Switch to cleaner STRIP_MASK with prepallstrip.

Package-Manager: portage-2.1.2.5

3 files changed, 23 insertions, 38 deletions

diff --git a/sys-libs/glibc/ChangeLog b/sys-libs/glibc/ChangeLog
index b8a32dcbea4d..37cd6a1c6de9 100644
--- a/sys-libs/glibc/ChangeLog
+++ b/sys-libs/glibc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-libs/glibc
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.512 2007/05/04 13:17:54 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/ChangeLog,v 1.513 2007/05/05 03:55:33 vapier Exp $
+
+  05 May 2007; Mike Frysinger <vapier@gentoo.org> glibc-2.5-r2.ebuild:
+  Switch to cleaner STRIP_MASK with prepallstrip.
 
   04 May 2007; Gustavo Zacarias <gustavoz@gentoo.org> glibc-2.5-r2.ebuild:
   Stable on sparc wrt security #176712
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index 4917e114ea25..36918fccbcc8 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -514,18 +514,18 @@ EBUILD glibc-2.5-r1.ebuild 39228 RMD160 5437b2c40a0c8758e017c3aafdfd246d994664e6
 MD5 f469455cce2f993375e9e1a15c7ee35f glibc-2.5-r1.ebuild 39228
 RMD160 5437b2c40a0c8758e017c3aafdfd246d994664e6 glibc-2.5-r1.ebuild 39228
 SHA256 7efe4d61049d7847436580d7ea567f7ab77d0240c82841eeb99b3368c2fd97b7 glibc-2.5-r1.ebuild 39228
-EBUILD glibc-2.5-r2.ebuild 39191 RMD160 f883c5727ed3aff35db20beb4a68a25916f6b926 SHA1 1d60a94435a2463b618165e7ffee9098fef6a342 SHA256 c8abfcd624f380d914dcc2fd7d76d87d2e0577a3f3faed982ce5aed9038062a4
-MD5 ec90717f6de2657cb5209fadb414c3c4 glibc-2.5-r2.ebuild 39191
-RMD160 f883c5727ed3aff35db20beb4a68a25916f6b926 glibc-2.5-r2.ebuild 39191
-SHA256 c8abfcd624f380d914dcc2fd7d76d87d2e0577a3f3faed982ce5aed9038062a4 glibc-2.5-r2.ebuild 39191
+EBUILD glibc-2.5-r2.ebuild 38595 RMD160 00fa68c68793d6afe073f5f54013096d86359ac5 SHA1 a6b7fb7baa1458d37806dc71ffe67376e7635369 SHA256 40bce68b7c9583a316dd43422b8d4a54bb36781e5dc5e47172f0e0f5478bd836
+MD5 4cab998d5d38860852538d57ab88b17e glibc-2.5-r2.ebuild 38595
+RMD160 00fa68c68793d6afe073f5f54013096d86359ac5 glibc-2.5-r2.ebuild 38595
+SHA256 40bce68b7c9583a316dd43422b8d4a54bb36781e5dc5e47172f0e0f5478bd836 glibc-2.5-r2.ebuild 38595
 EBUILD glibc-2.5.ebuild 37920 RMD160 f0ed4f2224d0788057479f08f46481b310a41c86 SHA1 07fea0d2d7b9d4fa25ea6f9729edd9cb3b68cf9d SHA256 95fbb9bfc9a1f964b51138413afc14eda068ce409784b78f19137fa157ca2d20
 MD5 1acffac4370ad139d4778d9f212a2f2e glibc-2.5.ebuild 37920
 RMD160 f0ed4f2224d0788057479f08f46481b310a41c86 glibc-2.5.ebuild 37920
 SHA256 95fbb9bfc9a1f964b51138413afc14eda068ce409784b78f19137fa157ca2d20 glibc-2.5.ebuild 37920
