summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNaohiro Aota <naota@gentoo.org>2011-12-18 11:14:43 +0000
committerNaohiro Aota <naota@gentoo.org>2011-12-18 11:14:43 +0000
commite98c7797c037e6f1650763f01ae01e8c8ee0864f (patch)
treeb24942db9685f4c82fcaeebbe005ed42c24e13f5
parentStable for AMD64, wrt bug #395017 (diff)
downloadgentoo-2-e98c7797c037e6f1650763f01ae01e8c8ee0864f.tar.gz
gentoo-2-e98c7797c037e6f1650763f01ae01e8c8ee0864f.tar.bz2
gentoo-2-e98c7797c037e6f1650763f01ae01e8c8ee0864f.zip
Regenerate libtool. Add patch to detect libiconv
(Portage version: 2.2.0_alpha79/cvs/Linux x86_64)
-rw-r--r--dev-libs/libnatspec/ChangeLog6
-rw-r--r--dev-libs/libnatspec/files/libnatspec-0.2.6-iconv.patch12
-rw-r--r--dev-libs/libnatspec/libnatspec-0.2.6.ebuild13
3 files changed, 28 insertions, 3 deletions
diff --git a/dev-libs/libnatspec/ChangeLog b/dev-libs/libnatspec/ChangeLog
index 0e997d8f1077..db8d32b549a0 100644
--- a/dev-libs/libnatspec/ChangeLog
+++ b/dev-libs/libnatspec/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-libs/libnatspec
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnatspec/ChangeLog,v 1.10 2011/12/13 11:23:19 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnatspec/ChangeLog,v 1.11 2011/12/18 11:14:43 naota Exp $
+
+ 18 Dec 2011; Naohiro Aota <naota@gentoo.org> libnatspec-0.2.6.ebuild,
+ +files/libnatspec-0.2.6-iconv.patch:
+ Regenerate libtool. Add patch to detect libiconv
13 Dec 2011; Naohiro Aota <naota@gentoo.org> metadata.xml:
Assign to cjk herd
diff --git a/dev-libs/libnatspec/files/libnatspec-0.2.6-iconv.patch b/dev-libs/libnatspec/files/libnatspec-0.2.6-iconv.patch
new file mode 100644
index 000000000000..baf024d29b1a
--- /dev/null
+++ b/dev-libs/libnatspec/files/libnatspec-0.2.6-iconv.patch
@@ -0,0 +1,12 @@
+diff --git a/configure.ac b/configure.ac
+index ce9ce28..f1c4826 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -50,6 +50,7 @@ AC_CHECK_HEADERS([iconv.h],check_iconv=true)
+ if test "x$check_iconv" == x ; then
+ AC_MSG_ERROR([*** iconv.h not found.])
+ fi
++AC_CHECK_LIB([iconv], libiconv_open)
+
+ # check Doxygen
+ DOXYGEN=""
diff --git a/dev-libs/libnatspec/libnatspec-0.2.6.ebuild b/dev-libs/libnatspec/libnatspec-0.2.6.ebuild
index 2d0a4d23d89a..423152468d0f 100644
--- a/dev-libs/libnatspec/libnatspec-0.2.6.ebuild
+++ b/dev-libs/libnatspec/libnatspec-0.2.6.ebuild
@@ -1,16 +1,18 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnatspec/libnatspec-0.2.6.ebuild,v 1.8 2011/03/12 12:41:46 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnatspec/libnatspec-0.2.6.ebuild,v 1.9 2011/12/18 11:14:43 naota Exp $
EAPI="2"
+inherit autotools
+
DESCRIPTION="library to smooth charset/localization issues"
HOMEPAGE="http://natspec.sourceforge.net/"
SRC_URI="mirror://sourceforge/natspec/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="doc python"
RDEPEND="python? ( >=dev-lang/python-2.3 )
@@ -19,6 +21,13 @@ DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
python? ( dev-lang/tcl )"
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-iconv.patch
+ # regenerate to fix imcompatible readlink usage
+ rm -f "${S}"/ltmain.sh "${S}"/libtool
+ eautoreconf
+}
+
src_configure() {
use doc || export ac_cv_prog_DOX=no
# braindead configure script does not disable python on --without-python