Run tests with correct version of Python. Patch by Arfrever.

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

6 files changed, 33 insertions, 19 deletions

diff --git a/dev-vcs/bzr/ChangeLog b/dev-vcs/bzr/ChangeLog
index ee1c9fcd936b..9ccd91c60ecd 100644
--- a/dev-vcs/bzr/ChangeLog
+++ b/dev-vcs/bzr/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/bzr
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.30 2011/08/16 15:24:55 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/ChangeLog,v 1.31 2011/08/19 19:17:32 hwoarang Exp $
+
+  19 Aug 2011; Markos Chandras <hwoarang@gentoo.org> bzr-2.2.2-r1.ebuild,
+  bzr-2.2.4.ebuild, bzr-2.3.4.ebuild, bzr-2.4.0.ebuild:
+  Run tests with correct version of Python. Patch by Arfrever.
 
 *bzr-2.4.0 (16 Aug 2011)
 
diff --git a/dev-vcs/bzr/Manifest b/dev-vcs/bzr/Manifest
index bee04b376f24..2b72cf2e8d43 100644
--- a/dev-vcs/bzr/Manifest
+++ b/dev-vcs/bzr/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 71bzr-gentoo.el 124 RMD160 d85713f80f9be8685bf56979626003f46ebbc22f SHA1 150e54685444e444e2328bb5cb9dbb1c68c066e0 SHA256 8033a55433689ba25acd502865086600d1a03158a88f4a596fae0e7d3d953454
 AUX bzr-0.90-tests-fix_root.patch 1173 RMD160 572b86dbf99620abe5090b72a9a29c3d6d2ea566 SHA1 a41671354dcf7498039c421e81bc7d9fbbc7bb29 SHA256 b2275d04401bd4ba36c0a565f5e6b7c8471ca50acd48bbf5f5d1995b197809ec
@@ -11,16 +11,26 @@ DIST bzr-2.2.2.tar.gz 6897175 RMD160 888e0f59c88e0fde26adf697a9422ed732cc3329 SH
 DIST bzr-2.2.4.tar.gz 6900607 RMD160 57b5daa0ac94d727dee003a66fabea251d49324a SHA1 f63b93bde9372acd792e23c598789ea4c8c35577 SHA256 3ba84414cce4435dd34f4f1d7c94691587e6aa0b6677c361af17d74fb90a657e
 DIST bzr-2.3.4.tar.gz 7036541 RMD160 f9aca792a406d647c5252d8b4e3ca690df9942aa SHA1 fd4d28abe41835c2c327b21972edb4533fee0ae0 SHA256 336f8cdcaf5539af2600c0412a036cb70578cc641c076bd97bc2d85d44502094
 DIST bzr-2.4.0.tar.gz 7522083 RMD160 68508cf0188fba6507cbef6274c08e3f2038698e SHA1 94f0de11e1acc9f07765174f0a01d7fd01da568a SHA256 b1052d8fdb6e9ee63d98a11186295013d6a0c4cdbe0f832c014dff6a3ecf6be0
