diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2015-12-09 20:21:32 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2015-12-09 21:41:16 +0100 |
| commit | f16b1c0b5321673d017ac61af3623041f155c71a (patch) | |
| tree | c3b9467b1f2a257e0a8dcfa872a7320bb562502f | |
| parent | distutils-r1.eclass: Unset local functions after use (diff) | |
| download | gentoo-f16b1c0b5321673d017ac61af3623041f155c71a.tar.gz gentoo-f16b1c0b5321673d017ac61af3623041f155c71a.tar.bz2 gentoo-f16b1c0b5321673d017ac61af3623041f155c71a.zip | |
python-utils-r1.eclass: Disable jython2_5
| -rw-r--r-- | eclass/python-utils-r1.eclass | 6 | ||||
| -rwxr-xr-x | eclass/tests/python-utils-r1.sh | 1 |
2 files changed, 2 insertions, 5 deletions
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 3ea23a81f2d1..cf0e13496245 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -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';; *) diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh index b89acfd4b295..922b690754e3 100755 --- a/eclass/tests/python-utils-r1.sh +++ b/eclass/tests/python-utils-r1.sh @@ -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}" |