gentoo resync : 03.07.2021

3 files changed, 35 insertions, 12 deletions

diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 7c12c2c6b189..98d6f23ea19c 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,5 +1,6 @@
 AUX atril-1.24.0-make-synctex-optional.patch 16815 BLAKE2B 13c65b9dbf1afa43aa32d147462c90dbad94366b1795b1409746cde2991180a3b2a3266908469b2ff5a4b3107b457ae86a3cb3bc058384877f885a512fabab2d SHA512 cb4493eca4e0bc1bd4a9bdd4540033aad3318023f6101f5548c14c7c7134ce6a4618849df44573af39af7d561ebca4b9b549668e81c50c7432a525db7d0f620b
 DIST atril-1.24.0.tar.xz 2062468 BLAKE2B 374c7769f5c9753b1d9a6143c796a317914aebbb638b6f0a85b732b43b0e9ad2fff1374a5f3f4dc1abc8c265ce003bfef2cddc47cdb18ddc7f24c4905ef5232c SHA512 dfdd5ed82ba76c4f0a446a95b0a6201bedf8b4d00ff46ce697a5b937251f6d7a1888ca76eef623eb84dcddb425c7ad662e179f593686bba064b7491d4d940293
-EBUILD atril-1.24.0-r1.ebuild 2253 BLAKE2B ae262b9f622fbbd916898c936e83d5411501596bd4b1c36ddf057ae4a25aca707f6f4eb7ea8a56ffd3662e9db0b46aaafde49e879ddbd32b67eaeee5871b4de0 SHA512 c76e3f3ebcb797648ee2290e6adcd5920c5a55e01b8f529ca3c58a9b4132baa388bb4aceaadd8e2322821b0cf0f135e1950de096f6b6681299c65cf4a145440f
-EBUILD atril-1.24.0-r2.ebuild 2934 BLAKE2B e6b0b357612c85719aacd949293184c3e359c63eec5a05df80e18067e7cc1ced444dbe72d24025518cfbe4d7fc28029bf1b48a2972178b5e24f5c82be1bff7d4 SHA512 6a58b9d39d4c17cfac29a7af4a41cf8dbf5d4587586e5fb6caf48652bfee0100b984351e82debbb59da63a4479508fb4198a7a320a3da71bb5b3d9daf2a65f17
+DIST atril-1.24.1.tar.xz 2043552 BLAKE2B 01e41e53a38684c237fadef200614cf8d70cb84410a00bb9d28b200fcac43a2bf45cd81c4c7f19ab1351891f179ee64cd880bca1aa38cf68727bcf1da3e06c8d SHA512 94a55e7699bdfc9368e20986664bd411c12f50f466874ebf20210df3de6ddb499866b505e157c56b58a8065aad2c24284b96afa8c547a6cd259eef413096a91a
+EBUILD atril-1.24.0-r2.ebuild 2932 BLAKE2B ec1cbcb05b59fbbed0a347ed93dd6fb48778063477a2fa771c515a36842d3d907149e065ad7d19bdbaf5f46d58dcdd2ecd3b070704eb07adb75695f3de04254f SHA512 593e1aef58e7055be1257d13ffb23bf637f0ac15aff8cd1b86ef2906127a7c21d046e83fc1cbbe96a5242d6fed5c5e9f78028f917763925d3e8af93c48a40e2d
+EBUILD atril-1.24.1.ebuild 2934 BLAKE2B e6b0b357612c85719aacd949293184c3e359c63eec5a05df80e18067e7cc1ced444dbe72d24025518cfbe4d7fc28029bf1b48a2972178b5e24f5c82be1bff7d4 SHA512 6a58b9d39d4c17cfac29a7af4a41cf8dbf5d4587586e5fb6caf48652bfee0100b984351e82debbb59da63a4479508fb4198a7a320a3da71bb5b3d9daf2a65f17
 MISC metadata.xml 887 BLAKE2B 38b14cf53af3c9728f59bc846fe8664092c545703fe542b9264f20aa867e26186c2a0ade2910c8f9040d33f1f882af5b00fb85b181e9a5ddcae92aa0732f385d SHA512 dbf93874246a0f8da95bf6b80968211b58e15c9d14ceddf7bafcee7f073be9d1eedbf0203c796411b2be38d651b110903501dda4a0ee7a1fb6429d1b3d926934