-EBUILD bzr-2.2.2-r1.ebuild 4011 RMD160 ac8c527599dd46d6e674ee53a492820d48859472 SHA1 20c133f5bc8adf9252dce4dcce44c899224bad34 SHA256 c2c849efa1229c2cdb0e5f0468a6bec3321a6038ce37782bb87810538316859f
-EBUILD bzr-2.2.4.ebuild 4016 RMD160 c5d119899ad47638ee425444da220406665455e4 SHA1 e087b5131910fe8d849487c1c13cd97cf86ba214 SHA256 e1647eb38d0c03c3f0bd6185b1f63516bb230abbc66cb4bcc3b0c6ec43eb75a1
-EBUILD bzr-2.3.4.ebuild 3709 RMD160 cb1bce9eca49eb5eb8e5d7483cbe16af0ad9cfb4 SHA1 6f8ae0c0d7309aa4389765c551145b44e9e81467 SHA256 5a0e67d1a0aa5d5a0b408349131747b7a3a2567e4eba060f08dcbdaa536d0e0d
-EBUILD bzr-2.4.0.ebuild 4661 RMD160 bfa49e86d2e3e973bf7b9930c1efbfa46092c9af SHA1 d868c7671193eab261f59ebb664e718489fa7aee SHA256 c4736f87728525d779f54109e077b2aa04e35b60f8df6fb88f3de486fcab5bae
-MISC ChangeLog 22840 RMD160 5d076d3b721e0e2ea3aef1466b40298660409061 SHA1 64d4f77cf054ef93c908931c138b89fd0644abb0 SHA256 dc03c718c38ce7d5c7f3521344219d5e921684a1fe64c0e69768bd4f156d7808
+EBUILD bzr-2.2.2-r1.ebuild 4009 RMD160 3d9ea03b680835b6da9b1fc284f41a77aaff937a SHA1 717ad39d385c2c8f03cb6ee5884d201cf23606a1 SHA256 496f94085df43b9880a27e374700a35a64834800b6d8b0f0af1a530b8ce7707d
+EBUILD bzr-2.2.4.ebuild 4013 RMD160 15050f6e2ea18a3437366d5bb7dd8b4b29e377f7 SHA1 86dd2465d7913db0ca61cb6c36e85e04cb909a4d SHA256 a0e5b36e0151ad37596b3d97bd002735d4be86af1bc630078fa325ca1cc52512
+EBUILD bzr-2.3.4.ebuild 3709 RMD160 7d40c3e4686753749ef75d2dad8156ec8b9b80ef SHA1 8bd140e5164c700af7798a4653d347995151231b SHA256 d207e7d65ab1eb34d12d6b1f5978541e1cde7bebfec5b6dbec916a5dd763c1e6
+EBUILD bzr-2.4.0.ebuild 4661 RMD160 b8de20ccf5d5df52e8fc706a0259216d30db8560 SHA1 586949f326275489d2d17c1f8041e49ffbaee93e SHA256 1b4ff75e261195f6f05daf064e3b7c10e265e4ada7deb4661d62afe7d5331035
+MISC ChangeLog 23037 RMD160 f1be215664e543732aee1f11bcce3a43534db84b SHA1 00a9110bf064d2467dfe9e126c095522f37d67fb SHA256 fe01bc8625560c93dd54bd3583339eaa6818971b94450e430e7a09f227eb2ef7
 MISC metadata.xml 712 RMD160 36b19a78e61a946c4bd8db576c4ee1ee3039f9f8 SHA1 bc90063835a8043bea6940cba69c0134d6b34e0a SHA256 dcfc4ef80c924142d79801e013ba53c17731d6813e130dd23d7007dd4011a2bb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5Ki+MACgkQNQqtfCuFneM3HQCgl7P322Y+dC6RuENYKmig4ipj
