gentoo resync : 29.10.2017

35 files changed, 213 insertions, 318 deletions

diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 94a2adcb5bc1..cb6ec6880c3b 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -2,12 +2,9 @@ DIST atril-1.12.2.tar.xz 1663920 SHA256 47cd22969d4ff6ef860a310a57f77f1fcc0c5674
 DIST atril-1.14.2.tar.xz 1703272 SHA256 9a8eadd85bda4539560f01a2127be4d6c358c07c6a744c09d1fdb5bff7ce14f4 SHA512 9f77abe43848a3a35df1484edef4a6bbc6339f82b0d8e9f3c149c44fd632f2720acf24bcc1354b944c5c364fc4ce1d70b733c1ec5bc40b1a17041e59acf7bd9b WHIRLPOOL 3e4bf2f6af6369b7cf410f161c159f6f0221d311b354c24d8b86fbcb14c3553d01ea6d79667d9817541aa401202bc8590d074f635745730854a148ca74b41dfc
 DIST atril-1.16.1.tar.xz 1691456 SHA256 c74a5f8c8603fa5952efb4343f055677e4474f1907080be9658d4456d3dc092f SHA512 69128171f13f50079b0b40bfada868967c289b5970e3cda3454f10e7cf723000ab29290c7c9ada67648c370472fd51eeb0a8dbbfa0af05babfc85cb28e3570fe WHIRLPOOL a7b386897c598e473642aa8c3ba2a40211c4389ef3560e574adf04072882887e37a50a7d83ff5fab4c74982908994c926211272d33220fb47a360e05c851a670
 DIST atril-1.18.0.tar.xz 1688144 SHA256 c2284f17f7b683efa22615f00cf2768ea07667981d8304566e49c3d863de80fd SHA512 71e40faebfac08c60c90e7c919d2274976a5f03e6f9c6882fe81d4736152c14b1baf45da770f357030708d103203a4ffc47387c736c4df8737dfc5caf1fd466a WHIRLPOOL 4cef97e4a832a2123ddfc1ddaf2af8d44af9a746676ce356c0d7dcc4fe463a762ab33982fa2045ca9bf461dd79c52b513d6fe263fd153121ff3a6afad1708ecc
-EBUILD atril-1.12.2-r3.ebuild 2347 SHA256 1253933089f14ca020345ff8788bd6b3f715ce76a5b652585d2409429d31021d SHA512 a02f369ebb18e2b6f0c6e99e8db6185928bac62d02a29381f88872ee63fb948296e1347c15bc2b687f349e7036887d70f193adc26c9d13d07778537598a2f0ef WHIRLPOOL 99dacb65e3c753f0186529cdb8b1d88a3b5bdd33e9e116aa7a72f217fe21e3a78a0c0c550356ddeb2c767efb95efd68c22644a7ee92094fd40d0996303be6fac
-EBUILD atril-1.12.2-r4.ebuild 2333 SHA256 820ed2d8933682b746aedeb92b1e8233379d6ee8951ee09a9a7a116b1e692e26 SHA512 c485c4bda248f2719800166ff8a5b6fcdc6610012661bdc0a490ef06414ba2a2a5a9f483841d7c2bcb5efe4900f3fa4b06b348935ec0e6d2d84c0482405edc60 WHIRLPOOL 818fd64bbbbd3e961f02b2d1e9b888479e53cc3cf90e2c44e5fb5825cf367d7592acaaa19390eced529f7b8c8cfe6181581eaa4d80c15ade0969b7554923b3d5
+EBUILD atril-1.12.2-r4.ebuild 2331 SHA256 13b99c99ec1eba20661adb1a5fc6ae04f12d892cfdd3f452091866a7e0d220aa SHA512 897bc693606b157ab17b9a1f56b3a26e3a3d69b0bca0f8d0ebec5af5a0777acfe8dd60457090ae2d1fe04280b9a455e8c92c669fe2afa74b0045ace60a8a6eb4 WHIRLPOOL 5a0ae9c5b34907a0e1f25db017c14e39559d5ea02c1bf5d8104e849f6d9f64ce86c359a581f92d336f5f7b3ab88761298282fdca2939b07f3586f04c97b5f676
 EBUILD atril-1.14.2-r1.ebuild 2373 SHA256 4788380fad37640ba89dee20d02d94982bd37860516f3591bfe45c96b3853d78 SHA512 f10dac5113a74cee27f28f47ae59e850a9331755864016cf35a24fe3ddcea84a7e6ce2d24bbc8237d2b4745afc1fd4616f5f8d0df9c6bd5aa1cc2c36fa5b4625 WHIRLPOOL 4880b967e3ccfb9cdac0d96a3516bcd7bf8e51968144a916cdeee2fba70dd14b373305f3bf9e47848bd5d460e867cd7b5cdd4724cd0e708e348ce7825c2d7f62
-EBUILD atril-1.14.2.ebuild 2389 SHA256 ddcb7f1878c7ddf682d91300cef883b4221f3c24853fecc5caabe1fd48acad00 SHA512 6910eaf71e24fcf9c42048dde071f2117f5f8ed81e122a6d4619a977a16e2977821870edbe62ade81e39dd3e34ff689e6cd29a9c8dea4c96008dd86f04240e80 WHIRLPOOL 05837650aa69af56cd846e8d94e735bed40efa027dd3872ea6a04e72053db9c04ad5d671832cf94b5d53854fdaa38abc3e0315f75c7c071ac81c1f25b8c49283
 EBUILD atril-1.16.1-r1.ebuild 2310 SHA256 863f2e70efa1a475f315b36178c62944f6e6c578ea7bba337ef1802c09217ab5 SHA512 61d811ce7d246b8e962dfd60a710da7a5f08ad17bb532a0396f1206599918e0eb89ec7675032fc1a3bdb72724073feb80d35875e7215636fc8d22abff43fb188 WHIRLPOOL 36a2a17f9abdd27a230e723363be251f62713bc397a9275ca2a530b5c34fc14e2fe47cd55ef1e8387fba939c318746d89272a7634473287a156b92861e739903
-EBUILD atril-1.16.1.ebuild 2326 SHA256 984eb424094ca9c714e96dc9b000d7e3b94fdd4e41da69f8a1184a5cd7272f62 SHA512 1ffc591b8b4c193909d5603f8aecb2eb1501aa9b8ab4e2abe9fe9a33a39268e1e73b62f59edf0a80294915bec82e2fb13162b8666a8821e21d624b9fb988676a WHIRLPOOL afb0f8d98775e8c5365fc70821afe4f57c7373eac43301ee1378923769fd25a4300cfc14425f117770a53fa57879c4e862c7de6245ce0ea076d6a7f763352546
 EBUILD atril-1.18.0.ebuild 2162 SHA256 ae522c7814cb10a077f42ff5451b591c7b69a94e24259b2f2f25dc4e7b1421de SHA512 813b95f5230e292164c658147e961b6cc2eb5ab80ad63643fa06fcc6bd9092750f4af45b8de4c85965b704740ec8e138cee25185296d8aa5156dca58f96212a8 WHIRLPOOL 53d52337cd9aacd7f5616750dfc06e832e6554e7a5883a9bf28266c0099267a7b65d4d28bf5df249892d5ceb47d726a8c4169e30e2843b042b711698e7068ec5
 MISC ChangeLog 5815 SHA256 01a88c082c524b9bb8ae0d8b8a2ab495bf2afb3925af22107262a098c36705a3 SHA512 8ece396a1ff632fa5a4ccde01b89838b6298841966a541ef5212e0d7eee11ec9ec58911e51fcae3114985b1572cb91c6ba0463fdbfeed4cec1f911ee58712415 WHIRLPOOL 73ea430fc247eed383c67339cd1887ea49624ca38759a43cfd06cca6770a75d2d2d689a4ee2d96bdb1eb5fb098626a97a9d49496892315756f3dc74762ae54fc
 MISC ChangeLog-2015 1249 SHA256 3aa2ad53dda652f8f91d9288596c475473adbb27ba6fd0a3e0a7b5225a44e30f SHA512 b9976048766136413bfbab246302d3c7bd92f1c5a0831465c37aac68e325e5aab60a65d36335b8046c2be74912f3929577d3f6cac7418e9c4ad2bebc017ad339 WHIRLPOOL 12e953096e9fe2eed2e8109fa3d71af1e836d909fe052ae8d05477901bcce54c091c65a995b8158425774b96163a36ecfa952bda1861180314b8e124de0c8ec4
diff --git a/app-text/atril/atril-1.12.2-r3.ebuild b/app-text/atril/atril-1.12.2-r3.ebuild
deleted file mode 100644
index 78c75e698fc5..000000000000
--- a/app-text/atril/atril-1.12.2-r3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 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 )"
-
-RDEPEND=">=app-text/poppler-0.16:0=[cairo]
-	app-text/rarian:0
-	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?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:2 )
-	)
-	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"
-
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	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"
-
-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-r4.ebuild b/app-text/atril/atril-1.12.2-r4.ebuild
index 8a29b95e1db7..aa353029fbdf 100644
--- a/app-text/atril/atril-1.12.2-r4.ebuild
+++ b/app-text/atril/atril-1.12.2-r4.ebuild
@@ -8,7 +8,7 @@ MATE_LA_PUNT="yes"
 inherit mate
 
 if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 ~arm x86"
 fi
 
 DESCRIPTION="Atril document viewer for MATE"
