Don't prestrip the multicall binary. Closes bug #262944.

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

4 files changed, 25 insertions, 9 deletions

diff --git a/net-wireless/wireless-tools/ChangeLog b/net-wireless/wireless-tools/ChangeLog
index b67f66de02b8..1c7cf7274fda 100644
--- a/net-wireless/wireless-tools/ChangeLog
+++ b/net-wireless/wireless-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-wireless/wireless-tools
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/ChangeLog,v 1.135 2008/09/01 18:49:14 armin76 Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/ChangeLog,v 1.136 2009/09/11 13:13:59 flameeyes Exp $
+
+  11 Sep 2009; Diego E. Pettenò <flameeyes@gentoo.org>
+  wireless-tools-29.ebuild, wireless-tools-30_pre7.ebuild:
+  Don't prestrip the multicall binary. Closes bug #262944.
 
 *wireless-tools-30_pre7 (01 Sep 2008)
 
diff --git a/net-wireless/wireless-tools/Manifest b/net-wireless/wireless-tools/Manifest
index f053e2aa559c..e3b1686b9c9b 100644
--- a/net-wireless/wireless-tools/Manifest
+++ b/net-wireless/wireless-tools/Manifest
@@ -1,9 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wireless-tools-29-asneeded.patch 478 RMD160 811ba1cd7d2279b84b8786a08cf33dea6fa4d6a3 SHA1 67a7363eef98edee18ba2c3246abfbdbdaf1d863 SHA256 41ab166672833cc030a292160b4e0d13b86fe12b6dbe79f7e8537ae76d402c56
 DIST wireless_tools.29.tar.gz 294417 RMD160 89d690fc2d0dc23d7b296ef312effed65bc13470 SHA1 22040ac1497f4c5f8ddeca365591b01ae3475710 SHA256 6fb80935fe208538131ce2c4178221bab1078a1656306bce8909c19887e2e5a1
 DIST wireless_tools.30.pre6.tar.gz 327067 RMD160 18fb40127cc259d0d4d4543b68dfd104b9c2f9a5 SHA1 709a0dc3e5b02372fca734be051ec0a615c28504 SHA256 fc7b07883f37b4cb4f7ba8a06073e27d7ea770ceac04be4247cac9e2895dbb89
 DIST wireless_tools.30.pre7.tar.gz 327231 RMD160 93f0c98d15a3b8b0fd189b9bb6f339d66c80f60e SHA1 627337a26da5d3a31465c848e1158f3196d665c3 SHA256 f21da687f1f95417309899cdb4f44fcd9eb3814f3123ec8100905138e183f4ce
-EBUILD wireless-tools-29.ebuild 2078 RMD160 989bcce545f07bfbd8c7bb760ef2b512a675c5f2 SHA1 13ee216c3ee7e60ec50a2775130ad129245c9ec8 SHA256 5ff25dea6b0f515d55948d458ea035933def03b6b3b2c50d86ab69d45523e57c
+EBUILD wireless-tools-29.ebuild 2108 RMD160 ed0afa2512a37aaa6cb6420ff62231dd5b1c0c68 SHA1 722f5878e8ff2b0cc6f4ad688ff54e436155f5f9 SHA256 b620b797854a139f718b06572c8d43efc1c2621859ae1c0603a3e593f89872d2
 EBUILD wireless-tools-30_pre6.ebuild 2063 RMD160 502379efb8ffef162b8db10a4ea56b44ac2b6af3 SHA1 c4f77a1d1417db21297ffca31737533251a9d31f SHA256 a2cfc654e6abdb430a97519cca75245ff21a3a34f307e91ddd5f0f159d60eb0b
-EBUILD wireless-tools-30_pre7.ebuild 2063 RMD160 c42a0a7dbc2d18c8f144139dab205375cae24cb2 SHA1 f72b9b40eca6ef4debc2a9a7708fbd20c74c12e8 SHA256 fce2565973499b817f0713f5fb4d5b7039b359e4767578c3f50fb5736ea4f7b9
-MISC ChangeLog 21592 RMD160 210e4d22c733067008a76534fb6595209da74c7e SHA1 60669a89228b924f77b4ba8baf21d66035df73ac SHA256 ff9b6b98c1c83d250d3c91c38b2ec958d936bbb3ab9455817fea295dfe15d1ab
+EBUILD wireless-tools-30_pre7.ebuild 2093 RMD160 9a14692264abf3ac868db2da2d00d89d64d7d394 SHA1 a364b00d37d3879129f7296201593835ed07e367 SHA256 89028fe5551c29ac9b5acb35756053ed3e84e548956ac5e795dbe715c394f499
+MISC ChangeLog 21769 RMD160 2fe69dbffce2c4d1a3ef783d79657f5f3aa4506a SHA1 6577a452c7a016bb30e8cb6f0f01b6840e9e242d SHA256 7e42339eab090c49679d601360a4b210c2520fa8b0bb13c0b4e43438dc52085e
 MISC metadata.xml 511 RMD160 22e85f7e056bea5375cd444cec7f380df6eb9492 SHA1 e31cdcd0a3025cf4d043c3ebc3858ba9fecf1a0b SHA256 972462d300cc0121913daff0a7b50066305307b6e6765bcd3ada3d5d90f1ba5d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqqTR0ACgkQAiZjviIA2XhQ7ACgx5qu+K7CbpRCF6pIxEprkofc
+jhIAnjr+5sGS9Q5Q53RgqmqEGk74giWQ
+=3xjZ
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/wireless-tools/wireless-tools-29.ebuild b/net-wireless/wireless-tools/wireless-tools-29.ebuild
index 69f5612aab6c..64d62f51768c 100644
--- a/net-wireless/wireless-tools/wireless-tools-29.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-29.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/wireless-tools-29.ebuild,v 1.10 2008/08/11 17:29:17 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/wireless-tools-29.ebuild,v 1.11 2009/09/11 13:13:59 flameeyes Exp $
 
 inherit toolchain-funcs multilib eutils
 
@@ -33,6 +33,7 @@ src_unpack() {
 		-e "s:\(@\$(LDCONFIG).*\):#\1:" \
 		-e "s:^\(INSTALL_MAN= \$(PREFIX)\)/man/:\1/share/man:" \
 		-e "s:^\(INSTALL_LIB= \$(PREFIX)\)/lib/:\1/$(get_libdir)/:" \
+		-e '/\$(CC)/s:-Wl,-s::' \
 		"${S}"/Makefile || die
 }
 
diff --git a/net-wireless/wireless-tools/wireless-tools-30_pre7.ebuild b/net-wireless/wireless-tools/wireless-tools-30_pre7.ebuild
index ef813c0d6782..17c5b1a4a7b0 100644
--- a/net-wireless/wireless-tools/wireless-tools-30_pre7.ebuild
+++ b/net-wireless/wireless-tools/wireless-tools-30_pre7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/wireless-tools-30_pre7.ebuild,v 1.1 2008/09/01 18:49:14 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wireless-tools/wireless-tools-30_pre7.ebuild,v 1.2 2009/09/11 13:13:59 flameeyes Exp $
 
 inherit toolchain-funcs multilib
 
@@ -32,6 +32,7 @@ src_unpack() {
 		-e "s:^\(INSTALL_MAN= \$(PREFIX)\)/man:\1/share/man:" \
 		-e "s:^\(INSTALL_LIB= \$(PREFIX)\)/lib:\1/$(get_libdir)/:" \
 		-e "s:^\(BUILD_STATIC = y\):#\1:" \
+		-e '/\$(CC)/s:-Wl,-s::' \
 		"${S}"/Makefile || die
 }