commit: fe4dcd95624dba81e3428a2934a25c234a928ad4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 17 10:28:05 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 17 21:01:02 2025 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=fe4dcd95
kde-plasma/plasma-meta: Allow kde-plasma/drkonqi:6 non-systemd version
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
kde-plasma/plasma-meta/plasma-meta-6.3.90.ebuild | 11 +++++------
kde-plasma/plasma-meta/plasma-meta-6.4.49.9999.ebuild | 11 +++++------
kde-plasma/plasma-meta/plasma-meta-9999.ebuild | 11 +++++------
3 files changed, 15 insertions(+), 18 deletions(-)
diff --git a/kde-plasma/plasma-meta/plasma-meta-6.3.90.ebuild
b/kde-plasma/plasma-meta/plasma-meta-6.3.90.ebuild
index 42be2d6bcb..bac49a236c 100644
--- a/kde-plasma/plasma-meta/plasma-meta-6.3.90.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-6.3.90.ebuild
@@ -16,11 +16,7 @@ cups discover +display-manager +elogind +firewall flatpak
grub gtk +kwallet
+networkmanager oxygen-theme plymouth pulseaudio qt5 rdp +sddm sdk +smart
systemd
thunderbolt unsupported wacom +wallpapers webengine X"
-REQUIRED_USE="
- ^^ ( elogind systemd )
- crash-handler? ( systemd )
- firewall? ( systemd )
-"
+REQUIRED_USE="^^ ( elogind systemd ) firewall? ( systemd )"
# The =kde-apps/spectacle-6.3* pin is needed because Spectacle moved from
# KDE Gear => KDE Plasma, but KDE Gear's version scheme is higher than
@@ -82,6 +78,10 @@ RDEPEND="
bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
browser-integration? (
>=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
colord? ( x11-misc/colord )
+ crash-handler? (
+ !systemd? ( >=kde-plasma/drkonqi-6.3.80:${SLOT} )
+ systemd? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
+ )
crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
cups? (
>=kde-plasma/print-manager-${PV}:${SLOT}
@@ -125,7 +125,6 @@ RDEPEND="
smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
systemd? (
sys-apps/systemd[pam]
- crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
)
thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
diff --git a/kde-plasma/plasma-meta/plasma-meta-6.4.49.9999.ebuild
b/kde-plasma/plasma-meta/plasma-meta-6.4.49.9999.ebuild
index 74d3276b7e..c7bd001aca 100644
--- a/kde-plasma/plasma-meta/plasma-meta-6.4.49.9999.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-6.4.49.9999.ebuild
@@ -16,11 +16,7 @@ cups discover +display-manager +elogind +firewall flatpak
grub gtk +kwallet
+networkmanager oxygen-theme plymouth pulseaudio qt5 rdp +sddm sdk +smart
systemd
thunderbolt unsupported wacom +wallpapers webengine X"
-REQUIRED_USE="
- ^^ ( elogind systemd )
- crash-handler? ( systemd )
- firewall? ( systemd )
-"
+REQUIRED_USE="^^ ( elogind systemd ) firewall? ( systemd )"
# The =kde-apps/spectacle-6.3* pin is needed because Spectacle moved from
# KDE Gear => KDE Plasma, but KDE Gear's version scheme is higher than
@@ -82,6 +78,10 @@ RDEPEND="
bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
browser-integration? (
>=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
colord? ( x11-misc/colord )
+ crash-handler? (
+ !systemd? ( >=kde-plasma/drkonqi-6.3.80:${SLOT} )
+ systemd? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
+ )
crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
cups? (
>=kde-plasma/print-manager-${PV}:${SLOT}
@@ -125,7 +125,6 @@ RDEPEND="
smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
systemd? (
sys-apps/systemd[pam]
- crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
)
thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
diff --git a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
index 74d3276b7e..c7bd001aca 100644
--- a/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
+++ b/kde-plasma/plasma-meta/plasma-meta-9999.ebuild
@@ -16,11 +16,7 @@ cups discover +display-manager +elogind +firewall flatpak
grub gtk +kwallet
+networkmanager oxygen-theme plymouth pulseaudio qt5 rdp +sddm sdk +smart
systemd
thunderbolt unsupported wacom +wallpapers webengine X"
-REQUIRED_USE="
- ^^ ( elogind systemd )
- crash-handler? ( systemd )
- firewall? ( systemd )
-"
+REQUIRED_USE="^^ ( elogind systemd ) firewall? ( systemd )"
# The =kde-apps/spectacle-6.3* pin is needed because Spectacle moved from
# KDE Gear => KDE Plasma, but KDE Gear's version scheme is higher than
@@ -82,6 +78,10 @@ RDEPEND="
bluetooth? ( >=kde-plasma/bluedevil-${PV}:${SLOT} )
browser-integration? (
>=kde-plasma/plasma-browser-integration-${PV}:${SLOT} )
colord? ( x11-misc/colord )
+ crash-handler? (
+ !systemd? ( >=kde-plasma/drkonqi-6.3.80:${SLOT} )
+ systemd? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
+ )
crypt? ( >=kde-plasma/plasma-vault-${PV}:${SLOT} )
cups? (
>=kde-plasma/print-manager-${PV}:${SLOT}
@@ -125,7 +125,6 @@ RDEPEND="
smart? ( >=kde-plasma/plasma-disks-${PV}:${SLOT} )
systemd? (
sys-apps/systemd[pam]
- crash-handler? ( >=kde-plasma/drkonqi-${PV}:${SLOT} )
firewall? ( >=kde-plasma/plasma-firewall-${PV}:${SLOT} )
)
thunderbolt? ( >=kde-plasma/plasma-thunderbolt-${PV}:${SLOT} )
