Fix -Wl,--no-as-needed to $(no-as-needed) in -1.2.96_beta-r2.ebuild and remove it entirely from -2.0.95_beta.ebuild wrt #246726.

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

4 files changed, 12 insertions, 18 deletions

diff --git a/app-accessibility/speech-tools/ChangeLog b/app-accessibility/speech-tools/ChangeLog
index 39236f8f242b..26e84f73967a 100644
--- a/app-accessibility/speech-tools/ChangeLog
+++ b/app-accessibility/speech-tools/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-accessibility/speech-tools
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.68 2010/06/30 14:40:52 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/ChangeLog,v 1.69 2010/07/01 12:39:22 ssuominen Exp $
+
+  01 Jul 2010; Samuli Suominen <ssuominen@gentoo.org>
+  speech-tools-1.2.96_beta-r2.ebuild, speech-tools-2.0.95_beta.ebuild:
+  Fix -Wl,--no-as-needed to $(no-as-needed) in -1.2.96_beta-r2.ebuild and
+  remove it entirely from -2.0.95_beta.ebuild wrt #246726.
 
 *speech-tools-2.0.95_beta (30 Jun 2010)
 
diff --git a/app-accessibility/speech-tools/Manifest b/app-accessibility/speech-tools/Manifest
index 7f7eeb030159..bbf6817a04bc 100644
--- a/app-accessibility/speech-tools/Manifest
+++ b/app-accessibility/speech-tools/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX speech-tools-1.2.96_beta-gcc42.patch 2203 RMD160 c2bb3d7cec0c9449b4480a45675057acc4a8ef8c SHA1 3cf29f9dcb9fdfd90249003b7eca9d71a88b8219 SHA256 4bc724774e4223448bb1bbd202fe6055580abd62d11ffab470843e1351c45e9e
 AUX speech-tools-1.2.96_beta-gcc43-include.patch 878 RMD160 fb89c84949548cfdc49ddff50a7129ea63dc9b2d SHA1 afb2ecfacc123411acb7e82ae9b7c707bd32b922 SHA256 dd050d6556b484ecd494dd080c8b917fcc08c264260c4850d5392986f492febe
 AUX speech-tools-1.2.96_beta-gcc44.patch 579 RMD160 389950e6e9e8444acfaa7c647519cf488d38e89c SHA1 3389cad0757b5239be7caba00d412c625e3e49d0 SHA256 720cb246c3845779291038e945e09024370b3478d3e84416886efb9263f490bf
@@ -8,15 +5,8 @@ DIST speech_tools-1.2.96-beta-patches.tar.gz 17282 RMD160 9fbcc8ae819d51380bbf3c
 DIST speech_tools-1.2.96-beta.tar.gz 1275015 RMD160 3d2acc841a8b14e0bff66c9bb08293206f501a7a SHA1 7f208863833a7e7ea4838e0f0f04a4881b32cf56 SHA256 fa1ce5698e1253ee21e67629f394733ef6ad578af671e3a90ea8b73898a12428
 DIST speech_tools-2.0.95-beta-patches.tar.gz 5773 RMD160 2b781434bae545425af4a2e4ff99a159b3251215 SHA1 3cf324b45350be07d49dfafc01d3ec8bf41308e3 SHA256 e7d6780ccf7f1cc4e61f1f70f3fc6d981344b2b2d1c5a1631fe15397f7daac0e
 DIST speech_tools-2.0.95-beta.tar.gz 1681824 RMD160 ccb1f249924885c0b0c831bb0bc0c9f6a7279fbb SHA1 d3f13f0f66f763e80c73eb26f07b86572944ba2a SHA256 61f6786468872aeb2ba0db3ba8c42dd23dfba95467b9fb30cc4f3d92a956b554
