it makes little to no sense to use get_libname if you expect it to have an ELF pattern

Package-Manager: portage-2.1.2.9

3 files changed, 16 insertions, 28 deletions

diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 4b27a022591e..2ca98adcbab8 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -1,6 +1,3 @@
------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
@@ -18,14 +15,14 @@ MD5 20dbf5cfc16f8726e7594fb49da5665c files/gettext-0.15-expat-no-dlopen.patch 58
 RMD160 7e41b0b5b1f9a8eb220a445fde835c3a7a3f3ade files/gettext-0.15-expat-no-dlopen.patch 585
 SHA256 dc5d9adff87b786ec753b1251c135355daeb185ab275ee40d165031e56c5f539 files/gettext-0.15-expat-no-dlopen.patch 585
 DIST gettext-0.16.1.tar.gz 8539634 RMD160 0fa96b2d005e2490e8603a0a3612041086d5aea1 SHA1 8642f4346dfd6a18ecd883329e150bfe9e0886c3 SHA256 0bf850d1a079fb5a61f0a47b1a9efd35eb44032255375e1cedb0253bc27b376d
-EBUILD gettext-0.16.1-r1.ebuild 3225 RMD160 dff1d184ba69a297195c250902beba35c7fe76e1 SHA1 99b220d662f05e87316ff5bcd9226b402c009ccb SHA256 d9d7e3133c503ae25edf82c69efa6e5e8bc199ae9fa30348b95fa6a337847840
-MD5 7200ce6078bfdfd004f15eb32ef250d9 gettext-0.16.1-r1.ebuild 3225
-RMD160 dff1d184ba69a297195c250902beba35c7fe76e1 gettext-0.16.1-r1.ebuild 3225
-SHA256 d9d7e3133c503ae25edf82c69efa6e5e8bc199ae9fa30348b95fa6a337847840 gettext-0.16.1-r1.ebuild 3225
-EBUILD gettext-0.16.1.ebuild 3374 RMD160 0903f36f3effcfb09abb029a378baa3b9f4b20d5 SHA1 ceed2991d258177344bd7adf21c6cdf4a1239f8d SHA256 5b73802d0c207992b7eb437c4f2364b9da10011badbc21bbde0a0eb4e1045848
-MD5 7dab92115f9d277ec795331abd50a103 gettext-0.16.1.ebuild 3374
-RMD160 0903f36f3effcfb09abb029a378baa3b9f4b20d5 gettext-0.16.1.ebuild 3374
-SHA256 5b73802d0c207992b7eb437c4f2364b9da10011badbc21bbde0a0eb4e1045848 gettext-0.16.1.ebuild 3374
+EBUILD gettext-0.16.1-r1.ebuild 3210 RMD160 fd8fc559a7d228d2afe7ebbbd0cf229085d3fbdb SHA1 2266a846b3a1232c4f1188d437951dafef487799 SHA256 cb56891cff84a2ae185f53f30f55263c02fd7fb84b4a89be6cd5e4c49e2806f0
+MD5 78addda8ec27a06292badf3b2d31d724 gettext-0.16.1-r1.ebuild 3210
+RMD160 fd8fc559a7d228d2afe7ebbbd0cf229085d3fbdb gettext-0.16.1-r1.ebuild 3210
+SHA256 cb56891cff84a2ae185f53f30f55263c02fd7fb84b4a89be6cd5e4c49e2806f0 gettext-0.16.1-r1.ebuild 3210
+EBUILD gettext-0.16.1.ebuild 3355 RMD160 db8430176ac319495c8aec0b60378350809c9b13 SHA1 16bb3b1d8834910ee505ff19e0cdae42fa17fb5f SHA256 f6ccce923c2330606e1b3c386505a699272b20b7b904fcae3d42855e200bff2c
+MD5 0a36c8a5a02dd394e6cacab82599f1b0 gettext-0.16.1.ebuild 3355
+RMD160 db8430176ac319495c8aec0b60378350809c9b13 gettext-0.16.1.ebuild 3355
+SHA256 f6ccce923c2330606e1b3c386505a699272b20b7b904fcae3d42855e200bff2c gettext-0.16.1.ebuild 3355
 MISC ChangeLog 18507 RMD160 75a0770c4f41a8e358dfa4e7c0733aaeece964a9 SHA1 51d6cd49dfb0f466dabfdd6a0c389327cca59ebe SHA256 0de7f2d5f2645239f5fe4cfe0d5089243fc67f1e2a45dacdbd9015b25cbe246a
 MD5 05f5806bc4d894fafdd86cad17053141 ChangeLog 18507
 RMD160 75a0770c4f41a8e358dfa4e7c0733aaeece964a9 ChangeLog 18507
