Version bump -- needs iconv rpath fixed though.

Package-Manager: portage-2.2_pre2

3 files changed, 77 insertions, 3 deletions

diff --git a/dev-libs/libiconv/ChangeLog b/dev-libs/libiconv/ChangeLog
index b7dc2687a1e0..a800573463a1 100644
--- a/dev-libs/libiconv/ChangeLog
+++ b/dev-libs/libiconv/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libiconv
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.28 2007/01/23 07:17:54 flameeyes Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.29 2008/02/21 22:20:24 vapier Exp $
+
+*libiconv-1.12 (21 Feb 2008)
+
+  21 Feb 2008; Mike Frysinger <vapier@gentoo.org> +libiconv-1.12.ebuild:
+  Version bump -- needs iconv rpath fixed though.
 
   23 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> libiconv-1.11.ebuild:
   Use toolchain-funcs's gen_usr_ldscript. See bug #144529.
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index 244bb73c3a00..96845694d1e2 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -1,5 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX libiconv-1.10-link.patch 910 RMD160 9ffdad30a03ec8013c4e7eb257de01b096026853 SHA1 e5f2687b3ac28b17f5d5e79c7b1df45a31916a6c SHA256 99618454073097c4946acd4df69f2af961f7bfd3b52d0e385722a6cc4b81d8d8
 DIST libiconv-1.11.tar.gz 4430930 RMD160 9adbcd61598bee2fbe4eb94ac3f35f83f568d9d0 SHA1 df09c3ef43443ac15c0c2d49fd791aa73a64bf30 SHA256 fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b
+DIST libiconv-1.12.tar.gz 4513309 RMD160 74a63c1a2963ac1729c1ac7adfec8fd397a685bd SHA1 a5738d7dfbbd01c49e8ce026ea4ffa0f01af0179 SHA256 a99e244fd78babb95ea3c9a5c88b964994edaa1d15fd8dde5b4067801e23f0cd
 EBUILD libiconv-1.11.ebuild 1759 RMD160 4879335fc61a9857b9f515d23aae05f8009364ed SHA1 aa7ee424baa228b75ba7463748a57a7a681a0c74 SHA256 0c1e84a3137ab15a6916ff540b85bdaae1278c589cf0a6ab53bf1de0d20b6777
-MISC ChangeLog 4549 RMD160 c1a19f56a96810118908b79d34ebf38262877036 SHA1 2a619ba152fa0f9a4984cc0b269b74da393b1b79 SHA256 90d8d6b5bfc1295b7538fdafb4a70be0c41c1c4b7bf206fbe8997fce098f6fff
+EBUILD libiconv-1.12.ebuild 1659 RMD160 944133c1178667a5dcc4d9ebc841b50d6df5737d SHA1 20d322ddcb88b260dbe61677f44d2bc7e1e0af10 SHA256 3917e6d01f638e6dea8070a4911b2b369a9ed45df698f4a074aa54132fce4cf7
+MISC ChangeLog 4700 RMD160 0f494988f1b4a07a8afc00c2eeea0df5ba15107d SHA1 12bde886ea4b85e9afb0a86e2866dbfcb344fff3 SHA256 78ca934c8fc7698902e917b1e06527839cff94d0e50d559818d2cb2f506179a3
 MISC metadata.xml 378 RMD160 907b05848e357c89928e9e40c8eacfba66a20d04 SHA1 a5566ba3b095b06da0d54f2d79d3f42769a9af26 SHA256 fb61ffaf9539c5b433445c9145ce53945ccbbb19b02e97afa513574f88d64b1f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHvfkuj9hvisErhMIRAp0KAKCXLLAAXFsDo4+X7bborDyMz0+PcwCgi0AB
+13qRn6eAbIRuA9PFNLySxco=
+=nTbr
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libiconv/libiconv-1.12.ebuild b/dev-libs/libiconv/libiconv-1.12.ebuild
new file mode 100644
index 000000000000..e3128fda75eb
--- /dev/null
+++ b/dev-libs/libiconv/libiconv-1.12.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.12.ebuild,v 1.1 2008/02/21 22:20:24 vapier Exp $
+
+inherit eutils multilib flag-o-matic libtool toolchain-funcs
+
+DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
+HOMEPAGE="http://www.gnu.org/software/libiconv/"
+SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+#KEYWORDS="~sparc-fbsd ~x86-fbsd"
+IUSE=""
+
+DEPEND="!sys-libs/glibc
+	!sys-apps/man-pages"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# This patch is needed as libiconv 1.10 provides (and uses) new functions
+	# and they are not present in the old libiconv.so, and this breaks the
+	# ${DESTDIR} != ${prefix} that we use. It's a problem for Solaris, but we
+	# don't have to deal with it for now.
+	#epatch "${FILESDIR}"/${PN}-1.10-link.patch
+
+	# Make sure that libtool support is updated to link "the linux way" on
+	# FreeBSD.
+	elibtoolize
+}
+
+src_compile() {
+	# Install in /lib as utils installed in /lib like gnutar
+	# can depend on this
+
+	# Disable NLS support because that creates a circular dependency
+	# between libiconv and gettext
+
+	econf \
+		--disable-nls \
+		--enable-shared \
+		--enable-static \
+		 || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}/html" install || die "make install failed"
+
+	# Move static libs and creates ldscripts into /usr/lib
+	dodir /$(get_libdir)
+	mv "${D}"/usr/$(get_libdir)/*.so* "${D}/$(get_libdir)" || die
+	gen_usr_ldscript libiconv.so
+	gen_usr_ldscript libcharset.so
+}