-EBUILD speech-tools-1.2.96_beta-r2.ebuild 3065 RMD160 837c5622f9b9a5e34e44f3439040d1cf238a81f3 SHA1 fba5bef6718136fde171194a5af583b0ce9c6402 SHA256 f2d796ed614051e7f789676ee19202ccd49ce10c84e2f6e107e0085fb0cfb171
+EBUILD speech-tools-1.2.96_beta-r2.ebuild 3062 RMD160 4aef36d48a788889b71d76edb13cefcbf478b647 SHA1 82a74fe507a39b2d307d73fa4694e3238261ca30 SHA256 5814021c5378e4193f5a6cf3aad56f4c84c2ec41e9acb9c95bf175b0e005adfc
 EBUILD speech-tools-1.2.96_beta.ebuild 2801 RMD160 4d69f662118f44891e82e5a1d9baae38b3b074aa SHA1 4e366f2228e6892b370d5444913c5fd527e7c567 SHA256 9f87ae7a32433603744490de14c1bba8ae2fd2289d779a9b47e6eccc98caa297
-EBUILD speech-tools-2.0.95_beta.ebuild 3201 RMD160 726be641cbfe09d1af8b0050a46ef6eae36bd944 SHA1 44c0e1d84fac70321d90ddc6b4ad20c8fa3b330b SHA256 eb782858044a7ea27a3ab549b09704e82b0561844c01dfbf66a69ee4c4278f8f
-MISC ChangeLog 10990 RMD160 a4908c968c366452c3a018869e64c38690c8cc68 SHA1 7287e837294f4555819f2a3becb88c69e1143d66 SHA256 1f4281e5a03b920c446eb0e078acab48fd66d849045fe5ade3252cc00f37b41d
+EBUILD speech-tools-2.0.95_beta.ebuild 3166 RMD160 062afb5ae89d6f63b82fbbe5bfdf5c3383e45dac SHA1 33146f928ccfdc4a6c81282ee798a1950b4cd02e SHA256 6ca7a9ffcc404e43a34d4b544d258b379ad2772b28ee80a92770e5b60669c628
+MISC ChangeLog 11249 RMD160 68f60c13d014aad9ee0d93ac252da0f8fc64574f SHA1 aa11f967fcb4dec0037cbaec8a4db32fcf2d84d7 SHA256 bafa7f6c08252a2754b4dc245d1e935807455dfe9376e5f218096c0ec33a54c9
 MISC metadata.xml 249 RMD160 b4704f1b46f70badf05ac1549e9feaf260041a08 SHA1 901e48e020cb6dcb722212410e1ac34212e87cf0 SHA256 7bce1abcec735751c95b28394f348e421b525ead1ba86638fc5f884217cdb49a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkwrSYgACgkQdIssYB9vBoM8vQCeNMvYl5V47ZkRq13tJexT2la6
-moUAn1Oo1BT+Cy0xcNpwGia6dzdT+/2y
-=91vc
------END PGP SIGNATURE-----
diff --git a/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild b/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
index 08db62a45123..7aaef3d445b6 100644
--- a/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild,v 1.2 2010/05/19 16:20:50 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-1.2.96_beta-r2.ebuild,v 1.3 2010/07/01 12:39:22 ssuominen Exp $
 
 EAPI="2"
 
@@ -45,7 +45,7 @@ src_configure() {
 	if [ ! use X ]; then
 		sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak
 	fi
-	append-ldflags -Wl,--no-as-needed
+	append-ldflags $(no-as-needed)
 	econf || die
 }
 
diff --git a/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild b/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
index c5842a3d3888..709056ecd6e9 100644
--- a/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
+++ b/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild,v 1.1 2010/06/30 14:40:52 neurogeek Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-accessibility/speech-tools/speech-tools-2.0.95_beta.ebuild,v 1.2 2010/07/01 12:39:22 ssuominen Exp $
 
 EAPI="2"
 
@@ -45,7 +45,6 @@ src_configure() {
 	if [ ! use X ]; then
 		sed -i -e "s/-lX11 -lXt//" config/modules/esd_audio.mak
 	fi
-	append-ldflags -Wl,--no-as-needed
 	econf || die
 }