Workaround build failure when test failure occurs. Rerun tests in src_test(). It moves valgrind misconfiguration error to src_test() phase (bug #424377 by Diego Elio Pettenò).

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

3 files changed, 22 insertions, 13 deletions

diff --git a/media-sound/xmms2/ChangeLog b/media-sound/xmms2/ChangeLog
index 16293e2f85cb..b19f7d2eb23e 100644
--- a/media-sound/xmms2/ChangeLog
+++ b/media-sound/xmms2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/xmms2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.26 2012/05/05 08:56:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/ChangeLog,v 1.27 2012/07/01 17:25:26 slyfox Exp $
+
+  01 Jul 2012; Sergei Trofimovich <slyfox@gentoo.org> xmms2-0.8-r1.ebuild:
+  Workaround build failure when test failure occurs. Rerun tests in src_test().
+  It moves valgrind misconfiguration error to src_test() phase (bug #424377 by
+  Diego Elio Pettenò).
 
   05 May 2012; Michał Górny <mgorny@gentoo.org> xmms2-0.7-r2.ebuild,
   xmms2-0.7-r3.ebuild, xmms2-0.8-r1.ebuild:
diff --git a/media-sound/xmms2/Manifest b/media-sound/xmms2/Manifest
index 63e258d8cbc3..2d03b70cd7b4 100644
--- a/media-sound/xmms2/Manifest
+++ b/media-sound/xmms2/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX xmms2-0.7DrNo-XsParse-3.patch 1544 RMD160 6903d87e738a1f30b665a68bdcdb932b9fcc0e8b SHA1 3ab9f160bbfcec3aff50e5b94a25e3ecaf668920 SHA256 9b690bec7c5e82eb905c95f01bdc321785caf72f88308d08b78f90e231304160
 AUX xmms2-0.7DrNo-missing-protos.patch 4252 RMD160 0d3d15c8b326690bab11850450f02462c76ec2a8 SHA1 bee9cfb77011e1537c1526005343d288f4bf9946 SHA256 76c5953772fa9a2108384539235cbd5127948f8f7a0a5d354faf99b7f916dcd3
@@ -9,15 +9,13 @@ DIST xmms2-0.7DrNo.tar.bz2 1519973 RMD160 3a526df9fa1ed5103b6a252c34c0394bf0e4f1
 DIST xmms2-0.8DrO_o.tar.bz2 1670726 RMD160 35513d7eddd5f79146cb8aa5c6c0bb35369619ec SHA1 9f7585571d95acd98df48c37948e8638fae7cc3a SHA256 c77e41e7bd5788889d5a2f78331ca8c748b8721bd2e59f36c36ad4c7cae8694a
 EBUILD xmms2-0.7-r2.ebuild 6243 RMD160 0c42ee6cb3b91ea8302c4e0f983c1acd58c91740 SHA1 b29eaa448d0d0086bc7b117b70e1361a8b47c4e2 SHA256 2f42105b496f7e1d61554748005fcaa8863e8eedc7a8d34a852ca92928e2e9cc
 EBUILD xmms2-0.7-r3.ebuild 6479 RMD160 5599e0ce325ac6cccfa9d02285eb1b20dfb77a44 SHA1 2d9b9e2a4fe9aff3cc086cc3780a149fc0023f53 SHA256 6c1edd3bbd5bb780fd550617f4a42e61b0a4b0f2810edc1a4932a0759b0dd183
-EBUILD xmms2-0.8-r1.ebuild 6534 RMD160 4f7861277de20f481f4d36bb687294e51fe67657 SHA1 630b3fcf6074bdeb1f7d91243d2bfbfbe8746d3d SHA256 11d8ecb057b2197a86e53634c4b9694a2079de0aa6771a1a81f7b16567aa7ac4
-MISC ChangeLog 4626 RMD160 a89edd063b248b843012fbc5c047175255672858 SHA1 7e3453a63f2a25401c2fec267b983d076e385f5d SHA256 40b36df634353d588a67049c0241da7b4722c6b1a14043191d0bab6b638245a9
+EBUILD xmms2-0.8-r1.ebuild 6700 RMD160 471adface2eea9eb57700d19e0ea8a38d672f32f SHA1 b209cce823942e20b8b51d0c65817185df7b1915 SHA256 b35e6db6eaaf3543dd4e8da331223047e238ee20d91b686d01f46ed436c59e7c
+MISC ChangeLog 4885 RMD160 8a4bb924f1e9c6bcee2751129a230a7bb859d0e6 SHA1 3c4fab3d48c7c3dc340480915f1b98f8eb273dd3 SHA256 d7705d18859d02bb00f6233aa00c079fc02e7945a0ffbfbfaf8ca4e08d0f19dd
 MISC metadata.xml 2435 RMD160 d3b18498cda492b5a64c4bc05cce867babd2707d SHA1 5130db5388108bb558a3d270dfd4a7c2454ca7d8 SHA256 f7fb6c7694bf849149c7f3f3f2aec711543d994f782b95dd75ca1759bcc1e22a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQEIAAYFAk+k61wACgkQfXuS5UK5QB2A/QP+ML+6pfliufxJFOYJCqbHTOVe
-/tf2EEFi3QTc4+jvxUDbeDUgDetoGsAfyAG2ZNkO71pLgi/0jmbK/u3ZXqyh8fsB
-9I1l1NcQssU0KPeXaTICpvVbiqG4aUeWkV9AD2Egj/tz1cDVQ8F+5ojRGX2Nz9ZR
-RLT0FXCvsCzEJAsWqQA=
-=1X6I
+iEYEARECAAYFAk/wiVUACgkQcaHudmEf86rGjwCcD2aJdaespCm2Mxe/PSK1cqZ8
+TDoAnRkkoF3cXyczSrNkZPX4M5GoGo9h
+=+fs+
 -----END PGP SIGNATURE-----
diff --git a/media-sound/xmms2/xmms2-0.8-r1.ebuild b/media-sound/xmms2/xmms2-0.8-r1.ebuild
index 684b5adf2bff..6f692bfb5df1 100644
--- a/media-sound/xmms2/xmms2-0.8-r1.ebuild
+++ b/media-sound/xmms2/xmms2-0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.6 2012/05/05 08:56:07 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms2/xmms2-0.8-r1.ebuild,v 1.7 2012/07/01 17:25:26 slyfox Exp $
 
 EAPI=3
 
@@ -232,8 +232,14 @@ src_configure() {
 }
 
 src_compile() {
-	# also runs tests if 'use test' in enabled (see tests option)
-	./waf build || die "waf build failed"
+	# waf is very keen to run tests in build phase (bug #424377) but
+	# it does not bother running tests twice, so the hack below works:
+	./waf build || ./waf build || die "waf build failed"
+}
+
+src_test() {
+	# rerun tests
+	./waf --alltests || die "waf --alltests failed"
 }
 
 src_install() {