Install library in /lib for utils like gnutar which is installed in /lib.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 71 insertions, 38 deletions

diff --git a/dev-libs/libiconv/ChangeLog b/dev-libs/libiconv/ChangeLog
index 4382d5395fcf..97657dc936bc 100644
--- a/dev-libs/libiconv/ChangeLog
+++ b/dev-libs/libiconv/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-libs/libiconv
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.11 2005/04/30 11:29:57 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.12 2005/06/17 16:59:18 flameeyes Exp $
+
+*libiconv-1.9.2-r3 (17 Jun 2005)
+
+  17 Jun 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -libiconv-1.9.2-r2.ebuild, +libiconv-1.9.2-r3.ebuild:
+  Install library in /lib for utils like gnutar which is installed in /lib.
+  Disable nls to avoid circular dependency between libiconv and gettext.
+  Install docs in the right place. Added build useflag to remove /usr data.
 
 *libiconv-1.9.2-r2 (30 Apr 2005)
 
diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index 5ebb6ecf8272..b9e0451970ff 100644
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -1,5 +1,15 @@
-MD5 bfc9aa35537f38d53a95ed6d51b8346e ChangeLog 1773
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 f90c6b5ccd48096b82a7842c5994583b metadata.xml 469
-MD5 0bdf73e9b20233e63602df97619bd0ac libiconv-1.9.2-r2.ebuild 769
+MD5 277cb2900ce229bba5574ddbfa4af107 libiconv-1.9.2-r3.ebuild 1279
+MD5 67f1991d15839b3956ae3cf9c181ce21 ChangeLog 2142
 MD5 97aebb7d7ded50f07b44c23768d25928 files/libiconv-1.9.2-RPATH-fix.patch 1906
-MD5 ba26148d2aed650a790b129b9907ae59 files/digest-libiconv-1.9.2-r2 67
+MD5 ba26148d2aed650a790b129b9907ae59 files/digest-libiconv-1.9.2-r3 67
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCswGHj5H05b2HAEkRAtnRAJ9n12VLQiaDLxjNlbLrwYsz26dDvgCdFSLB
+mn3BUgLWVFF9q9Sr59/Rqic=
+=1TPV
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libiconv/files/digest-libiconv-1.9.2-r2 b/dev-libs/libiconv/files/digest-libiconv-1.9.2-r3
index e124274679fd..e124274679fd 100644
--- a/dev-libs/libiconv/files/digest-libiconv-1.9.2-r2
+++ b/dev-libs/libiconv/files/digest-libiconv-1.9.2-r3
diff --git a/dev-libs/libiconv/libiconv-1.9.2-r2.ebuild b/dev-libs/libiconv/libiconv-1.9.2-r2.ebuild
deleted file mode 100644
index c328812281ff..000000000000
--- a/dev-libs/libiconv/libiconv-1.9.2-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.9.2-r2.ebuild,v 1.1 2005/04/30 11:29:57 flameeyes Exp $
-
-inherit eutils
-
-DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
-SRC_URI="ftp://ftp.gnu.org/pub/gnu/libiconv/${P}.tar.gz"
-HOMEPAGE="http://www.gnu.org/software/libiconv/"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="~x86 ~sparc ~ppc ~amd64"
-IUSE="nls"
-
-DEPEND="virtual/libc
-	!sys-libs/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-RPATH-fix.patch
-}
-
-src_compile() {
-	econf \
-		$(use_enable nls) \
-		 || die "econf failed"
-	emake || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-}
diff --git a/dev-libs/libiconv/libiconv-1.9.2-r3.ebuild b/dev-libs/libiconv/libiconv-1.9.2-r3.ebuild
new file mode 100644
index 000000000000..489c957c8d79
--- /dev/null
+++ b/dev-libs/libiconv/libiconv-1.9.2-r3.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.9.2-r3.ebuild,v 1.1 2005/06/17 16:59:18 flameeyes Exp $
+
+inherit eutils multilib
+
+DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
+SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
+HOMEPAGE="http://www.gnu.org/software/libiconv/"
+
+SLOT="0"
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="build"
+
+DEPEND="virtual/libc
+	!sys-libs/glibc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-RPATH-fix.patch
+}
+
+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 \
+		--libdir=/$(get_libdir) \
+		--disable-nls \
+		 || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR=${D} docdir="/usr/share/doc/${PF}/html" install || die "make install failed"
+
+	# Move static libs and creates ldscripts into /usr/lib
+	dolib /usr/lib
+	mv ${D}/$(get_libdir)/*.a ${D}/$(get_libdir)/*.la ${D}/usr/$(get_libdir)
+	gen_usr_ldscript libiconv.so
+	gen_usr_ldscript libcharset.so
+
+	use build && rm -rf /usr
+}