python-utils-r1.eclass: Disable jython2_5
authorMichał Górny <mgorny@gentoo.org>
Wed, 9 Dec 2015 19:21:32 +0000 (20:21 +0100)
committerMichał Górny <mgorny@gentoo.org>
Wed, 9 Dec 2015 20:41:16 +0000 (21:41 +0100)
eclass/python-utils-r1.eclass
eclass/tests/python-utils-r1.sh

index 3ea23a81f2d11afc1503e343a6a854cf31ef2f28..cf0e13496245bc89b1ae4eb0d28eba7ede3f1b8f 100644 (file)
@@ -44,7 +44,7 @@ declare -g -r _PYTHON_ALL_IMPLS=(
        python2_7
        python3_3 python3_4 python3_5
        pypy pypy3
-       jython2_5 jython2_7
+       jython2_7
 )
 
 # @FUNCTION: _python_impl_supported
@@ -67,7 +67,7 @@ _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_[345]|jython2_[57])
+               python2_7|python3_[345]|jython2_7)
                        return 0
                        ;;
                pypy1_[89]|pypy2_0|python2_[56]|python3_[12])
@@ -368,8 +368,6 @@ python_export() {
                                                PYTHON_PKG_DEP='virtual/pypy:0=';;
                                        pypy3)
                                                PYTHON_PKG_DEP='virtual/pypy3:0=';;
-                                       jython2.5)
-                                               PYTHON_PKG_DEP='>=dev-java/jython-2.5.3-r2:2.5';;
                                        jython2.7)
                                                PYTHON_PKG_DEP='dev-java/jython:2.7';;
                                        *)
index b89acfd4b2951515e488cc21ee59dfaae9e1e777..922b690754e3095bc421752b13e6c80eefc6dedd 100755 (executable)
@@ -175,7 +175,6 @@ 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 pypy3" 0
-test_is "_python_impl_supported jython2_5" 0
 test_is "_python_impl_supported jython2_7" 0
 
 rm "${tmpfile}"