Use toolchain-funcs's gen_usr_ldscript. See bug #144529.

Package-Manager: portage-2.1.2-r1

diff --git a/dev-libs/libiconv/ChangeLog b/dev-libs/libiconv/ChangeLog
index ea99e8e05d5d595d2ada43b94151f24faf78e2f1..b7dc2687a1e0014c29c7a79754658234917269bb 100644 (file)
--- a/dev-libs/libiconv/ChangeLog
+++ b/dev-libs/libiconv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/libiconv
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/ChangeLog,v 1.27 2006/12/02 18:57:25 flameeyes Exp $
+# 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 $
+
+  23 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> libiconv-1.11.ebuild:
+  Use toolchain-funcs's gen_usr_ldscript. See bug #144529.
 
   02 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> libiconv-1.11.ebuild:
   Block man-pages as they both install iconv(3) manpage.

diff --git a/dev-libs/libiconv/Manifest b/dev-libs/libiconv/Manifest
index 3fdc125c373f38dc5f47df0859661fefd08a800a..d753f2989228b79a21344e216b57102c60dd23af 100644 (file)
--- a/dev-libs/libiconv/Manifest
+++ b/dev-libs/libiconv/Manifest
@@ -6,14 +6,14 @@ MD5 c48abf520f6345ca1cb28be835796db8 files/libiconv-1.10-link.patch 910
 RMD160 9ffdad30a03ec8013c4e7eb257de01b096026853 files/libiconv-1.10-link.patch 910
 SHA256 99618454073097c4946acd4df69f2af961f7bfd3b52d0e385722a6cc4b81d8d8 files/libiconv-1.10-link.patch 910
 DIST libiconv-1.11.tar.gz 4430930 RMD160 9adbcd61598bee2fbe4eb94ac3f35f83f568d9d0 SHA1 df09c3ef43443ac15c0c2d49fd791aa73a64bf30 SHA256 fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b
-EBUILD libiconv-1.11.ebuild 1883 RMD160 177b36256ae9735f9a127460560b52190ac16479 SHA1 9d7101ea4099b946aad2f6c590c529acdd9b9665 SHA256 1590a5eda4beaaa5f17b4769eabb95ac2c1b249c30a34b4ddb54ee072d559cf1
-MD5 37438451eeea675ccf37b065a96e1c17 libiconv-1.11.ebuild 1883
-RMD160 177b36256ae9735f9a127460560b52190ac16479 libiconv-1.11.ebuild 1883
-SHA256 1590a5eda4beaaa5f17b4769eabb95ac2c1b249c30a34b4ddb54ee072d559cf1 libiconv-1.11.ebuild 1883
-MISC ChangeLog 4414 RMD160 1e23b043dbb02b936cce509da4e50dfc1cc2948d SHA1 66d50d6d7879e822b682ee40d7f6a6bfb29be797 SHA256 89e3bd69805fe3380e0cb425f836d027257b2d0ef153f2b061407b446f6624cb
-MD5 f9479d6001adf86f914d5e155eecd9c8 ChangeLog 4414
-RMD160 1e23b043dbb02b936cce509da4e50dfc1cc2948d ChangeLog 4414
-SHA256 89e3bd69805fe3380e0cb425f836d027257b2d0ef153f2b061407b446f6624cb ChangeLog 4414
+EBUILD libiconv-1.11.ebuild 1759 RMD160 4879335fc61a9857b9f515d23aae05f8009364ed SHA1 aa7ee424baa228b75ba7463748a57a7a681a0c74 SHA256 0c1e84a3137ab15a6916ff540b85bdaae1278c589cf0a6ab53bf1de0d20b6777
+MD5 6a5dd66255b7838b546ecfe9b0af1a22 libiconv-1.11.ebuild 1759
+RMD160 4879335fc61a9857b9f515d23aae05f8009364ed libiconv-1.11.ebuild 1759
+SHA256 0c1e84a3137ab15a6916ff540b85bdaae1278c589cf0a6ab53bf1de0d20b6777 libiconv-1.11.ebuild 1759
+MISC ChangeLog 4549 RMD160 c1a19f56a96810118908b79d34ebf38262877036 SHA1 2a619ba152fa0f9a4984cc0b269b74da393b1b79 SHA256 90d8d6b5bfc1295b7538fdafb4a70be0c41c1c4b7bf206fbe8997fce098f6fff
+MD5 c81675eff96bd252cc2900f04c3406de ChangeLog 4549
+RMD160 c1a19f56a96810118908b79d34ebf38262877036 ChangeLog 4549
+SHA256 90d8d6b5bfc1295b7538fdafb4a70be0c41c1c4b7bf206fbe8997fce098f6fff ChangeLog 4549
 MISC metadata.xml 378 RMD160 907b05848e357c89928e9e40c8eacfba66a20d04 SHA1 a5566ba3b095b06da0d54f2d79d3f42769a9af26 SHA256 fb61ffaf9539c5b433445c9145ce53945ccbbb19b02e97afa513574f88d64b1f
 MD5 c9d8d5d37487d29e41f03ef9dc5dc198 metadata.xml 378
 RMD160 907b05848e357c89928e9e40c8eacfba66a20d04 metadata.xml 378
@@ -22,9 +22,9 @@ MD5 b5814d388716bff7df495d4bf1efb9cf files/digest-libiconv-1.11 244
 RMD160 c96e87d30ac33aea1687de3dbb0c5eba6c57b57c files/digest-libiconv-1.11 244
 SHA256 363a12701f3231f372696f460f13b0efc5b8fda01434932e34495b501cf7df38 files/digest-libiconv-1.11 244
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5 (GNU/Linux)
+Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFccylAiZjviIA2XgRAieXAKDUoVvKUMo5xgsC95sIVl4A0qV+swCgh8/r
-6QXVCGS9Sgbbmy/vw6ii7Ak=
-=kGHd
+iD8DBQFFtbapAiZjviIA2XgRAr5HAJ4o+K4KtOety8w0VA+o+Piv/c8HgwCg4D6r
+Ks4kLBZ4KoZqOKAEDAGC36o=
+=QZOg
 -----END PGP SIGNATURE-----

diff --git a/dev-libs/libiconv/libiconv-1.11.ebuild b/dev-libs/libiconv/libiconv-1.11.ebuild
index 962aec9c12933e558b46ea1c81af784e12618c08..babc0c06454db8b699945777f31d4617b7c1ad41 100644 (file)
--- a/dev-libs/libiconv/libiconv-1.11.ebuild
+++ b/dev-libs/libiconv/libiconv-1.11.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.11.ebuild,v 1.7 2006/12/02 18:57:25 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libiconv/libiconv-1.11.ebuild,v 1.8 2007/01/23 07:17:54 flameeyes Exp $
 
-inherit eutils multilib flag-o-matic autotools libtool
+inherit eutils multilib flag-o-matic libtool toolchain-funcs
 
 DESCRIPTION="GNU charset conversion library for libc which doesn't implement it"
 SRC_URI="mirror://gnu/libiconv/${P}.tar.gz"
@@ -59,10 +59,4 @@ src_install() {
        gen_usr_ldscript libcharset.so
 
        use build && rm -rf "${D}/usr"
-
-       preserve_old_lib /lib/$(get_libdir)/libiconv.so.4
-}
-
-pkg_postinst() {
-       preserve_old_lib_notify /lib/$(get_libdir)/libiconv.so.4
 }