gentoo resync : 05.12.2021

4 files changed, 35 insertions, 12 deletions

diff --git a/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use
deleted file mode 100644
index 269791a40b12..000000000000
--- a/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 2019-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Brian Evans <grknight@gentoo.org> (2019-02-27)
-# Avoid conflict between kde-plasma/plasma-workspace[systemd] requiring sys-apps/dbus[user-session]
-# and net-wireless/bluez[systemd,-user-session] requiring sys-apps/dbus[-user-session].
-net-wireless/bluez user-session
-sys-apps/dbus user-session
diff --git a/profiles/default/linux/x86/17.0/musl/use.mask b/profiles/default/linux/x86/17.0/musl/use.mask
index a676f6deb519..fe008ec19efd 100644
--- a/profiles/default/linux/x86/17.0/musl/use.mask
+++ b/profiles/default/linux/x86/17.0/musl/use.mask
@@ -1,5 +1,2 @@
-# Copyright 1999-2020 Gentoo Authors.
+# Copyright 1999-2021 Gentoo Authors.
 # Distributed under the terms of the GNU General Public License, v2
-
-# ssp is broken on x86 musl: bug #706210
-ssp
diff --git a/profiles/default/linux/x86/17.0/uclibc/deprecated b/profiles/default/linux/x86/17.0/uclibc/deprecated
new file mode 100644
index 000000000000..a03e880d5f33
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/uclibc/deprecated
@@ -0,0 +1,17 @@
+
+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/deprecated b/profiles/default/linux/x86/17.0/uclibc/hardened/deprecated
new file mode 100644
index 000000000000..a03e880d5f33
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/uclibc/hardened/deprecated
@@ -0,0 +1,17 @@
+
+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