| 1 |
commit: 39240792a3478d7777382ba08bdb8bca2e23f446 |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Dec 9 19:21:32 2015 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Dec 9 19:29:33 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39240792 |
| 7 |
|
| 8 |
python-utils-r1.eclass: Disable jython2_5 |
| 9 |
|
| 10 |
eclass/python-utils-r1.eclass | 6 ++---- |
| 11 |
eclass/tests/python-utils-r1.sh | 1 - |
| 12 |
2 files changed, 2 insertions(+), 5 deletions(-) |
| 13 |
|
| 14 |
diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass |
| 15 |
index 3ea23a8..cf0e134 100644 |
| 16 |
--- a/eclass/python-utils-r1.eclass |
| 17 |
+++ b/eclass/python-utils-r1.eclass |
| 18 |
@@ -44,7 +44,7 @@ declare -g -r _PYTHON_ALL_IMPLS=( |
| 19 |
python2_7 |
| 20 |
python3_3 python3_4 python3_5 |
| 21 |
pypy pypy3 |
| 22 |
- jython2_5 jython2_7 |
| 23 |
+ jython2_7 |
| 24 |
) |
| 25 |
|
| 26 |
# @FUNCTION: _python_impl_supported |
| 27 |
@@ -67,7 +67,7 @@ _python_impl_supported() { |
| 28 |
# keep in sync with _PYTHON_ALL_IMPLS! |
| 29 |
# (not using that list because inline patterns shall be faster) |
| 30 |
case "${impl}" in |
| 31 |
- python2_7|python3_[345]|jython2_[57]) |
| 32 |
+ python2_7|python3_[345]|jython2_7) |
| 33 |
return 0 |
| 34 |
;; |
| 35 |
pypy1_[89]|pypy2_0|python2_[56]|python3_[12]) |
| 36 |
@@ -368,8 +368,6 @@ python_export() { |
| 37 |
PYTHON_PKG_DEP='virtual/pypy:0=';; |
| 38 |
pypy3) |
| 39 |
PYTHON_PKG_DEP='virtual/pypy3:0=';; |
| 40 |
- jython2.5) |
| 41 |
- PYTHON_PKG_DEP='>=dev-java/jython-2.5.3-r2:2.5';; |
| 42 |
jython2.7) |
| 43 |
PYTHON_PKG_DEP='dev-java/jython:2.7';; |
| 44 |
*) |
| 45 |
|
| 46 |
diff --git a/eclass/tests/python-utils-r1.sh b/eclass/tests/python-utils-r1.sh |
| 47 |
index b89acfd..922b690 100755 |
| 48 |
--- a/eclass/tests/python-utils-r1.sh |
| 49 |
+++ b/eclass/tests/python-utils-r1.sh |
| 50 |
@@ -175,7 +175,6 @@ test_is "_python_impl_supported pypy1_9" 1 |
| 51 |
test_is "_python_impl_supported pypy2_0" 1 |
| 52 |
test_is "_python_impl_supported pypy" 0 |
| 53 |
test_is "_python_impl_supported pypy3" 0 |
| 54 |
-test_is "_python_impl_supported jython2_5" 0 |
| 55 |
test_is "_python_impl_supported jython2_7" 0 |
| 56 |
|
| 57 |
rm "${tmpfile}" |
Archives