-MISC ChangeLog 100372 RMD160 00b4c8cc11ace1b2aeaa6681e38627aab5ef9cfe SHA1 4018e2b98b0b34abb0da6a5434a0106d4dea2c16 SHA256 dbd8fd4192fcb57b2f9a0403c5d6cae3a683d76c1cbe77035e053c88d03cf340
-MD5 e0c9e665d4f612b51c6648689be1c7dd ChangeLog 100372
-RMD160 00b4c8cc11ace1b2aeaa6681e38627aab5ef9cfe ChangeLog 100372
-SHA256 dbd8fd4192fcb57b2f9a0403c5d6cae3a683d76c1cbe77035e053c88d03cf340 ChangeLog 100372
+MISC ChangeLog 100492 RMD160 1aba08b0986bfa9cae39f80e5f06f08b16d318dc SHA1 5d216a6c3b3fa779109969bd7f97449a6b68c450 SHA256 1ecfab4f19f612db11b87fdaf3091910b699ca981bb606b37767928760955eb3
+MD5 c1d069dacbeb079334cd584380972c0a ChangeLog 100492
+RMD160 1aba08b0986bfa9cae39f80e5f06f08b16d318dc ChangeLog 100492
+SHA256 1ecfab4f19f612db11b87fdaf3091910b699ca981bb606b37767928760955eb3 ChangeLog 100492
 MISC metadata.xml 162 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 SHA1 d6b4923897f6ae673b4f93646f5b4ba61d5a2c3c SHA256 65a915d44de1f01d4b7f72d313b4192c38374a9835d24988c00c1e73dca5805a
 MD5 567094e03359ffc1c95af7356395228d metadata.xml 162
 RMD160 d002486a43522f2116b1d9d59828c484956d66e2 metadata.xml 162
@@ -561,9 +561,9 @@ MD5 0a79bbdbb4367e10ae10ec2cbce36292 files/digest-glibc-2.5-r2 1280
 RMD160 16ea1ea0cf5e12d079b96673d00b4d9a6b75c87e files/digest-glibc-2.5-r2 1280
 SHA256 16e32c55f00e44513a9489d20498b2df7c5dd8925d5cebef89dfdfee2b918797 files/digest-glibc-2.5-r2 1280
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6-ecc01.6 (GNU/Linux)
+Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGOzKIKRy60XGEcJIRArP7AJ9sShP0jssBhOO2mKR9szBwHtrPwQCgln/Y
-TRHWwOK9kRiA0ldmBU92GtQ=
-=QYaO
+iD8DBQFGPABP8bi6rjpTunYRAu0ZAJ9JJiKM3l9XFXpXIktjeMP8RN5NvwCeMpa2
+E97xaRBfKQfYp5gOZwtlJe0=
+=JVlX
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/glibc/glibc-2.5-r2.ebuild b/sys-libs/glibc/glibc-2.5-r2.ebuild
index 60ea0d39dd8a..a6f5303562fd 100644
--- a/sys-libs/glibc/glibc-2.5-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.5-r2.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-libs/glibc/glibc-2.5-r2.ebuild,v 1.5 2007/05/04 13:17:54 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/glibc/glibc-2.5-r2.ebuild,v 1.6 2007/05/05 03:55:33 vapier Exp $
 
 # Here's how the cross-compile logic breaks down ...
 #  CTARGET - machine that will target the binaries
@@ -1043,6 +1043,7 @@ DEPEND=">=sys-devel/gcc-3.4.4
 	>=app-misc/pax-utils-0.1.10
 	virtual/os-headers
 	nls? ( sys-devel/gettext )
+	>=sys-apps/portage-2.1.2
 	selinux? ( !build? ( sys-libs/libselinux ) )"
 RDEPEND="nls? ( sys-devel/gettext )
 	selinux? ( !build? ( sys-libs/libselinux ) )"
@@ -1197,30 +1198,11 @@ src_strip() {
 	# Now, strip everything but the thread libs #46186, as well as the dynamic
 	# linker, else we cannot set breakpoints in shared libraries due to bugs in
 	# gdb.  Also want to grab stuff in tls subdir.  whee.
-#when new portage supports this ...
-#	env \
-#		-uRESTRICT \
-#		CHOST=${CTARGET} \
-#		STRIP_MASK="/*/{,tls/}{ld-,lib{pthread,thread_db}}*" \
-#		prepallstrip
-	pushd "${D}" > /dev/null
-
-	if ! is_crosscompile ; then
-		mkdir -p "${T}"/strip-backup
-		for x in $(find "${D}" -maxdepth 3 \
-		           '(' -name 'ld-*' -o -name 'libpthread*' -o -name 'libthread_db*' ')' \
-		           -a '(' '!' -name '*.a' ')' -type f -printf '%P ')
-		do
-			mkdir -p "${T}/strip-backup/${x%/*}"
-			cp -a -- "${D}/${x}" "${T}/strip-backup/${x}" || die "backing up ${x}"
-		done
-	fi
-	env -uRESTRICT CHOST=${CTARGET} prepallstrip
-	if ! is_crosscompile ; then
-		cp -a -- "${T}"/strip-backup/* "${D}"/ || die "restoring non-stripped libs"
-	fi
-
-	popd > /dev/null
+	env \
+		-uRESTRICT \
+		CHOST=${CTARGET} \
+		STRIP_MASK="/*/{,tls/}{ld-,lib{pthread,thread_db}}*" \
+		prepallstrip
 }
 
 src_install() {