gentoo resync : 16.02.1018

33 files changed, 82 insertions, 403 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index a91c89744603..6f049b72626c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/apvlv/Manifest b/app-text/apvlv/Manifest
index d73add49b19e..7ced64fb65b4 100644
--- a/app-text/apvlv/Manifest
+++ b/app-text/apvlv/Manifest
@@ -3,5 +3,5 @@ AUX apvlv-0.1.5-gcc6.patch 403 BLAKE2B d593c72ef63ddc22a76fe8b93ad12078b1739f359
 AUX apvlv-0.1.5-gcc7.patch 685 BLAKE2B 3ece21cc1bfb5bbf66d10fb67abb140a357c6953655ca1b02b37cbc3d09503b5382694fb20337b2a7e50fc0a7ab51657f1a3091060bf03e8666b2bdbd0b8a8dc SHA512 53102dfea587fd946bdd7300fdb60b8395d6b2436aef6fe67be539e4ac88063f9d7934282227316f456951aa1e0748db7db02ddda06e17056d32ea6b91588afb
 AUX apvlv-0.1.5-poppler-0.73.patch 282 BLAKE2B 8bd7926afd2ce2364b82e7f9c8348b2905e1c3cdd6ba3565b4191ec5b6cfa5565179cc58706286f793b5b02cba2dc6eff04076b2fa61eb0be1638681632eedd5 SHA512 b832ee8e8e7290d2294ac326e84271570f560a5e7afc29446401ad1c05f1b03998c054bf3cd7ec80813899e49c256f86c871b400ce8e5a663fa9ab22015990cb
 DIST apvlv-0.1.5.tar.gz 4254177 BLAKE2B 53bb949838353e7e8387219d086b8c7efef78d4bff15196c68e3d0fe6c298be8a771ecce4e156254f1d072d1715794caff640ebe795f8da73e09d6a4fe4addc9 SHA512 680b2d6e272cda34b0b9065f5fdf7b917a4e3ed4d54a6e78cb41a60cf43374c687b506d4148d6cecf87912957fbe6bc4c77e9278616fd236e49ade15774e1ccd
-EBUILD apvlv-0.1.5-r2.ebuild 1249 BLAKE2B 9b0e9a731cf1f092e3db10ba923bc7ce9d40d469d2a43fbd1a663b7f0b1d92e80434af533539b94028c1331b9fe5455c8bf70b7f11724a357c14d9775c34ed31 SHA512 9e7b83d9164ec2b181e4abc401d088da42ac2576dbb9b4aebb78e97b90d8e2313d94034a81747a4b5c37282a640e0ae7b15c58ef4efacc0fd9eb2a72f05349cc
+EBUILD apvlv-0.1.5-r2.ebuild 1092 BLAKE2B d707df2a6ad2db0a0c755452c9ce4c9d44e00f160155c76216cbc0ee73a7e00f45d221d44282220c4d58f3608792b1809e8a0c33a5e731016d53a6fe30779978 SHA512 cdad1f2cac5410a5a3c77ab6174880fb70536a782ef203a4e6e8cdf598aec68aa465578557147e3b19069b15fdd1eda32ae6538e9934ff179e2d916e4ba295b4
 MISC metadata.xml 304 BLAKE2B bd4def156407f7aa104c4bb45814ecc48caa571fef3b68961e831c0c1997324c8f0773beb78da896ee23e14f8e82634a20696bf2b2fd201fc5d87037e995fa5a SHA512 0d01027269ed441b2c29ae9ae560e16eca4a6aed7ed7d0e418887c538673b913988dc3f7c6414982198dfda258044ff7ef3667b8fc53cfd9d4f7773dd5d35030
diff --git a/app-text/apvlv/apvlv-0.1.5-r2.ebuild b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
index ed51cc3d3d63..e952e34db067 100644
--- a/app-text/apvlv/apvlv-0.1.5-r2.ebuild
+++ b/app-text/apvlv/apvlv-0.1.5-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils desktop gnome2-utils xdg-utils
+inherit xdg cmake-utils desktop
 
 DESCRIPTION="Alf's PDF Viewer Like Vim"
 HOMEPAGE="https://naihe2010.github.com/apvlv/"
@@ -14,15 +14,16 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="debug djvu"
 
