Bug #240568: Fix bad stripping output in older ebuilds.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

5 files changed, 21 insertions, 17 deletions

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index 2ed1abdb5cea..666c2793e688 100644
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.301 2010/05/03 21:59:12 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.302 2010/05/03 23:21:52 robbat2 Exp $
+
+  03 May 2010; Robin H. Johnson <robbat2@gentoo.org> db-4.5.20_p2.ebuild,
+  db-4.5.20_p2-r1.ebuild, db-4.6.21_p4.ebuild:
+  Bug #240568: Fix bad stripping output in older ebuilds.
 
 *db-4.8.30 (03 May 2010)
 
diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 0a807f532234..e65043b57dde 100644
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -71,13 +71,13 @@ EBUILD db-4.3.29_p1-r1.ebuild 4926 RMD160 39a85a8d06d197542d15c2fc7e1b8f0746cd64
 EBUILD db-4.3.29_p1.ebuild 3804 RMD160 2b171030d3158631018d3275104ae6f703633ff8 SHA1 270b4136936e7c524cf474926e20aa9c823b6204 SHA256 f8073fb1f2d95be50d035aad0b4858297e668c7d23f1fbacdc1e156345861a2a
 EBUILD db-4.4.20_p4-r1.ebuild 4697 RMD160 8239958186e0b41c5d8368a5a3cec20be1585c20 SHA1 ad639052c97c5e302773e4e3543ac73620e55b6c SHA256 68934f4f491b4753a12f9eab1cb04559e98361c9af16227d379c6a6525ad50f8
 EBUILD db-4.4.20_p4.ebuild 3716 RMD160 552a9494af7a661dbf2a30225f45d1fef16b7819 SHA1 a729eb93008120026f946a6c4929af5998f512f0 SHA256 c65e185e912b08a09e7b61b6c45c728800e35ffa9e769e9cfa021ae324cc0d8b
-EBUILD db-4.5.20_p2-r1.ebuild 5092 RMD160 584ca254f4224d083649332d1a893d1b804ea022 SHA1 a0412757a31bd7090bb3ed400b9795647c8e5564 SHA256 2cf45cf178f6239483c872cae6228771a199783e35172f31c5b4e0cc0f69aa6e
-EBUILD db-4.5.20_p2.ebuild 3971 RMD160 2acedc9f05f22779c34d1b6b7f521b7b14083916 SHA1 9898dd2b87bd38eea915494a0336f5f87e487f85 SHA256 117133ef28477686affa222aeeee95958fa338114dc2e6e8843b8d7eb03fb27b
-EBUILD db-4.6.21_p4.ebuild 4818 RMD160 3f98f8a04f1dc0b4a787a92d458e1d30dd52299f SHA1 9b2623cc59292a5afc552457e397b7e7ee54bb15 SHA256 df3165009982842c8394b876411df74642be3e9eda37308a0dc3d5534a8b634a
+EBUILD db-4.5.20_p2-r1.ebuild 5092 RMD160 99ad7d8a79557e94233f424843801adc74f3bad5 SHA1 3b6ce62889cf7b3ff95263f2a3d7cfbd31a5d551 SHA256 245668fb060f6ad4fd016cf8b1c355f384e6984d866f215203bfe8b1b4980219
+EBUILD db-4.5.20_p2.ebuild 3971 RMD160 e1b40740d6dd5606637f19085180192eb3c1ef34 SHA1 fadb3c00f2b25ad8f95749b72349c49a470afc21 SHA256 aa8e24fcdffcc13de62adc1d7abae6a4a8ff9c85dac1bcb14a5e0e170e53dfa1
+EBUILD db-4.6.21_p4.ebuild 4818 RMD160 0777c54632c7c6ebb967ec2a7b15ae69f11d911a SHA1 2af001ec07a7d24407455d0c7a39a9ebb6731e31 SHA256 73232ce6539cc21b45a22f0b3d24e015325b0a9e231f7b10f7785088dc4d5ff7
 EBUILD db-4.7.25_p3.ebuild 4085 RMD160 d286c79e84bd1002718aaa185d4589d22673e35b SHA1 aa4314ffbd7359b2326b754586c4ad91b8566093 SHA256 4a22799ba6f7362b88eecebaad0ba79a449f4ee3737c5ac9fd92b0b054b40647
 EBUILD db-4.7.25_p4.ebuild 4353 RMD160 ee5995cda8b373e842b92ca365adb7ad03b3b4e6 SHA1 fb05b4c0b7a9223b297f715939837862fa8336e9 SHA256 678b785e6a8f356656dacd7a710b54a380da858c4978d9e413328e6a79800cb6
 EBUILD db-4.8.24.ebuild 4431 RMD160 3ed6aa7cd48f9824bdf8b2cb4f44b5fc48fe887c SHA1 968afb91b4c4eef1fc1ee5745a044d38776d0a2e SHA256 ef5d888687d88dab2aac25234df1c6376343aee7d68b9277254d678f043706e5
 EBUILD db-4.8.26.ebuild 4431 RMD160 b5ada7784ee0ff0ecff7bcbd10a72a64abb6271c SHA1 c884f625ead196b4e1afaf428cf394b8008ef4a4 SHA256 ba81971dc4090bc318cdfa6ec02e5dad68693b038a5fa03827f83e677089e5fd
 EBUILD db-4.8.30.ebuild 4431 RMD160 79ad467c23dd37c895542fd4d1cb1839d1dd16dc SHA1 f6e4a3314c118c72aa1da277e1a8c3382c53dbab SHA256 2265aba0c86de5423f17b2b0db0998d14fdcb65a045e9da968b3ecd9840965d2
