Signed-off-by: Matt Turner <matts...@gentoo.org>
---
.../linux/amd64/17.0/desktop/plasma/systemd/package.use | 7 -------
.../linux/amd64/17.1/desktop/plasma/systemd/package.use | 7 -------
.../linux/arm/17.0/desktop/plasma/systemd/package.use | 7 -------
.../linux/arm64/17.0/desktop/plasma/systemd/package.use | 7 -------
.../linux/x86/17.0/desktop/plasma/systemd/package.use | 7 -------
profiles/targets/systemd/make.defaults | 4 ++--
6 files changed, 2 insertions(+), 37 deletions(-)
delete mode 100644
profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use
delete mode 100644
profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use
delete mode 100644
profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use
delete mode 100644
profiles/default/linux/arm64/17.0/desktop/plasma/systemd/package.use
delete mode 100644
profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use
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
deleted file mode 100644
index bdf6c817864..00000000000
--- a/profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2019-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Brian Evans <grkni...@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
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
deleted file mode 100644
index bdf6c817864..00000000000
--- a/profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2019-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Brian Evans <grkni...@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
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
deleted file mode 100644
index bdf6c817864..00000000000
--- a/profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2019-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Brian Evans <grkni...@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
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
deleted file mode 100644
index bdf6c817864..00000000000
--- a/profiles/default/linux/arm64/17.0/desktop/plasma/systemd/package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2019-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Brian Evans <grkni...@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
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 bdf6c817864..00000000000
--- a/profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 2019-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Brian Evans <grkni...@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
diff --git a/profiles/targets/systemd/make.defaults
b/profiles/targets/systemd/make.defaults
index 8bc064858b2..7b7f59898a3 100644
--- a/profiles/targets/systemd/make.defaults
+++ b/profiles/targets/systemd/make.defaults
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-USE="systemd udev"
+USE="systemd udev user-session"
BOOTSTRAP_USE="${BOOTSTRAP_USE} systemd udev"
--
2.24.1