-RDEPEND="
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
 	>=app-text/poppler-0.18[cairo,xpdf-headers(+)]
 	dev-libs/glib:2
 	x11-libs/gtk+:3
 	djvu? ( app-text/djvu:= )
 "
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+RDEPEND="${DEPEND}"
 
 PATCHES=(
 	# preserve cflags
@@ -50,13 +51,3 @@ src_install() {
 	cmake-utils_src_install
 	newicon -s 32 icons/pdf.png ${PN}.png
 }
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index 56ab60785546..5b80b900b362 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1,4 +1,4 @@
-DIST blogc-0.14.1.tar.xz 330540 BLAKE2B e8b2f793a1c7f95fde59d7929245cdace95d31f484d62252d00c4fa535c9d4b9d83c6d1828e9197f0fab74473e5a549802ca26aefe2dd441bad03b4f3466c1b4 SHA512 2d393684e8ddb38d720f029c7fe7884a577dc844f8e774a21afedd7519b9aa32a84d2b0e40c7bc565feba5a8e13f83c61692f0d04f20fea44e96f3f66d613a5a
-EBUILD blogc-0.14.1.ebuild 1117 BLAKE2B 3a7d101207b6828738eb3c7e9896af1c8820bc3db4352b45dacd01d19ba8d0bd6d6b316617e92e5e6cdf1b35577406877c978796cbd60f344bafd250be0b19ea SHA512 4e439eb3dfaac7ce6eb5bc8c6d832f829e4049b95ce9fd35f442876f91e27732a24ee5b53be5ef8a993bfe38272e205739810ad0df2e444eb8121a48fb66d689
+DIST blogc-0.15.0.tar.xz 335996 BLAKE2B c7fff528180c2124ea5c26ddd413f252d00570bcfe35645b8cdc8c7b3e289b52b38bd895e2ae5c2cab88d2a8143fa637118d75c719d69f685cef4c182bd9d6e3 SHA512 57a685938ef644b22b9271a0462260acb8ab8f9e9ff842415069011bb480923b8a4871742640eecc0babc7c65eefec3cab9051170dc6c3e69899e77d366a01c6
+EBUILD blogc-0.15.0.ebuild 1117 BLAKE2B 3a7d101207b6828738eb3c7e9896af1c8820bc3db4352b45dacd01d19ba8d0bd6d6b316617e92e5e6cdf1b35577406877c978796cbd60f344bafd250be0b19ea SHA512 4e439eb3dfaac7ce6eb5bc8c6d832f829e4049b95ce9fd35f442876f91e27732a24ee5b53be5ef8a993bfe38272e205739810ad0df2e444eb8121a48fb66d689
 EBUILD blogc-9999.ebuild 1120 BLAKE2B 234392dc7c1e42c3bcd2c3ac4b1a648ee9e4fa6fc486cfcc60ef0af1c0cfb97ea68bc2b2ce3da820bdd88f05ef5993b7dc6589e52137d8d1e7cbce19d9c0a064 SHA512 ed4c808f2cfa1435972a53ae17f76a9e3423943713759cb7ad7378e6417a3912dbb16e0964d963dac8a476be37c90a42d8f875128101ee806f12a8ab11a519d9
 MISC metadata.xml 785 BLAKE2B 90817e117dbf1f0e60d655206ad0cc3f3cecf2b97a16ba43fdf84ae0f621ee6296af2ab6a17bb205d82b1d107be3f62b75d9c740aeab0267b02947a4bcc50aea SHA512 31230bdb8113bb73662328e0e657e710cd33e65f126d638f0cefdacbe97525643604f48ce3da27f80b8163d129092c7df7eee265cd6d6194cd0181b138230206
diff --git a/app-text/blogc/blogc-0.14.1.ebuild b/app-text/blogc/blogc-0.15.0.ebuild
index d5c7c49e8ea5..d5c7c49e8ea5 100644
--- a/app-text/blogc/blogc-0.14.1.ebuild
+++ b/app-text/blogc/blogc-0.15.0.ebuild
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index c84365fd9254..2689d7b5d311 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,5 +1,5 @@
 AUX docbook-dsssl-stylesheets-1.77.Makefile 676 BLAKE2B e87e463a2fffd64e6633a2d1015660ebc341f089a2dd3cb5da9c743eaf9b98b8457a723040f871c350969445275a6eca705546e2d4ba7596c21994fc5069c540 SHA512 110c5dbed17a759179c08fe44410b7d098dc42c8a1d6ed1a4accb30d815ccbd0f2a65a65723b18747577c838106d5e9c193c466a7c2e7f69fe2aeb1a4637d2c3
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
 EBUILD docbook-dsssl-stylesheets-1.79-r2.ebuild 1622 BLAKE2B 1d3a39700f1d767669319d7ecfff473ecd4849ae66918d070780f1e9bd327a82488a65a7744834a98572bc2685bbcb333dc5482316f232b6a1fbbe157f8a96bd SHA512 87e7ffd95e6e6ff0dd713f1246b80353a246736696fac03384ae906d1ed6a3438f9d74ac1526f7bd516e7d3110f2e76d76e90aa59fe9d17bbc7930ec9257124c
-EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1554 BLAKE2B 158a37533f4cd9a9e526e10fabca6825cb2e5ee3c3cd0104f2e64313ffedf113bab3bf00b6c2a855eaacfb457f7481fe21376db73d81419a8b7c77125d0b2932 SHA512 49883cc37eb6e2a17d6daf75037fb7ad442c3b0ec35c155a26d3b517e633ed26bee1e01727dee96acad1dfb91ae80f8fafe30e52927e26a5f9bf585671c7e433
+EBUILD docbook-dsssl-stylesheets-1.79-r3.ebuild 1552 BLAKE2B 404a5e3406218b9d8120cfe66b9cc23ec1e961b6582cd3dd9bf04d324cc01d8f93121662d0707e8069ce1762480893feee8ce4b870821cfbfb1259afbde43eb5 SHA512 ec08de1af700a863e1b8124b47b40b18727f489868bbf14947b68a5e2d7a066a27f49ec8cd8c60599cc2b37171b817419eea0c912f9f08bea86cf3128904802f
 MISC metadata.xml 297 BLAKE2B 33f8b636a483011e6561d078c58c16a477925ea41543b150c11ea7ecb3465151a5404689d8cf263a6e9f6ede4d2d5a55fc8fd02fa89814c7b7b0e93e7c6077aa SHA512 e5cc7a9b4aea0e6cd29246bb44f1bd2713495d58b243bc78bceb760c827c415ec30459f5b9acf2ddab615e39d9ab5c4a9d4eb41e7bd53684032a08f7a4fbce3e
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
index 1d8a69d03476..e8d69d90a29f 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/docbook-xml-simple-dtd/Manifest b/app-text/docbook-xml-simple-dtd/Manifest
index 2baf7d30bddb..db3a2bd9837a 100644
--- a/app-text/docbook-xml-simple-dtd/Manifest
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -4,9 +4,7 @@ AUX docbook-xml-simple-dtd-4.1.2.5.catalog 1728 BLAKE2B a5ba21fb9f622b7427adf142
 DIST docbook-simple-1.0.zip 31173 BLAKE2B b19054783553be68eaa2a689cb673bb4a270f546e7c45416b3176cf413bd3be46b1b7321ff9360018c93d7f2eb2db904c9d194dcb3b4de6eff4ea33dcbd228f1 SHA512 5be8a2fb48b95912412eb250d2dad6126c78f81155b7eb115d175d32831430ede285d5f4bbebd0d8a50a1a3159fe1b7d133adf84ff8447111ca88a441b415643
 DIST sdb4124.zip 35199 BLAKE2B bee2de887a662978b6f0bf8b9ae663d37c4da1859f07a09e869cff91943bd65946dfd493b9bbe9244ffb8794f3cc5c828c647ab00b183326b63e179540765664 SHA512 b5c158cfcaaa4150d5ee719d11f3fc2b5a207cace241a147b39ab4a9f721cae2a894a88cd3dd944ecd24feae850b387faa03c669747b02de839f5d6a3ff0821f
 DIST simple4125.zip 29839 BLAKE2B 83f2b65e5192334bf6a9b5b5388a77d8b566a924837d041329d16f0ab864d5e69b7ea0a60b70fec4affcf0161fb724c5ed99fe16dd230dc0984100e40642709c SHA512 21c8d411f5b37c82442283dadbde99352778efe90fcf7eab7cc6a74fe9b702f14ffa5bd39e058d8f29fada7dbcdb197d5c880c29b207e3509ba856c5d19cfef1
-EBUILD docbook-xml-simple-dtd-1.0-r1.ebuild 859 BLAKE2B d3b7e65c640b6b80f101e8ffeca18e87aed94ca3187e1482b539f9c32c38405f14942a27023b066aa352aa8bf14e41670c8f21e48872522c1b49898841ba904f SHA512 b9bd047f159c6f139dcccdae4d424094a9867854469dec8f1f6f5b9c1f8c64d1ef0eefea4e723cf993f4951af242fa22a4827221da0570eccac359804c3784f1
-EBUILD docbook-xml-simple-dtd-1.0-r2.ebuild 1017 BLAKE2B 2f45b331671d37c07fe49106b722c5212adebe84fa2b19bebd41bc5739cb496d4e328279a3f059ffbc863a11463368bab543574cd6c10611c9d2d1b0e961d720 SHA512 7022205fff1a7ea024ab32e556dd168662528ade0635b22db035e434169f5935688fb30af8e35950089301f52f418f0e3b45c8179cc8d1016ddb741bc891af14
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r2.ebuild 882 BLAKE2B 142b82f5e1babca573deeb03787c9cf8f36f037aa8a79317729b080550ccd626462dbbe3ed2cd3d8d64e716757511cafda68d37932aab5e27b22c90a3f45932c SHA512 752a60262080c00de1268ffb7b099fcd05537cc7e16e9ba74ffd3d863c18d4bf84a7a26105ae2081b691d6bac0c413abb1c687a2f3792ded17833a1d735e1b29
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r3.ebuild 1067 BLAKE2B e58ff1762d62cff6089cd8a194afc12ffeed143e221dd3f386725a8cc504a6bdae439bba5b61ba662e5f7d732d668f5d2c49f8e6369eec757a30d095f6cd164a SHA512 060482e9855f86f8ad5a06827d8c8753bf3ad1c582aa04bc4bb7248a9d945b79783a8498e706e6e2ef51f041afc4e6689bd556841b05b436e47b17efdf201c5e
+EBUILD docbook-xml-simple-dtd-1.0-r2.ebuild 1013 BLAKE2B 9454e1ad486ffcf7190af51cd750eb3aaac42aa4a5f07f485887cbd650fda46543c53cd721f5985f1faef89049373c7059f8a3f1a51753b714b903b6f5da321c SHA512 ce84d4cf08eb0c64b174a33ecd7a0064c09e72c2dcb5b65a2e009f227b561f3fe4306bafe7e3695dcadb404315a0fa6892122eb35f337c72d521d5c70763cdb1
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r3.ebuild 1063 BLAKE2B 863f55c0428c2457ebf5e88435f86969fb20c1d4279f2e7d2fdd16227b42e93b3095f6d2d4574203b8d8b3f5bc38aa7043ae75b2eb46376f200992f77876e9db SHA512 023e19c364bc970672a790c96b9b6ada643af26c15659928560dc7964ff6adfc5da0cda464d1330b9d6dca0c060169ed8737953993ae4b1537d6f547014a6c4e
 EBUILD docbook-xml-simple-dtd-4.1.2.5-r2.ebuild 1005 BLAKE2B e0e590a732cff3961f31c47422fbb8474905270996b886395e21decd03bb792ccd1b74834598905b69ff70e36218291bb2de49ce222b8f9879b6b113af5adf5d SHA512 b48010392f3787199881e89e0db87289cf7764abd2cdab4025d9a011e96f14b58eb5c33646a48c4558d90dc94e5789624fde873e210834873dbe4b2c1e0fbdc6
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild
deleted file mode 100644
index 41e6db86cdfb..000000000000
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_PN="docbook-simple"
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Simplified Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/"
-SRC_URI="http://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="dev-libs/libxml2"
-DEPEND=">=app-arch/unzip-5.41
-	${RDEPEND}"
-
-S=${WORKDIR}
-
-sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
-
-src_install() {
-	insinto /usr/share/sgml/docbook/${P#docbook-}
-	doins *.dtd *.mod *.css
-	newins "${FILESDIR}"/${P}.cat catalog
-}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
index c1c1ed6e8efa..4769cfbe91b4 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="1.0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild
deleted file mode 100644
index aa892f99c197..000000000000
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit sgml-catalog
-
-MY_P="sdb4124"
-DESCRIPTION="Docbook DTD for XML"
-HOMEPAGE="http://www.oasis-open.org/docbook/"
-SRC_URI="mirror://gentoo/${MY_P}.zip"
-
-LICENSE="docbook"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
-IUSE=""
-
-DEPEND=">=app-arch/unzip-5.41"
-RDEPEND=""
-
-sgml-catalog_cat_include "/etc/sgml/xml-simple-docbook-${PV}.cat" \
-	"/usr/share/sgml/docbook/${P#docbook-}/catalog"
-
-S=${WORKDIR}
-
-src_install() {
-	insinto /usr/share/sgml/docbook/${P#docbook-}
-	doins *.dtd *.mod *.css
-
-	newins "${FILESDIR}"/${P}.catalog catalog
-
-	insinto /usr/share/sgml/docbook/${P#docbook-}/ent
-	doins ent/*.ent
-
-	dodoc README ChangeLog LostLog COPYRIGHT
-}
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
index 6e3ee2c426a6..d8f17a55a964 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/htmlinc/Manifest b/app-text/htmlinc/Manifest
index e957847b2261..a82a9cad7c0f 100644
--- a/app-text/htmlinc/Manifest
+++ b/app-text/htmlinc/Manifest
@@ -1,5 +1,4 @@
 AUX htmlinc-gcc3-gentoo.patch 3601 BLAKE2B d268406b773c21cd2885d3f9b5e66ad0121493152a454811b5af1bb20e8ee857777374f2424d68ae9634c74d30d6e24a8d09779059c8fe4440db390259108e23 SHA512 f29d5c823fae27ef027002a8e075e105f028c8a4892d142c64d69af7bca52a63de4ca19aa0cf86acc67f772349472d2b04003c71257cf1b7464c9dee56d95afd
 DIST htmlinc.tar.gz 17042 BLAKE2B 07c9333599876c17846dec8d40c0eba31f1f9321cfa463e4c5dd2698a120c878c6b2d0e6593eb78d22a15fa5333e0fb26ed064a9cccf6b95641cd9a7e3a13a53 SHA512 2bdb7a5df4a8152d9a23f7b740995bd565e92998ef199cfb7d08b1f5e8ae4390c5179f78da71dfa4b7ce18a2a0bfe6002d465b0fa8d860a25afdec5eb4f3ee4c
-EBUILD htmlinc-1.0_beta1-r2.ebuild 718 BLAKE2B 9f6f6208f9bb395c4db942f589fa7becbfe84c150bea3b0e3696273ed663255b380b397cffce873fc5e9440b2eddd6fc0552839c16deacc3ca018aeb2a926bd9 SHA512 8011704a4ecb7a97305058292c92015475189999d2e0bf551e8d983c6c8c8545f1d36346eb22d48aab6b9c1d59acd40c2137f58017a2fd5257a549703492566a
-EBUILD htmlinc-1.0_beta1.ebuild 528 BLAKE2B 34f15f9f94bfa769fbf258cc81b2878acc4c0c9c29b71de890291127c73b8cb1ae7e95973be9a6a46987b0c91aeab948829588afe17b6b1ee28e1bb76ca8684e SHA512 5cfd9473e10c5b0676c59376070438f8c2c21f5e8a9659ce19ac9ab951575262664f7a1fe3754743afe8f171b0dd7a03c1cd3f75e9eaa55a13edd8be47ed2d03
+EBUILD htmlinc-1.0_beta1-r2.ebuild 717 BLAKE2B 1550392f3fc525dd0fb8949d94a1d32d5b143b5134d71495a6424849d29c5bbbbfc1f4fe5875cff578a11f003519286551b46df03e4c2fd5e2ce5079b7a7fbec SHA512 ea4b9bd809690e905e6ab9bba09fe797c1e0333ce222bc66fbef1df4129584bf9d4d5d61d08e2a4751d91b89c7bf2f99069768f5a4565257d055d3da2ed17c69
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
index fe99dabe2c32..73d010fb1fbe 100644
--- a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
+++ b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://meybohm.de/files/${PN}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc sparc ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc sparc x86 ~x86-linux ~ppc-macos ~x86-macos"
 IUSE=""
 
 S=${WORKDIR}/htmlinc
diff --git a/app-text/htmlinc/htmlinc-1.0_beta1.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1.ebuild
deleted file mode 100644
index a11b46cd4146..000000000000
--- a/app-text/htmlinc/htmlinc-1.0_beta1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="HTML Include System by Ulli Meybohm"
-HOMEPAGE="http://www.meybohm.de/"
-SRC_URI="http://meybohm.de/files/${PN}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-S=${WORKDIR}/htmlinc
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/htmlinc-gcc3-gentoo.patch
-}
-
-src_compile() {
-	emake CFLAGS="${CXXFLAGS} -Wall" || die
-}
-
-src_install() {
-	dobin htmlinc
-}
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index 5e0976bfce99..143853e9e191 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,5 +1,7 @@
 DIST libgepub-0.4.tar.xz 246016 BLAKE2B d51f55064d2dd0c9d6cb33884d9dae967b6a9ea971624fce333e9692abfaddf12c6ee4fb11cad97dc0fcc0b6a5d42ff71fc842eb205326ce8181af8e3ad46d2e SHA512 dd3e9837ba2c5896319918bda19eec8ea790d54f7893ddca46774f96f8e09ac1962ae6cbfc0bcd23c15059c63683ef4a6673e05f8416b024591677fddfa3ca15
 DIST libgepub-0.5.2.tar.xz 27076 BLAKE2B 8934e7cbd3b2e4056220c560111fb1cbaca1b16541519da3c3c1b28784900c14b84b9a7497d59d4895b74075c2f94bf8dc540e19d2e5bcc686429d216ec3d2f5 SHA512 9e8ba3acc717fe5d1957935b154776720fcdb90ab566e0888203bce4ea2281b84f9fe44d554f6b5cadb1bba3aeae8b5b9a759001f404c43fa46b0ba16b959e69
-EBUILD libgepub-0.4.ebuild 681 BLAKE2B 92fc88552bda9ef7e5fbe0699496679c8b2f7cc589627e62071987c175a005633924a6026ec84c82a6829cf36dd0730bfc7b4aa62b612996f3e5f9056572fdd6 SHA512 0071795abfdc4915fc7eb8ef88fb1d0ba6883e2010f5ff4836b9119ac02da6364ff223e0c32a00dac23ba404054fcdbc3dbee0e113a91ffb88eb3dba2882edba
-EBUILD libgepub-0.5.2.ebuild 673 BLAKE2B 8fcdcea9bd667816508d9328e83ada057ff44eacaf35fab8d0a11fe30b45ee257037ca91ae7ba68dab3a2c755c64ba4b35f6b9e3a000401e3e1583727dc8e957 SHA512 cda432b08898fd45911231fd83c7c009792df6b43ae4398bb3a9adeef9226d49a030bd2b2447da0815741fbb1ee4f20393987ed59eb5114352324829f3607527
+DIST libgepub-0.5.3.tar.xz 25576 BLAKE2B c51f6850c78185fec6f027ad5507b2402ab578b2ce6e4b91c674c3a3c6945857ce3d3ebd4560408ae8e5552ca658c40b30c73b42db1ef61f4814cde36a404df7 SHA512 8eb3370b6ca639135a1365756f3977f6daea3039bcb7ec4d5cd116d869584be2a2b1e8bb7f202d4c101f1afb0f7b9a45bd48c1b2337197ec4320d50a4c8d0183
+EBUILD libgepub-0.4.ebuild 682 BLAKE2B 5e5e637ff47ed41cc130907d61d7e5bb4cfd4711d523350f12896926abf90c56f3f5994fdc17c329d5eeb30dea4bd5f7243059642c3261d3f5011f6581bfd1b4 SHA512 636d71bf49aa273232dc555c999febb2f10c14927f4a1c160c2caf64f5d6154921bf4390220483d5967c1abba4d02000e58c59f1270d18a5c6acdee39e9e9087
+EBUILD libgepub-0.5.2.ebuild 671 BLAKE2B e11f3acb7349358557aa8c4280e95ea6fbfc8fc469d0dc4783825bb3a4a8e7e7401a323ab557e2ad4fa17f67d6305e45e402eefa47a53c02b7abc23415c6e079 SHA512 eb9406d3f74ed4df90f42079e58aaeb8154d65f2f43705153db4d7b080329bd064230a1525c1bc4f54ee5180dfed70b1c84200ebcb7ea0c5df0e0a752a41af94
+EBUILD libgepub-0.5.3.ebuild 642 BLAKE2B b6e079a704a146457cecbc77c3cd61f96a3a02a9ccc459b935477f2242cfc443a15e15c34de6c6e44971e72e8dc933be451eb7ff0c7723fc6cfd6ab8c89d1f3e SHA512 1e9297a1b15e5f468fba37d6ba83f47aa5257f6e0d5c0004ce94c64033da730bcb4b23fd40f2ad6121585b7176a92c9cee3182aff753dc7ffd0720d80edc5cdb
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/libgepub/libgepub-0.4.ebuild b/app-text/libgepub/libgepub-0.4.ebuild
index 816748d46117..101e914610a2 100644
--- a/app-text/libgepub/libgepub-0.4.ebuild
+++ b/app-text/libgepub/libgepub-0.4.ebuild
@@ -8,7 +8,7 @@ inherit gnome2
 DESCRIPTION="GObject based library for handling and rendering epub documents"
 HOMEPAGE="https://git.gnome.org/browse/libgepub"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="+introspection"
diff --git a/app-text/libgepub/libgepub-0.5.2.ebuild b/app-text/libgepub/libgepub-0.5.2.ebuild
index 37ff044fb87c..8f894e8e55f1 100644
--- a/app-text/libgepub/libgepub-0.5.2.ebuild
+++ b/app-text/libgepub/libgepub-0.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ inherit gnome.org meson
 DESCRIPTION="GObject based library for handling and rendering epub documents"
 HOMEPAGE="https://git.gnome.org/browse/libgepub"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+introspection"
diff --git a/app-text/libgepub/libgepub-0.5.3.ebuild b/app-text/libgepub/libgepub-0.5.3.ebuild
new file mode 100644
index 000000000000..47691a83f82b
--- /dev/null
+++ b/app-text/libgepub/libgepub-0.5.3.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gnome.org meson
+
+DESCRIPTION="GObject based library for handling and rendering epub documents"
+HOMEPAGE="https://git.gnome.org/browse/libgepub"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+introspection"
+
+RDEPEND="
+	app-arch/libarchive
+	dev-libs/glib:2
+	dev-libs/libxml2
+	net-libs/libsoup:2.4
+	net-libs/webkit-gtk:4
+	x11-libs/gtk+:3
+	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
+"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+"
+
+src_configure() {
+	meson_src_configure \
+		$(meson_use introspection)
+}
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 1598c696919e..55dbfe48cd14 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -5,5 +5,5 @@ AUX llpp.desktop 566 BLAKE2B 2b7497616434d7ae4abfa7a78d753f194ff13c460138a1d8f13
 DIST llpp-26b_p20180114.tar.gz 170204 BLAKE2B c7f46491d69350e8e94b444f0be4d7375f5658cccded792ecce2a246c907ae98bcca45d73e3b6c15765bd926d559327491559b5e5eec63bf2645cba84f6ee0d3 SHA512 1bc544f4bae268f573c2c111b69f7129bd3d1c1c8cc635c06f76e12670ad9476b4c2a2776e3959203ab6e53ea8ad1c68be290619298f7ebc1ae8203875f88314
 DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
 EBUILD llpp-26b_p20180114.ebuild 3032 BLAKE2B d6cc8bf1fac0cd932c298d4816221137e47df136283fc752be62886a1111de02803e92230319ccffc1864dbaf81b318c0400a34454a4f1019d8825d76f353e5b SHA512 f4b0da1be74c63c71ae02e1b6dfb7067ead203a9e1203e2c88e1eb4302364205bb92c2e4e841d861124f99781e6bb7214bf5e536dbab51a0e20c178b54afec11
-EBUILD llpp-30.ebuild 1716 BLAKE2B 720bf3ad6f76923ef518fe2bbbef66575087a27a7320b4e76fecbd09754ec64a80189e9da3e14d7f59d98a092222460c736f60b18841460edcc05b3d3159de89 SHA512 f1da1557700969bc6a1ad7aee50437b0b157dfbdfacbdf4377e55f434222d351faa231f0a5d9042b3de52524b25defdbf75e7a34a133f29df7a439e518f91959
+EBUILD llpp-30.ebuild 1715 BLAKE2B c7e3de96332ddec7ed68bb96401dca50f12992c380b4694682f05acd89558c9cea0a92dbe8acf7cf0b37afbe1a13d5516ffaa8c2133832c1149a2ae5245974d3 SHA512 3af9f945925cb7552f9c19432cd7d43410de241d864de1b05e43e0530a538d76a9271ce1e68ed66968dd6e4b27a1678ba9a87870c495fccf79aa9a76367202fd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild
index 3ba1ce6fe451..5b3092727458 100644
--- a/app-text/llpp/llpp-30.ebuild
+++ b/app-text/llpp/llpp-30.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE="+ocamlopt static"
 
 LIB_DEPEND=">=app-text/mupdf-1.12.0:0=[static-libs]
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index 641cb21f5fad..8af09cfb599c 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -10,6 +10,5 @@ AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4
 AUX openjade-1.3.2-wchar_t-uint.patch 496 BLAKE2B 0576cdd89a5d9c187eba41f740662d2d5e9ba5414ab931583f1e791ceae948e381e558f8337399e6b853573388041288d0f42d7c45e1f34befb8d65bfa8b03b7 SHA512 e483c08b6ea63e78dfc6351670f7bb6a55927f458c6e922c542981b25389168f32eb79e16554a41c102b19b7fa12489c0303beb35b839dfc9767b5ab9e5e1027
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
-EBUILD openjade-1.3.2-r7.ebuild 3700 BLAKE2B b80ec4f9088cfe7d15ceaa84fd14d640e33f48e8a718034e1d7812c25a8376d93b68ae4a7b3e73e7ea17f6ac91a59af227a4f22c6bd5720b1d43e2fbcc744e0e SHA512 5a7df1f6187b35f1ca79777ba33ccc50fce08dcf3528dbe4f8439034104da58152d6fbdb13f5f303bf33cf18ecbf5a1e6d3760c4a293c7bb1c08b0cc0bd70d5d
-EBUILD openjade-1.3.2-r8.ebuild 3704 BLAKE2B d424dcff33f7e9753647eda30b4b518528aea368cfc1444760facd1252a0c83338db96480b8d09271ec6da3b50d3e794b68a5c74ea4c010f94a78d9c616326ad SHA512 16a91cd325321ec83b100eef1b215179c0e2d320a11462345e5b830fe44a0a11f7c240a8d9a60a91976ef6d099eda13bad1e92372fe10b2ee7c2e0eaba19dba9
+EBUILD openjade-1.3.2-r8.ebuild 3700 BLAKE2B e74eeb4224d52d4a26309d3d76480178c16fc6067ca8edb2abc356ed0a1ce701790971dbea13bb5f4c89d474fceeea9ff5b10da83b517aa9696764fd7fa4ddae SHA512 f5b536b2f604991257cdbcdcbb59d70167b92eae5bc1f7b538730c48ebdc1bbfd623afa74571cc536ba9044480883b0dd3fe56d33f8b79352079d4ada0a37209
 MISC metadata.xml 245 BLAKE2B f01e184cc74cf4d5924bc0d9eaf955adf9797f656ddc41a13443a9c2dbf158ee403dc6f0f39970aa736d87111017b593c93750542a2f2ad539d1a644c96f664e SHA512 5d2a537b74c248094a700b0eeed29425d8d62c36ae30fca3ea8381daf41f74284333344775a108ff374b94b9f334516aa41892a983c825efa855b35a0f110c40
diff --git a/app-text/openjade/openjade-1.3.2-r7.ebuild b/app-text/openjade/openjade-1.3.2-r7.ebuild
deleted file mode 100644
index 95ece1c5ef24..000000000000
--- a/app-text/openjade/openjade-1.3.2-r7.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools sgml-catalog flag-o-matic toolchain-funcs
-
-DESCRIPTION="Jade is an implementation of DSSSL for formatting SGML and XML documents"
-HOMEPAGE="http://openjade.sourceforge.net"
-SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND="
-	app-text/sgml-common
-	>=app-text/opensp-1.5.1
-"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-"
-
-src_prepare() {
-	default
-
-	eapply "${FILESDIR}"/${P}-deplibs.patch
-	eapply "${FILESDIR}"/${P}-ldflags.patch
-	eapply "${FILESDIR}"/${P}-msggen.pl.patch
-	eapply "${FILESDIR}"/${P}-respect-ldflags.patch
-	eapply "${FILESDIR}"/${P}-libosp-la.patch
-	eapply "${FILESDIR}"/${P}-gcc46.patch
-	eapply "${FILESDIR}"/${P}-no-undefined.patch
-	eapply "${FILESDIR}"/${P}-wchar_t-uint.patch
-	eapply "${FILESDIR}"/${P}-chmod.patch #487218
-
-	# Please note!  Opts are disabled.  If you know what you're doing
-	# feel free to remove this line.  It may cause problems with
-	# docbook-sgml-utils among other things.
-	#ALLOWED_FLAGS="-O -O1 -O2 -pipe -g -march"
-	strip-flags
-
-	# Default CFLAGS and CXXFLAGS is -O2 but this make openjade segfault
-	# on hppa. Using -O1 works fine. So I force it here.
-	use hppa && replace-flags -O2 -O1
-
-	ln -s config/configure.in configure.ac || die
-	cp "${FILESDIR}"/${P}-acinclude.m4 acinclude.m4 || die
-	rm config/missing || die
-
-	AT_NOEAUTOMAKE=yes
-	eautoreconf
-
-	SGML_PREFIX="${EPREFIX}"/usr/share/sgml
-}
-
-src_configure() {
-	# avoids dead-store elimination optimization
-	# leading to segfaults on GCC 6
-	# bug #592590 #596506
-	tc-is-clang || append-cxxflags $(test-flags-CXX -fno-lifetime-dse)
-
-	# We need Prefix env, bug #287358
-	export CONFIG_SHELL="${CONFIG_SHELL:-${BASH}}"
-	econf \
-		--enable-http \
-		--enable-default-catalog="${EPREFIX}"/etc/sgml/catalog \
-		--enable-default-search-path="${EPREFIX}"/usr/share/sgml \
-		--enable-splibdir="${EPREFIX}"/usr/$(get_libdir) \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--datadir="${EPREFIX}"/usr/share/sgml/${P} \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	unset INCLUDE #412725
-	emake -j1 SHELL="${BASH}"
-}
-
-src_install() {
-	insinto /usr/$(get_libdir)
-
-	make DESTDIR="${D}" \
-		SHELL="${BASH}" \
-		libdir="${EPREFIX}"/usr/$(get_libdir) \
-		install install-man
-
-	use static-libs || find "${D}" -name '*.la' -delete || die
-
-	dosym openjade  /usr/bin/jade
-	dosym onsgmls   /usr/bin/nsgmls
-	dosym osgmlnorm /usr/bin/sgmlnorm
-	dosym ospam     /usr/bin/spam
-	dosym ospent    /usr/bin/spent
-	dosym osx       /usr/bin/sgml2xml
-
-	insinto /usr/share/sgml/${P}/
-	doins dsssl/builtins.dsl
-
-	echo 'SYSTEM "builtins.dsl" "builtins.dsl"' > ${ED}/usr/share/sgml/${P}/catalog
-	insinto /usr/share/sgml/${P}/dsssl
-	doins dsssl/{dsssl.dtd,style-sheet.dtd,fot.dtd}
-	newins "${FILESDIR}"/${P}.dsssl-catalog catalog
-
-	# Breaks sgml2xml among other things
-	#insinto /usr/share/sgml/${P}/unicode
-	#doins unicode/{catalog,unicode.sd,unicode.syn,gensyntax.pl}
-	insinto /usr/share/sgml/${P}/pubtext
-	doins pubtext/*
-
-	HTML_DOCS="doc/*.htm" einstalldocs
-
-	insinto /usr/share/doc/${PF}/jadedoc
-	doins jadedoc/*.htm
-	insinto /usr/share/doc/${PF}/jadedoc/images
-	doins jadedoc/images/*
-}
-
-sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
-	"/usr/share/sgml/openjade-${PV}/catalog"
-sgml-catalog_cat_include "/etc/sgml/${P}.cat" \
-	"/usr/share/sgml/openjade-${PV}/dsssl/catalog"
-sgml-catalog_cat_include "/etc/sgml/sgml-docbook.cat" \
-	"/etc/sgml/${P}.cat"
diff --git a/app-text/openjade/openjade-1.3.2-r8.ebuild b/app-text/openjade/openjade-1.3.2-r8.ebuild
index 338f5e1e57f6..38c5ac6d1c15 100644
--- a/app-text/openjade/openjade-1.3.2-r8.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/openjade/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-text/pdfshuffler/Manifest b/app-text/pdfshuffler/Manifest
index 8f799a5e220f..730d53e20a90 100644
--- a/app-text/pdfshuffler/Manifest
+++ b/app-text/pdfshuffler/Manifest
@@ -1,4 +1,4 @@
 AUX pdfshuffler-PyPDF2.patch 701 BLAKE2B a8ee95b415f121bf7c450a80e9d01c3349ed685146fd375d6aa10bcc7cc3684e1b75ad9986504aeb10d039e897750e7f304f32af8ebe12aaf24b5236f79fe62c SHA512 8496ebb9656e1f9e5ee99184a5d8cf0493ebacedc9f936804aedd784930457d39390b577683e77b6b5264ba50f7e2b202404c40ae426ba42b6f612d7ca193433
 DIST pdfshuffler-0.6.0.tar.gz 48071 BLAKE2B 8bcb513f1dd18cf9d6e17315a7a2ec5bbf5240176acd6deb6ec803900174a39927998210ab5e4aab9a7330821ce7d1ab266e1ae677e03fd51df305ceec9f5836 SHA512 e2563e9b5faf3ebac56f3840017ad9279a5e8e096c9f44ec053c617894910b1d0531457bc37d8fb9bc1db13ae25b94d55ca0b4ec26fbddeb9e51e6b4d75293fe
-EBUILD pdfshuffler-0.6.0-r1.ebuild 877 BLAKE2B cb8ecf84a7cd7895b9f13e044bace9c094cd8ff4cc650a116c5b87862b465f30aba38cd5babba1bcc86a6a6b1b86a6f16169fa366dd5d28b39200046d6c019fe SHA512 0b508ebc13b85bbdab0c74a212f06128755bbcbf9f8969f5dc7f7a81defe3fa428af5f1b891adc8a84f6fdcf6235f8cd31b8114733e4379bf952d5d289f2e01b
+EBUILD pdfshuffler-0.6.0-r1.ebuild 607 BLAKE2B ab262ec61c560f7906036f1ea9bfb64561ffe556912ad60b7579aa904c30e4710c17eb0cc5c9def4d28ad3e100010932ceff53d0eab4e8987a4aab8099de4472 SHA512 2f2ee48f1ede05060b806f2e1df4764f131a73be9a7a890cc4b861dc2b42a186d7af21fb1b6b64a0174c1797f00f21912ffb203e5afe6c23aa0b01075b32974c
 MISC metadata.xml 244 BLAKE2B 551d6af2c99b19299e4d0da0548b49dc84d448ee49adbcc4d1e49580c75369aa9accf1fba724bff40ebbe2a3834105564dfba6f1f60db27502de87291e7974ae SHA512 f509ae4acd33243de7c2f7035971fb1c720da3aea0dac715dc1ce8c7e3e8a0ac10ac4b2089c900df5438a22ce5a03cc8acd946ffa74e4b8140f3c27d38e71ea5
diff --git a/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild b/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild
index 1f2948029b4f..23dcc1238d34 100644
--- a/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild
+++ b/app-text/pdfshuffler/pdfshuffler-0.6.0-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
 
-inherit distutils-r1 gnome2-utils xdg-utils
+PYTHON_COMPAT=( python2_7 )
+inherit distutils-r1 xdg
 
 DESCRIPTION="GUI app that can merge or split pdfs and rotate, crop and rearrange their pages"
 HOMEPAGE="https://sourceforge.net/projects/pdfshuffler/"
@@ -19,21 +19,6 @@ DEPEND="|| ( dev-python/PyPDF2 dev-python/pyPdf )
 	dev-python/python-poppler"
 RDEPEND="${DEPEND}"
 
-DOCS="ChangeLog README TODO AUTHORS"
-PATCHES=( "${FILESDIR}"/${PN}-PyPDF2.patch )
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
+DOCS=( ChangeLog README TODO AUTHORS )
 
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
+PATCHES=( "${FILESDIR}"/${PN}-PyPDF2.patch )
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index aee29af389b5..5bcc7ded9ddb 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,7 +1,3 @@
-DIST poppler-data-0.4.7.tar.gz 4182339 BLAKE2B 85a731e738cce9b6adc7c236ee5183b6494b641a20e4c823900314bfec5bc3c327ae49e35511936c0f3a6f13e25be098b24bd6a91ae04815be6a02149a636563 SHA512 9a865f077f8760a106c6b28302357253c6d63a8f4f10a9506724d1f0ba42e3481bd790ca07e7ee245c63de3650a33c12e80e20e94415a0e37b05225cfe0efce2
-DIST poppler-data-0.4.8.tar.gz 4209901 BLAKE2B ed4dc809044240141db3ec483b7fb272d976eb61febf13b3f1297b27146f8597eb6d817a799da4729192f39873226f6eae6374b86bcf4dad8cde7d0bc9388b94 SHA512 c9435f557ca696fb1e94b6a0b42d401cc911a08f995e3494a7352b47bde5091226f2bb99792ff2b1ee02dfebee66f50f736daca72020a19217ce1c27bde92d54
 DIST poppler-data-0.4.9.tar.gz 4196919 BLAKE2B a986dcff2c2295eeb952adbb4bfc59ccbc53c27668ecc44fcf862bbe3d65062ccdb9302ebdd9b530d9d0ed155666922086b368c81c0772bdab284e323e6ac436 SHA512 45afd378d0bb415c5e1bc9718025328058712c0bde6d529d2c7a4813b12f600be46ecd2ed2454b3f83fb9f8cad157b75d11d8c5d1ca849f347c310b58132ff7a
-EBUILD poppler-data-0.4.7.ebuild 787 BLAKE2B bff0b033eb916cd9a7b19f77f3b888047842cb9130a42e5f94e2cc6df42d3d4f5ac31338b427b1b8bf155d0f4de9b448b6f641d92978632df5aa317c28ed584f SHA512 57558ab6909cb93d40ac4193580c03a959949f27ad559f9200506af6f8e36ffb0e8c50bed1e8deefa548cd02391bd5097cbdcbcd42e6f30610a4536dd8fea485
-EBUILD poppler-data-0.4.8.ebuild 798 BLAKE2B 00a4ab43ff8962444ee45435eed5e578599083915867b0d29d7cb978319cab5e441179d405a07dd97d161c45ac7fbba08b1c06e4a69ca1ac036314eb2196bcb9 SHA512 9ff80bc42f0004e01901ded0db13c115282758692f48c6626ed1c4228f8be2ef20ca34552819f1ea80bf967e96147b59f09c7a0e504747b2ca77fcf729c5776f
-EBUILD poppler-data-0.4.9.ebuild 787 BLAKE2B 4562c91d6479ccdec467fe69ccc7daf8d829a4be64cfbfb51a9d246b92e66c66ff14359b70561469e8fd62460fb0a26e88461da3c396cae3f2a199cdfa2d536e SHA512 8722626a90cdbe4718b6afc5bfd57822a78fd7c966af63370cbb40819c53901aae99757fa6be536383e6eb48fc800eab2d939d196024d5716c1a9469fdf2d100
+EBUILD poppler-data-0.4.9.ebuild 784 BLAKE2B 16fcced2eed5171ab935902a5858875b9296d2b5ee1943bfa370ec03c34b90febe46875e853c1448b2ff24733276ae333207ce13150652b5bd458e4397680f13 SHA512 c90e6209acaf9f379ffd4ca2068ac251abb9f02282ee230728946a3fcd2a8687bc038a4a7fcd4ea702a0441b6a05e9c7cc657611b12ef199a8b15bbb1371d778
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/poppler-data/poppler-data-0.4.7.ebuild b/app-text/poppler-data/poppler-data-0.4.7.ebuild
deleted file mode 100644
index 8583800548d5..000000000000
--- a/app-text/poppler-data/poppler-data-0.4.7.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
-HOMEPAGE="https://poppler.freedesktop.org/"
-SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
-
-LICENSE="BSD GPL-2 MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-src_install() {
-	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
-
-	# bug 409361
-	dodir /usr/share/poppler/cMaps
-	cd "${D}/${EPREFIX}"/usr/share/poppler/cMaps || die
-	find ../cMap -type f -exec ln -s {} . \; || die
-}
diff --git a/app-text/poppler-data/poppler-data-0.4.8.ebuild b/app-text/poppler-data/poppler-data-0.4.8.ebuild
deleted file mode 100644
index ecc3bd95ac2f..000000000000
--- a/app-text/poppler-data/poppler-data-0.4.8.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
-HOMEPAGE="https://poppler.freedesktop.org/"
-SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
-
-LICENSE="BSD GPL-2 MIT"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-IUSE=""
-
-src_install() {
-	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
-
-	# bug 409361
-	dodir /usr/share/poppler/cMaps
-	cd "${D}/${EPREFIX}"/usr/share/poppler/cMaps || die
-	find ../cMap -type f -exec ln -s {} . \; || die
-}
diff --git a/app-text/poppler-data/poppler-data-0.4.9.ebuild b/app-text/poppler-data/poppler-data-0.4.9.ebuild
index c8d965ff016d..fcd701289a51 100644
--- a/app-text/poppler-data/poppler-data-0.4.9.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.9.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://poppler.freedesktop.org/"
 SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="BSD GPL-2 MIT"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 4377d2efb4c6..34a659a51fbe 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,13 +1,11 @@
 DIST qpdf-7.0.0.tar.gz 7053781 BLAKE2B 1abd54a3cdc24c3e56ac81cabaa56be8d2217961abfc026cbd0c0141aea3efb6c75b9daf2fe9f6fc0f09efd224d241fa859bd37bcd972df4e4837318497d774e SHA512 7b52d67b4d2c428a7b0c1cd03b03a23f05d38d7e3c81041079a137919019ea5158f12bf95fdcfcff6b43ffdefe93a85127ced2a363a6b4b380cbaa02a3840256
 DIST qpdf-7.1.1.tar.gz 7099282 BLAKE2B 9658dd1cc6f8d0e3dd13137db147e0f954f747b5bb6b1577f70a236b1f67c5513713889dca77181a9b25f1a2054a8ec5cbfda60866e97b2d43e60b494752c9fd SHA512 a75f988c7dd7ac174bdc981cd3696ca8b539ac6c581e3afecf601dc67277014cb4fe3f0e5cb75a67412cafa4eb645b2fc2d8a0ec203834464baf0c7e80baa0b4
-DIST qpdf-8.0.2.tar.gz 7952979 BLAKE2B a9c81f41d6b5e3e9f80dab8325fffbedb8740ae500efbf4f4d2c27aca1778b1e2c438b7aba7846bd62874e2ff4265bb50b3b3d3d32302fb3e4583ba0251bf8f4 SHA512 f6d062f011d87f3f1df44e96e5dec0cd4b1b5f800dc6c088bf1313b2c96922d2f3c1b6eb1109a6ef00c558144b85dc20aeb85f937b73a3b594633aa67104f5e3
-DIST qpdf-8.1.0.tar.gz 8243624 BLAKE2B 6db64282353bedca91225f2f5a9bc2a568872209d9c6b392374412e561bcb37d8e17223ecb34b332ebc7a83aa826bf2e85fbb0b3eeee3f055b24f343a26eed9d SHA512 1831bcaaed87dae268db5d61805d1483ec5c101f6ce594be660664c119597ae67cf011c2b50092964d785a814d5f6c780935127a89401fe37a1026ae4d3af15c
 DIST qpdf-8.2.1.tar.gz 8256216 BLAKE2B 67e9b897ed938b9dd2e8508efaddd4dd6f63568aa23332ef72918a0888cc1e1b8fe844f0c1424b8ab568ee5ce42f8efd04293cd525e9d8de0c5fe7b352f49367 SHA512 ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c
 DIST qpdf-8.3.0.tar.gz 8915504 BLAKE2B 961e6534a389f2f42ce86f5f7cab9534bdda32c998622cd7fcf1f2d62cf42444f8a3dc7d1582e691b81b9571d5578ad78e278136ac6ace23a31113fe177ba34e SHA512 9982a489cc6b9c880adc7decb18f1941930a86f430a00505f230364fbadf83c5afd832a1ccf7966a9453cdbb40b7c60db438f7b27d836a242eefb07a77d7284d
+DIST qpdf-8.4.0.tar.gz 16981811 BLAKE2B ac0f7b6ab0ca5b421229bf3813cba6b59cc5b7472080246b1384db468e14a4e634f00e1e9e9347e2f8ac8d7e5c15c1b1c18e954f4249298e5ee4778f996fc4ee SHA512 13225c6285311e8fe89970971b082b9613e70d474ee71dd5572f1ae268234d366c2c9c7bf427c4758a746a1a27ecc0127d31044ab501dbc08885c8aa0a514028
 EBUILD qpdf-7.0.0.ebuild 1234 BLAKE2B 303e3943f8429ab560cfef1d62b1c35f2dbec6c2e27fd6436fd8cba9eec5d8247bf4df27b2093f5a5936295452c171b81a7e07f3b888b98fff428ad7b566d109 SHA512 bc0f824517bf3d7837243162e11cd7a1b973fc27f984f2486cfea23047a7df185f5d4adcdbc82fa7c7b39a9aa6a31c80624e76fb5bda9d92aa2bff4dc457efb1
 EBUILD qpdf-7.1.1.ebuild 1243 BLAKE2B 99023977c552d4fb2b6d2177f60664d01867a5f5309a79c9e192ac4b8f6c6394649f2bc58717114bcbce15c91031ad00dac38364353c1121901722b7f4240b6a SHA512 5f9e78903502e37430b8b2dda10507fb5527b47dd76aaa1afd56dbf3453ed5a209720c0bed72e0f5c2a8aa055b27403c340b1eeb8c870274e450b9bb055e347c
-EBUILD qpdf-8.0.2.ebuild 1247 BLAKE2B 764bccbf564caebf07f28c24bdc84fc9b14dd8a494aa529d27c32ad473443cfce21ef062cc74a2b5e0a44c6e61f40f123611140298cfe9051fd7e68604a555e9 SHA512 7370df6aa8c3ac1609488169d6aed641fbcdcf7130ccee68a1f24ddaf153cf9564fa02b2476851c4141d81b0dad39481f5db77ac836aa1a950744a6961a1e447
-EBUILD qpdf-8.1.0.ebuild 1247 BLAKE2B 764bccbf564caebf07f28c24bdc84fc9b14dd8a494aa529d27c32ad473443cfce21ef062cc74a2b5e0a44c6e61f40f123611140298cfe9051fd7e68604a555e9 SHA512 7370df6aa8c3ac1609488169d6aed641fbcdcf7130ccee68a1f24ddaf153cf9564fa02b2476851c4141d81b0dad39481f5db77ac836aa1a950744a6961a1e447
 EBUILD qpdf-8.2.1.ebuild 1277 BLAKE2B 032b88e0dc73e3190245e08977a6a630a184a8dd148ae8dfc22687ad8dd5c3cfddcf8344292ff457aedb399308e1a599e4f5d871c0d7d19570d47a14ab090563 SHA512 4c600512d4795870437795c9ac00ef7457d7ae5841e67fa06edd0cad65481d67f454c699ba1ab7335791bfac5aa124859056578a061932ebd513a512cea58a52
 EBUILD qpdf-8.3.0.ebuild 1278 BLAKE2B e32c28130f8b8e90cb022fcf78fbbd4f07b94455557f41b74c6645113d89ac2f33ff7c277d89e5dc16bd3b5e0b2502aa35f99c5e74804a3422a5e9c8848aa8f9 SHA512 c589c5ca6d96c9e5b48c62e5f1bac9ca26025c6a97925443805c64d51f0267a8b05497531fe55f2c352eae14f0349bffbe275fc79cd7ee672b5e54db7776ef5a
+EBUILD qpdf-8.4.0.ebuild 1278 BLAKE2B e32c28130f8b8e90cb022fcf78fbbd4f07b94455557f41b74c6645113d89ac2f33ff7c277d89e5dc16bd3b5e0b2502aa35f99c5e74804a3422a5e9c8848aa8f9 SHA512 c589c5ca6d96c9e5b48c62e5f1bac9ca26025c6a97925443805c64d51f0267a8b05497531fe55f2c352eae14f0349bffbe275fc79cd7ee672b5e54db7776ef5a
 MISC metadata.xml 438 BLAKE2B ccb3c4e7dace8650c11418fecc8c5fdd7062692f83c99f60d3b73fd698f1fea19dd429a92014267388d04ea57e00652499768c88aaffd7e0e3f66e53c84f6449 SHA512 4c1aa514207b18e7b4de0585545d1c7b5def7f42be9d43726801f9a9ae7b129b91802dedf4e3eb9f2595a26e3863918c029b927ab42b6aab7ab0130c000ff843
diff --git a/app-text/qpdf/qpdf-8.0.2.ebuild b/app-text/qpdf/qpdf-8.0.2.ebuild
deleted file mode 100644
index 4458411fa22f..000000000000
--- a/app-text/qpdf/qpdf-8.0.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
-HOMEPAGE="http://qpdf.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 Artistic-2 )"
-
-# subslot = libqpdf soname version
-SLOT="0/21"
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
-IUSE="doc examples perl static-libs test"
-
-CDEPEND="
-	sys-libs/zlib
-	virtual/jpeg:0=
-"
-DEPEND="${CDEPEND}
-	test? (
-		sys-apps/diffutils
-		media-libs/tiff
-		app-text/ghostscript-gpl[tiff]
-	)
-"
-# Only need perl for the installed tools.
-RDEPEND="${CDEPEND}
-	perl? ( >=dev-lang/perl-5.8 )
-"
-
-DOCS=( ChangeLog README.md TODO )
-
-src_configure() {
-	CONFIG_SHELL=/bin/bash econf \
-		$(use_enable static-libs static) \
-		$(use_enable test test-compare-images)
-}
-
-src_install() {
-	default
-
-	if ! use perl ; then
-		rm "${ED%/}"/usr/bin/fix-qdf || die
-		rm "${ED%/}"/usr/share/man/man1/fix-qdf.1 || die
-	fi
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -name '*.la' -exec rm -f {} +
-}
diff --git a/app-text/qpdf/qpdf-8.1.0.ebuild b/app-text/qpdf/qpdf-8.4.0.ebuild
index 4458411fa22f..320e39eb2a68 100644
--- a/app-text/qpdf/qpdf-8.1.0.ebuild
+++ b/app-text/qpdf/qpdf-8.4.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
 HOMEPAGE="http://qpdf.sourceforge.net/"
@@ -34,22 +34,24 @@ RDEPEND="${CDEPEND}
 DOCS=( ChangeLog README.md TODO )
 
 src_configure() {
-	CONFIG_SHELL=/bin/bash econf \
-		$(use_enable static-libs static) \
+	local myeconfargs=(
+		$(use_enable static-libs static)
 		$(use_enable test test-compare-images)
+	)
+	CONFIG_SHELL=/bin/bash econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
 
 	if ! use perl ; then
-		rm "${ED%/}"/usr/bin/fix-qdf || die
-		rm "${ED%/}"/usr/share/man/man1/fix-qdf.1 || die
+		rm "${ED}"/usr/bin/fix-qdf || die
+		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
 	fi
 
 	if use examples ; then
 		dobin examples/build/.libs/*
 	fi
 
-	find "${ED}" -name '*.la' -exec rm -f {} +
+	find "${ED}" -name '*.la' -delete || die
 }