Convert to python-any-r1.

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

3 files changed, 28 insertions, 17 deletions

diff --git a/dev-cpp/gtest/ChangeLog b/dev-cpp/gtest/ChangeLog
index 41082d6bbac1..3572ad9bd7ef 100644
--- a/dev-cpp/gtest/ChangeLog
+++ b/dev-cpp/gtest/ChangeLog
@@ -1,5 +1,8 @@
 # ChangeLog for dev-cpp/gtest
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.32 2013/06/19 18:44:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/ChangeLog,v 1.33 2013/08/16 14:44:49 mgorny Exp $
+
+  16 Aug 2013; Michał Górny <mgorny@gentoo.org> gtest-1.6.0-r2.ebuild:
+  Convert to python-any-r1.
 
   19 Jun 2013; Sébastien Fabbro <bicatali@gentoo.org> gtest-1.6.0-r2.ebuild:
   Keyword amd64-linux and x86-linux
diff --git a/dev-cpp/gtest/Manifest b/dev-cpp/gtest/Manifest
index d1d30f2f4abf..fca89b7b5ad8 100644
--- a/dev-cpp/gtest/Manifest
+++ b/dev-cpp/gtest/Manifest
@@ -4,14 +4,26 @@ Hash: SHA256
 AUX configure-fix-pthread-linking.patch 3142 SHA256 501f42dd4f4f4412fcb18fc4eb5f1100f5c5a6b19610f6548bccc84989c6f83e SHA512 4347570606853c75e43d3d1abe449cd562538e531136658e6742f8e2dddcc1767932b427a063f711b868467ca85ff947f24c4ed3e328319bd0a739bb66093016 WHIRLPOOL 5ab7be10a9bd675398884f2a4ad8c30fef17412ff3fbaae5d14cf290ebf723ccc005d2ea1dd7ad68c8bd8db57d06cc0fadd79d7f9f2ab46ea5ed0a87df8201fb
 DIST gtest-1.6.0.zip 1121697 SHA256 5ec97df8e75b4ee796604e74716d1b50582beba22c5502edd055a7e67a3965d8 SHA512 f4718dfbfa3339bb9449c3f14e5b44ae405ea7df64c10a0957a6300985b71c4642981d069a1382e27ae041a4e2873527a9e442aff978447e795a190f99fac115 WHIRLPOOL 745a49020d4353ed2fa38adfc80bbd777358c831719bbe3b7c90d243f84256615222ba5f04d48d98b9e1a803bb40766799b3aedd575024c19d853d9239a12f8a
 EBUILD gtest-1.6.0-r1.ebuild 1323 SHA256 a25e2db4552fa335ac8a044e750b2b6fa4920515307ee6f114fd42fd113a25db SHA512 27869b4a124ebcba0679944e537107cc334d5bad17482707700253d04b639c420168de66a0a5b4e66b1142e3edb06ce3a32f185cf418ca7167a55813af32d8a4 WHIRLPOOL e60cb80ac90595d606865002449beaeba674752249466c673bc9a805cafb8c05d476769826703c3ac533433582f6c874753981d193dc1bf90b685a29969577c9
-EBUILD gtest-1.6.0-r2.ebuild 1511 SHA256 dac27a1c9e681ccdbd3faaa24da756f914cba1a6624cf2da1cd814ce06e40e5a SHA512 060582a4bff18dbc57634e4d593a890672dcc02d3c554eec159a59d37f4afd0f5d83e4060147d0e33eb80638865cb996ed7c598663c81e303515c0e209a5155f WHIRLPOOL adc63f29df990bb6df193d2f63cd7ead717e11acab07b4ea86cbfc9054f91290164ef600512aa813391ff5590aeaaf8d184f30d25d2ede3df9793f8fb16d3979
+EBUILD gtest-1.6.0-r2.ebuild 1505 SHA256 caaeb41276d2a49c331639be6bb4b5554a2a3274c0b2410eaa4d5f2b85949c0d SHA512 4b1ef912adf777e89a137a9e7c812349ef3d955567dfce90146fa51130a835cc28937d783f82acc4e554f5588743b61b4042bde2f566213822c21fa584950a9e WHIRLPOOL 2484c79e75e6d8cf5321670c3312a1af9d0fe69f8505d110d5d73c5eae912a0a8dedc4e0c0aada5f9b5193ba947a5fa170fb133e8c81489d3250006fd914a967
 EBUILD gtest-1.6.0.ebuild 1281 SHA256 9bccd7abfa3d8fafeeb786e975fe3183fa41e2b2428e8887b4b68413e7fc7aad SHA512 8246b7bb2dc68657bda9e7a0fa32f29a6f5b475f127a6450b92467ea3b641fff240282a28e9c2678d9900dc576cd8eca353aaea7a943aebe921e8d6ccd2025d7 WHIRLPOOL 63b2b736ccced1a0bb86b016229fcb58bb9287c54979412a0271dc81de2110f1cf1a9ba5aaeff4bc79dc70882d3379514b84cbf289a93ed9a2c1e2aa46b21632
