Force python-2.x when running tests #455276 by Markus Oehme.

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

3 files changed, 35 insertions, 18 deletions

diff --git a/dev-cpp/gmock/ChangeLog b/dev-cpp/gmock/ChangeLog
index 34c28d6cfde2..3a0612050228 100644
--- a/dev-cpp/gmock/ChangeLog
+++ b/dev-cpp/gmock/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-cpp/gmock
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.20 2014/03/27 02:35:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/ChangeLog,v 1.21 2014/05/04 15:27:38 vapier Exp $
+
+  04 May 2014; Mike Frysinger <vapier@gentoo.org> gmock-1.7.0-r1.ebuild:
+  Force python-2.x when running tests #455276 by Markus Oehme.
 
 *gmock-1.7.0-r1 (27 Mar 2014)
 
diff --git a/dev-cpp/gmock/Manifest b/dev-cpp/gmock/Manifest
index 140745a6c686..ee2507779406 100644
--- a/dev-cpp/gmock/Manifest
+++ b/dev-cpp/gmock/Manifest
@@ -10,24 +10,24 @@ DIST gmock-1.7.0.zip 2167746 SHA256 26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492
 EBUILD gmock-1.4.0.ebuild 900 SHA256 ac6459b47610fabc4a1976a27b813a5d60bc2ed94b053e0f0f95eaa9317f2919 SHA512 dc4bd30c218906d7a43798dc4393d6b9201328185d6dc5e5fa591ec44419b71814d759e9061b2b7125d1efb41e670e9680c6ccd50be1835e7ae496020a5b6d33 WHIRLPOOL ebec651a934b28ecc628f6abfb3ebea8442b2eb572b5cd4cfafd86f1286454afff51de5260f0d5afe75253a52788b08253af08d7274283df52a7e9bef0b0b89c
 EBUILD gmock-1.5.0.ebuild 801 SHA256 da8e3eb98f7fc07b8909373b612700c8a861c5c92bb48ee27c5addf787848657 SHA512 d1813c15ecc635418c859f69ba49c4ff401daf56bef042d9d8e8abc1f072421af04579f0aea4e4ad6c650b60aaa2f1ccea65bd295a298f0cce5c3cfd5f9ddd52 WHIRLPOOL 47ed5fafcb25a3414bb06c8eb27688c571b42e7b52f84089414e82ac8944b736a66698023b9dd81d3201316af07fe5056c6741e925f185c85efaaa0bccf4dcaf
 EBUILD gmock-1.6.0.ebuild 995 SHA256 6258ae401f441e5d97a7e7fafa3af8e118ce8d673e9f91c30aae25ed95151836 SHA512 22188348514a7d0ab35f8befd290476ba188625b5d0e8adccd4859f6c912a719df47edcc0179e710efb8c8e8fc6a167af993991eec65dae8d06bbfa4827a2094 WHIRLPOOL 01e07ca21977d66958d932b33b36bc00aacd523d985db338f14388de00a0181b98f9f49715474ba67bf6de1fe238e2e8089f5a4397f57dd4b4def7e8edc3ba79