-MISC ChangeLog 47155 RMD160 904cf86d5614aa8455c191c65841f435d07e8994 SHA1 5d7ed6d88e8fbf93b2868350807784fb55c981dc SHA256 d2880a483181ed5b7337e2539c301e363c456ff688debb9b064a8f1e0c2192f6
+MISC ChangeLog 47335 RMD160 d4fcc13e5d48c6c1f4478c2793dd08b1e4bc2fb9 SHA1 658d15bf897e64ee91b5d88fd8488ab7a62168b0 SHA256 30f09be87003cf2eba7c3a7ab43cc3d2fc52615c224a3b5d7756cdac4b945501
 MISC metadata.xml 1657 RMD160 f474f2ae4512bb017c5f6d344d5d2d1b03dc6b47 SHA1 f24d5b8ab267859ddc9c1ddb0c10992d31809ec9 SHA256 cb82ec7afe1d3df3b38835aa74a6d467f5b31f98a783df9a01396a546acdf044
diff --git a/sys-libs/db/db-4.5.20_p2-r1.ebuild b/sys-libs/db/db-4.5.20_p2-r1.ebuild
index f8a6568d9b99..2dc8aeb80f91 100644
--- a/sys-libs/db/db-4.5.20_p2-r1.ebuild
+++ b/sys-libs/db/db-4.5.20_p2-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2-r1.ebuild,v 1.14 2009/09/20 19:52:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2-r1.ebuild,v 1.15 2010/05/03 23:21:52 robbat2 Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -138,14 +138,14 @@ src_compile() {
 		--host="${CHOST}" \
 		${myconf}  "${javaconf}" || die "configure failed"
 
-	sed -e "s,\(^STRIP *=\).*,\1\"none\"," Makefile > Makefile.cpy \
+	sed -e "s,\(^STRIP *=\).*,\1\"true\"," Makefile > Makefile.cpy \
 	    && mv Makefile.cpy Makefile
 
 	emake || die "make failed"
 }
 
 src_install() {
-	einstall libdir="${D}/usr/$(get_libdir)" STRIP="none" || die
+	einstall libdir="${D}/usr/$(get_libdir)" STRIP="true" || die
 
 	db_src_install_usrbinslot
 
diff --git a/sys-libs/db/db-4.5.20_p2.ebuild b/sys-libs/db/db-4.5.20_p2.ebuild
index 0b5d522b6716..7af8aae77068 100644
--- a/sys-libs/db/db-4.5.20_p2.ebuild
+++ b/sys-libs/db/db-4.5.20_p2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2.ebuild,v 1.29 2009/09/20 19:52:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2.ebuild,v 1.30 2010/05/03 23:21:52 robbat2 Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -107,14 +107,14 @@ src_compile() {
 		--host="${CHOST}" \
 		${myconf}  "${javaconf}" || die "configure failed"
 
-	sed -e "s,\(^STRIP *=\).*,\1\"none\"," Makefile > Makefile.cpy \
+	sed -e "s,\(^STRIP *=\).*,\1\"true\"," Makefile > Makefile.cpy \
 	    && mv Makefile.cpy Makefile
 
 	emake -j1 || die "make failed"
 }
 
 src_install() {
-	einstall libdir="${D}/usr/$(get_libdir)" STRIP="none" || die
+	einstall libdir="${D}/usr/$(get_libdir)" STRIP="true" || die
 
 	db_src_install_usrbinslot
 
diff --git a/sys-libs/db/db-4.6.21_p4.ebuild b/sys-libs/db/db-4.6.21_p4.ebuild
index c3db7784511e..9b5293cebb4c 100644
--- a/sys-libs/db/db-4.6.21_p4.ebuild
+++ b/sys-libs/db/db-4.6.21_p4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.21_p4.ebuild,v 1.10 2009/09/20 19:52:44 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.6.21_p4.ebuild,v 1.11 2010/05/03 23:21:52 robbat2 Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2 autotools libtool
 
@@ -131,14 +131,14 @@ src_compile() {
 		--host="${CHOST}" \
 		${myconf}  "${javaconf}" || die "configure failed"
 
-	sed -e "s,\(^STRIP *=\).*,\1\"none\"," Makefile > Makefile.cpy \
+	sed -e "s,\(^STRIP *=\).*,\1\"true\"," Makefile > Makefile.cpy \
 	    && mv Makefile.cpy Makefile
 
 	emake || die "make failed"
 }
 
 src_install() {
-	einstall libdir="${D}/usr/$(get_libdir)" STRIP="none" || die
+	einstall libdir="${D}/usr/$(get_libdir)" STRIP="true" || die
 
 	db_src_install_usrbinslot