Tests require python-2, continuation of bug #407885

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

4 files changed, 31 insertions, 17 deletions

diff --git a/sys-devel/clang/ChangeLog b/sys-devel/clang/ChangeLog
index 54fe580c0b41..af11d06f33a3 100644
--- a/sys-devel/clang/ChangeLog
+++ b/sys-devel/clang/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-devel/clang
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.57 2012/03/08 16:37:54 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/ChangeLog,v 1.58 2012/03/13 17:08:38 voyageur Exp $
+
+  13 Mar 2012; Bernard Cafarelli <voyageur@gentoo.org> clang-3.0-r3.ebuild,
+  clang-9999.ebuild:
+  Tests require python-2, continuation of bug #407885
 
   08 Mar 2012; Bernard Cafarelli <voyageur@gentoo.org> clang-9999.ebuild:
   Add AddressSanitizer (asan) support with compiler-rt, bug #407295
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index 47c07bf2ffac..188a0a10ed42 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -19,14 +19,14 @@ DIST llvm-2.9.tgz 9574781 RMD160 caeaa067fda1eb34196b356a087645f83731cfb7 SHA1 5
 DIST llvm-3.0.tar.gz 10350539 RMD160 85211cafbed1c5d838ac54669017b5298613f975 SHA1 b683e7294fcf69887c0d709025d4640f5dca755b SHA256 519eb11d3499ce99c6ffdb8718651fc91425ed7690eac91c8d6853474f7c0477
 EBUILD clang-2.8-r3.ebuild 6768 RMD160 7b552f45bca12124fe5659a9d3690b60706d14cb SHA1 c3b42800e461cda5852961f912e4ac0609062e0c SHA256 604b2964d566197adda982e6c1e6cdcc3365596ccfabadafe60e316049edabd7
 EBUILD clang-2.9-r1.ebuild 6431 RMD160 cb9ed182675f9a76beb2caa0fc1fe26bfc534dd9 SHA1 1a7a912396c7d1823cd1867bb4be9679a31b2c0e SHA256 f9993c92ea46a43debdf55563b70093530e1eabebcee270c01e4d0e3b9490d1a
-EBUILD clang-3.0-r3.ebuild 6615 RMD160 ec67ec4642539985134b6b7b11a2f232c2ef8771 SHA1 5357bc6235fe8785a6e0f1441a51a0b0759b9958 SHA256 8e05a18a8bd221a1f37968216ea98f7343fa225d115e1b38584d6734d81e88b0
-EBUILD clang-9999.ebuild 5527 RMD160 5b5fef14c06044410fc60b2f01060e9b21cb4fcf SHA1 a5145e30c5792d3350968ccc6e6340a6b602e32f SHA256 855f0d686bf3bd149e2b97bcde60008a3fd3bc000381b5d5ab4e5cceb32b6487
-MISC ChangeLog 10988 RMD160 f3d38f986ea85cb7738edb5b0231b512a6771c5a SHA1 e8a38275a4a42a729dc7fd4aaf0c889aef1a0080 SHA256 7f5c2b3d5538ce5ecb69ee6f3916e737f50f36691ebd8f8261aeec29e715a001
+EBUILD clang-3.0-r3.ebuild 6713 RMD160 59e05e5d0c7f063ab19a6cf1e9b07f36bc3bcdc9 SHA1 b7d52887a424bdd540c4943189f19390857a2c75 SHA256 38fb19e7c4ece506b983dd1b523ae59b099f80736f15e901fec114d474567334
+EBUILD clang-9999.ebuild 5624 RMD160 4e0911e1af7000762628f3bcfb873f7b2fddb682 SHA1 6bd2d46bc6f8b5a32f95c05d4ab223e45af23b55 SHA256 82f0c27512b7412d60b8eac7bb91c9a597f76611c83be5de03d46445089e8173
+MISC ChangeLog 11140 RMD160 379233d1a47f829288e33f3924bef266f7f12f63 SHA1 6a073244db5161f2cd7d060de29a2ae8ca2b1e59 SHA256 dc85ca3ecbc884a31b060c73a9d5420be6b0dffbb6eb68f8a90e51d1a4644bbc
 MISC metadata.xml 1339 RMD160 5f8b76cda96fc95f67fd8ff7f977c116a4f0f28a SHA1 034f922ae098216b179e9d5c78246f9caa95b9d6 SHA256 0ef2f9bcc4f3293dcb69b2c882b93737b9be496e6f8789efa69df6adb2c1edf8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk9Y4HAACgkQFYEBGcdFJfJ39gD/Tyz79THhbCKeKp0PSqHC+YBf