diff --git a/app-text/atril/atril-1.14.2.ebuild b/app-text/atril/atril-1.14.2.ebuild
deleted file mode 100644
index cec82ec0eadf..000000000000
--- a/app-text/atril/atril-1.14.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 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 )"
-
-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?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:2 )
-	)
-	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"
-
-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.16.1.ebuild b/app-text/atril/atril-1.16.1.ebuild
deleted file mode 100644
index 25821be1a795..000000000000
--- a/app-text/atril/atril-1.16.1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2016 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 )"
-
-COMMON_DEPEND=">=app-text/poppler-0.22:0=[cairo]
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	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?]
-		epub? ( >=net-libs/webkit-gtk-2.4.3:2 )
-	)
-	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.1: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"
-
-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-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/bibus/Manifest b/app-text/bibus/Manifest
index b540dd31f9e3..2de977cbc89b 100644
--- a/app-text/bibus/Manifest
+++ b/app-text/bibus/Manifest
@@ -4,7 +4,7 @@ AUX bibus-1.5.2-wx30.patch 7623 SHA256 37d21557bf4375b048df41cbdd346ffc08b57deb8
 DIST bibus-1.5.2-lo-4.patch.xz 13196 SHA256 b7147230929c304ab357c6a725c5cabbd577607e6200df968cdf2c057603c8a1 SHA512 68b90574e9dd0bb3e2cc89c539ff35febdf4ac37dfb65c06709d21b62fdda0108c93f05d37ab96bf52c4f99bbe20caa361d562c297b05dc7ea37404eea659fd1 WHIRLPOOL d807d81277fac722c50d98575939142a6f1f5a1e9eb88dec0acf0053349f54ecce7d7dcf070742b143bbf166704994b401eeb1e1ecd3e32c351d9bc41c09d1d8
 DIST bibus_1.5.2.orig.tar.gz 5411889 SHA256 c6c66d6bdce403b7791bf58cc16eeaae9f0e9d1c3f0ba8411f9f3e694d740f02 SHA512 33d091dacc707859a11010fcba57691a3e2726ae7579d601720b4398f7be29b580be978da8cd058fab491ec5b52dd3ce33c964a8d5077f8e80d8f0f387ffa2c4 WHIRLPOOL 964f13902a8a20d9e838784cf1f0a032bb2327cd28f3b2470c35a7394ae7f7536a7884d798a8308049a02f6976183ffb1c56cc4d8b20dce13f98033668a90d38
 EBUILD bibus-1.5.2-r2.ebuild 2073 SHA256 d697f9e7200a2337d27def9544ed63e5851e69a9f78020b8ed0752de8e0c6076 SHA512 bb07320da8f9e63bb854010fad2e0096da1d4c8858b38ed04b15971cfdb5b103af233098f5d45dd1e9ef6831d070adf799b246626f04405c5f503302075ce0c9 WHIRLPOOL 2daef5c50ebb43c9a3b34bc687d398304b3bf2f685bd3724b65fcd2d763f0c9e219679c3bf1bc5f12311b808408f00926ad9ba7dab14327044aaecc7f38cbf04
-EBUILD bibus-1.5.2-r3.ebuild 2067 SHA256 9de71d7bd004abb59cf4bc303711ebe39786af052539aa07a5e6f9be39fd4f94 SHA512 c635061c82dc2c9496eda0c4bf587265cd54015eb070f93333a427bb8d2da8b12f98361431b9b37a6e552ed972069958e5b1f447807edbdc775b7061a75976b7 WHIRLPOOL 3066fc81f9c828244438d4ff7ed716555b50c85cf1b97b78092730c29b324581e1bbc639997b457bf1417d40b1d60037e5761387971b7492d610c85e9d0396a9
+EBUILD bibus-1.5.2-r3.ebuild 2065 SHA256 b931a57196578a8d6829add9a4f9182fe9d4ef80065d8889d723ff8c3018f7ac SHA512 c0a3d1b9367a36898e8ec88e46c32f0339f417633fcfce8ccad95806826be75590b08430fc65f462371e28c7900df83947e28588b8502ccdfbbcdcca27869794 WHIRLPOOL 3c9ec18378dde8da1fdefa7699a989ac1349fc01c573c511f052aeba6824dbdd0435b9f3b46e96454010acfcc66785e86a1118dc59e221c2ee984543adb31e1e
 MISC ChangeLog 3773 SHA256 b73db29405ae3406a30584ceed8334c0fe13e53b31a3e1476d5d0851261511f4 SHA512 97ffa22c04e16029a22d59c92024247cca7681ed768a9cd97146c65a61cfd8fb28b1c4aa382f6ccdc98da1bd34214fe571ddc68a9ab365277cadfcca6ccf461d WHIRLPOOL 00f1aad3c8946ed9d6847c76c4779c42b02c637e7dab626cde6f3ab0523844577f14315f7619734e4392b77c5c5bddfe3f8977d67df8e45f1b4a451abd12725a
 MISC ChangeLog-2015 6768 SHA256 09751212cad7560fbec3888ddaaa6a9b2a12223cbaf0b02ed7043db36bd412fc SHA512 04fe6a2f805ffca73a117c55936c8a186765cdc60f5635a0e5bd2ff56a7bb269744e3e81ec15683dee0d6a0430e5ade042300fd9352f173d92e4c91223b365ec WHIRLPOOL c155f7cacb2c02f0e58e88497584043b01c9ca6b502e86ebc9642c34d55ad24610dda000e36ce66e8663718a2982fd8e78fe8d3997c59c2b8a6d1e8177fe1e03
 MISC metadata.xml 335 SHA256 cd07b450a91fad05d81c79343968a94d3d3419d5765979d6905ed6cd15d1434b SHA512 fe16c696e26755549539bce6b16f8370df11af5bf69c774a103ea608e99525e83a8e2b355efcff51a42f8296bc0146e66d4d4e49004e1a54dbbaba98dcdc867f WHIRLPOOL 11ead0861679bc2f692c1ee669dc823501320590f9e1a509b7aa350f73c2966a94a0c57029bae06f00d569b4c17259c504f586425a43a53695e24172556eb443
diff --git a/app-text/bibus/bibus-1.5.2-r3.ebuild b/app-text/bibus/bibus-1.5.2-r3.ebuild
index 712ed76b6310..b00c1bb65595 100644
--- a/app-text/bibus/bibus-1.5.2-r3.ebuild
+++ b/app-text/bibus/bibus-1.5.2-r3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 IUSE="mysql"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 1bd78564d3b6..655ada350b07 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,7 +1,7 @@
 DIST discount-2.1.8a.tar.bz2 85161 SHA256 c01502f4eedba8163dcd30c613ba5ee238a068f75291be127856261727e03526 SHA512 a1eba7076a27da56136b8057189c5474a36bf11f8233cbae270c8a0cf9b070332b4dcdbbbecfbfbe1d8c19961ccaf87cee27ebe855c6bc6558d8ccc423553c96 WHIRLPOOL 5d7148f6c4e9f84a5290fffafa417c4684517df6fce0deec773beb2f89b4416b7849aa50351c27338653b8950b68c3c49ba223d31e347ad7562b0cb040761114
 DIST discount-2.2.2.tar.bz2 89288 SHA256 ec7916731e3ef8516336333f8b7aa9e2af51e57c0017b1e03fa43f1ba6978f64 SHA512 67d882c0a334592230332815c543458b3c916a950bf7983f8a468fbc9f61154b4023d4bf451b76639fcb3a076506b48118f192a8e21f2535b3f49c7f081bbdf3 WHIRLPOOL 30ea10c83c54ffe43720486b8cec652d5f0ed60263904f9a8f902baa9feef7fdb4abab4ee69f0be12311c0631b53dfd8816d40cd43e755f31a2afa0eb46a3c87
 EBUILD discount-2.1.8a-r1.ebuild 2429 SHA256 615f0f325b6098ed931e1f96f6bcffcf666b6facd133b99b19ead8afef73c840 SHA512 065784f0effb3c1c24ba3b7897022480c956aa07a1288e047fb5e1a2fb51a347a7950f5ea09b4af2ef01222021297b4a8744fac70d07532651af978aebfe6118 WHIRLPOOL dfe3ea7f4047b9e0c6b12ec081ed3a97efc893cb8dfab4891ad792eded58ab4bcd79fcb8ab6fe8a20d3466cac1a86b836145e5c8860bda23f8f3614b53b0f0c3
