gentoo resync : 11.07.2019

3 files changed, 2 insertions, 93 deletions

diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index d8417e6d2e2d..81cf87bdfe8f 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,5 +1,3 @@
-DIST atril-1.22.0.tar.xz 1819580 BLAKE2B 6d5ae9e42407c5c7ae716c0650eda2085bc2206f442dbbb04dbf549263cdabe6d28761deb14bb9557534f26828882cf5b9373698b5e2c29f4b70445ebfabaa5b SHA512 bf940178647c348fd78e828bcb3a55c4ff6195d4020bf198ae5ba4a96e2fe582f7e30fb9d4cde4143e82ae783358373d3a9fd68413295586da9fe1b374e2f034
 DIST atril-1.22.1.tar.xz 1766980 BLAKE2B 0b7b1a7dfff13c5d803fed4140596940b20a322fce54c9f0faecd8e80bdc1e5e498603851a10a88763b20444377bcf4e7b124ac08953ab6aa4b3b2cce021a46c SHA512 838ae397c868ac417c9266e4a06525d66214650cf8647e91c1472d83d50c8954f6dbb29411384892a98f0929e1fbac9947118bd0db10d50400fc0d5270a3619d
-EBUILD atril-1.22.0.ebuild 2114 BLAKE2B c3731b7086b91b09c2ff7eac2247caafe889286fd37ba7e43ef9cf276de60f42cc646421e3ef47cfe5540786aab12e2d746f20ff16f2f47344c35e536bed6164 SHA512 b8b9ab41fc5beeeb4463f3993d8bf7fe30c66a516aaec65f50be17932e3a3d8c44234d892678ea663c3790a4a4867af8c711607700ffd01e1f9efddf9b16107b
-EBUILD atril-1.22.1.ebuild 2140 BLAKE2B 62a297c4acb54cd3c777de938d0ec6836f887192c16a6408db41f5580f5b9879d06811935c9e262ea4fab451a413f858eafbc2e57c30606cc73a01adf1484f62 SHA512 a4abb4d9f0bed5733678c304bbfc1928542d59b38e9b8763e8a60c2c880300d3ddab28b23a71e0b9baac5c2060fd19bbab9b0e2cf0c5f36ea9c1411860749a87
+EBUILD atril-1.22.1.ebuild 2138 BLAKE2B 2a8a895fd05a48d4a0ebc5056a6560b710b51f1f3fed7cff4346310022c4d59b8dc4ce831c0044ce081890be4713a14220ef59f8e9adfc4836a344505bfddfb7 SHA512 664c74e3e5c7aca481b2538838b1d170c1bca280e5ee7f4f1c3b61dccf514dad910013144655782d3764da6e45fb6b11d6ed67e4a13c53f81ac75baead26452c
 MISC metadata.xml 782 BLAKE2B f87378442b88dfae4c1b06d6bfc3f3d13770271bb0c589ad37965325bdc0ac13cdbea3dc18fb41d48339a078c2d11c0adfa78a88da9216356c79fece0f5f39d9 SHA512 d3c0b43a5957c49d606b8eafd71ec8a0ef3e428e1953a0e8172c633bede7c9e1d468cf61eecb2f6cd980ff64ab02faf16c9501351ccebbc64175af9fb9b32477
diff --git a/app-text/atril/atril-1.22.0.ebuild b/app-text/atril/atril-1.22.0.ebuild
deleted file mode 100644
index 19cf67a3e376..000000000000
--- a/app-text/atril/atril-1.22.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2019 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="GPL-2"
-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/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.1.ebuild b/app-text/atril/atril-1.22.1.ebuild
index 7fa4d3d8236f..fbfbdd9bd521 100644
--- a/app-text/atril/atril-1.22.1.ebuild
+++ b/app-text/atril/atril-1.22.1.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"