summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-10-05 19:59:38 +0100
committerSam James <sam@gentoo.org>2022-10-05 19:59:38 +0100
commitc5fa9d5ffea45687a0f2227cfaa1e818b8b66e34 (patch)
tree96ca07e1773239f8bf4b4273423804c730d8c993 /dev-util
parentapp-text/atril: use || ( ... ) dep for dev-libs/atk (diff)
downloadgentoo-c5fa9d5ffea45687a0f2227cfaa1e818b8b66e34.tar.gz
gentoo-c5fa9d5ffea45687a0f2227cfaa1e818b8b66e34.tar.bz2
gentoo-c5fa9d5ffea45687a0f2227cfaa1e818b8b66e34.zip
dev-util/clion: use || ( ... ) dep for dev-libs/atk
Forcing migration to at-spi2-atk right now leads to nasty conflicts for stable users. Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/clion/clion-2022.1.3-r1.ebuild (renamed from dev-util/clion/clion-2022.1.3.ebuild)7
-rw-r--r--dev-util/clion/clion-2022.2.1-r2.ebuild (renamed from dev-util/clion/clion-2022.2.1-r1.ebuild)7
2 files changed, 8 insertions, 6 deletions
diff --git a/dev-util/clion/clion-2022.1.3.ebuild b/dev-util/clion/clion-2022.1.3-r1.ebuild
index 977084632a53..e3be5c083ec2 100644
--- a/dev-util/clion/clion-2022.1.3.ebuild
+++ b/dev-util/clion/clion-2022.1.3-r1.ebuild
@@ -22,9 +22,10 @@ BDEPEND="dev-util/patchelf"
# RDEPENDS may cause false positives in repoman.
# clion requires cmake and gdb at runtime to build and debug C/C++ projects
RDEPEND="
- app-accessibility/at-spi2-atk:2
- app-accessibility/at-spi2-core:2
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat
dev-libs/glib:2
dev-libs/nspr
diff --git a/dev-util/clion/clion-2022.2.1-r1.ebuild b/dev-util/clion/clion-2022.2.1-r2.ebuild
index a0bb07fec4df..5877a908c2d6 100644
--- a/dev-util/clion/clion-2022.2.1-r1.ebuild
+++ b/dev-util/clion/clion-2022.2.1-r2.ebuild
@@ -22,9 +22,10 @@ BDEPEND="dev-util/patchelf"
# RDEPENDS may cause false positives in repoman.
# clion requires cmake and gdb at runtime to build and debug C/C++ projects
RDEPEND="
- app-accessibility/at-spi2-atk:2
- app-accessibility/at-spi2-core:2
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
dev-libs/expat
dev-libs/glib:2
dev-libs/nspr