From 155dc8fdd81759cd86b32b7089220ebd9e8e59d3 Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 5 Oct 2022 19:59:53 +0100 Subject: [PATCH] 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 --- x11-misc/xpad/xpad-5.4.0.ebuild | 6 ++++-- x11-misc/xpad/xpad-5.7.0.ebuild | 6 ++++-- x11-misc/xpad/xpad-5.8.0.ebuild | 6 ++++-- 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 a1ae20d7ee747..cf0357f56a9e8 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 2df4a07a8d04e..90ae5daec2115 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 2df4a07a8d04e..90ae5daec2115 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]