-EBUILD discount-2.2.2.ebuild 1745 SHA256 73cfe60ccfb1b37407792188256cadbcc917b2ef1ed42b10c37e9dc170f8b50f SHA512 6bc80e256fd4d7ed70e4c525671ea2b65a746d356053f7b0d5e5ff33f43f9bdfbfe9a23ae843ef8096588c5895455d108c63d0d1f518cd7621c06c971d7ac4e7 WHIRLPOOL cd160268c82aa6cd43bb8927b9f0ce63f4026cd2472d72e6d173896b043d0f21f45778fd453b13fe85e6c4f79bfb93ae8b9a9470047b07c1c3c036ae48483be3
+EBUILD discount-2.2.2.ebuild 1790 SHA256 b956a185bcf230c43df4da2f735d34bdd607716c0da4d0bb8526ff3687e61b27 SHA512 a69861b85f1f2b30dfcbb08892ee4daa00fd4792536a9b90ff43e067d22f8f2716502d51e234e698eb09f4aa472bb68fb648083bfa1406abc29eba2f3239e989 WHIRLPOOL d72dcf9aeef73bd21a3cdbb3711f956310d47a7ccb6327211593f38cf56c665d7b90ebb387343fdc002a686406daa67cad0f0b6b84cbc4fe92cb0655a44c1228
 MISC ChangeLog 4437 SHA256 d5163ee5d70cd238e1d1f4660191c8bcacf611acd85cc7c979c9d2574e656362 SHA512 d86bf209c399934d4e61bb6301d13a9bc0479d2177e027683e793b59428312e3b0987e3ed51a2b30a6f2c0f770361481d17cad2919f7341534939a61b02e74ad WHIRLPOOL ef0c778f497f1b471fc6be02bef58b821a4164056b1be0be1283c521922c3c7be32cce4b000dc06fed5d9f8f9f85b72c3ec56ab354f3a157595fe772887df223
 MISC ChangeLog-2015 2472 SHA256 7e63434fb1e7db783a0d961204a17cfed6790b3dd940fd238fecb5aa966520b5 SHA512 1c296077c16676cedcf2db0e4de5d17204ef2c496fd1145084be1be3aef8b711fa2c48ca287f4e04a51b6b5b02304bc6cb0a69976b05a22e8ca9d4ffca2675f8 WHIRLPOOL ebee3ca9558584c36adb5a61f11a955fe993a540f8699addbd2260c2fc39f19202128c7f54e213f0988de735619439a91fb05804f365ddd00c9d597c20ac2e0d
 MISC metadata.xml 366 SHA256 c99a065110021175e05522d5512f0dbbd68597796c4ec69689cf454acb6b35ab SHA512 39d05813a4efdcd14d0f5932efc63c25ae22b83088cb1bf020863e8ab9bdb348bcbd48901a2dff3c1184dc1483ae3868d2b4a2fd942dda91150944008773db3f WHIRLPOOL e7c7f81de4d006693fe9039cbd2b4aafb72336dd19cde6fe49acd5cff16d5484825f4d605f4b823e1b541b7f50fb4fa91603aa7563443482b87c21a3584b8184
diff --git a/app-text/discount/discount-2.2.2.ebuild b/app-text/discount/discount-2.2.2.ebuild
index a16f7b4e4025..bb4f809a591c 100644
--- a/app-text/discount/discount-2.2.2.ebuild
+++ b/app-text/discount/discount-2.2.2.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=6
 
+inherit toolchain-funcs
+
 DESCRIPTION="A Markdown-to HTML translator written in C"
 HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
 SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
@@ -46,6 +48,7 @@ src_configure() {
 		--debian-glitch
 	)
 	einfo "Running ${configure_call[@]}"
+	CC="$(tc-getCC)" \
 	"${configure_call[@]}" || die
 }
 
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 6fd393c378ac..0036c55c8417 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -2,7 +2,7 @@ AUX djvu-3.5.24-gcc46.patch 859 SHA256 c13e57ca5bbe87c57d74643cfe35ff6eeb823e575
 DIST djvulibre-3.5.25.3.tar.gz 2543949 SHA256 898d7ed6dd2fa311a521baa95407a91b20a872d80c45e8245442d64f142cb1e0 SHA512 0e38f56d77915ee6707dd19a36a8ca9167608c39449a5c73de9cd784d712852c07c068b79a794e25f6d3ded0f927d083413dde197c9fc8f7b68c03cffe68035b WHIRLPOOL 43ce341be7dd6322f7bf05ed541e9eb6b8b923d95893bb8f8b78761ae452384e39c39e23723b4d0fc7fe8e95301dc414ac9c2d74a169a6ae12b86e5968f1edc3
 DIST djvulibre-3.5.27.tar.gz 3648522 SHA256 e69668252565603875fb88500cde02bf93d12d48a3884e472696c896e81f505f SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee WHIRLPOOL 7caff93eeaaaccb393c03013b62220cfc1b1a50e4d6da4a107ae0267fed1f5f9e6d3ad2b61845be5192b67917ec064a2c21c0f4ad567d4b0d6f56168ae4593bc
 EBUILD djvu-3.5.25.3.ebuild 1769 SHA256 74bdbbbfdb83702f9d9c50b982777c6595b5907111d3dafd9f05501e556717d6 SHA512 51e5ed5fb1c2f3deff3e989c5bbabeb43177ac7ba0174f5ecc6916bb1734d88fcc6f6a9585183a30688ee70dae214c27b047b9f762e9b9eaafc3b5f77af86d53 WHIRLPOOL 8bfc83c75eeb2c0d828ac775d522c563e7e66e80bf11f3dc6842635ec078f05e093158bdcd934fc2785d2d5574a376187703f0dac1e514d4a300858bb65bab1c
-EBUILD djvu-3.5.27.ebuild 1467 SHA256 ad22a204b85f5f5ef25cd2a68fdf7873673ae03daac37966909338fac282075f SHA512 6c244b2ee9107d061d0f8abd74efc606551196b479c1a527db6bfe232fae3843112e3ed2fa29e8eba85ab54bcfde4dcc50a98cec4e6fd8ce729764adff3e84f2 WHIRLPOOL 2527af8d44848dd751f90a581672eae13aa870dfbd218604d1fe583d70dee84a76ab8bf24c6180dd4368277b41d97c7a4c528365634aaaf311faa666cd4bfdef
+EBUILD djvu-3.5.27.ebuild 1465 SHA256 dc3ab26c9ac2337ec7619e1f697a9be07ff0eec62ecb0b947733c1d6db6c4d00 SHA512 0d64086380727997383fa367f56b9e0d911baaad4506d8e5e01073e28d2bd856e876fad5027e1234ec31bf8e6c5baba3d609e658bcba6a63616b212e18a2a53a WHIRLPOOL c3bf8ab63f5cf4c3b3574a518cf9ea2bee9cb71731bc3032b9fa92221ab4458357f323bce49e15424f158c6d6579a6edbf0653ef07f18986d544ecd2a10c44f5
 MISC ChangeLog 2697 SHA256 3ebcc8d9f9877e3a024cda8dc6019f96cfca7bf2957e48c5b76844a3e93e5f50 SHA512 abd6829a18b99296f8c5a80fe95ed69978ac786b69bcd888b008d454f661e7335ce7895d6f70e4e5886e76a6654e0122703933deca2894fe471a96741f3be826 WHIRLPOOL db04442f5ba2ddb49d024716e3d7d14aeecdf3c41c28446c5df1e5b2e44c69e5f79ab31b2b68f00e65d8d6ec950b406a655faad1757bf5f70c222d60dcde3195
 MISC ChangeLog-2015 19330 SHA256 31c029f70ed8223ca5c5be0260751729a69f6182668b7d050156f565db4358a7 SHA512 e8297dd91742f743281c4731fad3ef41b128fb88bfcabbf29e567051bc8e1e3ae643a908ef94fbeb015f2b19e4af113c93fbe7913e19d1c53efae23b6fd8d1bb WHIRLPOOL 165ef2401a0e602607a30d8b3c15154c89e0e450172d09731d23bfdb4909779be424cdc93db556fc718733fd39f2a0885a223c39da6ed4a6ae5f96fc19513817
 MISC metadata.xml 948 SHA256 9c5cad18c654bf32ac6e4f8fbac22e67318ed3400c2ca4acd11053c0cf160b40 SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42 WHIRLPOOL 2198d5d107ab6a0aa44d64408a8d0fc8202e187c018cf497a306f67320eda7a90b4a102404081491a1468b5c2d4067abfd1616df4eb41080853107daf80f80de
