From 48dfe2bc364ddab0b3a188bb2816b94ae71cf11a Mon Sep 17 00:00:00 2001 From: Sam James Date: Wed, 5 Oct 2022 19:59:46 +0100 Subject: [PATCH] net-im/zoom: 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 --- ...oom-5.11.10.4400.ebuild => zoom-5.11.10.4400-r1.ebuild} | 7 ++++--- ...om-5.11.9.4300-r4.ebuild => zoom-5.11.9.4300-r5.ebuild} | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) rename net-im/zoom/{zoom-5.11.10.4400.ebuild => zoom-5.11.10.4400-r1.ebuild} (98%) rename net-im/zoom/{zoom-5.11.9.4300-r4.ebuild => zoom-5.11.9.4300-r5.ebuild} (98%) diff --git a/net-im/zoom/zoom-5.11.10.4400.ebuild b/net-im/zoom/zoom-5.11.10.4400-r1.ebuild similarity index 98% rename from net-im/zoom/zoom-5.11.10.4400.ebuild rename to net-im/zoom/zoom-5.11.10.4400-r1.ebuild index 0e53f1f8aa8cd..1f9950a803ee9 100644 --- a/net-im/zoom/zoom-5.11.10.4400.ebuild +++ b/net-im/zoom/zoom-5.11.10.4400-r1.ebuild @@ -17,9 +17,10 @@ IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland" RESTRICT="mirror bindist strip" RDEPEND="!games-engines/zoom - app-accessibility/at-spi2-atk - app-accessibility/at-spi2-core - 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/net-im/zoom/zoom-5.11.9.4300-r4.ebuild b/net-im/zoom/zoom-5.11.9.4300-r5.ebuild similarity index 98% rename from net-im/zoom/zoom-5.11.9.4300-r4.ebuild rename to net-im/zoom/zoom-5.11.9.4300-r5.ebuild index 0e53f1f8aa8cd..1f9950a803ee9 100644 --- a/net-im/zoom/zoom-5.11.9.4300-r4.ebuild +++ b/net-im/zoom/zoom-5.11.9.4300-r5.ebuild @@ -17,9 +17,10 @@ IUSE="bundled-libjpeg-turbo +bundled-qt opencl pulseaudio wayland" RESTRICT="mirror bindist strip" RDEPEND="!games-engines/zoom - app-accessibility/at-spi2-atk - app-accessibility/at-spi2-core - 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