-MISC ChangeLog 5832 SHA256 89094028e9d543ccd5c8498f185fc879909d9d3e1777046746932cbdba9b4da1 SHA512 eba1032f85350a4d894cd97fbacd665d9ad286657f846a9cfe6f8960ec5d22d6d57154bbd092e97cafd64aad2f2d0f1f500c004fd5a69835cba9888d41ed6836 WHIRLPOOL 2f35cbb8dbde156b6d3c49f2f5d3a9f2e766107b41fe54b485d3b1c8def306704f196bde8db0c37c409babe5cfa16145769681a4026caa3ebf40b101b4da6248
+MISC ChangeLog 5932 SHA256 884ceae9221d605f85125764da6202358d9d07d427ff34d30a9311f05453557b SHA512 d221b712ce7bea66bcc41998d16cd07f073970ce18f8021cc85f585f2524672045e195dd05f167b9de22a4ca6834f73f521eae60923616f8a20cd8e7e5e19e6f WHIRLPOOL c9ba7ae6475a1acdad14a0f4d38d26ce5d0e8d1b5110ea78fb074b8bc68947c0f8ade8d193d83231576d844495ede3b0ee6fd5e07177452d70edd7317609a100
 MISC metadata.xml 374 SHA256 776842821130b79f552271fe642b3e455006874c6eae5d1b9323e46a1670310a SHA512 a1248ebd1cc76617b425db3d91d8e96894561acb2fcca70c8524f50fa2f933e024d0d4a4d61797a90b42c00a6cfdce8a68057e94a82ce63dfd156037359a60cf WHIRLPOOL 99afc26196452541537ad72d29362547d3154c5f3772d5fd6fb9484ba499ed4b3567873b8eac3c5f2fa7f812b0466f2f3e5c5f25b168e9a069eb4ad2845fa99a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHB+/8ACgkQ1ycZbhPLE2AGzACgiPhhwxXRWPaTFoFsTcpSJ4sF
-qx8AnjJWkhUEI0BgJeqdBsHmpZrwNTir
-=8OFL
+iQJ8BAEBCABmBQJSDjrpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZD2pgP/2VF+Uw341oBopubfbpeu81b
+9JCwZggRbZ5nkZGlXYyGuUECJc++vs+zBCE2b2/NtZVkQe83MXafULhB/hzt5C+0
+skvMK4zXvsJCcBLLwkPEfKdBRt2Q3uVhfOA7k6UTCeRT5huKJjwrACoSFWFIrSZF
+oqGWX+I9lrBewpptVg6ImXh1YVqJZI45vMQzyNKbofAlsseIMcRypImZKahDP138
+tumgtwrAPAtaxZqGCuEiHrKMaSOCuZZeFA9TNGDtFdTg95dpGnKACeYOoXZhpKbo
+hPoIO9hOMdX4WmNOqzLjcc1mE/MGnStntl8eJ+CV2272FUFS9T8Tqm4+rAIXl47I
+HC1R03ESJfGskOvpFtZCnApBheU3W/1h+cTMIbXVFGnRjTNGeCs5FZf1AmnJVWoT
+FOMZTDZJe2D6fHc/gMkjlaLautesxlESsJcwnNc9t5nU6T1ShbdQWBgOH14BYFSN
+qVP8Jdx1jMAY5S/2wM3E/BEexB22VVagn4aOThkyjQ0E0n9KoYJin/mp2TEmrhaR
+5YUfLIO0Y/5GF6ktpWMWqS6Oygyggu6Be2NPrVx/Yrr6x+jorvM6xWtUu2XVwGLJ
+2IZxo4/lJzSWUle4qKcOgB87ob51cZ01WOJoLOQgbbtRHlO0lP5lT47eVTbp9+/e
++9bLy+wjVN8yOVy+TNam
+=jjSV
 -----END PGP SIGNATURE-----
diff --git a/dev-cpp/gtest/gtest-1.6.0-r2.ebuild b/dev-cpp/gtest/gtest-1.6.0-r2.ebuild
index b3d31c32077b..01731a73f2f7 100644
--- a/dev-cpp/gtest/gtest-1.6.0-r2.ebuild
+++ b/dev-cpp/gtest/gtest-1.6.0-r2.ebuild
@@ -1,11 +1,13 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r2.ebuild,v 1.2 2013/06/19 18:44:11 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/gtest/gtest-1.6.0-r2.ebuild,v 1.3 2013/08/16 14:44:49 mgorny Exp $
 
 EAPI="5"
-PYTHON_DEPEND="2"
 
-inherit eutils python autotools-multilib
+# Python is required for tests and some build tasks.
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils python-any-r1 autotools-multilib
 
 DESCRIPTION="Google C++ Testing Framework"
 HOMEPAGE="http://code.google.com/p/googletest/"
@@ -16,7 +18,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux ~ppc-macos"
 IUSE="examples static-libs"
 
-DEPEND="app-arch/unzip"
+DEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
 RDEPEND=""
 
 PATCHES=(
@@ -25,11 +28,6 @@ PATCHES=(
 
 AUTOTOOLS_AUTORECONF="1"
 
-pkg_setup() {
-	python_pkg_setup
-	python_set_active_version 2
-}
-
 src_prepare() {
 	sed -i -e "s|/tmp|${T}|g" test/gtest-filepath_test.cc || die
 	sed -i -r \
@@ -37,8 +35,6 @@ src_prepare() {
 		Makefile.am || die
 	autotools-multilib_src_prepare
 
-	python_convert_shebangs -r 2 .
-
 	multilib_copy_sources
 }