summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2015-12-09 20:23:53 +0100
committerMichał Górny <mgorny@gentoo.org>2015-12-09 21:41:16 +0100
commitda3b3d5f590cec0df88cff6734955a5ccb6e31c5 (patch)
tree66e02221d2645f2d98317ba060f4888f46fb6ac5 /profiles
parentpython-utils-r1.eclass tests: Fix to ensure PYTHON for python_export (diff)
downloadgentoo-da3b3d5f590cec0df88cff6734955a5ccb6e31c5.tar.gz
gentoo-da3b3d5f590cec0df88cff6734955a5ccb6e31c5.tar.bz2
gentoo-da3b3d5f590cec0df88cff6734955a5ccb6e31c5.zip
profiles: Remove jython2_5 flags
Diffstat (limited to 'profiles')
-rw-r--r--profiles/arch/amd64/use.mask2
-rw-r--r--profiles/arch/x86/use.mask2
-rw-r--r--profiles/base/package.use.force2
-rw-r--r--profiles/base/use.mask2
-rw-r--r--profiles/desc/python_single_target.desc1
-rw-r--r--profiles/desc/python_targets.desc1
6 files changed, 1 insertions, 9 deletions
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index f8fe6ce1d8c..136749a5a09 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -57,8 +57,6 @@
# Ralph Sennhauser <sera@gentoo.org> (31 Jul 2012)
# Keyworded on amd64
--python_targets_jython2_5
--python_single_target_jython2_5
-python_targets_jython2_7
-python_single_target_jython2_7
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index ec44ea326a3..159d592cf63 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -56,8 +56,6 @@
# Ralph Sennhauser <sera@gentoo.org> (31 Jul 2012)
# Keyworded on x86
--python_targets_jython2_5
--python_single_target_jython2_5
-python_targets_jython2_7
-python_single_target_jython2_7
diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force
index 14abfe82eac..9c3f46f16a4 100644
--- a/profiles/base/package.use.force
+++ b/profiles/base/package.use.force
@@ -34,7 +34,7 @@ app-shells/bash:0 readline
# Michał Górny <mgorny@gentoo.org> (14 Oct 2012)
# Force-enable all PYTHON_TARGETS for python-exec to avoid using private
# API. Please remember to keep it in sync with python_targets.desc.
-dev-lang/python-exec python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_jython2_5 python_targets_jython2_7 python_targets_pypy python_targets_pypy3
+dev-lang/python-exec python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 python_targets_jython2_7 python_targets_pypy python_targets_pypy3
# Zac Medico <zmedico@gentoo.org> (20 Oct 2010)
# Force ipc USE flag since it should remain enabled unless
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index af98fa022b4..a7a4a072c8f 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -331,10 +331,8 @@ dxr3
# Ralph Sennhauser <sera@gentoo.org> (31 Jul 2012)
# Unmask in arch specific profiles when jython implementaton is available.
-python_targets_jython2_5
python_targets_jython2_7
python_targets_jython3_1
-python_single_target_jython2_5
python_single_target_jython2_7
python_single_target_jython3_1
diff --git a/profiles/desc/python_single_target.desc b/profiles/desc/python_single_target.desc
index 2eb0801ea33..596bb5cd67a 100644
--- a/profiles/desc/python_single_target.desc
+++ b/profiles/desc/python_single_target.desc
@@ -9,7 +9,6 @@ python3_2 - Build for Python 3.2 only (deprecated)
python3_3 - Build for Python 3.3 only
python3_4 - Build for Python 3.4 only
python3_5 - Build for Python 3.5 only
-jython2_5 - Build for Jython 2.5 only
jython2_7 - Build for Jython 2.7 only
pypy - Build for PyPy only
pypy3 - Build for PyPy3 only
diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc
index 3168d918a04..6e1610f46fb 100644
--- a/profiles/desc/python_targets.desc
+++ b/profiles/desc/python_targets.desc
@@ -10,7 +10,6 @@ python3_2 - Build with Python 3.2 (deprecated)
python3_3 - Build with Python 3.3
python3_4 - Build with Python 3.4
python3_5 - Build with Python 3.5
-jython2_5 - Build with Jython 2.5
jython2_7 - Build with Jython 2.7
pypy2_0 - Build with PyPy 2.0 (removed)
pypy - Build with PyPy