gentoo resync : 04.01.2022

92 files changed, 8 insertions, 808 deletions

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/