Fix warning about skipped tests being shown even when tests are disabled by the user (bug #373963 by William Throwe).

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

3 files changed, 35 insertions, 41 deletions

diff --git a/dev-libs/glib/ChangeLog b/dev-libs/glib/ChangeLog
index 830f6ad94662..d4b9873c87bc 100644
--- a/dev-libs/glib/ChangeLog
+++ b/dev-libs/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/glib
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.473 2011/07/01 21:07:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/ChangeLog,v 1.474 2011/07/04 10:51:44 pacho Exp $
+
+  04 Jul 2011; Pacho Ramos <pacho@gentoo.org> glib-2.28.8.ebuild:
+  Fix warning about skipped tests being shown even when tests are disabled by
+  the user (bug #373963 by William Throwe).
 
   01 Jul 2011; Markos Chandras <hwoarang@gentoo.org> glib-2.28.8.ebuild:
   Stable on amd64 wrt bug #278255
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 735df0105c9d..de5c88c0d1bd 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX glib-1.2.10-automake.patch 827 RMD160 3b1485f89a157b60f31f5ae8ffe2333ab842d217 SHA1 cd40e4dc579190a89e09fad9ac7b209f24b231b3 SHA256 db6d22caf4054c09467b50b6d85566eec7479a29169460950e423c083332ef67
 AUX glib-1.2.10-configure-LANG.patch 1464 RMD160 91481ba6b3f7a1d6e22a4ab7003fcee17450f3c1 SHA1 d98cc2f4ac6cc4aae55270ad0e5705af4de9b3ad SHA256 32377819896297caf9628f382c7bba09ee0a049bd977e9ea927314c0c2e669b4
@@ -20,23 +20,13 @@ DIST glib-2.28.8.tar.xz 5223564 RMD160 9f665eee95990ace173676a4ad7aeeb0cc17fef9
 DIST pkg-config-0.26.tar.gz 396399 RMD160 face3d16ec338b9b1ab41d56d6e4d1a5624b52d0 SHA1 fd71a70b023b9087c8a7bb76a0dc135a61059652 SHA256 94c1936a797c930fb3e4e5a154165b6268caba22b32d24083dd4c492a533c8af
 EBUILD glib-1.2.10-r5.ebuild 1777 RMD160 eaf01d9d6f1ba55edb93e46f46110b9e9c2fb778 SHA1 dbedf2bc146dcbec47ad308621bf1077c9f735cb SHA256 9d9dd1ea44c25087918148c2ba1203f3b38be09996bd7e48a26f9b4f93405d36
 EBUILD glib-2.28.6.ebuild 5649 RMD160 1a57e73c13cae0a708808053ed6bd3e92c1ce29c SHA1 3c607a96e34dad256b32d9b006f2f5a8a333f454 SHA256 4a9d0a6f835a2aced9de540091acf8eaccf74cb054ce6d55576ea2ef34bdb78e
-EBUILD glib-2.28.8.ebuild 7045 RMD160 bc88725dcc15ac6562ec672c577011541bbac615 SHA1 d5118466ac7623e151d9622c2e9cce252d510fd2 SHA256 81fe7fe91c68f777e1162e468cfef2ec8a9ffa1f31577915594da47e0ea19560
-MISC ChangeLog 61880 RMD160 a4db70347890f55aa5b1e74d94266bdfa263995f SHA1 ebf9c37744460809c46a9b424ee41d2d63863108 SHA256 58b05413768e8a8bab17757eb89e87ab5a6773e90985f6af2da11356549a1358
+EBUILD glib-2.28.8.ebuild 7068 RMD160 0458b8ce372d920fb20d38d413da039c50096aba SHA1 b6531663aa5aff668193bedc4ad0e1218d8f1612 SHA256 c0f1d0a52ca6bd7d4343e68eaab0c7faae6941ed9f3bff4eb60b14fe09514997
+MISC ChangeLog 62066 RMD160 121994497bea765bc14c095c9866268308b61cd2 SHA1 ba705614d0d9775e1f8df2c5e1a5ad7da4dc2dd8 SHA256 bdef4c4c168ca4a9639013531facc710d389e155c04d09c34f206fb8403aa4f4
 MISC metadata.xml 285 RMD160 829826c3a3edd13d82bf87a4e6c1c08719f1549f SHA1 03e8b2cfc1956cfea91e8cedfa2451e68b2bf8e5 SHA256 8400998fc578bc9661b57a27ed3226941e4f75ef5bf7d9f929ed9de2d97ba8b0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJODjcBAAoJEPqDWhW0r/LC4OEQALAwHdVKUizq2B3ggWcqkPyt
-5VUS5odj0O0Fe6JLmyY8T5GirEiVG6DcsNpgCBuptjZhRSb4FfAV9UjyRDQ0phzY
-asQCGjjdx4vIWEqwjjygO1OgE3vRtNREAa6fAbHGxTpWbTwAvJnHKaljx0Bk0ZBo
-3zlXaLr6T9Gujp1NBd10843zMQLpEJhG50JC7m13X/ieXdcIemiyHJ0/W9kySdEz
-IyluoEY4H6Wjn+2aPixZYpuTa6aES84WbLTVTgC+d9DWWBSqnbg63slJ3ZFmIFug
-MOOYTh+ExyiHvhrcMn/edj9YYVmTS9tg9xkR1Wb1ax2CGUUhJdvLqaF2srBtM1uK
-3FF4OIZlt4qfJ7PcxPDvoqjWlXRE/a4aglHOfPT85rlznlG2vxGQjd81oOFbivVN
-7a+MWPtqNr769tgZRyMiCGOBqQwQAjgUjgR6KdoXh8AB4kaycgAAUrEhfRcaylV7
-SssoLbjd5C122FcLm4O5IMwSdnK46cDORSoKqN4tQzAJGS8fWvgWnDhcRl/lI9lt
-o4g9tQbNoygxW1wwSQOMW9ylsRyohUDvgjmencow6pseqPLLHRtpDd6ZGoJAHQKs
-Mi74b77XK6PSDICf57wZYy0O7fjQh9WJjMQ0wMlsG2rAc02feCyeuiCCkMFFRjkP
-kVdnbp7mAAcaU3deTJ8F
-=pJ4C
+iEYEARECAAYFAk4Rm0kACgkQCaWpQKGI+9T2xACeI8+Sr85Id6f6ocuzF+/zpBjg
+vD4AnRMAJUuYJQTsqby9l+ByRrIor3T1
+=2kDd
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/glib/glib-2.28.8.ebuild b/dev-libs/glib/glib-2.28.8.ebuild
index 32dec1dcdeb6..b1e44ded1b29 100644
--- a/dev-libs/glib/glib-2.28.8.ebuild
+++ b/dev-libs/glib/glib-2.28.8.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/dev-libs/glib/glib-2.28.8.ebuild,v 1.5 2011/07/01 21:07:09 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.28.8.ebuild,v 1.6 2011/07/04 10:51:44 pacho Exp $
 
 EAPI="3"
 GNOME_TARBALL_SUFFIX="xz"
@@ -75,32 +75,32 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.26.0-disable-locale-sensitive-test.patch"
 	epatch "${FILESDIR}/${PN}-2.26.0-disable-volumemonitor-broken-test.patch"
 
-	# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
-	if ! has_version dev-util/desktop-file-utils ; then
-		ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
-		ewarn "think on installing it to get these tests run."
-		sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
-		sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
-		sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
-		sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
-	fi
-
-	# Disable tests requiring dev-python/dbus-python, bug #349236
-	if ! has_version dev-python/dbus-python ; then
-		ewarn "Some tests will be skipped due dev-python/dbus-python not being present on your system,"
-		ewarn "think on installing it to get these tests run."
-		sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
-		sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
-		sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
-		sed -i -e "/gdbus\/bus-watch-name/d" gio/tests/gdbus-names.c || die
-		sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
-		sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
-		sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
-	fi
-
 	if ! use test; then
 		# don't waste time building tests
 		sed 's/^\(.*\SUBDIRS .*\=.*\)tests\(.*\)$/\1\2/' -i $(find -name Makefile.am -o -name Makefile.in) || die
+	else
+		# Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629
+		if ! has_version dev-util/desktop-file-utils ; then
+			ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die
+			sed -i -e "/desktop-app-info\/default/d" gio/tests/desktop-app-info.c || die
+			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
+			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
+		fi
+
+		# Disable tests requiring dev-python/dbus-python, bug #349236
+		if ! has_version dev-python/dbus-python ; then
+			ewarn "Some tests will be skipped due dev-python/dbus-python not being present on your system,"
+			ewarn "think on installing it to get these tests run."
+			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
+			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
+			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
+			sed -i -e "/gdbus\/bus-watch-name/d" gio/tests/gdbus-names.c || die
+			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
+			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
+			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
+		fi
 	fi
 
 	# Needed for the punt-python-check patch, disabling timeout test