profiles: remove dead kernel/elibc flags

Signed-off-by: David Seifert <soap@gentoo.org>

5 files changed, 5 insertions, 30 deletions

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index 547c7b31e83c..6548a518da5e 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -7,8 +7,8 @@
 # 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_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly glibc HPUX Interix mingw musl NetBSD OpenBSD SunOS Winnt"
-USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt"
+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
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index 137f6707246c..eee41ca8c6f8 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -70,26 +70,14 @@ multilib
 # Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles.
 userland_BSD
 
-elibc_AIX
 elibc_bionic
 elibc_Cygwin
 elibc_Darwin
-elibc_DragonFly
-elibc_HPUX
-elibc_Interix
 elibc_musl
-elibc_NetBSD
-elibc_OpenBSD
 elibc_SunOS
 elibc_Winnt
 
-kernel_AIX
 kernel_Darwin
-kernel_FreeBSD
-kernel_freemint
-kernel_HPUX
-kernel_NetBSD
-kernel_OpenBSD
 kernel_SunOS
 kernel_Winnt
 
diff --git a/profiles/desc/elibc.desc b/profiles/desc/elibc.desc
index ec994a00e657..8eef69979c83 100644
--- a/profiles/desc/elibc.desc
+++ b/profiles/desc/elibc.desc
@@ -4,18 +4,11 @@
 # This file contains descriptions of ELIBC USE_EXPAND flags.
 
 # Keep it sorted.
-
-AIX - ELIBC setting for systems that use the AIX C library
 bionic - ELIBC setting for systems that use Android's Bionic C library
 Cygwin - ELIBC setting for systems that use Cygwin
 Darwin - ELIBC setting for systems that use the Darwin C library
-DragonFly - ELIBC setting for systems that use the DragonFly C library
 glibc - ELIBC setting for systems that use the GNU C library
-HPUX - ELIBC setting for systems that use the HP-UX C library
-Interix - ELIBC setting for systems that use the Interix C library
 mingw - ELIBC setting for systems that use the Minimalist GNU for Windows library
 musl - ELIBC setting for systems that use the musl C library
-NetBSD - ELIBC setting for systems that use the NetBSD C library
-OpenBSD - ELIBC setting for systems that use the OpenBSD C library
 SunOS - ELIBC setting for systems that use the Sun Solaris C library
 Winnt - ELIBC setting for systems that use Winnt
diff --git a/profiles/desc/kernel.desc b/profiles/desc/kernel.desc
index 48d6e5455ea8..6658d525396b 100644
--- a/profiles/desc/kernel.desc
+++ b/profiles/desc/kernel.desc
@@ -1,16 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file contains descriptions of KERNEL USE_EXPAND flags.
 
 # Keep it sorted.
-AIX - KERNEL setting for system using the AIX kernel
 Darwin - KERNEL setting for system using the Darwin kernel (i.e.: Mac OS X).
-FreeBSD - KERNEL setting for system using the FreeBSD kernel
-freemint - KERNEL setting for system using the FreeMiNT kernel
-HPUX - KERNEL setting for system using the HP-UX kernel
 linux - KERNEL setting for system using the Linux kernel
-NetBSD - KERNEL setting for system using the NetBSD kernel
-OpenBSD - KERNEL setting for system using the OpenBSD kernel
 SunOS - KERNEL setting for system using an SunOS (i.e.: Solaris) kernel
 Winnt - KERNEL setting for systems on Windows (Cygwin, MinGW, Winnt, ...)
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index 4320f726a5e9..a86ce015b4d4 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -24,8 +24,8 @@ IUSE_IMPLICIT="prefix prefix-guest prefix-stack"
 USE_EXPAND_UNPREFIXED="ARCH"
 USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND"
 USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm64 hppa ia64 m68k mips ppc ppc64 ppc64-linux ppc-macos riscv s390 sparc sparc64-solaris sparc-solaris x64-cygwin x64-macos x64-solaris x64-winnt x86 x86-fbsd x86-linux x86-solaris x86-winnt"
-USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly glibc HPUX Interix mingw musl NetBSD OpenBSD SunOS Winnt"
-USE_EXPAND_VALUES_KERNEL="AIX Darwin FreeBSD freemint HPUX linux NetBSD OpenBSD SunOS Winnt"
+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