summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-10-05 19:59:48 +0100
committerSam James <sam@gentoo.org>2022-10-05 19:59:48 +0100
commit7018bfe2069351ffa004abb0d4e5d8dc95f1ea29 (patch)
tree7952e8caf50bf10ee77bc64e1a1a086f6d006712
parentwww-client/chromium: use || ( ... ) dep for dev-libs/atk (diff)
downloadgentoo-7018bfe2069351ffa004abb0d4e5d8dc95f1ea29.tar.gz
gentoo-7018bfe2069351ffa004abb0d4e5d8dc95f1ea29.tar.bz2
gentoo-7018bfe2069351ffa004abb0d4e5d8dc95f1ea29.zip
www-client/firefox: 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>
-rw-r--r--www-client/firefox/firefox-102.3.0.ebuild5
-rw-r--r--www-client/firefox/firefox-105.0.1.ebuild5
-rw-r--r--www-client/firefox/firefox-105.0.2.ebuild5
3 files changed, 12 insertions, 3 deletions
diff --git a/www-client/firefox/firefox-102.3.0.ebuild b/www-client/firefox/firefox-102.3.0.ebuild
index 37231e87224d..d9483d446dcf 100644
--- a/www-client/firefox/firefox-102.3.0.ebuild
+++ b/www-client/firefox/firefox-102.3.0.ebuild
@@ -110,7 +110,10 @@ BDEPEND="${PYTHON_DEPS}
x86? ( >=dev-lang/nasm-2.14 )"
COMMON_DEPEND="${FF_ONLY_DEPEND}
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ dev-libs/atk
+ )
dev-libs/expat
dev-libs/glib:2
dev-libs/libffi:=
diff --git a/www-client/firefox/firefox-105.0.1.ebuild b/www-client/firefox/firefox-105.0.1.ebuild
index a44bccfac2a9..22b25d6d14d3 100644
--- a/www-client/firefox/firefox-105.0.1.ebuild
+++ b/www-client/firefox/firefox-105.0.1.ebuild
@@ -111,7 +111,10 @@ BDEPEND="${PYTHON_DEPS}
amd64? ( >=dev-lang/nasm-2.14 )
x86? ( >=dev-lang/nasm-2.14 )"
COMMON_DEPEND="${FF_ONLY_DEPEND}
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ dev-libs/atk
+ )
dev-libs/expat
dev-libs/glib:2
dev-libs/libffi:=
diff --git a/www-client/firefox/firefox-105.0.2.ebuild b/www-client/firefox/firefox-105.0.2.ebuild
index 6d40b62240c0..1c4172c64be5 100644
--- a/www-client/firefox/firefox-105.0.2.ebuild
+++ b/www-client/firefox/firefox-105.0.2.ebuild
@@ -120,7 +120,10 @@ BDEPEND="${PYTHON_DEPS}
)
)"
COMMON_DEPEND="${FF_ONLY_DEPEND}
- >=app-accessibility/at-spi2-core-2.46.0:2
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ dev-libs/atk
+ )
dev-libs/expat
dev-libs/glib:2
dev-libs/libffi:=