Disable pypy2_0 and clean up after it.

5 files changed, 18 insertions, 42 deletions

diff --git a/eclass/ChangeLog b/eclass/ChangeLog
index 7811fb1ebb75..a3f60403b30c 100644
--- a/eclass/ChangeLog
+++ b/eclass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for eclass directory
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1197 2014/04/05 20:56:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1198 2014/04/08 16:05:30 mgorny Exp $
+
+  08 Apr 2014; Michał Górny <mgorny@gentoo.org> python-any-r1.eclass,
+  python-r1.eclass, python-utils-r1.eclass, tests/python-utils-r1.sh:
+  Disable pypy2_0 and clean up after it.
 
   05 Apr 2014; Michał Górny <mgorny@gentoo.org> python-r1.eclass:
   Fix improper suggestions to put unsupported implmentations in USE_PYTHON, bug
diff --git a/eclass/python-any-r1.eclass b/eclass/python-any-r1.eclass
index 46506d3e1d32..76a82710d1b3 100644
--- a/eclass/python-any-r1.eclass
+++ b/eclass/python-any-r1.eclass
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.16 2013/10/22 15:16:56 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-any-r1.eclass,v 1.17 2014/04/08 16:05:30 mgorny Exp $
 
 # @ECLASS: python-any-r1
 # @MAINTAINER:
@@ -230,10 +230,7 @@ _python_EPYTHON_supported() {
 	local i=${EPYTHON/./_}
 
 	case "${i}" in
-		python*|jython*)
-			;;
-		pypy-c*)
-			i=${i/-c/}
+		python*|jython*|pypy*)
 			;;
 		*)
 			ewarn "Invalid EPYTHON: ${EPYTHON}"
diff --git a/eclass/python-r1.eclass b/eclass/python-r1.eclass
index 6e69d36ac22d..57ae26308a26 100644
--- a/eclass/python-r1.eclass
+++ b/eclass/python-r1.eclass
@@ -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/eclass/python-r1.eclass,v 1.67 2014/04/05 20:56:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-r1.eclass,v 1.68 2014/04/08 16:05:30 mgorny Exp $
 
 # @ECLASS: python-r1
 # @MAINTAINER:
@@ -85,7 +85,7 @@ fi
 #
 # Example:
 # @CODE
-# PYTHON_COMPAT_OVERRIDE='pypy2_0 python3_3' emerge -1v dev-python/foo
+# PYTHON_COMPAT_OVERRIDE='pypy python3_3' emerge -1v dev-python/foo
 # @CODE
 
 # @ECLASS-VARIABLE: PYTHON_REQ_USE
@@ -561,9 +561,6 @@ _python_check_USE_PYTHON() {
 				jython*)
 					abi=${impl#jython}-jython
 					;;
-				pypy*)
-					abi=2.7-pypy-${impl#pypy}
-					;;
 				*)
 					die "Unexpected Python implementation: ${impl}"
 					;;
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 979e44954f0a..759998443078 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -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/eclass/python-utils-r1.eclass,v 1.52 2014/03/13 08:10:46 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/python-utils-r1.eclass,v 1.53 2014/04/08 16:05:30 mgorny Exp $
 
 # @ECLASS: python-utils-r1
 # @MAINTAINER:
@@ -41,7 +41,7 @@ inherit eutils multilib toolchain-funcs
 # All supported Python implementations, most preferred last.
 _PYTHON_ALL_IMPLS=(
 	jython2_5 jython2_7
-	pypy2_0 pypy
+	pypy
 	python3_2 python3_3 python3_4
 	python2_6 python2_7
 )
@@ -66,10 +66,10 @@ _python_impl_supported() {
 	# keep in sync with _PYTHON_ALL_IMPLS!
 	# (not using that list because inline patterns shall be faster)
 	case "${impl}" in
-		python2_[67]|python3_[234]|pypy2_0|jython2_[57])
+		python2_[67]|python3_[234]|jython2_[57])
 			return 0
 			;;
