[gentoo-commits] repo/gentoo:master commit in: eclass/tests/, eclass/

["Michał Górny" <mgorny@gentoo.org>]

commit:     8844b4c200dc82d7d09547b3d913f011f05cf592
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 00:48:32 2019 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 12:58:51 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8844b4c2

python-utils-r1.eclass: Remove PYTHON_TARGETS="pypy"

* With the EOL of CPython 2, we also want to
  remove support for PyPy (i.e. PyPy for Python 2).
  This change does not affect PyPy3, i.e. Pypy for
  Python 3.

Signed-off-by: David Seifert <soap <AT> gentoo.org>
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 eclass/python-utils-r1.eclass   | 6 +++---
 eclass/tests/python-utils-r1.sh | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass
index 370898bcea0..09b501a4ad2 100644
--- a/eclass/python-utils-r1.eclass
+++ b/eclass/python-utils-r1.eclass
@@ -40,7 +40,7 @@ inherit toolchain-funcs
 # All supported Python implementations, most preferred last.
 _PYTHON_ALL_IMPLS=(
 	jython2_7
-	pypy pypy3
+	pypy3
 	python2_7
 	python3_6 python3_7 python3_8
 )
@@ -78,10 +78,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_7|python3_[678]|jython2_7|pypy|pypy3)
+		python2_7|python3_[678]|jython2_7|pypy3)
 			return 0
 			;;
-		pypy1_[89]|pypy2_0|python2_[56]|python3_[12345])
+		pypy|pypy1_[89]|pypy2_0|python2_[56]|python3_[12345])
 			return 1
 			;;
 		*)

diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh
index df77a3fcf6e..f8d4858da7c 100755
--- a/eclass/tests/python-utils-r1.sh
+++ b/eclass/tests/python-utils-r1.sh
@@ -188,7 +188,7 @@ test_is "_python_impl_supported python3_8" 0
 test_is "_python_impl_supported pypy1_8" 1
 test_is "_python_impl_supported pypy1_9" 1
 test_is "_python_impl_supported pypy2_0" 1
-test_is "_python_impl_supported pypy" 0
+test_is "_python_impl_supported pypy" 1
 test_is "_python_impl_supported pypy3" 0
 test_is "_python_impl_supported jython2_7" 0