From d18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 15 Jun 2021 14:57:03 +0100 Subject: gentoo resync : 15.06.2021 --- profiles/base/make.defaults | 14 +++++++------- profiles/base/package.use.force | 1 - profiles/base/package.use.mask | 8 ++++++++ 3 files changed, 15 insertions(+), 8 deletions(-) (limited to 'profiles/base') diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 04c72b0d582f..9f77283b5365 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. @@ -122,15 +122,15 @@ PYTHONDONTWRITEBYTECODE="1" # Add in expanded PYTHON_TARGETS or stage1 builds break because of USE="-* ${BOOTSTRAP_USE}" # This MUST be kept in sync with the PYTHON_TARGETS below # Mike Gilbert (2018-05-23) -# sys-apps/baslayout-2.5 needs split-usr enabled. -BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr python_targets_python3_8" +# sys-apps/baselayout-2.5 needs split-usr enabled. +BOOTSTRAP_USE="unicode internal-glib pkg-config split-usr python_targets_python3_9" # Mike Gilbert (2012-05-15) # Default target(s) for python-r1.eclass -# Mikle Kolyada (2020-12-02) -# Updated to python3_8 -PYTHON_TARGETS="python3_8" -PYTHON_SINGLE_TARGET="python3_8" +# Michał Górny (2021-06-01) +# Updated to python3.9 +PYTHON_TARGETS="python3_9" +PYTHON_SINGLE_TARGET="python3_9" # Michał Górny (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 (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/base/package.use.mask b/profiles/base/package.use.mask index 5aead25bf943..8b41e67b4856 100644 --- a/profiles/base/package.use.mask +++ b/profiles/base/package.use.mask @@ -6,6 +6,14 @@ # This file is only for generic masks. For arch-specific masks (i.e. # mask everywhere, unmask on arch/*) use arch/base. +# Mike Gilbert (2021-06-14) +# Avoid running failing tests by default. +sys-kernel/dracut test + +# Michał Górny (2021-05-31) +# Requires Python 3.7 and old SciPy. + (2021-05-09) # Dependency requires sys-apps/systemd. Will only be unmasked in systemd target. kde-plasma/plasma-meta firewall -- cgit v1.2.3