Fix the not stripping of utilities

Package-Manager: portage-2.1.2.2

diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog
index b1b4bb57b6010a8609ba01cab6175082009883b8..601e0495a3bb9f30a5e51493e708018cfeb5ad05 100644 (file)
--- a/sys-libs/db/ChangeLog
+++ b/sys-libs/db/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/db
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.200 2007/03/02 17:33:26 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.201 2007/03/25 20:58:24 pauldv Exp $
+
+  25 Mar 2007; Paul de Vrieze <pauldv@gentoo.org> db-4.5.20_p2.ebuild:
+  Have a different fix for not stripping as the old fix no longer works for this
+  db version.
 
   02 Mar 2007; Caleb Tennis <caleb@gentoo.org> -files/db-4.1.25-java.patch,
   -files/db-4.1.25-uclibc.patch, -files/db-4.1.25_p1-jarlocation.patch,

diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest
index 66f086d8feccce1e860dd32907f6306c9b3e0043..98239162e73ed74f89e73ae8048a42e45111f426 100644 (file)
--- a/sys-libs/db/Manifest
+++ b/sys-libs/db/Manifest
@@ -141,14 +141,14 @@ EBUILD db-4.4.20_p4.ebuild 3674 RMD160 504f9b60bfb80673b9a8602b0087c2fe1cb6fd61
 MD5 08870c5ea80136222cd8066297479813 db-4.4.20_p4.ebuild 3674
 RMD160 504f9b60bfb80673b9a8602b0087c2fe1cb6fd61 db-4.4.20_p4.ebuild 3674
 SHA256 9e95db6fc040ab8e5aec3610e00a8bcb1b756c94707508251e937db18219b9d2 db-4.4.20_p4.ebuild 3674
-EBUILD db-4.5.20_p2.ebuild 3674 RMD160 4af5c68c23c2e6c1f050328fd955c7898f800acb SHA1 fec8e063d7b0c84039c870f9fa8fc9ec5c02e097 SHA256 39063bea3aac0a9a169e90a9510dc7b38e160edbf80f2a9cbee680e4cf6f3ce7
-MD5 b3b7ceba0a74409aa926f4510b9b28fc db-4.5.20_p2.ebuild 3674
-RMD160 4af5c68c23c2e6c1f050328fd955c7898f800acb db-4.5.20_p2.ebuild 3674
-SHA256 39063bea3aac0a9a169e90a9510dc7b38e160edbf80f2a9cbee680e4cf6f3ce7 db-4.5.20_p2.ebuild 3674
-MISC ChangeLog 31443 RMD160 26ab893e75980ee2b00ede8e71394e33554eabcb SHA1 18b1be5606638fb2103fd04ce456f4c2bc9482b4 SHA256 fb41ebb97e52213d1ac5ed132dd5b89f62c0e5e8147b6cf2b2ec0c84e5cbdd6c
-MD5 3b17eb0afca59938e24d821fa6b10c30 ChangeLog 31443
-RMD160 26ab893e75980ee2b00ede8e71394e33554eabcb ChangeLog 31443
-SHA256 fb41ebb97e52213d1ac5ed132dd5b89f62c0e5e8147b6cf2b2ec0c84e5cbdd6c ChangeLog 31443
+EBUILD db-4.5.20_p2.ebuild 3765 RMD160 bde72e235d74ecd8b60ced4fc4dc2e6c66800d82 SHA1 1bddb8067501b65b62cada2ed4c400339fc9b664 SHA256 7818775b416638a09d1222301ea24974384264c1dad9dbe298fb70a20e2b1643
+MD5 e525558adacd62f527d00e6d8c8a2350 db-4.5.20_p2.ebuild 3765
+RMD160 bde72e235d74ecd8b60ced4fc4dc2e6c66800d82 db-4.5.20_p2.ebuild 3765
+SHA256 7818775b416638a09d1222301ea24974384264c1dad9dbe298fb70a20e2b1643 db-4.5.20_p2.ebuild 3765
+MISC ChangeLog 31611 RMD160 bbf48a97c01c7a1fdd631e1e2fa4f4bb235df68c SHA1 f67bbfb39d79ce7f33aab5d121526419d34603b2 SHA256 1f74b9e7cf782637edf3a4b5ba67b65b797bf259aa4f7959407a554b18523e54
+MD5 824b3070f62e6e6f2d4f966a1df47026 ChangeLog 31611
+RMD160 bbf48a97c01c7a1fdd631e1e2fa4f4bb235df68c ChangeLog 31611
+SHA256 1f74b9e7cf782637edf3a4b5ba67b65b797bf259aa4f7959407a554b18523e54 ChangeLog 31611
 MISC metadata.xml 1651 RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 SHA1 e70ae3f07e5559a43dd85fad3270b7f7f185b996 SHA256 895bfb43a1bd60170937b4523f396d5772a3914384a95105345ac1f24c606550
 MD5 71519f9e67010bd7b9d8aff6b19b8c15 metadata.xml 1651
 RMD160 cbdc138b8fd0fab28ec59db03fca18f2e0e74818 metadata.xml 1651

diff --git a/sys-libs/db/db-4.5.20_p2.ebuild b/sys-libs/db/db-4.5.20_p2.ebuild
index 6637ddac49da872fd909665cd74425f8ba77d195..0e004b24f04d931dccf2b9eb83317c09fb4e5ad2 100644 (file)
--- 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-2007 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.4 2007/02/28 13:22:15 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-4.5.20_p2.ebuild,v 1.5 2007/03/25 20:58:24 pauldv Exp $
 
 inherit eutils db flag-o-matic java-pkg-opt-2
 
@@ -103,11 +103,14 @@ src_compile() {
                --host="${CHOST}" \
                ${myconf}  "${javaconf}" || die "configure failed"
 
+       sed -e "s,\(^STRIP *=\).*,\1\"none\"," Makefile > Makefile.cpy \
+           && mv Makefile.cpy Makefile
+
        emake -j1 || die "make failed"
 }
 
 src_install() {
-       einstall libdir="${D}/usr/$(get_libdir)" strip="${D}/bin/strip" || die
+       einstall libdir="${D}/usr/$(get_libdir)" STRIP="none" || die
 
        db_src_install_usrbinslot