app-text/atril: Drop old, sync with Gentoo

Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Adam Feldman <NP-Hardass@gentoo.org>

8 files changed, 124 insertions, 250 deletions

diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 6b8a9c6..c4442d6 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,4 +1,3 @@
-DIST atril-1.12.2.tar.xz 1663920 BLAKE2B 7fa615a3d19fe33b086676d2326d690b5d6c694679a7e934ecf8922ad73aa83eb2ffb6c16aaf776e1d3798c3fa93fa844f52382b9eb9aa813cc6686395a4114e SHA512 2ceeda42adeb284a25caff3a69d15a231129988fb410e4d502a281ccf5819307b9963722a2e330307a1c3b15d3c82405b708d983ed1c266e091a35264766e6ec
-DIST atril-1.14.2.tar.xz 1703272 BLAKE2B e02fee02ad8644be9ea2c388f24c9f9e3480a68ae86bba41939e4fa195626189f9e6d93b97ea4b9d4a256f72ffc3d604f69fe4222c00a385f9d4ad9ac3a8e337 SHA512 9f77abe43848a3a35df1484edef4a6bbc6339f82b0d8e9f3c149c44fd632f2720acf24bcc1354b944c5c364fc4ce1d70b733c1ec5bc40b1a17041e59acf7bd9b
-DIST atril-1.16.1.tar.xz 1691456 BLAKE2B 5fccac614c64e7241ce0369842e97379c98df00f12d61524291afea22eebf18777ec2550592d734ff38aa64b92cbfa6350d11823a043337c6a7ee4b52757989f SHA512 69128171f13f50079b0b40bfada868967c289b5970e3cda3454f10e7cf723000ab29290c7c9ada67648c370472fd51eeb0a8dbbfa0af05babfc85cb28e3570fe
-DIST atril-1.18.3.tar.xz 1695960 BLAKE2B 2479ddd46104153631d34070054e9ba72956468c7b720aa5dc3c4a458a00cc00484cdfefb01981f2e8beeb7a13f1fc3db940dcc9a728863a1378b5b896e71e57 SHA512 d57cf4386651cb871455b003482e896a2735fb023e0b11f192ed1d169e364306f9ba55ef163df02ffd236b5f86d6afe2c1068d00d3fbc309807ded729ce2355a
+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.14.2-r2.ebuild b/app-text/atril/atril-1.14.2-r2.ebuild
deleted file mode 100644
index 792c2c2..0000000
--- a/app-text/atril/atril-1.14.2-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 ~x86"
-fi
-
-DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring gtk3 +postscript t1lib tiff xps"
-
-REQUIRED_USE="t1lib? ( dvi )
-	!gtk3? ( !epub )" #608604
-
-COMMON_DEPEND=">=app-text/poppler-0.16:0=[cairo]
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	sys-libs/zlib:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	>=x11-libs/libSM-1:0
-	x11-libs/libX11:0
-	>=x11-libs/cairo-1.9.10:0
-	x11-libs/pango:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
-	djvu? ( >=app-text/djvu-3.5.17:0 )
-	dvi? (
-		virtual/tex-base:0
-		t1lib? ( >=media-libs/t1lib-5:5 )
-	)
-	epub? ( dev-libs/mathjax )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2[introspection?]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
-	postscript? ( >=app-text/libspectre-0.2:0 )
-	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.0:0 )
-	!!app-text/mate-document-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian:0
-	app-text/yelp-tools:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	virtual/pkgconfig:*
-	sys-devel/gettext:*"
-
-# Tests use dogtail which is not available on Gentoo.
-RESTRICT="test"
-
-FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" )
-
-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 \
-		--with-matedesktop \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(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.12.2-r5.ebuild b/app-text/atril/atril-1.22.1.ebuild
index 360dac8..c5b3e71 100644
--- a/app-text/atril/atril-1.12.2-r5.ebuild
+++ b/app-text/atril/atril-1.22.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,67 +8,63 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="amd64 ~arm x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
+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 gtk3 +postscript t1lib tiff xps"
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps"
 
-REQUIRED_USE="t1lib? ( dvi )
-	!gtk3? ( !epub )" #608604
+REQUIRED_USE="t1lib? ( dvi )"
 
-RDEPEND=">=app-text/poppler-0.16:0=[cairo]
-	app-text/rarian:0
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
+RDEPEND="
+	>=app-text/poppler-0.22[cairo]
+	dev-libs/atk
+	>=dev-libs/glib-2.50:2
 	>=dev-libs/libxml2-2.5:2
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	sys-libs/zlib:0
+	sys-libs/zlib
 	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libICE
 	>=x11-libs/libSM-1:0
-	x11-libs/libX11:0
-	>=x11-libs/cairo-1.9.10:0
-	x11-libs/pango:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
+	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:0
+		virtual/tex-base
 		t1lib? ( >=media-libs/t1lib-5:5 )
 	)
