Don't build tests if we are not going to run them (#512022 by kulti)

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 16 insertions, 10 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index b4fa458db5fb..3873069416ec 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.608 2014/04/27 16:17:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.609 2014/06/01 15:15:59 pacho Exp $
+
+  01 Jun 2014; Pacho Ramos <pacho@gentoo.org> glib-2.40.0.ebuild:
+  Don't build tests if we are not going to run them (#512022 by kulti)
 
 *glib-2.40.0 (27 Apr 2014)
 
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index c9ad86464c03..ff899110fd6a 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -20,13 +20,13 @@ DIST glib-2.40.0.tar.xz 7016228 SHA256 0d27f195966ecb1995dcce0754129fd66ebe820c7
 DIST pkg-config-0.28.tar.gz 1931203 SHA256 6b6eb31c6ec4421174578652c7e141fdaae2dabad1021f420d8713206ac1f845 SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320 WHIRLPOOL db4ddb4ce61724e629931c5ffccb4d7a551b4dc0f4efed5a966822307e4b5a786adee5705dd80ec0a9aa32cb1af9ad9615e307360e131fc34688207216161486
 EBUILD glib-1.2.10-r5.ebuild 1802 SHA256 b8561be2cdbe967604c39b6316bee46016e62131e9858d26fb26d8f1699c2029 SHA512 d2c84ba968f81bc851f53fbf1bad01f62de58f16dc49565e341bf7e9396b5f8870501de2027d5b49c5dcd2a8416dca6f530a34491c63ccb26ab94aeafea442ba WHIRLPOOL 1fd9b784429c287fa5dbb4e20db42dd9e1f67cc03ac60c7d47fb751878ed827f2791a2bd6622d84773a4a4607c190a671cef6a6d9b7a61943bf12b7b0e1d6b45
 EBUILD glib-2.38.2-r1.ebuild 9861 SHA256 af45a7fe07818085a00ea1928fa63928f12607443953d73cc9402c84f357d99d SHA512 afaacec3dca8ca254cf16dce0ffcb5c5f94f2dce129ae3b2199eea3ddb646a04b2e19bf1ecdb83f2ea34350f767eb07b192c816ed630840223818ddc98a8ba63 WHIRLPOOL 8c51f2e66a8f6070656f3c70e06b92e321b9f1af9900831c8a96eea9eadee5cb4141b7360f439e72408cb7b725fc41813fe6e4436951271d89d4f43b6fe610fd
-EBUILD glib-2.40.0.ebuild 9726 SHA256 be7da7ed2fa86fd4ae41eb36d1d51aee49aa8a6b170f20b22f63a00a6feff0a5 SHA512 74a74c64987acb8ab8bac77203a0ff11a05f25b8147cde131db000cb96bcd9993843b1eab25c3a52140836fae87cf58be4aaf9cb6cc57162cb0ff1ac35ffc5c4 WHIRLPOOL d68a09c3f8c61de401da3ec2974298fdc03376ae8783c7b143a4aa136a2980acc52ae44e01d5d7c7de63994233c55922f2a391631f505646fb0179aabe860bb9
-MISC ChangeLog 85624 SHA256 4d2b7b0846cadde1eb38da8e417ac32345ceb36ff8782d2d0cdf4fb323d56746 SHA512 760ab70061c7bec1377f2c110f194cd2f93a8bab8dbe14528bc6e9ffbd432138d22b4f6a8bedf28f6e363b6bc99dfe2a64ae623b5f4db0166170eee15811cc2c WHIRLPOOL 9eeb8cad42beac17f23a3f544d294303b90f1195da8c30931e22496e13465fc6ae710656b54397721e4cb55ac1c333632427587ce63dbcd198f5a9ff6caa2083
+EBUILD glib-2.40.0.ebuild 9854 SHA256 1fa5f2cd2fcf80339a31aeead23af5ce9b2390df37591f81583c5209536ffabb SHA512 d242b5ab5bd57c28c5e8845a415ce57a2d9f69757710b47083faf1b6c6263112e29460b2c62f50bdb56bf56189d5fd293226c62e4ccb0edfc10bcbaaae23990b WHIRLPOOL 8bd39d31c0439222a48bbac3ec520b122713838571ba26fd77c779e8f83d81ab3f56f94d14f640d1fc02aa133adae01b99b4b53c31721c6701d1eada242d1a00
+MISC ChangeLog 85764 SHA256 2f81ddc667b5b0d8d9522748f39c4e70e737488b6bb1ae74743f9603a4eb9b23 SHA512 cb4652560ba2bfd99e4323f1e83555037e480d40351e520aeb28d9417d7c8e6d2da25aa9648bc99762a1b59875e80a9e9d424aa45b2ffa08eca19baa4d3fc978 WHIRLPOOL 36766ba3a8f51b622276350b11cfc3d211b5bdee9c2f33dfe0312acefd47de4505965363dda841e63f5ee93d67b02b0155c47417b3a85ca8a8cf69d19c638a73
 MISC metadata.xml 479 SHA256 1a41cb4f56511674a423efd444f7c6999b5d316f9058d2eb67a032a522738ffb SHA512 f30f9e937d43dd4fb148dc7ab1554b5c58ddf4211bc06cfc65e92ff9843a84f0b05fa130fcd130744ad6e3579fb5b82a7f31950dd8ccc317f58388023cb6fe50 WHIRLPOOL 92888cd8e3a839860cb20c60ad1ee2871ea9efdf54d5751d6b5f677faf10e721333c3d68b1b5c4af212854f9ecd9e31970832eaa05f30276987bcadacaf5f637
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlNdLYcACgkQ1fmVwcYIWAZ4YgCfVWTsJ+9vaxCxw7oKA5YcLMR2
-eFYAn23fX2tVTkYrVtji+FoAiErY3mxg
-=n7x2
+iEYEAREIAAYFAlOLQ7EACgkQCaWpQKGI+9QXxgCfc9x1haLNiQMv01EOb4/ADPpH
+JJ4An3MsOKFqK0Zc4QvYg4fAeEkVS80w
+=clra
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.40.0.ebuild b/dev-libs/glib/glib-2.40.0.ebuild
index 7bab1165e34e..99a694fb43b3 100644
--- a/dev-libs/glib/glib-2.40.0.ebuild
+++ b/dev-libs/glib/glib-2.40.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0.ebuild,v 1.1 2014/04/27 16:17:10 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.40.0.ebuild,v 1.2 2014/06/01 15:15:59 pacho Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python2_{6,7} )
@@ -128,10 +128,13 @@ src_prepare() {
 
 		# Test relies on /usr/bin/true, but we have /bin/true, upstream bug #698655
 		sed -i -e "s:/usr/bin/true:/bin/true:" gio/tests/desktop-app-info.c || die
-	fi
 
-	# thread test fails, upstream bug #679306
-	epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+		# thread test fails, upstream bug #679306
+		epatch "${FILESDIR}/${PN}-2.34.0-testsuite-skip-thread4.patch"
+	else
+		# Don't build tests, also prevents extra deps, bug #512022
+		sed -i -e 's/ tests//' {.,gio,glib}/Makefile.am || die
+	fi
 
 	# gdbus-codegen is a separate package
 	epatch "${FILESDIR}/${PN}-2.40.0-external-gdbus-codegen.patch"