Prevent valgrind detection (we definately don't want to run valgrind from Portage because it's too unreliable).

Package-Manager: portage-2.2.0_alpha14/cvs/Linux x86_64

4 files changed, 16 insertions, 11 deletions

diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index 5f441d1527ee..2fe3cc599b48 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-libs/gnutls
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.286 2010/12/28 01:16:59 ranger Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.287 2011/01/10 19:32:19 ssuominen Exp $
+
+  10 Jan 2011; Samuli Suominen <ssuominen@gentoo.org> gnutls-2.10.4.ebuild,
+  gnutls-2.11.6.ebuild:
+  Prevent valgrind detection (we definately don't want to run valgrind from
+  Portage because it's too unreliable).
 
   27 Dec 2010; Brent Baude <ranger@gentoo.org> gnutls-2.10.2.ebuild:
   stable ppc64, bug 343755
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index 25ed45e095bc..276bde4b925a 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -10,11 +10,11 @@ EBUILD gnutls-2.10.1.ebuild 2508 RMD160 6cbaeebb8db55138199fae4462e372ffa5d3dc3a
 EBUILD gnutls-2.10.2-r1.ebuild 2860 RMD160 8a4ca5c7a841c13f163423b1d74b6c63009d77ae SHA1 bf435a9d1ea00143550833a59fe7bea6f13434dd SHA256 e6470b5e43d332c221e31109c2a8f561ca9b918d7ba29075612b031fdd18f7e0
 EBUILD gnutls-2.10.2.ebuild 2463 RMD160 6e153cad5b4cb11921680bbf0f220bf3e86a6004 SHA1 19118467f98d3043594d8cecf1c441ba64e6ccef SHA256 4f63937fa7a5f9bf8719e3f5df6ce410a35e00bc557e361121b023cde25ff46a
 EBUILD gnutls-2.10.3.ebuild 2658 RMD160 c58171d941dec9811a5b146ec7b3d0aa6d5af5b4 SHA1 40f782b1ad17f552d076acff45906bc3ac467c8d SHA256 d1e9cdfb702e5de3f6c8ffd7f248c33f7eba883fb9cc2236178e25f212884d8f
-EBUILD gnutls-2.10.4.ebuild 2658 RMD160 68ccbafe584943d1cd3333be6ba1fb8ff87f8df6 SHA1 73a28cdf68d577500a44cb398e55cf2dfbd7cd81 SHA256 9aad74aab91feacae379279ddda4ad9c78cbf927df3a20485fa907274008743a
+EBUILD gnutls-2.10.4.ebuild 2615 RMD160 48f3107c62d6d8bdd77da60328496a0ba9ba3235 SHA1 e3efc68c6e176daeeac69455639c2990ff21a030 SHA256 688620593a1c834c2fa9635d9566368d2522a0cea12d50dd42c3dad821fbd675
 EBUILD gnutls-2.11.4-r1.ebuild 2991 RMD160 b5417234cbfd673b197247855be8563c0f39a9af SHA1 8dfb70fbcdca80862a111c41fdd98f729396929c SHA256 940b80f084a33741d00fdb7acbadfe131d0bd48695045704c8ee61b40ed09a05
 EBUILD gnutls-2.11.4.ebuild 2644 RMD160 8093e9b24c21e57a1e24ceb11e353e26983a3014 SHA1 ba63cd2383511953f597e4134b5be5d636fe73cf SHA256 c3a9287d481fce012f95d66367d3f4a18484bdd95923edb3dd2867f067776304
 EBUILD gnutls-2.11.5.ebuild 3009 RMD160 198879f91412e6be04e6666ed242cc6f45dc1dbc SHA1 6a48dfcea4f834b5175e47efe33ee3d7062ea244 SHA256 01939346e342afb8a3d86838062024bf7762da391c14f39c662d65c01e912e0e
-EBUILD gnutls-2.11.6.ebuild 2932 RMD160 b3d8ab30afb58ca48ad4e88387dcebe4afc316f4 SHA1 9805aec499c941a4ada028819016a0ce234f66eb SHA256 66db18915aa0f4c2ca5d4c12b40ab327ecbabc637601b603475f09d4db2ff9b0
+EBUILD gnutls-2.11.6.ebuild 2889 RMD160 0bfb5800d1058154672259b66f8bc2cff39d8628 SHA1 59d254b54f411c7a7105164e6190854e2ebcbefa SHA256 dc2cd3dff87b53fe3977aac25fcf0508dc1e9989412e80130cc170a67ce0fe1c
 EBUILD gnutls-2.8.6.ebuild 2502 RMD160 d9ead3a80eab35c1f8db333ef82642fce6d4c842 SHA1 91e9de156089c1d10410c2ec8546f1d36b9569f5 SHA256 4a849cc8ee7358b34e2ca592cb596ad0ddc590cf5032bc6485464f9b7aa1d630
-MISC ChangeLog 42737 RMD160 1da6f0909e32bd76b57e645f03f1314c183694ed SHA1 2cc6d7a8e3876fdcee7e18626a5e8897604456c8 SHA256 eb1ee6a94a2367c1cb3d397a7fd5d759b010ce154725985f4f6f7310ecc58c46
+MISC ChangeLog 42957 RMD160 c983ef8ac4bf69c54ae6f2be4abfff8abfc75189 SHA1 a9a70d609a17670228a7306b9a9df406448d7687 SHA256 28167a61270f1bc7a60d8d899f61f45c8f6393cef76149e1c215787b3fb66ea2
 MISC metadata.xml 350 RMD160 5a195410cfec360554b39b5ed5af5ca9d983eb82 SHA1 6e5596d896b21ced6dfb8925be135dfaae2f98c6 SHA256 a8b8266694bd56790b5b568feabec29b705a9fc78a9fd260761ab14f0303f406
diff --git a/net-libs/gnutls/gnutls-2.10.4.ebuild b/net-libs/gnutls/gnutls-2.10.4.ebuild
index cf6a0cba1e28..dff9d952ab7e 100644
--- a/net-libs/gnutls/gnutls-2.10.4.ebuild
+++ b/net-libs/gnutls/gnutls-2.10.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.10.4.ebuild,v 1.1 2010/12/27 17:48:15 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.10.4.ebuild,v 1.2 2011/01/10 19:32:19 ssuominen Exp $
 
 EAPI="3"
 
@@ -70,7 +70,6 @@ src_prepare() {
 src_configure() {
 	local myconf
 	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-	[[ "${VALGRIND_TESTS}" == "0" ]] && myconf+=" --disable-valgrind-tests"
 
 	econf --htmldir=/usr/share/doc/${P}/html \
 		$(use_enable cxx) \
@@ -78,6 +77,7 @@ src_configure() {
 		$(use_enable guile) \
 		$(use_enable nls) \
 		$(use_with zlib) \
+		--disable-valgrind-tests \
 		${myconf}
 }
 
diff --git a/net-libs/gnutls/gnutls-2.11.6.ebuild b/net-libs/gnutls/gnutls-2.11.6.ebuild
index 1285e762b331..fdbf6921dbdf 100644
--- a/net-libs/gnutls/gnutls-2.11.6.ebuild
+++ b/net-libs/gnutls/gnutls-2.11.6.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.11.6.ebuild,v 1.1 2010/12/27 17:51:01 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-2.11.6.ebuild,v 1.2 2011/01/10 19:32:19 ssuominen Exp $
 
 EAPI="3"
 
@@ -75,7 +75,6 @@ src_prepare() {
 src_configure() {
 	local myconf
 	use bindist && myconf="--without-lzo" || myconf="$(use_with lzo)"
-	[[ "${VALGRIND_TESTS}" == "0" ]] && myconf+=" --disable-valgrind-tests"
 
 	econf --htmldir=/usr/share/doc/${P}/html \
 		$(use_enable cxx) \
@@ -84,6 +83,7 @@ src_configure() {
 		$(use_with !nettle libgcrypt) \
 		$(use_enable nls) \
 		$(use_with zlib) \
+		--disable-valgrind-tests \
 		${myconf}
 }