commit: f2cddf799029258efea18ffcff9110a3367761ec Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Jan 15 14:11:01 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Jan 15 17:05:54 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2cddf79
profiles: Remove python3_6 flags Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/18873 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> profiles/arch/riscv/use.mask | 4 +--- profiles/base/package.use.force | 3 +-- profiles/base/use.mask | 8 -------- profiles/desc/python_single_target.desc | 3 +-- profiles/desc/python_targets.desc | 3 +-- 5 files changed, 4 insertions(+), 17 deletions(-) diff --git a/profiles/arch/riscv/use.mask b/profiles/arch/riscv/use.mask index 4dc60e18d16..702524e3a47 100644 --- a/profiles/arch/riscv/use.mask +++ b/profiles/arch/riscv/use.mask @@ -1,4 +1,4 @@ -# Copyright 2019-2020 Gentoo Authors +# Copyright 2019-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Unmask the flag which corresponds to ARCH. @@ -8,9 +8,7 @@ -systemd # Our Python has a lot of trouble with the two-level libdir. python_targets_python2_7 -python_targets_python3_6 python_single_target_python2_7 -python_single_target_python3_6 # Ben Kohler <bkoh...@gentoo.org> (2019-01-09) # no fam providers keyworded yet diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index 52f7499a622..59d626b6636 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Lars Wendler <polynomia...@gentoo.org> (2020-12-31) @@ -163,7 +163,6 @@ 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_6 dev-lang/python-exec python_targets_python3_7 dev-lang/python-exec python_targets_python3_8 dev-lang/python-exec python_targets_python3_9 diff --git a/profiles/base/use.mask b/profiles/base/use.mask index 11e7560900e..ca2703dd53e 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -10,14 +10,6 @@ php_targets_php7-2 php7-2 -# Michał Górny <mgo...@gentoo.org> (2021-01-01) -# The support for python3.6 target in Gentoo is discontinued. -# The flags are masked to permit removal of the last backport packages. -# Once they're gone, the eclass support will be disabled and the flags -# removed. -python_targets_python3_6 -python_single_target_python3_6 - # Alexis Ballier <aball...@gentoo.org> (2020-10-13) # Nothing depends on those ROS messages. dev-ros/geneus # is half broken in our setup where it looks for packages diff --git a/profiles/desc/python_single_target.desc b/profiles/desc/python_single_target.desc index 8101fce1ec7..08637d9955c 100644 --- a/profiles/desc/python_single_target.desc +++ b/profiles/desc/python_single_target.desc @@ -1,10 +1,9 @@ -# Copyright 1999-2020 Gentoo Authors. +# Copyright 1999-2021 Gentoo Authors. # Distributed under the terms of the GNU General Public License v2 # This file contains descriptions of PYTHON_SINGLE_TARGET USE_EXPAND flags. python2_7 - Build for Python 2.7 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 python3_9 - Build for Python 3.9 only diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc index da103c79778..0bea2b63748 100644 --- a/profiles/desc/python_targets.desc +++ b/profiles/desc/python_targets.desc @@ -1,10 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors. +# Copyright 1999-2021 Gentoo Authors. # Distributed under the terms of the GNU General Public License v2 # This file contains descriptions of PYTHON_TARGETS USE_EXPAND flags. python2_7 - Build with Python 2.7 -python3_6 - Build with Python 3.6 python3_7 - Build with Python 3.7 python3_8 - Build with Python 3.8 python3_9 - Build with Python 3.9
