gentoo resync : 04.01.2022

16 files changed, 10 insertions, 160 deletions

diff --git a/profiles/features/hardened/package.use.mask b/profiles/features/hardened/package.use.mask
index 484dafd701c0..fd48a16c7817 100644
--- a/profiles/features/hardened/package.use.mask
+++ b/profiles/features/hardened/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 sys-apps/hwloc gl
@@ -12,6 +12,3 @@ www-client/firefox gmp-autoupdate
 # net-fs/openafs-kernel module can't be used on hardened,
 # see bug 540196.
 net-fs/openafs modules
-
-# jit don't work on hardened.
-dev-vcs/git pcre-jit
diff --git a/profiles/features/musl/package.mask b/profiles/features/musl/package.mask
index 95cd5b8d1c49..66e8061eae59 100644
--- a/profiles/features/musl/package.mask
+++ b/profiles/features/musl/package.mask
@@ -1,6 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Marek Szuba <marecki@gentoo.org> (2022-01-01)
+# Binary-only package linked against glibc.
+app-crypt/rainbowcrack
+
 # Conrad Kostecki <conikost@gentoo.org> (2021-12-15)
 # Level Zero needs RTLD_DEEPBIND, which does not exist on musl.
 dev-libs/level-zero
@@ -55,11 +59,8 @@ app-emulation/dosemu
 
 # Old undated blocks of masks
 #
-
-sys-libs/uclibc-ng
 sys-libs/glibc
 
-# We use eudev which is tested on both uclibc and musl
 # As of 2021-08-08, >=sys-fs/udev-249-r2 is patched in Gentoo
 # to work on musl.
 sys-apps/systemd
diff --git a/profiles/features/musl/use.mask b/profiles/features/musl/use.mask
index 3029d07118b7..394d12cd2af2 100644
--- a/profiles/features/musl/use.mask
+++ b/profiles/features/musl/use.mask
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors.
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Select the correct ELIBC
 -elibc_musl
-elibc_uclibc
 elibc_glibc
 
 # Musl doesn't have support for utmp/wtmp by design
diff --git a/profiles/features/prefix/package.use.mask b/profiles/features/prefix/package.use.mask
index e31604ff8285..a90a7c2a9588 100644
--- a/profiles/features/prefix/package.use.mask
+++ b/profiles/features/prefix/package.use.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Sam James <sam@gentoo.org> (2021-01-27)
@@ -25,8 +25,8 @@ sys-apps/dbus-broker launcher
 www-servers/uwsgi uwsgi_plugins_systemd_logger
 
 # Benda Xu <heroxbd@gentoo.org> (2016-07-28)
-# Needs root privilege.
-sys-fs/eudev hwdb kmod
+# Needs root privileges.
+sys-fs/eudev kmod
 
 # Fabian Groffen <grobian@gentoo.org> (2011-12-08)
 # USE=vanilla produces a broken compiler for Prefix.  Only use this flag
