Respect Gentoo's C compiler choice and don't force specific optimizations, thanks...

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

diff --git a/net-p2p/gtk-gnutella/ChangeLog b/net-p2p/gtk-gnutella/ChangeLog
index 7ca54f95211113023c610cbafe79f997c465c6a9..fb00e27075ae1bbf51e58a3d8273fd219748cffb 100644 (file)
--- a/net-p2p/gtk-gnutella/ChangeLog
+++ b/net-p2p/gtk-gnutella/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-p2p/gtk-gnutella
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.115 2011/09/11 19:21:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/ChangeLog,v 1.116 2011/09/12 18:20:51 graaff Exp $
+
+  12 Sep 2011; Hans de Graaff <graaff@gentoo.org> gtk-gnutella-0.97.1.ebuild:
+  Respect Gentoo's C compiler choice and don't force specific optimizations,
+  thanks to Agostino Sarubbo in bug 382595.
 
 *gtk-gnutella-0.97.1 (11 Sep 2011)
 

diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index 33cbe1e3bc098805aace11b9caff15e442ab4640..2ece16c25a82f408c0125a682e3c05b3b65a4350 100644 (file)
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -8,14 +8,14 @@ DIST gtk-gnutella-0.97.1.tar.bz2 17084243 RMD160 b99178745da99e238889665d653a5c2
 DIST gtk-gnutella-0.97.tar.bz2 16876186 RMD160 aef2c1f8c7526e7867d0ba0513c01d587ff53180 SHA1 1b50790adc494d7023a7cf9319d7cdef1c9ab51e SHA256 0ba64ac94116c6ab1fdcd8e544ff647f1ace35c0b2a130c298129e50ee6f4f50
 EBUILD gtk-gnutella-0.96.8.ebuild 1462 RMD160 ee278d9f778c553a79c8d25847c38fb784e8c25c SHA1 ac551af7308030ac24ee0a2ee18065c4c590e2dc SHA256 536e73bbda6249685e38e72f02d713e879180aeab7b2a1e1fd73adc50657a287
 EBUILD gtk-gnutella-0.96.9.ebuild 1312 RMD160 f264ff36534f2ef342c13b653fe616e428c1c3b0 SHA1 697f044eedc660ccd6dca8e2d89442c9839a6e96 SHA256 6999f9e699f3a2ecb1ef3613513855c18f790f7873b76a1af4d90fa250229d2f
-EBUILD gtk-gnutella-0.97.1.ebuild 1506 RMD160 f71c728dc2b2012239a94e699f348e959652dea0 SHA1 bdf148f2876279237796acb01c263865aac10b29 SHA256 3e1c8ceae8324feaabeb64609c9f6a6947e3f5c3f46015ee504c862e525c9896
+EBUILD gtk-gnutella-0.97.1.ebuild 1677 RMD160 b4f8a803dcc384be09c73465afdf81fa3208b062 SHA1 077ac57e1c32816ec99b4511470b4bc53e49f0f9 SHA256 b57c287dc1a5034ab648f6efbda22ed24e26a1245de31e76b3734637e09d31e5
 EBUILD gtk-gnutella-0.97.ebuild 1504 RMD160 e416601c39a3915aeeb2bc1e3107f69dd34af50a SHA1 5a753e714d07baefd67b216e7da4f1009e0e24cb SHA256 f68fb04614a5d76f10e9b6f1b158a49cf8141b172e74f0a46699c3808eb200b3
-MISC ChangeLog 17606 RMD160 c3687b0a4693565be9da77c63654a8c2efa19ceb SHA1 39f67a5af009981fc1683e455d26b03dad3a5ed2 SHA256 68449cf52f6d2882075db4cc71433a67d63a8ef2778d8a7a17c726f6951ecabd
+MISC ChangeLog 17806 RMD160 3be4a601d63bd4800962d7d0aebf7a82ff526876 SHA1 d315ac447c1da22257000b88372c660ba0182767 SHA256 da5b390fdab26cefa3e09e245c349bf19637ce83e0f31114ecdfc3683c294fda
 MISC metadata.xml 220 RMD160 58b415d40e04dbba4c72b3083c4af9915cd1989e SHA1 5d89a2094e18668dcb971a0dc43fccbbd67f22cb SHA256 d58e366dd43b562958c2857ad163829d8bc5061a7b855715ba07fa0edb1cd201
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk5tCkAACgkQiIP6VqMIqNfXjAD8CXC+GEyh2BjbMjAyM7rd4x2J
-9BDxmG1qAL0fx6HjWXQA/0HalJYWx2ejppMsHjEnyOlUGv/pBQGL+cF0J/NI+znI
-=OdxL
+iF4EAREIAAYFAk5uTZEACgkQiIP6VqMIqNcXngD+PtELVACdnzQr1konKEneHmbO
+C/t9vf9NbFLUsroYmN8A/jakTLtR2wlm/rzjKEGfBiQqlqylulXZ0eBN3MsEvvqB
+=1RH0
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-0.97.1.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-0.97.1.ebuild
index ba1c0dd41421f941a390a3182a1419ed55768958..d96f3549a841bd85f777f86296c615f252e23003 100644 (file)
--- a/net-p2p/gtk-gnutella/gtk-gnutella-0.97.1.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-0.97.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.97.1.ebuild,v 1.1 2011/09/11 19:21:26 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/gtk-gnutella/gtk-gnutella-0.97.1.ebuild,v 1.2 2011/09/12 18:20:51 graaff Exp $
 
 EAPI="2"
 
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}
        dev-util/pkgconfig"
 
 src_configure() {
+       # There is no option to turn off optimization through the build.sh
+       # script.
+       sed -i -e "s/optimize=''/optimize=' '/" Configure || die
+
        # The build script does not support the equivalent --enable
        # options so we must construct the configuration by hand.
 
@@ -48,7 +52,11 @@ src_configure() {
                myconf="${myconf} --topless"
        fi
 
-       ./build.sh --configure-only --prefix="/usr" ${myconf}
+       ./build.sh \
+               --configure-only \
+               --prefix="/usr" \
+               --cc=$(tc-getCC) \
+               ${myconf}
 }
 
 src_install() {