Fix for Gentoo/FreeBSD: copy the old library even when it's in /lib rather than /usr/lib, and move the new one in /lib.

Package-Manager: portage-2.1.1_pre4-r1

3 files changed, 31 insertions, 10 deletions

diff --git a/sys-devel/gettext/ChangeLog b/sys-devel/gettext/ChangeLog
index 77c8eb8226e3..df8ec51f467a 100644
--- a/sys-devel/gettext/ChangeLog
+++ b/sys-devel/gettext/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/gettext
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.114 2006/07/31 16:40:14 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/ChangeLog,v 1.115 2006/08/01 19:26:17 flameeyes Exp $
+
+  01 Aug 2006; Diego Pettenò <flameeyes@gentoo.org> gettext-0.15.ebuild:
+  Fix for Gentoo/FreeBSD: copy the old library even when it's in /lib rather
+  than /usr/lib, and move the new one in /lib.
 
   31 Jul 2006; Fabian Groffen <grobian@gentoo.org> gettext-0.15.ebuild:
   Remove OSX hack, as it's not needed anymore (bug #142232)
diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 28eab0e4d883..feaaa762ea39 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 50po-mode-gentoo.el 322 RMD160 fe6603c8a72c7674f8b55201f44c9854fa209991 SHA1 b4017776f7abfc1267b8c0799ee512eef60f69ac SHA256 96e59f3fffb71699946e4b930dec98bce68a8234f598f4f85024ee61713991c0
 MD5 26632b2c8167333a89f1818c6cd5002d files/50po-mode-gentoo.el 322
 RMD160 fe6603c8a72c7674f8b55201f44c9854fa209991 files/50po-mode-gentoo.el 322
@@ -65,14 +68,14 @@ EBUILD gettext-0.14.6.ebuild 4027 RMD160 51d1d96a5b31fa73a1b8391a87617c2607a58de
 MD5 ceaf0fc1da75a74c7779f1981158dc48 gettext-0.14.6.ebuild 4027
 RMD160 51d1d96a5b31fa73a1b8391a87617c2607a58deb gettext-0.14.6.ebuild 4027
 SHA256 53df3dbe7d1777f44f451ab3452e9d53b15e103f8bf9d9292b6826c61404406f gettext-0.14.6.ebuild 4027
-EBUILD gettext-0.15.ebuild 3646 RMD160 53d76912dcec617abbf2855c05299a516645212b SHA1 b3d6e07abc25a8428a667cd3c17d9eee41c5b699 SHA256 1bb098aca4999dbac310401cd93bd4632d1f9f984824e1ff660ebd976737e1a3
-MD5 f6fcd57abb66c083ee58ade77c110ed5 gettext-0.15.ebuild 3646
-RMD160 53d76912dcec617abbf2855c05299a516645212b gettext-0.15.ebuild 3646
-SHA256 1bb098aca4999dbac310401cd93bd4632d1f9f984824e1ff660ebd976737e1a3 gettext-0.15.ebuild 3646
-MISC ChangeLog 14433 RMD160 9da794bf498fe8d36028374e2160f99cff16e374 SHA1 7d6dc8f70fce789f80166d9fe2337ede1fb0bb33 SHA256 5f2b95ac85bb5d99b93f61f4e59c564dff2363da4e881cd3c68037fa6c7a3556
-MD5 f3814756562a524e67dada81056a7d23 ChangeLog 14433
-RMD160 9da794bf498fe8d36028374e2160f99cff16e374 ChangeLog 14433
-SHA256 5f2b95ac85bb5d99b93f61f4e59c564dff2363da4e881cd3c68037fa6c7a3556 ChangeLog 14433
+EBUILD gettext-0.15.ebuild 3872 RMD160 fb0b47d62cb905d4b63d9b39efa49ee3cb65fc2a SHA1 591b63c09376fe74619c72a9c823b7a13522cf46 SHA256 e7fd15f533a0f636ebd0f1b94e994e9e3409d28033b873b154e6c88e2096f82c
+MD5 016bab1a79950d2f40ddd1b902c0b5c7 gettext-0.15.ebuild 3872
+RMD160 fb0b47d62cb905d4b63d9b39efa49ee3cb65fc2a gettext-0.15.ebuild 3872
+SHA256 e7fd15f533a0f636ebd0f1b94e994e9e3409d28033b873b154e6c88e2096f82c gettext-0.15.ebuild 3872
+MISC ChangeLog 14634 RMD160 535af5443e47714d527da17fcb1a62af29ad950e SHA1 2d895f0c06c772eb2cbdeb32a75b0996005f408e SHA256 660e6182ece50109a91ca1ea2683e8d4bcdb345f028958a272256069721da723
+MD5 f4ccd29f40e1bc5f1f6412e82786a441 ChangeLog 14634
+RMD160 535af5443e47714d527da17fcb1a62af29ad950e ChangeLog 14634
+SHA256 660e6182ece50109a91ca1ea2683e8d4bcdb345f028958a272256069721da723 ChangeLog 14634
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -98,3 +101,10 @@ SHA256 9a79ad652aaf3dd5fa80aa5c25e60304c7ecc28e81a63359f660e474f66e0efc files/di
 MD5 17d746c8efa5e4286c26bf52fddc47d7 files/digest-gettext-0.15 241
 RMD160 a0eac6fb612cbd682123137994a7183beea6aab0 files/digest-gettext-0.15 241
 SHA256 1a7a8875b3b7d8011871a3b8a0aeb1ec0a1664e33547b816fe4927865fb47abd files/digest-gettext-0.15 241
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD8DBQFEz6roAiZjviIA2XgRAhfiAJ9ZUH7+99GqlcVH7WoBZHnlGTZdKwCeO1iC
+eonnakqsI59+a4t1sLtDotQ=
+=r0+C
+-----END PGP SIGNATURE-----
diff --git a/sys-devel/gettext/gettext-0.15.ebuild b/sys-devel/gettext/gettext-0.15.ebuild
index a577a162a283..1d95839815ae 100644
--- a/sys-devel/gettext/gettext-0.15.ebuild
+++ b/sys-devel/gettext/gettext-0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.15.ebuild,v 1.3 2006/07/31 16:40:14 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.15.ebuild,v 1.4 2006/08/01 19:26:17 flameeyes Exp $
 
 inherit flag-o-matic eutils multilib toolchain-funcs mono libtool elisp-common
 
@@ -85,7 +85,14 @@ src_install() {
 		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 ! use elibc_glibc; then
+		libname="libintl$(get_libname 8)"
 		# Move dynamic libs and creates ldscripts into /usr/lib
 		dodir /$(get_libdir)
 		mv "${D}"/usr/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/