-	epub? ( dev-libs/mathjax )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2[introspection?]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
+	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:0 )
+	postscript? ( >=app-text/libspectre-0.2 )
 	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.0: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/yelp-tools:0
+	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:*
-	virtual/pkgconfig:*
-	sys-devel/gettext:*"
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 # Tests use dogtail which is not available on Gentoo.
 RESTRICT="test"
 
-FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" )
-
 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.
@@ -79,8 +75,6 @@ src_configure() {
 		--enable-pixbuf \
 		--enable-previewer \
 		--enable-thumbnailer \
-		--with-matedesktop \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
 		$(use_with gnome-keyring keyring) \
 		$(use_enable caja) \
 		$(use_enable dbus) \
diff --git a/app-text/atril/atril-1.18.3.ebuild b/app-text/atril/atril-1.22.3.ebuild
index 2270d16..db8529d 100644
--- a/app-text/atril/atril-1.18.3.ebuild
+++ b/app-text/atril/atril-1.22.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,54 +12,55 @@ if [[ ${PV} != 9999 ]]; then
 fi
 
 DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
+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 )"
 
-COMMON_DEPEND=">=app-text/poppler-0.22:0=[cairo]
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
+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:0
+	sys-libs/zlib
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libICE:0
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libICE
 	>=x11-libs/libSM-1:0
-	x11-libs/libX11:0
-	>=x11-libs/cairo-1.9.10:0
-	x11-libs/pango: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:0
+		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:0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
-	postscript? ( >=app-text/libspectre-0.2:0 )
+	postscript? ( >=app-text/libspectre-0.2 )
 	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.1:0 )
+	xps? ( >=app-text/libgxps-0.2.1 )
 	!!app-text/mate-document-viewer"
 
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian:0
-	app-text/yelp-tools:0
+	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:*
-	virtual/pkgconfig:*
-	sys-devel/gettext:*"
+	>=dev-util/intltool-0.50.1
+	sys-devel/gettext
+	virtual/pkgconfig"
 
 # Tests use dogtail which is not available on Gentoo.
 RESTRICT="test"
diff --git a/app-text/atril/atril-1.16.1-r2.ebuild b/app-text/atril/atril-1.24.0.ebuild
index 24aad9d..0f89edd 100644
--- a/app-text/atril/atril-1.16.1-r2.ebuild
+++ b/app-text/atril/atril-1.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,68 +8,69 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
+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 gtk3 +postscript t1lib tiff xps"
+IUSE="caja dbus debug djvu dvi epub +introspection gnome-keyring +postscript t1lib tiff xps"
 
-REQUIRED_USE="t1lib? ( dvi )
-	!gtk3? ( !epub )" #608604
+REQUIRED_USE="t1lib? ( dvi )"
 
-COMMON_DEPEND=">=app-text/poppler-0.22:0=[cairo]
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
+COMMON_DEPEND="
+	>=app-text/poppler-0.22[cairo]
+	dev-libs/atk
+	>=dev-libs/glib-2.62:2
 	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:0
+	sys-libs/zlib
 	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libICE
 	>=x11-libs/libSM-1:0
-	x11-libs/libX11:0
-	>=x11-libs/cairo-1.9.10:0
-	x11-libs/pango:0
-	caja? ( >=mate-base/caja-1.8[gtk3(-)=,introspection?] )
+	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? (
-		virtual/tex-base:0
+		virtual/tex-base
 		t1lib? ( >=media-libs/t1lib-5:5 )
 	)
-	epub? ( dev-libs/mathjax )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24.0:2[introspection?]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:4 )
+	epub? (
+		dev-libs/mathjax
+		>=net-libs/webkit-gtk-2.6.0:4
 	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
-	postscript? ( >=app-text/libspectre-0.2:0 )
+	postscript? ( >=app-text/libspectre-0.2 )
 	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.1:0 )
-	!!app-text/mate-document-viewer"
+	xps? ( >=app-text/libgxps-0.2.1 )
+"
 
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!!app-text/mate-document-viewer
+"
 
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian:0
-	app-text/yelp-tools:0
+	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:*
-	virtual/pkgconfig:*
-	sys-devel/gettext:*"
+	>=sys-devel/gettext-0.19.8:*
+	virtual/pkgconfig
+"
 
 # Tests use dogtail which is not available on Gentoo.
 RESTRICT="test"
 