diff --git a/app-text/djvu/djvu-3.5.27.ebuild b/app-text/djvu/djvu-3.5.27.ebuild
index e77303c6ddd1..ab44200ff0f2 100644
--- a/app-text/djvu/djvu-3.5.27.ebuild
+++ b/app-text/djvu/djvu-3.5.27.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/djvu/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug doc jpeg tiff xml"
 
 RDEPEND="jpeg? ( virtual/jpeg:0 )
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 961c6a6be079..e1bd3957ba84 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -2,7 +2,7 @@ DIST dos2unix-7.3.4.tar.gz 640991 SHA256 8ccda7bbc5a2f903dafd95900abb5bf5e77a769
 DIST dos2unix-7.3.5.tar.gz 662133 SHA256 a72caa2fb5cb739403315472fe522eda41aabab2a02ad6f5589639330af262e5 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58 WHIRLPOOL e1cda793c7e9a2b0f0000c61f5c4b9a48db37d41020af14e253b838768e81b0e94ea7a0666be712f79f89b05e5a6f72a1bf8516a01822f5da39062cc0bedf01f
 DIST dos2unix-7.4.0.tar.gz 710339 SHA256 bac765abdbd95cdd87a71989d4382c32cf3cbfeee2153f0086cb9cf18261048a SHA512 41be6b0c747f4a8e316eccecd468c8250aa6791962485569eb9496def60818ae434d619b5cfb5f80f15f8d17800314f5aefe229dc5d37faaa34e1270575175e9 WHIRLPOOL 89f093ff96aadbe64f5fb448d2be337464a0059cee3009cd513dbd0315b486c012efe53273467774dc9f884dfe5b1a4ee65903b94c2c5dd8c062ed3e41eed94a
 EBUILD dos2unix-7.3.4.ebuild 2026 SHA256 2740f83a639d0e3de27e615e429dbbd9bc61a6ba67addcea2ff5514f9d288e71 SHA512 5e251e9ff961e07e91fef0c462d32f4e3b0ad7b7cfbb38a35b11c9a784b79256a4a4073a55adc4e96ff67fc896f85f2d007662cef8cfb09061709a02ddb4d760 WHIRLPOOL 3a6302216ca7ffc009902dae8475991151f0dcb9f8a38b7b46deb2a05b54eb6fc0388021130f911a2af5c36006631bbbfa4ace248a5614319da0cf2b3c77c923
-EBUILD dos2unix-7.3.5.ebuild 2039 SHA256 3371b893e1de59b1dbd63793ae157375256b2277e97dcd9d4c4a723da16df76e SHA512 c2a358843659b69e1c32164da741b8fb4229cb603d4928a193940df201321767d00e0cfe084d69a2c2d34c3b13c975be083ec5f90cbc27b53332234c94a6056d WHIRLPOOL 517e7708852bb2b65a662a03a4b90d93efa9f619aff82218d96af01d49b0c46a6a8250dd8ba90e66ba2002d6c4fc75c1b1022d4d2f1a3bba937efe2ca234fec6
+EBUILD dos2unix-7.3.5.ebuild 2038 SHA256 ab86ad639db2298ba269fa004604c3a4639b50af774d74efdbb6c1945c637e20 SHA512 70aac16e854bd20d886dea1bf6b7d935e27540cb23a4088b953f67864a2bf50e6b522fe4e07ab6ebaaa0a047b43fa26827a3040fefc801f72900bbdb8fdd8531 WHIRLPOOL 1694611b55db83be7061894919ec7826592565f16b796961c56cec26dfef5f085a5eedb256eedaa693eae76a35e0ea8dfd3901a5588d4c8b8fcc3c9c7f032253
 EBUILD dos2unix-7.4.0.ebuild 2046 SHA256 c619db5f4357058ed36ddc65f95fc97996c4a5886863211c4dbc488d245a393c SHA512 27fc2bd3e3e43512d4ab571ca5ddfb4f6ba8e0940eb8bd65c9d90f0c602822334f5789f3a2101311006fb614708ca32396ae8c3d24b8b313aa9248c8cd76d350 WHIRLPOOL a56b643af417670b4eff43acbd543dd688e1f2dac13f46f673d54f45529900456191815a5fea34690ec73396b40adf1aed94e9e6104bf5754855ef9173fa7c67
 MISC ChangeLog 7196 SHA256 4a2c232190d6729640540918b5be7b533c2edaaa445f850cc6a47b9c3a59f04a SHA512 66da70a04731f3bd299bc577885b31e3c278016b38b1f5228394a384f960c49a0c3e97154ec82ef1489c9a9fce195077254240e458f649037e6859b0c060fe50 WHIRLPOOL 48484b065ae3a96f6c15a454e701ce60cac060d2a1e1466afc29d18544ca2f9d2d5cddb60820b6d8f400c568d1a2386febc868662587b5ddf6c9996ec7adf5d3
 MISC ChangeLog-2015 19680 SHA256 99b0f5f0d9a2a0ae8117f683cd295d8a8c5b0cfc2208325fc96cdb7c6ad416db SHA512 6921c2763ca5d07eba46899fc0ba3869042972fc9d60e85c835eb50d08b56ebc6a176a64d1e808802b1afe5ea7b6c2ad74f773fc50e55fbd83ee224c317a003e WHIRLPOOL f9e49b2959b16982e507cd9b67e24d9d5fd535d1b61676f1621a012ec2c15541a5382ab54aedd635669c13be995ce008d77dc52e0110c168da42a6d407465cf5
diff --git a/app-text/dos2unix/dos2unix-7.3.5.ebuild b/app-text/dos2unix/dos2unix-7.3.5.ebuild
index d6307cab1895..1f097e87f841 100644
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 383fe91d121a..74bf06ebb12e 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,8 +1,8 @@
 AUX 3.22.1-CVE-2017-1000083.patch 5157 SHA256 7e755824da994a0d9b82f85733ac20c17a881fa98d9e5165368387b2f9e279fd SHA512 f7bf0a0015191d4994d7e6a40a8a3bc4b8b2ec18ad04ca8fc46cca455709955d9f13d7ab2a0f419faca55a85064c4fe9c9f57ac4d9683f0c3fb61331996eb921 WHIRLPOOL 3261868e9c82009dad0aadd52c535a38dcb86b7071a27c352614d8eab93d68aa69a0a11d1d42a9b26193e82f102698590e487b55444fc3a0d72f83b8c9850082
 DIST evince-3.22.1.tar.xz 3365004 SHA256 f3d439db3b5a5745d26175d615a71dffa1535235b1e3aa0b85d397ea33ab231c SHA512 c36a90bf98f25b4f9f05536f1a09c38be30b814529e17a4ab159ba7c1e952402a211f335d4cdf1928ace8a5b46d6d019fbbd457ce11c2ffa264d8bb7c32d5a18 WHIRLPOOL 7b646bab40f9c05b7689de70b1de2e313b0576a772887187d71b51b00c456251169b7e5bb85f44f443a0dcce5199a405dc303c49a4be3d62c244225493c58749
-DIST evince-3.24.1.tar.xz 3511576 SHA256 9ca0c5213407b37be55fddb04a85d9301b692c4412c5920319d975403bff0f37 SHA512 205c1c9b68c9215bdcebf0c36841a35898e056ef8e56208db62c1fac04c4efad8fbc0800f410e3c94c526536adba5e8ead68bebec8f81061a3831789c5173726 WHIRLPOOL de0074c42ec8614a7ef34848de6768a722a855f3113fdad7392993a913f707f6e4fc55f86cbab945b41bc84ba92d79c82e2bc0b680a99702681b4d775706e3c6
+DIST evince-3.24.2.tar.xz 3509216 SHA256 6b89c3c76e32f71e56d3e2478a6c1a84438d2f3fd79c2c335d4346c1785a43d9 SHA512 77e099ff60188f982a49f5c8287eb2ed8d42402a15a54ccf8367b3814e7e16ba31354363d3f101117153792daa96f653f24bb06193b5e749d0ebfaac7d7c1e0f WHIRLPOOL a4cf7933be3da2a2c53e22a1b017f4872b77d1ac0a64ecdafab2548bd43753d7083659c2d76bd84fe86676547bde9afbfb4e1a7459b13f9cf6845635d83bef66
 EBUILD evince-3.22.1-r1.ebuild 2874 SHA256 0832fb9f4f4095f23763a6c9b6f419c12d29768ad4e42365d911f81a1ce94012 SHA512 0b41b16686f158123aebc9cd939186524c6c0c84bb2e8dd043620538f2d283ebdf98fcdedadb713adc8f969403bf29b42b0c4854ad7ee043ac68e721d6aab075 WHIRLPOOL a838857c14986adef4f0671a6ac60560a1d98daf8a49c82195b1b09d47f38e6d9809b875cee1d3c185bb75269b7dbf3b1d133f0a52bdb5e84245e1cf9a38c3da
