summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRepository mirror & CI <repomirrorci@gentoo.org>2021-09-14 17:36:16 +0000
committerRepository mirror & CI <repomirrorci@gentoo.org>2021-09-14 17:36:16 +0000
commit3b1aef1eebee09f1b1beb0044792c4d87a086587 (patch)
tree3ad0268b584a9d0e7897531a30934fbb4e591aa2 /profiles
parent2021-09-14 17:21:28 UTC (diff)
parentprofiles: default-enable sys-apps/dbus[user-session] in plasma/systemd profiles (diff)
downloadgentoo-3b1aef1eebee09f1b1beb0044792c4d87a086587.tar.gz
gentoo-3b1aef1eebee09f1b1beb0044792c4d87a086587.tar.bz2
gentoo-3b1aef1eebee09f1b1beb0044792c4d87a086587.zip
Merge updates from master
Diffstat (limited to 'profiles')
-rw-r--r--profiles/default/linux/amd64/17.0/desktop/plasma/systemd/package.use1
-rw-r--r--profiles/default/linux/amd64/17.1/desktop/plasma/systemd/package.use1
-rw-r--r--profiles/default/linux/arm/17.0/desktop/plasma/systemd/package.use1
-rw-r--r--profiles/default/linux/arm64/17.0/desktop/plasma/systemd/package.use1
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/package.use1
-rw-r--r--profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/package.use1
-rw-r--r--profiles/default/linux/x86/17.0/desktop/plasma/systemd/package.use1
7 files changed, 7 insertions, 0 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/plasma/systemd/package.use b/profiles/default/linux/riscv/20.0/rv64gc/lp64/desktop/plasma/systemd/package.use
index bdf6c817864d..269791a40b12 100644
--- 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
@@ -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/lp64d/desktop/plasma/systemd/package.use b/profiles/default/linux/riscv/20.0/rv64gc/lp64d/desktop/plasma/systemd/package.use
index bdf6c817864d..269791a40b12 100644
--- 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
@@ -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/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