diff --git a/app-text/atril/atril-1.24.0-r2.ebuild b/app-text/atril/atril-1.24.0-r2.ebuild
index 1cf25b1ae899..55de51ce62bd 100644
--- a/app-text/atril/atril-1.24.0-r2.ebuild
+++ b/app-text/atril/atril-1.24.0-r2.ebuild
@@ -10,7 +10,7 @@ PYTHON_COMPAT=( python3_{7..9} )
 inherit mate python-any-r1 virtualx
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Atril document viewer for MATE"
diff --git a/app-text/atril/atril-1.24.0-r1.ebuild b/app-text/atril/atril-1.24.1.ebuild
index 58223d3207d6..1cf25b1ae899 100644
--- a/app-text/atril/atril-1.24.0-r1.ebuild
+++ b/app-text/atril/atril-1.24.1.ebuild
@@ -1,21 +1,23 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MATE_LA_PUNT="yes"
 
-inherit mate
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit mate python-any-r1 virtualx
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Atril document viewer for MATE"
 LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+ LGPL-2.1+"
 SLOT="0"
 
-IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps"
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript synctex t1lib test tiff xps"
 
 REQUIRED_USE="t1lib? ( dvi )"
 
@@ -32,7 +34,6 @@ COMMON_DEPEND="
 	x11-libs/libX11
 	>=x11-libs/cairo-1.14
 	x11-libs/pango
-	virtual/tex-base
 	caja? ( >=mate-base/caja-1.17.1[introspection?] )
 	djvu? ( >=app-text/djvu-3.5.17:0 )
 	dvi? (
@@ -46,6 +47,7 @@ COMMON_DEPEND="
 	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
 	postscript? ( >=app-text/libspectre-0.2 )
+	synctex? ( virtual/tex-base )
 	tiff? ( >=media-libs/tiff-3.6:0 )
 	xps? ( >=app-text/libgxps-0.2.1 )
 "
@@ -64,19 +66,30 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/glib-utils
 	dev-util/gtk-doc
 	dev-util/gtk-doc-am
-	>=sys-devel/gettext-0.19.8:*
+	>=sys-devel/gettext-0.19.8
 	virtual/pkgconfig
+	test? ( $(python_gen_any_dep 'dev-util/dogtail[${PYTHON_USEDEP}]') )
 "
 
-# Tests use dogtail which is not available on Gentoo.
+#RESTRICT="!test? ( test )"
+# Tests use dogtail and require using accessibility services.
+# Until we figure out how to run successfully, don't run tests
 RESTRICT="test"
 
+PATCHES=( "${FILESDIR}/${PN}-1.24.0-make-synctex-optional.patch" )
+
+python_check_deps() {
+	use test && has_version "dev-util/dogtail[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
 src_configure() {
 	# Passing --disable-help would drop offline help, that would be inconsistent
 	# with helps of the most of GNOME apps that doesn't require network for that.
 	mate_src_configure \
-		--disable-static \
-		--disable-tests \
 		--enable-comics \
 		--enable-pdf \
 		--enable-pixbuf \
@@ -91,7 +104,16 @@ src_configure() {
 		$(use_enable epub) \
 		$(use_enable introspection) \
 		$(use_enable postscript ps) \
+		$(use_enable synctex) \
 		$(use_enable t1lib) \
+		$(use_enable test tests) \
 		$(use_enable tiff) \
 		$(use_enable xps)
 }
+
+src_test() {
+	export GSETTINGS_BACKEND=keyfile
+	gsettings set org.gnome.desktop.interface toolkit-accessibility true || die
+	gsettings set org.mate.interface accessibility true || die
+	virtx emake check
+}