-CuQAn08KffltbpQSw/WLgRFGWPOslF4O
-=gAvq
+iQIcBAEBCgAGBQJOTrbMAAoJEPqDWhW0r/LCADQQAJXLfJd7vriWUYzFt09YAW3I
+krtxeBzzHzHvPMxh2aVKlMG12mWJEHue+NOj4HacezYP1AJFwEgVJVye1lBBQABx
+W06RHxG7ostXyb/kktyp8T97D6h+IlOV+EYhn7RmdtMm28fMLS92CMR5gg8F4LDj
+BcidLRmgdr87CMeWOlEUZs6sr6o3UheHuPOpl+0fj2UQRMmn0hv3deHReDZsbjlO
+2ry+WL/6eoublru2eZtygBJi9zmOaBJBOg7vi0tqNyymJckvBdK0QuwHDvOkV+zs
+ATeMM6LedhEPZOR1RFtbzuclbsjbQBQugq/C6kDb0+DJztLJwwBPq+VoKdshmrMU
+PkTPkidOqL74g5DH9JEfktxSx2EoZjgXyyGrGWSDjzU2q4KRSJcqKYRIjnVx/HhU
+6nTwmw/1TOBkTSJoIk3mhyQh1ER5O7aanhBPUXHAheo9wsCwScHb8icmtcCIEbPr
+6ZkmGgFxg13ny9hMt5w++wXj3eXO0nmoYmZz8imW3o+JKRCWqF2c7A7bfE2TfcJs
+GzDJi72FeH5FydlIFRC2fscNMdEeMSqrfkijbc6FS1Z80JIHkG5n/4MSPbg/Hc/l
+A8yTxSdKE+q+1gT2F+6T6p50OOndO8TyZ4pJG5vE2CzchZGIvVn3FD9fuNyyDdlZ
+PuQWAEDqPeiEoCGYki3z
+=6KSn
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr/bzr-2.2.2-r1.ebuild b/dev-vcs/bzr/bzr-2.2.2-r1.ebuild
index 4f4056ca87b7..e928c9de2faf 100644
--- a/dev-vcs/bzr/bzr-2.2.2-r1.ebuild
+++ b/dev-vcs/bzr/bzr-2.2.2-r1.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-vcs/bzr/bzr-2.2.2-r1.ebuild,v 1.8 2011/04/16 16:06:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.2.2-r1.ebuild,v 1.9 2011/08/19 19:17:32 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -87,7 +87,7 @@ src_test() {
 	fi
 
 	testing() {
-		LC_ALL="C" "$(PYTHON -2)" bzr --no-plugins selftest ${skip_tests:+-x} ${skip_tests}
+		LC_ALL="C" "$(PYTHON)" bzr --no-plugins selftest ${skip_tests:+-x} ${skip_tests}
 	}
 	python_execute_function testing
 
diff --git a/dev-vcs/bzr/bzr-2.2.4.ebuild b/dev-vcs/bzr/bzr-2.2.4.ebuild
index fa98655f72d1..a6b21e19197a 100644
--- a/dev-vcs/bzr/bzr-2.2.4.ebuild
+++ b/dev-vcs/bzr/bzr-2.2.4.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-vcs/bzr/bzr-2.2.4.ebuild,v 1.2 2011/04/10 12:34:50 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.2.4.ebuild,v 1.3 2011/08/19 19:17:32 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -87,7 +87,7 @@ src_test() {
 	fi
 
 	testing() {
-		LC_ALL="C" "$(PYTHON -2)" bzr --no-plugins selftest ${skip_tests:+-x} ${skip_tests}
+		LC_ALL="C" "$(PYTHON)" bzr --no-plugins selftest ${skip_tests:+-x} ${skip_tests}
 	}
 	python_execute_function testing
 
diff --git a/dev-vcs/bzr/bzr-2.3.4.ebuild b/dev-vcs/bzr/bzr-2.3.4.ebuild
index 7e286f63b588..f8743b373225 100644
--- a/dev-vcs/bzr/bzr-2.3.4.ebuild
+++ b/dev-vcs/bzr/bzr-2.3.4.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-vcs/bzr/bzr-2.3.4.ebuild,v 1.1 2011/07/17 11:23:29 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.3.4.ebuild,v 1.2 2011/08/19 19:17:32 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -81,7 +81,7 @@ src_test() {
 	fi
 
 	testing() {
-		LC_ALL="C" "$(PYTHON -2)" bzr --no-plugins selftest ${skip_tests:+-x} ${skip_tests}
+		LC_ALL="C" "$(PYTHON)" bzr --no-plugins selftest ${skip_tests:+-x} ${skip_tests}
 	}
 	python_execute_function testing
 
diff --git a/dev-vcs/bzr/bzr-2.4.0.ebuild b/dev-vcs/bzr/bzr-2.4.0.ebuild
index 79d0d9e81b45..2a0844e00867 100644
--- a/dev-vcs/bzr/bzr-2.4.0.ebuild
+++ b/dev-vcs/bzr/bzr-2.4.0.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-vcs/bzr/bzr-2.4.0.ebuild,v 1.1 2011/08/16 15:24:55 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr/bzr-2.4.0.ebuild,v 1.2 2011/08/19 19:17:32 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -76,7 +76,7 @@ src_test() {
 	fi
 
 	testing() {
-		LC_ALL="C" "$(PYTHON -2)" bzr --no-plugins selftest ${skip_tests:+-x} ${skip_tests}
+		LC_ALL="C" "$(PYTHON)" bzr --no-plugins selftest ${skip_tests:+-x} ${skip_tests}
 	}
 	python_execute_function testing