-EBUILD gmock-1.7.0-r1.ebuild 1109 SHA256 e18cbcf2d84a847611a089dfa8dd1192443261cc4b6fe43f08dab55f3d68b2b1 SHA512 4c34f3f94e4f57c1c2eaf0a4ad2ad3bff670b9c9d62f36edeed791a7385be37039549ec245bdbdd4289a3c04462e602bd511592ee4475b7753ea7f52348f32de WHIRLPOOL 4da87ca35558737ffb5ad4ae2312e52ebab4aa8c7e70106c63010e1a6c0cf834df937b0924aee8298dbbe4e825a84de82720173bf2dc441051acad98aa8b6814
+EBUILD gmock-1.7.0-r1.ebuild 1353 SHA256 0295ea2465f6dca51f4da2dc89b07d683f986aa90ecdc4197d7c91ad14cdad3a SHA512 58e50499bed039a1981d28d637d4271e18a26458edf4b35efaf4a379bc8a64dabf542775981174f73920ed0e498c5673cce669b0bbd2f50265f8955c9d72962b WHIRLPOOL 56e7e2ead53a6b0d2554abba54197bcf5480f9836426d733741501f584996e26b7b7f3a2ddb37bdf5fcd63fdbe6508fc37a25d631f03b11a26ab207897da5005
 EBUILD gmock-1.7.0.ebuild 1003 SHA256 1544f2c85385de37a6a5494f67c38652eba49e67f494ef563143413f237b5fd8 SHA512 d7f4d52ec8280e7e2a4eefc33cdaacd1dd6bd18fdc8d7f4c9ba4ae3b9c49060ac303e486a59e0ab0adfaf5cb4e54f386a1df2f0465a85c7fefc461c419e16ba5 WHIRLPOOL f0b7b913e5ef102c7af733200db686d8bf0cbf4c07121369a1a72a5d9c8825f69b9ada3079bf76fa4754f76adebc96635fa9bb9e7074d89bcb4c6a85fef8675b
-MISC ChangeLog 2757 SHA256 4dbceb17f800ff608f692b0bcea3001578ad0e28a09410fc29984c55a2ce8b32 SHA512 d38e2601b4dc8a6fe331fceda71c53f1dd633ee047c57171df9f88adbef92da8860f2dccfa611d0269a6a695c6466c594bb27eda46bfa93fb11709ab0ba04e6d WHIRLPOOL 97383164bdf4306ec206baa0655973191a37a98c8067cec272cb47bba02073599d19a7a497bbfa1c4fad0c9e89827e65bf70da0d3d38c75e73cc21c951d62853
+MISC ChangeLog 2894 SHA256 20a79f5bc55c380190294e3f8518516ed17b88534c171afb23668a66c06394f7 SHA512 a94fd20eff0981295a1ef0e4dfa55e765022d8910a28f7b37fae3503c527614674f8475b1d8302d258a83fde27d4f08efa4d86e434400816f79f23cbd2f8730a WHIRLPOOL 20e8d7ad3e106efe8cd676e0b157c00eab141fe6d62138bd4be95dedcbe9e240c5b71728a5390812ff96805eda34010e9d4a6f9d4d5e9ba503c21f9e2734b14b
 MISC metadata.xml 283 SHA256 c34e015327f31293e860e8b2366e59e1d361c67f47d1c2cb010e16f43521a0f2 SHA512 e85ed05e67750a75476066754448e724ab3e65c91af152befff80c7f66423254311243fa213ba282bcc6456499964d4c969103cad829d8386ab3ef50138b5b81 WHIRLPOOL 3c504418a30332c69ad4282d204ff0ffeef35bc0aff4071d0c7f51704e7a1e091ce7e72826de354f8d1ded20920d61fa60bee4fafd3db8bd43acb9cdce9717bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTM45vAAoJEPGu1DbS6WIAO3sP/AzeKd61wiAyJB4V0XGqz7z9