diff --git a/profiles/features/uclibc/deprecated b/profiles/features/uclibc/deprecated
deleted file mode 100644
index a03e880d5f33..000000000000
--- a/profiles/features/uclibc/deprecated
+++ /dev/null
@@ -1,17 +0,0 @@
-
-uClibc-ng is mostly abandoned upstream, and since an RFC by its maintainer in Gentoo
-in Jan 2021, no one has volunteered to step up maintenance or expressed interest in
-the uClibc-ng profiles. With this announcement we last-rite the "uclibc"
-profiles, which will be removed on 2022-01-01. For parties interested in
-an alternative libc, consider moving to musl, which is supported.
-
-Gentoo continues to wholeheartedly support musl and is focusing its
-efforts in that area.
-
-Resources:
-- https://wiki.gentoo.org/wiki/Project:Hardened_musl
-- https://gitweb.gentoo.org/proj/musl.git/ (overlay for patches)
-- #gentoo-hardened (IRC channel on irc.libera.chat) for support and discussion
-
-Please see the news item for more information:
-https://www.gentoo.org/support/news-items/2021-08-18-uclibc-ng-retirement.html
diff --git a/profiles/features/uclibc/eapi b/profiles/features/uclibc/eapi
deleted file mode 100644
index 7ed6ff82de6b..000000000000
--- a/profiles/features/uclibc/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/profiles/features/uclibc/make.defaults b/profiles/features/uclibc/make.defaults
deleted file mode 100644
index 3a1b040cc7cb..000000000000
--- a/profiles/features/uclibc/make.defaults
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-PORTAGE_LIBC="uClibc"
-ELIBC=uclibc
-
-FEATURES="sandbox sfperms strict"
-
-USE="nptl unicode -berkdb"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} nptl -berkdb"
-
-SYMLINK_LIB="no"
-FEATURES="-multilib-strict"
diff --git a/profiles/features/uclibc/package.mask b/profiles/features/uclibc/package.mask
deleted file mode 100644
index 39a81a82d33a..000000000000
--- a/profiles/features/uclibc/package.mask
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-sys-libs/musl
-sys-libs/glibc
-sys-libs/pam
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
-# Mask the libxcrypt-based virtual
-~virtual/libcrypt-2
--virtual/libcrypt:0/1
-
-# Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
-# Mask in favor of opentmpfiles until usable with uclibc-ng (bug #801106)
-sys-apps/systemd-tmpfiles
-
-# David Seifert <soap@gentoo.org> (2021-02-08)
-# nvidia-drivers only works against glibc.
-x11-drivers/nvidia-drivers
-
-# We use eudev which is tested on both uclibc and musl
-sys-apps/systemd
-sys-fs/udev
-
-# Working on it, bug #470884
-dev-libs/elfutils
->virtual/libelf-2
diff --git a/profiles/features/uclibc/package.unmask b/profiles/features/uclibc/package.unmask
deleted file mode 100644
index 73afa680a140..000000000000
--- a/profiles/features/uclibc/package.unmask
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Ionen Wolkens <ionen@gentoo.org> (2021-07-09)
-# Unmask opentmpfiles on uclibc profiles until systemd-tmpfiles is
-# usable (bug #801106).
-sys-apps/opentmpfiles
diff --git a/profiles/features/uclibc/package.use b/profiles/features/uclibc/package.use
deleted file mode 100644
index c5742cb3c80e..000000000000
--- a/profiles/features/uclibc/package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2021 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Anthony G. Basile <blueness@gentoo.org> (2018-07-14)
-# We need this to break a circular dependency with
-# 'sys-libs/libcap pam' in stage3 catalyst builds
-sys-libs/pam -filecaps
diff --git a/profiles/features/uclibc/package.use.force b/profiles/features/uclibc/package.use.force
deleted file mode 100644
index 82ca48bfea6c..000000000000
--- a/profiles/features/uclibc/package.use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 2021 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org> (2021-07-14)
-# Do not force system install for libxcrypt here
->=sys-libs/libxcrypt-4.4.23-r1 -system -compat
diff --git a/profiles/features/uclibc/package.use.mask b/profiles/features/uclibc/package.use.mask
deleted file mode 100644
index b3f8a9ebe24a..000000000000
--- a/profiles/features/uclibc/package.use.mask
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Andreas K. Hüttel <dilfridge@gentoo.org>
-# Restore mask here that is gone elsewhere
-sys-libs/libxcrypt split-usr system
-
-# Anthony G. Basile <blueness@gentoo.org>
-# sanitize is broken on at least all hardened uclibc
-sys-devel/gcc sanitize
-
-# Michał Górny <mgorny@gentoo.org> (2018-01-12)
-# Those require USE=java that is masked in this profile.
-app-emulation/virtualbox vboxwebsrv
-app-office/libreoffice libreoffice_extensions_wiki-publisher
-
-# Thomas Deutschmann <whissi@gentoo.org> (2017-01-21)
-# Mask due Gnome3 not going to be stabilized on this arch
-# due to uclibc
-dev-util/geany-plugins gtkspell
-
-# Joshua Kinard <kumba@gentoo.org> (2016-01-18)
-# Fails linking to gettext/libintl for symbol 'libintl_gettext'.
-# Is fixable by using 'append-ldflags' from flag-o-matic to force
-# -lintl, but that's a QA violation.  Real solution is to use
-# 'append-libs', but xfsdump's build system doesn't honor $LIBS.
-# So this is the best way for now.  See 570548.
-sys-fs/xfsdump nls
-
-# static linking works with uClibc
-app-shells/mksh -static
diff --git a/profiles/features/uclibc/packages b/profiles/features/uclibc/packages
deleted file mode 100644
index 0ff81f33bfb2..000000000000
--- a/profiles/features/uclibc/packages
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-*app-misc/pax-utils
-*dev-libs/libiconv
-*dev-libs/libintl
--*sys-apps/man-pages
diff --git a/profiles/features/uclibc/packages.build b/profiles/features/uclibc/packages.build
deleted file mode 100644
index eb8df49779a5..000000000000
--- a/profiles/features/uclibc/packages.build
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file lists extra packages needed to build for
-# a stage 1 based on this profile.
-
-dev-libs/libiconv
-dev-libs/libintl
diff --git a/profiles/features/uclibc/use.force b/profiles/features/uclibc/use.force
deleted file mode 100644
index 6225883ae668..000000000000
--- a/profiles/features/uclibc/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Select the correct ELIBC
-elibc_uclibc
-uclibc
diff --git a/profiles/features/uclibc/use.mask b/profiles/features/uclibc/use.mask
deleted file mode 100644
index 94bf5b5ae184..000000000000
--- a/profiles/features/uclibc/use.mask
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors.
-# Distributed under the terms of the GNU General Public License v2
-
-# Thomas Deutschmann <whissi@gentoo.org> (2017-01-28)
-# No JAVA in uclibc
-java
-
-nls
-pam
-
--uclibc
-
--elibc_uclibc
-elibc_glibc
-elibc_musl
-
-systemd