@@ -40,10 +37,3 @@ SHA256 fcec1f6a5ae0b5b6204ed6bb505566eec066b83ba20aab9a94740353912a4d1c files/di
 MD5 3039d88bd5ec140e7f74737dfb833be0 files/digest-gettext-0.16.1-r1 247
 RMD160 71e6dc3fea3df0df49e4facd032dcbbd6ce198df files/digest-gettext-0.16.1-r1 247
 SHA256 fcec1f6a5ae0b5b6204ed6bb505566eec066b83ba20aab9a94740353912a4d1c files/digest-gettext-0.16.1-r1 247
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGju/2Oeoy/oIi7uwRAqzHAJ4iGZw8N5hU16c9RTjBbiiUldzZGgCeLU8c
-vherMtTdPbeqoDzgNC6PZ5U=
-=SVSm
------END PGP SIGNATURE-----
diff --git a/sys-devel/gettext/gettext-0.16.1-r1.ebuild b/sys-devel/gettext/gettext-0.16.1-r1.ebuild
index 3a01d6d17339..4a856f2f0c64 100644
--- a/sys-devel/gettext/gettext-0.16.1-r1.ebuild
+++ b/sys-devel/gettext/gettext-0.16.1-r1.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-r1.ebuild,v 1.2 2007/07/07 01:44:18 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.16.1-r1.ebuild,v 1.3 2007/08/04 15:28:13 grobian Exp $
 
 inherit flag-o-matic eutils multilib toolchain-funcs mono libtool
 
@@ -74,12 +74,11 @@ src_install() {
 	fi
 	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
 
-	if [[ ${USERLAND} == "BSD" ]] ; then
-		libname="libintl$(get_libname 8)"
+	if use !elibc_glibc ; then
 		# Move dynamic libs and creates ldscripts into /usr/lib
 		dodir /$(get_libdir)
-		mv "${D}"/usr/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/
-		gen_usr_ldscript ${libname}
+		mv "${D}"/usr/$(get_libdir)/libintl*$(get_libname 8)* "${D}"/$(get_libdir)/
+		gen_usr_ldscript libintl$(get_libname 8)
 	fi
 
 	if use doc ; then
diff --git a/sys-devel/gettext/gettext-0.16.1.ebuild b/sys-devel/gettext/gettext-0.16.1.ebuild
index 4f664f689a8d..d3e5d6dca03f 100644
--- 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.12 2007/03/16 17:24:25 yoswink Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.16.1.ebuild,v 1.13 2007/08/04 15:28:13 grobian Exp $
 
 inherit flag-o-matic eutils multilib toolchain-funcs mono libtool elisp-common
 
@@ -71,12 +71,11 @@ src_install() {
 	fi
 	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
 
-	if [[ ${USERLAND} == "BSD" ]] ; then
-		libname="libintl$(get_libname 8)"
+	if use !elibc_glibc ; then
 		# Move dynamic libs and creates ldscripts into /usr/lib
 		dodir /$(get_libdir)
-		mv "${D}"/usr/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/
-		gen_usr_ldscript ${libname}
+		mv "${D}"/usr/$(get_libdir)/libintl*$(get_libname 8)* "${D}"/$(get_libdir)/
+		gen_usr_ldscript libintl$(get_libname 8)
 	fi
 
 	if use doc ; then