-vevN79smtf3xVMHyivQDD1ncR9rYXnVBZlR0rvyxRbkyByQeykpTBrkVSX1sgdes
-hG0uWUPqi/jcfsrm2rhLTnUFY1pih7WTtTcWzEfTUe5xHBg91xfD59dF9N3izBa8
-v7GX0FCBOougBAp4dKxEsE3E9ifS36T+U/UdDDcLSWVvRu0mFq+TFRkTLRTAvv5+
-Yelz6uEPb9vnvrHoOx1eviWU8MvHEAU2+My8G+IxfeUNYb/9H3LtNu/Mq5DZRB26
-4Ohl66kflZWbVyWo5KqvyUG7K+KympAlHPot7MFj2RDXPPAdz1hByE5HJQ504Y7f
-Legwp9czv5Sqt3gkdO3Joqumj0PIdqG/yz8huBIriMZcIzTuZGgQAkENpihYAsd5
-jbp0nTRwAIN76CIEq2gn78vTqHeOg0aDp+8WqGH38+KpHRm5h3myxqHm4Wy/rqYD
-tKYcOtZ5UOrXJMUBJ2G6/00YXYLKt5jPPxNLGotRcn4Zplvhzd0VHw2edFCRmQdv
-W2sVJ3ajXYprnIjbCAXOBYwLsQ00TaY1RU+TPZYRO5MDAbAnn6THIx4EAW3KqN3k
-B1qon38XMnnUhaXGU2TJF7xuJdpSg5SLN8TA+VxW11w713e+xrr1srWBLPeYK74u
-yLNRG+jpYFYI9BIOAsOI
-=iTmD
+iQIcBAEBCAAGBQJTZlxtAAoJEPGu1DbS6WIAjUAP/1/F5hpQRokdw9TidxKLlRQx
+IvwDXH3cbDY5kiZenaIdHQ1HU1ognfEER9xGjxGFS9r1E2IkU5/RcAu5N2ro8Wfd
+hPefa/pom31MwjT1v86o/fpO+3lxA9o2Q2BkBnCF17PONifBWsB2p0QcOjTcQm15
+/zUi/2ZKcW1Z+byFnh+NhtqjP7L5BrTfxwZ0i2iXjgI2s3XpEDdfaBNgua8n0BWO
+I6KFVoQRz/nAnCcNNYJhuFH1gin/CIKVjYa+nC42ahEFCJg6Q1gyi677pLZSYH3Y
+6CyAzdQ+OZz3vwGIFZbbsdkN91JtpplDEZdrTG1rcutcfmmbrK5QK3F5pwhWAU/2
+SkyV4xmLiGvO21B/S5CfwoiJjG9ERKjw/jOGMtWIzzkAm+HhcSickZFJ46f1iUhc
+hVuFDJL0KZLBN5IYymcThkkEJ8Y1Vd4EWHFHrpMP5FxWV2FeEZfIbFBLQGqYo82k
+vqNEBzhsqjjvFnGgy3HiO6QsLNUN5pQL2ntnGmeOsLOkXoEuAFBFUv0LxFm09JUC
+aIZdHilVPV8o2ATuiW9VdplAWi70x4polpgl0Rg8u52P00CXP1bU1aPEFoJjXOnl
+0KydqThs1yb2ISIaWpaF1uS4+/n4Ebkhm/d+pf5lRJDvarsTl5CnAVxReuUUt3qh
+pqLoDjRkGX9OpM90K1OP
+=Ob4s
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gmock/gmock-1.7.0-r1.ebuild b/dev-cpp/gmock/gmock-1.7.0-r1.ebuild
index f968d5f82b69..9a118336ae86 100644
--- a/dev-cpp/gmock/gmock-1.7.0-r1.ebuild
+++ b/dev-cpp/gmock/gmock-1.7.0-r1.ebuild
@@ -1,10 +1,12 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild,v 1.1 2014/03/27 02:35:20 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gmock/gmock-1.7.0-r1.ebuild,v 1.2 2014/05/04 15:27:38 vapier Exp $
 
 EAPI="4"
 
-inherit libtool multilib-minimal
+PYTHON_COMPAT=( python2_7 )
+
+inherit libtool multilib-minimal python-any-r1
 
 DESCRIPTION="Google's C++ mocking framework"
 HOMEPAGE="http://code.google.com/p/googlemock/"
@@ -17,8 +19,15 @@ IUSE="static-libs"
 
 RDEPEND="=dev-cpp/gtest-${PV}*[${MULTILIB_USEDEP}]"
 DEPEND="${RDEPEND}
+	test? ( ${PYTHON_DEPS} )
 	app-arch/unzip"
 
+pkg_setup() {
+	# Stub to disable python_setup running when USE=-test.
+	# We'll handle it down in src_test ourselves.
+	:
+}
+
 src_unpack() {
 	default
 	# make sure we always use the system one
@@ -36,6 +45,11 @@ multilib_src_configure() {
 	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
 }
 
+multilib_src_test() {
+	python_setup
+	emake check
+}
+
 multilib_src_install() {
 	default
 	dobin scripts/gmock-config