-		pypy1_[89]|python2_5|python3_1)
+		pypy1_[89]|pypy2_0|python2_5|python3_1)
 			return 1
 			;;
 		pypy)
@@ -239,15 +239,6 @@ python_export() {
 			impl=${1}
 			shift
 			;;
-		pypy-c*)
-			impl=${1}
-			shift
-			;;
-		pypy*)
-			local v=${1#pypy}
-			impl=pypy-c${v/_/.}
-			shift
-			;;
 		*)
 			impl=${EPYTHON}
 			[[ ${impl} ]] || die "python_export: no impl nor EPYTHON"
@@ -268,15 +259,12 @@ python_export() {
 			PYTHON_SITEDIR)
 				local dir
 				case "${impl}" in
-					python*)
+					python*|pypy)
 						dir=/usr/$(get_libdir)/${impl}
 						;;
 					jython*)
 						dir=/usr/share/${impl/n/n-}/Lib
 						;;
-					pypy*)
-						dir=/usr/$(get_libdir)/${impl/-c/}
-						;;
 				esac
 
 				export PYTHON_SITEDIR=${EPREFIX}${dir}/site-packages
@@ -288,8 +276,8 @@ python_export() {
 					python*)
 						dir=/usr/include/${impl}
 						;;
-					pypy*)
-						dir=/usr/$(get_libdir)/${impl/-c/}/include
+					pypy)
+						dir=/usr/$(get_libdir)/${impl}/include
 						;;
 					*)
 						die "${impl} lacks header files"
@@ -368,8 +356,6 @@ python_export() {
 						PYTHON_PKG_DEP='>=dev-lang/python-3.3.2-r2:3.3';;
 					python*)
 						PYTHON_PKG_DEP="dev-lang/python:${impl#python}";;
-					pypy-c2.0)
-						PYTHON_PKG_DEP='>=virtual/pypy-2.0.2:2.0';;
 					pypy)
 						PYTHON_PKG_DEP='virtual/pypy:0=';;
 					jython2.5)
@@ -517,7 +503,7 @@ _python_rewrite_shebang() {
 
 	local impl
 	case "${1}" in
-		python*|jython*|pypy-c*)
+		python*|jython*|pypy*)
 			impl=${1}
 			shift
 			;;
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index eb175f496daa..ff98d83f2984 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -54,13 +54,6 @@ test_var PYTHON_SITEDIR jython2_7 /usr/share/jython-2.7/Lib/site-packages
 test_var PYTHON_PKG_DEP jython2_7 '*dev-java/jython*:2.7'
 test_var PYTHON_SCRIPTDIR jython2_7 /usr/lib/python-exec/jython2.7
 
-test_var EPYTHON pypy2_0 pypy-c2.0
-test_var PYTHON pypy2_0 /usr/bin/pypy-c2.0
-test_var PYTHON_SITEDIR pypy2_0 /usr/lib/pypy2.0/site-packages
-test_var PYTHON_INCLUDEDIR pypy2_0 /usr/lib/pypy2.0/include
-test_var PYTHON_PKG_DEP pypy2_0 '*virtual/pypy*:2.0'
-test_var PYTHON_SCRIPTDIR pypy2_0 /usr/lib/python-exec/pypy-c2.0
-
 test_var EPYTHON pypy pypy
 test_var PYTHON pypy /usr/bin/pypy
 test_var PYTHON_SITEDIR pypy /usr/lib/pypy/site-packages
@@ -71,7 +64,6 @@ test_var PYTHON_SCRIPTDIR pypy /usr/lib/python-exec/pypy
 test_is python_is_python3 python2.7 1
 test_is python_is_python3 python3.2 0
 test_is python_is_python3 jython2.7 1
-test_is python_is_python3 pypy2.0 1
 test_is python_is_python3 pypy 1
 
 texit