whatever BSD does here, is non-standard, so don't break it

Package-Manager: portage-2.1.2.9

3 files changed, 18 insertions, 16 deletions

diff --git a/sys-devel/gettext/Manifest b/sys-devel/gettext/Manifest
index 669211ff122b..dcc024b2dff9 100644
--- a/sys-devel/gettext/Manifest
+++ b/sys-devel/gettext/Manifest
@@ -15,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 3208 RMD160 e303b063865a8e7babf4f22d4f99d8e7b2952468 SHA1 33914d7376741c945c683799358faa241088d210 SHA256 ccc71cd0f319df8b7b42e7755b27b401f77632f91571262b62b21bdfd9689c84
-MD5 8e2a7fcd2fa59ddaa15a5cd0df11f61a gettext-0.16.1-r1.ebuild 3208
-RMD160 e303b063865a8e7babf4f22d4f99d8e7b2952468 gettext-0.16.1-r1.ebuild 3208
-SHA256 ccc71cd0f319df8b7b42e7755b27b401f77632f91571262b62b21bdfd9689c84 gettext-0.16.1-r1.ebuild 3208
-EBUILD gettext-0.16.1.ebuild 3353 RMD160 62ad3ace45f4f8113db3965d0ad21e6956eee67e SHA1 1ea21c5cdb3f82cb2f401ba5476797c5e6e51f8e SHA256 57b7d5f94cac45be77bcf8e190d5a90216b503bbf5befa640f1120ae53fe9aee
-MD5 6676dc74687a1943f56e65cbe68dab79 gettext-0.16.1.ebuild 3353
-RMD160 62ad3ace45f4f8113db3965d0ad21e6956eee67e gettext-0.16.1.ebuild 3353
-SHA256 57b7d5f94cac45be77bcf8e190d5a90216b503bbf5befa640f1120ae53fe9aee gettext-0.16.1.ebuild 3353
+EBUILD gettext-0.16.1-r1.ebuild 3229 RMD160 7b837a1efce5885a5027c7219b30a010bc9b0a70 SHA1 f87ddd438b76769918cd2f1a2d6e941701abe2a3 SHA256 cda857a54cc6914ab288f444b4d76140ab376ad7ccf71794cc79c35dc97c3eef
+MD5 689b0121a7e67d5ee70febfbf04deba5 gettext-0.16.1-r1.ebuild 3229
+RMD160 7b837a1efce5885a5027c7219b30a010bc9b0a70 gettext-0.16.1-r1.ebuild 3229
+SHA256 cda857a54cc6914ab288f444b4d76140ab376ad7ccf71794cc79c35dc97c3eef gettext-0.16.1-r1.ebuild 3229
+EBUILD gettext-0.16.1.ebuild 3374 RMD160 527f28c030dc3244777fca0ec3c8121f7682f04c SHA1 7e27c8d1e0e41dc19637fbad6b0afd4d0d64db46 SHA256 2454c4d0bae42ae00ccb711b576d4cda0081d50d89973d2fab80363932200cf1
+MD5 61ab83f15dc9edd6a49b8dd45916337e gettext-0.16.1.ebuild 3374
+RMD160 527f28c030dc3244777fca0ec3c8121f7682f04c gettext-0.16.1.ebuild 3374
+SHA256 2454c4d0bae42ae00ccb711b576d4cda0081d50d89973d2fab80363932200cf1 gettext-0.16.1.ebuild 3374
 MISC ChangeLog 18507 RMD160 75a0770c4f41a8e358dfa4e7c0733aaeece964a9 SHA1 51d6cd49dfb0f466dabfdd6a0c389327cca59ebe SHA256 0de7f2d5f2645239f5fe4cfe0d5089243fc67f1e2a45dacdbd9015b25cbe246a
 MD5 05f5806bc4d894fafdd86cad17053141 ChangeLog 18507
 RMD160 75a0770c4f41a8e358dfa4e7c0733aaeece964a9 ChangeLog 18507
diff --git a/sys-devel/gettext/gettext-0.16.1-r1.ebuild b/sys-devel/gettext/gettext-0.16.1-r1.ebuild
index 41048000cc70..b659d4ce4684 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.4 2007/08/04 16:03:00 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.16.1-r1.ebuild,v 1.5 2007/08/04 16:41:44 grobian Exp $
 
 inherit flag-o-matic eutils multilib toolchain-funcs mono libtool
 
@@ -74,11 +74,12 @@ src_install() {
 	fi
 	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
 
-	if use !elibc_glibc ; then
+	if [[ ${USERLAND} == "BSD" ]] ; then
+		libname="libintl$(get_libname 8)"
 		# Move dynamic libs and creates ldscripts into /usr/lib
 		dodir /$(get_libdir)
-		mv "${D}"/usr/$(get_libdir)/libintl*$(get_libname)* "${D}"/$(get_libdir)/
-		gen_usr_ldscript libintl$(get_libname 8)
+		mv "${D}"/usr/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/
+		gen_usr_ldscript ${libname}
 	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 3af0d6929494..9babe5e4851f 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.14 2007/08/04 16:03:00 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gettext/gettext-0.16.1.ebuild,v 1.15 2007/08/04 16:41:44 grobian Exp $
 
 inherit flag-o-matic eutils multilib toolchain-funcs mono libtool elisp-common
 
@@ -71,11 +71,12 @@ src_install() {
 	fi
 	rm -f "${D}"/usr/share/locale/locale.alias "${D}"/usr/lib/charset.alias
 
-	if use !elibc_glibc ; then
+	if [[ ${USERLAND} == "BSD" ]] ; then
+		libname="libintl$(get_libname 8)"
 		# Move dynamic libs and creates ldscripts into /usr/lib
 		dodir /$(get_libdir)
-		mv "${D}"/usr/$(get_libdir)/libintl*$(get_libname)* "${D}"/$(get_libdir)/
-		gen_usr_ldscript libintl$(get_libname 8)
+		mv "${D}"/usr/$(get_libdir)/${libname}* "${D}"/$(get_libdir)/
+		gen_usr_ldscript ${libname}
 	fi
 
 	if use doc ; then