[gentoo-commits] repo/gentoo:master commit in: profiles/arch/amd64/, profiles/base/, profiles/desc/, profiles/arch/x86/

[gentoo-commits] repo/gentoo:master commit in: profiles/arch/amd64/, profiles/base/, profiles/desc/, profiles/arch/x86/

[Michał Górny]

commit:     da3b3d5f590cec0df88cff6734955a5ccb6e31c5
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Dec  9 19:23:53 2015 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Dec  9 20:41:16 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da3b3d5f

profiles: Remove jython2_5 flags

 profiles/arch/amd64/use.mask            | 2 --
 profiles/arch/x86/use.mask              | 2 --
 profiles/base/package.use.force         | 2 +-
 profiles/base/use.mask                  | 2 --
 profiles/desc/python_single_target.desc | 1 -
 profiles/desc/python_targets.desc       | 1 -
 6 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index f8fe6ce..136749a 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 ec44ea3..159d592 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 14abfe8..9c3f46f 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 af98fa0..a7a4a07 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 2eb0801..596bb5c 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 3168d91..6e1610f 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