Improve/simplify interpreter choice code using new eclass code.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 26 insertions, 34 deletions

diff --git a/dev-python/pypy/ChangeLog b/dev-python/pypy/ChangeLog
index 9d4e23a50d2d..90834314fe15 100644
--- a/dev-python/pypy/ChangeLog
+++ b/dev-python/pypy/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/pypy
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.80 2014/11/08 23:10:10 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/ChangeLog,v 1.81 2014/11/09 22:47:27 mgorny Exp $
+
+  09 Nov 2014; Michał Górny <mgorny@gentoo.org> pypy-2.4.0.ebuild:
+  Improve/simplify interpreter choice code using new eclass code.
 
   08 Nov 2014; Michał Górny <mgorny@gentoo.org>
   -files/2.0.2-distutils-fix_handling_of_executables_and_flags.patch,
diff --git a/dev-python/pypy/Manifest b/dev-python/pypy/Manifest
index cb243873fc47..3cb9f3a1e230 100644
--- a/dev-python/pypy/Manifest
+++ b/dev-python/pypy/Manifest
@@ -8,25 +8,25 @@ AUX 2.3.1-shared-lib.patch 525 SHA256 865514044a180aaf707054aafbf78f8b834aedd4ce
 DIST pypy-2.3.1-src.tar.bz2 15225332 SHA256 3fd10d97c0177c33ed358a78eb26f5bf1f91b266af853564b1a9d8c310a1e439 SHA512 86aab86c5f413cdd6a56680915605de5c1416255b43a8dce1b4dcf8f1febdb3275076a4a9c7de30002387d59e4171a52da2528436eb205d8d947de7edd049c65 WHIRLPOOL c78d41240f1803d9461f797fd0ef647a40a6990a4e3a504e80a0eaaf460d052bb60fe6240cacdb3ee8737500c9c7f418b1d55c619d01ac7b73aace3d82157aa6
 DIST pypy-2.4.0-src.tar.bz2 15495214 SHA256 38810007aee4885ca0703b566db6594dd7649adaaa287df7a1012f10e067740f SHA512 91b41ed80a6ff0d7b2b134a7802f098de35ffd2068dc3e477d27b0bc821c6d329eb8bcad4db4a5ff9ff429830d4abfbeb435a2a2d2d9bbc2c36f2d21af0b2e0c WHIRLPOOL affb14b805b2dcb8b579dd421bfb8276e80d3b31cea41bf57ad5dd9260e2e27d838b0303e4a3af5ca38b0b4f08ac88b142d6f1db20753bec6f8cbfdfc482099b
 EBUILD pypy-2.3.1-r2.ebuild 6515 SHA256 3584119843cd8d8adc5b3ea7c27d53c99808ee318daf79ac68aa35bba7a36eaa SHA512 fc09ac9e3f47f2d986b14a53553b8c7eb447afbaed20ad8d55258d50a24132352633550326a9f81563365a5ce82932df06abc8d352917e1469ef651ef88caa4e WHIRLPOOL 1e472d27e7b1c068cbae7ce3287c55ce28524952a3faa1eec96274e132d22e5fefd0c95183444daf06951194939bddcaffcefaf8f97645056c15edb15735c6fe
