summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-10-05 19:59:53 +0100
committerSam James <sam@gentoo.org>2022-10-05 19:59:53 +0100
commit155dc8fdd81759cd86b32b7089220ebd9e8e59d3 (patch)
treedc52339ae2866e9aefab63ecc98a9d76e0ec50b7 /x11-misc
parentwww-client/vivaldi: use || ( ... ) dep for dev-libs/atk (diff)
downloadgentoo-155dc8fdd81759cd86b32b7089220ebd9e8e59d3.tar.gz
gentoo-155dc8fdd81759cd86b32b7089220ebd9e8e59d3.tar.bz2
gentoo-155dc8fdd81759cd86b32b7089220ebd9e8e59d3.zip
x11-misc/xpad: 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 'x11-misc')
-rw-r--r--x11-misc/xpad/xpad-5.4.0.ebuild6
-rw-r--r--x11-misc/xpad/xpad-5.7.0.ebuild6
-rw-r--r--x11-misc/xpad/xpad-5.8.0.ebuild6
3 files changed, 12 insertions, 6 deletions
diff --git a/x11-misc/xpad/xpad-5.4.0.ebuild b/x11-misc/xpad/xpad-5.4.0.ebuild
index a1ae20d7ee74..cf0357f56a9e 100644
--- a/x11-misc/xpad/xpad-5.4.0.ebuild
+++ b/x11-misc/xpad/xpad-5.4.0.ebuild
@@ -14,8 +14,10 @@ KEYWORDS="amd64 ~arm ppc x86"
RDEPEND="
>=dev-libs/glib-2.56:2
- app-accessibility/at-spi2-atk
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
sys-devel/gettext
x11-libs/gdk-pixbuf
x11-libs/gtk+:3[X]
diff --git a/x11-misc/xpad/xpad-5.7.0.ebuild b/x11-misc/xpad/xpad-5.7.0.ebuild
index 2df4a07a8d04..90ae5daec211 100644
--- a/x11-misc/xpad/xpad-5.7.0.ebuild
+++ b/x11-misc/xpad/xpad-5.7.0.ebuild
@@ -14,8 +14,10 @@ SLOT="0"
KEYWORDS="amd64 ~arm ppc x86"
RDEPEND="
- app-accessibility/at-spi2-atk
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
>=dev-libs/glib-2.58:2
x11-libs/gdk-pixbuf
x11-libs/gtk+:3[X]
diff --git a/x11-misc/xpad/xpad-5.8.0.ebuild b/x11-misc/xpad/xpad-5.8.0.ebuild
index 2df4a07a8d04..90ae5daec211 100644
--- a/x11-misc/xpad/xpad-5.8.0.ebuild
+++ b/x11-misc/xpad/xpad-5.8.0.ebuild
@@ -14,8 +14,10 @@ SLOT="0"
KEYWORDS="amd64 ~arm ppc x86"
RDEPEND="
- app-accessibility/at-spi2-atk
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ ( app-accessibility/at-spi2-atk dev-libs/atk )
+ )
>=dev-libs/glib-2.58:2
x11-libs/gdk-pixbuf
x11-libs/gtk+:3[X]