gentoo resync : 16.09.2021

32 files changed, 57 insertions, 8 deletions

diff --git a/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use b/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use
index bdf6c817864d..269791a40b12 100644
--- a/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use
+++ b/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use
@@ -5,3 +5,4 @@
 # 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/amd64/17.1/desktop/plasma/systemd/package.use b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use
index bdf6c817864d..269791a40b12 100644
--- a/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use
+++ b/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use
@@ -5,3 +5,4 @@
 # 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/arm/17.0/desktop/plasma/systemd/package.use b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use
index bdf6c817864d..269791a40b12 100644
--- a/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use
+++ b/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use
@@ -5,3 +5,4 @@
 # 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/arm64/17.0/desktop/plasma/systemd/package.use b/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/package.use
index bdf6c817864d..269791a40b12 100644
--- a/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/package.use
+++ b/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/package.use
@@ -5,3 +5,4 @@
 # 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/riscv/20.0/rv64gc/lp64/desktop/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/parent
new file mode 100644
index 000000000000..d5a56a13f692
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..288aeccdce82
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/parent
new file mode 100644
index 000000000000..fae96e8d36b2
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/parent
new file mode 100644
index 000000000000..0317df26cc9b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/package.use b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/package.use
new file mode 100644
index 000000000000..269791a40b12
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/package.use
@@ -0,0 +1,8 @@
+# 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/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/parent
new file mode 100644
index 000000000000..5d9d87f6d91e
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/parent
new file mode 100644
index 000000000000..f7739b405877
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/parent
new file mode 100644
index 000000000000..d5a56a13f692
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/gnome
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/parent
new file mode 100644
index 000000000000..288aeccdce82
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/gnome/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/desktop/gnome/systemd
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/parent
new file mode 100644
index 000000000000..fae96e8d36b2
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../targets/desktop
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/parent
new file mode 100644
index 000000000000..0317df26cc9b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/desktop/plasma
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/package.use b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/package.use
new file mode 100644
index 000000000000..269791a40b12
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/package.use
@@ -0,0 +1,8 @@
+# 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/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/parent
new file mode 100644
index 000000000000..5d9d87f6d91e
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../../targets/systemd
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/eapi b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/parent b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/parent
new file mode 100644
index 000000000000..f7739b405877
--- /dev/null
+++ b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../../targets/systemd
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
index bdf6c817864d..269791a40b12 100644
--- a/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use
+++ b/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use
@@ -5,3 +5,4 @@
 # 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/package.mask b/profiles/default/linux/x86/17.0/musl/package.mask
index 48c3e6db7a7e..ea771f7580c3 100644
--- a/profiles/default/linux/x86/17.0/musl/package.mask
+++ b/profiles/default/linux/x86/17.0/musl/package.mask
@@ -1,10 +1,2 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License, v2
-
-# Sam James <sam@gentoo.org> (2021-07-06)
-# Forces -fstack-protector, masking for now to allow stage3s to be built.
-# Masking this forces sys-apps/opentmpfiles to provide virtual/tmpfiles.
-# bug #800893
-# Temporarily unmask opentmpfiles here to get working stages.
-sys-apps/systemd-tmpfiles
--sys-apps/opentmpfiles