-EBUILD evince-3.24.1.ebuild 2819 SHA256 af3cebcf6c6ded6a839280df54f92a2106d9183fd13b5f1028d8eecc31b735b1 SHA512 7aebe03d4e66ee9a686c08ac8f0c3c0e9205a3cc35e3334fc463eaa4112b01a817558c2760a25f57371685e0e6fc3e9f7bbc57003f1879c5a43eeda3ad7a94f2 WHIRLPOOL 48b96ace9dd75c62fe41f88d5fb5f2a8ca18ca9185c47939156622cbc943150c03a52c1241ab75410a78bb1df721f4661ce830a97b43fd4b8273b09f0628deac
+EBUILD evince-3.24.2.ebuild 2819 SHA256 af3cebcf6c6ded6a839280df54f92a2106d9183fd13b5f1028d8eecc31b735b1 SHA512 7aebe03d4e66ee9a686c08ac8f0c3c0e9205a3cc35e3334fc463eaa4112b01a817558c2760a25f57371685e0e6fc3e9f7bbc57003f1879c5a43eeda3ad7a94f2 WHIRLPOOL 48b96ace9dd75c62fe41f88d5fb5f2a8ca18ca9185c47939156622cbc943150c03a52c1241ab75410a78bb1df721f4661ce830a97b43fd4b8273b09f0628deac
 MISC ChangeLog 5311 SHA256 e1308727ba2c885331119d8bc2e280c78edb8ca853493bd9e8c575f647c7bc1c SHA512 d58d5bafd59b1f3c04d4781edb6c0509a1583dd53f8ef5ea020c1042b63e2be0d7d5d7ce037833a31d82fa7e13394991bc1643751ac0250f1e07c2cd49992290 WHIRLPOOL c6b16268ac6c374eb945800e66709691205c8255a4914ef4114e547d35eb648ac6e43a86d5a117018c076789cb3f3a201930d9036a6b9b147a2c7a742a6a620e
 MISC ChangeLog-2015 44981 SHA256 e8ed4f19d188781c6eb9321bbcea98648fbc3800a6d2e18167adfec313c7e589 SHA512 eb0b055150f34498fdf1a951195e4571ac79b4a43c99f4f5aa86c66a55a5db42335e29712e4bfb7f1e6cd89a98bf49bb4de7709a7c75812826f03f7194016ed9 WHIRLPOOL 4eccd6bf9e9293a82e01c3d45a40fa097556cf1cd18c7d04f7483a2a1c37d79e1823904b12ff54d9f0eec4065af099036d17b35c7e1c4c8eb7622a48f9ef0107
 MISC metadata.xml 612 SHA256 9dcf1b7b52be95787c7208d719f965fbcb88ec5b40d50e4a994dfff9af9dcbb4 SHA512 a9ce7d786d979e14c852b0fe3f722b346dce2f1f52b8f9ab272a1f2291ce88adba78c5d347e3e33a3bb0a58f46d77d20febc92516a4c12bc9f987cccd7aa977c WHIRLPOOL c766224427b16bdc43a415c9753fa9a4dc55b2d8ac5f745003a1bbc175a3f13e85be7731800b55fe84340cc752124c7361b39e8ca032ca075b8c6d6d0948e526
diff --git a/app-text/evince/evince-3.24.1.ebuild b/app-text/evince/evince-3.24.2.ebuild
index 28ce5a2f8a0d..28ce5a2f8a0d 100644
--- a/app-text/evince/evince-3.24.1.ebuild
+++ b/app-text/evince/evince-3.24.2.ebuild
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index a5d2cd06b66a..52d01851329c 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -4,7 +4,7 @@ DIST html-xml-utils-7.1.tar.gz 319559 SHA256 ec0efd2263b864bb7e0ae5c59f02c43c5d8
 EBUILD html-xml-utils-6.9-r1.ebuild 534 SHA256 97a6edec295d0d2e1925760b9f2946b29f6ab00d70405afa54bd99f030042ec6 SHA512 39cc174c62a8c96d16d00987ac39c4160b4c12804c4ddb0d21cc2bb49ddb5226c12c196416f7f9a0700667ab83f6a471a76b3dab95685f667aebae5add450cc0 WHIRLPOOL 44e518fa5c75c1514fd59360f87f7eb5d43f1835c70518365c59c2e8f88735ae87db5ff7472aa711d888dffc208f88543812407626bd8da9834d87fcd9a45ded
 EBUILD html-xml-utils-6.9.ebuild 521 SHA256 92b742074a280127ce69f1fb9112e2e9eae1922ae0ec6a714ae20b16b85af670 SHA512 624d91296ebae1488e978eef8c477da23d096a08ebb16a60c92d2862bbe09f0a80694a635870801c00e6e59cfe2f3c601eaac232e2ce76539d89149020f22d15 WHIRLPOOL 9f6949a8399f1123b70c2628c19654c507a457df5138aa5152f17dfa212a7019473cbd2a09a4f05219b164a4d3facc17a6c95771770076b88dca5bc68906d4ed
 EBUILD html-xml-utils-7.0.ebuild 715 SHA256 bccf4e0e923373c1d8f59e81ed3258a1b6f2b4417cea6878a1d0ad89233164ca SHA512 76c019ff9e14c846de543bff0720cec0302c358fc3987829a9aaf049c29d571436a1c31ccfd1f65d54315d9d0dab24856258964fc910e291ef9c8e59b754a2ea WHIRLPOOL 9f299c6ec0b18bad8e0ffa7366dc4f2268f58e283279bf550af42c6dd4215048c3d48ea8dd129fe6870edce039876db717efd338de0abdfaffcb39fcf672872a
-EBUILD html-xml-utils-7.1.ebuild 724 SHA256 4be6ca2f970ff00118c96a8b2037c0a13054881a60c516ba6f05c4ea389ea82b SHA512 7ceedb6d8ce7288edf2582f37af8e6bf4d48421dcb740578c8666fadd0b4dd0dfbc1f3ab1e340c5bbb4825549fb87ecae7feb09672ab60f7acbd805e3242d15a WHIRLPOOL c2e53752b63c85ddfc31e1b4cff7fe8094e02d2c689f15183be77518deda9e0ca55f98732c3cd4b7f9e75015d3202a24c54b7217b3563dec27da0ebcadf56429
+EBUILD html-xml-utils-7.1.ebuild 721 SHA256 d1a5f2a6d5e43d6d27a9c601dd54778b30231e25aff2e0b7fd6a7f98e2cb6ce6 SHA512 079501e0517bb3bb3e17254f1c62894aa6c0b3caf56709cd83812d391166e9372b983202cdc2a94980173fbab332be9cca8088d519e9b856c50b02e8152f059c WHIRLPOOL 32ec674c2ba21d9544f904ac770b1c04f36c56ee09146da10a7a7378cf4f19fab9983053a43b0af33153e32d2a6a2f13efc88d60becc2f4d809b8657e4284a4a
 MISC ChangeLog 3512 SHA256 816925977485274a4192d5eef75ef7365a28dd7bb18c254dcd67533eb907df2a SHA512 f5324420ac84e6e09b764662dfa1e1e7e66510bbec71840406568584987753468dc772bc1a8c3c58653fc3aa33dd8742f4efa2a0e737b876542eb1e312457149 WHIRLPOOL d28a3a06a12a325acabb059a22252ff6b81400bbe33a8acce194d9bd6092ead3484fa580b769fe1bdcf94c146d723a03c68d602626d9b35c601203e0aa9b3615
 MISC ChangeLog-2015 7768 SHA256 8dabacae0f327d94ac8db165bf67a7ac53096ecad39fd5e9d1eed30828dcd37c SHA512 f93490f9ad442c71e7cdde74e90557f23822b4b4e97d6dbf1ca5a97c8fbc0f2f17935fe7a0985c93b2c556d3d07ee7fdebf480068b8e16c630d334610a6301cd WHIRLPOOL eef546a4b7b9416b21edd65d41980877047b442c8a904a7e2a17f517733f30865b4563b89e0bd38acd4add6c2e57209fd602702f63ce18c314df60ab8af85e07
 MISC metadata.xml 220 SHA256 998ce4afb847c8594ee92e054f8a06ae3de375d38b2e400eebab911ebbad60a8 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc WHIRLPOOL 23c78e4c05afc8a04239236928ca26e539b0a969f44389b90a34fef3f4a57f18d9db2838d3df439c482cd4b89ce8b959dde5e83500c44ebd2af453629ef79a3d
diff --git a/app-text/html-xml-utils/html-xml-utils-7.1.ebuild b/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
index 080b0bdc12c5..38e21f4c0f04 100644
--- a/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-7.1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos"
 
 RESTRICT="test"
 
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 9c77bb021a6a..687408edef80 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,4 +1,4 @@
 DIST lesspipe-1.83.tar.gz 115129 SHA256 d616f0d51852e60fb0d0801eec9c31b10e0acc6fdfdc62ec46ef7bfd60ce675e SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d WHIRLPOOL 4ff4baac25c768a4177d71a82f766b326cff6840e0032d6b9125506de38ff20264b71c765cb08777adda9e9f24e18e33e452667be8e7a94f7fef062f1d6f019f
