diff options
| author |   David Seifert <soap@gentoo.org> | 2023-05-16 23:11:23 +0200 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2023-05-16 23:11:23 +0200 |
| commit | 05be364e1dcbf04a23b5ecf54b6bfae0f39f5cf0 (patch) | |
| tree | db4c1bee1a7a3cb965b29b153a20d97749d12e0c /profiles/base | |
| parent | net-misc/httpie: 3.2.1-r2 revbump with urllib3-2.x fixes. (diff) | |
| download | gentoo-05be364e1dcbf04a23b5ecf54b6bfae0f39f5cf0.tar.gz gentoo-05be364e1dcbf04a23b5ecf54b6bfae0f39f5cf0.tar.bz2 gentoo-05be364e1dcbf04a23b5ecf54b6bfae0f39f5cf0.zip | |
profiles: remove dead implicit userland_* flags
Closes: https://github.com/gentoo/gentoo/pull/31034
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'profiles/base')
| -rw-r--r-- | profiles/base/make.defaults | 10 | ||||
| -rw-r--r-- | profiles/base/use.force | 5 | ||||
| -rw-r--r-- | profiles/base/use.mask | 3 |
3 files changed, 6 insertions, 12 deletions
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults index 65b8149ada84..f227acf07c58 100644 --- a/profiles/base/make.defaults +++ b/profiles/base/make.defaults @@ -6,18 +6,17 @@ # Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later) IUSE_IMPLICIT="prefix prefix-guest prefix-stack" -USE_EXPAND_IMPLICIT="ELIBC KERNEL USERLAND" +USE_EXPAND_IMPLICIT="ELIBC KERNEL" USE_EXPAND_VALUES_ELIBC="bionic Cygwin Darwin glibc mingw musl SunOS Winnt" USE_EXPAND_VALUES_KERNEL="Darwin linux SunOS Winnt" -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_S390 ABI_X86 ADA_TARGET ALSA_CARDS AMDGPU_TARGETS 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 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="ABI_MIPS ABI_S390 ABI_X86 ADA_TARGET ALSA_CARDS AMDGPU_TARGETS 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 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 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. -USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC ABI_MIPS ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86" +USE_EXPAND_HIDDEN="KERNEL ELIBC ABI_MIPS ABI_S390 ABI_X86 CPU_FLAGS_ARM CPU_FLAGS_PPC CPU_FLAGS_X86" CONFIG_PROTECT="/etc" CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" @@ -47,12 +46,11 @@ ENV_UNSET="DBUS_SESSION_BUS_ADDRESS DISPLAY CARGO_HOME GDK_PIXBUF_MODULE_FILE XA # Variables that are set exclusively by the profile # and not by user configuration files. -PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND" +PROFILE_ONLY_VARIABLES="${PROFILE_ONLY_VARIABLES} ELIBC IUSE_IMPLICIT KERNEL USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL" # 'Sane' defaults ELIBC="glibc" KERNEL="linux" -USERLAND="GNU" INPUT_DEVICES="libinput" # Accept only licenses in the FREE license group, i.e., with diff --git a/profiles/base/use.force b/profiles/base/use.force index d51d6c2ea56c..22123a5fe908 100644 --- a/profiles/base/use.force +++ b/profiles/base/use.force @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # Matt Turner <mattst88@gentoo.org> (2020-08-11) @@ -10,8 +10,7 @@ libglvnd # Disabling this requires a migration to be performed. split-usr -# Force the GNU/Linux ELIBC, KERNEL, and USERLAND +# Force the GNU/Linux ELIBC and KERNEL # flags that apply to the majority of profiles. elibc_glibc kernel_linux -userland_GNU diff --git a/profiles/base/use.mask b/profiles/base/use.mask index 07ade179a443..f6587acbec12 100644 --- a/profiles/base/use.mask +++ b/profiles/base/use.mask @@ -61,9 +61,6 @@ packagekit selinux multilib -# Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles. -userland_BSD - elibc_bionic elibc_Cygwin elibc_Darwin |