diff options
| -rw-r--r-- | dev-perl/GD/GD-2.730.0.ebuild | 2 | ||||
| -rw-r--r-- | dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild | 2 | ||||
| -rw-r--r-- | eclass/python-utils-r1.eclass | 4 | ||||
| -rw-r--r-- | profiles/base/make.defaults | 10 | ||||
| -rw-r--r-- | profiles/base/package.use.force | 1 | ||||
| -rw-r--r-- | profiles/desc/python_single_target.desc | 1 | ||||
| -rw-r--r-- | profiles/desc/python_targets.desc | 1 | ||||
| -rw-r--r-- | profiles/embedded/make.defaults | 2 | ||||
| -rw-r--r-- | profiles/prefix/windows/cygwin/use.mask | 5 |
9 files changed, 11 insertions, 17 deletions
diff --git a/dev-perl/GD/GD-2.730.0.ebuild b/dev-perl/GD/GD-2.730.0.ebuild index d6d5874dceeb..7c2acda1ecf6 100644 --- a/dev-perl/GD/GD-2.730.0.ebuild +++ b/dev-perl/GD/GD-2.730.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Interface to Thomas Boutell's gd library" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~sparc" IUSE="animgif fcgi gif jpeg png test truetype xpm" RDEPEND=" diff --git a/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild b/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild index 212d72844ee1..80a2d26293ba 100644 --- a/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild +++ b/dev-perl/Test-Fork/Test-Fork-0.20.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="test code which forks" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc" +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~sparc" IUSE="test" RESTRICT="!test? ( test )" diff --git a/eclass/python-utils-r1.eclass b/eclass/python-utils-r1.eclass index 0082a231f0a0..3dbf221eac5d 100644 --- a/eclass/python-utils-r1.eclass +++ b/eclass/python-utils-r1.eclass @@ -42,7 +42,7 @@ inherit toolchain-funcs # All supported Python implementations, most preferred last. _PYTHON_ALL_IMPLS=( pypy3 - python3_{7..10} + python3_{8..10} ) readonly _PYTHON_ALL_IMPLS @@ -54,7 +54,7 @@ _PYTHON_HISTORICAL_IMPLS=( jython2_7 pypy pypy1_{8,9} pypy2_0 python2_{5..7} - python3_{1..6} + python3_{1..7} ) readonly _PYTHON_HISTORICAL_IMPLS diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 04c72b0d582f..baa4de239bad 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -13,7 +13,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU" # Env vars to expand into USE vars. Modifying this requires prior # discussion on gentoo-dev@lists.gentoo.org. -USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS" +USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS" # USE_EXPAND variables whose contents are not shown in package manager # output. Changes need discussion on gentoo-dev. @@ -127,10 +127,10 @@ BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr python_targets_python3 # Mike Gilbert <floppym@gentoo.org> (2012-05-15) # Default target(s) for python-r1.eclass -# Mikle Kolyada <zlogene@gentoo.org> (2020-12-02) -# Updated to python3_8 -PYTHON_TARGETS="python3_8" -PYTHON_SINGLE_TARGET="python3_8" +# Michał Górny <mgorny@gentoo.org> (2021-06-01) +# Updated to python3.9 +PYTHON_TARGETS="python3_9" +PYTHON_SINGLE_TARGET="python3_9" # Michał Górny <mgorny@gentoo.org> (2013-08-10) # Moved from portage's make.globals. diff --git a/profiles/base/package.use.force b/profiles/base/package.use.force index 81f0d8fb009a..2450d7885002 100644 --- a/profiles/base/package.use.force +++ b/profiles/base/package.use.force @@ -183,7 +183,6 @@ app-shells/bash:0 readline # Michał Górny <mgorny@gentoo.org> (2012-10-14) # 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_python3_7 dev-lang/python-exec python_targets_python3_8 dev-lang/python-exec python_targets_python3_9 dev-lang/python-exec python_targets_python3_10 diff --git a/profiles/desc/python_single_target.desc b/profiles/desc/python_single_target.desc index 4e52300f9d83..d670f950de72 100644 --- a/profiles/desc/python_single_target.desc +++ b/profiles/desc/python_single_target.desc @@ -3,7 +3,6 @@ # This file contains descriptions of PYTHON_SINGLE_TARGET USE_EXPAND flags. -python3_7 - Build for Python 3.7 only python3_8 - Build for Python 3.8 only python3_9 - Build for Python 3.9 only python3_10 - Build for Python 3.10 only diff --git a/profiles/desc/python_targets.desc b/profiles/desc/python_targets.desc index 526bf6e292bf..ba8b8ea5eff8 100644 --- a/profiles/desc/python_targets.desc +++ b/profiles/desc/python_targets.desc @@ -3,7 +3,6 @@ # This file contains descriptions of PYTHON_TARGETS USE_EXPAND flags. -python3_7 - Build with Python 3.7 python3_8 - Build with Python 3.8 python3_9 - Build with Python 3.9 python3_10 - Build with Python 3.10 diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults index 567ec0c187a2..b0ddb83f4f8d 100644 --- a/profiles/embedded/make.defaults +++ b/profiles/embedded/make.defaults @@ -30,7 +30,7 @@ USE_EXPAND_VALUES_USERLAND="BSD GNU" # Env vars to expand into USE vars. Modifying this requires prior # discussion on gentoo-dev@lists.gentoo.org. -USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC ENLIGHTENMENT_MODULES FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LIRC_DEVICES LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XFCE_PLUGINS XTABLES_ADDONS" +USE_EXPAND="ABI_MIPS ABI_PPC ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES CAMERAS COLLECTD_PLUGINS CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86 CURL_SSL ELIBC FFTOOLS GPSD_PROTOCOLS GRUB_PLATFORMS INPUT_DEVICES KERNEL L10N LCD_DEVICES LIBREOFFICE_EXTENSIONS LLVM_TARGETS LUA_SINGLE_TARGET LUA_TARGETS MONKEYD_PLUGINS NGINX_MODULES_HTTP NGINX_MODULES_MAIL NGINX_MODULES_STREAM OFED_DRIVERS OFFICE_IMPLEMENTATION OPENMPI_FABRICS OPENMPI_OFED_FEATURES OPENMPI_RM PHP_TARGETS POSTGRES_TARGETS PYTHON_SINGLE_TARGET PYTHON_TARGETS QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS ROS_MESSAGES RUBY_TARGETS SANE_BACKENDS USERLAND UWSGI_PLUGINS VIDEO_CARDS VOICEMAIL_STORAGE XTABLES_ADDONS" # USE_EXPAND variables whose contents are not shown in package manager # output. Changes need discussion on gentoo-dev. diff --git a/profiles/prefix/windows/cygwin/use.mask b/profiles/prefix/windows/cygwin/use.mask index 051c6484f403..12139b1f5195 100644 --- a/profiles/prefix/windows/cygwin/use.mask +++ b/profiles/prefix/windows/cygwin/use.mask @@ -1,8 +1,5 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Re-add Cygwin's libc -elibc_Cygwin - -# we do have only python-3.6 ready on cygwin -python_targets_python3_7 |