diff options
author | David Seifert <soap@gentoo.org> | 2019-12-30 01:48:32 +0100 |
---|---|---|
committer | Michał Górny <mgorny@gentoo.org> | 2019-12-30 13:58:53 +0100 |
commit | e636f5a60842cf91e4a6435667dbc70689e7a231 (patch) | |
tree | e45781108c12be7ac5d6cf69957cb9b4ac8b2c19 | |
parent | python-utils-r1.eclass: Remove PYTHON_TARGETS="jython2_7" (diff) | |
download | gentoo-e636f5a60842cf91e4a6435667dbc70689e7a231.tar.gz gentoo-e636f5a60842cf91e4a6435667dbc70689e7a231.tar.bz2 gentoo-e636f5a60842cf91e4a6435667dbc70689e7a231.zip |
profiles: Remove dead PYTHON_TARGETS
Signed-off-by: David Seifert <soap@gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/14164
Signed-off-by: Michał Górny <mgorny@gentoo.org>
-rw-r--r-- | profiles/arch/amd64/package.use.stable.mask | 1 | ||||
-rw-r--r-- | profiles/arch/amd64/use.mask | 7 | ||||
-rw-r--r-- | profiles/arch/amd64/use.stable.mask | 2 | ||||
-rw-r--r-- | profiles/arch/base/use.mask | 2 | ||||
-rw-r--r-- | profiles/arch/riscv/rv64gc/use.mask | 2 | ||||
-rw-r--r-- | profiles/arch/x86/package.use.stable.mask | 1 | ||||
-rw-r--r-- | profiles/arch/x86/use.mask | 7 | ||||
-rw-r--r-- | profiles/arch/x86/use.stable.mask | 2 | ||||
-rw-r--r-- | profiles/base/package.use.force | 3 | ||||
-rw-r--r-- | profiles/base/use.mask | 5 | ||||
-rw-r--r-- | profiles/base/use.stable.mask | 2 | ||||
-rw-r--r-- | profiles/desc/python_single_target.desc | 3 | ||||
-rw-r--r-- | profiles/desc/python_targets.desc | 3 | ||||
-rw-r--r-- | profiles/features/prefix/standalone/kernel-2.6.16+/use.mask | 2 | ||||
-rw-r--r-- | profiles/features/selinux/package.use.mask | 16 | ||||
-rw-r--r-- | profiles/prefix/use.mask | 4 | ||||
-rw-r--r-- | profiles/prefix/windows/cygwin/use.mask | 1 |
17 files changed, 8 insertions, 55 deletions
diff --git a/profiles/arch/amd64/package.use.stable.mask b/profiles/arch/amd64/package.use.stable.mask index c3814e0fc7ed..c92316952397 100644 --- a/profiles/arch/amd64/package.use.stable.mask +++ b/profiles/arch/amd64/package.use.stable.mask @@ -100,5 +100,4 @@ gnustep-base/gnustep-make libobjc2 # Michał Górny <mgorny@gentoo.org> (2014-03-30) # Don't apply stable masks to python-exec since we're forcing every # impl there anyway. Please keep this in sync with use.stable.mask. -dev-lang/python-exec -python_targets_pypy dev-lang/python-exec -python_targets_pypy3 diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask index 273afa3f77fb..773b4862f2ed 100644 --- a/profiles/arch/amd64/use.mask +++ b/profiles/arch/amd64/use.mask @@ -42,8 +42,6 @@ # Michał Górny <mgorny@gentoo.org> (2014-03-30) # PyPy is keyworded on this arch. --python_targets_pypy --python_single_target_pypy -python_targets_pypy3 -python_single_target_pypy3 @@ -72,11 +70,6 @@ # IPMI is only implemented for x86, amd64 and ia64 -ipmi -# Ralph Sennhauser <sera@gentoo.org> (2012-07-31) -# Keyworded on amd64 --python_targets_jython2_7 --python_single_target_jython2_7 - # Joerg Bornkessel <hd_brummy@gentoo.org> (2012-03-05) # Unmask, works with v4l2, #350211 -dxr3 diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask index 632b974f29fb..5d32143f73f4 100644 --- a/profiles/arch/amd64/use.stable.mask +++ b/profiles/arch/amd64/use.stable.mask @@ -25,7 +25,5 @@ clozurecl # Michał Górny <mgorny@gentoo.org> (2014-03-30) # PyPy is unstable on this arch. -python_targets_pypy -python_single_target_pypy python_targets_pypy3 python_single_target_pypy3 diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask index 4a46bc011556..10bf338ad853 100644 --- a/profiles/arch/base/use.mask +++ b/profiles/arch/base/use.mask @@ -191,8 +191,6 @@ orc # Mike Gilbert <floppym@gentoo.org> (2013-01-02) # PyPy is unkeyworded on most arches. If you are running amd64 or x86, # please switch to one of the testing 13.0 profiles to get it. -python_targets_pypy -python_single_target_pypy python_targets_pypy3 python_single_target_pypy3 diff --git a/profiles/arch/riscv/rv64gc/use.mask b/profiles/arch/riscv/rv64gc/use.mask index 529c1d546345..6e01a574cebb 100644 --- a/profiles/arch/riscv/rv64gc/use.mask +++ b/profiles/arch/riscv/rv64gc/use.mask @@ -7,8 +7,6 @@ # Our Python has a lot of trouble with the two-level libdir. python_targets_python2_7 -python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 -python_single_target_python3_5 python_single_target_python3_6 diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask index 72e4dea554ab..613458e8f88e 100644 --- a/profiles/arch/x86/package.use.stable.mask +++ b/profiles/arch/x86/package.use.stable.mask @@ -94,5 +94,4 @@ dev-cpp/eigen test # Michał Górny <mgorny@gentoo.org> (2014-03-30) # Don't apply stable masks to python-exec since we're forcing every # impl there anyway. Please keep this in sync with use.stable.mask. -dev-lang/python-exec -python_targets_pypy dev-lang/python-exec -python_targets_pypy3 diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask index d7fb537d7955..bfe15cba31f1 100644 --- a/profiles/arch/x86/use.mask +++ b/profiles/arch/x86/use.mask @@ -38,8 +38,6 @@ python_single_target_python3_7 # Michał Górny <mgorny@gentoo.org> (2014-03-30) # PyPy is keyworded on this arch. --python_targets_pypy --python_single_target_pypy -python_targets_pypy3 -python_single_target_pypy3 @@ -69,11 +67,6 @@ python_single_target_python3_7 # IPMI is only implemented for x86, amd64 and ia64 -ipmi -# Ralph Sennhauser <sera@gentoo.org> (2012-07-31) -# Keyworded on x86 --python_targets_jython2_7 --python_single_target_jython2_7 - # Joerg Bornkessel <hd_brummy@gentoo.org> (2012-03-05) # Unmask, works with v4l2, #350211 -dxr3 diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask index eae8d7442ac9..580c08661a6b 100644 --- a/profiles/arch/x86/use.stable.mask +++ b/profiles/arch/x86/use.stable.mask @@ -25,7 +25,5 @@ clozurecl # Michał Górny <mgorny@gentoo.org> (2014-03-30) # PyPy is unstable on this arch. -python_targets_pypy -python_single_target_pypy python_targets_pypy3 python_single_target_pypy3 diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index bd35fdae7247..5423bfcf2ba0 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -106,12 +106,9 @@ app-shells/bash:0 readline # 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 -dev-lang/python-exec python_targets_python3_5 dev-lang/python-exec python_targets_python3_6 dev-lang/python-exec python_targets_python3_7 dev-lang/python-exec python_targets_python3_8 -dev-lang/python-exec python_targets_jython2_7 -dev-lang/python-exec python_targets_pypy dev-lang/python-exec python_targets_pypy3 # Zac Medico <zmedico@gentoo.org> (2010-10-20) diff --git a/profiles/base/use.mask b/profiles/base/use.mask index aeae877243cf..ad09289730d6 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -88,11 +88,6 @@ prefix-stack # masking flags that only apply to FreeBSD kqueue -# Ralph Sennhauser <sera@gentoo.org> (2012-07-31) -# Unmask in arch specific profiles when jython implementaton is available. -python_targets_jython2_7 -python_single_target_jython2_7 - # Diego Elio Pettenò <flameeyes@gentoo.org> (2012-08-18) # Prelude is being masked for removal prelude diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask index 9c76a0e79acf..2ac81425eac1 100644 --- a/profiles/base/use.stable.mask +++ b/profiles/base/use.stable.mask @@ -18,8 +18,6 @@ postgres_targets_postgres12 # Zac Medico <zmedico@gentoo.org> (2016-09-01) # Needs virtual/pypy* stable -python_targets_pypy -python_single_target_pypy python_targets_pypy3 python_single_target_pypy3 diff --git a/profiles/desc/python_single_target.desc b/profiles/desc/python_single_target.desc index 574d99eb6a5b..6f8f16d8d04f 100644 --- a/profiles/desc/python_single_target.desc +++ b/profiles/desc/python_single_target.desc @@ -4,10 +4,7 @@ # This file contains descriptions of PYTHON_SINGLE_TARGET USE_EXPAND flags. python2_7 - Build for Python 2.7 only -python3_5 - Build for Python 3.5 only python3_6 - Build for Python 3.6 only python3_7 - Build for Python 3.7 only python3_8 - Build for Python 3.8 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 4827da4af78f..7823e2baa42f 100644 --- a/profiles/desc/python_targets.desc +++ b/profiles/desc/python_targets.desc @@ -4,10 +4,7 @@ # This file contains descriptions of PYTHON_TARGETS USE_EXPAND flags. python2_7 - Build with Python 2.7 -python3_5 - Build with Python 3.5 python3_6 - Build with Python 3.6 python3_7 - Build with Python 3.7 python3_8 - Build with Python 3.8 -jython2_7 - Build with Jython 2.7 -pypy - Build with PyPy pypy3 - Build with PyPy3 diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask index b7f146f8d4a1..83862097866b 100644 --- a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask +++ b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask @@ -1,3 +1 @@ # >=python-3 is masked -python_single_target_python3_5 -python_targets_python3_5 diff --git a/profiles/features/selinux/package.use.mask b/profiles/features/selinux/package.use.mask index 287c2abb966b..ed28e6e8aad5 100644 --- a/profiles/features/selinux/package.use.mask +++ b/profiles/features/selinux/package.use.mask @@ -7,14 +7,14 @@ net-analyzer/wireshark sdjournal # Brian Dolbec <dolsen@gentoo.org> (2014-09-17) # mask pypy for several utilities due to incompatibility with libselinux -sys-apps/portage python_targets_pypy python_targets_pypy3 -app-portage/gentoolkit python_targets_pypy python_targets_pypy3 -app-portage/layman python_targets_pypy python_targets_pypy3 -app-admin/webapp-config python_targets_pypy python_targets_pypy3 -app-portage/diffmask python_targets_pypy python_targets_pypy3 -app-portage/flaggie python_targets_pypy python_targets_pypy3 -app-portage/gentoopm python_targets_pypy python_targets_pypy3 -app-portage/gpyutils python_targets_pypy python_targets_pypy3 +sys-apps/portage python_targets_pypy3 +app-portage/gentoolkit python_targets_pypy3 +app-portage/layman python_targets_pypy3 +app-admin/webapp-config python_targets_pypy3 +app-portage/diffmask python_targets_pypy3 +app-portage/flaggie python_targets_pypy3 +app-portage/gentoopm python_targets_pypy3 +app-portage/gpyutils python_targets_pypy3 # Jason Zaman <perfinion@gentoo.org> (2015-06-27) # SystemD has no support in the SELinux policy at the moment. diff --git a/profiles/prefix/use.mask b/profiles/prefix/use.mask index 6346ec770537..68ccdc24bdc8 100644 --- a/profiles/prefix/use.mask +++ b/profiles/prefix/use.mask @@ -21,9 +21,5 @@ kernel_linux # coreutils on darwin. acl -# Prefix removed python3_5 from PYTHON_TARGETS and PYTHON_SINGLE_TARGET -python_targets_python3_5 -python_single_target_python3_5 - # Similar for Ruby 2.3 ruby_targets_ruby23 diff --git a/profiles/prefix/windows/cygwin/use.mask b/profiles/prefix/windows/cygwin/use.mask index 392ef405f2e6..051c6484f403 100644 --- a/profiles/prefix/windows/cygwin/use.mask +++ b/profiles/prefix/windows/cygwin/use.mask @@ -5,5 +5,4 @@ -elibc_Cygwin # we do have only python-3.6 ready on cygwin -python_targets_python3_5 python_targets_python3_7 |