[gentoo-commits] proj/gentoo-mate:master commit in: app-text/atril/

[Adam Feldman]

commit:     0adb72fb1b9bd66ba904a0a68e62e070f798ac58
Author:     Adam Feldman <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  2 04:59:42 2020 +0000
Commit:     Adam Feldman <np-hardass <AT> gentoo <DOT> org>
CommitDate: Wed Sep  2 05:55:35 2020 +0000
URL:        https://gitweb.gentoo.org/proj/gentoo-mate.git/commit/?id=0adb72fb

app-text/atril: Sync with ::gentoo

Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Adam Feldman <NP-Hardass <AT> gentoo.org>

 app-text/atril/Manifest                            |  1 -
 app-text/atril/atril-1.22.1.ebuild                 | 90 ----------------------
 app-text/atril/atril-1.22.3.ebuild                 |  2 +-
 ...{atril-1.24.0.ebuild => atril-1.24.0-r1.ebuild} |  3 +-
 4 files changed, 3 insertions(+), 93 deletions(-)

diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index c4442d6..3af59ac 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,3 +1,2 @@
-DIST atril-1.22.1.tar.xz 1766980 BLAKE2B 0b7b1a7dfff13c5d803fed4140596940b20a322fce54c9f0faecd8e80bdc1e5e498603851a10a88763b20444377bcf4e7b124ac08953ab6aa4b3b2cce021a46c SHA512 838ae397c868ac417c9266e4a06525d66214650cf8647e91c1472d83d50c8954f6dbb29411384892a98f0929e1fbac9947118bd0db10d50400fc0d5270a3619d
 DIST atril-1.22.3.tar.xz 1798396 BLAKE2B 1f06585393e1a9a6d51b7cc50c52bd61e8e115aa3985ffca0233c2e09219a88c3a30b4ddbcc70bfb9ddf663810e6cc67e968f8a32bfd4a3f07b4646e896a7f18 SHA512 f4a83702818e1fb32279c67f1727c01480d27fe756f3fc0ff9dcd42584ce74ce10ac7ee81c0149f3756b6eb08f2a011ede28706ab54ff16a51c544a1af3b103f
 DIST atril-1.24.0.tar.xz 2062468 BLAKE2B 374c7769f5c9753b1d9a6143c796a317914aebbb638b6f0a85b732b43b0e9ad2fff1374a5f3f4dc1abc8c265ce003bfef2cddc47cdb18ddc7f24c4905ef5232c SHA512 dfdd5ed82ba76c4f0a446a95b0a6201bedf8b4d00ff46ce697a5b937251f6d7a1888ca76eef623eb84dcddb425c7ad662e179f593686bba064b7491d4d940293

diff --git a/app-text/atril/atril-1.22.1.ebuild b/app-text/atril/atril-1.22.1.ebuild
deleted file mode 100644
index c5b3e71..0000000
--- a/app-text/atril/atril-1.22.1.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	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"
-
-REQUIRED_USE="t1lib? ( dvi )"
-
-RDEPEND="
-	>=app-text/poppler-0.22[cairo]
-	dev-libs/atk
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib
-	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libICE
-	>=x11-libs/libSM-1:0
-	x11-libs/libX11
-	>=x11-libs/cairo-1.9.10
-	x11-libs/pango
-	caja? ( >=mate-base/caja-1.17.1[introspection?] )
-	djvu? ( >=app-text/djvu-3.5.17:0 )
-	dvi? (
-		virtual/tex-base
-		t1lib? ( >=media-libs/t1lib-5:5 )
-	)
-	epub? (
-		dev-libs/mathjax
-		>=net-libs/webkit-gtk-2.4.3:4
-	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
-	postscript? ( >=app-text/libspectre-0.2 )
-	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.1 )
-	!!app-text/mate-document-viewer"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian
-	app-text/yelp-tools
-	>=app-text/scrollkeeper-dtd-1:1.0
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-# Tests use dogtail which is not available on Gentoo.
-RESTRICT="test"
-
-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-tests \
-		--enable-comics \
-		--enable-pdf \
-		--enable-pixbuf \
-		--enable-previewer \
-		--enable-thumbnailer \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable caja) \
-		$(use_enable dbus) \
-		$(use_enable debug) \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable epub) \
-		$(use_enable introspection) \
-		$(use_enable postscript ps) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps)
-}

diff --git a/app-text/atril/atril-1.22.3.ebuild b/app-text/atril/atril-1.22.3.ebuild
index db8529d..c5b3e71 100644
--- a/app-text/atril/atril-1.22.3.ebuild
+++ b/app-text/atril/atril-1.22.3.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 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.ebuild b/app-text/atril/atril-1.24.0-r1.ebuild
similarity index 97%
rename from app-text/atril/atril-1.24.0.ebuild
rename to app-text/atril/atril-1.24.0-r1.ebuild
index 0f89edd..58223d3 100644
--- a/app-text/atril/atril-1.24.0.ebuild
+++ b/app-text/atril/atril-1.24.0-r1.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Atril document viewer for MATE"
@@ -75,6 +75,7 @@ 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 \