summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-10-05 19:59:37 +0100
committerSam James <sam@gentoo.org>2022-10-05 19:59:37 +0100
commit714f9ff460eee70d7eda2a0c432c072227882448 (patch)
tree9723323d56c1c7d8978f7024747dfb28e3e7c5ae /app-text
parentapp-editors/vscodium: use || ( ... ) dep for dev-libs/atk (diff)
downloadgentoo-714f9ff460eee70d7eda2a0c432c072227882448.tar.gz
gentoo-714f9ff460eee70d7eda2a0c432c072227882448.tar.bz2
gentoo-714f9ff460eee70d7eda2a0c432c072227882448.zip
app-text/atril: 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 'app-text')
-rw-r--r--app-text/atril/atril-1.24.0-r3.ebuild (renamed from app-text/atril/atril-1.24.0-r2.ebuild)7
-rw-r--r--app-text/atril/atril-1.24.1-r1.ebuild (renamed from app-text/atril/atril-1.24.1.ebuild)5
-rw-r--r--app-text/atril/atril-1.26.0-r2.ebuild (renamed from app-text/atril/atril-1.26.0-r1.ebuild)5
3 files changed, 13 insertions, 4 deletions
diff --git a/app-text/atril/atril-1.24.0-r2.ebuild b/app-text/atril/atril-1.24.0-r3.ebuild
index 55de51ce62bd..f5307411c138 100644
--- a/app-text/atril/atril-1.24.0-r2.ebuild
+++ b/app-text/atril/atril-1.24.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -23,7 +23,10 @@ REQUIRED_USE="t1lib? ( dvi )"
COMMON_DEPEND="
>=app-text/poppler-0.22[cairo]
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ dev-libs/atk
+ )
>=dev-libs/glib-2.62:2
>=dev-libs/libxml2-2.5:2
sys-libs/zlib
diff --git a/app-text/atril/atril-1.24.1.ebuild b/app-text/atril/atril-1.24.1-r1.ebuild
index 3d098e7a9f2d..77196d6dd8b3 100644
--- a/app-text/atril/atril-1.24.1.ebuild
+++ b/app-text/atril/atril-1.24.1-r1.ebuild
@@ -23,7 +23,10 @@ REQUIRED_USE="t1lib? ( dvi )"
COMMON_DEPEND="
>=app-text/poppler-0.22[cairo]
- dev-libs/atk
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ dev-libs/atk
+ )
>=dev-libs/glib-2.62:2
>=dev-libs/libxml2-2.5:2
sys-libs/zlib
diff --git a/app-text/atril/atril-1.26.0-r1.ebuild b/app-text/atril/atril-1.26.0-r2.ebuild
index 83e849a1e4e3..a11d6f7ba6da 100644
--- a/app-text/atril/atril-1.26.0-r1.ebuild
+++ b/app-text/atril/atril-1.26.0-r2.ebuild
@@ -22,7 +22,10 @@ IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring nls +postscript
REQUIRED_USE="t1lib? ( dvi )"
COMMON_DEPEND="
- app-accessibility/at-spi2-core
+ || (
+ >=app-accessibility/at-spi2-core-2.46.0:2
+ dev-libs/atk
+ )
>=app-text/poppler-0.22[cairo]
>=dev-libs/glib-2.62:2
>=dev-libs/libxml2-2.5:2