[gentoo-commits] repo/gentoo:master commit in: profiles/prefix/windows/winnt/, profiles/desc/, profiles/base/, ...

[David Seifert]

commit:     f097dc38fb4229a34dc2a36b156dbaa697148fc5
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  2 10:01:45 2022 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan  2 10:01:45 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f097dc38

profiles: remove uclibc

Closes: https://bugs.gentoo.org/820905
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 profiles/base/make.defaults                        |  2 +-
 profiles/base/use.mask                             |  2 -
 .../default/linux/amd64/17.0/uclibc/deprecated     | 17 ------
 profiles/default/linux/amd64/17.0/uclibc/eapi      |  1 -
 .../linux/amd64/17.0/uclibc/hardened/deprecated    | 17 ------
 .../default/linux/amd64/17.0/uclibc/hardened/eapi  |  1 -
 .../linux/amd64/17.0/uclibc/hardened/parent        |  2 -
 .../default/linux/amd64/17.0/uclibc/make.defaults  | 10 ----
 profiles/default/linux/amd64/17.0/uclibc/parent    |  3 -
 .../linux/arm/17.0/uclibc/armv6j/deprecated        | 17 ------
 profiles/default/linux/arm/17.0/uclibc/armv6j/eapi |  1 -
 .../arm/17.0/uclibc/armv6j/hardened/deprecated     | 17 ------
 .../linux/arm/17.0/uclibc/armv6j/hardened/eapi     |  1 -
 .../linux/arm/17.0/uclibc/armv6j/hardened/parent   |  2 -
 .../linux/arm/17.0/uclibc/armv6j/make.defaults     | 10 ----
 .../default/linux/arm/17.0/uclibc/armv6j/parent    |  1 -
 .../linux/arm/17.0/uclibc/armv7a/deprecated        | 17 ------
 profiles/default/linux/arm/17.0/uclibc/armv7a/eapi |  1 -
 .../arm/17.0/uclibc/armv7a/hardened/deprecated     | 17 ------
 .../linux/arm/17.0/uclibc/armv7a/hardened/eapi     |  1 -
 .../linux/arm/17.0/uclibc/armv7a/hardened/parent   |  2 -
 .../linux/arm/17.0/uclibc/armv7a/make.defaults     | 10 ----
 .../default/linux/arm/17.0/uclibc/armv7a/parent    |  1 -
 profiles/default/linux/arm/17.0/uclibc/deprecated  | 17 ------
 profiles/default/linux/arm/17.0/uclibc/eapi        |  1 -
 profiles/default/linux/arm/17.0/uclibc/parent      |  3 -
 profiles/default/linux/musl/package.mask           |  5 +-
 profiles/default/linux/musl/use.mask               |  3 +-
 .../linux/powerpc/ppc32/17.0/uclibc/deprecated     | 17 ------
 .../default/linux/powerpc/ppc32/17.0/uclibc/eapi   |  1 -
 .../powerpc/ppc32/17.0/uclibc/hardened/deprecated  | 17 ------
 .../linux/powerpc/ppc32/17.0/uclibc/hardened/eapi  |  1 -
 .../powerpc/ppc32/17.0/uclibc/hardened/parent      |  2 -
 .../linux/powerpc/ppc32/17.0/uclibc/make.defaults  | 10 ----
 .../linux/powerpc/ppc32/17.0/uclibc/package.use    |  3 -
 .../powerpc/ppc32/17.0/uclibc/package.use.mask     |  7 ---
 .../default/linux/powerpc/ppc32/17.0/uclibc/parent |  3 -
 profiles/default/linux/uclibc/deprecated           | 17 ------
 profiles/default/linux/uclibc/eapi                 |  1 -
 profiles/default/linux/uclibc/make.defaults        | 12 ----
 profiles/default/linux/uclibc/mips/deprecated      | 17 ------
 profiles/default/linux/uclibc/mips/eapi            |  1 -
 profiles/default/linux/uclibc/mips/make.defaults   | 20 -------
 .../default/linux/uclibc/mips/mipsel/deprecated    | 17 ------
 profiles/default/linux/uclibc/mips/mipsel/eapi     |  1 -
 .../default/linux/uclibc/mips/mipsel/make.defaults |  5 --
 profiles/default/linux/uclibc/mips/mipsel/parent   |  1 -
 profiles/default/linux/uclibc/mips/package.mask    | 10 ----
 .../default/linux/uclibc/mips/package.use.force    |  8 ---
 .../default/linux/uclibc/mips/package.use.mask     | 14 -----
 profiles/default/linux/uclibc/mips/parent          |  1 -
 profiles/default/linux/uclibc/mips/use.force       |  6 --
 profiles/default/linux/uclibc/mips/use.mask        |  6 --
 profiles/default/linux/uclibc/package.mask         | 68 ----------------------
 profiles/default/linux/uclibc/package.use.mask     | 20 -------
 profiles/default/linux/uclibc/packages             |  7 ---
 profiles/default/linux/uclibc/packages.build       |  8 ---
 profiles/default/linux/uclibc/parent               |  3 -
 profiles/default/linux/uclibc/use.force            |  5 --
 profiles/default/linux/uclibc/use.mask             | 15 -----
 profiles/default/linux/x86/17.0/uclibc/deprecated  | 17 ------
 profiles/default/linux/x86/17.0/uclibc/eapi        |  1 -
 .../linux/x86/17.0/uclibc/hardened/deprecated      | 17 ------
 .../default/linux/x86/17.0/uclibc/hardened/eapi    |  1 -
 .../default/linux/x86/17.0/uclibc/hardened/parent  |  2 -
 .../default/linux/x86/17.0/uclibc/make.defaults    | 10 ----
 profiles/default/linux/x86/17.0/uclibc/parent      |  3 -
 profiles/desc/elibc.desc                           |  1 -
 profiles/embedded/make.defaults                    |  2 +-
 profiles/features/musl/package.mask                |  3 -
 profiles/features/musl/use.mask                    |  3 +-
 profiles/features/uclibc/deprecated                | 17 ------
 profiles/features/uclibc/eapi                      |  1 -
 profiles/features/uclibc/make.defaults             | 13 -----
 profiles/features/uclibc/package.mask              | 27 ---------
 profiles/features/uclibc/package.unmask            |  7 ---
 profiles/features/uclibc/package.use               |  7 ---
 profiles/features/uclibc/package.use.force         |  6 --
 profiles/features/uclibc/package.use.mask          | 31 ----------
 profiles/features/uclibc/packages                  |  7 ---
 profiles/features/uclibc/packages.build            |  8 ---
 profiles/features/uclibc/use.force                 |  6 --
 profiles/features/uclibc/use.mask                  | 17 ------
 profiles/hardened/linux/musl/use.mask              |  3 +-
 profiles/hardened/linux/uclibc/deprecated          | 17 ------
 profiles/hardened/linux/uclibc/eapi                |  1 -
 profiles/hardened/linux/uclibc/make.defaults       |  5 --
 profiles/hardened/linux/uclibc/mips/eapi           |  1 -
 profiles/hardened/linux/uclibc/mips/mipsel/eapi    |  1 -
 profiles/hardened/linux/uclibc/mips/mipsel/parent  |  2 -
 profiles/hardened/linux/uclibc/mips/parent         |  2 -
 profiles/hardened/linux/uclibc/package.use.mask    |  6 --
 profiles/hardened/linux/uclibc/use.force           |  8 ---
 profiles/hardened/linux/uclibc/use.mask            | 17 ------
 profiles/info_pkgs                                 |  3 +-
 profiles/prefix/sunos/use.mask                     |  3 +-
 profiles/prefix/windows/winnt/use.mask             |  5 +-
 profiles/profiles.desc                             | 19 +-----
 profiles/use.desc                                  |  3 +-
 99 files changed, 12 insertions(+), 797 deletions(-)

diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index ffef3a74bf0f..7ef343584cf4 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -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 musl NetBSD OpenBSD SunOS uclibc Winnt"
+USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD 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/use.mask b/profiles/base/use.mask
index ddbe686ea336..85ccff7cc3ab 100644
--- a/profiles/base/use.mask
+++ b/profiles/base/use.mask
@@ -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.
@@ -83,7 +82,6 @@ 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@g.o> (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/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@g.o> (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@g.o> (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@g.o> (2019-06-12)
-# Unfortunately pie has broken on ppc uclibc for years
-sys-devel/gcc pie
-
-# Anthony G. Basile <blueness@g.o> (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/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@g.o> (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@g.o> (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@××××××.de> (2016-09-24)
-# net-libs/libnetfilter_conntrack is not keyworded on mips
-net-dns/dnsmasq conntrack
-
-# Davide Pesavento <pesa@g.o> (2015-10-26)
-# Tests require non-keyworded qt5
-dev-qt/qtchooser test
-
-# Matthias Maier <tamiko@g.o> (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@g.o> (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@g.o> (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@g.o> (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@g.o> (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@g.o> (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 7edf823ddcd7..a853e59bf9c9 100644
--- a/profiles/desc/elibc.desc
+++ b/profiles/desc/elibc.desc
@@ -19,5 +19,4 @@ 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 a14a73f66064..990981afcdb9 100644
--- a/profiles/embedded/make.defaults
+++ b/profiles/embedded/make.defaults
@@ -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 musl NetBSD OpenBSD SunOS uclibc Winnt"
+USE_EXPAND_VALUES_ELIBC="AIX bionic Cygwin Darwin DragonFly FreeBSD 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/musl/package.mask b/profiles/features/musl/package.mask
index 44a252dec06e..66e8061eae59 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -59,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/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@g.o> (2021-07-14)
-# Mask the libxcrypt-based virtual
-~virtual/libcrypt-2
--virtual/libcrypt:0/1
-
-# Ionen Wolkens <ionen@g.o> (2021-07-09)
-# Mask in favor of opentmpfiles until usable with uclibc-ng (bug #801106)
-sys-apps/systemd-tmpfiles
-
-# David Seifert <soap@g.o> (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@g.o> (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@g.o> (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@g.o> (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@g.o>
-# Restore mask here that is gone elsewhere
-sys-libs/libxcrypt split-usr system
-
-# Anthony G. Basile <blueness@g.o>
-# sanitize is broken on at least all hardened uclibc
-sys-devel/gcc sanitize
-
-# Michał Górny <mgorny@g.o> (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@g.o> (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@g.o> (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@g.o> (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@g.o> (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/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 bed4491af569..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
 
 #############################################
@@ -280,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@g.o
-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@g.o
 

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