-FILES=( "${FILESDIR}/${PN}-cve-2017-1000083.patch" )
-
 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.
@@ -80,7 +81,6 @@ src_configure() {
 		--enable-pixbuf \
 		--enable-previewer \
 		--enable-thumbnailer \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
 		$(use_with gnome-keyring keyring) \
 		$(use_enable caja) \
 		$(use_enable dbus) \
diff --git a/app-text/atril/atril-9999.ebuild b/app-text/atril/atril-9999.ebuild
index e253873..0f89edd 100644
--- a/app-text/atril/atril-9999.ebuild
+++ b/app-text/atril/atril-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,58 +8,65 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 DESCRIPTION="Atril document viewer for MATE"
-LICENSE="GPL-2"
+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 )"
 
-COMMON_DEPEND=">=app-text/poppler-0.22:0=[cairo]
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
+COMMON_DEPEND="
+	>=app-text/poppler-0.22[cairo]
+	dev-libs/atk
+	>=dev-libs/glib-2.62:2
 	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:0
+	sys-libs/zlib
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.14:3[introspection?]
-	x11-libs/libICE:0
+	>=x11-libs/gtk+-3.22:3[introspection?]
+	x11-libs/libICE
 	>=x11-libs/libSM-1:0
-	x11-libs/libX11:0
-	>=x11-libs/cairo-1.9.10:0
-	x11-libs/pango:0
+	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? (
-		virtual/tex-base:0
+		virtual/tex-base
 		t1lib? ( >=media-libs/t1lib-5:5 )
 	)
 	epub? (
 		dev-libs/mathjax
-		>=net-libs/webkit-gtk-2.4.3:4
+		>=net-libs/webkit-gtk-2.6.0:4
 	)
-	gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6:= )
-	postscript? ( >=app-text/libspectre-0.2:0 )
+	postscript? ( >=app-text/libspectre-0.2 )
 	tiff? ( >=media-libs/tiff-3.6:0 )
-	xps? ( >=app-text/libgxps-0.2.1:0 )
-	!!app-text/mate-document-viewer"
+	xps? ( >=app-text/libgxps-0.2.1 )
+"
 
-RDEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}
+	virtual/libintl
+	!!app-text/mate-document-viewer
+"
 
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-xml-dtd:4.1.2
-	app-text/rarian:0
-	app-text/yelp-tools:0
+	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:*
-	virtual/pkgconfig:*
-	sys-devel/gettext:*"
+	>=sys-devel/gettext-0.19.8:*
+	virtual/pkgconfig
+"
 
 # Tests use dogtail which is not available on Gentoo.
 RESTRICT="test"
diff --git a/app-text/atril/files/atril-cve-2017-1000083.patch b/app-text/atril/files/atril-cve-2017-1000083.patch
deleted file mode 100644
index 29c81f7..0000000
--- a/app-text/atril/files/atril-cve-2017-1000083.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From f4291fd62f7dfe6460d2406a979ccfac0c68dd59 Mon Sep 17 00:00:00 2001
-From: ZenWalker <scow@riseup.net>
-Date: Wed, 19 Jul 2017 11:00:09 +0200
-Subject: [PATCH] comics: make the files containing "--checkpoint-action="
- unsupported
-
-Fixes #257
----
- backend/comics/comics-document.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
-index 9f945c6..4d4d293 100644
---- a/backend/comics/comics-document.c
-+++ b/backend/comics/comics-document.c
-@@ -983,6 +983,12 @@ extract_argv (EvDocument *document, gint page)
- 	char *command_line, *quoted_archive, *quoted_filename;
- 	GError *err = NULL;
- 
-+	if (g_strrstr (comics_document->page_names->pdata[page], "--checkpoint-action="))
-+	{
-+		g_warning ("File unsupported\n");
-+		gtk_main_quit ();
-+	}
-+
-         if (page >= comics_document->page_names->len)
-                 return NULL;
- 
diff --git a/app-text/atril/metadata.xml b/app-text/atril/metadata.xml
index 8c1303c..0b99971 100644
--- a/app-text/atril/metadata.xml
+++ b/app-text/atril/metadata.xml
@@ -11,7 +11,6 @@
 		<flag name="dvi">Enable build-in DVI viewer</flag>
 		<flag name="epub">Enable build-in DVI viewer using
 			<pkg>net-libs/webkit-gtk</pkg></flag>
-		<flag name="gtk3">Build with GTK+3 instead of GTK+2</flag>
 		<flag name="t1lib">Enable the Type-1 fonts for the build-in DVI viewer
 			(<pkg>media-libs/t1lib</pkg>)</flag>
 		<flag name="xps">Enable XPS viewer using