-EBUILD pypy-2.4.0.ebuild 6478 SHA256 e5dd433780d37ec333377a96588300df5e6b2f0f3b52c55f0974843e9fed4a3f SHA512 21b84c7d2c8eee29d3d54350d41af97c7f200b86fbc02c009c0798f42ca5a5addd7bc8e9ebcbef2abb9c2472e8a6d59fb93785e968c0b7dd6cb0f2beb07970d5 WHIRLPOOL eb6a209d45743efd4c4417ef92df5e9bdbde70d83b262751e1c35344ddb9ec6bbe4221aadf7049cfbc194a34c8098a30d54db123bce4d6ffc5f780c95df98976
-MISC ChangeLog 14866 SHA256 4276b9a8735a95afacfb41c15f0b4ca2078017a4d04e4ae667f9c542ac1d84a3 SHA512 35c59eddbc7fb933d356da1ee14cd5ab2dc55f97a2c478633d7d2539f9f2925438d616d9b2264f7a95c0ef5c92bc72d1dfb67057fe392b97a4c814eacfa9fb1d WHIRLPOOL ab5532afcaa88f8391ac40b34329d83c854f0fc71defb952529777301cb156f2db5d920bd1b12de990a5f255d16c03167817deb57427bfc0f64ae95e74096e08
+EBUILD pypy-2.4.0.ebuild 6223 SHA256 09aa2117aa74419624a26ac4994c4e9842344eb81a244f40e0915297ae772d31 SHA512 58d00f08469e4e55e74e2c44ed0dc21a5bf34fcab35eae07e89a8ce781b1948e38ecfc35a46a4dffbf68c50c45fc35b29f78fbd42d0d3c73aef108901097459e WHIRLPOOL a9ecaaac96bfc0790733db98106b239a9f27be228eb8339cc5edcaeb6735b297ff72c91433d9594ae0292e83e4ccd78e04fe5aa742667ab1d3e86242ee4cf247
+MISC ChangeLog 15002 SHA256 38c32b497f57c9bb38d6e26953f3b6e5229900adca980f4179eb695393554fac SHA512 c67fa0838a654d3736481d85e5f256d1976a871170ab6c9fdce0b296e4da04eb7828b0cdd617284334993b8f586215f9969ae8f771e7ed03d7ac99168fd10caf WHIRLPOOL 107e42cd4d7728093e2c7d318e743b780a2b5913f6526c2ae75a1745c59a645e3fc1a098efd8afb7ed532881c555f2cd91ec344a1671d3c9653df258363c1bbb
 MISC metadata.xml 886 SHA256 90dfb3efc5ed246caf98dcf6b97d6b9106a71c9851592b1ae67d002930cc6704 SHA512 6d4b2898758739a8bb4aedc7b3d6a47f4223bd6c2403de65e7e913d6e1695afb94dd272dd05a239234fda5febdc78e62022d4f36cbfcaf87f4083a2720704304 WHIRLPOOL cbb63a846ca9e6ef5ce23d7165cdbdfe052a1ce559fdb2933db04d4081e3515a880672f9dda0759dc566e924b1375c21c7191a2c1ba11a61d0121923363567f1
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJUXqLTXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJUX+8AXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOzXYQAMXA3Bvk+37EjmlnMLwPJJ9n
-YX+lV3NaNpE8PQhNFgdG4uajVQsGoh270R8PW9Jn2VMQnL1JBn/yEZJtc6465bjw
-dyV70RmqUfsOFTRIgBlkXr9JmmqlhIq0I5XO8cd76ZZ+SevKBooN3Kc7DLzdjmNJ
-RZK8hduK4/l3SWNLBKUN6NyLepcifEQ8Ws6dWlUqfMzlyfbUb+3JXhgnLamF9Ur/
-wnEpqnyFq3jUwNbtfxWn+e0bozs4EE2/1DjZpt3I7LhttTAeIGG8eAvQv3cum94q
-h5ar4hVH1x5xNiYR5KyuB8Y0Nq388JgZrDWmGZAoZ3sAFvQo4cbrP+Crcs9tejP8
-cg/ZwNXBrafPjHZF5/H9tjJmJHmsRM8HDOa82Nd1K3nu3eA5zUOTOdTlqCdL+Yxa
-77+9IqDrcBivaw9tLisfVr4P5XK+aY2vEwXTLybU6ek9MP/k8UmEBkwMb/O3K3m/
-MGqwEVF47NNWfTwiIjeHi9cLBLLNMZBh/2qZFAJ8D7s0DX/L2UAjViIbSmhczUIw
-JaAM9/CBRKZByjrp0tql/KDM8PAGgxSRJ4VtjjNTO3JWR5MlJMC9033MQaIhjRWH
-HlPW1m6jDyu12mcxj7mhdOuE8Aw4wk8j1d2JPfcQGTbtfYlQpDuRNawGF3P69Wkg
-TbnEkettK3b4HVxqh6L0
-=0FmH
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZO9MgQAL1cXTH0bYe9cNuymIwGtOvN
+9/987HTo/CrdBgO9pvLmxuWl1mbWPPH1g2nPoZNV8p9Waw53NNheADST8cFai6NL
+cteDXiQtciXE6Ko4Vz1hqIBisr/x/zTb1FEud8U/8My3YKZCODtyyZzpT9BXg7Em
+0EkfvIRsmGxLJCEUJ3Ee7mYm90WP1NE3edzfk3BTuOwrDJOcNwiWWSP8MhB8oPKl
+sd1xPVy4AipGIT65pVmXcGwxd25NaM/3FnKBt96O6rLMZXD3nmDR5wltZRaDA9xP
+HeSaX0G/SDzA3l4nNiUy8J+ybXyQX1/nKnWvZ/O0v0NeIBdwFkrpKwhALd6VDFgF
+yblFNvJ+XTm78/EeNlXubw2fRIFWDBpJOobHlLp4pHdcUNnFMd7OxtNnBTcpCZNh
+k5DmWbXXTib+9bmo+4FFSeQrJXBl7+N76ADboA1xyaa+R20zJawaUXhrQrHUJrxX
+6A2m6ukgfwsh0TuqDkT6QEdEst8uul+SON0fTcxau3tu55OxjPgyO8amHAq0M2E4
+W2uh0DRH9VrR1/5mWCkuUqIi24OgtEZCg9a5qiRvE1Zmx939gKeJLtSZ+EjSO0DX
+bks5bwZNReRiE09WMDCRzkqmpVvS8zIQdg84AA8Mg+kmmpz9FNPYfuLC4hwW6WgA
+bF6do/8hmOHNsDss17kv
+=1ChM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pypy/pypy-2.4.0.ebuild b/dev-python/pypy/pypy-2.4.0.ebuild
index 10b9d24969c2..6fb18d90eba3 100644
--- a/dev-python/pypy/pypy-2.4.0.ebuild
+++ b/dev-python/pypy/pypy-2.4.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild,v 1.9 2014/11/08 23:04:12 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pypy/pypy-2.4.0.ebuild,v 1.10 2014/11/09 22:47:27 mgorny Exp $
 
 EAPI=5
 
