Use preserve_old_lib rather than screwing with $ROOT ourselves #168046.

Package-Manager: portage-2.1.2-r10

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 7b01e2277caa3c123ccba33424dc9991684d9ddf..4235018efe0e89f3b891054be113156ec0b6b160 100644 (file)
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.141 2007/02/21 18:16:35 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.142 2007/02/26 01:32:09 vapier Exp $
+
+  26 Feb 2007; Mike Frysinger <vapier@gentoo.org> gettext-0.16.1.ebuild:
+  Use preserve_old_lib rather than screwing with $ROOT ourselves #168046.
 
   21 Feb 2007; Alexander H. Færøy <eroyf@gentoo.org>
   gettext-0.16.1.ebuild:

diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 493443d278e589ee233acd895e526056aa8ae6d9..9b6cb0227de1bbd8a322e28b1b422a0f79557c76 100644 (file)
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -81,14 +81,14 @@ EBUILD gettext-0.15.ebuild 3812 RMD160 ce88946a297b943f0568c7fea64c369c4e235c72
 MD5 740d3b73f7ec665d41501da1f17f1a24 gettext-0.15.ebuild 3812
 RMD160 ce88946a297b943f0568c7fea64c369c4e235c72 gettext-0.15.ebuild 3812
 SHA256 f894c1e5675558ca197400ed6e5f3bfc5881d19f457004163c614a349c8c6cf5 gettext-0.15.ebuild 3812
-EBUILD gettext-0.16.1.ebuild 3697 RMD160 5195a9933c3cb84b324367467e2bb58df98bb25f SHA1 ce876755295c130216330025bc930701a1bd1928 SHA256 fd16b3f085311e89cfbe42922fdd4f3cbd6262213a6c2f34d627e7283cfbad80
-MD5 fd8c0fed80cee3be4d81da2ce8716026 gettext-0.16.1.ebuild 3697
-RMD160 5195a9933c3cb84b324367467e2bb58df98bb25f gettext-0.16.1.ebuild 3697
-SHA256 fd16b3f085311e89cfbe42922fdd4f3cbd6262213a6c2f34d627e7283cfbad80 gettext-0.16.1.ebuild 3697
-MISC ChangeLog 17983 RMD160 4aa1459bc0e7fdaf5bdc21ce0261fca70b805c4b SHA1 bad3e731f8f953a8fdf97a881fb903044bd73ec7 SHA256 bbb3ce5ea962a0b1c13c3c5c9e8fa2c0b4f4e6ad49a359e64cfc70ad4d1834fd
-MD5 9beef38a1b9c64b9b4b5ff64dd6b77e7 ChangeLog 17983
-RMD160 4aa1459bc0e7fdaf5bdc21ce0261fca70b805c4b ChangeLog 17983
-SHA256 bbb3ce5ea962a0b1c13c3c5c9e8fa2c0b4f4e6ad49a359e64cfc70ad4d1834fd ChangeLog 17983
+EBUILD gettext-0.16.1.ebuild 3374 RMD160 6e6d108219d0378a2bc79b844584234349c66cab SHA1 4136bc5fd77a05c9dbb0120483614608e9a7c94e SHA256 f78194002d2c47836c826881ead228fbb02fdd37edc550be0c374a3c2b27fd82
+MD5 3b8da0c81d8b17c07bca7dadecfd3720 gettext-0.16.1.ebuild 3374
+RMD160 6e6d108219d0378a2bc79b844584234349c66cab gettext-0.16.1.ebuild 3374
+SHA256 f78194002d2c47836c826881ead228fbb02fdd37edc550be0c374a3c2b27fd82 gettext-0.16.1.ebuild 3374
+MISC ChangeLog 18132 RMD160 31426f7f4741ae95e70b0cba90005179ef06f5f4 SHA1 c1231d9beb9ec7ba3259522325292aa89e4e99fc SHA256 e2fe330788e8e60cd0b0b9e1fb56aeee46a770979c0b471a0b4a5a7c3214cdc5
+MD5 c66f92db57b458216c81a11fd6ec8e70 ChangeLog 18132
+RMD160 31426f7f4741ae95e70b0cba90005179ef06f5f4 ChangeLog 18132
+SHA256 e2fe330788e8e60cd0b0b9e1fb56aeee46a770979c0b471a0b4a5a7c3214cdc5 ChangeLog 18132
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -121,9 +121,9 @@ MD5 3039d88bd5ec140e7f74737dfb833be0 files/digest-gettext-0.16.1 247
 RMD160 71e6dc3fea3df0df49e4facd032dcbbd6ce198df files/digest-gettext-0.16.1 247
 SHA256 fcec1f6a5ae0b5b6204ed6bb505566eec066b83ba20aab9a94740353912a4d1c files/digest-gettext-0.16.1 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFF3IxN6Xxn2nLwtdQRAlteAKCDdadXmdpXv2gj3e7qRc/qLSB9iwCeLwNZ
-xCqcv4iS2bxn4qCjGY2fTfE=
-=xjaB
+iD8DBQFF4jjq8bi6rjpTunYRAoE4AJ9EQ929cV8hAhXhVYiBjlL7mPwRagCgtU+y
+MxOzH9covBajPIgAqzQ9smQ=
+=QCZq
 -----END PGP SIGNATURE-----

diff --git a/sys-devel/gettext/gettext-0.16.1.ebuild b/sys-devel/gettext/gettext-0.16.1.ebuild
index c9754b498df48db09102ac4b0e5d1452b34827d0..f8d05e35dc28ffc41dfb66f7c4062e4430bb3381 100644 (file)
--- a/sys-devel/gettext/gettext-0.16.1.ebuild
+++ b/sys-devel/gettext/gettext-0.16.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.16.1.ebuild,v 1.10 2007/02/21 18:16:35 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.16.1.ebuild,v 1.11 2007/02/26 01:32:09 vapier Exp $
 
 inherit flag-o-matic eutils multilib toolchain-funcs mono libtool elisp-common
 
@@ -71,21 +71,7 @@ src_install() {
        fi
        rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
 
-       # older gettext's sometimes installed libintl ...
-       # need to keep the linked version or the system
-       # could die (things like sed link against it :/)
-       local libname="libintl$(get_libname 7)"
-       if [[ -e ${ROOT}/usr/$(get_libdir)/${libname} ]] ; then
-               cp -pPR ${ROOT}/usr/$(get_libdir)/${libname}* "${D}"/usr/$(get_libdir)/
-               touch "${D}"/usr/$(get_libdir)/${libname}*
-       fi
-       if [[ -e ${ROOT}/$(get_libdir)/${libname} ]] ; then
-               dodir /$(get_libdir)
-               cp -pPR ${ROOT}/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/
-               touch "${D}"/$(get_libdir)/${libname}*
-       fi
-
-       if [[ $USERLAND == "BSD" ]] ; then
+       if [[ ${USERLAND} == "BSD" ]] ; then
                libname="libintl$(get_libname 8)"
                # Move dynamic libs and creates ldscripts into /usr/lib
                dodir /$(get_libdir)
@@ -110,6 +96,13 @@ src_install() {
        dodoc AUTHORS ChangeLog NEWS README THANKS
 }
 
+pkg_preinst() {
+       # older gettext's sometimes installed libintl ...
+       # need to keep the linked version or the system
+       # could die (things like sed link against it :/)
+       preserve_old_lib /{,usr/}$(get_libdir)/libintl$(get_libname 7)
+}
+
 pkg_postinst() {
        use emacs && elisp-site-regen
        ewarn "Any package that linked against the previous version"