summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfred Wingate <parona@protonmail.com>2024-07-24 21:46:41 +0300
committerSam James <sam@gentoo.org>2024-07-24 19:49:11 +0100
commit9c527f4ddc516b883f93801fe176eccc524555ce (patch)
tree193e6237d533267765967d6d98e89e06b5819500 /x11-misc/xdg-utils
parentnet-mail/gnubiff: drop 2.2.17-r2 (diff)
downloadgentoo-9c527f4ddc516b883f93801fe176eccc524555ce.tar.gz
gentoo-9c527f4ddc516b883f93801fe176eccc524555ce.tar.bz2
gentoo-9c527f4ddc516b883f93801fe176eccc524555ce.zip
x11-misc/xdg-utils: avoid circular dependency with kservice
* Error: circular dependencies: (x11-misc/xdg-utils-1.2.1-r3:0/0::gentoo, ebuild scheduled for merge) depends on (kde-frameworks/kservice-5.116.0:5/5.116::gentoo, ebuild scheduled for merge) (runtime) (kde-frameworks/kf-env-5:5/5::gentoo, ebuild scheduled for merge) (runtime) (x11-misc/xdg-utils-1.2.1-r3:0/0::gentoo, ebuild scheduled for merge) (runtime) It might be possible to break this cycle by applying the following change: - x11-misc/xdg-utils-1.2.1-r3 (Change USE: -plasma) Signed-off-by: Alfred Wingate <parona@protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/37709 Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'x11-misc/xdg-utils')
-rw-r--r--x11-misc/xdg-utils/xdg-utils-1.2.1-r4.ebuild (renamed from x11-misc/xdg-utils/xdg-utils-1.2.1-r3.ebuild)12
1 files changed, 8 insertions, 4 deletions
diff --git a/x11-misc/xdg-utils/xdg-utils-1.2.1-r3.ebuild b/x11-misc/xdg-utils/xdg-utils-1.2.1-r4.ebuild
index a7b80d3a2808..cda3c70809fd 100644
--- a/x11-misc/xdg-utils/xdg-utils-1.2.1-r3.ebuild
+++ b/x11-misc/xdg-utils/xdg-utils-1.2.1-r4.ebuild
@@ -35,6 +35,14 @@ RDEPEND="
)
plasma? (
virtual/pkgconfig
+ )
+ X? (
+ x11-apps/xprop
+ x11-apps/xset
+ )
+"
+PDEPEND="
+ plasma? (
|| (
(
kde-frameworks/kservice:6
@@ -46,10 +54,6 @@ RDEPEND="
)
)
)
- X? (
- x11-apps/xprop
- x11-apps/xset
- )
"
BDEPEND="
app-alternatives/awk