@@ -40,8 +40,7 @@ S="${WORKDIR}/${P}-src"
 
 pkg_pretend() {
 	if use low-memory; then
-		if ! has_version dev-python/pypy && ! has_version dev-python/pypy-bin
-		then
+		if ! python_is_installed pypy; then
 			eerror "USE=low-memory requires a (possibly old) version of dev-python/pypy"
 			eerror "or dev-python/pypy-bin being installed. Please install it using e.g.:"
 			eerror
@@ -62,15 +61,12 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	local force_pypy
-
 	pkg_pretend
 
-	if has_version dev-python/pypy || has_version dev-python/pypy-bin
-	then
-		if [[ ! ${EPYTHON} ]] || use low-memory; then
+	if python_is_installed pypy; then
+		if [[ ! ${EPYTHON} || ${EPYTHON} == pypy ]] || use low-memory; then
 			einfo "Using already-installed PyPy to perform the translation."
-			force_pypy=1
+			local EPYTHON=pypy
 		else
 			einfo "Using ${EPYTHON} to perform the translation. Please note that upstream"
 			einfo "recommends using PyPy for that. If you wish to do so, please unset"
@@ -78,14 +74,7 @@ pkg_setup() {
 		fi
 	fi
 
-	if [[ ${force_pypy} ]]; then
-		# set manually since python_setup needs virtual/pypy
-		# and we don't force the dep
-		python_export pypy EPYTHON PYTHON
-		python_wrapper_setup
-	else
-		python-any-r1_pkg_setup
-	fi
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {