summaryrefslogtreecommitdiff
path: root/profiles
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-01-04 01:27:12 +0000
committerV3n3RiX <venerix@koprulu.sector>2022-01-04 01:27:12 +0000
commit3517852e3b8a68d1e997770fc0650c5053bafc6c (patch)
tree44068672445b1418489aed82de58df3c470289e7 /profiles
parent0f15659d48c193027158492acb726297501202c5 (diff)
gentoo resync : 04.01.2022
Diffstat (limited to 'profiles')
-rw-r--r--profiles/Manifest.gzbin152178 -> 141014 bytes
-rw-r--r--profiles/arch/alpha/package.use.mask15
-rw-r--r--profiles/arch/amd64/no-multilib/package.mask1
-rw-r--r--profiles/arch/amd64/use.stable.mask6
-rw-r--r--profiles/arch/arm/package.use.mask5
-rw-r--r--profiles/arch/arm/use.stable.mask6
-rw-r--r--profiles/arch/arm64/package.use.mask16
-rw-r--r--profiles/arch/arm64/package.use.stable.mask5
-rw-r--r--profiles/arch/arm64/use.stable.mask6
-rw-r--r--profiles/arch/hppa/package.use.mask8
-rw-r--r--profiles/arch/hppa/use.mask6
-rw-r--r--profiles/arch/hppa/use.stable.mask6
-rw-r--r--profiles/arch/ia64/package.use.mask8
-rw-r--r--profiles/arch/m68k/package.use.mask7
-rw-r--r--profiles/arch/m68k/use.mask20
-rw-r--r--profiles/arch/powerpc/ppc32/package.use.mask16
-rw-r--r--profiles/arch/powerpc/ppc32/package.use.stable.mask5
-rw-r--r--profiles/arch/powerpc/ppc32/use.stable.mask6
-rw-r--r--profiles/arch/powerpc/ppc64/64le/package.use.mask5
-rw-r--r--profiles/arch/powerpc/ppc64/64le/use.mask5
-rw-r--r--profiles/arch/powerpc/ppc64/64le/use.stable.mask11
-rw-r--r--profiles/arch/powerpc/ppc64/64ul/package.use.mask5
-rw-r--r--profiles/arch/powerpc/ppc64/64ul/use.mask5
-rw-r--r--profiles/arch/powerpc/ppc64/64ul/use.stable.mask9
-rw-r--r--profiles/arch/powerpc/ppc64/package.use.mask16
-rw-r--r--profiles/arch/powerpc/ppc64/package.use.stable.mask5
-rw-r--r--profiles/arch/powerpc/ppc64/use.mask5
-rw-r--r--profiles/arch/powerpc/ppc64/use.stable.mask11
-rw-r--r--profiles/arch/riscv/1level/make.defaults7
-rw-r--r--profiles/arch/riscv/1level/package.mask5
-rw-r--r--profiles/arch/riscv/1level/package.unmask5
-rw-r--r--profiles/arch/riscv/make.defaults12
-rw-r--r--profiles/arch/riscv/package.mask6
-rw-r--r--profiles/arch/riscv/package.use.mask18
-rw-r--r--profiles/arch/riscv/rv32imac/eapi1
-rw-r--r--profiles/arch/riscv/rv32imac/ilp32/make.defaults12
-rw-r--r--profiles/arch/riscv/rv32imac/ilp32/package.mask (renamed from profiles/arch/riscv/rv32imac/package.mask)0
-rw-r--r--profiles/arch/riscv/rv32imac/ilp32/package.use.force3
-rw-r--r--profiles/arch/riscv/rv32imac/ilp32/use.force2
-rw-r--r--profiles/arch/riscv/rv32imac/ilp32/use.mask6
-rw-r--r--profiles/arch/riscv/rv32imac/ilp32d/make.defaults13
-rw-r--r--profiles/arch/riscv/rv32imac/ilp32d/package.mask (renamed from profiles/arch/riscv/rv32imac/use.mask)4
-rw-r--r--profiles/arch/riscv/rv32imac/ilp32d/package.use.force2
-rw-r--r--profiles/arch/riscv/rv32imac/ilp32d/use.mask4
-rw-r--r--profiles/arch/riscv/rv32imac/parent2
-rw-r--r--profiles/arch/riscv/rv32imac/use.force2
-rw-r--r--profiles/arch/riscv/rv64gc/eapi1
-rw-r--r--profiles/arch/riscv/rv64gc/lp64/make.defaults13
-rw-r--r--profiles/arch/riscv/rv64gc/lp64/package.use.force2
-rw-r--r--profiles/arch/riscv/rv64gc/lp64/use.force2
-rw-r--r--profiles/arch/riscv/rv64gc/lp64/use.mask5
-rw-r--r--profiles/arch/riscv/rv64gc/lp64d-multilib/eapi (renamed from profiles/arch/riscv/1level/eapi)0
-rw-r--r--profiles/arch/riscv/rv64gc/lp64d-multilib/make.defaults (renamed from profiles/arch/riscv/rv64gc/make.defaults)5
-rw-r--r--profiles/arch/riscv/rv64gc/lp64d-multilib/parent1
-rw-r--r--profiles/arch/riscv/rv64gc/lp64d/make.defaults13
-rw-r--r--profiles/arch/riscv/rv64gc/lp64d/package.use.force2
-rw-r--r--profiles/arch/riscv/rv64gc/lp64d/use.mask5
-rw-r--r--profiles/arch/riscv/rv64gc/parent2
-rw-r--r--profiles/arch/riscv/rv64gc/use.force2
-rw-r--r--profiles/arch/riscv/rv64gc/use.mask2
-rw-r--r--profiles/arch/s390/package.mask2
-rw-r--r--profiles/arch/s390/package.use.mask7
-rw-r--r--profiles/arch/s390/s390x/package.use.mask3
-rw-r--r--profiles/arch/sparc/64ul/package.use.mask7
-rw-r--r--profiles/arch/sparc/use.stable.mask6
-rw-r--r--profiles/arch/x86/package.use.mask12
-rw-r--r--profiles/arch/x86/package.use.stable.mask10
-rw-r--r--profiles/arch/x86/use.stable.mask6
-rw-r--r--profiles/base/make.defaults4
-rw-r--r--profiles/base/package.use.mask11
-rw-r--r--profiles/base/use.mask6
-rw-r--r--profiles/default/linux/amd64/17.0/uclibc/deprecated17
-rw-r--r--profiles/default/linux/amd64/17.0/uclibc/eapi1
-rw-r--r--profiles/default/linux/amd64/17.0/uclibc/hardened/deprecated17
-rw-r--r--profiles/default/linux/amd64/17.0/uclibc/hardened/eapi1
-rw-r--r--profiles/default/linux/amd64/17.0/uclibc/hardened/parent2
-rw-r--r--profiles/default/linux/amd64/17.0/uclibc/make.defaults10
-rw-r--r--profiles/default/linux/amd64/17.0/uclibc/parent3
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/armv6j/deprecated17
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/armv6j/eapi1
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/deprecated17
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/eapi1
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/parent2
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/armv6j/make.defaults10
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/armv6j/parent1
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/armv7a/deprecated17
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/armv7a/eapi1
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/deprecated17
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/eapi1
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/parent2
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/armv7a/make.defaults10
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/armv7a/parent1
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/deprecated17
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/eapi1
-rw-r--r--profiles/default/linux/arm/17.0/uclibc/parent3
-rw-r--r--profiles/default/linux/musl/package.mask5
-rw-r--r--profiles/default/linux/musl/use.mask3
-rw-r--r--profiles/default/linux/package.use.mask6
-rw-r--r--profiles/default/linux/powerpc/ppc32/17.0/uclibc/deprecated17
-rw-r--r--profiles/default/linux/powerpc/ppc32/17.0/uclibc/eapi1
-rw-r--r--profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/deprecated17
-rw-r--r--profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/eapi1
-rw-r--r--profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/parent2
-rw-r--r--profiles/default/linux/powerpc/ppc32/17.0/uclibc/make.defaults10
-rw-r--r--profiles/default/linux/powerpc/ppc32/17.0/uclibc/package.use3
-rw-r--r--profiles/default/linux/powerpc/ppc32/17.0/uclibc/package.use.mask7
-rw-r--r--profiles/default/linux/powerpc/ppc32/17.0/uclibc/parent3
-rw-r--r--profiles/default/linux/riscv/17.0/rv32imac/eapi1
-rw-r--r--profiles/default/linux/riscv/17.0/rv32imac/ilp32/eapi1
-rw-r--r--profiles/default/linux/riscv/17.0/rv32imac/ilp32/parent2
-rw-r--r--profiles/default/linux/riscv/17.0/rv32imac/ilp32d/eapi1
-rw-r--r--profiles/default/linux/riscv/17.0/rv32imac/ilp32d/parent2
-rw-r--r--profiles/default/linux/riscv/17.0/rv32imac/parent3
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/deprecated43
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/eapi1
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/lp64/deprecated43
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/lp64/eapi1
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/lp64/parent2
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/deprecated43
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/eapi1
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/parent2
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/lp64d/deprecated43
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/lp64d/eapi1
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/lp64d/parent2
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/deprecated43
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/eapi1
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/parent2
-rw-r--r--profiles/default/linux/riscv/17.0/rv64gc/parent3
-rw-r--r--profiles/default/linux/riscv/20.0/rv32imac/parent2
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults10
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/multilib/parent1
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/parent2
-rw-r--r--profiles/default/linux/riscv/parent1
-rw-r--r--profiles/default/linux/uclibc/deprecated17
-rw-r--r--profiles/default/linux/uclibc/eapi1
-rw-r--r--profiles/default/linux/uclibc/make.defaults12
-rw-r--r--profiles/default/linux/uclibc/mips/deprecated17
-rw-r--r--profiles/default/linux/uclibc/mips/eapi1
-rw-r--r--profiles/default/linux/uclibc/mips/make.defaults20
-rw-r--r--profiles/default/linux/uclibc/mips/mipsel/deprecated17
-rw-r--r--profiles/default/linux/uclibc/mips/mipsel/eapi1
-rw-r--r--profiles/default/linux/uclibc/mips/mipsel/make.defaults5
-rw-r--r--profiles/default/linux/uclibc/mips/mipsel/parent1
-rw-r--r--profiles/default/linux/uclibc/mips/package.mask10
-rw-r--r--profiles/default/linux/uclibc/mips/package.use.force8
-rw-r--r--profiles/default/linux/uclibc/mips/package.use.mask14
-rw-r--r--profiles/default/linux/uclibc/mips/parent1
-rw-r--r--profiles/default/linux/uclibc/mips/use.force6
-rw-r--r--profiles/default/linux/uclibc/mips/use.mask6
-rw-r--r--profiles/default/linux/uclibc/package.mask68
-rw-r--r--profiles/default/linux/uclibc/package.use.mask20
-rw-r--r--profiles/default/linux/uclibc/packages7
-rw-r--r--profiles/default/linux/uclibc/packages.build8
-rw-r--r--profiles/default/linux/uclibc/parent3
-rw-r--r--profiles/default/linux/uclibc/use.force5
-rw-r--r--profiles/default/linux/uclibc/use.mask15
-rw-r--r--profiles/default/linux/x86/17.0/uclibc/deprecated17
-rw-r--r--profiles/default/linux/x86/17.0/uclibc/eapi1
-rw-r--r--profiles/default/linux/x86/17.0/uclibc/hardened/deprecated17
-rw-r--r--profiles/default/linux/x86/17.0/uclibc/hardened/eapi1
-rw-r--r--profiles/default/linux/x86/17.0/uclibc/hardened/parent2
-rw-r--r--profiles/default/linux/x86/17.0/uclibc/make.defaults10
-rw-r--r--profiles/default/linux/x86/17.0/uclibc/parent3
-rw-r--r--profiles/desc/elibc.desc5
-rw-r--r--profiles/embedded/make.defaults4
-rw-r--r--profiles/features/hardened/package.use.mask5
-rw-r--r--profiles/features/musl/package.mask9
-rw-r--r--profiles/features/musl/use.mask3
-rw-r--r--profiles/features/prefix/package.use.mask6
-rw-r--r--profiles/features/uclibc/deprecated17
-rw-r--r--profiles/features/uclibc/eapi1
-rw-r--r--profiles/features/uclibc/make.defaults13
-rw-r--r--profiles/features/uclibc/package.mask27
-rw-r--r--profiles/features/uclibc/package.unmask7
-rw-r--r--profiles/features/uclibc/package.use7
-rw-r--r--profiles/features/uclibc/package.use.force6
-rw-r--r--profiles/features/uclibc/package.use.mask31
-rw-r--r--profiles/features/uclibc/packages7
-rw-r--r--profiles/features/uclibc/packages.build8
-rw-r--r--profiles/features/uclibc/use.force6
-rw-r--r--profiles/features/uclibc/use.mask17
-rw-r--r--profiles/hardened/linux/musl/use.mask3
-rw-r--r--profiles/hardened/linux/uclibc/deprecated17
-rw-r--r--profiles/hardened/linux/uclibc/eapi1
-rw-r--r--profiles/hardened/linux/uclibc/make.defaults5
-rw-r--r--profiles/hardened/linux/uclibc/mips/eapi1
-rw-r--r--profiles/hardened/linux/uclibc/mips/mipsel/eapi1
-rw-r--r--profiles/hardened/linux/uclibc/mips/mipsel/parent2
-rw-r--r--profiles/hardened/linux/uclibc/mips/parent2
-rw-r--r--profiles/hardened/linux/uclibc/package.use.mask6
-rw-r--r--profiles/hardened/linux/uclibc/use.force8
-rw-r--r--profiles/hardened/linux/uclibc/use.mask17
-rw-r--r--profiles/info_pkgs3
-rw-r--r--profiles/package.mask133
-rw-r--r--profiles/prefix/darwin/macos/package.mask8
-rw-r--r--profiles/prefix/sunos/use.mask3
-rw-r--r--profiles/prefix/windows/winnt/use.mask5
-rw-r--r--profiles/profiles.desc24
-rw-r--r--profiles/targets/desktop/plasma/package.use6
-rw-r--r--profiles/targets/systemd/package.use.force7
-rw-r--r--profiles/thirdpartymirrors2
-rw-r--r--profiles/updates/1Q-20171
-rw-r--r--profiles/updates/3Q-20211
-rw-r--r--profiles/updates/4Q-20213
-rw-r--r--profiles/use.desc3
-rw-r--r--profiles/use.local.desc55
206 files changed, 335 insertions, 1429 deletions
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 9cf2709bf1cb..6695caa5de0b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
Binary files differ
diff --git a/profiles/arch/alpha/package.use.mask b/profiles/arch/alpha/package.use.mask
index 4424f1abce12..dbe79219b8b2 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -1,6 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Michał Górny <mgorny@gentoo.org> (2021-12-30)
+# Don't apply stable masks to python-exec since we're forcing every
+# impl there anyway. Please keep this in sync with use.mask.
+dev-lang/python-exec -python_targets_python3_10
+
# Vadim Misbakh-Soloviov <mva@gentoo.org> (2021-12-09)
# ts-cli requires rust to be built, and rust is unavailable here ATM.
dev-libs/tree-sitter ts-cli
@@ -31,7 +36,7 @@ sys-libs/libcap tools
sys-apps/rng-tools rtlsdr
# Marek Szuba <marecki@gentoo.org> (2021-08-11)
-# dev-ruby/{thor,tty-editor} not keyworded here yet (Bug #807685)
+# dev-ruby/thor not keyworded here
app-text/htmltidy test
# Matt Turner <mattst88@gentoo.org> (2021-07-23)
@@ -278,12 +283,6 @@ net-libs/gnutls test-full
# Requires USE=bluetooth that is masked in this profile.
media-sound/pulseaudio native-headset
-# Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
-# Upstream Git is switching to PCRE2 w/ JIT.
-# This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
-<dev-vcs/git-2.31.0 pcre-jit
-
# Tobias Klausmann <klausman@gentoo.org> (2017-05-18)
# Stack protector code is not ported to alpha (and may not ever be)
>=sys-devel/gcc-6 ssp
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index e4411cb89cb1..8ceefa57faa7 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -31,6 +31,7 @@ app-emulation/crossover-bin
app-emulation/protontricks
app-emulation/q4wine
app-emulation/winetricks
+<=app-shells/scsh-0.6.9
dev-embedded/libftd2xx
dev-embedded/openocd
dev-util/android-ndk
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index df910ea0ebe9..eb5449388b24 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -4,12 +4,6 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
-
# Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
# sci-libs/mkl is not stable, needs online registration to even run pkg_setup
mkl
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask
index 0eea5cd8321e..77b4e5870b93 100644
--- a/profiles/arch/arm/package.use.mask
+++ b/profiles/arch/arm/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2021-10-31)
@@ -25,9 +25,8 @@ media-video/mjpg-streamer -input-raspicam
dev-util/diffoscope pascal pdf
# Marek Szuba <marecki@gentoo.org> (2021-07-18)
-# media-libs/rnnoise, media-plugins/gst-plugins-webrtc
# and media-plugins/zam-plugins not keyworded here
-media-sound/easyeffects rnnoise webrtc zamaudio
+media-sound/easyeffects zamaudio
# Miroslav Šulc <fordfrog@gentoo.org> (2021-04-12)
# no stable virtual/jdk on this arch
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index 8fa70e683bc3..d06f8e1c9383 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -4,12 +4,6 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
-
# Sam James <sam@gentoo.org> (2020-12-22)
# Not yet stable
lirc
diff --git a/profiles/arch/arm64/package.use.mask b/profiles/arch/arm64/package.use.mask
index 58c25a4ae688..8cba9766d5b3 100644
--- a/profiles/arch/arm64/package.use.mask
+++ b/profiles/arch/arm64/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Sam James <sam@gentoo.org> (2022-01-02)
+# sys-fabric/ofed is not keyworded here
+sys-cluster/slurm ofed
+
# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-11-16)
# requires sys-apps/dbus-broker, which keyworded here.
sys-apps/systemd -hostnamed-fallback
@@ -39,9 +43,8 @@ sys-boot/grub grub_platforms_qemu grub_platforms_uboot
dev-util/diffoscope pascal
# Marek Szuba <marecki@gentoo.org> (2021-07-18)
-# media-libs/rnnoise, media-plugins/gst-plugins-webrtc
-# and media-plugins/zam-plugins not keyworded here
-media-sound/easyeffects rnnoise webrtc zamaudio
+# media-plugins/zam-plugins not keyworded here
+media-sound/easyeffects zamaudio
# Sam James <sam@gentoo.org> (2021-04-14)
# Supports 64-bit NEON
@@ -356,11 +359,6 @@ media-sound/mumble g15
# media-libs/libemf fails with #error unknown CPU.
media-gfx/pstoedit emf
-# Alexis Ballier <aballier@gentoo.org> (2017-07-14)
-# zfs does not build on arm64 (yet?)
-app-emulation/libvirt zfs
-sys-cluster/ceph zfs
-
# Alexis Ballier <aballier@gentoo.org> (2017-07-10)
# openvz-sources are likely too old for any proper arm64 usage
app-emulation/libvirt openvz
diff --git a/profiles/arch/arm64/package.use.stable.mask b/profiles/arch/arm64/package.use.stable.mask
index 1cec2de5360c..af59a1a97147 100644
--- a/profiles/arch/arm64/package.use.stable.mask
+++ b/profiles/arch/arm64/package.use.stable.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# Don't apply stable masks to python-exec since we're forcing every
+# impl there anyway. Please keep this in sync with use.stable.mask.
+dev-lang/python-exec -python_targets_pypy3
+
# Sam James <sam@gentoo.org> (2021-11-20)
# dev-python/networkx is not yet marked stable on arm*
app-admin/setools infoflow
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index ff0cafe9ef98..03d4cb4097f4 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -4,12 +4,6 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
-
# Sam James <sam@gentoo.org> (2020-12-23)
# dev-lang/luajit is not yet stable
lua_single_target_luajit
diff --git a/profiles/arch/hppa/package.use.mask b/profiles/arch/hppa/package.use.mask
index f438ef894cc3..3071bbb0f102 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# NOTE: When masking a USE flag due to missing keywords, please file a keyword
@@ -235,12 +235,6 @@ app-forensics/sleuthkit java
# Requires USE=seccomp that is masked in this profile.
net-libs/gnutls test-full
-# Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
-# Upstream Git is switching to PCRE2 w/ JIT.
-# This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
-<dev-vcs/git-2.31.0 pcre-jit
-
# Michał Górny <mgorny@gentoo.org> (2017-06-28)
# app-misc/dtach is not keyworded, and tests are restricted anyway, so
# no point in pursuing it right now.
diff --git a/profiles/arch/hppa/use.mask b/profiles/arch/hppa/use.mask
index eec8e480fd60..54706b70567e 100644
--- a/profiles/arch/hppa/use.mask
+++ b/profiles/arch/hppa/use.mask
@@ -16,12 +16,6 @@ openexr
bluetooth
pipewire
-# Michał Górny <mgorny@gentoo.org> (2021-05-20)
-# Unresolved keywordreqs are getting in the way.
-# https://bugs.gentoo.org/789606
-python_targets_python3_10
-python_single_target_python3_10
-
# Arfrever Frehtes Taifersar Arahesis <arfrever.fta@gmail.com> (2021-04-01)
# sys-libs/llvm-libunwind not supported on HPPA.
llvm-libunwind
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index b73cd857e2fa..873d96ddd30c 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -26,12 +26,6 @@ colord
# media-libs/libsamplerate is not stable on hppa
libsamplerate
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
-
# Matt Turner <mattst88@gentoo.org> (2020-12-23)
# dev-db/postgresql is not stable on hppa
postgres
diff --git a/profiles/arch/ia64/package.use.mask b/profiles/arch/ia64/package.use.mask
index f7d836375ea4..d739b62aacb1 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Vadim Misbakh-Soloviov <mva@gentoo.org> (2021-12-09)
@@ -264,12 +264,6 @@ media-video/ffmpeg libv4l
# Requires USE=bluetooth that is masked in this profile.
media-sound/pulseaudio native-headset
-# Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
-# Upstream Git is switching to PCRE2 w/ JIT.
-# This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-# Since >=dev-vcs/git-2.31.0 pcre1 support has been dropped from git.
-<dev-vcs/git-2.31.0 pcre-jit
-
# Sergei Trofimovich <slyfox@gentoo.org> (2017-07-20)
# pulls in unkeyworded java
sci-libs/gdal mdb
diff --git a/profiles/arch/m68k/package.use.mask b/profiles/arch/m68k/package.use.mask
index b478a13dfc42..1cab9568abcd 100644
--- a/profiles/arch/m68k/package.use.mask
+++ b/profiles/arch/m68k/package.use.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# James Le Cuirot <chewi@gentoo.org> (2022-01-01)
+# Some optional emacs dependencies are not keyworded.
+app-editors/emacs gui mailutils
+
# James Le Cuirot <chewi@gentoo.org> (2021-09-28)
# Needs a lot of Perl packages to be keyworded.
dev-vcs/git doc
@@ -17,6 +21,7 @@ media-gfx/graphviz lefty pdf
# Requires Rust, which is currently unavailable on m68k.
app-editors/emacs svg
media-gfx/graphviz svg
+media-gfx/imagemagick svg
# James Le Cuirot <chewi@gentoo.org> (2021-09-19)
# Requires Ruby, which is broken on m68k.
diff --git a/profiles/arch/m68k/use.mask b/profiles/arch/m68k/use.mask
index d06346dd9a9b..56fb20679473 100644
--- a/profiles/arch/m68k/use.mask
+++ b/profiles/arch/m68k/use.mask
@@ -1,9 +1,21 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Unmask the flag which corresponds to ARCH.
-m68k
+# James Le Cuirot <chewi@gentoo.org> (2022-01-01)
+# Hardware that probably doesn't apply to m68k.
+input_devices_elographics
+video_cards_amdgpu
+video_cards_glint
+video_cards_mga
+video_cards_nouveau
+video_cards_nv
+video_cards_r128
+video_cards_radeon
+video_cards_radeonsi
+
# James Le Cuirot <chewi@gentoo.org> (2021-10-02)
# Keywording aside, m68k CPUs are probably too slow for PulseAudio.
pulseaudio
@@ -11,6 +23,7 @@ pulseaudio
# James Le Cuirot <chewi@gentoo.org> (2021-09-28)
# Too many unkeyworded dependencies for now.
efl
+openexr
subversion
# James Le Cuirot <chewi@gentoo.org> (2021-09-27)
@@ -24,7 +37,12 @@ mpi
# James Le Cuirot <chewi@gentoo.org> (2021-09-19)
# I tried Mesa under qemu-system-m68k with VirtIO-GPU. It didn't work.
+egl
+gles1
+gles2
+opencl
opengl
+vulkan
# James Le Cuirot <chewi@gentoo.org> (2021-09-17)
# Ruby just crashes on startup.
diff --git a/profiles/arch/powerpc/ppc32/package.use.mask b/profiles/arch/powerpc/ppc32/package.use.mask
index d6929b9f383b..2bf76153d4ca 100644
--- a/profiles/arch/powerpc/ppc32/package.use.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.mask
@@ -1,6 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Sam James <sam@gentoo.org> (2021-12-31)
+# dev-lang/julia not keyworded here
+# sci-mathematics/polymake not keyworded here
+sci-mathematics/singular julia polymake
+
# Sam James <sam@gentoo.org> (2021-12-08)
# Masks involving webkit-gtk; webkit-gtk was dekeyworded on ppc for a while.
# We haven't (yet?) restored keywords for all the bits we had to drop, so
@@ -31,10 +36,6 @@ app-i18n/uim kde
# media-libs/libheif not keyworded here
sci-libs/gdal heif
-# Marek Szuba <marecki@gentoo.org> (2021-08-11)
-# dev-ruby/tty-editor not keyworded here yet (Bug #807685)
-app-text/htmltidy test
-
# Matt Turner <mattst88@gentoo.org> (07-25-2021)
# gdm requires gnome-shell requires rustified librsvg.
x11-misc/xscreensaver gdm
@@ -44,9 +45,8 @@ x11-misc/xscreensaver gdm
net-libs/gssdp gtk
# Marek Szuba <marecki@gentoo.org> (2021-07-18)
-# media-libs/rnnoise, media-plugins/gst-plugins-webrtc
-# and media-plugins/zam-plugins not keyworded here
-media-sound/easyeffects rnnoise webrtc zamaudio
+# media-plugins/zam-plugins not keyworded here
+media-sound/easyeffects zamaudio
# Matt Turner <mattst88@gentoo.org> (2021-06-10)
# dev-python/django is not keyworded here
diff --git a/profiles/arch/powerpc/ppc32/package.use.stable.mask b/profiles/arch/powerpc/ppc32/package.use.stable.mask
index fa7b5a672925..7b64f1a1fe16 100644
--- a/profiles/arch/powerpc/ppc32/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/package.use.stable.mask
@@ -17,6 +17,11 @@
#--- END OF EXAMPLES ---
+# Marek Szuba <marecki@gentoo.org> (2021-12-31)
+# No stable dev-ruby/{thor,tty-editor} on this arch yet
+# and there are many dependencies to go through before there are
+app-text/htmltidy test
+
# Sam James <sam@gentoo.org> (2021-02-06)
# Drags in too much unstable GNOME for now
# bug #727572
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index 408d42d9aa94..57875ce2a1bf 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -1,12 +1,6 @@
# Copyright 2014-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
-
# Andreas Sturmlechner <asturm@gentoo.org> (2020-08-13)
# media-gfx/gimp is not stable
gimp
diff --git a/profiles/arch/powerpc/ppc64/64le/package.use.mask b/profiles/arch/powerpc/ppc64/64le/package.use.mask
index 57513f24743e..ad5616188460 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.use.mask
@@ -1,6 +1,11 @@
# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# Don't apply stable masks to python-exec since we're forcing every
+# impl there anyway. Please keep this in sync with use.stable.mask.
+dev-lang/python-exec -python_targets_pypy3
+
# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-11-13)
# ppc64 has pipewire keyworded
www-client/firefox -screencast
diff --git a/profiles/arch/powerpc/ppc64/64le/use.mask b/profiles/arch/powerpc/ppc64/64le/use.mask
index 1e05b89c6963..b596bd803519 100644
--- a/profiles/arch/powerpc/ppc64/64le/use.mask
+++ b/profiles/arch/powerpc/ppc64/64le/use.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# PyPy3 is keyworded here.
+-python_targets_pypy3
+-python_single_target_pypy3
+
# Sam James <sam@gentoo.org> (2021-10-16)
# media-libs/openexr doesn't work on BE, but should on LE.
# ...and openscenegraph needs openexr.
diff --git a/profiles/arch/powerpc/ppc64/64le/use.stable.mask b/profiles/arch/powerpc/ppc64/64le/use.stable.mask
index ea967fc953b8..9d8490097912 100644
--- a/profiles/arch/powerpc/ppc64/64le/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/64le/use.stable.mask
@@ -1,13 +1,12 @@
# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# PyPy3 target is not ready for stable.
+python_targets_pypy3
+python_single_target_pypy3
+
# Sam James <sam@gentoo.org> (2021-11-14)
# media-libs/openexr is not marked stable on ppc64
# (it's broken on BE and it's more convenient to keep it at ~arch here for now)
openexr
-
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
diff --git a/profiles/arch/powerpc/ppc64/64ul/package.use.mask b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
index b6e15b3d13f1..ca0dd80c2085 100644
--- a/profiles/arch/powerpc/ppc64/64ul/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/package.use.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# Don't apply stable masks to python-exec since we're forcing every
+# impl there anyway. Please keep this in sync with use.stable.mask.
+dev-lang/python-exec -python_targets_pypy3
+
# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-07-27)
# deps are keyworded
gnome-base/gnome-extra-apps -tracker
diff --git a/profiles/arch/powerpc/ppc64/64ul/use.mask b/profiles/arch/powerpc/ppc64/64ul/use.mask
index 0587005a8db1..598e625a645e 100644
--- a/profiles/arch/powerpc/ppc64/64ul/use.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/use.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# PyPy3 is keyworded here.
+-python_targets_pypy3
+-python_single_target_pypy3
+
# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-06-03)
# clang is keyworded and works on ppc64
-clang
diff --git a/profiles/arch/powerpc/ppc64/64ul/use.stable.mask b/profiles/arch/powerpc/ppc64/64ul/use.stable.mask
index 9bf68847141b..fee4cfaa3747 100644
--- a/profiles/arch/powerpc/ppc64/64ul/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/64ul/use.stable.mask
@@ -1,11 +1,10 @@
# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# PyPy3 target is not ready for stable.
+python_targets_pypy3
+python_single_target_pypy3
# Georgy Yakovlev <gyakovlev@gentoo.org> (2020-01-26)
# media-plugins/frei0r-plugins not stable yet
diff --git a/profiles/arch/powerpc/ppc64/package.use.mask b/profiles/arch/powerpc/ppc64/package.use.mask
index 5c49713bc423..7a0bdb803f0e 100644
--- a/profiles/arch/powerpc/ppc64/package.use.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.mask
@@ -1,6 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# Don't apply stable masks to python-exec since we're forcing every
+# impl there anyway. Please keep this in sync with use.stable.mask.
+dev-lang/python-exec -python_targets_pypy3
+
# Georgy Yakovlev <gyakovlev@gentoo.org> (2021-11-12)
# telepathy stack is not keyworded
dev-util/kdevelop reviewboard
@@ -17,14 +22,9 @@ net-dns/dnscrypt-proxy pie
# Needs media-libs/libldac which builds on ppc64le, but not be
media-video/pipewire -bluetooth
-# Marek Szuba <marecki@gentoo.org> (2021-08-11)
-# dev-ruby/tty-editor not keyworded here yet (Bug #807685)
-app-text/htmltidy test
-
# Marek Szuba <marecki@gentoo.org> (2021-07-18)
-# media-plugins/gst-plugins-webrtc and media-plugins/zam-plugins
-# not keyworded here
-media-sound/easyeffects webrtc zamaudio
+# media-plugins/zam-plugins not keyworded here
+media-sound/easyeffects zamaudio
# Ionen Wolkens <ionen@gentoo.org> (2021-07-01)
# Feature currently relies on amd64 prebuilt binaries.
diff --git a/profiles/arch/powerpc/ppc64/package.use.stable.mask b/profiles/arch/powerpc/ppc64/package.use.stable.mask
index ad8e800ab267..46b6dcd3e2f7 100644
--- a/profiles/arch/powerpc/ppc64/package.use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/package.use.stable.mask
@@ -17,6 +17,11 @@
#--- END OF EXAMPLES ---
+# Marek Szuba <marecki@gentoo.org> (2021-12-31)
+# No stable dev-ruby/{thor,tty-editor} on this arch yet
+# and there are many dependencies to go through before there are
+app-text/htmltidy test
+
# Georgy Yakovlev <gyakovlev@gentoo.org (2021-06-25)
# ceph is not going to be stable on ppc64
# https://bugs.gentoo.org/798744
diff --git a/profiles/arch/powerpc/ppc64/use.mask b/profiles/arch/powerpc/ppc64/use.mask
index 63cd97f2d51e..ab9cefcf66ac 100644
--- a/profiles/arch/powerpc/ppc64/use.mask
+++ b/profiles/arch/powerpc/ppc64/use.mask
@@ -3,6 +3,11 @@
### THIS FILE IS ONLY FOR PACKAGES MASKED ON BOTH 64-BIT AND 32-BIT USERLAND!!!
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# PyPy3 is keyworded here.
+-python_targets_pypy3
+-python_single_target_pypy3
+
# Sam James <sam@gentoo.org> (2021-10-16)
# media-libs/openexr doesn't work on BE (bug #818424)
# ...and openscenegraph needs openexr.
diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask
index 013b344a472d..49d27fdb8144 100644
--- a/profiles/arch/powerpc/ppc64/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask
@@ -4,13 +4,12 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
+# Michał Górny <mgorny@gentoo.org> (2021-12-31)
+# PyPy3 target is not ready for stable.
+python_targets_pypy3
+python_single_target_pypy3
+
# Sam James <sam@gentoo.org> (2021-11-14)
# media-libs/openexr is not marked stable on ppc64
# (it's broken on BE and it's more convenient to keep it at ~arch here for now)
openexr
-
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
diff --git a/profiles/arch/riscv/1level/make.defaults b/profiles/arch/riscv/1level/make.defaults
deleted file mode 100644
index 2a8d8bdc9bb3..000000000000
--- a/profiles/arch/riscv/1level/make.defaults
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-LIBDIR_lp64d="lib64"
-LIBDIR_lp64="lib64"
-LIBDIR_ilp32d="lib"
-LIBDIR_ilp32="lib"
diff --git a/profiles/arch/riscv/1level/package.mask b/profiles/arch/riscv/1level/package.mask
deleted file mode 100644
index eb4368881cc3..000000000000
--- a/profiles/arch/riscv/1level/package.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Doesnt work properly with the one-level libdirs
-<sys-apps/baselayout-2.7-r3
diff --git a/profiles/arch/riscv/1level/package.unmask b/profiles/arch/riscv/1level/package.unmask
deleted file mode 100644
index 61bf895f5679..000000000000
--- a/profiles/arch/riscv/1level/package.unmask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Does work properly with the one-level libdirs
-<dev-lang/python-3.7
diff --git a/profiles/arch/riscv/make.defaults b/profiles/arch/riscv/make.defaults
index 3a7d4ac18e7f..6006d582a10a 100644
--- a/profiles/arch/riscv/make.defaults
+++ b/profiles/arch/riscv/make.defaults
@@ -15,6 +15,15 @@ FCFLAGS="${CFLAGS}"
SYMLINK_LIB="no"
+# Note about LIBDIR_*:
+# 1) To keep in step with other arches and distributions we use "lib" for 32bit
+# and "lib64" for 64bit for the *default* ABI.
+# NOT the two level dirs from the specification, and NOT lib32 as specified
+# as 32bit fallback.
+# 2) The LIBDIRs provided *here* are the ones for secondary ABI in the multilib
+# case.
+# The LIBDIR for the *primary* ABI MUST be overridden in an inheriting profile.
+
# Flags for lp64d
LIBDIR_lp64d="lib64/lp64d"
CFLAGS_lp64d="-mabi=lp64d"
@@ -42,7 +51,8 @@ CHOST_ilp32="riscv32-unknown-linux-gnu"
# Since many people will want to test this in qemu...
FEATURES="-pid-sandbox -network-sandbox -ipc-sandbox"
-# The following stuff is, e.g., defined in subdirs:
+# The following stuff MUST be defined in subdirs:
# ABI
# DEFAULT_ABI
# MULTILIB_ABIS
+# LIBDIR_* for DEFAULT_ABI
diff --git a/profiles/arch/riscv/package.mask b/profiles/arch/riscv/package.mask
index 43580b7b49a0..3b8aa5520537 100644
--- a/profiles/arch/riscv/package.mask
+++ b/profiles/arch/riscv/package.mask
@@ -1,5 +1,5 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Doesnt work properly with the two-level libdirs
-<dev-lang/python-3.7
+# Doesnt work properly with the one-level libdirs
+<sys-apps/baselayout-2.7-r3
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask
index 8a95c710fd15..64bd1d5f56fb 100644
--- a/profiles/arch/riscv/package.use.mask
+++ b/profiles/arch/riscv/package.use.mask
@@ -1,6 +1,22 @@
-# Copyright 2019-2021 Gentoo Authors
+# Copyright 2019-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Andrey Grozin <grozin@gentoo.org> (2022-01-03)
+# dev-libs/utfcpp is not keyworded yet
+media-gfx/asymptote lsp
+
+# Yongxinag Liang <tanekliang@gmail.com> (2021-12-30)
+# untested.
+net-misc/vinagre spice
+
+# Alex Fan <alex.fan.q@gmail.com> (2021-12-28)
+# dev-lang/julia doesn't support riscv yet
+sci-mathematics/singular julia
+
+# Alexey Sokolov <alexey+gentoo@asokolov.org> (2012-12-25)
+# Requires dev-qt/qtwebengine
+sci-astronomy/stellarium webengine
+
# Alex Fan <alex.fan.q@gmail.com> (2021-12-12)
# dev-python/uvloop fails test #806412
# but with it installed, anyio passes all tests
diff --git a/profiles/arch/riscv/rv32imac/eapi b/profiles/arch/riscv/rv32imac/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/riscv/rv32imac/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/riscv/rv32imac/ilp32/make.defaults b/profiles/arch/riscv/rv32imac/ilp32/make.defaults
index 1065af43c9a8..702bf0db5663 100644
--- a/profiles/arch/riscv/rv32imac/ilp32/make.defaults
+++ b/profiles/arch/riscv/rv32imac/ilp32/make.defaults
@@ -1,9 +1,17 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# RISC-V rv32imac/ilp32 no-multilib profile
-# We have only one ABI
+CHOST="riscv32-unknown-linux-gnu"
+
MULTILIB_ABIS="ilp32"
DEFAULT_ABI="ilp32"
ABI="ilp32"
+
+LIBDIR_ilp32="lib"
+
+CFLAGS="-O2 -pipe -march=rv32imac -mabi=ilp32"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/profiles/arch/riscv/rv32imac/package.mask b/profiles/arch/riscv/rv32imac/ilp32/package.mask
index fae8be793357..fae8be793357 100644
--- a/profiles/arch/riscv/rv32imac/package.mask
+++ b/profiles/arch/riscv/rv32imac/ilp32/package.mask
diff --git a/profiles/arch/riscv/rv32imac/ilp32/package.use.force b/profiles/arch/riscv/rv32imac/ilp32/package.use.force
deleted file mode 100644
index aacc29b1d56e..000000000000
--- a/profiles/arch/riscv/rv32imac/ilp32/package.use.force
+++ /dev/null
@@ -1,3 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.force b/profiles/arch/riscv/rv32imac/ilp32/use.force
deleted file mode 100644
index 82bb958a577a..000000000000
--- a/profiles/arch/riscv/rv32imac/ilp32/use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv32imac/ilp32/use.mask b/profiles/arch/riscv/rv32imac/ilp32/use.mask
index 991c792750ad..9779cbad81b5 100644
--- a/profiles/arch/riscv/rv32imac/ilp32/use.mask
+++ b/profiles/arch/riscv/rv32imac/ilp32/use.mask
@@ -1,5 +1,5 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Mask multilib, since we do not want to use it.
-multilib
+# sys-libs/libseccomp has not been ported to rv32 yet
+seccomp
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
index d19b0ba49931..d21fdce62781 100644
--- a/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
+++ b/profiles/arch/riscv/rv32imac/ilp32d/make.defaults
@@ -1,12 +1,17 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# RISC-V rv32imac/ilp32d no-multilib profile
+CHOST="riscv32-unknown-linux-gnu"
+
+MULTILIB_ABIS="ilp32d"
+DEFAULT_ABI="ilp32d"
+ABI="ilp32d"
+
+LIBDIR_ilp32d="lib"
+
CFLAGS="-O2 -pipe -march=rv32imafdc -mabi=ilp32d"
CXXFLAGS="${CFLAGS}"
FFLAGS="${CFLAGS}"
FCFLAGS="${CFLAGS}"
-
-# We have only one ABI
-MULTILIB_ABIS="ilp32d"
diff --git a/profiles/arch/riscv/rv32imac/use.mask b/profiles/arch/riscv/rv32imac/ilp32d/package.mask
index 9779cbad81b5..fae8be793357 100644
--- a/profiles/arch/riscv/rv32imac/use.mask
+++ b/profiles/arch/riscv/rv32imac/ilp32d/package.mask
@@ -1,5 +1,5 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# sys-libs/libseccomp has not been ported to rv32 yet
-seccomp
+sys-libs/libseccomp
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/package.use.force b/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
deleted file mode 100644
index 9de5ab734497..000000000000
--- a/profiles/arch/riscv/rv32imac/ilp32d/package.use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv32imac/ilp32d/use.mask b/profiles/arch/riscv/rv32imac/ilp32d/use.mask
index d8172baa5f5f..9779cbad81b5 100644
--- a/profiles/arch/riscv/rv32imac/ilp32d/use.mask
+++ b/profiles/arch/riscv/rv32imac/ilp32d/use.mask
@@ -1,5 +1,5 @@
# Copyright 2019-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-# Mask multilib, since we do not want to use it.
-multilib
+# sys-libs/libseccomp has not been ported to rv32 yet
+seccomp
diff --git a/profiles/arch/riscv/rv32imac/parent b/profiles/arch/riscv/rv32imac/parent
deleted file mode 100644
index 6ee1b9eff10c..000000000000
--- a/profiles/arch/riscv/rv32imac/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../features/multilib
diff --git a/profiles/arch/riscv/rv32imac/use.force b/profiles/arch/riscv/rv32imac/use.force
deleted file mode 100644
index 9de5ab734497..000000000000
--- a/profiles/arch/riscv/rv32imac/use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv64gc/eapi b/profiles/arch/riscv/rv64gc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/arch/riscv/rv64gc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/arch/riscv/rv64gc/lp64/make.defaults b/profiles/arch/riscv/rv64gc/lp64/make.defaults
index 4aeb573215d2..e811f8eb643a 100644
--- a/profiles/arch/riscv/rv64gc/lp64/make.defaults
+++ b/profiles/arch/riscv/rv64gc/lp64/make.defaults
@@ -3,12 +3,15 @@
# RISC-V rv64gc/lp64 no-multilib profile
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
+CHOST="riscv64-unknown-linux-gnu"
-# We have only one ABI
MULTILIB_ABIS="lp64"
DEFAULT_ABI="lp64"
ABI="lp64"
+
+LIBDIR_lp64="lib64"
+
+CFLAGS="-O2 -pipe -march=rv64imac -mabi=lp64"
+CXXFLAGS="${CFLAGS}"
+FFLAGS="${CFLAGS}"
+FCFLAGS="${CFLAGS}"
diff --git a/profiles/arch/riscv/rv64gc/lp64/package.use.force b/profiles/arch/riscv/rv64gc/lp64/package.use.force
deleted file mode 100644
index 9de5ab734497..000000000000
--- a/profiles/arch/riscv/rv64gc/lp64/package.use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv64gc/lp64/use.force b/profiles/arch/riscv/rv64gc/lp64/use.force
deleted file mode 100644
index 9de5ab734497..000000000000
--- a/profiles/arch/riscv/rv64gc/lp64/use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv64gc/lp64/use.mask b/profiles/arch/riscv/rv64gc/lp64/use.mask
deleted file mode 100644
index d8172baa5f5f..000000000000
--- a/profiles/arch/riscv/rv64gc/lp64/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Mask multilib, since we do not want to use it.
-multilib
diff --git a/profiles/arch/riscv/1level/eapi b/profiles/arch/riscv/rv64gc/lp64d-multilib/eapi
index 7ed6ff82de6b..7ed6ff82de6b 100644
--- a/profiles/arch/riscv/1level/eapi
+++ b/profiles/arch/riscv/rv64gc/lp64d-multilib/eapi
diff --git a/profiles/arch/riscv/rv64gc/make.defaults b/profiles/arch/riscv/rv64gc/lp64d-multilib/make.defaults
index e35f63c8d1e1..3546d506abb7 100644
--- a/profiles/arch/riscv/rv64gc/make.defaults
+++ b/profiles/arch/riscv/rv64gc/lp64d-multilib/make.defaults
@@ -3,7 +3,7 @@
# RISC-V profile for rv64gc multilib
#
-# This immediate profile is ONLY useful for internal purposes; it can generate
+# This profile is ONLY useful for internal purposes; it can generate
# stages just fine, but the only "hardware" that can run them is qemu-user ...
CHOST="riscv64-unknown-linux-gnu"
@@ -12,3 +12,6 @@ CHOST="riscv64-unknown-linux-gnu"
MULTILIB_ABIS="lp64d lp64 ilp32d ilp32"
DEFAULT_ABI="lp64d"
ABI="lp64d"
+
+# One-level dir for the default abi
+LIBDIR_lp64d="lib64"
diff --git a/profiles/arch/riscv/rv64gc/lp64d-multilib/parent b/profiles/arch/riscv/rv64gc/lp64d-multilib/parent
new file mode 100644
index 000000000000..d6e19b529616
--- /dev/null
+++ b/profiles/arch/riscv/rv64gc/lp64d-multilib/parent
@@ -0,0 +1 @@
+../../../../features/multilib
diff --git a/profiles/arch/riscv/rv64gc/lp64d/make.defaults b/profiles/arch/riscv/rv64gc/lp64d/make.defaults
index f595f6ac4437..80a9bdad63ee 100644
--- a/profiles/arch/riscv/rv64gc/lp64d/make.defaults
+++ b/profiles/arch/riscv/rv64gc/lp64d/make.defaults
@@ -1,12 +1,17 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# RISC-V rv64gc/lp64d no-multilib profile
+CHOST="riscv64-unknown-linux-gnu"
+
+MULTILIB_ABIS="lp64d"
+DEFAULT_ABI="lp64d"
+ABI="lp64d"
+
+LIBDIR_lp64d="lib64"
+
CFLAGS="-O2 -pipe -march=rv64gc -mabi=lp64d"
CXXFLAGS="${CFLAGS}"
FFLAGS="${CFLAGS}"
FCFLAGS="${CFLAGS}"
-
-# We have only one ABI
-MULTILIB_ABIS="lp64d"
diff --git a/profiles/arch/riscv/rv64gc/lp64d/package.use.force b/profiles/arch/riscv/rv64gc/lp64d/package.use.force
deleted file mode 100644
index 9de5ab734497..000000000000
--- a/profiles/arch/riscv/rv64gc/lp64d/package.use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv64gc/lp64d/use.mask b/profiles/arch/riscv/rv64gc/lp64d/use.mask
deleted file mode 100644
index 991c792750ad..000000000000
--- a/profiles/arch/riscv/rv64gc/lp64d/use.mask
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Mask multilib, since we do not want to use it.
-multilib
diff --git a/profiles/arch/riscv/rv64gc/parent b/profiles/arch/riscv/rv64gc/parent
deleted file mode 100644
index 6ee1b9eff10c..000000000000
--- a/profiles/arch/riscv/rv64gc/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../features/multilib
diff --git a/profiles/arch/riscv/rv64gc/use.force b/profiles/arch/riscv/rv64gc/use.force
deleted file mode 100644
index 9de5ab734497..000000000000
--- a/profiles/arch/riscv/rv64gc/use.force
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/riscv/rv64gc/use.mask b/profiles/arch/riscv/rv64gc/use.mask
deleted file mode 100644
index 9de5ab734497..000000000000
--- a/profiles/arch/riscv/rv64gc/use.mask
+++ /dev/null
@@ -1,2 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
diff --git a/profiles/arch/s390/package.mask b/profiles/arch/s390/package.mask
index 4ec03ac97676..824dc8c81eea 100644
--- a/profiles/arch/s390/package.mask
+++ b/profiles/arch/s390/package.mask
@@ -4,4 +4,4 @@
# Sam James <sam@gentoo.org> (2021-11-05)
# Perl segfaults during build on s390(x). Presumably related to
# now truly respecting CFLAGS. bug #821577
-=dev-lang/perl-5.34.0-r5
+>=dev-lang/perl-5.34.0-r5
diff --git a/profiles/arch/s390/package.use.mask b/profiles/arch/s390/package.use.mask
index 3c5a79ed8553..0fc4971c703e 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2021-11-05)
@@ -35,11 +35,6 @@ app-arch/rpm test
# no ceph keyworded
net-analyzer/rrdtool rados
-# Robin H. Johnson <robbat2@gentoo.org> (2017-08-05)
-# Upstream Git is switching to PCRE2 w/ JIT.
-# This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-dev-vcs/git pcre-jit
-
# Lars Wendler <polynomial-c@gentoo.org> (2016-11-17)
# jit not supported on s390
dev-libs/libpcre2 jit
diff --git a/profiles/arch/s390/s390x/package.use.mask b/profiles/arch/s390/s390x/package.use.mask
index 9d4593ef4b49..9af431104cb5 100644
--- a/profiles/arch/s390/s390x/package.use.mask
+++ b/profiles/arch/s390/s390x/package.use.mask
@@ -1,8 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2021-02-05)
# libpcre2 has JIT support for s390x (not s390)
# but it doesn't seem to build right now?
dev-libs/libpcre2 jit
-dev-vcs/git pcre-jit
diff --git a/profiles/arch/sparc/64ul/package.use.mask b/profiles/arch/sparc/64ul/package.use.mask
index 343cd157d4d4..cdda3cd66f3b 100644
--- a/profiles/arch/sparc/64ul/package.use.mask
+++ b/profiles/arch/sparc/64ul/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2021-03-20)
@@ -7,10 +7,5 @@
dev-libs/libpcre jit
# Matt Turner <mattst88@gentoo.org> (2019-08-26)
-# Upstream Git is switching to PCRE2 w/ JIT.
-# This is not available on some arches, where a fallback to PCRE1 without JIT is used.
-<dev-vcs/git-2.31.0 pcre-jit
-
-# Matt Turner <mattst88@gentoo.org> (2019-08-26)
# jit not supported on sparc64
dev-libs/libpcre2 jit
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index fec578b5e9ab..f0527a3ac8e4 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -4,12 +4,6 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
-
# Sam James <sam@gentoo.org> (2021-04-27)
# Clang and friends aren't (yet?) stable on sparc
clang
diff --git a/profiles/arch/x86/package.use.mask b/profiles/arch/x86/package.use.mask
index b0e644494c6e..3f7965cb15de 100644
--- a/profiles/arch/x86/package.use.mask
+++ b/profiles/arch/x86/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Conrad Kostecki <conikost@gentoo.org> (2021-11-16)
@@ -17,10 +17,6 @@ x11-misc/read-edid -vbe-mode
# media-libs/webrtc-audio-processing only has amd64 and x86 keywords
media-video/pipewire -echo-cancel
-# Marek Szuba <marecki@gentoo.org> (2021-08-11)
-# dev-ruby/tty-editor not keyworded here yet (Bug #807685)
-app-text/htmltidy test
-
# James Le Cuirot <chewi@gentoo.org> (2021-08-07)
# The ORBlite scanner plugin only works on amd64 and x86.
net-print/hplip-plugin -orblite
@@ -31,10 +27,10 @@ net-print/hplip-plugin -orblite
media-video/obs-studio nvenc
# Marek Szuba <marecki@gentoo.org> (2021-07-17)
-# media-libs/rnnoise, media-plugins/gst-plugins-webrtc
+# media-plugins/gst-plugins-webrtc
# and media-plugins/zam-plugins not keyworded here
-media-sound/easyeffects rnnoise webrtc zamaudio
-media-sound/pulseeffects rnnoise webrtc zamaudio
+media-sound/easyeffects zamaudio
+media-sound/pulseeffects webrtc zamaudio
# Sam James <sam@gentoo.org> (2021-07-12)
# Haskell is (only) available on amd64/x86 right now in Gentoo
diff --git a/profiles/arch/x86/package.use.stable.mask b/profiles/arch/x86/package.use.stable.mask
index 1d2df4a87746..d234bdd14a84 100644
--- a/profiles/arch/x86/package.use.stable.mask
+++ b/profiles/arch/x86/package.use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# When you add an entry to the top of this file, add your name, the date, and
@@ -17,6 +17,14 @@
#--- END OF EXAMPLES ---
+# Marek Szuba <marecki@gentoo.org> (2022-01-03)
+# no stable media-libs/rnnoise on this arch yet
+media-sound/pulseeffects rnnoise
+
+# Marek Szuba <marecki@gentoo.org> (2022-01-03)
+# no stable dev-ruby/tty-editor on this arch yet
+app-text/htmltidy test
+
# Joonas Niilola <juippis@gentoo.org> (2021-08-13)
# dev-libs/efl is stabilized on x86.
app-crypt/pinentry -efl
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index e0bd80001526..58b15063cd35 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -4,12 +4,6 @@
# This file requires eapi 5 or later. New entries go on top.
# Please use the same syntax as in use.mask
-# Michał Górny <mgorny@gentoo.org> (2021-05-04)
-# Python 3.10 is not yet stable (and will not be until it's out of beta,
-# around September.
-python_single_target_python3_10
-python_targets_python3_10
-
# Sam James <sam@gentoo.org> (2020-11-10)
# media-gfx/openvdb is not stable on x86
# ... and has failing tests right now anyway
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index f25074f9d81a..547c7b31e83c 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
#
# System-wide defaults for the Portage system
@@ -7,7 +7,7 @@
# 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 FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc 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_USERLAND="BSD GNU"
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index f92c812d5477..0d2a178a42f0 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,17 @@
# This file is only for generic masks. For arch-specific masks (i.e.
# mask everywhere, unmask on arch/*) use arch/base.
+# John Helmert III <ajak@gentoo.org> (2021-12-31)
+# Rizin tests require a tarball of binaries of ambiguous license.
+# As such, we cannot properly test it, so mask the flag until this
+# situation is resolved.
+dev-util/rizin test
+
+# Sam James <sam@gentoo.org> (2021-12-27)
+# Doc building is broken and no new releases in a long time.
+# bug #830013
+sci-libs/flann doc
+
# Joonas Niilola <juippis@gentoo.org> (2021-12-20)
# Broken, upstream issue/PR open since 2021-05 without reply.
# Gentoo bug #821253
diff --git a/profiles/base/use.mask b/profiles/base/use.mask
index d5ff47743a6e..2a93cc41dd77 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# This file is only for generic masks. For arch-specific masks (i.e.
@@ -65,7 +65,6 @@ packagekit
# Don't put hardened in here.
# TODO: move multilib into arch/base once inherit order is fixed
selinux
-uclibc
multilib
# Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles.
@@ -76,15 +75,12 @@ elibc_bionic
elibc_Cygwin
elibc_Darwin
elibc_DragonFly
-elibc_FreeBSD
elibc_HPUX
elibc_Interix
-elibc_mintlib
elibc_musl
elibc_NetBSD
elibc_OpenBSD
elibc_SunOS
-elibc_uclibc
elibc_Winnt
kernel_AIX
diff --git a/profiles/default/linux/amd64/17.0/uclibc/deprecated b/profiles/default/linux/amd64/17.0/uclibc/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/default/linux/amd64/17.0/uclibc/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/default/linux/amd64/17.0/uclibc/eapi b/profiles/default/linux/amd64/17.0/uclibc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/17.0/uclibc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/17.0/uclibc/hardened/deprecated b/profiles/default/linux/amd64/17.0/uclibc/hardened/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/default/linux/amd64/17.0/uclibc/hardened/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/default/linux/amd64/17.0/uclibc/hardened/eapi b/profiles/default/linux/amd64/17.0/uclibc/hardened/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/amd64/17.0/uclibc/hardened/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/amd64/17.0/uclibc/hardened/parent b/profiles/default/linux/amd64/17.0/uclibc/hardened/parent
deleted file mode 100644
index 45a355b0beba..000000000000
--- a/profiles/default/linux/amd64/17.0/uclibc/hardened/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../features/hardened/amd64
diff --git a/profiles/default/linux/amd64/17.0/uclibc/make.defaults b/profiles/default/linux/amd64/17.0/uclibc/make.defaults
deleted file mode 100644
index 0ca751c8ecbb..000000000000
--- a/profiles/default/linux/amd64/17.0/uclibc/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="x86_64-gentoo-linux-uclibc"
-
-# Anthony G. Basile <blueness@gentoo.org> (2014-07-01)
-# Multilib-related setup, bug #515130
-MULTILIB_ABIS="amd64"
-CHOST_amd64="${CHOST}"
-LIBDIR_amd64="lib"
diff --git a/profiles/default/linux/amd64/17.0/uclibc/parent b/profiles/default/linux/amd64/17.0/uclibc/parent
deleted file mode 100644
index a56db381f595..000000000000
--- a/profiles/default/linux/amd64/17.0/uclibc/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../../arch/amd64/no-multilib
-../../../../../features/uclibc/
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/deprecated b/profiles/default/linux/arm/17.0/uclibc/armv6j/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/armv6j/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/eapi b/profiles/default/linux/arm/17.0/uclibc/armv6j/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/armv6j/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/deprecated b/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/eapi b/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/parent b/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/parent
deleted file mode 100644
index 3e3d7782bae7..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/armv6j/hardened/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../features/hardened
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/make.defaults b/profiles/default/linux/arm/17.0/uclibc/armv6j/make.defaults
deleted file mode 100644
index d5f3c4a8df89..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/armv6j/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="armv6j-unknown-linux-uclibceabihf"
-CHOST_arm="${CHOST}"
-
-CFLAGS="-O2 -pipe -march=armv6j -mfpu=vfp -mfloat-abi=hard"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv6j/parent b/profiles/default/linux/arm/17.0/uclibc/armv6j/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/armv6j/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/deprecated b/profiles/default/linux/arm/17.0/uclibc/armv7a/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/armv7a/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/eapi b/profiles/default/linux/arm/17.0/uclibc/armv7a/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/armv7a/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/deprecated b/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/eapi b/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/parent b/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/parent
deleted file mode 100644
index 3e3d7782bae7..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/armv7a/hardened/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../features/hardened
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/make.defaults b/profiles/default/linux/arm/17.0/uclibc/armv7a/make.defaults
deleted file mode 100644
index ff9bd9e3abda..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/armv7a/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="armv7a-unknown-linux-uclibceabihf"
-CHOST_arm="${CHOST}"
-
-CFLAGS="-O2 -pipe -march=armv7-a -mfpu=vfpv3-d16 -mfloat-abi=hard"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
diff --git a/profiles/default/linux/arm/17.0/uclibc/armv7a/parent b/profiles/default/linux/arm/17.0/uclibc/armv7a/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/armv7a/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/arm/17.0/uclibc/deprecated b/profiles/default/linux/arm/17.0/uclibc/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/default/linux/arm/17.0/uclibc/eapi b/profiles/default/linux/arm/17.0/uclibc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/arm/17.0/uclibc/parent b/profiles/default/linux/arm/17.0/uclibc/parent
deleted file mode 100644
index a22f101e8a92..000000000000
--- a/profiles/default/linux/arm/17.0/uclibc/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../../arch/arm
-../../../../../features/uclibc/
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
index c0b4d10a84cc..b567918b4526 100644
--- a/profiles/default/linux/musl/package.mask
+++ b/profiles/default/linux/musl/package.mask
@@ -1,10 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-sys-libs/uclibc-ng
sys-libs/glibc
-# We use eudev which is tested on both uclibc and musl
+# We use eudev which is tested on musl
sys-apps/systemd
sys-fs/udev
diff --git a/profiles/default/linux/musl/use.mask b/profiles/default/linux/musl/use.mask
index b609f7257cd7..ce9f2fcf95c8 100644
--- a/profiles/default/linux/musl/use.mask
+++ b/profiles/default/linux/musl/use.mask
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation.
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-elibc_musl
-elibc_uclibc
elibc_glibc
# video cards that work on musl
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index c110492efeac..50362fdc81fe 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Andrey Grozin <grozin@gentoo.org> (2021-05-06)
-# Upstream bug: all versions in the tree fail to compile
+# Upstream bug: old versions fail to compile
# bug #782688
-media-gfx/asymptote offscreen
+<media-gfx/asymptote-2.74 offscreen
# Peter Levine <plevine457@gmail.com> (2019-10-01)
# Native inotify support is preferred on linux.
diff --git a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/deprecated b/profiles/default/linux/powerpc/ppc32/17.0/uclibc/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/eapi b/profiles/default/linux/powerpc/ppc32/17.0/uclibc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/deprecated b/profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/eapi b/profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/parent b/profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/parent
deleted file mode 100644
index 289590637db8..000000000000
--- a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/hardened/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../features/musl/
diff --git a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/make.defaults b/profiles/default/linux/powerpc/ppc32/17.0/uclibc/make.defaults
deleted file mode 100644
index 38a341826097..000000000000
--- a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="powerpc-gentoo-linux-uclibc"
-
-# Anthony G. Basile <blueness@gentoo.org> (2014-07-01)
-# Multilib-related setup, bug #515130
-MULTILIB_ABIS="ppc"
-CHOST_ppc="${CHOST}"
-LIBDIR_ppc="lib"
diff --git a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/package.use b/profiles/default/linux/powerpc/ppc32/17.0/uclibc/package.use
deleted file mode 100644
index f0df3883da0e..000000000000
--- a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/package.use
+++ /dev/null
@@ -1,3 +0,0 @@
-# Anthony G. Basile <blueness@gentoo.org> (2019-06-14)
-# This is needed for default stage3
-sys-libs/gdbm berkdb
diff --git a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/package.use.mask b/profiles/default/linux/powerpc/ppc32/17.0/uclibc/package.use.mask
deleted file mode 100644
index e7b179867f2f..000000000000
--- a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/package.use.mask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Anthony G. Basile <blueness@gentoo.org> (2019-06-12)
-# Unfortunately pie has broken on ppc uclibc for years
-sys-devel/gcc pie
-
-# Anthony G. Basile <blueness@gentoo.org> (2019-06-14)
-# pie is also broken on openssh uclibc
-net-misc/openssh pie
diff --git a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/parent b/profiles/default/linux/powerpc/ppc32/17.0/uclibc/parent
deleted file mode 100644
index 28eee7de13be..000000000000
--- a/profiles/default/linux/powerpc/ppc32/17.0/uclibc/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../../../arch/powerpc/ppc32
-../../../../../../features/uclibc/
diff --git a/profiles/default/linux/riscv/17.0/rv32imac/eapi b/profiles/default/linux/riscv/17.0/rv32imac/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv32imac/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv32imac/ilp32/eapi b/profiles/default/linux/riscv/17.0/rv32imac/ilp32/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv32imac/ilp32/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv32imac/ilp32/parent b/profiles/default/linux/riscv/17.0/rv32imac/ilp32/parent
deleted file mode 100644
index a29c20c15237..000000000000
--- a/profiles/default/linux/riscv/17.0/rv32imac/ilp32/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/riscv/rv32imac/ilp32
diff --git a/profiles/default/linux/riscv/17.0/rv32imac/ilp32d/eapi b/profiles/default/linux/riscv/17.0/rv32imac/ilp32d/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv32imac/ilp32d/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv32imac/ilp32d/parent b/profiles/default/linux/riscv/17.0/rv32imac/ilp32d/parent
deleted file mode 100644
index f30144c36328..000000000000
--- a/profiles/default/linux/riscv/17.0/rv32imac/ilp32d/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/riscv/rv32imac/ilp32d
diff --git a/profiles/default/linux/riscv/17.0/rv32imac/parent b/profiles/default/linux/riscv/17.0/rv32imac/parent
deleted file mode 100644
index 5c520eb16b4e..000000000000
--- a/profiles/default/linux/riscv/17.0/rv32imac/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../..
-../../../../../arch/riscv/rv32imac
-../../../../../releases/17.0
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/deprecated
deleted file mode 100644
index 36128fb4712c..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/deprecated
+++ /dev/null
@@ -1,43 +0,0 @@
-default/linux/riscv/20.0/rv64gc/lp64d
-
-On RISC-V we are switching from two-level library directories (e.g.,
-/usr/lib64/lp64d) to a more traditional directory architecture.
-This is done via the profile upgrade from 17.0 to 20.0 profiles.
-
-We recommend to re-install from scratch using a 20.0 profile based
-stage. 17.0 profiles will be deprecated immediately and removed
-in 6 months.
-
-If you want to upgrade an existing installation, the following
-steps should be taken. Please read all commands carefully first and
-make sure you understand them, since the procedure is risky. The
-commands are given for a lp64d profile; in case of a lp64 profile,
-always replace lp64d with lp64.
-
-# cd /usr/local/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /usr/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# sln . lp64d
-
-Note that the last command uses "sln" instead of "ln -s".
-
-Then switch from your 17.0 profile to the corresponding 20.0 profile,
-either by using "eselect profile" or by manually changing the
-/etc/portage/make.profile symlink.
-
-Next, rebuild all packages:
-
-# emerge -eav world
-
-As last step, check if portage has removed any of the symlinks created
-above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/eapi b/profiles/default/linux/riscv/17.0/rv64gc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64/deprecated
deleted file mode 100644
index e38047556647..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64/deprecated
+++ /dev/null
@@ -1,43 +0,0 @@
-default/linux/riscv/20.0/rv64gc/lp64
-
-On RISC-V we are switching from two-level library directories (e.g.,
-/usr/lib64/lp64d) to a more traditional directory architecture.
-This is done via the profile upgrade from 17.0 to 20.0 profiles.
-
-We recommend to re-install from scratch using a 20.0 profile based
-stage. 17.0 profiles will be deprecated immediately and removed
-in 6 months.
-
-If you want to upgrade an existing installation, the following
-steps should be taken. Please read all commands carefully first and
-make sure you understand them, since the procedure is risky. The
-commands are given for a lp64d profile; in case of a lp64 profile,
-always replace lp64d with lp64.
-
-# cd /usr/local/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /usr/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# sln . lp64d
-
-Note that the last command uses "sln" instead of "ln -s".
-
-Then switch from your 17.0 profile to the corresponding 20.0 profile,
-either by using "eselect profile" or by manually changing the
-/etc/portage/make.profile symlink.
-
-Next, rebuild all packages:
-
-# emerge -eav world
-
-As last step, check if portage has removed any of the symlinks created
-above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/eapi b/profiles/default/linux/riscv/17.0/rv64gc/lp64/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/parent b/profiles/default/linux/riscv/17.0/rv64gc/lp64/parent
deleted file mode 100644
index 0273fe595371..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/riscv/rv64gc/lp64
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/deprecated
deleted file mode 100644
index 70e347cc4398..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/deprecated
+++ /dev/null
@@ -1,43 +0,0 @@
-default/linux/riscv/20.0/rv64gc/lp64/systemd
-
-On RISC-V we are switching from two-level library directories (e.g.,
-/usr/lib64/lp64d) to a more traditional directory architecture.
-This is done via the profile upgrade from 17.0 to 20.0 profiles.
-
-We recommend to re-install from scratch using a 20.0 profile based
-stage. 17.0 profiles will be deprecated immediately and removed
-in 6 months.
-
-If you want to upgrade an existing installation, the following
-steps should be taken. Please read all commands carefully first and
-make sure you understand them, since the procedure is risky. The
-commands are given for a lp64d profile; in case of a lp64 profile,
-always replace lp64d with lp64.
-
-# cd /usr/local/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /usr/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# sln . lp64d
-
-Note that the last command uses "sln" instead of "ln -s".
-
-Then switch from your 17.0 profile to the corresponding 20.0 profile,
-either by using "eselect profile" or by manually changing the
-/etc/portage/make.profile symlink.
-
-Next, rebuild all packages:
-
-# emerge -eav world
-
-As last step, check if portage has removed any of the symlinks created
-above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/eapi b/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/parent b/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/parent
deleted file mode 100644
index 44f88d3e2df0..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/deprecated
deleted file mode 100644
index 36128fb4712c..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/deprecated
+++ /dev/null
@@ -1,43 +0,0 @@
-default/linux/riscv/20.0/rv64gc/lp64d
-
-On RISC-V we are switching from two-level library directories (e.g.,
-/usr/lib64/lp64d) to a more traditional directory architecture.
-This is done via the profile upgrade from 17.0 to 20.0 profiles.
-
-We recommend to re-install from scratch using a 20.0 profile based
-stage. 17.0 profiles will be deprecated immediately and removed
-in 6 months.
-
-If you want to upgrade an existing installation, the following
-steps should be taken. Please read all commands carefully first and
-make sure you understand them, since the procedure is risky. The
-commands are given for a lp64d profile; in case of a lp64 profile,
-always replace lp64d with lp64.
-
-# cd /usr/local/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /usr/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# sln . lp64d
-
-Note that the last command uses "sln" instead of "ln -s".
-
-Then switch from your 17.0 profile to the corresponding 20.0 profile,
-either by using "eselect profile" or by manually changing the
-/etc/portage/make.profile symlink.
-
-Next, rebuild all packages:
-
-# emerge -eav world
-
-As last step, check if portage has removed any of the symlinks created
-above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/eapi b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/parent b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/parent
deleted file mode 100644
index f497f659b838..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../arch/riscv/rv64gc/lp64d
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/deprecated b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/deprecated
deleted file mode 100644
index cbac179df32e..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/deprecated
+++ /dev/null
@@ -1,43 +0,0 @@
-default/linux/riscv/20.0/rv64gc/lp64d/systemd
-
-On RISC-V we are switching from two-level library directories (e.g.,
-/usr/lib64/lp64d) to a more traditional directory architecture.
-This is done via the profile upgrade from 17.0 to 20.0 profiles.
-
-We recommend to re-install from scratch using a 20.0 profile based
-stage. 17.0 profiles will be deprecated immediately and removed
-in 6 months.
-
-If you want to upgrade an existing installation, the following
-steps should be taken. Please read all commands carefully first and
-make sure you understand them, since the procedure is risky. The
-commands are given for a lp64d profile; in case of a lp64 profile,
-always replace lp64d with lp64.
-
-# cd /usr/local/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /usr/lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# ln -s . lp64d
-
-# cd /lib64
-# cp -av lp64d/. .
-# rm -rf lp64d
-# sln . lp64d
-
-Note that the last command uses "sln" instead of "ln -s".
-
-Then switch from your 17.0 profile to the corresponding 20.0 profile,
-either by using "eselect profile" or by manually changing the
-/etc/portage/make.profile symlink.
-
-Next, rebuild all packages:
-
-# emerge -eav world
-
-As last step, check if portage has removed any of the symlinks created
-above, and if yes, recreate them.
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/eapi b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/parent b/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/parent
deleted file mode 100644
index 44f88d3e2df0..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/lp64d/systemd/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/17.0/rv64gc/parent b/profiles/default/linux/riscv/17.0/rv64gc/parent
deleted file mode 100644
index 689797260969..000000000000
--- a/profiles/default/linux/riscv/17.0/rv64gc/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../..
-../../../../../arch/riscv/rv64gc
-../../../../../releases/17.0
diff --git a/profiles/default/linux/riscv/20.0/rv32imac/parent b/profiles/default/linux/riscv/20.0/rv32imac/parent
index 4e6e3225bf31..b8f5b5cbc9d2 100644
--- a/profiles/default/linux/riscv/20.0/rv32imac/parent
+++ b/profiles/default/linux/riscv/20.0/rv32imac/parent
@@ -1,4 +1,2 @@
../..
-../../../../../arch/riscv/rv32imac
../../../../../releases/17.0
-../../../../../arch/riscv/1level
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults b/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults
deleted file mode 100644
index 42e660f1a345..000000000000
--- a/profiles/default/linux/riscv/20.0/rv64gc/multilib/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# we need to reset the two-level libdirs here, otherwise the one-level
-# paths lead to collisions... note that the default abi libdir remains
-# "lib64"
-
-LIBDIR_lp64="lib64/lp64"
-LIBDIR_ilp32d="lib32/ilp32d"
-LIBDIR_ilp32="lib32/ilp32"
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent b/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent
index f3229c5b9876..eef8b55d0efc 100644
--- a/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent
+++ b/profiles/default/linux/riscv/20.0/rv64gc/multilib/parent
@@ -1 +1,2 @@
..
+../../../../../../arch/riscv/rv64gc/lp64d-multilib
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/parent b/profiles/default/linux/riscv/20.0/rv64gc/parent
index 0f380a1962bb..b8f5b5cbc9d2 100644
--- a/profiles/default/linux/riscv/20.0/rv64gc/parent
+++ b/profiles/default/linux/riscv/20.0/rv64gc/parent
@@ -1,4 +1,2 @@
../..
-../../../../../arch/riscv/rv64gc
../../../../../releases/17.0
-../../../../../arch/riscv/1level
diff --git a/profiles/default/linux/riscv/parent b/profiles/default/linux/riscv/parent
index 9f9d2cbed246..1f65d976126f 100644
--- a/profiles/default/linux/riscv/parent
+++ b/profiles/default/linux/riscv/parent
@@ -1,2 +1,3 @@
../../../base
..
+../../../arch/riscv
diff --git a/profiles/default/linux/uclibc/deprecated b/profiles/default/linux/uclibc/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/default/linux/uclibc/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/default/linux/uclibc/eapi b/profiles/default/linux/uclibc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/uclibc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/uclibc/make.defaults b/profiles/default/linux/uclibc/make.defaults
deleted file mode 100644
index 1908f11a5fc0..000000000000
--- a/profiles/default/linux/uclibc/make.defaults
+++ /dev/null
@@ -1,12 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-PORTAGE_LIBC="uClibc"
-ELIBC=uclibc
-
-FEATURES="sandbox sfperms strict"
-
-USE="nptl unicode -berkdb"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} nptl -berkdb"
-
-SYMLINK_LIB="no"
diff --git a/profiles/default/linux/uclibc/mips/deprecated b/profiles/default/linux/uclibc/mips/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/default/linux/uclibc/mips/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/default/linux/uclibc/mips/eapi b/profiles/default/linux/uclibc/mips/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/uclibc/mips/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/uclibc/mips/make.defaults b/profiles/default/linux/uclibc/mips/make.defaults
deleted file mode 100644
index 3e3fbc4a2be4..000000000000
--- a/profiles/default/linux/uclibc/mips/make.defaults
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="mips"
-ACCEPT_KEYWORDS="${ARCH} ~${ARCH}"
-
-CHOST="mips-gentoo-linux-uclibc"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-# Anthony G. Basile <blueness@gentoo.org> (2014-07-01)
-# Multilib-related setup, bug #515130
-ABI="o32"
-DEFAULT_ABI="o32"
-MULTILIB_ABIS="o32"
-CHOST_o32="${CHOST}"
-LIBDIR_o32="lib"
-IUSE_IMPLICIT="abi_mips_o32"
diff --git a/profiles/default/linux/uclibc/mips/mipsel/deprecated b/profiles/default/linux/uclibc/mips/mipsel/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/default/linux/uclibc/mips/mipsel/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/default/linux/uclibc/mips/mipsel/eapi b/profiles/default/linux/uclibc/mips/mipsel/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/uclibc/mips/mipsel/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/uclibc/mips/mipsel/make.defaults b/profiles/default/linux/uclibc/mips/mipsel/make.defaults
deleted file mode 100644
index 7a0c10717521..000000000000
--- a/profiles/default/linux/uclibc/mips/mipsel/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="mipsel-gentoo-linux-uclibc"
-CHOST_o32="${CHOST}"
diff --git a/profiles/default/linux/uclibc/mips/mipsel/parent b/profiles/default/linux/uclibc/mips/mipsel/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/uclibc/mips/mipsel/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/uclibc/mips/package.mask b/profiles/default/linux/uclibc/mips/package.mask
deleted file mode 100644
index dddaa61ae978..000000000000
--- a/profiles/default/linux/uclibc/mips/package.mask
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-#
-# See bug #544756.
->=sys-devel/gcc-4.9
-
-#
-# Broken packages
-app-cdr/cdrtools
diff --git a/profiles/default/linux/uclibc/mips/package.use.force b/profiles/default/linux/uclibc/mips/package.use.force
deleted file mode 100644
index 89f4520ca4eb..000000000000
--- a/profiles/default/linux/uclibc/mips/package.use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (2016-09-24)
-# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_Mips
-sys-devel/clang llvm_targets_Mips
-sys-devel/llvm llvm_targets_Mips
diff --git a/profiles/default/linux/uclibc/mips/package.use.mask b/profiles/default/linux/uclibc/mips/package.use.mask
deleted file mode 100644
index 44c0f9a15363..000000000000
--- a/profiles/default/linux/uclibc/mips/package.use.mask
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Felix Janda <felix.janda@posteo.de> (2016-09-24)
-# net-libs/libnetfilter_conntrack is not keyworded on mips
-net-dns/dnsmasq conntrack
-
-# Davide Pesavento <pesa@gentoo.org> (2015-10-26)
-# Tests require non-keyworded qt5
-dev-qt/qtchooser test
-
-# Matthias Maier <tamiko@gentoo.org> (2014-12-24)
-# sys-devel/clang is not keyworded on mips.
-app-doc/doxygen clang
diff --git a/profiles/default/linux/uclibc/mips/parent b/profiles/default/linux/uclibc/mips/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/uclibc/mips/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/uclibc/mips/use.force b/profiles/default/linux/uclibc/mips/use.force
deleted file mode 100644
index e94d30137368..000000000000
--- a/profiles/default/linux/uclibc/mips/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
-mips
-abi_mips_o32
diff --git a/profiles/default/linux/uclibc/mips/use.mask b/profiles/default/linux/uclibc/mips/use.mask
deleted file mode 100644
index b285b3b4746e..000000000000
--- a/profiles/default/linux/uclibc/mips/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the flag which corresponds to arch/abi, bug #515130
--mips
--abi_mips_o32
diff --git a/profiles/default/linux/uclibc/package.mask b/profiles/default/linux/uclibc/package.mask
deleted file mode 100644
index 97da958c1c0c..000000000000
--- a/profiles/default/linux/uclibc/package.mask
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-sys-libs/musl
-sys-libs/glibc
-sys-libs/pam
-
-# We use eudev which is tested on both uclibc and musl
-sys-apps/systemd
-sys-fs/udev
-
-# Working on it, bug #470884
-dev-libs/elfutils
->virtual/libelf-2
-
-# These binary pkgs have a hard dep on glibc; make repoman shut up
-app-arch/rar
-dev-games/ps2-packer
-games-action/crimsonland
-games-action/descent3
-games-action/descent3-demo
-games-action/guacamelee
-games-action/shadowgrounds-bin
-games-action/shadowgrounds-survivor-bin
-games-action/trine
-games-fps/etqw-bin
-games-fps/glxquake-bin
-games-fps/legends
-games-fps/soldieroffortune
-games-fps/transfusion-bin
-games-fps/tribes2
-games-fps/ut2004
-games-fps/ut2004-bonuspack-cbp1
-games-fps/ut2004-bonuspack-cbp2
-games-fps/ut2004-bonuspack-ece
-games-fps/ut2004-bonuspack-mega
-games-fps/ut2004-data
-games-puzzle/world-of-goo-demo
-games-puzzle/world-of-goo-hb
-games-roguelike/neon-chrome
-games-rpg/costume-quest
-games-rpg/wasteland2
-games-server/etqw-ded
-games-server/ut2004-ded
-games-simulation/bcs-demo
-games-strategy/defcon-demo
-games-strategy/knights-demo
-games-strategy/majesty-demo
-
-# needs boost[nls]
-games-strategy/wesnoth
-
-# missing multilib deps
-games-action/beathazardultra
-games-action/brutal-legend
-games-action/hotline-miami
-games-action/intrusion2
-games-action/solar2
-games-action/swordandsworcery
-games-action/trine-enchanted-edition
-games-action/trine2
-games-arcade/dynamitejack
-games-arcade/thinktanks-demo
-games-misc/little-inferno
-games-misc/papers-please
-games-rpg/dear-esther
-games-rpg/dungeon-defenders
-
diff --git a/profiles/default/linux/uclibc/package.use.mask b/profiles/default/linux/uclibc/package.use.mask
deleted file mode 100644
index 6e32f7f6fd2e..000000000000
--- a/profiles/default/linux/uclibc/package.use.mask
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Michał Górny <mgorny@gentoo.org> (2018-01-12)
-# Those require USE=java that is masked in this profile.
-app-emulation/virtualbox vboxwebsrv
-app-office/libreoffice libreoffice_extensions_wiki-publisher
-
-# Thomas Deutschmann <whissi@gentoo.org> (2017-01-21)
-# Mask due Gnome3 not going to be stabilized on this arch
-# due to uclibc
-dev-util/geany-plugins gtkspell
-
-# Joshua Kinard <kumba@gentoo.org> (2016-01-18)
-# Fails linking to gettext/libintl for symbol 'libintl_gettext'.
-# Is fixable by using 'append-ldflags' from flag-o-matic to force
-# -lintl, but that's a QA violation. Real solution is to use
-# 'append-libs', but xfsdump's build system doesn't honor $LIBS.
-# So this is the best way for now. See 570548.
-sys-fs/xfsdump nls
diff --git a/profiles/default/linux/uclibc/packages b/profiles/default/linux/uclibc/packages
deleted file mode 100644
index cd23d77e3f2c..000000000000
--- a/profiles/default/linux/uclibc/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-*app-misc/pax-utils
-*dev-libs/libiconv
-*dev-libs/libintl
--*sys-apps/man-pages
diff --git a/profiles/default/linux/uclibc/packages.build b/profiles/default/linux/uclibc/packages.build
deleted file mode 100644
index bcc0d2106efd..000000000000
--- a/profiles/default/linux/uclibc/packages.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2021 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file lists extra packages needed to build for
-# a stage 1 based on this profile.
-
-dev-libs/libiconv
-dev-libs/libintl
diff --git a/profiles/default/linux/uclibc/parent b/profiles/default/linux/uclibc/parent
deleted file mode 100644
index 2348d8d17b95..000000000000
--- a/profiles/default/linux/uclibc/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../arch/base
-../../../base
-..
diff --git a/profiles/default/linux/uclibc/use.force b/profiles/default/linux/uclibc/use.force
deleted file mode 100644
index dbadd65e481f..000000000000
--- a/profiles/default/linux/uclibc/use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-elibc_uclibc
-uclibc
diff --git a/profiles/default/linux/uclibc/use.mask b/profiles/default/linux/uclibc/use.mask
deleted file mode 100644
index 32ee894d8488..000000000000
--- a/profiles/default/linux/uclibc/use.mask
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Thomas Deutschmann <whissi@gentoo.org> (2017-01-28)
-# No JAVA in uclibc
-java
-
-nls
-pam
-
--uclibc
-
--elibc_uclibc
-elibc_glibc
-elibc_musl
diff --git a/profiles/default/linux/x86/17.0/uclibc/deprecated b/profiles/default/linux/x86/17.0/uclibc/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/default/linux/x86/17.0/uclibc/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/default/linux/x86/17.0/uclibc/eapi b/profiles/default/linux/x86/17.0/uclibc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/x86/17.0/uclibc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/x86/17.0/uclibc/hardened/deprecated b/profiles/default/linux/x86/17.0/uclibc/hardened/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/default/linux/x86/17.0/uclibc/hardened/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/default/linux/x86/17.0/uclibc/hardened/eapi b/profiles/default/linux/x86/17.0/uclibc/hardened/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/default/linux/x86/17.0/uclibc/hardened/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/default/linux/x86/17.0/uclibc/hardened/parent b/profiles/default/linux/x86/17.0/uclibc/hardened/parent
deleted file mode 100644
index 45a355b0beba..000000000000
--- a/profiles/default/linux/x86/17.0/uclibc/hardened/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-..
-../../../../../../features/hardened/amd64
diff --git a/profiles/default/linux/x86/17.0/uclibc/make.defaults b/profiles/default/linux/x86/17.0/uclibc/make.defaults
deleted file mode 100644
index 846d921dc2c0..000000000000
--- a/profiles/default/linux/x86/17.0/uclibc/make.defaults
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-CHOST="i686-gentoo-linux-uclibc"
-
-# Anthony G. Basile <blueness@gentoo.org> (2014-07-01)
-# Multilib-related setup, bug #515130
-MULTILIB_ABIS="x86"
-CHOST_x86="${CHOST}"
-LIBDIR_x86="lib"
diff --git a/profiles/default/linux/x86/17.0/uclibc/parent b/profiles/default/linux/x86/17.0/uclibc/parent
deleted file mode 100644
index bf856ff784ae..000000000000
--- a/profiles/default/linux/x86/17.0/uclibc/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-..
-../../../../../arch/x86
-../../../../../features/uclibc/
diff --git a/profiles/desc/elibc.desc b/profiles/desc/elibc.desc
index 04c4db7791ff..ec994a00e657 100644
--- a/profiles/desc/elibc.desc
+++ b/profiles/desc/elibc.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# This file contains descriptions of ELIBC USE_EXPAND flags.
@@ -10,15 +10,12 @@ 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
-FreeBSD - ELIBC setting for systems that use the FreeBSD 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
-mintlib - ELIBC setting for systems that use the FreeMiNT C 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
-uclibc - ELIBC setting for systems that use the uClibc C library
Winnt - ELIBC setting for systems that use Winnt
diff --git a/profiles/embedded/make.defaults b/profiles/embedded/make.defaults
index b0ddb83f4f8d..4320f726a5e9 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2008-2021 Gentoo Authors
+# Copyright 2008-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
USE="kdrive minimal multicall zlib"
@@ -24,7 +24,7 @@ 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 FreeBSD glibc HPUX Interix mingw mintlib musl NetBSD OpenBSD SunOS uclibc 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_USERLAND="BSD GNU"
diff --git a/profiles/features/hardened/package.use.mask b/profiles/features/hardened/package.use.mask
index 484dafd701c0..fd48a16c7817 100644
--- a/profiles/features/hardened/package.use.mask
+++ b/profiles/features/hardened/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
sys-apps/hwloc gl
@@ -12,6 +12,3 @@ www-client/firefox gmp-autoupdate
# net-fs/openafs-kernel module can't be used on hardened,
# see bug 540196.
net-fs/openafs modules
-
-# jit don't work on hardened.
-dev-vcs/git pcre-jit
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 95cd5b8d1c49..66e8061eae59 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Marek Szuba <marecki@gentoo.org> (2022-01-01)
+# Binary-only package linked against glibc.
+app-crypt/rainbowcrack
+
# Conrad Kostecki <conikost@gentoo.org> (2021-12-15)
# Level Zero needs RTLD_DEEPBIND, which does not exist on musl.
dev-libs/level-zero
@@ -55,11 +59,8 @@ app-emulation/dosemu
# Old undated blocks of masks
#
-
-sys-libs/uclibc-ng
sys-libs/glibc
-# We use eudev which is tested on both uclibc and musl
# As of 2021-08-08, >=sys-fs/udev-249-r2 is patched in Gentoo
# to work on musl.
sys-apps/systemd
diff --git a/profiles/features/musl/use.mask b/profiles/features/musl/use.mask
index 3029d07118b7..394d12cd2af2 100644
--- a/profiles/features/musl/use.mask
+++ b/profiles/features/musl/use.mask
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors.
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Select the correct ELIBC
-elibc_musl
-elibc_uclibc
elibc_glibc
# Musl doesn't have support for utmp/wtmp by design
diff --git a/profiles/features/prefix/package.use.mask b/profiles/features/prefix/package.use.mask
index e31604ff8285..a90a7c2a9588 100644
--- a/profiles/features/prefix/package.use.mask
+++ b/profiles/features/prefix/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2021-01-27)
@@ -25,8 +25,8 @@ sys-apps/dbus-broker launcher
www-servers/uwsgi uwsgi_plugins_systemd_logger
# Benda Xu <heroxbd@gentoo.org> (2016-07-28)
-# Needs root privilege.
-sys-fs/eudev hwdb kmod
+# Needs root privileges.
+sys-fs/eudev kmod
# Fabian Groffen <grobian@gentoo.org> (2011-12-08)
# USE=vanilla produces a broken compiler for Prefix. Only use this flag
diff --git a/profiles/features/uclibc/deprecated b/profiles/features/uclibc/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/features/uclibc/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/features/uclibc/eapi b/profiles/features/uclibc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/features/uclibc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/features/uclibc/make.defaults b/profiles/features/uclibc/make.defaults
deleted file mode 100644
index 3a1b040cc7cb..000000000000
--- a/profiles/features/uclibc/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-PORTAGE_LIBC="uClibc"
-ELIBC=uclibc
-
-FEATURES="sandbox sfperms strict"
-
-USE="nptl unicode -berkdb"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} nptl -berkdb"
-
-SYMLINK_LIB="no"
-FEATURES="-multilib-strict"
diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask
deleted file mode 100644
index 39a81a82d33a..000000000000
--- a/profiles/features/uclibc/package.mask
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-sys-libs/musl
-sys-libs/glibc
-sys-libs/pam
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
-# Mask the libxcrypt-based virtual
-~virtual/libcrypt-2
--virtual/libcrypt:0/1
-
-# Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
-# Mask in favor of opentmpfiles until usable with uclibc-ng (bug #801106)
-sys-apps/systemd-tmpfiles
-
-# David Seifert <soap@gentoo.org> (2021-02-08)
-# nvidia-drivers only works against glibc.
-x11-drivers/nvidia-drivers
-
-# We use eudev which is tested on both uclibc and musl
-sys-apps/systemd
-sys-fs/udev
-
-# Working on it, bug #470884
-dev-libs/elfutils
->virtual/libelf-2
diff --git a/profiles/features/uclibc/package.unmask b/profiles/features/uclibc/package.unmask
deleted file mode 100644
index 73afa680a140..000000000000
--- a/profiles/features/uclibc/package.unmask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
-# Unmask opentmpfiles on uclibc profiles until systemd-tmpfiles is
-# usable (bug #801106).
-sys-apps/opentmpfiles
diff --git a/profiles/features/uclibc/package.use b/profiles/features/uclibc/package.use
deleted file mode 100644
index c5742cb3c80e..000000000000
--- a/profiles/features/uclibc/package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2021 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Anthony G. Basile <blueness@gentoo.org> (2018-07-14)
-# We need this to break a circular dependency with
-# 'sys-libs/libcap pam' in stage3 catalyst builds
-sys-libs/pam -filecaps
diff --git a/profiles/features/uclibc/package.use.force b/profiles/features/uclibc/package.use.force
deleted file mode 100644
index 82ca48bfea6c..000000000000
--- a/profiles/features/uclibc/package.use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2021 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
-# Do not force system install for libxcrypt here
->=sys-libs/libxcrypt-4.4.23-r1 -system -compat
diff --git a/profiles/features/uclibc/package.use.mask b/profiles/features/uclibc/package.use.mask
deleted file mode 100644
index b3f8a9ebe24a..000000000000
--- a/profiles/features/uclibc/package.use.mask
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org>
-# Restore mask here that is gone elsewhere
-sys-libs/libxcrypt split-usr system
-
-# Anthony G. Basile <blueness@gentoo.org>
-# sanitize is broken on at least all hardened uclibc
-sys-devel/gcc sanitize
-
-# Michał Górny <mgorny@gentoo.org> (2018-01-12)
-# Those require USE=java that is masked in this profile.
-app-emulation/virtualbox vboxwebsrv
-app-office/libreoffice libreoffice_extensions_wiki-publisher
-
-# Thomas Deutschmann <whissi@gentoo.org> (2017-01-21)
-# Mask due Gnome3 not going to be stabilized on this arch
-# due to uclibc
-dev-util/geany-plugins gtkspell
-
-# Joshua Kinard <kumba@gentoo.org> (2016-01-18)
-# Fails linking to gettext/libintl for symbol 'libintl_gettext'.
-# Is fixable by using 'append-ldflags' from flag-o-matic to force
-# -lintl, but that's a QA violation. Real solution is to use
-# 'append-libs', but xfsdump's build system doesn't honor $LIBS.
-# So this is the best way for now. See 570548.
-sys-fs/xfsdump nls
-
-# static linking works with uClibc
-app-shells/mksh -static
diff --git a/profiles/features/uclibc/packages b/profiles/features/uclibc/packages
deleted file mode 100644
index 0ff81f33bfb2..000000000000
--- a/profiles/features/uclibc/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-*app-misc/pax-utils
-*dev-libs/libiconv
-*dev-libs/libintl
--*sys-apps/man-pages
diff --git a/profiles/features/uclibc/packages.build b/profiles/features/uclibc/packages.build
deleted file mode 100644
index eb8df49779a5..000000000000
--- a/profiles/features/uclibc/packages.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file lists extra packages needed to build for
-# a stage 1 based on this profile.
-
-dev-libs/libiconv
-dev-libs/libintl
diff --git a/profiles/features/uclibc/use.force b/profiles/features/uclibc/use.force
deleted file mode 100644
index 6225883ae668..000000000000
--- a/profiles/features/uclibc/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Select the correct ELIBC
-elibc_uclibc
-uclibc
diff --git a/profiles/features/uclibc/use.mask b/profiles/features/uclibc/use.mask
deleted file mode 100644
index 94bf5b5ae184..000000000000
--- a/profiles/features/uclibc/use.mask
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors.
-# Distributed under the terms of the GNU General Public License v2
-
-# Thomas Deutschmann <whissi@gentoo.org> (2017-01-28)
-# No JAVA in uclibc
-java
-
-nls
-pam
-
--uclibc
-
--elibc_uclibc
-elibc_glibc
-elibc_musl
-
-systemd
diff --git a/profiles/hardened/linux/musl/use.mask b/profiles/hardened/linux/musl/use.mask
index b851b043ca08..c294cc126a42 100644
--- a/profiles/hardened/linux/musl/use.mask
+++ b/profiles/hardened/linux/musl/use.mask
@@ -1,8 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation.
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-elibc_musl
-elibc_uclibc
elibc_glibc
-hardened
diff --git a/profiles/hardened/linux/uclibc/deprecated b/profiles/hardened/linux/uclibc/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/hardened/linux/uclibc/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/hardened/linux/uclibc/eapi b/profiles/hardened/linux/uclibc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/uclibc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/make.defaults b/profiles/hardened/linux/uclibc/make.defaults
deleted file mode 100644
index 1212f635f54f..000000000000
--- a/profiles/hardened/linux/uclibc/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-USE="${USE} hardened pic -jit -orc"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic -jit -orc"
diff --git a/profiles/hardened/linux/uclibc/mips/eapi b/profiles/hardened/linux/uclibc/mips/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/uclibc/mips/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/mips/mipsel/eapi b/profiles/hardened/linux/uclibc/mips/mipsel/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/hardened/linux/uclibc/mips/mipsel/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/hardened/linux/uclibc/mips/mipsel/parent b/profiles/hardened/linux/uclibc/mips/mipsel/parent
deleted file mode 100644
index 27f3883747a6..000000000000
--- a/profiles/hardened/linux/uclibc/mips/mipsel/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../default/linux/uclibc/mips/mipsel/
-../..
diff --git a/profiles/hardened/linux/uclibc/mips/parent b/profiles/hardened/linux/uclibc/mips/parent
deleted file mode 100644
index 323f100058b2..000000000000
--- a/profiles/hardened/linux/uclibc/mips/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/uclibc/mips
-..
diff --git a/profiles/hardened/linux/uclibc/package.use.mask b/profiles/hardened/linux/uclibc/package.use.mask
deleted file mode 100644
index 7525128ecb90..000000000000
--- a/profiles/hardened/linux/uclibc/package.use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Anthony G. Basile <blueness@gentoo.org> (2017-12-12)
-# masked in base, unmask for hardened/uclibc
-sys-devel/gcc -pie
diff --git a/profiles/hardened/linux/uclibc/use.force b/profiles/hardened/linux/uclibc/use.force
deleted file mode 100644
index b0ea1237d5a6..000000000000
--- a/profiles/hardened/linux/uclibc/use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-elibc_uclibc
-
-# Make sure people don't accidentally turn of ssp/pie in important packages.
-pie
-ssp
diff --git a/profiles/hardened/linux/uclibc/use.mask b/profiles/hardened/linux/uclibc/use.mask
deleted file mode 100644
index 174226cb64e3..000000000000
--- a/profiles/hardened/linux/uclibc/use.mask
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
--elibc_uclibc
-elibc_musl
-elibc_glibc
-
--hardened
-
-# precompiled headers are not compat with ASLR.
-pch
-
-# prelink is masked for hardened
-prelink
-
-# profile are incompatible when linking with pie
-profile
diff --git a/profiles/info_pkgs b/profiles/info_pkgs
index ec81f85d27d5..bb782b267881 100644
--- a/profiles/info_pkgs
+++ b/profiles/info_pkgs
@@ -1,4 +1,4 @@
-# Copyright 2004-2021 Gentoo Authors
+# Copyright 2004-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
##
@@ -11,7 +11,6 @@ sys-devel/automake
sys-kernel/linux-headers
sys-libs/glibc
sys-libs/musl
-sys-libs/uclibc-ng
sys-devel/binutils
sys-devel/binutils-config
sys-devel/libtool
diff --git a/profiles/package.mask b/profiles/package.mask
index 772a96c9f80d..8693c9eb21f2 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
####################################################################
@@ -33,6 +33,42 @@
#--- END OF EXAMPLES ---
+# Ionen Wolkens <ionen@gentoo.org> (2022-01-03)
+# Obsolete, higan-purify is now provided by games-emulation/higan
+# as the icarus utility (bug #821121) and dev-games/higan-ananke
+# has no known uses without higan-purify (bug #821124). Further
+# stuck on gtk2 with dead HOMEPAGE / SRC_URI.
+# Removal after 2022-02-02.
+games-util/higan-purify
+dev-games/higan-ananke
+
+# Florian Schmaus <flow@gentoo.org> (2022-01-02)
+# Unmaintained, upstream gone, only packaged by
+# Gentoo, and the whole idea to unlock based on
+# bluetooth appears to be insecure. Bug #830448
+# Removal after 2022-03-01.
+sys-auth/pam_blue
+
+# Jonas Stein <jstein@gentoo.org> (2022-01-02)
+# Unmaintained and broken.
+# Removal after 2022-03-01. Bug #830428.
+www-servers/bozohttpd
+
+# Jonas Stein <jstein@gentoo.org> (2021-12-31)
+# Removal after 2022-05-01. Bug #830331.
+# Broken and upstream needs new maintainer.
+x11-plugins/purple-facebook
+
+# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-11-19)
+# java-virtuals and packages without consumers.
+# Bug #828719. Removal in 30 days.
+java-virtuals/ejb-api
+java-virtuals/saaj-api
+java-virtuals/transaction-api
+java-virtuals/xmlrpc-api
+dev-java/jsr67
+dev-java/glassfish-ejb-api
+
# Mike Gilbert <floppym@gentoo.org> (2021-12-24)
# Replaced by sys-apps/hwdata. Removal on 2022-01-23.
sys-apps/hwids
@@ -201,106 +237,11 @@ net-analyzer/amap
# Blender compatibility (no mixed LLVM versions).
=media-libs/osl-1.12*
-# William Hubbs <williamh@gentoo.org> (2021-11-30)
-# Dead upstream, no releases since 2015
-# Bug #770619; masked for removal on 2021-12-30.
-net-vpn/badvpn
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-11-30)
-# Blocks cleanup of sci-libs/fcl-0.5.0, unmaintained in Gentoo.
-# Upstream master claims to target sci-libs/fcl-0.6.1, but that
-# requires someone adopting the package.
-# Bug #770589; masked for removal on 2021-12-30.
-dev-python/python-fcl
-
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-11-30)
-# No revdeps, bug #774498; masked for removal on 2021-12-30.
-dev-libs/qrosscore
-
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-11-28)
-# Libraries without consumers. Removal in 30 days.
-dev-java/commons-pool
-dev-java/dict4j
-dev-java/felix-gogo-command
-dev-java/jama
-dev-java/janino
-dev-java/jchardet
-dev-java/jcommon
-dev-java/jdynamite
-dev-java/jfreesvg
-dev-java/jgrapht
-dev-java/jmdns
-dev-java/jsr225
-dev-java/jsr311-api
-dev-java/jsr322
-dev-java/jung
-dev-java/mojarra
-dev-java/neuroph
-dev-java/ognl
-dev-java/piccolo
-dev-java/portletapi
-dev-java/vldocking
-dev-java/ws-commons-util
-dev-java/xml-security
-dev-java/xmpcore
-
-# Marek Szuba <marecki@gentoo.org> (2021-11-27)
-# XXV has been outdated and unmaintained in Gentoo for years.
-# EAPI 5, numerous QA violations.
-# Removal in 30 days. Bug #827669
-www-misc/xxv
-x11-themes/xxv-skins
-
-# Marek Szuba <marecki@gentoo.org> (2021-11-27)
-# No activity in upstream GitHub repository since July 2013,
-# no official release tarballs, unmaintained in Gentoo, EAPI 5.
-# Removal in 30 days. Bug #827666
-www-apache/mod_vhost_ldap
-
-# Marek Szuba <marecki@gentoo.org> (2021-11-27)
-# Upstream Web site (including release tarballs) is gone, no activity
-# in their GitHub repository since June 2012. Unmaintained in Gentoo
-# for years, EAPI 5.
-# Removal in 30 days. Bug #827663
-www-apache/mod_ldap_userdir
-
-# Marek Szuba <marecki@gentoo.org> (2021-11-27)
-# Upstream is long gone, unmaintained in Gentoo for years, EAPI 5.
-# Removal in 30 days. Bug #827657
-www-apache/mod_extract_forwarded
-
-# Marek Szuba <marecki@gentoo.org> (2021-11-27)
-# No upstream activity since October 2005, release tarballs
-# not available any more. Unmaintained in Gentoo, EAPI 5.
-# Removal in 30 days. Bug #827654
-www-apache/mod_evasive
-
-# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-11-26)
-# Library without consumers. Removal in 30 days.
-dev-java/jss
-
-# Alfredo Tupone <tupone@gentoo.org> (2021-11-26)
-# EAPI 6. Removal in 30 days. Bug @827158
-=dev-lang/gnat-gpl-2019-r2
-
-# Marek Szuba <marecki@gentoo.org> (2021-11-25)
-# Upstream discontinued Linux support over 10 years ago so we are now
-# one major version and countless known bugs behind. No source archives
-# published for current versions. Unmaintained in Gentoo for years,
-# EAPI 5. Removal in 30 days. Bug #827522
-sci-biology/ApE
-
# Hans de Graaff <graaff@gentoo.org> (2021-11-26)
# Mask new rubygems version for testing. This version uses a new
# gentoo-defaults profile, bug #789957
>=dev-ruby/rubygems-3.2.31
-# Hans de Graaff <graaff@gentoo.org> (2021-11-26)
-# Old slot, obsolete since 2016. No reverse dependencies. Use the
-# newer slot instead.
-# Masked for removal in 30 days.
-dev-ruby/typhoeus:0
-
# Volkmar W. Pogatzki <gentoo@pogatzki.net> (2021-11-23)
# Does not support updated dev-java/pdfbox-2.0.24, Bug #803488
# Blocks (CVE-2018-11797, CVE-2021-{27807,27906,31811,31812})
diff --git a/profiles/prefix/darwin/macos/package.mask b/profiles/prefix/darwin/macos/package.mask
index 8db86fec4d07..7c44bbda818d 100644
--- a/profiles/prefix/darwin/macos/package.mask
+++ b/profiles/prefix/darwin/macos/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Sam James <sam@gentoo.org> (2021-12-23)
@@ -8,9 +8,3 @@
# bug #829847
=app-editors/nano-5.9
=app-editors/nano-6.0
-
-# Sam James <sam@gentoo.org> (2021-09-05)
-# gdbm-1.21 fails to build right now on macOS with:
-# ```gdbmshell.c:1013:54: error: ‘struct stat’ has no member named ‘st_mtim’```
-# bug #811792
-=sys-libs/gdbm-1.21
diff --git a/profiles/prefix/sunos/use.mask b/profiles/prefix/sunos/use.mask
index 02248a9b5031..875fdb97c4dd 100644
--- a/profiles/prefix/sunos/use.mask
+++ b/profiles/prefix/sunos/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Re-add SunOS libc
@@ -19,5 +19,4 @@ hardened
oss
svga
rtc
-uclibc
v4l
diff --git a/profiles/prefix/windows/winnt/use.mask b/profiles/prefix/windows/winnt/use.mask
index 7c916bb3e37c..96fe791477a6 100644
--- a/profiles/prefix/windows/winnt/use.mask
+++ b/profiles/prefix/windows/winnt/use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Re-add Winnt libc
@@ -7,7 +7,6 @@
# CURL_SSL=winssl is allowd on Winnt libc
-curl_ssl_winssl
-# these need a review, since they are just copied from interix
# these will more than likely never work on Windows
3dfx
acpi
@@ -46,8 +45,6 @@ selinux
scanner
smartcard
svga
-uclibc
-# unicode is totally b0rked on interix
unicode
usb
v4l
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index ef85a255410f..f60317bf41ad 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -1,4 +1,4 @@
-# Copyright 2003-2021 Gentoo Authors
+# Copyright 2003-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
#############################################
@@ -208,11 +208,6 @@ ppc64 default/linux/ppc64le/17.0/musl/hardened exp
# RISC-V Profiles
# @MAINTAINER: riscv@gentoo.org
-riscv default/linux/riscv/17.0/rv64gc exp
-riscv default/linux/riscv/17.0/rv64gc/lp64d exp
-riscv default/linux/riscv/17.0/rv64gc/lp64d/systemd exp
-riscv default/linux/riscv/17.0/rv64gc/lp64 exp
-riscv default/linux/riscv/17.0/rv64gc/lp64/systemd exp
riscv default/linux/riscv/20.0/rv64gc/lp64d stable
riscv default/linux/riscv/20.0/rv64gc/lp64d/desktop dev
riscv default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome dev
@@ -285,23 +280,6 @@ ppc default/linux/powerpc/ppc32/17.0/musl/hardened exp
x86 default/linux/x86/17.0/musl exp
x86 default/linux/x86/17.0/musl/selinux exp
-# Non-embedded uclibc profiles
-# @MAINTAINER: uclibc@gentoo.org
-amd64 default/linux/amd64/17.0/uclibc exp
-amd64 default/linux/amd64/17.0/uclibc/hardened exp
-arm default/linux/arm/17.0/uclibc/armv6j exp
-arm default/linux/arm/17.0/uclibc/armv6j/hardened exp
-arm default/linux/arm/17.0/uclibc/armv7a exp
-arm default/linux/arm/17.0/uclibc/armv7a/hardened exp
-mips default/linux/uclibc/mips exp
-mips hardened/linux/uclibc/mips exp
-mips default/linux/uclibc/mips/mipsel exp
-mips hardened/linux/uclibc/mips/mipsel exp
-ppc default/linux/powerpc/ppc32/17.0/uclibc exp
-ppc default/linux/powerpc/ppc32/17.0/uclibc/hardened exp
-x86 default/linux/x86/17.0/uclibc exp
-x86 default/linux/x86/17.0/uclibc/hardened exp
-
# These are Gentoo Prefix profiles, maintained by the Prefix team
# @MAINTAINER: prefix@gentoo.org
diff --git a/profiles/targets/desktop/plasma/package.use b/profiles/targets/desktop/plasma/package.use
index a85ee3fa4ce6..ace810f3220d 100644
--- a/profiles/targets/desktop/plasma/package.use
+++ b/profiles/targets/desktop/plasma/package.use
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# NSS: Required by kde-apps/okular[pdf]
@@ -52,11 +52,7 @@ net-firewall/nftables json python xtables
# Required by dev-qt/qtwebengine:5
sys-libs/zlib minizip
-# Required by kde-plasma/kwin; >=1.20.13-r1 has dropped the flag
-<x11-base/xorg-server-1.20.13-r1 wayland
-
# Keep existing defaults after dropping IUSE=phonon from make.defaults
<app-office/calligra-3.3 phonon
kde-apps/kio-extras phonon
kde-apps/marble phonon
-
diff --git a/profiles/targets/systemd/package.use.force b/profiles/targets/systemd/package.use.force
index 0abe8e8aadcc..f662b57f596f 100644
--- a/profiles/targets/systemd/package.use.force
+++ b/profiles/targets/systemd/package.use.force
@@ -1,6 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Sam James <sam@gentoo.org> (2022-01-03)
+# Need systemd enabled here for depgraph: bug #830485
+# (only sys-fs/eudev supports static which isn't available on systemd profiles)
+sys-fs/mdadm systemd
+
# Mike Gilbert <floppym@gentoo.org> (2015-04-22)
# Force systemd to avoid depgraph breakage, bug 547360.
virtual/libudev systemd
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 5be2d33fb589..02ef5195fc10 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -1,4 +1,4 @@
-apache https://apache.lauf-forum.at/ https://apache.mirror.digionline.de/ https://apache.mirror.iphh.net/ https://artfiles.org/apache.org/ https://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ https://ftp.fau.de/apache/ https://ftp.halifax.rwth-aachen.de/apache/ http://mirror.23media.de/apache/ https://apache.mirrors.hoobly.com/ http://www.gtlib.gatech.edu/pub/apache/ https://apache.osuosl.org/
+apache https://apache.lauf-forum.at/ https://apache.mirror.iphh.net/ https://artfiles.org/apache.org/ https://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/ https://ftp.fau.de/apache/ https://apache.mirrors.hoobly.com/ http://www.gtlib.gatech.edu/pub/apache/ https://apache.osuosl.org/
cpan https://cpan.metacpan.org https://www.cpan.org
cran https://cran.r-project.org https://cran.us.r-project.org
debian https://deb.debian.org/debian/ http://ftp.au.debian.org/debian/ http://ftp.at.debian.org/debian/ http://ftp.by.debian.org/debian/ http://ftp.be.debian.org/debian/ http://ftp.br.debian.org/debian/ http://ftp.bg.debian.org/debian/ http://ftp.ca.debian.org/debian/ http://ftp2.cn.debian.org/debian/ http://ftp.cn.debian.org/debian/ http://ftp.hr.debian.org/debian/ http://ftp.cz.debian.org/debian/ http://ftp.dk.debian.org/debian/ http://ftp.sv.debian.org/debian/ http://ftp.ee.debian.org/debian/ http://ftp.fi.debian.org/debian/ http://ftp.fr.debian.org/debian/ http://ftp2.de.debian.org/debian/ http://ftp.de.debian.org/debian/ http://ftp.gr.debian.org/debian/ http://ftp.hu.debian.org/debian/ http://ftp.is.debian.org/debian/ http://ftp.ie.debian.org/debian/ http://ftp.it.debian.org/debian/ http://ftp.jp.debian.org/debian/ http://ftp.lt.debian.org/debian/ http://ftp.mx.debian.org/debian/ http://ftp.md.debian.org/debian/ http://ftp.nl.debian.org/debian/ http://ftp.nc.debian.org/debian/ http://ftp.nz.debian.org/debian/ http://ftp.no.debian.org/debian/ http://ftp.pl.debian.org/debian/ http://ftp.pt.debian.org/debian/ http://ftp.ro.debian.org/debian/ http://ftp.ru.debian.org/debian/ http://ftp.sg.debian.org/debian/ http://ftp.sk.debian.org/debian/ http://ftp.si.debian.org/debian/ http://ftp.es.debian.org/debian/ http://ftp.se.debian.org/debian/ http://ftp.ch.debian.org/debian/ http://ftp.tw.debian.org/debian/ http://ftp.tr.debian.org/debian/ http://ftp.ua.debian.org/debian/ http://ftp.uk.debian.org/debian/ http://ftp.us.debian.org/debian/
diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017
index faa4e3963bc3..b68e933e5fe7 100644
--- a/profiles/updates/1Q-2017
+++ b/profiles/updates/1Q-2017
@@ -3,7 +3,6 @@ move dev-libs/uchardet app-i18n/uchardet
move net-libs/libkgapi kde-apps/libkgapi
slotmove =dev-ruby/typhoeus-1.1.2 0 1
move app-cdr/k3b kde-apps/k3b
-move net-misc/badvpn net-vpn/badvpn
move net-misc/libreswan net-vpn/libreswan
move net-misc/logmein-hamachi net-vpn/logmein-hamachi
move net-misc/openconnect net-vpn/openconnect
diff --git a/profiles/updates/3Q-2021 b/profiles/updates/3Q-2021
index 1672dcae1c5c..f27a66f3d891 100644
--- a/profiles/updates/3Q-2021
+++ b/profiles/updates/3Q-2021
@@ -3,7 +3,6 @@ move media-sound/zam-plugins media-plugins/zam-plugins
slotmove =dev-ruby/elasticsearch-transport-6.8.3 6 6.8.3
move dev-python/cfn-python-lint dev-python/cfn-lint
move dev-python/dbusmock dev-python/python-dbusmock
-move dev-python/fcl dev-python/python-fcl
move dev-python/python-backoff dev-python/backoff
move dev-python/python-musicbrainz-ngs dev-python/python-musicbrainzngs
move dev-python/python-podman dev-python/podman-py
diff --git a/profiles/updates/4Q-2021 b/profiles/updates/4Q-2021
index ff58730799b0..aad8f76a9cdf 100644
--- a/profiles/updates/4Q-2021
+++ b/profiles/updates/4Q-2021
@@ -66,3 +66,6 @@ move app-emulation/flannel app-containers/flannel
move app-emulation/lxd app-containers/lxd
move app-emulation/lxc-templates app-containers/lxc-templates
move app-emulation/lxc app-containers/lxc
+move dev-libs/stp sci-mathematics/stp
+move app-shells/fzy app-text/fzy
+move dev-python/exdown dev-python/pytest-codeblocks
diff --git a/profiles/use.desc b/profiles/use.desc
index 59fd60a65eeb..33b5cc3fd624 100644
--- a/profiles/use.desc
+++ b/profiles/use.desc
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
# Keep them sorted
@@ -319,7 +319,6 @@ tiff - Add support for the TIFF image format
timidity - Build with Timidity++ (MIDI sequencer) support
tk - Add support for Tk GUI toolkit
truetype - Add support for FreeType and/or FreeType2 fonts
-uclibc - Enable uclibc specific patches and build or link uclibc
udev - Enable virtual/udev integration (device discovery, power and storage device support, etc)
udisks - Enable storage management support (automounting, volume monitoring, etc)
unicode - Add support for Unicode
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 189ce2fd6f3d..a94ed6a96574 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -877,6 +877,7 @@ app-misc/lirc:uinput - Enable support for uinput
app-misc/mc:edit - Compile and install the mcedit application
app-misc/mc:sftp - Add support for sftp (uses net-libs/libssh2 for it).
app-misc/mc:slang - Use sys-libs/slang instead of sys-libs/ncurses.
+app-misc/mime-types:nginx - Enable mime-types support for www-servers/nginx package
app-misc/mosquitto:bridge - Enable bridge support in the MQTT broker.
app-misc/mosquitto:persistence - Store messages and subscriptions to a file.
app-misc/mosquitto:srv - Include SRV lookup support.
@@ -1211,11 +1212,17 @@ dev-ada/gnatcoll-db:sql - Build sql library
dev-ada/gnatcoll-db:static-pic - Build shared library
dev-ada/gnatcoll-db:xref - Build xref library
dev-ada/gtkada:shared - Build gtkada as shared library
+dev-ada/gtkada:static-pic - Build static library with pic code
dev-ada/langkit:shared - Build shared library
dev-ada/langkit:static-pic - Build static library with pic code
dev-ada/libadalang:static-pic - Build static library with pic code
+dev-ada/libadalang-tools:shared - Build shared library
+dev-ada/libadalang-tools:static-pic - Build static library with pic code
dev-ada/libgpr:shared - Build shared library
dev-ada/libgpr:static-pic - Build static library with pic code
+dev-ada/spawn:glib - Add support to dev-libs/glib-based mainloop.
+dev-ada/spawn:shared - Build shared library
+dev-ada/spawn:static-pic - Build static library with pic code
dev-ada/xmlada:shared - Build shared library
dev-ada/xmlada:static-pic - Build static library with pic code
dev-cpp/abseil-cpp:cxx17 - Build with -DCMAKE_CXX_STANDARD=17 (required by some revdeps)
@@ -1685,7 +1692,6 @@ dev-java/icedtea-bin:headless-awt - Don't install the X backend for AWT, needed
dev-java/jaxen:dom4j - Includes org.jaxen.dom4j package
dev-java/jaxen:jdom - Includes org.jaxen.jdom package
dev-java/jaxen:xom - Includes org.jaxen.xom package
-dev-java/jfreesvg:debug - Enable debugging during compilation.
dev-java/jna:awt - Enables support for Java AWT
dev-java/jna:nio-buffers - Enables support for NIO buffers
dev-java/log4j:javamail - Build the SMTPAppender
@@ -1738,7 +1744,6 @@ dev-lang/gnat-gpl:go - Build the GCC Go language frontend.
dev-lang/gnat-gpl:graphite - Add support for the framework for loop optimizations based on a polyhedral intermediate representation
dev-lang/gnat-gpl:libssp - Build SSP support into a dedicated library rather than use the code in the C library (DO NOT ENABLE THIS IF YOU DON'T KNOW WHAT IT DOES)
dev-lang/gnat-gpl:lto - Build using Link Time Optimizations (LTO)
-dev-lang/gnat-gpl:mpx - Enable support for Intel Memory Protection Extensions (MPX)
dev-lang/gnat-gpl:nptl - Enable support for Native POSIX Threads Library, the new threading module (requires linux-2.6 or better usually)
dev-lang/gnat-gpl:objc - Build support for the Objective C code language
dev-lang/gnat-gpl:objc++ - Build support for the Objective C++ language
@@ -2235,7 +2240,6 @@ dev-libs/starpu:gcc-plugin - Enable GCC extension plugin (experimental)
dev-libs/starpu:opencl - Enable OpenCL support
dev-libs/starpu:spinlock-check - Enable spinlock check
dev-libs/starpu:valgrind - Enable dev-util/valgrind support
-dev-libs/stp:python - Enable building the Python interface
dev-libs/tinyxml:stl - Compile with TIXML_USE_STL support
dev-libs/tntnet:server - Enable tntnet server daemon
dev-libs/totem-pl-parser:archive - Enables ISO detection with app-arch/libarchive
@@ -2449,7 +2453,6 @@ dev-python/mpmath:matplotlib - Add support for dev-python/matplotlib
dev-python/msgpack:native-extensions - Compiles native "C" extensions (speedups, instead of using python fallback code).
dev-python/nbdime:webtools - Install web-based diff and merge tools.
dev-python/nltk-data:extra - Install the complete set of data files. Otherwise, only files required by tests are installed.
-dev-python/numexpr:mkl - Enable support for Intel Vector Math Library, part of sci-libs/mkl.
dev-python/pandas:full-support - Pull all packages to give pandas full support
dev-python/paramiko:server - Enable server feature
dev-python/pillow:imagequant - Build with Image Quantization Library support
@@ -3037,6 +3040,7 @@ games-emulation/dosbox-staging:fluidsynth - use media-sound/fluidsynth for MIDI
games-emulation/dosbox-staging:mt-32 - use media-libs/munt-mt32emu for MT-32 emulation
games-emulation/dosbox-staging:network - Enable networking features (modem, ipx)
games-emulation/dosbox-staging:opus - Support compressed audio tracks (.opus) used with CDROM images
+games-emulation/dosbox-staging:slirp - Enable Ethernet emulation using net-libs/libslirp
games-emulation/fceux:ffmpeg - Use media-video/ffmpeg for video recording
games-emulation/fceux:x265 - Use media-libs/x265 for video recording (HEVC)
games-emulation/generator:sdlaudio - Enable SDL Audio
@@ -3376,10 +3380,6 @@ gui-libs/wlroots:vulkan - Enable support for the vulkan backend renderer
gui-libs/wlroots:x11-backend - Enable support for handling input/output devices through x11-libs/libxcb
gui-libs/xdg-desktop-portal-wlr:elogind - Enable support for rootless session via elogind
gui-wm/hikari:X - Enable support for X11 applications (XWayland)
-gui-wm/hikari:gamma - add gamma control for redshift
-gui-wm/hikari:layershell - add support for wayland apps using layer shell
-gui-wm/hikari:screencopy - add support for screen grabbing
-gui-wm/hikari:virtual-io - enable virtual input/output support, needed for remote I/O in VNC
gui-wm/sway:X - Enable support for X11 applications (XWayland)
gui-wm/sway:swaybar - Install 'swaybar': sway's status bar component
gui-wm/sway:swaybg - Install 'swaybg': allows to set a desktop background image
@@ -3902,6 +3902,7 @@ media-gfx/apngasm:zopfli - Enable support for Zopfli compression
media-gfx/asymptote:boehm-gc - Enables using the Boehm-Demers-Weiser conservative garbage collector
media-gfx/asymptote:context - Enables support for ConTeXt format (dev-texlive/texlive-context)
media-gfx/asymptote:curl - Enables running remote programs via net-misc/curl
+media-gfx/asymptote:lsp - Enables Language Server Protocol
media-gfx/asymptote:offscreen - Enables off-screen rendering
media-gfx/asymptote:sigsegv - Enables using dev-libs/libsigsegv
media-gfx/blender:alembic - Add support for Alembic through media-gfx/alembic.
@@ -4099,6 +4100,8 @@ media-libs/cogl:kms - Enable KMS support.
media-libs/cogl:pango - Build cogl-pango library for x11-libs/pango integration
media-libs/coin:exceptions - Compile with C++ exceptions
media-libs/coin:qthelp - Build API documentation in QtHelp format
+media-libs/cubeb:rust - Use the newer rust-based audio backends if available
+media-libs/cubeb:sndio - Enable support for the media-sound/sndio backend
media-libs/dav1d:10bit - Add support for building 10-bit and 12-bit AV1.
media-libs/dav1d:8bit - Add support for decoding 8-bit AV1.
media-libs/dav1d:asm - Enable custom assembly for faster decoding.
@@ -4554,13 +4557,9 @@ media-sound/dir2ogg:mac - Add support for decoding Monkey's Audio files
media-sound/dir2ogg:wma - Add support for wma files through mplayer
media-sound/drumstick:fluidsynth - Enable support for media-sound/fluidsynth
media-sound/drumstick:network - Build Network RT backend
-media-sound/easyeffects:bs2b - Enable use of media-libs/libbs2b for the crossfeed FX
media-sound/easyeffects:calf - Enable use of media-plugins/calf for adding various FX
media-sound/easyeffects:doc - Install packages needed to display built-in user documentation
media-sound/easyeffects:mda-lv2 - Enable use of media-plugins/mda-lv2 for the loudness FX
-media-sound/easyeffects:rnnoise - Enable use of media-libs/rnnoise for the neural network-based noise-reduction FX
-media-sound/easyeffects:rubberband - Enable use of media-libs/rubberband for the pitch-shifting FX
-media-sound/easyeffects:webrtc - Enable use of media-plugins/gst-plugins-webrtc for various voice-enhancement FX
media-sound/easyeffects:zamaudio - Enable use of media-plugins/zam-plugins for the maximizer FX
media-sound/easytag:nautilus - Build gnome-base/nautilus extension
media-sound/ecasound:lv2 - Add support for Ladspa V2
@@ -6081,6 +6080,7 @@ net-libs/libwebsockets:smtp - Provide SMTP support
net-libs/libwebsockets:sqlite3 - Require SQLITE3 support
net-libs/loudmouth:asyncns - Use net-libs/libasyncns for asynchronous name resolution.
net-libs/loudmouth:openssl - Enable dev-libs/openssl support instead of gnutls (which is the default).
+net-libs/mbedtls:cmac - Enable block cipher-based message authentication code algorithm
net-libs/mbedtls:havege - Enable the HAVEGE random generator. Warning: the HAVEGE random generator is not suitable for virtualized environments
net-libs/mbedtls:programs - Build PolarSSL programs
net-libs/neon:libproxy - Add support for net-libs/libproxy
@@ -6855,11 +6855,6 @@ net-voip/yate:tdmcard - Enable TDMV API card driver
net-voip/yate:wanpipe - Enable Wanpipe support
net-voip/yate:wpcard - Enable Wanpipe card driver
net-voip/yate:zaptel - Enable Zaptel driver
-net-vpn/badvpn:client - Build the badvpn-client program, a daemon that runs on endpoints of the VPN.
-net-vpn/badvpn:ncd - Build NCD, a lightweight scripting language especially suited for network configurations.
-net-vpn/badvpn:server - Build the badvpn-server program, a central server that manages the VPN network.
-net-vpn/badvpn:tun2socks - Build tun2socks, a program which implements a TUN device that forwards TCP traffic through a SOCKS5 server.
-net-vpn/badvpn:udpgw - Build udpgw, a small daemon which allows tun2socks to forward UDP traffic.
net-vpn/i2p:nls - Adds Native Language Support using GNU gettext.
net-vpn/i2pd:i2p-hardening - Compile with hardening on vanilla compilers/linkers
net-vpn/libreswan:dnssec - Use DNSSEC resolver (requires net-dns/unbound)
@@ -7065,6 +7060,7 @@ sci-astronomy/stellarium:deep-sky - Install extra deep sky objects catalog (may
sci-astronomy/stellarium:media - Enable sound and video support
sci-astronomy/stellarium:stars - Install extra star catalogs
sci-astronomy/stellarium:telescope - Enable telescope control via sci-libs/indilib
+sci-astronomy/stellarium:webengine - Show online results about the selected star in an embedded window using dev-qt/qtwebengine
sci-astronomy/swarp:cfitsio - Link with sci-libs/cfitsio
sci-astronomy/wcslib:fits - Enable support for the FITS format through sci-libs/cfitsio
sci-astronomy/wcslib:pgplot - Builds PGBSOX routines, needs sci-libs/pgplot library
@@ -7286,6 +7282,7 @@ sci-libs/gmsh:metis - Enables metis support
sci-libs/gmsh:netgen - Enable 3D Frontal triangulation using netgen lib
sci-libs/gmsh:opencascade - Enable OpenCASCADE support
sci-libs/gmsh:petsc - Enable sci-mathematics/petsc support
+sci-libs/gmsh:shared - Install shared library and headers
sci-libs/gsl:cblas-external - Link gsl with external cblas provided by (virtual/cblas) instead of shipped internal version
sci-libs/gsl:deprecated - Enable deprecated functions
sci-libs/hdf5:hl - Enable high level API (https://support.hdfgroup.org/HDF5/doc/HL/index.html)
@@ -7524,6 +7521,8 @@ sci-mathematics/rstudio:server - Build and install the RStudio server
sci-mathematics/singular:julia - Enables interface for Singular to julia
sci-mathematics/singular:polymake - Enable the interface to TOPCOM
sci-mathematics/slepc:complex-scalars - Make scalars complex
+sci-mathematics/stp:cryptominisat - Enable sci-mathematics/cryptominisat support
+sci-mathematics/stp:python - Enable building the Python interface
sci-mathematics/unuran:prng - Use sci-mathematics/prng library
sci-mathematics/unuran:rngstreams - Use sci-mathematics/rngstreams library
sci-mathematics/vampire:z3 - Enable support for sci-mathematics/z3
@@ -7876,6 +7875,7 @@ sys-apps/systemd:importd - Enable import daemon
sys-apps/systemd:kmod - Enable kernel module loading via sys-apps/kmod
sys-apps/systemd:lz4 - Enable lz4 compression for the journal
sys-apps/systemd:nat - Enable support for network address translation in networkd
+sys-apps/systemd:openssl - Enable use of dev-libs/openssl
sys-apps/systemd:pkcs11 - Enable PKCS#11 support for cryptsetup and homed
sys-apps/systemd:pwquality - Enable password quality checking in homed
sys-apps/systemd:qrcode - Enable qrcode output support in journal
@@ -8393,7 +8393,6 @@ sys-libs/readline:utils - Install rlfe (ReadLine Front-End) helper tool -- a wra
sys-libs/talloc:compat - Enable extra compatibility stuff
sys-libs/timezone-data:leaps-timezone - Install the set of "right" timezones; these timezones include leap seconds when counting seconds since the epoch (while POSIX does not) as they are based on the TAI (International Atomic Time) clock
sys-libs/timezone-data:zic-slim - Default to 'slim' file format for /usr/share/zoneinfo. Otherwise 'fat' format is used. Not all programs can handle 'slim' format'.
-sys-libs/uclibc-ng:symlink-compat - Explicitly add sym links for libdl.so.0, libm.so.0, and friends for backward compatibility with sys-libs/uclibc-ng-1.0.17 and earlier
sys-libs/zlib:minizip - include the minizip library for quick and dirty zip extraction
sys-libs/zlib-ng:compat - Enable compatibility to sys-libs/zlib
sys-power/apcupsd:modbus - Enable MODBUS support over USB
@@ -8496,7 +8495,6 @@ virtual/rust:rustfmt - Install rustfmt, Rust code formatter
virtual/ssh:minimal - Prefer net-misc/dropbear over net-misc/openssh
virtual/wine:staging - Enable Wine-Staging's Patchset
www-apache/mod_backtrace:unwind - Use sys-libs/libunwind to provide better resolution of function names.
-www-apache/mod_extract_forwarded:mod-proxy - Enable support for Apache's internal proxy
www-apache/mod_musicindex:archive - Add archive support
www-apache/mod_musicindex:cache - Add File cache support
www-apache/mod_musicindex:mysql - Add MySQL cache support
@@ -8642,7 +8640,6 @@ www-client/w3m:lynxkeymap - If you prefer Lynx-like key binding
www-misc/litmus:libproxy - Support for automatic proxy configuratino management through net-libs/libproxy.
www-misc/litmus:libxml2 - Use dev-libs/libxml2 to parse XML
www-misc/litmus:pkcs11 - Support for PKCS #11 through PaKChoiS (dev-libs/pakchois).
-www-misc/xxv:themes - Enable more themes via x11-themes/xxv-skins
www-plugins/lightspark:ppapi - Install the PPAPI plugin (for Chromium)
www-plugins/lightspark:rtmp - Enable Real Time Messaging Protocol using librtmp
www-plugins/passff-host:chrome - Install plugin for chrome (which also includes opera)
@@ -8931,6 +8928,9 @@ x11-themes/arc-theme:pre-rendered - Avoid media-gfx/inkscape and media-gfx/optip
x11-themes/arc-theme:xfce - Install theme for xfce-base/xfwm4
x11-themes/comix-xcursors:lefthanded - Install lefthanded version of theme in addition to default one.
x11-themes/comix-xcursors:opaque - Install non-transparent version of theme in addition to default one.
+x11-themes/fluent-icon-theme:black - Install the black version of symbolic icons (for white color-scheme panels)
+x11-themes/fluent-icon-theme:hardlink - Hardlink duplicate icons to greatly reduce installation size
+x11-themes/fluent-icon-theme:round - Install the round version of symbolic icons
x11-themes/gentoo-artwork:grub - Install extra sys-boot/grub themes
x11-themes/gentoo-artwork:icons - Install icons
x11-themes/gentoo-artwork:lilo - Install extra sys-boot/lilo themes
@@ -8940,6 +8940,21 @@ x11-themes/gtk-engines-murrine:themes - Pull in themes via x11-themes/murrine-th
x11-themes/gtk-engines-nodoka:animation-rtl - Progressbar animation from right to left
x11-themes/kfaenza:additional - Install additional KFaenza icons. See third homepage for details
x11-themes/mate-themes-meta:gtk2-only - Allow dependency-resolution for a system without GTK+3
+x11-themes/tela-icon-theme:black - Install black folder version
+x11-themes/tela-icon-theme:blue - Install blue folder version
+x11-themes/tela-icon-theme:brown - Install bworn folder version
+x11-themes/tela-icon-theme:green - Install green folder version
+x11-themes/tela-icon-theme:grey - Install grey folder version
+x11-themes/tela-icon-theme:hardlink - Hardlink duplicate icons to greatly reduce installation size
+x11-themes/tela-icon-theme:kde - Install colorshceme version for KDE plasma (folder color follow the colorscheme)
+x11-themes/tela-icon-theme:manjaro - Install manjaro folder version
+x11-themes/tela-icon-theme:orange - Install orange folder version
+x11-themes/tela-icon-theme:pink - Install pink folder version
+x11-themes/tela-icon-theme:purple - Install purple folder version
+x11-themes/tela-icon-theme:red - Install red older version
+x11-themes/tela-icon-theme:standard - Install standard folder version
+x11-themes/tela-icon-theme:ubuntu - Install ubuntu folder version
+x11-themes/tela-icon-theme:yellow - Install yellow folder version
x11-themes/vertex-theme:cinnamon - Install theme for gnome-extra/cinnamon
x11-themes/vertex-theme:gnome-shell - Install theme for gnome-base/gnome-shell
x11-themes/vertex-theme:mate - Install Metacity theme for mate-base/mate