-EBUILD lesspipe-1.83.ebuild 1161 SHA256 9ade675aaa4337be94dc34bc8af9cca8124a8fbbb0724d31837e710489627cd5 SHA512 0e14c9d4744af386c1f575874fcb0fbc12d405456c210b55240032f330f6626953c1ea7a361f24a154a377e6bf9837fb04cb3367d3bdd655ae5d3b377b4679e4 WHIRLPOOL c3114b8c528dec3604c20af95934ac8d1b7f3baede2efc359195900d3b11d2bd666738b0ddb15bca84f80b87cecb5d2d839e4e99cf325d84dc2e101beaee0d14
+EBUILD lesspipe-1.83.ebuild 1160 SHA256 b51d8cdb3a12a8c1c51613a9b852d356289b1083c63c5d3fbaf1640f5b70971f SHA512 dd378d2a7c307564ba93995327a14f9d89fcf02fcb0b586a056bde0f852170449ba616fc2d7c5d3a5543420a9120bc449dd8687c018eac35e6d1aa840bca59df WHIRLPOOL ad571a67781cdc6d95feb586d44ca693d2d2c4d908178ff8311d635b96d7b967bc27718b9e27b3c346f2ad08cb9b1f5775db5954bb898898083f97bfcfa09f42
 MISC ChangeLog 379 SHA256 5b9744ac3446c67febdbf8f9f71388d6c5cb8c7aa4bc27da4474939b3724a8ba SHA512 8f4ea82e6b15ca4289f2efbe6c0d1329dc0cd208a566c07ffaf2b97547b4d1d65fc6d5f5b8efef3d102732964d764c494a883ca4c334c31c7fb7cf2d79c3d166 WHIRLPOOL 60229df4aa2e3561b37347d08959d266f9582624e92943a1da56c30eede83edead639bd5b60a53fea3c1615bfc4ce458e623d9f1a2eaa5dbefa54c91ee4047c8
 MISC metadata.xml 303 SHA256 de8626350ef7a3645b1c23c4d372e6757a1828e6e8d53ffa2e7b5046ddc95735 SHA512 efdd1963073db285de7f83ff804fdc98876846cb011fa0c8aa65f9b3c1dd6b7cdb039ca6a7a03018edfdff930f817208bb29601bb0c5571fc16d637615e0c7b7 WHIRLPOOL 9ad464bec6ae95b2f2dc5f675dace1a5bcec9bd8a59b1b5ecf0d73c9b26f23583531bbe5ce0f28e59c152928ae4fb7db1afd819d7fffb3b940945cc0447c6354