-DMU9ftGaWPyxyDrg2sEBAKLKamD4RuAUcLAK5AngwbuC7qeF2JO+eD+MXH7zYRkf
-=Bf60
+iF4EAREIAAYFAk9ffywACgkQFYEBGcdFJfIH/gD+PdydzFmVp7ZeaBqvYBmeSe2s
+fAPrhYw1An0cznP7LVUA/200PQJQZ+0dZHdVMiwDp4ULY1DJNXoVs6Em7/Npl5Uo
+=QR36
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/clang/clang-3.0-r3.ebuild b/sys-devel/clang/clang-3.0-r3.ebuild
index e9bd61a12dda..37826b1da79b 100644
--- a/sys-devel/clang/clang-3.0-r3.ebuild
+++ b/sys-devel/clang/clang-3.0-r3.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/sys-devel/clang/clang-3.0-r3.ebuild,v 1.3 2012/02/28 09:09:31 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-3.0-r3.ebuild,v 1.4 2012/03/13 17:08:38 voyageur Exp $
 
 EAPI=3
 
@@ -52,6 +52,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.0-gentoo-binutils-apple.patch
 	# Specify python version
 	python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view
+	python_convert_shebangs -r 2 test/Scripts
 
 	# From llvm src_prepare
 	einfo "Fixing install dirs"
@@ -125,10 +126,14 @@ src_test() {
 	rm -f test/Driver/linux-ld.c
 
 	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	if ! emake -j1 VERBOSE=1 test; then
-		has test $FEATURES && die "Make test failed. See above for details."
-		has test $FEATURES || eerror "Make test failed. See above for details."
-	fi
+
+	testing() {
+		if ! emake -j1 VERBOSE=1 test; then
+			has test $FEATURES && die "Make test failed. See above for details."
+			has test $FEATURES || eerror "Make test failed. See above for details."
+		fi
+	}
+	python_execute_function testing
 }
 
 src_install() {
diff --git a/sys-devel/clang/clang-9999.ebuild b/sys-devel/clang/clang-9999.ebuild
index 4378a8b7db3e..66f2c910e410 100644
--- a/sys-devel/clang/clang-9999.ebuild
+++ b/sys-devel/clang/clang-9999.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/sys-devel/clang/clang-9999.ebuild,v 1.27 2012/03/08 16:37:54 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-9999.ebuild,v 1.28 2012/03/13 17:08:38 voyageur Exp $
 
 EAPI=4
 
@@ -55,6 +55,7 @@ src_prepare() {
 		|| die "gold plugin path sed failed"
 	# Specify python version
 	python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view
+	python_convert_shebangs -r 2 test/Scripts
 	python_convert_shebangs 2 projects/compiler-rt/lib/asan/scripts/asan_symbolize.py
 
 	# From llvm src_prepare
@@ -111,10 +112,14 @@ src_test() {
 	cd "${S}"/tools/clang || die "cd clang failed"
 
 	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
-	if ! emake -j1 VERBOSE=1 test; then
-		has test $FEATURES && die "Make test failed. See above for details."
-		has test $FEATURES || eerror "Make test failed. See above for details."
-	fi
+
+	testing() {
+		if ! emake -j1 VERBOSE=1 test; then
+			has test $FEATURES && die "Make test failed. See above for details."
+			has test $FEATURES || eerror "Make test failed. See above for details."
+		fi
+	}
+	python_execute_function testing
 }
 
 src_install() {