diff --git a/app-text/lesspipe/lesspipe-1.83.ebuild b/app-text/lesspipe/lesspipe-1.83.ebuild
index a3dc8e985281..228307252d38 100644
--- a/app-text/lesspipe/lesspipe-1.83.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
new file mode 100644
index 000000000000..116f874288a8
--- /dev/null
+++ b/app-text/libepubgen/Manifest
@@ -0,0 +1,3 @@
+DIST libepubgen-0.0.1.tar.xz 295780 SHA256 6e221ea10933bf6a80525e134c51e1adb6cdd67184c368fcdcb73ce8dbffeac7 SHA512 9add9c873ea0ad1b04fcfdfb987c7974b20f7e0c6c6b5a65b6ce5105a85318307fb9871ab60e998da649da378038f6df3722001940d00a7bc88af6dc87bd8945 WHIRLPOOL e90a196de03160f866bf0270e1a9b9a38fb9e8f2b03020dd1dace24fc8c324105a997b847e3285ec99e4ce77497b58e150dcc0c72b157ee40c5bae2d4dfe446d
+EBUILD libepubgen-0.0.1.ebuild 670 SHA256 ea892725b9113c46a33a4754ae5e5b4ce110d35f297e82d4e713ffd4f9c5e2a4 SHA512 c2f47d84b0901c002550df5e2cf8c2409c5e164898022b45be04bfceda549513e2bb72d6733ec0679406ee1c8593dc304b434ab88666cb922cbe0144a17afd49 WHIRLPOOL 0339a52c14cbfe5c0e6c2568dd09d9fd01521a35fd2083098fa52f19df1bb63c8ce9bd859b708b68385644bdbbd389a7a0a61ac664b4dc21e30b6f2a66218969
+MISC metadata.xml 255 SHA256 34d028c790cfe86c47c5c3dcf8655fcefc3e23ff52fed38a400ce42d678c8c5e SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3 WHIRLPOOL 87f7199996948fe95e5417f8da0c4c90cd51a68f246ac8ae87a2e2a31c11c709f220d664eb893b34692577415e5f5eb351dd7e310dbc59f508fa40c7edb8ceeb
diff --git a/app-text/libepubgen/libepubgen-0.0.1.ebuild b/app-text/libepubgen/libepubgen-0.0.1.ebuild
new file mode 100644
index 000000000000..508558384209
--- /dev/null
+++ b/app-text/libepubgen/libepubgen-0.0.1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="EPUB generator for librevenge"
+HOMEPAGE="https://sourceforge.net/projects/libepubgen/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test"
+
+RDEPEND="
+	dev-libs/librevenge
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-weffc \
+		--disable-werror \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable test tests)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libepubgen/metadata.xml b/app-text/libepubgen/metadata.xml
new file mode 100644
index 000000000000..13ce236ee519
--- /dev/null
+++ b/app-text/libepubgen/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
new file mode 100644
index 000000000000..e0525b6fd9a5
--- /dev/null
+++ b/app-text/libqxp/Manifest
@@ -0,0 +1,3 @@
+DIST libqxp-0.0.0.tar.xz 337292 SHA256 0dd32afbf1c889debc28848b260c1bdc0eba5f57504476b787e164f7c59776d5 SHA512 c92cb6298ea4643e29145732ff3b6df806f2d30c86ab4967e445dcbc8c43b6d9fdd17c30a3e6131b4f0f2a42135caa0137b61aac2ab2722528a08e1fd6c02df9 WHIRLPOOL b24aa8205ab11792f189dc1862f54afafe2b7fbbbd45487ec5a212afa3946de5f1372af59ff0c05332d7b77763b112ae95de017b24d472221015655d719e7093
+EBUILD libqxp-0.0.0.ebuild 729 SHA256 c7a113db28355aa36057a83f586a3211335e5fa6c7b6ae7ae52abc45cbae9461 SHA512 d53e5c523bbc5fd08f428fe65a6a6b099588a5cff60399bee9718378e82038a0b167cbb084ae097faf373a50f6ffffe4bb73015a9002b00dab01f18054c67ac5 WHIRLPOOL 5e954bd037dbb39425c59046b6445a3c755402cf295e30cb2ee023c7b9677c8e5babbaec6a0d687ae8a0630083b987311c21cd77808f8f7c5b25e3eda75035c9
+MISC metadata.xml 326 SHA256 e53dbbf9375deb78071db86cffa24f588589f357c40afcc8dc5d08dbbdc40d17 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e WHIRLPOOL aa63df9c272272f7875927027aeae84e218fd637349102c365325b3ee7714ff52f031ca4752a065d781451d3e3cea6d293f5d1118729900c67383028ecf4db99
diff --git a/app-text/libqxp/libqxp-0.0.0.ebuild b/app-text/libqxp/libqxp-0.0.0.ebuild
new file mode 100644
index 000000000000..f38c8f335ab0
--- /dev/null
+++ b/app-text/libqxp/libqxp-0.0.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library parsing QuarkXpress documents"
+HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/${PN}"
+SRC_URI="https://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc test tools"
+
+RDEPEND="
+	dev-libs/librevenge
+	dev-libs/icu:=
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+src_configure() {
+	econf \
+		--disable-weffc \
+		$(use_enable debug) \
+		$(use_with doc docs) \
+		$(use_enable test tests) \
+		$(use_enable tools)
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/app-text/libqxp/metadata.xml b/app-text/libqxp/metadata.xml
new file mode 100644
index 000000000000..e99ec98e14f8
--- /dev/null
+++ b/app-text/libqxp/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>office@gentoo.org</email>
+		<name>Gentoo Office project</name>
+	</maintainer>
+	<use>
+		<flag name="tools">Build file conversion tools</flag>
+	</use>
+</pkgmetadata>
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
new file mode 100644
index 000000000000..162d3ecb85ba
--- /dev/null
+++ b/app-text/master-pdf-editor/Manifest
@@ -0,0 +1,3 @@
+DIST master-pdf-editor-4.3.61_qt5.amd64.tar.gz 14950654 SHA256 d54ea747dc17bc5fb3020495688be529d4c8c7314b7703d171d71bc82cead5bc SHA512 0c416df191a2796fdafa6014c258166d47037039fcc9205398138a46d59b1f771d9ffe38eb16f22f4300c3e965435300037d7413a86efb997395e6e974baecb5 WHIRLPOOL 5a40bf8589abcfb9681a920cca686f160f482d330c1086a3af6bf8ce11678ff3cc362ebdb60b8e0c4bb36852d378e70ae0aa017c859689580300408def39b706
+EBUILD master-pdf-editor-4.3.61.ebuild 1629 SHA256 b91613a4767e176f57e43e0ae5e7abf9621b57fafbbb150219d66beae2d6265f SHA512 8c5ac33caf8c69d9a606da47152c84aae104d4b566653003c5e437e5f018a09201a65ffd954f779404bd51cbdce43591e73a6a56867ff1eb3cd1ce6546aa2a9a WHIRLPOOL 5cc9ccf367d6a5f48b10b7745a690ddf4892103470bf710d27478890195ae2b2f9feebc98f73e6e840cf138998c4b1b9d7ea2e249f6ccf36a08395556e706c1f
+MISC metadata.xml 367 SHA256 925278b2cadffc19f6deafd8f637158b911860f1c318b58a940eb8960fd28e5e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156 WHIRLPOOL 22c401ff9d910104e0ac66cf5d90fd49ac3cef030bfe222b13cace3e3bd604ecf75cd3d92c3bf3d26056c5755608c1ce69c4f2d0334028066c01f359222bdc2c
diff --git a/app-text/master-pdf-editor/master-pdf-editor-4.3.61.ebuild b/app-text/master-pdf-editor/master-pdf-editor-4.3.61.ebuild
new file mode 100644
index 000000000000..7f5e919d6361
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-4.3.61.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils eutils versionator
+
+DESCRIPTION="Master PDF Editor is a complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+
+SRC_URI="http://get.code-industry.net/public/${P}_qt5.amd64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	dev-libs/double-conversion
+	dev-libs/glib
+	dev-libs/icu
+	dev-libs/openssl
+	media-gfx/graphite2
+	media-gfx/sane-backends
+	media-libs/freetype
+	media-libs/harfbuzz
+	media-libs/libjpeg-turbo
+	media-libs/libpng
+	media-libs/tiff
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libxcb
+	x11-libs/libXdmcp
+	x11-libs/libXext
+	>=dev-qt/qtsvg-5.4:5
+	>=dev-qt/qtnetwork-5.4:5
+	>=dev-qt/qtgui-5.4:5
+	>=dev-qt/qtprintsupport-5.4:5
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+S="${WORKDIR}/${PN}-$(get_major_version ${PV})"
+
+src_install() {
+	local dest=/opt/${PN}
+	local bin_name=masterpdfeditor4
+
+	insinto ${dest}
+	doins -r fonts lang stamps templates ${bin_name}.png
+
+	exeinto ${dest}
+	doexe ${bin_name}
+
+	dosym ${dest}/${bin_name} /opt/bin/${bin_name}
+	make_desktop_entry ${bin_name} \
+		"Master PDF Editor ${PV}" ${dest}/${bin_name}.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
+
+pkg_postinst() {
+	sed -i -e \
+		'/^Exec=/s/masterpdfeditor4/masterpdfeditor4 %f/' \
+		/usr/share/applications/masterpdfeditor4-${PN}.desktop || die
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/master-pdf-editor/metadata.xml b/app-text/master-pdf-editor/metadata.xml
new file mode 100644
index 000000000000..82340dc648a0
--- /dev/null
+++ b/app-text/master-pdf-editor/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>joaompssantos@gmail.com</email>
+		<name>Joao Santos</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index 61cf0ae04c03..22949cb347c3 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -2,7 +2,7 @@ AUX opensp-1.5-gcc34.patch 263 SHA256 679aa70752d48a6bd0d2ff32c8e4c7153f2ce6e50a
 AUX opensp-1.5.2-fix-segfault.patch 747 SHA256 d60915133b0d00ccd5453864af4e389e50825071f70bb2c7f88e53d9fd81246b SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf WHIRLPOOL e4028a8980d17dcc303166147cfcf24d21aaed79db70ebed45c259e94928f77042046da60e5e18f34c638d2635958e3e0ee04fd89317a495f1460ad728203c17
 DIST OpenSP-1.5.2.tar.gz 1521390 SHA256 57f4898498a368918b0d49c826aa434bb5b703d2c3b169beb348016ab25617ce SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e WHIRLPOOL 9565425b87d0f68025a2058e8941c5c64519cdb1ab3f22aeec6968473989f39b805dbfa8ca8c74f3968358fac2144756cf50aeab8e6c9ce8112610bd445d5ce2
 EBUILD opensp-1.5.2-r3.ebuild 1917 SHA256 de2b546d7d060b4a3f98f88f770b1aa3c187874de3832bdf695afbe78358ef54 SHA512 4f7e27bfbdaa0987c3e87fac99082732a1f741ced6404cd0282b489a56b4164f8e8f4688644b55c25da5f31472e043557a119658658590f16f15822f078ed213 WHIRLPOOL 3431c7242b2d80ecc63c2b228c6c11d3793e9eeff95d933f3e3341b604e02c1f2e3fb19fed265cff60c1c645e6f1e2ab535508729ec0776116b6e4d1c97c09c7
-EBUILD opensp-1.5.2-r4.ebuild 1981 SHA256 c2b5062ced9d601e5cff305f15475e4307ba881d7f3ef1ef03158898ec9efb24 SHA512 4520d96aaf2bcc86ecdcfb22dcb959f9fa5709584f1484a3939fc2bc9bba93c1bf51839635e50dd00d25676bb0f3b92b6b784df54e4150f311055a9afd670b5e WHIRLPOOL a16e6dfc7b0f4580adc06ced37034795aef1c25612dc9dad076e6597f27dc3ed308546516b12ae3e58bf4628690056a3150b99297f04e21609e3ac5190cd4447
+EBUILD opensp-1.5.2-r6.ebuild 1956 SHA256 5fcb5db5298b673078ed1bf084122a523a5421a280547f6fd70af7a9cd82854c SHA512 c0305b0aad809dfbeef279c93cfe6366b7989a43c636203f37bb9dd863017c9cf5197baea5a3836bd7913ea2d58cae329f6423623940e44d0b7a399e5ff8afea WHIRLPOOL 3519abcd8eabbfb73b46b202f412b170fdf6e12d96d5e2d2e4fa0823fbcf34bab358c882de32e098f870034cb611c65a9826ec678ce6745649a36a61a287aa06
 MISC ChangeLog 2308 SHA256 39f03a192deff58d623a4f5505e8778b7efc803cc06b2c53351c0898b235bb9c SHA512 5e42030043dc81b6354cb59d2b4bd2b2f570f4569a13b522d0c2ca23f030e2f882cdec27e22ae7b054558703eec4b9157dde98825c4119cc716c8d8bbe043fbc WHIRLPOOL e9282199927cabae628767bfb7fcfc70ee3d50677d2a960246b084728c3c66d1fc5cb8f72db7a5e6f5aa66cfd2fe80d625bebd6c7763b01205e90e3fee454001
 MISC ChangeLog-2015 9194 SHA256 085d0f865e1ca53847addec0946b26d7df5db7739bdef9b818c98aa8faa943c6 SHA512 abc62ec98d05235b3829a5c9c1a49b67194c1d5e0fcad5d6855bc0e9195cc923008a2bb8276752d35361d33f4618219e2d91a7de3014f8368f3d825fa70d2657 WHIRLPOOL de03203e03881b3e290b8ca4f5d0c13b9cb65010b91d1d3dde4176907057aa6c8f89454ba39e15bd965229d3c9d8ce8313a3e4a87440755f2bfabaf7dea1a226
 MISC metadata.xml 418 SHA256 12de568288fe2a8d05ea073ac0a0d965aa617abc68e9690f6b37281fb7398756 SHA512 d69bb957dd6b4af7a13527a7c6fb15b7df9ae62cddafb561557654d4076c3e455b28ed16c081fe6c8843c0ed9ec26bef4d26035ac6389d6d95523953bd940008 WHIRLPOOL 9f1c7b3cae102ff14a90c7716291422ef5034cd419dce26135f4c7eda67ab5941f0a5b2050266d8b753e699a540a38ae8bbfaf99418c1355073259ff7d9ec009
diff --git a/app-text/opensp/opensp-1.5.2-r4.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
index 9ca36741d8cf..f2198eb5e884 100644
--- a/app-text/opensp/opensp-1.5.2-r4.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r6.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~s
 IUSE="doc nls static-libs test"
 
 RDEPEND="
-	|| ( net-libs/libnsl <sys-libs/glibc-2.26 )
+	net-libs/libnsl:0=
 "
 DEPEND="${RDEPEND}
 	nls? ( sys-devel/gettext )
diff --git a/app-text/rnv/Manifest b/app-text/rnv/Manifest
index b0d96a1ba3dc..aced045e0cba 100644
--- a/app-text/rnv/Manifest
+++ b/app-text/rnv/Manifest
@@ -4,4 +4,4 @@ EBUILD rnv-1.7.11-r1.ebuild 650 SHA256 8fed62e000cef68ec14380a6efab6d18ab3003b8f
 EBUILD rnv-1.7.11.ebuild 576 SHA256 f7186e11ecec42b665d0fd29f14de4f1c13a808080821dd45911a1db63ad27bd SHA512 d94b3b964563764f5ae11f9a7468d75b00ed5522f1a0c4cdb5b23d6c9f316f9b8a357998504086af8df22b3c04533cec7188fed7f107334e48209933be36a6b7 WHIRLPOOL 89b9249d5111ae8e9bdb104bf11cc5969952cbf1c0a8158a57e564792eb59b0e272f373d7c09285299ee285f3644b6eb606ad2dcbb4c5ab1a2c2ff176e25db0b
 MISC ChangeLog 3356 SHA256 de8ce5098ee1533e7b60c45a4ed177121ada64095f897fee306f4189e6b20ff6 SHA512 0145f0a79794e5865617ec90bdb94a83c01eec781941f2c612843d83af1e97888ae6722e99abb52aff822513a3c8a878b758216ccf27873cfcfd00abbb6e0e01 WHIRLPOOL b10751cc2352ff7ee2ed084523bb210700b9e3d3e59327bfbe25bbb7e3e802766a26059bfe070660a9bc40a5f48d1fa558ac07d94405dd5243ac5d3957981f0a
 MISC ChangeLog-2015 2843 SHA256 e659761186aeec1974bc3e9e75fd23e89b16f0ff72082c7900c2c6091791aac9 SHA512 400a7e01c44c43abcb82c143a24101e91a1668484358ae58f92dbd766f17a47d225316179bdc7d8a6c6108717218d3dae28bb60f16e2128b28ef7e35ef7a4144 WHIRLPOOL 5d3e96fd8dbc82313eede01520a053348078e823cdfc675e8511f657d2633e04e4c284552d2c02dae7c16d0bbbfb88caa220dfa4026aeb92b176a0e0690f9b98
-MISC metadata.xml 402 SHA256 b3084c02db396a2fa0d95e3aa2ec56f42928a9755067040e86a8b706dce9a1db SHA512 4d9406d86d89d241f23290eb315695ea70bbfdb8f9e9c3c996a798cd473aeceac37f82178191505a5bb7a51479fa74dc20d6dc40a930b1b0a6d6433a3fe36f43 WHIRLPOOL 8707d0900e03937e1cb13bf185f1d20ffb860a4a1b01bb7d95aecab61041a2fff5be839b2809cf43d3afb5d4734cb9a6ab17fe5ca7bbe56575adba95a711aea1
+MISC metadata.xml 239 SHA256 662bf89c79e530486a0dc5039c7ba190d4190eddf27c50771d603199ec836fda SHA512 7eb6bf1beffa771eee5c4de5dcf2ba3966398fcf6ea009eaeaa1d73cbdfc3d38907b8fd3c711144089b2ae506bcfa394f76ffd66238fd7df8e2f95589bb2f5f9 WHIRLPOOL a371312fb1caec3581efb17596df6e87bae03e75bf1a1829c9f4805d811be05feb75a9bd90db48f228b72092158baebcd106bfd3d93a8f11a98fa3289abfeff4
diff --git a/app-text/rnv/metadata.xml b/app-text/rnv/metadata.xml
index 857f078172f2..453784645d4c 100644
--- a/app-text/rnv/metadata.xml
+++ b/app-text/rnv/metadata.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>dma05@web.de</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">rnv</remote-id>
 	</upstream>
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index 670a1f91d970..92d4758dee44 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,8 +1,8 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 SHA256 64c1df49f92a44d4219c10b60e60bee34063fc6b99ae5f0ed1b14e11b27ea16d SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4 WHIRLPOOL ae83df73b7682f05b6e048aa7908331ef5b1ece0f2a40dfb968bfadd1991611fb998edd33dcef2984f0e5259e11a597a1620f9025a1f2d98554bd96da52b18be
 DIST xmlto-0.0.26.tar.bz2 119819 SHA256 efb49b2fb3bc27c1a1e24fe34abf19b6bf6cbb40844e6fd58034cdf21c54b5ec SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18 WHIRLPOOL f7ded4ceb65adcfc7c06bfdb8a3d22ca7195c098b5bcf26b3884111f536b72efbf5e642eeeee8be17d4a33db3accc139d78178dba2fe5a98037712048c2410e4
 DIST xmlto-0.0.28.tar.bz2 127921 SHA256 1130df3a7957eb9f6f0d29e4aa1c75732a7dfb6d639be013859b5c7ec5421276 SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1 WHIRLPOOL 4adbd66f85ed0ca90cb122dc08f9817d82e0b2bd417ae2ca8bb97e1fa3e301ab344d1ff9b9dec8571a6a519f1e0a80f0ce133d2618a211a64b0982c0b2b8c5f6
-EBUILD xmlto-0.0.26-r1.ebuild 1394 SHA256 27aee9ffd5aef12b1695d0849ba15d00442e15a070ba9f88233a8c17edf0aa89 SHA512 464125df8e6123886a7bb032544460e34d3fac328800f8a099fa3bbbfe162b2bfc2accc5dee39c65a11dc57e49523a7f8bea4a72a7b534487e92d9a7d24a5c56 WHIRLPOOL 74b0b2b21ed7003c410d3e7d809b5442816585771951dd94386bc94f2606c142a286f376e9e22b67d0a449ed5396b2bf982606bb74274f42b3882c73206f4437
-EBUILD xmlto-0.0.28-r1.ebuild 1406 SHA256 861137815545632fb61d697b9b641a19e4f6f40b0fd09adf78505d641ccff3e3 SHA512 e7c6e876c892f9596c19fd10f06b5d8d69f92ab55c9cf92624a1c87545c737bbc8f57ac8b952c02985c4a6385b42d97c0b904515120b0369cc0714f478eccc21 WHIRLPOOL c2334262be9de0538c0caaf02e6b3e7957e2412fc7c72e9a216924cf09cd2a453d3e1376e06842b20946016a7ac3e97ffd16bae21dfe3304cb7fa174ec14f3f1
+EBUILD xmlto-0.0.26-r1.ebuild 1360 SHA256 2343404586120c60b9f0221922a4121db50fec19878ea3a694ce857bcb87481e SHA512 2ef0a60cc7f8ea950070edcfef7b6582ac4b641d1a6e1e3f4206c20ad1b254f85f48c162b0a98e7633ee736157734984c7e4e03f978357b013262f8bd8e67ca0 WHIRLPOOL 6f3121e14f3d4bfcc7ddfed2cf77883ef5c0bef43a8c82de7d7b7b2aaaa35a85ce664b969a6296e1890084172aad7cb2dfca10c098e47ca6a274ee2d8aa16097
+EBUILD xmlto-0.0.28-r1.ebuild 1372 SHA256 5dbfca9d917a28fef4b88f7bc0d2d822a3c7b302f202b6bac7e0801e7be932f8 SHA512 a520e13daa04aedf7952859e30bdfd87c96a35e39363e1c379af6158d6f47704f0f11af766c8041340a4558dfd513b376fc48e1a41f9d446a52d9365abf5dec8 WHIRLPOOL 5eebbf6cd0db4534340e11f4d62912639d863e16f3ebe7fc20c7d034fb0b2ddd9ffea2bbcd0d761a31a52de6a38649a523c2167de6d40b3f6cb80c7fa992b4e7
 MISC ChangeLog 3521 SHA256 8b2e90c61add15760ba829b26949e4533f30ae5fbf1240331efa38bbf5a26463 SHA512 4b5aef60fcf5d0afcdafe36e99abe9e3eb5892279e3dca2302eb08307aae1192d301786fa1eb25bb84a7f6d38468fb671f6b8e859bf2beb397d57e4685d7868f WHIRLPOOL 3d31d93b06d6d0650c8175a12186060654635333b3362e1bfe31bcab5154c36eba256a9efcb990071eead8cab68bd6490875feb727a1d7d921c033dd4ab69048
 MISC ChangeLog-2015 12889 SHA256 664e2564cde09621649415b636efae8d8b846c5eaef9dea2eccc321b519721dc SHA512 962a84dc23501ed2699789e4383ff4085b9d14353f6375254bbdec8de766a34b106eeb1f859a4f7dc28209311443c12911b7362e5520bf9a5e42d9700bfcb96c WHIRLPOOL 30dcbad24d85623a3cce1607d6a4181ee34a8f3847a2c1b0589035ac9ce511d2802c6f167c904dbb4985c70563d934265a55f03867751b542d40a613993bfbcf
 MISC metadata.xml 247 SHA256 8afdfa1e3d4e32c0657326871389067326bcc1dc1ca57efd4165808c6c649ffc SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47 WHIRLPOOL 0e83d34a4f68934b022a4e0fcd3b60de44a8149fd6faf62176d15288eac700ca1b62de073912f7a2e61bfb2023e1ac1e8364642576135e0c631229fb3603e809
diff --git a/app-text/xmlto/xmlto-0.0.26-r1.ebuild b/app-text/xmlto/xmlto-0.0.26-r1.ebuild
index a09fe62fa98f..7131d28dfe9f 100644
--- a/app-text/xmlto/xmlto-0.0.26-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.26-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=5
 inherit eutils
 
 DESCRIPTION="script for converting XML and DocBook documents to a variety of output formats"
-HOMEPAGE="https://fedorahosted.org/xmlto/"
-SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://pagure.io/xmlto"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
index 2e79b5582e6f..dcdf3321459f 100644
--- a/app-text/xmlto/xmlto-0.0.28-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
@@ -5,8 +5,8 @@ EAPI=5
 inherit eutils
 
 DESCRIPTION="script for converting XML and DocBook documents to a variety of output formats"
-HOMEPAGE="https://fedorahosted.org/xmlto/"
-SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
+HOMEPAGE="https://pagure.io/xmlto"
+SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"