gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-text
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
192 files changed, 1445 insertions, 1619 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 2bdb49cbe3c0..91a868fb3b76 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/XML-Schema-learner/Manifest b/app-text/XML-Schema-learner/Manifest
index 22161f9b3c7c..a7a44c0061b9 100644
--- a/app-text/XML-Schema-learner/Manifest
+++ b/app-text/XML-Schema-learner/Manifest
@@ -1,3 +1,3 @@
 DIST XML-Schema-learner-1.0.1.tar.gz 51057 BLAKE2B db9e5c6176484278fcc050c201f4ee3c560536fd1439cadf1f7c2be29e967ef9d84a488ec01045cc3887f527a0cbaf53649bdb4a505f11df17c5697b344a6fd3 SHA512 f357c1a99ac6a7f807538910dfe5e19b14f789046816d333cb031addfbffc0858fd5641f52dcd7304417d0cf0b6c45d1eb3f2092652c4891c09fc45dd26feb9d
-EBUILD XML-Schema-learner-1.0.1.ebuild 1031 BLAKE2B 73c8a5380ba8d61b8e0f91b6d1dce2267aa1ba589dade647bf3fb064b166608afc8d0e9fce6d89b2abfe2c48b040524b9d7c1f69ebc11d69c902c07d4c8296bd SHA512 24aadcfe0f5418b49ceeee240c6c770bd1c97d60c690ea263e9d422c7235d30888bede59c1a0c99daa9079dd55b500c41a2248ad25934da8a4c777ad09208aaf
+EBUILD XML-Schema-learner-1.0.1.ebuild 1058 BLAKE2B e235d747462f8e96c5bbe907b7ee7f9f3d83a142e8f3b5aa7759f4b15286e1c421513a38ceb064a01c20bf0eac63fadd684cb813f390fe0ac48b25517a47fcc2 SHA512 839a22ec4d82f1df20baa1b67a1119ef17138b204a140c212de979b9e92fd7625c7d006e5e3cb6478027f90d82c8e860fa761c3adc953c7b3c3412d53ffa174a
 MISC metadata.xml 942 BLAKE2B 99cfdc01afc572294b15a21d4a14a3e272c4e465e276d83990e01c6e03273730348265d3615da5fd3c5c1dc73e4c688d20ba161c9f4021f719357f1109f6c1c1 SHA512 48e0d860bbede84a76773ad1a77620cdee393eb0894f63461371ae7cb12a43fa0b640bb2dee17eb3eeb22fbe24899c90da704a74f70075e722e83f5d0be86bb2
diff --git a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
index 0b0e2413742a..8da9a7b4ee68 100644
--- a/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
+++ b/app-text/XML-Schema-learner/XML-Schema-learner-1.0.1.ebuild
@@ -11,6 +11,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 # PHP dependency can be inferred from .travis.yml in the repository.
 # The necessary USE flags on the other hand were found the hard way.
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index f49fc77806fe..bb0cd4a173a8 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -13,7 +13,8 @@ AUX a2ps-4.14-ja-cleanup.patch 3210 BLAKE2B 599c8bca7f599c3ffda2d1a071d9ca5c4d47
 AUX a2ps-4.14-psset.patch 616 BLAKE2B 1554f3ea640b1e44cecc6b0cb6a2f593f1dc1aeec36b5f9a9d1e98c847e431a0848d35a0139ce1541cba55eedf3de619f6b5dcfd4099641112d0f4fe3c8ee251 SHA512 3118d91519c81e5e9f46a5386e9db757936231e71047ba8579b3d969a7c824bad6325b54221a61a0b171bb87669b548704a068bc71a1cd3b48d3a32416fe0c0f
 AUX a2ps-4.14-ptrdiff_t.patch 367 BLAKE2B 1a69ba36b72a08f3c853905d9d2a0f787259f4f1252ff83d4eb8ae09788aa0017a332847c9d4cb4a16096ecfe84197769ca6fca7cab239fc7da7b113e48d0d94 SHA512 b9ebff895614a20b8f9e891ce53cf0f7ec38452619f7e907deadff22840a019737dd129690f5ffec91f7f798ae03bd0c7c62f1aa751589865f589362825038c5
 AUX a2ps-4.14-texinfo-5.x.patch 5996 BLAKE2B 720a408c88c848fbe9b6ece319a8eb05a109df97dd2c25a26ed8a4ad8f49d545d111900cedc4d5eda05b4aa120b9f1f4aecd6434c6f20f1944d863b13d4952aa SHA512 1e93a21cda8547a49d09e429c8ffed23b68e7f7555fa356f615bc76eef059a0065cc71e62bb4f1a1239aaf140796195c7d264c5c884e1a89516facbdbcb955d9
+AUX a2ps-4.14-texinfo-6.7-encoding.patch 1372 BLAKE2B 3eb51e4c83e60f7073c4957963dfe92931fa63eee1410e615171f1f823e21702032ae7dca9ae397851e0620df40a09c8e09bbb0ff12e2843b3c7aa511adda8ec SHA512 31d77113c5a727cc2aa72bc31a6e961cfc5d5871c40aa1f59f3edbadaa06ba55cb35bf6cf9b142276c83ac0a69fa49df9eb157d732fe44dc392f7dac7e014db4
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
-EBUILD a2ps-4.14-r6.ebuild 3576 BLAKE2B 66e1a0aabfd2032310af35ce798a5b5e21b2089a93ff5a5396246fdc2bb1c8f83d1ebf820cda8a9e512d219f6d99e9bc7268c3a7479fa58f25fc123bdb07bf98 SHA512 755386abe294f22aa129fb098b53fdf1e69c44d594268c41a6dc44f48cc9a7d9b9fd7ee80fdf1089efc2135212cf13f1e3480f58a6ef93ac5cd77741674921fa
+EBUILD a2ps-4.14-r6.ebuild 3628 BLAKE2B 9ff12ac976e3d26ce92f74e6d068cd1caa487acbcab917b6670c8bb780393d2dc2a44dede7751f75c6af6edc54fb4cab6f66035e7737eef9770f79ba6367c781 SHA512 9da8c75603b70b2ca8469a9ebf2a5ce099fc335875ff7ee5d702fce91aa4f633227a54ee40a74cc8d59396a10a94765a045186166b1744ffbbda9bea32734215
 MISC metadata.xml 346 BLAKE2B 5f3d7c0d868dfb3ce0ec6e47c33087f9d41b6b2e11d569c48b1a6a635f1a46e7cbb51e793f7df235c4b9dc20eb2eb24a5c8764ca2b6eee34a900d1f4641c4de7 SHA512 0973b9c922d40a291ad52b590c40ef122167070e2f3c2c30980a83188bf8ed8742d825542ca1ea88139fd7ceb0e251f91dff13822ffbec4c9a6af2ea2b7a0010
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
index 272fed2bb5cb..33b91a41bf4e 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,8 +23,7 @@ RDEPEND="app-text/ghostscript-gpl
 	emacs? ( virtual/emacs )
 	latex? ( virtual/latex-base )
 	nls? ( virtual/libintl )
-	userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )
-	userland_BSD? ( sys-freebsd/freebsd-ubin )"
+	userland_GNU? ( >=sys-apps/coreutils-6.10-r1 )"
 DEPEND="${RDEPEND}
 	>=dev-util/gperf-2.7.2
 	virtual/yacc
@@ -77,6 +76,9 @@ src_prepare() {
 	# fix CVE-2001-1593, bug 507024
 	eapply "${FILESDIR}"/${P}-CVE-2001-1593.patch
 
+	# specify encoding explicitly, bug #695918
+	eapply "${FILESDIR}"/${P}-texinfo-6.7-encoding.patch
+
 	# fix building with sys-devel/automake >= 1.12, bug 420503
 	rm -f {.,ogonkify}/aclocal.m4 || die
 	sed -i \
diff --git a/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch b/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch
new file mode 100644
index 000000000000..df2a60f395c5
--- /dev/null
+++ b/app-text/a2ps/files/a2ps-4.14-texinfo-6.7-encoding.patch
@@ -0,0 +1,40 @@
+https://bugs.gentoo.org/695918
+
+The patchs fixes build failure against texinfo-6.7+:
+```
+Malformed UTF-8 character: \xcb\xeb (unexpected non-continuation byte 0xeb, immediately after start byte 0xcb;
+need 2 bytes, got 1) in pattern match (m//) at /usr/share/texinfo/Texinfo/ParserNonXS.pm line 3364.
+Malformed UTF-8 character (fatal) at /usr/share/texinfo/Texinfo/ParserNonXS.pm line 3364.
+make[2]: *** [Makefile:472: a2ps.info] Error 25
+```
+
+Fixed-by: Neil Bothwick
+--- a/doc/a2ps.texi~	2019-11-24 18:51:07.000000000 +0000
++++ a/doc/a2ps.texi	2019-11-24 18:56:30.390438433 +0000
+@@ -1,5 +1,6 @@
+ \input texinfo @c -*- texinfo -*-
+ @c %**start of header
++@documentencoding ISO-8859-1
+ @setfilename a2ps.info
+ @settitle General Purpose PostScript Generating Utility
+ @c @setchapternewpage odd
+
+--- a/doc/regex.texi~	2002-03-04 18:46:24.000000000 +0000
++++ a/doc/regex.texi	2019-11-24 18:56:42.861052598 +0000
+@@ -1,5 +1,6 @@
+ \input texinfo
+ @c %**start of header
++@documentencoding ISO-8859-1
+ @setfilename regex.info
+ @settitle Regex
+ @c %**end of header
+
+--- a/ogonkify/doc/ogonkify.texi~	2007-12-29 02:09:38.000000000 +0000
++++ a/ogonkify/doc/ogonkify.texi	2019-11-24 18:57:03.173424149 +0000
+@@ -1,5 +1,6 @@
+ \input texinfo   @c -*-texinfo-*-
+ @c %**start of header
++@documentencoding ISO-8859-1
+ @setfilename ogonkify.info
+ @settitle Ogonkify
+ @setchapternewpage off
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index b0343f8653b3..aca1fac39634 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,5 @@
 DIST ansifilter-2.14.tar.bz2 441884 BLAKE2B 90b3b0330866da11c00b105aa79164178aebecf39131f5c8d8e373091f53d2d8bbced54472c975a61857d594a9fa92ce08d018523f471fde445d4548d48b949b SHA512 a0b7f12ea5b9ef9b5845a03484a2e238a9f60e0e49f8eddca8bf24b47faba48aa0b55f922678b3bf1b3f08857bbe9a8285b3f318f2adec84673bc502e21b6802
+DIST ansifilter-2.15.tar.bz2 441381 BLAKE2B db55f8a21aada3aa851a099e5a19a3f3bbf81b8ce5d75b31600cbc47f409306e74f57ff51c52266212fa3c59730fac0d416e99f1fefe8a7009bd357ea216b0cd SHA512 4c30ea11665ce0876664c77fbe69c377d5e692508a54b4629e9b6363c1f223b65ac91d20fd61d6d8cf719d1b391ca6d94d69dabbacde7c2dc460330d530a09af
 EBUILD ansifilter-2.14.ebuild 1004 BLAKE2B cc405c8153cb0b54751498169307b13302f25242c9e1e2a7164f69c982fbb048266f05a100a04dbcad97c825cfa992a149a0b664ace821f719cbb670b3463213 SHA512 caf0d3364e39d7a66cc4b6684d9f5277f60af0c44a13ca10462370f475e9c4e98baa393b491a1810bc3cdb824c6c67bbd5bfee4ad13c7c4ca4f4a8d10bf90dec
+EBUILD ansifilter-2.15.ebuild 1006 BLAKE2B 080cb34e7ad7ca1d89a47db0786a34dcae1fc6a9f14a53010192e655ff1a18db4ceb449f6d9653977bea05ed2645897372776f90cedc11538e43452c105e8382 SHA512 79aa89bfdbbceeacfdb80d851047a20676b7d01ab4c7229ef8e9b94bf29bd79253bb79e7666af695e8776d405c649659f7c2e625a277a56f6f7430ce9bac38a4
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.15.ebuild b/app-text/ansifilter/ansifilter-2.15.ebuild
new file mode 100644
index 000000000000..e993d7be98a1
--- /dev/null
+++ b/app-text/ansifilter/ansifilter-2.15.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs qmake-utils
+
+DESCRIPTION="Handles text files containing ANSI terminal escape codes"
+HOMEPAGE="http://www.andre-simon.de/"
+SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="qt5"
+
+RDEPEND="
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+	default
+
+	# bug 431452
+	rm src/qt-gui/moc_mydialog.cpp || die
+}
+
+src_configure() {
+	if use qt5 ; then
+		pushd src/qt-gui > /dev/null || die
+		eqmake5
+		popd > /dev/null || die
+	fi
+}
+
+src_compile() {
+	emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
+
+	if use qt5 ; then
+		pushd src/qt-gui > /dev/null || die
+		emake
+		popd > /dev/null || die
+	fi
+}
+
+src_install() {
+	dobin src/${PN}
+	use qt5 && dobin src/qt-gui/${PN}-gui
+
+	gunzip man/${PN}.1.gz
+	doman man/${PN}.1
+	einstalldocs
+}
diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest
index 8c0e8adaedac..b59782699128 100644
--- a/app-text/antiword/Manifest
+++ b/app-text/antiword/Manifest
@@ -1,5 +1,5 @@
 AUX antiword-0.37-CVE-2014-8123.patch 528 BLAKE2B 612718b3af9f3e91b5b755401a124c65268c482075b4f96ea71260f63e43d8fc5a1e009dce5a6ec527a56e013e4627855ea20259a6d72154e51ca0abf870554b SHA512 412884a236abb5ee75e5c707581c7e0158614d0e168cd9a8fe02dd8dcb8c0963ae2269c9575cd9cb9f4876efb3bec6bef7934fec5c7738530012495637a2d694
 DIST antiword-0.37.tar.gz 317884 BLAKE2B f47c815e2c6a1ddb33fefa33b3579fa5ba6e3900d3b9339350d28ebd0223853ad60ed717a1bccf4960c835427ebacc4de944548f9b354cd34889f0742de4e74a SHA512 6cd8fb9137238417544cf8754829a2d5296055d730ea62a8a025236baa79516190317d146401ff40cde73e1ee2c3c374a2ea01b2e5d24e149310bcabb8bfdce8
 DIST antiword-gentoo-patches-r2.tar.bz2 1747 BLAKE2B c01aa7c02539fb5148cb1ec01983a8406315bc3cb2f909118c022c2f218660919e6862582cda34dbd4c08a21beb02c928f685273853d1ff3350548957ae30cde SHA512 45ed3ee1c514a9ee78bc8963e56be18426b47ea628f02934dbcec83c2d632162e458f75f998da438daae4794fcce36fd8922a172804c0fc83c6f32c9a8092ffe
-EBUILD antiword-0.37-r1.ebuild 1431 BLAKE2B 2367955fe72a8c5d31e86fc8fb9303b858f4605e07d02458f63ce8d66fc35179e1ab5a6679cc31ea57f93f3e412dfef48e370b74384e4240f72741e64fbb7c8b SHA512 fdc188c4658e1093e4f843711a1843da8e827f1c737a627e54000bb3b4d16827eb828c52019b64adaca2fcfb20e6f57b29271f8d7c21241fc7fd9878c0204585
+EBUILD antiword-0.37-r1.ebuild 1381 BLAKE2B 0e2161bf4fc71bbdf466aa8f279104231163dba8286c1f06b399889a7798651842118e8a003ab2a0342505f883be4dc4660af55735ac3378d74994d47bbebbce SHA512 f214ecea89b8cf04974cbf9c6bc940ce96683998570b5ec90e19648be2fce441d2ce5809b932bd2156379152d585bcaa5eec833bd888c26fae07d411df1ded85
 MISC metadata.xml 343 BLAKE2B a255d4f9a7079612cf94d69b3136bf3dc5d1ac638629e02430c96512b039fbaa0d1d05a216f7181c7269a1701c096292e47251769581d1f4dc5bb1559c76501a SHA512 6a09982bb72f873e6fcfc90d8dcb8db7b06c11b43633793303f511b5bdc86f83a2b2ab560f6ce1e4b62e334c16cce96fd9b0ad983caee6381612a4b4102ccc09
diff --git a/app-text/antiword/antiword-0.37-r1.ebuild b/app-text/antiword/antiword-0.37-r1.ebuild
index 7aafe949cf22..53c8c77377b0 100644
--- a/app-text/antiword/antiword-0.37-r1.ebuild
+++ b/app-text/antiword/antiword-0.37-r1.ebuild
@@ -33,18 +33,18 @@ src_configure() { :; }
 
 src_compile() {
 	emake PREFIX="${EPREFIX}" OPT="${CFLAGS}" CC="$(tc-getCC)" LD="$(tc-getCC)" \
-		LDFLAGS="${LDFLAGS}" || die "emake failed"
+		LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
-	emake -j1 PREFIX="${EPREFIX}" DESTDIR="${D}" global_install || die
+	emake -j1 PREFIX="${EPREFIX}" DESTDIR="${D}" global_install
 
 	use kde || rm -f "${ED}"/usr/bin/kantiword
 
 	insinto /usr/share/${PN}/examples
-	doins Docs/testdoc.doc Docs/antiword.php || die
+	doins Docs/testdoc.doc Docs/antiword.php
 
 	cd Docs
-	doman antiword.1 || die
-	dodoc ChangeLog Exmh Emacs FAQ History Netscape QandA ReadMe Mozilla Mutt || die
+	doman antiword.1
+	dodoc ChangeLog Exmh Emacs FAQ History Netscape QandA ReadMe Mozilla Mutt
 }
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 0b38452e508b..d928f1251498 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,3 +1,3 @@
 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
-EBUILD asciidoc-8.6.10_p20181016.ebuild 2554 BLAKE2B 368368ee6e9043a38d1f6fcd32cd9cc1ea07b1b387b839d439693b388c77b2d969cfcfab43b9ab0fdd153d0571bde3f61140d7b361137470b5c05d42d413ddea SHA512 12b321f595458d9b73b72cd921460ae00cb75a0e0367f332ef8db9de583641f634302632c65d4d57b29a3fe2d6180005187b05d029d23cc758fb2669a0094de2
+EBUILD asciidoc-8.6.10_p20181016.ebuild 2581 BLAKE2B f464549e9a8859b08dd56450f329cfaf79777d13555b94e5d9484dbe91f202cea53f8d866aa6e0b3cc953889b34e9f7750b259231e892f481d81432d73b7b69b SHA512 c322af897f414085411c465736670d327fc6922d123e21ddadaf91714604600049924abdde5bd73824b342f9c799832969b35471de7331a9d9bb54f085934955
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
index 78348887c8c9..d7bf7ae33f54 100644
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
@@ -16,6 +16,7 @@ KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sp
 LICENSE="GPL-2"
 SLOT="0"
 IUSE="examples graphviz highlight test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index ca3a74ddceab..142c4e27bc25 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1,4 +1,4 @@
 DIST blogc-0.18.0.tar.xz 339920 BLAKE2B 03dce446c60c5337e85dedda8516a8417b770f294e019794ba6e3216b93f79896c851d690a37c3e24f218c8f9080f8271256647909b7dfaceaafb8a7d62d52d8 SHA512 db015d00b96af19b9f8cdb3023d073bdce45d41f731beafc0eba7219abb6bf31e435a08644145e56e2d783939542245dfcb6c20bbd27f27348de84ba4ca9e41a
-EBUILD blogc-0.18.0.ebuild 1117 BLAKE2B 3a7d101207b6828738eb3c7e9896af1c8820bc3db4352b45dacd01d19ba8d0bd6d6b316617e92e5e6cdf1b35577406877c978796cbd60f344bafd250be0b19ea SHA512 4e439eb3dfaac7ce6eb5bc8c6d832f829e4049b95ce9fd35f442876f91e27732a24ee5b53be5ef8a993bfe38272e205739810ad0df2e444eb8121a48fb66d689
-EBUILD blogc-9999.ebuild 1120 BLAKE2B 234392dc7c1e42c3bcd2c3ac4b1a648ee9e4fa6fc486cfcc60ef0af1c0cfb97ea68bc2b2ce3da820bdd88f05ef5993b7dc6589e52137d8d1e7cbce19d9c0a064 SHA512 ed4c808f2cfa1435972a53ae17f76a9e3423943713759cb7ad7378e6417a3912dbb16e0964d963dac8a476be37c90a42d8f875128101ee806f12a8ab11a519d9
+EBUILD blogc-0.18.0.ebuild 1144 BLAKE2B 6764ab70e01f55931815fc6602163bf8dd46ea9dbd043f9c7593dfe027d1b1e139da20d5f706d00d34154a213a88e1518424dea7b63dd16e6b0d68c400dba37e SHA512 dd59471fdfb17d2726afd914c8a95a3c07ed093115252786d8e66984cd03e1ed6500910ae1c443907d08bea0b6f21d18c2a0aab380d8d05f5521a908961ab4f1
+EBUILD blogc-9999.ebuild 1144 BLAKE2B 6764ab70e01f55931815fc6602163bf8dd46ea9dbd043f9c7593dfe027d1b1e139da20d5f706d00d34154a213a88e1518424dea7b63dd16e6b0d68c400dba37e SHA512 dd59471fdfb17d2726afd914c8a95a3c07ed093115252786d8e66984cd03e1ed6500910ae1c443907d08bea0b6f21d18c2a0aab380d8d05f5521a908961ab4f1
 MISC metadata.xml 785 BLAKE2B 90817e117dbf1f0e60d655206ad0cc3f3cecf2b97a16ba43fdf84ae0f621ee6296af2ab6a17bb205d82b1d107be3f62b75d9c740aeab0267b02947a4bcc50aea SHA512 31230bdb8113bb73662328e0e657e710cd33e65f126d638f0cefdacbe97525643604f48ce3da27f80b8163d129092c7df7eee265cd6d6194cd0181b138230206
diff --git a/app-text/blogc/blogc-0.18.0.ebuild b/app-text/blogc/blogc-0.18.0.ebuild
index d5c7c49e8ea5..e436f3de74d1 100644
--- a/app-text/blogc/blogc-0.18.0.ebuild
+++ b/app-text/blogc/blogc-0.18.0.ebuild
@@ -22,6 +22,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="git httpd make test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	git? (
diff --git a/app-text/blogc/blogc-9999.ebuild b/app-text/blogc/blogc-9999.ebuild
index eab99becb995..e436f3de74d1 100644
--- a/app-text/blogc/blogc-9999.ebuild
+++ b/app-text/blogc/blogc-9999.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
@@ -22,6 +22,7 @@ fi
 LICENSE="BSD"
 SLOT="0"
 IUSE="git httpd make test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	git? (
diff --git a/app-text/bogosort/Manifest b/app-text/bogosort/Manifest
index 607b0c22c33f..61e20911caa3 100644
--- a/app-text/bogosort/Manifest
+++ b/app-text/bogosort/Manifest
@@ -1,5 +1,5 @@
 AUX bogosort-0.4.2-glibc-2.10.patch 1479 BLAKE2B 6d5a6e9ff7f43a5275e8db8d1478a06ab69863105ffdfb3ed821bdbb7b901f2b0ed9b9158ee0795ca4e1dc01b01c5a3fdaedf5bd4996d3d9bc5ec4a89492e6eb SHA512 742b473df18b8eee876857fc3fa14bacc95bce4e14d083deb066d4451385437cd040cf40b6c572762c047b1aaa3e2ee973f2d880c5915993bf6a4ba130a776e4
 AUX xmalloc.patch 395 BLAKE2B 0ec83824e8ac740512c3c241cf2df352ca5b5d05a38507288fe5f96512eebb94d5532af0cfb6e05fcfcac9c10c96091584b917966629268e9921d964e8adb0c5 SHA512 c1479f342d71e1c53a2b038bc7bf858292c6585b8360b41c6006a4ef0efbafc3260cf8523efedee945c084247851186dda3450ab0533465c33176b038a8c0243
 DIST bogosort-0.4.2.tar.gz 161628 BLAKE2B 92abbb809747e3fdfd2a6e33f7f753f1ddccd4ecd9883f0a02fc843f8f680e0a5e6e6b65c3943708ed074a944e5187bb889297365ae0dd34292215b056bd46fc SHA512 2d2f7be36ec08aa78323cbdc5f1030297706c364d6fc82554065cf737295d11c90dd6061323f2732b63c70401d710b2018075bff6d1e6ab0078069b405ea62e9
-EBUILD bogosort-0.4.2-r1.ebuild 702 BLAKE2B d70ee1662cb0528e340837d4a95a5165edfe4387d92ce5d9512f16335ea8651718087b7c9960986f5f188dd6c28004ef10e2fc69989531b492e8a47ad77313d1 SHA512 7baec5a2de60f5bbef8689c12d6fdc54a3fd40dee3b64877af819422f986c50fb706c52906486a055af2ef16650e908a3c5b960181dba14b1ee14955d5c7a769
+EBUILD bogosort-0.4.2-r1.ebuild 688 BLAKE2B a46cc0d2432200d146aab46355166d8b27cd13978af6c8116d6a2b200b7d3a4538d871abed9a26143d15c4a5c0d0ce5a562b04b7a164fc509549ae056d1fe4bf SHA512 292acbf36b12e79a76bdf53624b39f45667998c4dfa06f767b17b46ca965145ecc8fb3d3dc40bfb64ceeedb74aac8699ae7d5c78f407ae971940d0e6050970a7
 MISC metadata.xml 500 BLAKE2B aeef2d2944fbcde35a34db35b8461e3fb22d5da60e0e6fee48cecbcd45991d44aa4511e0907587369c2a7c7bf2c735260ed516b5b9292e1fb60bd7a2e9c3859d SHA512 4975f3dcbf7a97db8c64835a83f45a0be5d3c34aaa9fe9f8b2e2e8bd5aaf102fe35a2f4dc609bbcd115ad08d86707818033c7b7759c17a3f233417af67604edb
diff --git a/app-text/bogosort/bogosort-0.4.2-r1.ebuild b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
index 5eff84f8ed58..f62f8e4978fa 100644
--- a/app-text/bogosort/bogosort-0.4.2-r1.ebuild
+++ b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
@@ -25,10 +25,10 @@ src_prepare() {
 
 src_configure() {
 	tc-export CC
-	econf || die
+	econf
 }
 
 src_install() {
 	make DESTDIR="${D}" install || die
-	dodoc README NEWS ChangeLog AUTHORS || die
+	dodoc README NEWS ChangeLog AUTHORS
 }
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index c15552f5d60b..b8855b2a73a5 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -4,12 +4,12 @@ AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcd
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-3.47.1.tar.xz 38710008 BLAKE2B 60915345dd756d085386af61128e92569304be64aadbc21b69973e93adf3fb5cc88f7250153c238ecf423546f408bfc094b5bce329a54e7f080f831c4a8c23c1 SHA512 010796b3ac3fc6adcdf26dbc7966946be0f48b2684e1317da11d77fa55151d1f6ad2b86adf3c8eced5559823567e6672bfdfd953c17e6cc978894544131fb6bd
 DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
-DIST calibre-4.1.0.tar.xz 36231016 BLAKE2B 85987b8b8b37deb40f9ebb7d918e15e9a763cca00cf26eab841d0035309bd066f675d50d1ca94cb65e512d1964bac4241b3006aa38cac14ec0cb5e2d6416d2a8 SHA512 9a4766ccec830e553b5165f9a3b1111a6b4d0dbadee8b6a6547fef1dc3ca51adc886d9c3d751af23f4ff3a30a0fe03606c70ab57245ea38bfb486c111fd0e82e
-DIST calibre-4.2.0.tar.xz 36319240 BLAKE2B a37baae9c77ae2535782c5ee2095a33874c394b7f6415f4aac2752330c6cac3972723e75b90d38955a67a5df90de4318b740ca357b7149f610245f1895482437 SHA512 653dec2ba7a7ca122425619dc148765aea5cd60ede7fab23c1b10b0a7ba70f055bc6167732d4e21f161f37b313a7f2f9dde81240e1226a11a24b1195c9e38866
-DIST calibre-4.3.0.tar.xz 36472072 BLAKE2B fd187d1b68ac60c26c11094b0d19123f24ac93cde1e9939b71ecd4756c7a40ab55e4e36128763ed7f312df18a5152da418828ce84f4514a8747df8ccc3de2365 SHA512 7b95459df5a65f3c6ea743ef8e45b2f859c5bd4991813c583380c173c8f0dbba07128e8dbe09f2c6133706367c76add9b3387c8fbc6e2587d0723b7ebfa41351
+DIST calibre-4.4.0.tar.xz 36389440 BLAKE2B d6f6bfb98dd95012a7d145d7700a2818974b2d2e9f8faf1d98b931283305c92ec7e136c9569ef2074d748cc39819e53186ab250b8331d60253d23fddaa1f8a41 SHA512 0204f47db53bc3d649f43276460152423f994cf321661db315904916997121592e0edfb0b9212fbb593d50d3faef0762a2dddd4a7568d1f72c7eecb6b952d278
+DIST calibre-4.5.0.tar.xz 36472092 BLAKE2B b742f897b45e3832e5d8ebec93d8223973b6f5b6d6b3074a07e529eb4b823fa63cbf55c2d6b46ee7e0b5868dc45a858d0a841ce6b9a071ebc27a8977c44b00c6 SHA512 0d024ca7bda1ba9f2bb20fd02af1c4225d63c1a1e1bd71bf7760c214cec9ccf821fe31859cf389c6e45ba7fca21c706e5619f2066b600571f17660c52d84bd09
+DIST calibre-4.6.0.tar.xz 37397188 BLAKE2B 145f329bb4dfeaffcc1a1dec741cf7f0d2bb943bc343f83828ad3755452c6313e59cc2e1518d8b05120746928080bc2c0de52827202c6a45733495bddf9995ed SHA512 4a057ffa6a77dfcec99a7ac89caf98045e2884af5a2833aed232620bd668ce92f542c903ea3817cfc05bbdbf10d89be029a459924d889fc83c8151100779a70d
 EBUILD calibre-3.47.1.ebuild 8350 BLAKE2B d59300c7f0fc9a85c5a2862b0ce844c76e83a30cec434351e1df98d3741cd0a21dff80a52548903d25da29421121e220d8ee02a3f629f56bb11f7b3f9f5873c8 SHA512 53f70f860b5e8b9e33ac49a598c03b6e3a075b03377461008ca77a0ae2518d0e899c1af19fca611850e3e16c6efb5cfce1241afa2cdce0cba82c704fcec05d9f
 EBUILD calibre-3.48.0.ebuild 8352 BLAKE2B 92a2d894b2ad0966588854cdece96930aa85e240699eb185cc32a4b7ec0b3e98c34e7cac2490c44b1909bc1e4fc92f7d5094ed8f6159e08ae22ef98d7156f06c SHA512 df60b94324ccfe704195af5a6188ea6a793767e342e058b1f5039f52ae7fab6b16e95266a0876f6ea8118b5e4a014d7d1e3636b58280d611ae94918e359763d4
-EBUILD calibre-4.1.0-r1.ebuild 8451 BLAKE2B e464f58bea125fa5651adc2226d853a702c0ca6af0b32382bd33899874023f8a94fbe4f799f121900312ed4f57c4322e8252bedb90559eaaeae29396ee7e6be0 SHA512 5f17a88f540a62249f180024216d4fb36a7d3e0d832fa45a62cda72ea2b5cf7e9433fa19244a7134f42ab1abc8e1e0e52e63ee9ead526a8ba0cd2f95aa9cb4de
-EBUILD calibre-4.2.0.ebuild 8451 BLAKE2B e464f58bea125fa5651adc2226d853a702c0ca6af0b32382bd33899874023f8a94fbe4f799f121900312ed4f57c4322e8252bedb90559eaaeae29396ee7e6be0 SHA512 5f17a88f540a62249f180024216d4fb36a7d3e0d832fa45a62cda72ea2b5cf7e9433fa19244a7134f42ab1abc8e1e0e52e63ee9ead526a8ba0cd2f95aa9cb4de
-EBUILD calibre-4.3.0-r1.ebuild 8503 BLAKE2B 4e94ad847b26f6831cf6e3b8039f25e98b6705caef49c0a48388299e53c5242e74024f8df3c57e9a4530ca23f2a2ce2960df6a4efb725ebeec31a8aa48019d0e SHA512 b426805e6753fb3c021a64f2788e0f2cc3c180a763fd2936a4d151a92c1b472896a68d527f73dfcc875bfc3d159fc5892182dff19a8281c97352fa2d80b013b7
+EBUILD calibre-4.4.0.ebuild 8503 BLAKE2B 4e94ad847b26f6831cf6e3b8039f25e98b6705caef49c0a48388299e53c5242e74024f8df3c57e9a4530ca23f2a2ce2960df6a4efb725ebeec31a8aa48019d0e SHA512 b426805e6753fb3c021a64f2788e0f2cc3c180a763fd2936a4d151a92c1b472896a68d527f73dfcc875bfc3d159fc5892182dff19a8281c97352fa2d80b013b7
+EBUILD calibre-4.5.0.ebuild 8503 BLAKE2B 4e94ad847b26f6831cf6e3b8039f25e98b6705caef49c0a48388299e53c5242e74024f8df3c57e9a4530ca23f2a2ce2960df6a4efb725ebeec31a8aa48019d0e SHA512 b426805e6753fb3c021a64f2788e0f2cc3c180a763fd2936a4d151a92c1b472896a68d527f73dfcc875bfc3d159fc5892182dff19a8281c97352fa2d80b013b7
+EBUILD calibre-4.6.0.ebuild 8522 BLAKE2B d475c2bac249c353afa8b6806e91099aa9cac4805b3541f046c424c0d45f8bd1e88e51796752ae3b81f5590dfa7b6480274b91c651448970e143a486529aae4e SHA512 def3bd07821ae12e5f78e6ede830bb14b9b4f65bf0450805740e56a117f8afe33630e0fc3f7b2415151a92b36fd0ed3c42a7dc5cc2d3f1000608165bb59a1609
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.3.0-r1.ebuild b/app-text/calibre/calibre-4.4.0.ebuild
index bd7b7fd33648..bd7b7fd33648 100644
--- a/app-text/calibre/calibre-4.3.0-r1.ebuild
+++ b/app-text/calibre/calibre-4.4.0.ebuild
diff --git a/app-text/calibre/calibre-4.1.0-r1.ebuild b/app-text/calibre/calibre-4.5.0.ebuild
index a435558ef333..bd7b7fd33648 100644
--- a/app-text/calibre/calibre-4.1.0-r1.ebuild
+++ b/app-text/calibre/calibre-4.5.0.ebuild
@@ -55,6 +55,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=sys-apps/dbus-1.10.8
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+	>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
 	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
diff --git a/app-text/calibre/calibre-4.2.0.ebuild b/app-text/calibre/calibre-4.6.0.ebuild
index a435558ef333..4f133b668aa3 100644
--- a/app-text/calibre/calibre-4.2.0.ebuild
+++ b/app-text/calibre/calibre-4.6.0.ebuild
@@ -43,6 +43,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-text/poppler-0.26.5[qt5]
 	>=dev-libs/chmlib-0.40:=
 	dev-libs/glib:2=
+	dev-libs/hyphen:=
 	>=dev-libs/icu-57.1:=
 	dev-libs/libinput:=
 	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
@@ -55,6 +56,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=sys-apps/dbus-1.10.8
 	dev-python/dnspython[${PYTHON_USEDEP}]
 	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
+	>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
 	>=dev-python/html5-parser-0.4.3[${PYTHON_USEDEP}]
 	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
 	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
diff --git a/app-text/cedilla/Manifest b/app-text/cedilla/Manifest
index 51db8cde98a5..83c7d1080488 100644
--- a/app-text/cedilla/Manifest
+++ b/app-text/cedilla/Manifest
@@ -1,6 +1,4 @@
 AUX cedilla-gentoo-r1.patch 645 BLAKE2B cedc4626df03c6706c5fee463cd2b662f1b5e297050cb3e67e585609319daa013d499f37fd6cff1ce2a10fcb21626e6b5178dc5545a02eef0778c404cd00f9fb SHA512 4a9d4c4f28509e2b527568a28a69dbcce0c4e7a8d6ae9a967dfb33ff639f12a5dae16a885b0f51686d3d444c9f651cf904bb5c93326308fc37e13d4ec8bb4162
-DIST cedilla-0.6.tar.gz 130676 BLAKE2B e316dff5ab9bb89dd350e9842847ed700846cfd57370be17198aa3c54f0562a4c26d23a49acccf8c7dc0b55f1765668dbfa24dbf57f50e568ac3039f7b5d662c SHA512 95d98fd4ab95b48023f635d61133ea1a8138a797cd1c414da0d4907531eb067ac147e8d612a528373da425d37fee7c1139dc7f0019308938c096e37caebf4e38
 DIST cedilla-0.7.tar.gz 114899 BLAKE2B 100c22be30ffed585a1eb44c96109dadab9cbf90c5c3432efd4ed8daa135fa0d9fb82374eda9f9f13126cc5d453ecb5933d8733a58e374ab3192ea7d5bd6d273 SHA512 a137bceee2c70e911922b17e823093dc37b19cce8dece99596003ae7b4bc8c02afbae164d7dfa4e4873b4f549f7d948faf1da9dc1d3ef89cde6d1f36ba91be77
-EBUILD cedilla-0.6.ebuild 697 BLAKE2B c1f1bcb2967e8c6068d3b6906dee9ca5279360689e4aa80836d72aeca426db5d94631ee8f541acd3b71c89084965e87919b9e2a64a7ed837ddcb93c25e9c2e04 SHA512 61c7d132115f2e255de5b1aad34397541f89fdaa1ebd24dab36e7b2d71bac7e592884a78d36bc3addd8108133091455bd0025c28c672787f0a995b0bba919fae
-EBUILD cedilla-0.7.ebuild 654 BLAKE2B b784971be122031e96b156d0cf2d2b6930bb97236101a931b92094c0860e817618654fbc42ca3828222daa1208065722b62ba1b60d13c13c7ec163f9b2d4f92f SHA512 66dc5955c4b7391b91fa8f0cf521b5f1a7b8962c2ba8ded1c379dc678ed197db3217bf661da9cfa55569161acf45f70af95955d44e092d703237bf7afb01ade3
+EBUILD cedilla-0.7.ebuild 649 BLAKE2B 6491e1c55d4f35f6dd6215491660cd55d0ef22c5033eda5297ce64df10292674d1b318a9a706247f33a73050451d6f214e523b896da480d0adaa94b8ca68b55e SHA512 a166c90c1c9d95b8b2617e79328b19e39a7786833c089cb84b98ca4f7b220f2a6307ab41df9c551336273c5382567693f1fe8da3eae0da40a40e727855af7be1
 MISC metadata.xml 253 BLAKE2B 34807135fdbc8396660d3fa85339e80c0c14693b937e360de963062b40d1a4306d86c3f6fbe60c45146632f934695d26c06083a2977031c36bdee17f57140f72 SHA512 06255a02d9a177532c33fb7a9271f8f538cef82354feb7689c839e2eb1516d53fd0e78aca22fee2f9a19dbf1e3f7ad96dea23c8d97efdac952e4b754314664d9
diff --git a/app-text/cedilla/cedilla-0.6.ebuild b/app-text/cedilla/cedilla-0.6.ebuild
deleted file mode 100644
index 720592e2a72d..000000000000
--- a/app-text/cedilla/cedilla-0.6.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="UTF-8 to postscript converter"
-HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/"
-SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
-
-KEYWORDS="amd64 x86"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE=""
-
-DEPEND="dev-lisp/clisp"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/cedilla-gentoo-r1.patch
-}
-
-src_compile() {
-	./compile-cedilla || die "Compile failed."
-}
-
-src_install() {
-	sed -i "s#${ED%/}##g" cedilla || die "sed failed"
-	newman cedilla.man cedilla.1
-	./install-cedilla || die "Install failed."
-	dodoc NEWS README
-}
diff --git a/app-text/cedilla/cedilla-0.7.ebuild b/app-text/cedilla/cedilla-0.7.ebuild
index d6e687479ec5..62a85f40d12f 100644
--- a/app-text/cedilla/cedilla-0.7.ebuild
+++ b/app-text/cedilla/cedilla-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ DESCRIPTION="UTF-8 to postscript converter"
 HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/"
 SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index 989d47be2539..bb59b5718566 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,3 +1,6 @@
+AUX cherrytree-0.38.9_update_setup_py.patch 748 BLAKE2B de89314f017fed48e2433bfbffd47b117234e779e80c9c2a8eebe80371be95a2b8f8fa4941544c674695121396e34e8b65c558ff3e642f74eab83d693fc22a78 SHA512 26a2f7e92717cd2e0e2f60b6df2ed2a861ba77a94b957e1841cd57f3377044ee1b52e179d3566795c9501472a76530a25f4c752a9046ac341bb533ead86c7d41
 DIST cherrytree-0.37.0.tar.gz 8888703 BLAKE2B 737c0c247c581086e23e4c3e5fba0b18459788b385078ec8092af8b7352d77c8b273c939f702178d0ae59c8633bf996a7a7e5223e22da703ced3c8bf1d7cbde3 SHA512 a1aaf92657c58c70430a45adaa771050b43476bc2a33dc929b108842d5ef46aa83c4fa4cfe8c4f54a9a3656fc0d30046fae34cbac5aa9fe3f32aa539058636f5
-EBUILD cherrytree-0.37.0.ebuild 1191 BLAKE2B 106630e09107a750bed11980bcb458fc39e194e7a6b03a3bd2d0a045ca84ba5e34f1337f92f3dad2e36a4f2c1cb979e6dfafa6a6434febf569ae482747ad26a5 SHA512 2cdb77421a542d6070be7fa933de3c083c0865f6cc58d93815ee9faf52c47f34154eb4acd7f0c6edea7c091e243789ee7824256ef947c725c3c78b5248de5e19
-MISC metadata.xml 250 BLAKE2B 9676935c062d76f3e06a49612672d533ba7f431e0819084758da368a632e3cdfbaa68da7e367b0847ed2e66db4e5a41377dd80819cca08af3dbce53fb3622d36 SHA512 c9d9bb6db803a0958073fb76a3d26192374ec85b66ccddaac01829afea556302126f99dc6158d71ae4cc9e5152da0ce203ad527ffe923edb6239c7ff43e19a76
+DIST cherrytree-0.38.9.tar.gz 9928805 BLAKE2B 4de4187ae7e650090d82de5e8b1b7f85c4af6dbb2c9b2bc67f10b074db4c08c4b4593c4769708bfaf584958eefe083a3626f7e9c4d7736bc53d143528c754e09 SHA512 40c1c26fa1a6868b447d31625c14b10cf712185289cf97b71881c253d2f72c58f51b974a1615fca5b532099c4741c56f8419df2d02e4ca821b2a1b909152e56b
+EBUILD cherrytree-0.37.0-r1.ebuild 1132 BLAKE2B e5ae77a4c323746f0a868ddb93ad875e1002096f584702a85953843a27ad87ceb15acde9526fc7bade6aa5c064d8aab667bbae4cc8fb372d1a950124925fd26a SHA512 387fd2dca8b5eaa9e633652ef969ddbb448ca3a50028afc26bba5a6020a5b150a5961dc9c7e3ed8f2d08fecf0694830898d1b6cc391ede10a57ddc80524f24ca
+EBUILD cherrytree-0.38.9.ebuild 1215 BLAKE2B 8c2ace0779ac24e801a5c70cca565bdd0022035dd8de2483fb2969662021e6ff838166c21738ba167c470bd495741362b8ac067bad7cc7f5138e8b58ef2867f0 SHA512 8271aad0b8dd6c8cac7d59ff0ea9e83b212f2513ca62971f31ba5abb87f7aebc5b3c3e2fce80ef1ce515ef7e051da58be17905769997196de033cf287ebf8d66
+MISC metadata.xml 444 BLAKE2B d40087a12c79b778c4af5cd9b7eea1299941df716a11351acb087ad6ff3bc64e271bc54014b4fd9402fc679cd15d63a91ab5c1b8a838a9203b463e0ed21e4b60 SHA512 f3a43e7c407bbc442b165e5fe5401a1a0090f925bfb34b1e1fb6e46a068c274c5202f32f5e733b8abcfbee33e59677cd0b85017fc544f5fc1cfb7a0ea5156448
diff --git a/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild b/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
new file mode 100644
index 000000000000..b7c0b37e37f2
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.37.0-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A hierarchical note taking application"
+HOMEPAGE="https://www.giuspen.com/cherrytree"
+SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="nls"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+python_prepare_all() {
+	sed -r -i \
+		-e '/\bupdate-desktop-database\b/d' \
+		setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+	use nls || mydistutilsargs+=( --without-gettext )
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/cherrytree/cherrytree-0.37.0.ebuild b/app-text/cherrytree/cherrytree-0.37.0.ebuild
deleted file mode 100644
index 70d1db48a137..000000000000
--- a/app-text/cherrytree/cherrytree-0.37.0.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
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-DISTUTILS_SINGLE_IMPL=true
-
-inherit xdg distutils-r1
-
-DESCRIPTION="A hierarchical note taking application"
-HOMEPAGE="https://www.giuspen.com/cherrytree"
-LICENSE="GPL-3"
-
-SLOT="0"
-SRC_URI="https://github.com/giuspen/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	x11-libs/libX11
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/pyenchant[${PYTHON_USEDEP}]
-	>=dev-python/pygtk-2.16:2[${PYTHON_USEDEP}]
-	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-"
-
-PLOCALES="cs de es fr hy it ja lt nl pl pt_BR ru sl tr uk zh_CN"
-inherit l10n
-
-python_prepare_all() {
-	xdg_src_prepare
-
-	if use nls ; then
-		l10n_find_plocales_changes 'locale' '' '.po'
-
-		rm_loc() {
-			rm -v -f "locale/${1}.po" || return 1
-		}
-		l10n_for_each_disabled_locale_do rm_loc
-	fi
-
-	sed -r -e '/\bupdate-desktop-database\b/d' -i -- 'setup.py' || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_configure_all() {
-	use nls || mydistutilsargs+=( --without-gettext )
-}
diff --git a/app-text/cherrytree/cherrytree-0.38.9.ebuild b/app-text/cherrytree/cherrytree-0.38.9.ebuild
new file mode 100644
index 000000000000..80af20d9208c
--- /dev/null
+++ b/app-text/cherrytree/cherrytree-0.38.9.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+DISTUTILS_SINGLE_IMPL=true
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="A hierarchical note taking application"
+HOMEPAGE="https://www.giuspen.com/cherrytree"
+SRC_URI="https://github.com/giuspen/cherrytree/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="nls"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygtk:2[${PYTHON_USEDEP}]
+	dev-python/pygtksourceview:2[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]"
+
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+
+PATCHES=( "${FILESDIR}"/${P}_update_setup_py.patch )
+
+python_configure_all() {
+	use nls || mydistutilsargs+=( --without-gettext )
+}
+
+src_install() {
+	distutils-r1_src_install
+	python_optimize "${D}/usr/share/${PN}/modules"
+
+	dodoc README.md changelog.txt
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch b/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch
new file mode 100644
index 000000000000..aad93f93a154
--- /dev/null
+++ b/app-text/cherrytree/files/cherrytree-0.38.9_update_setup_py.patch
@@ -0,0 +1,17 @@
+diff -ur a/setup.py b/setup.py
+--- a/setup.py	2019-08-17 14:23:16.000000000 +0300
++++ b/setup.py	2019-11-17 15:33:44.243070851 +0300
+@@ -195,7 +195,7 @@
+                       ("share/mime-info", ["linux/cherrytree.mime", "linux/cherrytree.keys"]),
+                       ("share/application-registry", ["linux/cherrytree.applications"]),
+                       ("share/metainfo", ["linux/cherrytree.appdata.xml"]),
+-                      ("share/man/man1", ["linux/cherrytree.1.gz"])
++                      ("share/man/man1", ["linux/cherrytree.1"])
+                    ],
+        cmdclass={
+             'build': BuildData,
+@@ -205,4 +205,3 @@
+           },
+        distclass=CherryTreeDist
+     )
+-    subprocess.call("update-desktop-database")
diff --git a/app-text/cherrytree/metadata.xml b/app-text/cherrytree/metadata.xml
index e69a8d811bcb..92aea49ad5a3 100644
--- a/app-text/cherrytree/metadata.xml
+++ b/app-text/cherrytree/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>email@linxon.ru</email>
+		<name>Yury Martynov</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="github">giuspen/cherrytree</remote-id>
 	</upstream>
diff --git a/app-text/cmark/Manifest b/app-text/cmark/Manifest
index 04038d994c4e..21893633e282 100644
--- a/app-text/cmark/Manifest
+++ b/app-text/cmark/Manifest
@@ -1,3 +1,3 @@
 DIST cmark-0.29.0.tar.gz 234545 BLAKE2B 1571cdf08f85142ff790db811b7973f2d95a7b1c8669af467cbeac1ad0907826a46f7e0e3ba717ba677746406f8372e40b9878f7810d317fa3c0e14db06dc8fb SHA512 06eb110cfd90c9e980c022b7588e28864d15a4da5d07d61ad4b27c6de47367492b9e58e9434e62b07517aa6dc484f17af13916808be3188f38c37d20cbf33112
-EBUILD cmark-0.29.0.ebuild 718 BLAKE2B 06384835aa4b35c5fb363d313433709ff48f8dcd79ce4b61c9513f9e569d4025f53b677bb932ba00e12843fbcf39506de0825fbebd8cd7ea8feeb2a7cb963999 SHA512 774047d8090655c41ba2e76b474fb8baa4fc9723370d58e33fab80802dbf049e49769cc5856d7b2d01bcaff88c3604022cf6431a40e2c1b31708e8eefb17de0c
+EBUILD cmark-0.29.0.ebuild 745 BLAKE2B 6c6499f3d8fe6dca58c635bc381d6d2c26a3dc4c16fb175c9c819b8ffa0afe6b95e68e6255ea5dd259529ef3ec7f98d246e1c728139f537dbd895ce3b5b08cd5 SHA512 1a7a4f350afbe83a3c0ce4d1dd6dc6f34bb465492177a1823439ca7f78a1c4eba2b5d34a30af281c0fc1299d618ec394853797b9dd580fe78edac62d54c4b304
 MISC metadata.xml 577 BLAKE2B f99edfb972715ce4b1660a5e68c0261c9b8d8f2914f5bd804227bbddeae1528205bbed55c20d6d366ecfdd6a01a69bb31decd57ed40f0440de4946e86339e659 SHA512 93ccb3c6ec9907489589f3aae77d00eb2858d5d436b78be1f711a060f47fadf92d2da8a81a9388ae7946ad1b6a93cc88cb96bfe15cdd81b1e56bdd7f4750a4c1
diff --git a/app-text/cmark/cmark-0.29.0.ebuild b/app-text/cmark/cmark-0.29.0.ebuild
index b9dfe5085714..2b06582a87f9 100644
--- a/app-text/cmark/cmark-0.29.0.ebuild
+++ b/app-text/cmark/cmark-0.29.0.ebuild
@@ -15,6 +15,7 @@ LICENSE="BSD-2"
 SLOT="0/0.29.0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="test? ( ${PYTHON_DEPS} )"
 
diff --git a/app-text/cpdf/Manifest b/app-text/cpdf/Manifest
index 71fb9e71a5e9..51f833738f6c 100644
--- a/app-text/cpdf/Manifest
+++ b/app-text/cpdf/Manifest
@@ -1,3 +1,5 @@
 DIST cpdf-2.2.1.tar.gz 704730 BLAKE2B 1767d2c9fdc645b4ff97b828b1d7bedb22aa645444f299e36ec4717015ea7b87dbbac4c9ec27bb508a7adb28b2c75c155bf9094a168567abbffa93887712241d SHA512 3dda72513c551cca5d8cb60732b3f2c2e8ad400bd2c9fcf0c3b54a68e94385e3f19ec7713de95efa90eafb7b0077662097565a28616041019e03edf140b6af4f
+DIST cpdf-2.3.tar.gz 384594 BLAKE2B 391cc2d88ae5ad2decc3911ea2125345cb337e15f059b2411f8e835f91460bc0cb28410ebe8a15bbf3c2c5ba511f89b0bcfec8ccae3aca69658fd6eb55c64dc2 SHA512 db17bd019a6c2a719761662af682cc74a7dbcc673c22867652cef37508b6d3dcbf4d5da9d9db9e8b1b0cf912f03be18f16748ab15dcbdfbdfd37900d4fd04ddd
 EBUILD cpdf-2.2.1.ebuild 816 BLAKE2B f6066dbbf981ba0e665e824432220024bf0c61dc2a86c4282adfebe37e8e21f8c1243a5e4bc523b3124ed40e76bb63e530402545489756af1289b4833df0da43 SHA512 6f9deef5e952035000287006c0a435ba5338bbd1d7569646738bf903683af208888a154367e2639a0abb2221d6d12dbc35376b71672442a25f2ae2283c783b34
-MISC metadata.xml 347 BLAKE2B 2f11a4f77be2b5501b6789daa1724cb1933313963450fa1df91072c095cab406f3907bb2656715022ffff4be94e6b8f4e70d5beae1feeb3b3fd5a2fa1c8413a1 SHA512 e97b4580d3d0e3c06a6e24aac842e66a354e2a9ea9eb70486383143999a2c8a188bdc5ac2d5672ae1ed83950f94d8fcce3d8c3a4d701009bd4102b88bd4b715d
+EBUILD cpdf-2.3.ebuild 823 BLAKE2B f2c254bc43decc98b70086acad8be52f9a3b85f70e51710863be39ef5fdcc237fca32a75dc52ebfa03350b5cccb43646d896fe1d46371874c34edd0cd2563670 SHA512 60855f500235a1fc2a3fc07a24e9699293bbdbffe0bc29ddc822e0cfcf43a4a34a8d54129b0db4022dabe89ff59b879c2b261c33700bfc86a46743b260ca66ed
+MISC metadata.xml 263 BLAKE2B 3ffd66543a6648ea0c9e61926708d5c754267db0c37f87a3eb0fa8cbd4aab9741b3a3954a784035b87b4f8464c2d9ee8f88b91d4ce085aaa6f44baf0ce6795bb SHA512 cc4f5613180a963e23d81b036e6e1993129818f421a695da9807cade662d1d6a16c5f470d2ae599479125dc87c5a41398db7056fc9cc0b2bcc8b4dd7c9efbbbe
diff --git a/app-text/cpdf/cpdf-2.3.ebuild b/app-text/cpdf/cpdf-2.3.ebuild
new file mode 100644
index 000000000000..3df1825ad110
--- /dev/null
+++ b/app-text/cpdf/cpdf-2.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit findlib
+
+DESCRIPTION="A command line tool for manipulating PDF files"
+HOMEPAGE="https://community.coherentpdf.com/ https://github.com/johnwhitington/cpdf-source/"
+SRC_URI="https://github.com/johnwhitington/cpdf-source/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# BSD is only for xmlm.ml
+LICENSE="Coherent-Graphics BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lang/ocaml-4:=[ocamlopt]
+	~dev-ml/camlpdf-${PV}:="
+DEPEND="${RDEPEND}"
+
+RESTRICT="mirror bindist"
+
+S=${WORKDIR}/${PN}-source-${PV}
+
+src_compile() {
+	# parallel make issues
+	emake -j1
+}
+
+src_install() {
+	findlib_src_install
+
+	dobin cpdf
+	dodoc Changes README.md cpdfmanual.pdf
+	doman cpdf.1
+
+	use doc && dodoc -r doc/cpdf/html
+}
diff --git a/app-text/cpdf/metadata.xml b/app-text/cpdf/metadata.xml
index 86681fac3204..a6f3d7a17c81 100644
--- a/app-text/cpdf/metadata.xml
+++ b/app-text/cpdf/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">johnwhitington/cpdf-source</remote-id>
   </upstream>
diff --git a/app-text/crm114/Manifest b/app-text/crm114/Manifest
index 53b338d12c69..a62693299eee 100644
--- a/app-text/crm114/Manifest
+++ b/app-text/crm114/Manifest
@@ -1,4 +1,4 @@
 AUX crm114-20100106-fix-makefile.patch 1796 BLAKE2B 370bc77608f77960be4c4ecb88e3729eb62fb9e46e15fcca673ae8f4e4efcaf4425f30cd6beada25d8eb9fdf741dfa449c4e2a5c3ca9d06eab9ea25524e38136 SHA512 3011a85116510fce131bd3c13b5ec1e4faeefdb1eebf114782d417fb9ce8050ce15cae05f8b651728335233641be1e870fe48702fa620b542a8f1c963853b81c
 DIST crm114-20100106-BlameMichelson.src.tar.gz 724672 BLAKE2B ce5c3078030f2c4e78833edfb107d78e134a02c339d28411f2f60d4a67c333904d2ed0cf32a087997a72d961cbc5dabef46fb6c692d99fb509abd4161bd0094b SHA512 bb95fa50d6feef1a127e39e4005c4964b0096c3c7059f63bbf2293042351cf5ceeb7590fd1bedc64291ba556dfba96856dba8554f2f52a6cbaa3ad65012809c6
-EBUILD crm114-20100106-r1.ebuild 1952 BLAKE2B 50da2788d3be437460b30b92140dce34c09dc244231f22d1ece22a195fcb1c9d7e723109cfd84b650d493d840038929d7a9bd57bc060a22883e1ae3b6005219c SHA512 01140268efd7fabd47c8b759d4d978e189588d0aa0c097c6b1b1beea604959430fa1bff87bcbf059b778681c9f9dd498cab25b47762c602e5daccfc5cde52ce6
+EBUILD crm114-20100106-r1.ebuild 1976 BLAKE2B 5c6a24de5ffdb634d170ecca1ca8a08e9df262fd1cae4f3a5ccc614b753ebc96bbebb459959cc4be815c327c5247940abee298709df20c19e037891da3fbe02e SHA512 7f8f8bb01dad899c8976f5a3ea2b068a4ef34e087a63dd14e1710d96205ddfac1f90957da3a6d3fae9dae8857746e191c0840b2701da32a21527e09581d025c9
 MISC metadata.xml 707 BLAKE2B f66efbf9497eb73a927c0cbbd87fa3da5617adae4102940135f983ebbf6ce18d3e2f2a3aa8721aa4395d54977fd0d3ff44387610906bcadcde869e46869ba932 SHA512 9009a38eaab5b49e3ec537785dc2e45601afd2ef0bd1c2f7a0ab7f8f24c80feb7bd99c2e47e6835d8bc4fffeeb8d6628df02c260ff5198905b209c6606c2352e
diff --git a/app-text/crm114/crm114-20100106-r1.ebuild b/app-text/crm114/crm114-20100106-r1.ebuild
index 9e28d628eaec..c141b5c7c517 100644
--- a/app-text/crm114/crm114-20100106-r1.ebuild
+++ b/app-text/crm114/crm114-20100106-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="examples mew mimencode nls normalizemime static test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	static? ( dev-libs/tre[static-libs] )
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 8eb1ad75dc2c..55acec09c47d 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,3 +1,3 @@
 DIST discount-2.2.4.tar.bz2 99482 BLAKE2B b04c372cef27d0a4a09a588eb66376dc70494eefe5c8a9e7aedb8075f081a6f32eafbb9671c29deea7d89128f4f30c93d38c17268eccbb1c917db6c1b7d3e040 SHA512 0650e0ce3f6948e3a30fdaa1a810e895f64621c55df46c7a5ed8755e65c1b718b7a1d1a1bfe0a87a3a59fbb13fca8907718f1aa095125a4b6e152602b8e490cf
-EBUILD discount-2.2.4.ebuild 1792 BLAKE2B 6e70971e50f0528c4d33b883e3075e694d6ff88167d96137114e485720732ff5ec9431d6bfca127f138baddd4f5b16ee5d4c2a477f7fdf349fb395f92ff6107e SHA512 ce1d64060cfebb55143596e6605ca64cb7640529800531573232f61d5d730d6c34407e030bbf0cd875ce775cde387262762abb13e8a2bed2b43323ba8eae8872
+EBUILD discount-2.2.4.ebuild 1819 BLAKE2B f4b36bf7d003bf01a4a0db7d8b6c5c086b992a73d1c43da5c1d23d2cef856d7f86b84fdf4b962b5e8396d82e212e102386ea2d08ddf715d53f8ada7d070cefa2 SHA512 4a1038c3289588bfb2535ea4ed556e359d12d43f4cf7cb368cbcc704c0a08c36949a6de0bc848962b1966800dc0a980a3475ed6601cbe053546befe84cfc8cca
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/discount/discount-2.2.4.ebuild b/app-text/discount/discount-2.2.4.ebuild
index d4d34cd4f43d..6fa776e65d63 100644
--- a/app-text/discount/discount-2.2.4.ebuild
+++ b/app-text/discount/discount-2.2.4.ebuild
@@ -13,6 +13,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE="minimal test"
+RESTRICT="!test? ( test )"
 
 src_prepare() {
 	default
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index 91f9a2832abe..05c0bb0d40a1 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -3,9 +3,9 @@ DIST docbook-xml-4.2.zip 78428 BLAKE2B 542a2b658a10e0eee4928666a2edbdbff12e96dbc
 DIST docbook-xml-4.3.zip 83865 BLAKE2B d231a6e6ba3d8023d83358080d136880a5d65b4b3b135b2f60e3a784d2f2231d12e1e9d1b5284a7d3fa1b9281466591e0438adbf6160d33732e3611f5c58f21b SHA512 f5090fb74884bae3d4fac8a3c5060bffff5d6a74272de183c181a7642e4b91f4ed32ad028537d198010782c3d98575ce679672f76a9749ed124432195886a7cb
 DIST docbook-xml-4.4.zip 96107 BLAKE2B 3616c20758de6c14e08f2a9b32682da33be741153d4586c8062d6ff895f0158decc188c5e1db4f0caafbea14afb139e39bd6805842f7bedc18f0770d22e0d2d3 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76
 DIST docbook-xml-4.5.zip 98497 BLAKE2B 3487f4488a9e3dbc3e366d63b61940727287a97f4e0ee2d2dda031cbba96cd4d85e5b729b7ee4d32e8a6842748fc688f85c94e1a0ab2f7ebc062dd8c7b800e20 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27
-EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1625 BLAKE2B 18c8bbef8edf41a3cad98a5c297cd6e3a0cbe2253c17236d841109920dd4610cd681c4fb7ebd99d28a7b9473d717695746e56d18e88cca8fb13e9b63713437e0 SHA512 7854d1cf94866f4a5387ec2dca09831ac1836d57c4c77d5f3bbe3b6f7a172fb912f6e8d8cf2f25ef71c528b539c247c430948e1a2afc1e850c777a40d690323d
-EBUILD docbook-xml-dtd-4.2-r3.ebuild 1619 BLAKE2B 985eadc7d7ff4a6bcb0a4de151ff74412e9a9cd3f21562a508746360a7badc50ff0cafc9a04d8af8137659acb134601277f89e3e5979c73e64563895a4bf558e SHA512 ae03227d0428c66b0992d2b8d94798df1de8aa387bd04fbe810a1883657f8a17f94c0c2f9cd91fbd42f1f798dba4fb02315e00629f11bf1d5aaad18b1c0bb8bb
-EBUILD docbook-xml-dtd-4.3-r2.ebuild 1619 BLAKE2B 985eadc7d7ff4a6bcb0a4de151ff74412e9a9cd3f21562a508746360a7badc50ff0cafc9a04d8af8137659acb134601277f89e3e5979c73e64563895a4bf558e SHA512 ae03227d0428c66b0992d2b8d94798df1de8aa387bd04fbe810a1883657f8a17f94c0c2f9cd91fbd42f1f798dba4fb02315e00629f11bf1d5aaad18b1c0bb8bb
-EBUILD docbook-xml-dtd-4.4-r3.ebuild 1652 BLAKE2B 48d73f566dc6923dc61f986e4543f3e14501f8426dca6b559171dc631a285b07b8659e673725da2f530654d38a47c460238986337ca832411f3eb28e94e4b097 SHA512 5ff39f24453a39cb7e10d62c11c00b4edb79fd6b4b6ec1e4e6240ed1f58238257989ab54d75500f421508e96a45efeed58704a9e0f7f49da60ebb9d716ec68e1
-EBUILD docbook-xml-dtd-4.5-r2.ebuild 1652 BLAKE2B 48d73f566dc6923dc61f986e4543f3e14501f8426dca6b559171dc631a285b07b8659e673725da2f530654d38a47c460238986337ca832411f3eb28e94e4b097 SHA512 5ff39f24453a39cb7e10d62c11c00b4edb79fd6b4b6ec1e4e6240ed1f58238257989ab54d75500f421508e96a45efeed58704a9e0f7f49da60ebb9d716ec68e1
+EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1618 BLAKE2B daf0384b931f81391b85b4a21825a7c2348452157b1e7b717ffcd75460e583ff8d454f155d53c26cc6f3ab62f9cdc3b18fd99156ce2744a205efd0b5d83124ae SHA512 3e45a2ec92cd8a6c74bb7b26b3e81ba6d584354a4e206331ad556a8430169716a9934cc1ef467934f4a1f9deda879c1474c4faf076b0f0b0d78c0a5e4ee43f5a
+EBUILD docbook-xml-dtd-4.2-r3.ebuild 1612 BLAKE2B 6d5718354b9c1b10c437ea1b9f95ab2bafc07939b8568656340b186d4e678b03330ddf32769a62d2e8e2c2188d23c89b4b76583817b70e385a83e15513bbc4a7 SHA512 73ac6f2f2132db8e9473fd38a35cf085534ba4e989404f163346a519db2bf27e223f0720e25456de336b32cb738aa9f28adc9028444bea8bf75bcc52bad0ed0e
+EBUILD docbook-xml-dtd-4.3-r2.ebuild 1612 BLAKE2B 6d5718354b9c1b10c437ea1b9f95ab2bafc07939b8568656340b186d4e678b03330ddf32769a62d2e8e2c2188d23c89b4b76583817b70e385a83e15513bbc4a7 SHA512 73ac6f2f2132db8e9473fd38a35cf085534ba4e989404f163346a519db2bf27e223f0720e25456de336b32cb738aa9f28adc9028444bea8bf75bcc52bad0ed0e
+EBUILD docbook-xml-dtd-4.4-r3.ebuild 1645 BLAKE2B 4e3337f482668043f3f3f82988c693a4dcc3c65908757509de3932e4c38f673b98533d168bc979e364735198a3a1a40f4b18c1655cef54969695e171aa76e6db SHA512 d7b1b20f06db3f47808ec1bd017ce987aa7b57103453421bbba0982b7a4053374f31a109462ff789ac6bef0d3bec697cd3bced1a8bd55bbad60b6b51ed2d8c64
+EBUILD docbook-xml-dtd-4.5-r2.ebuild 1645 BLAKE2B 4e3337f482668043f3f3f82988c693a4dcc3c65908757509de3932e4c38f673b98533d168bc979e364735198a3a1a40f4b18c1655cef54969695e171aa76e6db SHA512 d7b1b20f06db3f47808ec1bd017ce987aa7b57103453421bbba0982b7a4053374f31a109462ff789ac6bef0d3bec697cd3bced1a8bd55bbad60b6b51ed2d8c64
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
index c66dcb07d7c7..c6ceaa35945b 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -30,7 +30,7 @@ src_install() {
 	keepdir /etc/xml
 
 	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
-	doins *.cat *.dtd *.mod || die
+	doins *.cat *.dtd *.mod
 	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
 	doins ent/*.ent
 
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
index 33be69e94534..275c23a389fa 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -30,7 +30,7 @@ src_install() {
 	keepdir /etc/xml
 
 	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
-	doins *.cat *.dtd *.mod || die
+	doins *.cat *.dtd *.mod
 	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
 	doins ent/*.ent
 
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
index 33be69e94534..275c23a389fa 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
@@ -30,7 +30,7 @@ src_install() {
 	keepdir /etc/xml
 
 	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
-	doins *.cat *.dtd *.mod || die
+	doins *.cat *.dtd *.mod
 	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
 	doins ent/*.ent
 
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
index 127fcd260207..b1cb368058b6 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -30,7 +30,7 @@ src_install() {
 	keepdir /etc/xml
 
 	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
-	doins *.cat *.dtd *.mod *.xml || die
+	doins *.cat *.dtd *.mod *.xml
 	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
 	doins ent/*.ent
 
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
index 127fcd260207..b1cb368058b6 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -30,7 +30,7 @@ src_install() {
 	keepdir /etc/xml
 
 	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}"
-	doins *.cat *.dtd *.mod *.xml || die
+	doins *.cat *.dtd *.mod *.xml
 	insinto "/usr/share/sgml/docbook/xml-dtd-${PV}/ent"
 	doins ent/*.ent
 
diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest
index c8227470b6da..243c721a7fa7 100644
--- a/app-text/docbook2X/Manifest
+++ b/app-text/docbook2X/Manifest
@@ -3,5 +3,5 @@ AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1247 BLAKE2B 1afaf90f76030c6
 AUX docbook2X-0.8.8-filename_whitespace_handling.patch 2080 BLAKE2B ca60c0da237260893d9c4d75b95dafde605ac5ef0d01d311f52ca3a77817ce389a3f0bc7edde06f83593bc24ddc0170507898da4cfd57a7aa081884d3be7f503 SHA512 3a72979c03a1b5135662ad5cedefd0d508001994e727a0820d628ff5ad2476c09befeb921b9562230fdec3db547e5eec4b301aa08430dd6c2ce2632624a1c375
 AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3358 BLAKE2B e5c8c38c4504e03d7bb003929c3723cc0d15448258b8d0770571f94279e66d565f5c7cf2926cafc0a71f66e2976039401acd6b3486a9a177115b56b44437827c SHA512 af88626ca61847a25ef8c4cf8a09ea27cd1dce6510952e9629b704d3637097b10d85b9727e502dd7eecea1d2152a71cd26bf6abf4a8370eb8647258faa30be45
 DIST docbook2X-0.8.8.tar.gz 723909 BLAKE2B 17593d104a8b50a3ab56e5de464785d86d41c8a3fd04f76037c5482de867efa6dfa1ed4047e11814ed18275cd3b856440deafb637dcec17267a946d5cb1bd085 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c
-EBUILD docbook2X-0.8.8-r4.ebuild 1546 BLAKE2B 51508868838fdba3ff0c4f1a06ad95cd8c045df21ea384e4e58e89f35cbeecb224ca3051ac172c44c75c4e3313fd7873a156a1b58667fb4cc7c5be39605c7a91 SHA512 076184b0c75e9160e743944c044f4d3d39f598f388e0970c9d68bc6a2489fd1df1b6469b8ec7450d6cf9bae3f9202b1b6e007110cb83d32817aed3b03b894062
+EBUILD docbook2X-0.8.8-r4.ebuild 1573 BLAKE2B 6e01dc0007f2f00527c86565f512412b6d678e09190adce332300fd2c87656aa5abfc3b5ce8ff1bd069dd8458b30e73c936053092213d4b55403ed26807bfd43 SHA512 7e18d58a5986bc198037701c40b9e90869618c20dcb04f8eb417e5cf401db2384ecbe00c6057456c59526c69f2c7f04901814427c51109afafcdffc8aa8d1831
 MISC metadata.xml 246 BLAKE2B aa5c9c8df66314e0c3f156b1f79b96a87103809e228bff9935544e5b0d9e61165dc0bd0080ecb78595e6e93d0e06c1b8c979b47b8a29f6bdae22fc3abe7a3f95 SHA512 751233aacee2a81a9b2e02bf872dc788d2fe39fa6d6b3781146dbd19e4eebf5854620b2ae9d62e0d4dada2a64903ecf789e94b3eefecedd131808bc575617759
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
index 3a2c9554073b..c288e830bdbc 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -13,6 +13,7 @@ HOMEPAGE="http://docbook2x.sourceforge.net/"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~riscv s390 sh sparc x86 ~x86-linux ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 LICENSE="MIT"
 
 # dev-perl/XML-LibXML - although not mentioned upstream is required
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index a1ff469550b7..42ee934e3332 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -6,8 +6,8 @@ DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff87
 DIST enchant-2.1.2.tar.gz 963236 BLAKE2B 3adaf9d96c7e2d7c5e31fe31ac426230f2e88b1cd6f68157e11f13c30fc5c161723d5a5b40bbe158307ce7352e098cd22272f4a75786854f7d82a0c5694b0f2b SHA512 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
 DIST enchant-2.2.3.tar.gz 957451 BLAKE2B 294c4eb7afbe97a2c8076b1b26640cb15d13dde64de7879557992e3c8ec96d68ff4fbc2c911d3c6d8811d4d5ca5a104040941ab59f8a18e324134e7ac38a2dfa SHA512 abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6
 DIST enchant-2.2.4.tar.gz 953026 BLAKE2B c1745c365c4084d92988105e072b4776e7f565a53748fdda67ab792777ce78276de5f843ae095d7c025f4f08cfa5daa5e3f9c26acf4e98b0978d589c9e9e076b SHA512 3860f04e276e1afa8969041b3f57411136d6b96ecf90996cdb122739e87be432f12219d2635c29d2e7ef3f2eeb366013026b6f8327a9749ffbc3a1dfafb4b870
-EBUILD enchant-1.6.1-r1.ebuild 1604 BLAKE2B 1316d5ef21c9d0604f33a7e61a11f3e554d072f92346bdcb99e18a3d32544e73591790439d777a42a91edb6a62f552787e047c849895d3344d7024c666a09005 SHA512 730628d378611c32d2f9ee9457620f330a4f3d5d5181cbd8ca6dbf772a95c40f5f10762bd753fafd2c2718c0560e26357d7a08472b98670bab6f5c1e76eb0f42
-EBUILD enchant-1.6.1.ebuild 1475 BLAKE2B 7e0c58a66445f07c64d127e6be81f60dfdeca4f0740d46339bd4651faccdd3a2ee3c0cf5fe2cc47b6c28c9368191ffab54235c3a9de103ba32bcb21901eb4942 SHA512 5cd684fe0979a29dd91e7c590d0fcb5927e0c3bab5e65d2ba3800a3c545b2bb64426bdfa06d04199514f650a566f12af11aed59fb4a053f2cefd3b3e59a404cb
+EBUILD enchant-1.6.1-r1.ebuild 1631 BLAKE2B e11ec8c61312dce4fc5783cf9723aa4a58f98d0265b529d70eb5813d705ee25def0110a6d8c3806ba5324c83911721653f18bb8ba92d683a659cc6d85c83f9ed SHA512 56ea5e50b9a64223f2835fb36adad27b52b61f1e97771cdb32fa1760dd6d414774c45438656c70ae6dd67156bb014eda9c8c284383835c536bc34c3c5383b6f2
+EBUILD enchant-1.6.1.ebuild 1499 BLAKE2B bbe5a8be0b9064a11afecb5cc4fe622c7c6a1fd039152c314ad127bcddb9abdce7c0a68b4233ce8510f0ea591cd9e8a8243c9ad4b24717a5a84de620584c9f26 SHA512 fa14c1d7ebe3913320d4e2af5d6f26fa8ade77eae5b8e4372f83b19ecb4236601d27d223f02add6227a183d26431506fa613d6d3a7e2cfc05278387edf9a391c
 EBUILD enchant-2.1.0.ebuild 1293 BLAKE2B 28adab1e239028e4c1a1bb58380dd03f6104a4b5ee5ed8323703ce828989bc9f435d4ab10c0e53f2a475dc109f175f5f5a5c894bff326b6a2b251b800d6b85d9 SHA512 1537657246a50e76a4c65082b79ee75c8ed324d448063d840c94f886c043013fbb7ed33ff75c13aa35cfb2b528a5fec294f234948bff9479bcd8f21dffbe30cf
 EBUILD enchant-2.1.1.ebuild 1152 BLAKE2B 3f06209033ef964fce26cb8d7e8555b502316bb6609fcad2d49b9a21f33b2eb804169716879b7b5a16a201fa07f14e6a4dcb324863f0877d26cf6eaa539f08cc SHA512 af7796aa6c0d4688327dc1cdf4abbf2fa84a579178ef26e15a3b61054b781f6987c0ec0fe6b2be182a987c1899180e61288c88065e1a40bca5d0f3eb54131c33
 EBUILD enchant-2.1.2.ebuild 1152 BLAKE2B 3f06209033ef964fce26cb8d7e8555b502316bb6609fcad2d49b9a21f33b2eb804169716879b7b5a16a201fa07f14e6a4dcb324863f0877d26cf6eaa539f08cc SHA512 af7796aa6c0d4688327dc1cdf4abbf2fa84a579178ef26e15a3b61054b781f6987c0ec0fe6b2be182a987c1899180e61288c88065e1a40bca5d0f3eb54131c33
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
index 1c1f2b790703..4c3eaad3737a 100644
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r1.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( hunspell aspell )"
 
 # FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild
index 30cc4c9998e1..7c319297213d 100644
--- a/app-text/enchant/enchant-1.6.1.ebuild
+++ b/app-text/enchant/enchant-1.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="|| ( hunspell aspell )"
 
 # FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index 68477b191c28..e9d56827eeea 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -4,5 +4,5 @@ DIST evince-3.32.0.tar.xz 2564236 BLAKE2B 203bc6ff6b8b2a3d30ebd30f7f9be6269ded50
 DIST evince-3.32.1.tar.xz 2567868 BLAKE2B 8fec9ce1981fb2c5fc60c4b653f462f07f0341ebe64a5615f1e1a123533f8053c6f76a02d05da9245b4263c24df1cdd2e28aa89486b8c802a2aa14cf04faf13b SHA512 29028fedde9aff85e53a5059f63df007e1bac7d662a91fe01e1bb8c48349d5674afe3ce37f9c495e4b208fd476b22f4ecaf749c6d7c3362a03b05703400ece05
 EBUILD evince-3.30.2.ebuild 3114 BLAKE2B 839716b0960b7a8ed6e7ad682de262f432711dca58d51a313d40c15f7737d4b174d514066301974e9b0e8356b98c561b687de6de6ded6875f6929c5efb8188c2 SHA512 e46cddcc1296237685d865c2a1e5c5400add7c1d329c9887e79bcda2b4d73e26be5e3114edee9406828ba6e25e56eb9e46061d5e4f702faf7d1c3ed831a7e41f
 EBUILD evince-3.32.0.ebuild 3117 BLAKE2B a151578067d49c84001bf878991f425273c8634ba2dd35b0fe2444c469db250dbadf0e30f6ed05d7ef7b7853cee2d9f484693e122b201d6d07aa7294f6cf8a4c SHA512 2911fd3bbe41c67fc96492f9643940c5ff690634301dfad93c3b2120fd60dd1af629cdde5f1cc94567a133441e122ece244c5903dae683a7feb60fcb5ac6f719
-EBUILD evince-3.32.1.ebuild 3154 BLAKE2B 47404bc3ef9ae27dfb92dd454014bdbcb7bd63653bdf7c0e546b3c62506b4df0523ca536c2f6c9c03b3f8109c46ce1a6841d00608400f17ce29a378556a7d40e SHA512 0b4f8727604ff1d8592e8588b03615246884d1358671b1bf141ee0ea49ba0db5d997cfbadd61cf102325efe201ddd5c19f09d1a2681ef92f7d38cbe9abf9839d
+EBUILD evince-3.32.1.ebuild 3152 BLAKE2B ab77c699ba3bc856c0af95f6cd3cac4cc792f306ef4f43bdd994acd1cdf1141a44fd9eca1686752e5882a7d71dc1420a42ca0e310254946dd495ce5107594298 SHA512 f3813bd53af21ab59c9838ffdc07d746d84a8ebb0230a82c33872313200c8f7f6cad95a2f938e2e35c2f85ae03b88f6bf76f9034ab781219eae5f88a5926b752
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-3.32.1.ebuild b/app-text/evince/evince-3.32.1.ebuild
index c236ab722168..e572562893a4 100644
--- a/app-text/evince/evince-3.32.1.ebuild
+++ b/app-text/evince/evince-3.32.1.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
 IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 # atk used in libview
 # bundles unarr
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 991689e54f0d..7a4e1d8c9ba2 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,4 +1,6 @@
 AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2101 BLAKE2B f1970ffe2cf1d369ffc3f3a5a6abea2f04fb32cfdc54dde9052ef468c2a274db2318495c80ec1ef0048fb65df8209bacb86392d9ff594fdc60ea92ebb85584ab SHA512 25cff56b05bf4ec0ca55a6fcab1700bd6bec9f60a923e14607fd894bd9b63cd669a4e3e9b7bacc0480e040e393370be05f237ea21074cb439a3cf176be0dd78c
+AUX gnome-doc-utils-0.20.10-python3.patch 21576 BLAKE2B 487b2f7d3758d1df475178154ed92ee548c63fd492d59fb0c6cc3a75e6378ebe75e74e3bdc60b46a74ea0670ca77f9bbad279b625bb64d4cb8a432a869eb426b SHA512 500e952f12c1baae08a0f520ea7e08c09d20ee58c3ed5fdc5f6dd1b7a192d90f66de26956306ab685ef62298df9770af184c0f33b7d4e015023ef2129da351bf
 DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
 EBUILD gnome-doc-utils-0.20.10-r1.ebuild 1745 BLAKE2B e07cdad251d540fde141223a257f9b8afd30054119cb5fc76292b45f50a7903f4d396e701c958dd90c198806d82310c9b02d2fde2375392cf07dd5e371a04f9d SHA512 11920ebfad4a4512e03e5d7da7906e4211220a39a2219ba896c87378ba2d1d4dd24d5f628857379b24e995770069f552cd8f9e92afad333091c594da9d1e7bb4
+EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1852 BLAKE2B acc502e1d0dd9a006294d3b83ab6457a063711f68dc9b98f59ea778572371cef72babd34a578b010726c63af4190fc0dc2265c6b75451c12fdf8894d4c6ad583 SHA512 2906f283f52f21b2495f314878a45d753a5981a6495fa6c04e992810588877879a089cf2cf226473d7ad3ec1303a9bd6bb500e1a019b23651633365ae50dc49d
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-python3.patch b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-python3.patch
new file mode 100644
index 000000000000..2c4836974086
--- /dev/null
+++ b/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-python3.patch
@@ -0,0 +1,520 @@
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/__init__.py	2011-08-04 09:36:03.000000000 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py	2019-09-10 09:30:28.018627919 -0500
+@@ -86,14 +86,14 @@
+                 self.messages.append(t)
+                 if spacepreserve:
+                     self.nowrap[t] = True
+-                if t in self.linenos.keys():
++                if t in list(self.linenos.keys()):
+                     self.linenos[t].append((self.filename, tag, lineno))
+                 else:
+                     self.linenos[t] = [ (self.filename, tag, lineno) ]
+                 if (not self.do_translations) and comment and not t in self.comments:
+                     self.comments[t] = comment
+             else:
+-                if t in self.linenos.keys():
++                if t in list(self.linenos.keys()):
+                     self.linenos[t].append((self.filename, tag, lineno))
+                 else:
+                     self.linenos[t] = [ (self.filename, tag, lineno) ]
+@@ -166,7 +166,7 @@
+         elif node.isText():
+             if node.isBlankNode():
+                 if self.app.options.get('expand_entities') or \
+-                  (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
++                  (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
+                     #print >>sys.stderr, "BLANK"
+                     node.setContent('')
+             else:
+@@ -176,7 +176,7 @@
+             child = node.children
+             while child:
+                 self.normalizeNode(child)
+-                child = child.next
++                child = child.__next__
+ 
+     def normalizeString(self, text, spacepreserve = False):
+         """Normalizes string to be used as key for gettext lookup.
+@@ -200,7 +200,7 @@
+             tree = ctxt.doc()
+             newnode = tree.getRootElement()
+         except:
+-            print >> sys.stderr, """Error while normalizing string as XML:\n"%s"\n""" % (text)
++            print("""Error while normalizing string as XML:\n"%s"\n""" % (text), file=sys.stderr)
+             return text
+ 
+         self.normalizeNode(newnode)
+@@ -209,7 +209,7 @@
+         child = newnode.children
+         while child:
+             result += child.serialize('utf-8')
+-            child = child.next
++            child = child.__next__
+ 
+         result = re.sub('^ ','', result)
+         result = re.sub(' $','', result)
+@@ -235,7 +235,7 @@
+         ctxt.parseDocument()
+         tree = ctxt.doc()
+         if next:
+-            newnode = tree.children.next
++            newnode = tree.children.__next__
+         else:
+             newnode = tree.children
+ 
+@@ -243,7 +243,7 @@
+         child = newnode.children
+         while child:
+             result += child.serialize('utf-8')
+-            child = child.next
++            child = child.__next__
+         tree.freeDoc()
+         return result
+ 
+@@ -262,7 +262,7 @@
+                         result += child.content.decode('utf-8')
+                 else:
+                     result += self.myAttributeSerialize(child)
+-                child = child.next
++                child = child.__next__
+         else:
+             result = node.serialize('utf-8')
+         return result
+@@ -338,7 +338,7 @@
+                 pass
+ 
+             if not newnode:
+-                print >> sys.stderr, """Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8'))
++                print("""Error while parsing translation as XML:\n"%s"\n""" % (text.encode('utf-8')), file=sys.stderr)
+                 return
+ 
+             newelem = newnode.getRootElement()
+@@ -346,13 +346,13 @@
+             if newelem and newelem.children:
+                 free = node.children
+                 while free:
+-                    next = free.next
++                    next = free.__next__
+                     free.unlinkNode()
+                     free = next
+ 
+                 if node:
+                     copy = newelem.copyNodeList()
+-                    next = node.next
++                    next = node.__next__
+                     node.replaceNode(newelem.copyNodeList())
+                     node.next = next
+ 
+@@ -378,7 +378,7 @@
+             if child.type in ['text'] and  child.content.strip()!='':
+                 final = True
+                 break
+-            child = child.next
++            child = child.__next__
+ 
+         node.__autofinal__ = final
+         return final
+@@ -457,7 +457,7 @@
+                     outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
+                 else:
+                     outtxt += self.doSerialize(child)
+-            child = child.next
++            child = child.__next__
+ 
+         if self.app.operation == 'merge':
+             norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
+@@ -534,7 +534,7 @@
+             outtxt = ''
+             while child:
+                 outtxt += self.doSerialize(child)
+-                child = child.next
++                child = child.__next__
+             return outtxt
+ 
+ def xml_error_handler(arg, ctxt):
+@@ -577,8 +577,8 @@
+                 raise IOError("Unable to read file '%s'" % xmlfile)
+             try:
+                 doc = XMLDocument(xmlfile, self)
+-            except Exception, e:
+-                print >> sys.stderr, "Unable to parse XML file '%s': %s" % (xmlfile, str(e))
++            except Exception as e:
++                print("Unable to parse XML file '%s': %s" % (xmlfile, str(e)), file=sys.stderr)
+                 sys.exit(1)
+             self.current_mode.preProcessXml(doc.doc, self.msg)
+             doc.generate_messages()
+@@ -590,14 +590,14 @@
+             raise IOError("Unable to read file '%s'" % xmlfile)
+         try:
+             doc = XMLDocument(xmlfile, self)
+-        except Exception, e:
+-            print >> sys.stderr, str(e)
++        except Exception as e:
++            print(str(e), file=sys.stderr)
+             sys.exit(1)
+ 
+         try:
+             mfile = open(mofile, "rb")
+         except:
+-            print >> sys.stderr, "Can't open MO file '%s'." % (mofile)
++            print("Can't open MO file '%s'." % (mofile), file=sys.stderr)
+         self.gt = gettext.GNUTranslations(mfile)
+         self.gt.add_fallback(NoneTranslations())
+         # Has preProcessXml use cases for merge?
+@@ -619,16 +619,16 @@
+             raise IOError("Unable to read file '%s'" % xmlfile)
+         try:
+             doc = XMLDocument(xmlfile, self)
+-        except Exception, e:
+-            print >> sys.stderr, str(e)
++        except Exception as e:
++            print(str(e), file=sys.stderr)
+             sys.exit(1)
+         doc.generate_messages()
+ 
+         self.msg.translationsFollow()
+         try:
+             doc = XMLDocument(origxml, self)
+-        except Exception, e:
+-            print >> sys.stderr, str(e)
++        except Exception as e:
++            print(str(e), file=sys.stderr)
+             sys.exit(1)
+         doc.generate_messages()
+         self.output_po()
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/docbook.py	2011-01-10 10:08:10.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py	2019-09-10 09:31:15.199572286 -0500
+@@ -43,7 +43,7 @@
+ except ImportError:
+     from md5 import new as md5_new
+ 
+-from basic import basicXmlMode
++from .basic import basicXmlMode
+ 
+ class docbookXmlMode(basicXmlMode):
+     """Class for special handling of DocBook document types.
+@@ -131,7 +131,7 @@
+                     hash = self._md5_for_file(fullpath)
+                 else:
+                     hash = "THIS FILE DOESN'T EXIST"
+-                    print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
++                    print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
+ 
+                 msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
+                                   "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
+@@ -198,10 +198,10 @@
+ # Perform some tests when ran standalone
+ if __name__ == '__main__':
+     test = docbookXmlMode()
+-    print "Ignored tags       : " + repr(test.getIgnoredTags())
+-    print "Final tags         : " + repr(test.getFinalTags())
+-    print "Space-preserve tags: " + repr(test.getSpacePreserveTags())
++    print("Ignored tags       : " + repr(test.getIgnoredTags()))
++    print("Final tags         : " + repr(test.getFinalTags()))
++    print("Space-preserve tags: " + repr(test.getSpacePreserveTags()))
+ 
+-    print "Credits from string: '%s'" % test.getStringForTranslators()
+-    print "Explanation for credits:\n\t'%s'" % test.getCommentForTranslators()
++    print("Credits from string: '%s'" % test.getStringForTranslators())
++    print("Explanation for credits:\n\t'%s'" % test.getCommentForTranslators())
+ 
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/gs.py	2010-12-13 10:14:07.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/gs.py	2019-09-10 09:31:15.201572284 -0500
+@@ -20,7 +20,7 @@
+ # Special case Gnome Summary
+ #
+ 
+-from basic import basicXmlMode
++from .basic import basicXmlMode
+ 
+ class gsXmlMode(basicXmlMode):
+     """Abstract class for special handling of document types."""
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/mallard.py	2011-01-10 10:08:50.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/mallard.py	2019-09-10 09:31:15.212572271 -0500
+@@ -39,7 +39,7 @@
+ except ImportError:
+     from md5 import new as md5_new
+ 
+-from basic import basicXmlMode
++from .basic import basicXmlMode
+ 
+ class mallardXmlMode(basicXmlMode):
+     """Class for special handling of Mallard document types."""
+@@ -112,7 +112,7 @@
+                     hash = self._md5_for_file(fullpath)
+                 else:
+                     hash = "THIS FILE DOESN'T EXIST"
+-                    print >>sys.stderr, "Warning: image file '%s' not found." % fullpath
++                    print("Warning: image file '%s' not found." % fullpath, file=sys.stderr)
+                     
+                 msg.outputMessage("@@image: '%s'; md5=%s" % (attr, hash), node.lineNo(),
+                                   "When image changes, this message will be marked fuzzy or untranslated for you.\n"+
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/ubuntu.py	2010-12-13 10:14:07.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/ubuntu.py	2019-09-10 09:31:15.213572270 -0500
+@@ -2,7 +2,7 @@
+ 
+ import libxml2
+ 
+-from docbook import docbookXmlMode
++from .docbook import docbookXmlMode
+ 
+ class ubuntuXmlMode (docbookXmlMode):
+     """Special-casing Ubuntu DocBook website documentation."""
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/modes/xhtml.py	2010-12-13 10:14:07.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/xhtml.py	2019-09-10 09:31:15.214572269 -0500
+@@ -21,7 +21,7 @@
+ # This implements special instructions for handling XHTML documents
+ # in a better way, particularly to extract some attributes in HTML tags
+ 
+-from basic import basicXmlMode
++from .basic import basicXmlMode
+ 
+ class xhtmlXmlMode(basicXmlMode):
+     """Class for special handling of XHTML document types."""
+diff -U3 -r gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in
+--- gnome-doc-utils-0.20.10.orig/xml2po/xml2po/xml2po.py.in	2010-12-13 10:14:07.000000000 -0600
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in	2019-09-10 09:30:28.217627684 -0500
+@@ -41,9 +41,9 @@
+ if not os.path.exists('/dev/null'): NULL_STRING = 'NUL'
+ 
+ def usage (with_help = False):
+-    print >> sys.stderr, "Usage:  %s [OPTIONS] [XMLFILE]..." % (sys.argv[0])
++    print("Usage:  %s [OPTIONS] [XMLFILE]..." % (sys.argv[0]), file=sys.stderr)
+     if with_help:
+-        print >> sys.stderr, """
++        print("""
+ OPTIONS may be some of:
+     -a    --automatic-tags     Automatically decides if tags are to be considered
+                                  "final" or not
+@@ -72,7 +72,7 @@
+     using -p option for each XML file:
+         %(command)s -p de.po chapter1.xml > chapter1.de.xml
+         %(command)s -p de.po chapter2.xml > chapter2.de.xml
+-""" % {'command': sys.argv[0]}
++""" % {'command': sys.argv[0]}, file=sys.stderr)
+ 
+ 
+ def main(argv):
+@@ -82,7 +82,7 @@
+ 
+     name = os.path.join(os.path.dirname(__file__), '..')
+     if os.path.exists(os.path.join(name, 'tests')):
+-        print >> sys.stderr, 'Running from source folder, modifying PYTHONPATH'
++        print('Running from source folder, modifying PYTHONPATH', file=sys.stderr)
+         sys.path.insert(0, name)
+ 
+     from xml2po import Main
+@@ -142,14 +142,14 @@
+         elif opt in ('-o', '--output'):
+             output = arg
+         elif opt in ('-v', '--version'):
+-            print VERSION
++            print(VERSION)
+             sys.exit(0)
+         elif opt in ('-h', '--help'):
+             usage(True)
+             sys.exit(0)
+ 
+     if operation == 'update' and output != "-":
+-        print >> sys.stderr, "Option '-o' is not yet supported when updating translations directly. Ignoring this option."
++        print("Option '-o' is not yet supported when updating translations directly. Ignoring this option.", file=sys.stderr)
+ 
+     # Treat remaining arguments as XML files
+     filenames = []
+@@ -159,16 +159,16 @@
+     try:
+         xml2po_main = Main(default_mode, operation, output, options)
+     except IOError:
+-        print >> sys.stderr, "Error: cannot open file %s for writing." % (output)
++        print("Error: cannot open file %s for writing." % (output), file=sys.stderr)
+         sys.exit(5)
+ 
+     if operation == 'merge':
+         if len(filenames) > 1:
+-            print  >> sys.stderr, "Error: You can merge translations with only one XML file at a time."
++            print("Error: You can merge translations with only one XML file at a time.", file=sys.stderr)
+             sys.exit(2)
+ 
+         if not mofile:
+-            print >> sys.stderr, "Error: You must specify MO file when merging translations."
++            print("Error: You must specify MO file when merging translations.", file=sys.stderr)
+             sys.exit(3)
+ 
+         xml2po_main.merge(mofile, filenames[0])
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig	2019-09-10 09:34:42.110328324 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py	2019-09-10 09:34:44.170325899 -0500
+@@ -166,7 +166,7 @@
+         elif node.isText():
+             if node.isBlankNode():
+                 if self.app.options.get('expand_entities') or \
+-                  (not (node.prev and not node.prev.isBlankNode() and node.__next__ and not node.next.isBlankNode()) ):
++                  (not (node.prev and not node.prev.isBlankNode() and node.next and not node.next.isBlankNode()) ):
+                     #print >>sys.stderr, "BLANK"
+                     node.setContent('')
+             else:
+@@ -176,7 +176,7 @@
+             child = node.children
+             while child:
+                 self.normalizeNode(child)
+-                child = child.__next__
++                child = child.next
+ 
+     def normalizeString(self, text, spacepreserve = False):
+         """Normalizes string to be used as key for gettext lookup.
+@@ -209,7 +209,7 @@
+         child = newnode.children
+         while child:
+             result += child.serialize('utf-8')
+-            child = child.__next__
++            child = child.next
+ 
+         result = re.sub('^ ','', result)
+         result = re.sub(' $','', result)
+@@ -235,7 +235,7 @@
+         ctxt.parseDocument()
+         tree = ctxt.doc()
+         if next:
+-            newnode = tree.children.__next__
++            newnode = tree.children.next
+         else:
+             newnode = tree.children
+ 
+@@ -243,7 +243,7 @@
+         child = newnode.children
+         while child:
+             result += child.serialize('utf-8')
+-            child = child.__next__
++            child = child.next
+         tree.freeDoc()
+         return result
+ 
+@@ -262,7 +262,7 @@
+                         result += child.content.decode('utf-8')
+                 else:
+                     result += self.myAttributeSerialize(child)
+-                child = child.__next__
++                child = child.next
+         else:
+             result = node.serialize('utf-8')
+         return result
+@@ -346,13 +346,13 @@
+             if newelem and newelem.children:
+                 free = node.children
+                 while free:
+-                    next = free.__next__
++                    next = free.next
+                     free.unlinkNode()
+                     free = next
+ 
+                 if node:
+                     copy = newelem.copyNodeList()
+-                    next = node.__next__
++                    next = node.next
+                     node.replaceNode(newelem.copyNodeList())
+                     node.next = next
+ 
+@@ -378,7 +378,7 @@
+             if child.type in ['text'] and  child.content.strip()!='':
+                 final = True
+                 break
+-            child = child.__next__
++            child = child.next
+ 
+         node.__autofinal__ = final
+         return final
+@@ -457,7 +457,7 @@
+                     outtxt += '<%s>%s</%s>' % (starttag, content, endtag)
+                 else:
+                     outtxt += self.doSerialize(child)
+-            child = child.__next__
++            child = child.next
+ 
+         if self.app.operation == 'merge':
+             norm_outtxt = self.normalizeString(outtxt, self.app.isSpacePreserveNode(node))
+@@ -534,7 +534,7 @@
+             outtxt = ''
+             while child:
+                 outtxt += self.doSerialize(child)
+-                child = child.__next__
++                child = child.next
+             return outtxt
+ 
+ def xml_error_handler(arg, ctxt):
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig	2019-09-10 09:39:57.733974912 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py	2019-09-10 09:40:24.761946962 -0500
+@@ -326,7 +326,7 @@
+                 pass
+ 
+             content = '<%s>%s</%s>' % (starttag, text, endtag)
+-            tmp = tmp + content.encode('utf-8')
++            tmp = tmp + content
+ 
+             newnode = None
+             try:
+@@ -663,7 +663,7 @@
+         if not text or text.strip() == '':
+             return text
+         if self.gt:
+-            res = self.gt.ugettext(text.decode('utf-8'))
++            res = self.gt.gettext(text)
+             return res
+ 
+         return text
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py.orig	2019-09-10 09:41:23.853885851 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/__init__.py	2019-09-10 09:44:23.580699979 -0500
+@@ -352,9 +352,10 @@
+ 
+                 if node:
+                     copy = newelem.copyNodeList()
+-                    next = node.next
++                    #next = node.next
+                     node.replaceNode(newelem.copyNodeList())
+-                    node.next = next
++                    #print(type(next))
++                    #node.next = next
+ 
+             else:
+                 # In practice, this happens with tags such as "<para>    </para>" (only whitespace in between)
+@@ -470,7 +471,7 @@
+ 
+         worth = self.worthOutputting(node)
+         if not translation:
+-            translation = outtxt.decode('utf-8')
++            translation = outtxt
+             if worth and self.app.options.get('mark_untranslated'):
+                 node.setLang('C')
+ 
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py.orig	2019-09-10 09:46:15.409584334 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/modes/docbook.py	2019-09-10 09:46:30.164569075 -0500
+@@ -184,7 +184,7 @@
+                     else:
+                         ai.addChild(copy)
+                     if match.group(3):
+-                        copy.newChild(None, "year", match.group(3).encode('utf-8'))
++                        copy.newChild(None, "year", match.group(3))
+                     if match.group(1) and match.group(2):
+                         holder = match.group(1)+"(%s)" % match.group(2)
+                     elif match.group(1):
+@@ -193,7 +193,7 @@
+                         holder = match.group(2)
+                     else:
+                         holder = "???"
+-                    copy.newChild(None, "holder", holder.encode('utf-8'))
++                    copy.newChild(None, "holder", holder)
+ 
+ # Perform some tests when ran standalone
+ if __name__ == '__main__':
+--- gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in~	2019-09-10 09:50:34.000000000 -0500
++++ gnome-doc-utils-0.20.10/xml2po/xml2po/xml2po.py.in	2019-09-10 09:50:45.114305443 -0500
+@@ -1,4 +1,4 @@
+-#!/usr/bin/python -u
++#!/usr/bin/python3 -u
+ # -*- encoding: utf-8 -*-
+ # Copyright (c) 2004, 2005, 2006 Danilo Šegan <danilo@gnome.org>.
+ # Copyright (c) 2009 Claude Paroz <claude@2xlibre.net>.
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
new file mode 100644
index 000000000000..b13d0c227dee
--- /dev/null
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit gnome2 multibuild python-r1
+
+DESCRIPTION="A collection of documentation utilities for the Gnome project"
+HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/libxml2-2.6.12:2[python,${PYTHON_USEDEP}]
+	>=dev-libs/libxslt-1.1.8
+"
+DEPEND="${RDEPEND}
+	app-text/docbook-xml-dtd:4.4
+	app-text/scrollkeeper-dtd
+	>=dev-util/intltool-0.35
+	sys-devel/gettext
+	virtual/awk
+	virtual/pkgconfig
+"
+# dev-libs/glib needed for eautofoo, bug #255114.
+
+# If there is a need to reintroduce eautomake or eautoreconf, make sure
+# to AT_M4DIR="tools m4", bug #224609 (m4 removes glib build time dep)
+
+src_prepare() {
+	# Stop build from relying on installed package
+	eapply "${FILESDIR}"/${P}-fix-out-of-tree-build.patch
+	eapply "${FILESDIR}"/${P}-python3.patch
+
+	gnome2_src_prepare
+
+	# Leave shebang alone
+	sed -e '/s+^#!.*python.*+#/d' \
+		-i xml2po/xml2po/Makefile.{am,in} || die
+
+	python_prepare() {
+		mkdir -p "${BUILD_DIR}"
+	}
+	python_foreach_impl python_prepare
+}
+
+src_configure() {
+	ECONF_SOURCE="${S}" python_foreach_impl run_in_build_dir gnome2_src_configure
+}
+
+src_compile() {
+	MAKEOPTS="${MAKEOPTS} -j1" python_foreach_impl run_in_build_dir gnome2_src_compile #574282
+}
+
+src_test() {
+	python_foreach_impl run_in_build_dir default
+}
+
+src_install() {
+	python_foreach_impl run_in_build_dir gnome2_src_install
+	python_foreach_impl run_in_build_dir python_optimize
+	python_replicate_script "${ED}"/usr/bin/xml2po
+}
diff --git a/app-text/htmlc/Manifest b/app-text/htmlc/Manifest
index 7a551297debd..6df0efbe45fe 100644
--- a/app-text/htmlc/Manifest
+++ b/app-text/htmlc/Manifest
@@ -3,4 +3,4 @@ DIST htmlc-2.4.0.tgz 132584 BLAKE2B 42f0948e7f896130b539d8d0f0936ddfa21986d3eeab
 DIST htmlc-2.6.tgz 286727 BLAKE2B 47e5460c08f7ce5010615e0dec99bc60b2e0f6857d0347c50357837930ca68b369a66001846ef3855cd54cdf6f1dac73ab45546be659a05b1e202438e4914865 SHA512 fa268cf547d60babcbf1aee73f75d3516b08e83158dc0bee36f724abfe2f46ad4b571c09d9d14f97315c70f88d3ea29000fe2d838042242325adce201d60a8f4
 EBUILD htmlc-2.40.0.ebuild 877 BLAKE2B 9feb912ac666df0925693b585e5f71ec10acd0f9b42c7f6fc842824e1cf8d5cefa94c6a066be449a5614e1125221c9e246fff27acba0c86f181909099c8ccc8d SHA512 f97c54930c582ef4a1f9d969ac3d8bf2a5f1af368af8f90a2b4214468cfb51e3841c19eacd47b1e0fec1f666d7c21fb5c699261950715d26feeaac9bbc67c9f2
 EBUILD htmlc-2.60.0.ebuild 951 BLAKE2B 7c2a307ee8d6216d168f1cfc22b396bebefc8a4cff350e6870b3e34c2228bff307c4a8c64a73a547d18e9561fc94ec652c3c5e832700ec7e163498bde7e53e04 SHA512 180a18c3586dc3d7a0fa9ede3c1083c3d70c54454faeb24d8ad1f64746d3586cbbbb0cfbe4a7627f474edeeace6998c11cc0ae79fe15b50a2c31916969fe3a7b
-MISC metadata.xml 247 BLAKE2B a49ba320a43edd431ae39eb274b77ddf0db171a7b06f4f0f0b8f75ee8e3b7f840dead108aa9c63fba75c609a44f7418268cd65c65877f3305d2a6d3ed3c678f6 SHA512 0f7ebd1264695f56fe6ab78e4e82c07866376f03ebfa12b22b60d0b2df819aa818832cb0d9eb2d77ab642a786b44cd127f579c348f0b2f57bc22e26b3b51c42b
+MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/htmlc/metadata.xml b/app-text/htmlc/metadata.xml
index 75c9ea74812d..7a38bb900964 100644
--- a/app-text/htmlc/metadata.xml
+++ b/app-text/htmlc/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>ml@gentoo.org</email>
-		<name>Gentoo ML Project</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-text/htmlmin/Manifest b/app-text/htmlmin/Manifest
index 5c270349282b..4e566c4f5f60 100644
--- a/app-text/htmlmin/Manifest
+++ b/app-text/htmlmin/Manifest
@@ -1,5 +1,5 @@
 DIST htmlmin-0.1.11_pre20170909.tar.gz 123229 BLAKE2B 7cc22370afa045ac13bf05082d396534e08a454f13f6bf321bc45c4743c33813bc32c31b655c21d731f091f11d13aeef405bc82c8e2b0ed0d0a12a25e4e7f3ad SHA512 85b29bca8f40680574fa21e2720a6b573ba69b94c239cdbcea80cdb1d0032bbf0d735f596f2a3beb3b3691b2366cdfd6051dd2499eaeb6b4b7618c7b59ebd7ec
 DIST htmlmin-0.1.12.tar.gz 19940 BLAKE2B 66e9596f687b70fa44362078075cb5f70553e65a7a1a6c55a4abac6adc5d0821b8936507cbb56f4e8ea96575a8801ec341416fead54b18ff9e10d199ed506529 SHA512 5669327dc64d8d28accdfe0d9a222e723fccdc12b52e7f0315fb9caf958a734a0cf0514ad476cbd0b7d0f2d83514a207867127f135f5e51cfda9b15dbfe24b78
 EBUILD htmlmin-0.1.11_pre20170909.ebuild 629 BLAKE2B 414fca47272870b7183c3fd712947fc9585a66ffff99b027c54e672d983b119920b188206ae10c02c85eb657611185764196173cc7687f0ff2af2a73970f0664 SHA512 ceb7d128615fe00d0e9fa138891b89d525d25228b0de24423f38ece20725158d4f69935d0b34cc66c7ba562acd2ab68420e56b276a27dd344bc37563cc4a5476
-EBUILD htmlmin-0.1.12.ebuild 503 BLAKE2B e53e77c4617928cd9db2974d243dd2ac19ed45a17e6d0c37a223447c900e1ac413a1a3c2c847fbe2a6434e26bfbf0bf758c4d0dbaea760890a8f4b2e037e7a5b SHA512 d6f6284cf1d6a2435e08667c8d2feff26ed0677c316e6b829e219322aa0b8f5accfa3525079f0b67ad2b7861d71901d0d4a41671ed4e8c65b7a823bda966e01b
+EBUILD htmlmin-0.1.12.ebuild 514 BLAKE2B 47a414e076dc2d4c67c6dd0fd06f6d0f99942848a0387b20eb76dd7bcf6b35611ade0946564ed0cae15727666b048227ad63865406068935901ea70d76fbfa3e SHA512 b8ad304927cdcee5729636ad3e98fc9569e3ee489fe113e40599a61c87063c34359c8f28425091afb2b8bd7e7f4749825dd451ccaee4c8e97085278a49a51a07
 MISC metadata.xml 424 BLAKE2B 1026b0d3b470845caf9f575527f76c10b691c855426e5fe48972943ca067e9c4211f3e5af025b85f3881c321614c174f6c2f751c2f3f0764aedf04abb2dfe125 SHA512 53ae65ab7e6dd530f398c228e7ad38242a367efdd398a5bd321704e42f33b997c4fc5bfb942a90722b164ff29b35c1f6e3d3e15414241995bd371c3090c250e0
diff --git a/app-text/htmlmin/htmlmin-0.1.12.ebuild b/app-text/htmlmin/htmlmin-0.1.12.ebuild
index 95105e76d782..69c0412b0908 100644
--- a/app-text/htmlmin/htmlmin-0.1.12.ebuild
+++ b/app-text/htmlmin/htmlmin-0.1.12.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6,7,8} )
 
 inherit distutils-r1
 
@@ -20,6 +20,6 @@ IUSE=""
 RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 
 src_prepare() {
-	sed '/prune/d' -i MANIFEST.in
+	sed '/prune/d' -i MANIFEST.in || die
 	default
 }
diff --git a/app-text/htp/Manifest b/app-text/htp/Manifest
index fc90f82e44c0..a5c3b9bf32e7 100644
--- a/app-text/htp/Manifest
+++ b/app-text/htp/Manifest
@@ -1,6 +1,6 @@
 AUX strip.patch 261 BLAKE2B 760a04284f2b79e942fbee21d7b075d41c047f8f7f5eca563f6754e4a9fec1c372986dbcc965f2a1009ac26f8347868f7c0cb4bb767ac98c3be8b2895c49677f SHA512 2f2a9afb828e9de08fa97ca2798a0d2dc6f65cbf192cbc749c3790ed542f75c49c5fbb4644fb8017f93dc24a42c584914d5659841a211c1fe74a3aa43be633e4
 DIST htp-1.16.tar.gz 141133 BLAKE2B 58f0ab7df1400d561ec1994a98ce4fa3acaa3299b51d9382f9baaecbd95a623795d72204617c153fd4e165910fdabd0328e737cccb242be2075edd2573af55c1 SHA512 f33a9497fc3a1d0b95d8e3ee2747583d58626b565644e7c8cc054570458907aac9db42c6fa816b176b0e10db98ec7d1cedb521406035a8e7173e1abd991533a0
 DIST htp-1.19.tar.gz 208683 BLAKE2B 86837290a2f14b8a0337d9eb6a0fa4ad553c5c51074d5df903ee19aa7ba441898199f0649b39b93c35fa3707e4084a284e02d8802c014bf5c0277e3f18d02c98 SHA512 32d82bb42ef877bd815fe45fa81599a1428ad6d3269cbe53a4e686bcfe6d1c12ac2af280462768d488b1983ca67cc521da4ed78cc82d904575ffeff08c7eec1d
-EBUILD htp-1.16-r1.ebuild 1254 BLAKE2B a2c8cce1c8d85d069dfc094dea5e60be6ad9adce7e31c5d692fcfec411a3bc1b0f79967a14f7b5f0682abcfa3998bf4cbde25f8572292f998a1d42c499eb8703 SHA512 0217b514defbe8cbf8bfee84c53287a3bd93b1841b4ae3c2bbd8927833174321c77e4b67c26d0587cfc0d855e76497af42cf04b179eb39a0cd2a218042a3b897
+EBUILD htp-1.16-r1.ebuild 1229 BLAKE2B fec83aa0771a504a8f53da9fc66663f15b59f093f784c0b7d46568d408b46f3a694a093139df4cd9bc383de4d5764f617eb3a2e649108985b912d23ca7dbe487 SHA512 9e9b73f8b7d413446be1be74ddc673e30bb75035244f63346d7da29b699d38940c9c12c5095dec942d9264f749b4ac73dbfeff7f862feb9e4f14cfc5d3f502b4
 EBUILD htp-1.19.ebuild 698 BLAKE2B 943bad8608f7c0eb9677747b2a68838204c4c8d0a1137eba07f8a7c8844dc16e99b215745b707d8df7e94616fc08b8802d625bdbf25cf18c176dde59dfdb69b7 SHA512 d7f085bbdc08fb1b1a0afaf076c1593bd4ad96d2ee26e65c98f958cd01fa1112074d2654a39ea3f47e12d787a33dfd1585fa24edad65ec0db0a9a0880535cdab
 MISC metadata.xml 323 BLAKE2B 815632fb1a839f62a7e2201270b77e1cb16955e5bcc978bebd09d0501eb2df6f56bf20a8ed6a7c2ed6d7a5fcb5d0900a06c38f22dc649c731ada0d36478f3aa1 SHA512 f5c0a7720bd23aa0c604e0ffa07e2925afe69f9af09c9364818e16197fdf55c1decac5839234cdb08e483be1bfb4d0a88279e57c2b48c0002d3de27e90616f26
diff --git a/app-text/htp/htp-1.16-r1.ebuild b/app-text/htp/htp-1.16-r1.ebuild
index f3fd15c02c87..6a5c090922df 100644
--- a/app-text/htp/htp-1.16-r1.ebuild
+++ b/app-text/htp/htp-1.16-r1.ebuild
@@ -32,12 +32,11 @@ src_compile() {
 	emake \
 		CCOPT="-c ${CFLAGS} ${CPPFLAGS} -DHAVE_SNPRINTF -DHAVE_VASPRINTF -DHAVE_ASPRINTF" \
 		CC="$(tc-getCC)" \
-		LINK='$(CC) $(LDFLAGS)' \
-		|| die
+		LINK='$(CC) $(LDFLAGS)'
 }
 
 src_test() {
-	emake -C tests || die
+	emake -C tests
 }
 
 src_install() {
@@ -45,5 +44,5 @@ src_install() {
 		DESTDIR="${D}" \
 		prefix='$(DESTDIR)/usr' \
 		pkgdocdir='$(DESTDIR)/usr/share/doc/${PF}/html' \
-		install || die
+		install
 }
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 5f17a12bae0a..6ee47941434f 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,6 +1,6 @@
 AUX hunspell-1.6.2-renameexes.patch 5104 BLAKE2B 83ea0ec81fdd5e8934c954bb2f2d07e9c47f725f8b63360aca7cd611348106a1e3f13ab08609ff4877272ec6b116927c382c5b47731945656ddb7927aca22c50 SHA512 0d1871eda31b83851bf153746e0f4957599e889a536e9c0994d1cb988bc4a887788c1fafe4dccccaa94e68a69e6fa4ff1e201678fa8d1afdcb9608b83211b0ae
 AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa
-AUX hunspell-1.7.0-tinfo.patch 1721 BLAKE2B 1278f50da7577556710a8e481f46ca03ea40147149d2419343aadd2e08afcc3e1865efb9fc13beca9d4d2d7b1e027f72931415120524458843f85c86528e82da SHA512 3161ccc03a7c1af9b3a421515385d95866d306bf7639a24e4e4fc0d762a30e7195a517315ce489472fb18edc3594cd0f621ef5c42e17847d0b76563315426864
+AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb32c4158009c3444d43f506d19b94d0aa79d746ba409ec429d467e29619cd32894e935b8f8c0deda7f0ed2600841c6 SHA512 297f337895f805c9ce27ae63f424c88e8f153fb8f6724aedc11dd564acee6264b8eba01b09f43d75585d6d5bf3eb245db69b3da00c349c3c1c0d04a5a99b1b48
 DIST hunspell-1.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
 EBUILD hunspell-1.6.2-r1.ebuild 2361 BLAKE2B b75f02e0862a9a8be86d7fb29b663a93f483410bf5d0301bdab8487516c00f132e6268ed0bdf133f2ef746528b93c6b0d7cc71a38eb3f49b33202b125e19e04e SHA512 fa6f2089e74c17adcfeebdce2ffa7f2a56ef86e53f1b05b2a2d7fc61e4a29dc9a5f010aa305e07cf22c63208bb73fe1c795efc47e951b666aad33feccd0aeaad
diff --git a/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch b/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
index 1fb992b0c9d5..121c53e4595e 100644
--- a/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
+++ b/app-text/hunspell/files/hunspell-1.7.0-tinfo.patch
@@ -1,4 +1,4 @@
-From ce41cfc39129ee2be67667f2d9b78cc7f7d24dca Mon Sep 17 00:00:00 2001
+From b9a07b1ff100d5efeb5698d0ffe1c56935c681b8 Mon Sep 17 00:00:00 2001
 From: zimous <zimous@matfyz.cz>
 Date: Mon, 2 Sep 2019 12:46:53 +0200
 Subject: [PATCH] Fix build against ncurses with separate tinfo lib
@@ -9,7 +9,7 @@ Gentoo-bug: https://bugs.gentoo.org/692614
  1 file changed, 18 insertions(+), 4 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 9426a94..bc5e39d 100644
+index 9426a94..958375f 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -52,11 +52,23 @@ AC_ARG_WITH(
@@ -21,13 +21,13 @@ index 9426a94..bc5e39d 100644
 +        ])
  	],[AC_CHECK_LIB([curses],[tparm],[
  		CURSESLIB=-lcurses
-+        AC_CHECK_LIB([tinfow],[tgetent], [
++        AC_CHECK_LIB([tinfo],[tgetent], [
 +            CURSESLIB="$CURSESLIB -ltinfo"
 +        ])
  	],[AC_CHECK_LIB([ncurses],[tparm],[
  		CURSESLIB=-lncurses
 -	])])])
-+        AC_CHECK_LIB([tinfow],[tgetent], [
++        AC_CHECK_LIB([tinfo],[tgetent], [
 +            CURSESLIB="$CURSESLIB -ltinfo"
 +        ])
 +	],
@@ -57,5 +57,5 @@ index 9426a94..bc5e39d 100644
  	LDFLAGS="$LDFLAGS $TERMLIB"
  	AC_CHECK_LIB([readline],[readline],[
 -- 
-2.23.0
+2.24.1
 
diff --git a/app-text/info2html/Manifest b/app-text/info2html/Manifest
deleted file mode 100644
index 88296708eaf5..000000000000
--- a/app-text/info2html/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX info2html-2.0-xss.patch 2206 BLAKE2B 12daf13818b6c6a32932185f543bdfdfbb318d91f80ede4fe2495f9fe5d0dfc3183ad10b8e66d529530ea853834be2f029d94a81e7eebde5e8cfa67c06508797 SHA512 9ffdd82d6cd0f53473fa8eedd5372c09b3a0a2f2b59bea229320fb77bf07d9f9a9f6892585250cd9fa5034213b2b08a346e739ae931c6a42bbdc73487348b947
-DIST info2html-2.0.tar 51200 BLAKE2B 0209e7792689f68c8f596dcb0771395014963240f2071aa970f50611f752e9b9cf524ba2083a72a9b0f4346f8e14e23aedfde4497b05c02dae90b223ebcf6311 SHA512 1b9ebc8bdd4101d24116fe22df9e5d3124300b2ac11585d8c7fff9652f7984983480442af9d9f86300f9684335d85b96f276a775c56c95e7fac85ebc46235e06
-EBUILD info2html-2.0-r1.ebuild 1914 BLAKE2B 861c434b51a57e9a7641e2150e87c10a760ed0c13303ef1f2e7044e021923d23a9c870c1f4d2b7ec947b859736462ec775130eca325d9c07cec4b019f263549e SHA512 d6895e403e119a66884628d495fdc3345c6d0f9696468fccaabc8f339fa57a739baae1f3474efe58dc572a7a5dab881e33f7e3d45c77e682bd774bb6f0efd7db
-EBUILD info2html-2.0.ebuild 1936 BLAKE2B 35ad17ff213a187eb6a9b91e85c4e6e4c4cc9428cabf004d071aa0af4a9f6517dcaa06b76860523552250a0cb682982d587764b00238d47de080f63d14fb92e3 SHA512 e6064454cea807c4bd187f00796231ca53dbf1290aa7bca05eb56a048e0cce9c86b9ca857d5e18ad4e1ab036029acddbd74ba7aaf0592d8b5da58d1cf5f8b700
-MISC metadata.xml 329 BLAKE2B 9d0be1049ee8b84a11cf0b216e1e05263409f28ec1169978454df89f9726bdcdf1b63ba824f534606bdcd2163dd7b8e1aa9bf9497dfcb6410c0eb3b63958311a SHA512 18e0083cb85393d3d92abda8016dcdebe9f84fcd176557cb433b858ed9b6087ce7e5b53022d689e3861526d10440a9fe7fd6a1d86782a76d8f0756c3046bae23
diff --git a/app-text/info2html/files/info2html-2.0-xss.patch b/app-text/info2html/files/info2html-2.0-xss.patch
deleted file mode 100644
index a2254bdbbe2b..000000000000
--- a/app-text/info2html/files/info2html-2.0-xss.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -u info2html-2.0-orig/info2html info2html-2.0/info2html
---- info2html-2.0-orig/info2html	2006-09-01 14:55:13.000000000 +0200
-+++ info2html-2.0/info2html	2006-09-01 15:05:41.000000000 +0200
-@@ -42,7 +42,7 @@
- 
- use CGI;
- $ENV{'REQUEST_METHOD'} or
-- print "Note: I'm really supposed to be run as a CGI!\n";
-+ print "Note: I'm really supposed to be run as a CGI\!\n";
- 
- #-- patterns
- $NODEBORDER    = '\037\014?';      #-- delimiter of an info node
-@@ -62,7 +62,7 @@
- #---------------------------------------------------------
- # Don't reveal where we're looking... --jonh 5/20/97 (and reapplied 5/4/1998)
- sub DieFileNotFound{
--  local($FileName) = @_;
-+  local($FileName) = &XssEscape(@_);
-   #-- TEXT : error message if a file could not be opened
-   print <<"EOF";
- <html><head><title>Info Files  - Error Message</title>
-@@ -104,6 +104,28 @@
- }
- 
- #----------------------------------------------------------
-+#                   XssEscape
-+#----------------------------------------------------------
-+sub XssEscape {
-+  local($Tag) = @_;
-+  #-- output escaping is required to protect browser
-+  #   against `cross site' and `cross frame scripting'
-+
-+  $Tag =~ s/&/&amp;/gs;		# ampersand
-+  $Tag =~ s/#/&#35;/gs;
-+  $Tag =~ s/;/&#59;/gs;
-+  $Tag =~ s/[\000-\037\177-\237]/&iquest;/gs; # "ctrl" codes 0-31 and 127-159
-+  $Tag =~ s/</&lt;/gs;		# less-than symbol
-+  $Tag =~ s/>/&gt;/gs;		# greater-than symbol
-+  $Tag =~ s/"/&quot;/gs;	# double quote
-+  $Tag =~ s/\240/&nbsp;/gs;	# non-breaking space
-+  $Tag =~ s/\255/&shy;/gs;	# soft hyphen
-+				# the rest is interpreted
-+				# as ISO 8859-1
-+  $Tag;
-+}
-+
-+#----------------------------------------------------------
- #                   ParsHeaderToken
- #----------------------------------------------------------
- # Parses the heaer line of an info node for a specific 
-@@ -493,6 +515,8 @@
- #----------------------------------------------------------
- sub ReplyNotFoundMessage{
-   local($FileName,$Tag) = @_;
-+  $FileName = &XssEscape($FileName);
-+  $Tag      = &XssEscape($Tag);
-   print <<"EOF";
- <html><head><title>Info Files  -  Error Message</title>
- $BOTS_STAY_AWAY
-Only in info2html-2.0: info2html.orig
-Only in info2html-2.0: info2html.rej
diff --git a/app-text/info2html/info2html-2.0-r1.ebuild b/app-text/info2html/info2html-2.0-r1.ebuild
deleted file mode 100644
index 3bacec7b49a4..000000000000
--- a/app-text/info2html/info2html-2.0-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils webapp
-
-DESCRIPTION="Converts GNU .info files to HTML"
-HOMEPAGE="http://info2html.sourceforge.net/"
-SRC_URI="mirror://sourceforge/info2html/${P}.tar"
-
-LICENSE="freedist"
-# webapp.eclass deals with SLOTting
-#SLOT="0"
-IUSE=""
-KEYWORDS="~alpha ~amd64 ~hppa ~sparc ~x86"
-
-RDEPEND="dev-lang/perl"
-PATCHES=(
-	# filter user-provided data to prevent cross-frame/site scripting attacks
-	# bug #91354 (fix from Werner Fink)
-	"${FILESDIR}"/info2html-2.0-xss.patch
-)
-
-src_prepare() {
-	default
-
-	# Fixup INFODIR for paths in /etc/profile.env INFOPATH
-	infos=$(grep "^export INFOPATH=" /etc/profile.env | tail -n 1 |\
-				sed -e "s:^export INFOPATH=:INFOPATH=:;s:'::g")
-	# Default path to /usr/share/info and /usr/local/share/info
-	[[ -z ${infos} ]] && export infos="/usr/share/info"
-	infos=( ${INFOPATH//:/ } )
-	mv "${S}"/info2html.conf "${S}"/info2html.conf.orig
-	touch "${S}"/info2html.conf
-	state="copy"
-	inserted="no"
-	while read line; do
-		[[ ${line} == "@INFODIR = (" ]] && state="insert"
-		[[ ${line} == ");" ]] && state="copy"
-		case ${state} in
-			"copy")
-				echo ${line} >> ${S}/info2html.conf
-				;;
-			"insert")
-				echo ${line} >> ${S}/info2html.conf
-				for info in "${infos[@]}"; do
-					echo "	'${info}'," >> ${S}/info2html.conf
-				done
-				echo "	'/usr/local/share/info'" >> ${S}/info2html.conf
-				state="skip"
-				inserted="yes"
-				;;
-			"skip")
-				;;
-		esac
-	done < "${S}"/info2html.conf.orig
-	[[ ${state} == "copy" && ${inserted} == "yes" ]] ||
-		die "Setting up info2html.conf failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	exeinto ${MY_CGIBINDIR}
-	cp info2html infocat info2html.css info2html.conf "${D}"/${MY_CGIBINDIR}
-	# README zapped by info2html-gentoo.patch; it only listed
-	# the homepage so it doesn't add anything useful.
-	# dodoc README
-
-	webapp_src_install
-}
diff --git a/app-text/info2html/info2html-2.0.ebuild b/app-text/info2html/info2html-2.0.ebuild
deleted file mode 100644
index dde163431903..000000000000
--- a/app-text/info2html/info2html-2.0.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils webapp
-
-DESCRIPTION="Converts GNU .info files to HTML"
-HOMEPAGE="http://info2html.sourceforge.net/"
-SRC_URI="mirror://sourceforge/info2html/${P}.tar"
-
-LICENSE="freedist"
-# webapp.eclass deals with SLOTting
-#SLOT="0"
-IUSE=""
-KEYWORDS="alpha amd64 hppa sparc x86"
-
-RDEPEND="dev-lang/perl"
-
-src_unpack() {
-	local infos state line i
-	unpack ${A}
-	cd ${S}
-
-	# filter user-provided data to prevent cross-frame/site scripting attacks
-	# bug #91354 (fix from Werner Fink)
-	epatch "${FILESDIR}"/info2html-2.0-xss.patch
-
-	# Fixup INFODIR for paths in /etc/profile.env INFOPATH
-	infos=$(grep "^export INFOPATH=" /etc/profile.env | tail -n 1 |\
-				sed -e "s:^export INFOPATH=:INFOPATH=:;s:'::g")
-	# Default path to /usr/share/info and /usr/local/share/info
-	[[ -z ${infos} ]] && export infos="/usr/share/info"
-	infos=( ${INFOPATH//:/ } )
-	mv ${S}/info2html.conf ${S}/info2html.conf.orig
-	touch ${S}/info2html.conf
-	state="copy"
-	inserted="no"
-	while read line; do
-		[[ ${line} == "@INFODIR = (" ]] && state="insert"
-		[[ ${line} == ");" ]] && state="copy"
-		case ${state} in
-			"copy")
-				echo ${line} >> ${S}/info2html.conf
-				;;
-			"insert")
-				echo ${line} >> ${S}/info2html.conf
-				for info in "${infos[@]}"; do
-					echo "	'${info}'," >> ${S}/info2html.conf
-				done
-				echo "	'/usr/local/share/info'" >> ${S}/info2html.conf
-				state="skip"
-				inserted="yes"
-				;;
-			"skip")
-				;;
-		esac
-	done < ${S}/info2html.conf.orig
-	[[ ${state} == "copy" && ${inserted} == "yes" ]] ||
-		die "Setting up info2html.conf failed"
-}
-
-src_install() {
-	webapp_src_preinst
-
-	exeinto ${MY_CGIBINDIR}
-	cp info2html infocat info2html.css info2html.conf ${D}/${MY_CGIBINDIR}
-	# README zapped by info2html-gentoo.patch; it only listed
-	# the homepage so it doesn't add anything useful.
-	# dodoc README
-
-	webapp_src_install
-}
diff --git a/app-text/info2html/metadata.xml b/app-text/info2html/metadata.xml
deleted file mode 100644
index 5020ed8cb0fc..000000000000
--- a/app-text/info2html/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">info2html</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 7467a8816244..45100bbf8d23 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,3 +1,5 @@
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
+DIST iso-codes-4.4.tar.gz 13299605 BLAKE2B 485f3b0240f1892fb96f2b5c391b3f0adc593fac97d53748aa104208936d1bf81de1d40e742ab48e3663cea0ce5b28a20782df2f4eed251bab5b8a7055745d0e SHA512 d22ecdef75cd07b59ea0dbc87d25eb254676ab83297c1a43dbad9d3471ba355630f5588b4590972526f9e885b2e1ec307303ac0bb94b2dd5c707377c1cfa64d8
 EBUILD iso-codes-3.76.ebuild 2411 BLAKE2B 2ea8d7891bb7d0dd56f4eb7931c5bff65412da737701001a8051730078a7d5bf5ad60cb53eb42ce93602198e0af26e9752da34e6801b86d777ad003bd9042640 SHA512 90c20515ee2d490550ac53a29b63cbe63d941edfc0486ceb8b383d7a064abfce0bfcebdeb78c6955ceba112ff9733c59be35f68686581cd2847a0371e8d07407
+EBUILD iso-codes-4.4.ebuild 2610 BLAKE2B 848c31fc51e13012b69624f64b5d87f0dfce311c230f88e256fefcb03bf8fd0065c82894af1d8a86cbeef6b46270d0d5c8a0884017c00d40805a1c5a0aa2ef7a SHA512 34be1311ad85ee8e956a70080a9d94f31ad4735f045748d438a18224756b2830348efc390c4b1415e0df21a363a6d779a64408c9c07f75504a8673aedc50e450
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-4.4.ebuild b/app-text/iso-codes/iso-codes-4.4.ebuild
new file mode 100644
index 000000000000..5494c38bf591
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-4.4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7} )
+PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_IN br bs byn ca ce ch chr ckb crh cs csb cv cy da de dv dz ee el en eo es et eu fa ff fi fo fr frp fur fy ga gez gl gn gu gv ha haw he hi hr ht hu hy ia id io is it iu ja jam ka kab ki kk kl km kn ko kok ku kv kw ky lo lt lv mai mhr mi mk ml mn mo mr ms mt my na nah nb nb_NO ne nl nn nso nv oc or pa pap pi pl ps pt pt_BR ro ru rw sc sd si sk sl so son sq sr sr@latin sv sw ta te tg th ti tig tk tl tr tt tt@iqtelif ug uk ur uz ve vi wa wal wo xh yo zh_CN zh_HK zh_Hant zh_TW zu"
+
+inherit python-any-r1
+
+DESCRIPTION="ISO language, territory, currency, script codes and their translations"
+HOMEPAGE="https://salsa.debian.org/iso-codes-team/iso-codes"
+SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${P}/${PN}-${P}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+
+BDEPEND="${PYTHON_DEPS}
+	sys-devel/gettext
+"
+S="${WORKDIR}/${PN}-${P}"
+
+# This ebuild does not install any binaries.
+RESTRICT="binchecks strip"
+
+# l10n_find_plocales_changes doesn't support multiple directories,
+# so need to do the update scan ourselves.
+check_existing_locales() {
+	local std loc all_locales=()
+
+	ebegin "Looking for new locales"
+	for std in "${all_stds[@]}"; do
+		pushd "${std}" >/dev/null || die
+		for loc in *.po; do
+			all_locales+=( "${loc%.po}" )
+		done
+		popd >/dev/null
+	done
+
+	all_locales=$(echo $(printf '%s\n' "${all_locales[@]}" | LC_COLLATE=C sort -u))
+	if [[ ${PLOCALES} != "${all_locales}" ]]; then
+		eend 1
+		eerror "There are changes in locales! This ebuild should be updated to:"
+		eerror "PLOCALES=\"${all_locales}\""
+		die "Update PLOCALES in the ebuild"
+	else
+		eend 0
+	fi
+}
+
+src_prepare() {
+	default
+
+	local std loc mylinguas
+	local all_stds=( iso_15924 iso_3166-{1,2,3} iso_4217 iso_639-{2,3,5} )
+
+	check_existing_locales
+
+	# Modify the Makefiles so they only install requested locales.
+	for std in "${all_stds[@]}"; do
+		einfo "Preparing ${std} ..."
+		pushd "${std}" >/dev/null || die
+		mylinguas=()
+		for loc in *.po; do
+			if has ${loc%.po} ${LINGUAS-${loc%.po}}; then
+				mylinguas+=( "${loc}" )
+			fi
+		done
+
+		sed \
+			-e "/^pofiles =/s:=.*:= ${mylinguas[*]}:" \
+			-e "/^mofiles =/s:=.*:= ${mylinguas[*]/%.po/.mo}:" \
+			-i Makefile.am Makefile.in || die "sed in ${std} folder failed"
+		popd >/dev/null
+	done
+}
diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
index 4149fa711c0f..dc733e70a699 100644
--- a/app-text/libebook/Manifest
+++ b/app-text/libebook/Manifest
@@ -2,6 +2,6 @@ AUX libebook-0.1.2-boost-1.59-makefile.patch 335 BLAKE2B 21b62202de334b214e4dd04
 AUX libebook-0.1.2-tests.patch 784 BLAKE2B b7f2aa5b5abace8fb1276c534ef564d8e088b514569540d940f433b5d293a497e211782059186688d94db8139b1f9f0859180f59ea4ac7c0e9c86ca10d11a934 SHA512 e176746ed85e0564332b7ed6e375f0869931e7f489d734dc1ecbd685af595ce1247f933a82736c239df322d57505c40cd23af434db711b8087ee77e26de2c1ad
 DIST libe-book-0.1.2.tar.bz2 465922 BLAKE2B 11898cb34d41a6abbf256ed8a7ff44006f239616987ca5883a8a611041bcda2cce221acc00c57cd36d94f8c26510889df3206ca4f071c23ae272262938e2c396 SHA512 82982874f9c0f5e400166e9367a4b6017cf11bbd69e2e79240137385a5d68ddea08f13676f8c5d0e983f441de17cda9f4b5f7c90c5cb3515e319de638edf3a38
 DIST libe-book-0.1.3.tar.bz2 510498 BLAKE2B e29f9f80a85210447494af20cf30ce7f231ef43f40af9683df7f63e172f5ff8d944d74b995b5850856b2736044b1a5a1ac386262e52a48575325339224a1d339 SHA512 9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21
-EBUILD libebook-0.1.2-r1.ebuild 1075 BLAKE2B a7d25b9a34b217c50b4d687c3da29fe3fb43db886a09d2f47f3c17fbd0de02e52189b1f8ff53305afead4d332ea1e14f02420e0d88416ec68b8c529bb488ce46 SHA512 31b59ee0ad73f50e34a3c344902952a429c25b55f48e47832af1f27b41851084bf0cb0bdfb6957db243c87311d66bb71349a2f740325bd60d81b168c208b43c2
-EBUILD libebook-0.1.3.ebuild 1018 BLAKE2B fc52e8c376ca1ce72502b752f0feb5817e7e165c926860989e04645e658992502942584d6aaa7c9a156ff5b82329d8d8631daef0579ece9839fd75e273765c97 SHA512 97db9fe34881c30583a616470212182e7553c475c8dae1999555b85519318e55cc6c4e15d25de4678ad1681b6897edfbce89b247f01d8234f8f8a161b308b6d9
+EBUILD libebook-0.1.2-r1.ebuild 1102 BLAKE2B 746d4d4dda955395419b8c316650e2048496da0ea0684732b668edbbf4e1fb3859c22ff7e08e3388d707cbc1f8bba6923a5d4e89ccb45e95ef8512615b9e0b30 SHA512 cefcdac481822765c7ff42d90183e3c90c3122b75b8380f694d3bba000205a184ff114772aff47fe1266528a6ea4a7c90845454af7f8c3e9db48065d9e9c968d
+EBUILD libebook-0.1.3.ebuild 1042 BLAKE2B 66d539c1b16e6b4c1b51a79bc370a20582c93213d9a52814db706b1d2d96fc15a136c2b09a315b84b22e1eb9c8685e55b70061b093eebf28053f34b4fe85a8a0 SHA512 2a9b0761e3dabf4306efa346ba52fa4c41bd50c47ef3ed7962a030093f60b33e730dba766d2ea1a12210f47ee925271f82299dae2cae4181bf9e5d069b07450e
 MISC metadata.xml 404 BLAKE2B 69f06dd52ba8be857d504941c4aeb6778381d87d61f1c9a889a6c1ad16a9d7014dabf76c707db2ed6a160be300a010e6d15c2162d35e59ddd038181a4aa7fae8 SHA512 8e0679b60d1fd56fcb165fd7b5a8e1367f4ee472d7a58e157e6bb1445b502b1fee56b18d099837dcabaa35f7b18f52515cbb51f7bfe9c4c2a824210e4003a275
diff --git a/app-text/libebook/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.2-r1.ebuild
index e91c7a75c406..d7fb8e609183 100644
--- a/app-text/libebook/libebook-0.1.2-r1.ebuild
+++ b/app-text/libebook/libebook-0.1.2-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="doc test tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/icu:=
diff --git a/app-text/libebook/libebook-0.1.3.ebuild b/app-text/libebook/libebook-0.1.3.ebuild
index 37b315119bd4..07d3dfb305cf 100644
--- a/app-text/libebook/libebook-0.1.3.ebuild
+++ b/app-text/libebook/libebook-0.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,6 +16,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="doc test tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-text/liblangtag
diff --git a/app-text/libepubgen/Manifest b/app-text/libepubgen/Manifest
index 7418d1252236..0f3ae7cdc03f 100644
--- a/app-text/libepubgen/Manifest
+++ b/app-text/libepubgen/Manifest
@@ -1,3 +1,3 @@
 DIST libepubgen-0.1.1.tar.xz 324380 BLAKE2B f2dd4ee4987aa69f3972f83fe6348e8f0d4ba2d5c2f8f871e81d7e9dd5dcc00e10fc2be27fcbbb6170f5a673b86c62261fb8d25ff3bf788cda726e64a254ec7d SHA512 9d911384672b5394ff1df3280a5c9fe12888530c41f177aa100f135954e2ec279b64193f8388f12c96f6a6e587483ce853e74fe45b29fb748a930512dd011c2b
-EBUILD libepubgen-0.1.1.ebuild 714 BLAKE2B cc26874f30252435c86a3dbf52dc433619aee25c9e0574727e00939b543d723b39c3524338c85dc8f25849863a1cf6571f15ca965b90799058de4ee30a6cb3da SHA512 faf13a9ce9a35dfee5ec71fbcc8293ded2ba9be62124c49048909c2764c5a1f9f58386c5f379119be4dbc19e662c705b53c538a0adc7460e68ac3dd093b21676
+EBUILD libepubgen-0.1.1.ebuild 741 BLAKE2B e5e79eb8ac5c1c872b680549b5de8d0952cb750fbfd7510720e7d5b530838cabc38f1ee80a45b2f448bccd88baabc92dab33a68124eff183afcf4e4d5649d108 SHA512 d08a77434cddab008e2b5576e9c1b1c4fc3fbc9987503e4948731f2d2b56584c9b630f92cc56e83e997684cacfdc2a09e6b625c741b368f6e7d5d4e68aabe249
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libepubgen/libepubgen-0.1.1.ebuild b/app-text/libepubgen/libepubgen-0.1.1.ebuild
index da571d0a4452..3b3e96693e44 100644
--- a/app-text/libepubgen/libepubgen-0.1.1.ebuild
+++ b/app-text/libepubgen/libepubgen-0.1.1.ebuild
@@ -11,6 +11,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="debug doc test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/librevenge
diff --git a/app-text/libetonyek/Manifest b/app-text/libetonyek/Manifest
index f7e750504276..ee221c059b88 100644
--- a/app-text/libetonyek/Manifest
+++ b/app-text/libetonyek/Manifest
@@ -1,4 +1,4 @@
 DIST libetonyek-0.1.9.tar.xz 1477064 BLAKE2B 088d27c83d4aff41cb208cf840def78e323f378a1b7d456448db3abf51d1e850c8159ace75c8836958b533c2b84e583d5a622e638081230d2f862f6d1d175e98 SHA512 3f439b369d450bb1a4bdb3fe92023bda234b323cf676570f1738318c56867a97910f536280b9b164c3fdaa423a3ee669c935df75a5c700bc1530ea5b9a00391e
-EBUILD libetonyek-0.1.9.ebuild 1186 BLAKE2B d15463f4377588211f8d33f4dfabfc9e4fd1bf62fc4ee3d5828e9953edc7106f8f3e9f71827339beb21facf55b9737be53e6dfd45fd27098a9129fd8d84dd157 SHA512 70639675fc3b07a94a107fed5b40f72d8df2e2885db176ad5275f1a0e1fde0f7b2e945d5a42d438a34a83f311a2629638436eb7f613f782e7153883cf35fcee6
-EBUILD libetonyek-9999.ebuild 1319 BLAKE2B 68e896b8f92d533592df53574f366c4b633d1b9fbffaba9c7fd0c92c686446dff254b1b165682b0b66ab109c6245adadf7bc677a16906fbd125f7ad3d13d9cd7 SHA512 35a31c69a9bfadca69b4250e4495dfffd28b437197c8dedea2b65daf0d195d570d4fad8d62c70863ea32c61c711559d40024bd854821c367a13e4435a419a1eb
+EBUILD libetonyek-0.1.9.ebuild 1213 BLAKE2B dd541c95dc2422f4c0461627b79f27e053bc4616223cd924c545f26a9af8b2e5fba66f6aed8a30d61885adc7d00524511c55eae725463f091385a801e2959fc3 SHA512 f79eef907d1889f71a6c3377a3452c626758301e288addb84dd866df8d0b672214f3bd400598aa9f4037f8ae16bac54722008be056ee2611eaccc20e653b6ae9
+EBUILD libetonyek-9999.ebuild 1346 BLAKE2B b91113601d4561393b9dbe5e00a1bb5a85293d2e52b5453638a2075a01c3ac8d13ceb6c497f767a54a6bae021e03e375fb5013852b8d198c27929d92ae5dff68 SHA512 357978af52920775af2d1417df82aaabcf73e42e6cc9f5a8ca6ded6b6198fd01d4140ac07358518643d4df26de5ce8678984d83d246868b08283d400aeb598db
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libetonyek/libetonyek-0.1.9.ebuild b/app-text/libetonyek/libetonyek-0.1.9.ebuild
index e690d1468504..36303b04a6f7 100644
--- a/app-text/libetonyek/libetonyek-0.1.9.ebuild
+++ b/app-text/libetonyek/libetonyek-0.1.9.ebuild
@@ -16,6 +16,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-text/liblangtag
diff --git a/app-text/libetonyek/libetonyek-9999.ebuild b/app-text/libetonyek/libetonyek-9999.ebuild
index 9bea9ad25cf0..a545cc94cd23 100644
--- a/app-text/libetonyek/libetonyek-9999.ebuild
+++ b/app-text/libetonyek/libetonyek-9999.ebuild
@@ -16,6 +16,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libetonyek"
 LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 IUSE="doc static-libs test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="
 	virtual/pkgconfig
diff --git a/app-text/libqxp/Manifest b/app-text/libqxp/Manifest
index 5ca6d5f340a6..6dd455086215 100644
--- a/app-text/libqxp/Manifest
+++ b/app-text/libqxp/Manifest
@@ -1,3 +1,3 @@
 DIST libqxp-0.0.2.tar.xz 341760 BLAKE2B e596b3ebd23c8fff2a1675b1076ba6b4403bb41358972b50eb946610108f5968ef3e553478aec8c6211f8b476030033e7d334cb4deccc7d6bdfba3914821abf5 SHA512 409d3df82ac522b39bdd0ef4f0a781b906e246a8e6f502009c095eea90d672c482a7fc5c7f998d89952bc598c6f51357346ed6df490c25cb48e1318e27c50dab
-EBUILD libqxp-0.0.2.ebuild 791 BLAKE2B b1b867d53532481ec393b42d5af4436c24cb7df2e769507e1afc5b2300d68ef953e7f32b5f6cb2247cc6a63171a3fc4d08b21c429fdbc3f3af812ba0e5f38624 SHA512 4becfecc0a432ce757f43a3b25cfaa74a99dc8cc653d8457628d1dc44023a6cb9e3b4840402048b04bd5abb3cc424f654bbd6a0d9af742ef889f6dbdb017b9dd
+EBUILD libqxp-0.0.2.ebuild 818 BLAKE2B b606252d677a16b8f74d4001f83d83c18c9287c9dec6d37020ac276bbce2f6e1fac98d0f6a45e4d52816c9bc52308b5753af3ce02307150f04f753c299c0067a SHA512 43152bee7a26a2b89a8879f3e203d80f2bf3e926663faf9790470b6b44a5b7f61f860d3e9bf589ba087abccd76e766b322c011e08ba7a215a6c844b7cd02b724
 MISC metadata.xml 326 BLAKE2B 2058d5aa3fb12800596e894b6415bbb01df4d3b72efd60cb7cfc26d75f60d1de9ac3190aa4e82145fcfffbd3a48a80f8f2d0f984662160b82c6201aac48e3261 SHA512 97b3e21efde5b88155863552b56e196d2349d761106177deb84e587d3bd0c08cf4e91ec779caf1db86970ddd3f6ce7ce76ded2e08a8a763e93428a9042605e6e
diff --git a/app-text/libqxp/libqxp-0.0.2.ebuild b/app-text/libqxp/libqxp-0.0.2.ebuild
index e15f19284937..45620397cd35 100644
--- a/app-text/libqxp/libqxp-0.0.2.ebuild
+++ b/app-text/libqxp/libqxp-0.0.2.ebuild
@@ -11,6 +11,7 @@ LICENSE="MPL-2.0"
 SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86"
 IUSE="debug doc test tools"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-libs/librevenge
diff --git a/app-text/libxmlpatch/Manifest b/app-text/libxmlpatch/Manifest
index ee72e7d6b6a7..5d8c749a00b8 100644
--- a/app-text/libxmlpatch/Manifest
+++ b/app-text/libxmlpatch/Manifest
@@ -1,4 +1,4 @@
 AUX libxmlpatch-0.3.3-gentoo.patch 2029 BLAKE2B a2cced2f4a6e8c7ad53420e1c8a6d244cfc808ae398ecd4106b59c0c80c6d3b708a9bd7c6ccddd21f15b5a000faeba4d00d9510ed1eb3b4a44a34cf79e52905d SHA512 076f5ce303fa410ed48828bfd4c9544d4606511597bf39676a899fb577bc4670db83706ef05928d9e49a665089864d6fb2e22321c19217ed341265d57d2c4052
 DIST libxmlpatch-0.3.3.tar.gz 405496 BLAKE2B 57333f62b95be3acc058593ccdb935148217f84acd7b5d431043cf08bc217d04abe650be099a849790400f0153523cea46905e9a12e6a33e80f0e20edc2fd9f3 SHA512 2eb305ddd6aa1778bc9c9e7b8cae5f82ee05c0ed0a47bbb651209c496fff68f4e527b7d6ad1808bc8bf1f72aaa0172a12ddb140622ce87e3cd150a0ec4d35571
-EBUILD libxmlpatch-0.3.3.ebuild 772 BLAKE2B cdc29331635b6f5e8c227343b510d4ae94bcffdf6d70f0e8894710b11a9e53a630990c49cef28a37eb4b0c5524d61baf6a199733366828b1828e77ea7842dac8 SHA512 9087aa0c074e6c7b11b58bd02a6f8c19ba8d8c6730712a3157808de30b4064956caa862bdf31a7127b7772b6b7deef46597aa3d63cd197a0579bd9694a283f02
+EBUILD libxmlpatch-0.3.3.ebuild 796 BLAKE2B 4dcd48c289c36e72a8d9f4208a4857081ad9d31714a7030716b5661f66422bb40b0fa038d5fe2c318187408816d427d4fd18ea619613d0a1a8f574557e167f26 SHA512 d148276949fe5f8203bd91675421e90dc002af629c81d2299efb6296715872ebcf64299c88f35483508862f1dc50325014c661923ff454893d8a3acf4e73254d
 MISC metadata.xml 245 BLAKE2B e5b503817d886ea642301a8fb76459f31236d1496ba03cb467126419460106072424b6da1e1957ffaf977ac05f4c4baacef448cdf86ea4cbd93fdba026d5e8af SHA512 f884111cb1a85bb4e909b8bc6a70ca00e8d69e066fc9ef79ddbf0b3fc277bc8a47ce13bc1b7bd03a4be9bc0a54704440552394f1d1a8c68d0bf9704b8f05769f
diff --git a/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild b/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild
index f5697fc876de..51ae4624c90c 100644
--- a/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild
+++ b/app-text/libxmlpatch/libxmlpatch-0.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -13,6 +13,7 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test static-libs"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/glib:2
 	dev-libs/libxml2"
diff --git a/app-text/linuxdoc-tools/Manifest b/app-text/linuxdoc-tools/Manifest
index c34f0fff0b14..958f10c02957 100644
--- a/app-text/linuxdoc-tools/Manifest
+++ b/app-text/linuxdoc-tools/Manifest
@@ -1,6 +1,3 @@
-DIST linuxdoc-tools-0.9.72.tar.gz 614429 BLAKE2B 404b311c0560780bd81f021760d32e47cd6ebe8abc9aa64a181b8ce727dd0edbbd88d286cdfdcc97a51981bd0bd299563d7b1b2945e06f83ff32c7d3e56abb19 SHA512 2d522a99212dab2535786b64e0b404a9bb023d1612d8e57a628de21b5e77b104285713a98591c61a2fb2196e687b34180198ab0dfeda2b44fbbce051e9919408
 DIST linuxdoc-tools-0.9.73.tar.gz 613971 BLAKE2B e2e04aaa44d5e2cea5af266e38b476381f87a02b9704e03ae5943f7714634d5d214350abd5b193f2efe656a264403c679495af5f954870b30d32b8b799ad7206 SHA512 b26896316e259cf4ef170814d410b1e39e58f61db49b03b4b9c1f767f8459d84214e92d9dcc09ad739508fd9c3c5fe4a2264cbb3c693a11362e59fd221655252
-EBUILD linuxdoc-tools-0.9.72.ebuild 1767 BLAKE2B 46572536ad7d41da82be7618217966627236fedefbf2897c84f2b7f04453d123678b4d336447cf869e3fbbf963e1aa136c0468bd73e7977f74b18a285c6987f9 SHA512 04c2ca40dbf232b9d49453f6df9272605947755d3840edba6e10d3ec10b02dc7541552bb9908c050569e7315e2a5afd97bac2db3a4ae5850a212e9a43aff738c
-EBUILD linuxdoc-tools-0.9.73-r1.ebuild 1950 BLAKE2B 0b428db96cde36c532c276747445e939d719c08170f449df3533a4b1de899c194a585c0b18981db7d1f492697d3b103c8f315eec65ec2df0c07c474c3de8f21b SHA512 619c87b55840d9841a8ecb1373d66bb202d127ba8f9ea6ce2384073c3b5f33d2f1c6b058b645feb8b651f4fbf2b815c54a15c8384273a107a25d7c0ef8249a87
-EBUILD linuxdoc-tools-0.9.73.ebuild 1657 BLAKE2B 09063fffc91df4fbe7556cdbcfb83250233c966ef6151342a5a22293408304fcd615f44d7870a9cfd945bf10f692b6daced1e456b8534b6c6315a98ecadef3e3 SHA512 c4ad1f83a530da79f841af017b3b92b8af115c2de204c3862004637e166d7a3ae3c3d8ddd2071bf097fb65f1ec78ffa0e1270b4df964b130573d4ffd12d08336
+EBUILD linuxdoc-tools-0.9.73-r1.ebuild 1947 BLAKE2B f22cfc520248a1f82d8ba0af600a71d5822e1add1fe2d7d526d6f2b8f6aa9202f1fed646cf49337a3391f986c92569e3801a8f30d5b3a11b86100483252b691b SHA512 5899fe18b31eaadefca317298c4c0727824a677c3ca16293acde4ea13dba96e84a864843c01c81af7176e93da0ca306e3ca2751008337baefafed797d0eaa777
 MISC metadata.xml 712 BLAKE2B b2f8030cb2de1321cf9bf1be3431ad04d9d87165d206846c48f1cf50042abdad7b33b935c0b4acde37898cdb1e71487be2db720c97dc39c211cae27ca75d53ce SHA512 99b997c23ae04221a18ccf4b033ed7718180fd597cbded2e615aba1ff113d0737974ffd52beb1253f4096156068b001a786fbe643b4827a2f85786957a89eca0
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild
deleted file mode 100644
index 2bd2a8f42353..000000000000
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.72.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# EAPI=6 is blocked by Gentoo bugs 497038, 497052.
-EAPI=5
-
-inherit autotools epatch latex-package perl-functions sgml-catalog toolchain-funcs vcs-snapshot
-
-DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
-HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"
-SRC_URI="https://gitlab.com/agmartin/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz"
-
-LICENSE="GPL-3+ MIT SGMLUG"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc x86"
-IUSE="doc"
-
-RDEPEND="
-	|| ( app-text/openjade app-text/opensp )
-	app-text/sgml-common
-	dev-lang/perl:=
-	|| ( sys-apps/gawk sys-apps/mawk )
-	sys-apps/groff
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	doc? (
-		dev-texlive/texlive-fontsrecommended
-		virtual/latex-base
-	)
-"
-
-src_prepare() {
-	[[ ${PATCHES} ]] && epatch -p1 "${PATCHES[@]}"
-	epatch_user
-
-	# Update the build system with Gentoo paths.
-	sed -i \
-		-e "s|share/doc/${PN}|share/doc/${PF}|g" \
-		Makefile.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	perl_set_version
-	tc-export CC
-	local myeconfargs=(
-		--disable-docs
-		--with-texdir="${TEXMF}/tex/latex/${PN}"
-		--with-perllibdir="${VENDOR_ARCH}"
-		--with-installed-iso-entities
-	)
-	use doc && myeconfargs+=(--enable-docs="txt pdf html")
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Prevent access violations from bitmap font files generation.
-	use doc && export VARTEXFONTS="${T}/fonts"
-	default_src_compile
-}
-
-src_install() {
-	# Override latex-package.eclass
-	default_src_install
-}
-
-sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" "/usr/share/${PN}/${PN}.catalog"
-
-pkg_postinst() {
-	latex-package_pkg_postinst
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	latex-package_pkg_postrm
-	sgml-catalog_pkg_postrm
-}
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
index 8e02b1acefcd..afa70d83839c 100644
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
+++ b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3+ MIT SGMLUG"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild b/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
deleted file mode 100644
index 68f6240d0417..000000000000
--- a/app-text/linuxdoc-tools/linuxdoc-tools-0.9.73.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# EAPI=6 is blocked by Gentoo bugs 497038, 497052.
-EAPI=5
-
-inherit autotools latex-package perl-functions sgml-catalog toolchain-funcs
-
-DESCRIPTION="A toolset for processing LinuxDoc DTD SGML files"
-HOMEPAGE="https://gitlab.com/agmartin/linuxdoc-tools"
-SRC_URI="https://gitlab.com/agmartin/linuxdoc-tools/-/archive/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3+ MIT SGMLUG"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ~sparc x86"
-IUSE="doc"
-
-RDEPEND="
-	|| ( app-text/openjade app-text/opensp )
-	app-text/sgml-common
-	dev-lang/perl:=
-	sys-apps/groff
-"
-DEPEND="${RDEPEND}
-	sys-devel/flex
-	virtual/awk
-	doc? (
-		dev-texlive/texlive-fontsrecommended
-		virtual/latex-base
-	)
-"
-
-src_prepare() {
-	# Pregenerated configure scripts fail.
-	eautoreconf
-}
-
-src_configure() {
-	perl_set_version
-	tc-export CC
-	local myeconfargs=(
-		--disable-docs
-		--with-texdir="${TEXMF}/tex/latex/${PN}"
-		--with-perllibdir="${VENDOR_ARCH}"
-		--with-installed-iso-entities
-	)
-	use doc && myeconfargs+=(--enable-docs="txt pdf html")
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Prevent access violations from bitmap font files generation.
-	use doc && export VARTEXFONTS="${T}/fonts"
-	default_src_compile
-}
-
-src_install() {
-	# Makefile ignores docdir configuration option.
-	emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}" install
-	dodoc ChangeLog README
-}
-
-sgml-catalog_cat_include "/etc/sgml/linuxdoc.cat" "/usr/share/${PN}/${PN}.catalog"
-
-pkg_postinst() {
-	latex-package_pkg_postinst
-	sgml-catalog_pkg_postinst
-}
-
-pkg_postrm() {
-	latex-package_pkg_postrm
-	sgml-catalog_pkg_postrm
-}
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index c9af8976261f..0f52e9893889 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,6 +1,8 @@
 AUX Makefile 2810 BLAKE2B 9c8ad849e95dc4037813bc575b5627b54bdf1eae3085235489e1a1c0fdf3aa3c679b5884d4044fce828f2feef02afcb82c7762b09af2c9b167c1c2dd7d0c5c7c SHA512 28014bbf81cb22c28963b594f8ef15a16740e41de2d6ad7421017fc5a50015e33ca1d449ea43a9976f741a269dac4045b2ed459cb74081690f919a4218542303
 AUX llpp-30-keysym.patch 1669 BLAKE2B 4df35a04c4b5de7e8fa4eaf7efe6a63f203292f12c03d1c232a0c54fa7f9f47b92f1618042e998a006f9c9822f335620b6c0c40fe0d547ea6871cfff51e75676 SHA512 003d085650ee88ee3f7f12657aa81c8a46653f3fe4a13527aa18cd52f669b7135de7686169dfed706400a557c6654fdb8041a3cf2348014425f2063be67d494f
-AUX llpp.desktop 566 BLAKE2B 2b7497616434d7ae4abfa7a78d753f194ff13c460138a1d8f13cbee674b641a476d73753c8f95ef2d02e29568fcebc47df8820329ee224b611269724d812e108 SHA512 7bbfdb97ca6f3b58f95bde326cf20bed2a5b2797ff033b1fa497e1d1fbd4522c7691b3d06f57d36707623d335e0d6a7b2e82ec6e94bfd16689241bf58289313e
+AUX llpp.desktop 556 BLAKE2B 44ef90b27f7d4efc02e7a4f420bade296d9704ba1dda803d4ffe897fef1393a2147827971bfe58ad0d896b0af619c6b4796c1bb08beba0728d66c2ec15e2cc56 SHA512 a0c6a256f8d08829f70cf8c1b2a2b93fd9cb60ff2e5d886a09a4afffe42fc95e5f9ac86fbcb9e4af805d40f309a65b7958f5f60dc3637aab9ad4248a56a9fb97
 DIST llpp-30.tar.gz 165821 BLAKE2B 755648f9f7e0e0740dd9647559c085ab1626edfceb91d8df4aa783610f32499d744f24a2e0ac0d6f13e747695e8829112e59bcf0fc78c7ef5f4b2427c759353d SHA512 1dfcf273bdabfb3c7b38366bac60659555b943f459cb3fd6e656df1a33c0f84e6745d62522c5498df0bd6182bda13973144724054588c07145018bb3e758d893
+DIST llpp-30_p20190316.tar.gz 169517 BLAKE2B 56dbb4fc1f46e654f15986edf870bec22c3d26c694915db88125d99b8f0460c70ac3bd48c82f45f32939f5a09753a4ec6f2e6d544397a0d6ba242640c363917d SHA512 c736b94595eab1fd45e6fb6aa89a988e0c3ec1f4c7c88f8655d17a88c9ff62c6b7db4396a3934690861b5e61af595baa6736b92c585ad68c51677f3e577bd713
 EBUILD llpp-30.ebuild 1716 BLAKE2B c7c87a02e1ce23d4cd01645cd33469eff8be4cb109d5fa388b54fff60230a5eaca7adc6e432ce2385ef6e286ec23f06800ffdf4e194bd7bc31560e8ad3134575 SHA512 5afd881e7944eb01a77fbd1766ecbe131e1043f90d5809db99b5da24da4353d151a4b1a11e1e55e49d1046a5fb332178ed6a9bedb1d08929c9781f13ca460bef
+EBUILD llpp-30_p20190316.ebuild 1776 BLAKE2B b2b63fafd4d9f0a6303519e8ca017918fdbd2af6ece74c1e26f1faaac8c0d6efc71ea6d213bf5f5ef8176d6c5a49eb93c330c8ac64fe46da34636d0ba4daa1fa SHA512 7feef827c5fcd7b879f1878929ad0365e4c439fb0426f0b35c9839726aa425c253d08a938635a30c7ddb460c08db02434c1ee8ff7f132ae7698414fb07688a7c
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/llpp/files/llpp.desktop b/app-text/llpp/files/llpp.desktop
index 9d81141aede6..59c5fcde4e87 100644
--- a/app-text/llpp/files/llpp.desktop
+++ b/app-text/llpp/files/llpp.desktop
@@ -5,7 +5,7 @@ Exec=llpp %f
 TryExec=llpp
 Terminal=false
 Type=Application
-MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip;image/png;image/jpeg;image/pjpeg;image/gif;image/bmp;image/jpx;image/jp2;image/vnd.ms-photo;image/jxr;image/x-portable-bitmap;image/x-portable-greymap;image/x-portable-pixmap;image/x-portable-arbitrarymap;image/png;
+MimeType=application/pdf;application/x-pdf;application/x-cbz;application/oxps;application/vnd.ms-xpsdocument;application/epub+zip;image/png;image/jpeg;image/pjpeg;image/gif;image/bmp;image/jpx;image/jp2;image/vnd.ms-photo;image/jxr;image/x-portable-bitmap;image/x-portable-greymap;image/x-portable-pixmap;image/x-portable-arbitrarymap;
 Categories=Office;Viewer;Graphics
 Actions=View
 Version=1.0
diff --git a/app-text/llpp/llpp-30_p20190316.ebuild b/app-text/llpp/llpp-30_p20190316.ebuild
new file mode 100644
index 000000000000..019afdb0c6c4
--- /dev/null
+++ b/app-text/llpp/llpp-30_p20190316.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs xdg-utils
+
+DESCRIPTION="Graphical PDF viewer which aims to superficially resemble less(1)"
+HOMEPAGE="https://github.com/moosotc/llpp"
+MY_COMMIT="1f3ae0843d5877a0e599d8411d433bd9b0078157"
+SRC_URI="https://github.com/moosotc/llpp/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt static-libs"
+
+RDEPEND=">=app-text/mupdf-1.15.0:0=[static-libs=]
+	media-libs/openjpeg:2[static-libs=]
+	media-libs/fontconfig:1.0[static-libs=]
+	media-libs/freetype:2[static-libs=]
+	media-libs/jbig2dec:=[static-libs=]
+	sys-libs/zlib[static-libs=]
+	virtual/jpeg:0[static-libs=]
+	x11-libs/libX11[static-libs=]
+	x11-misc/xsel"
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig
+	static-libs? (
+		app-arch/bzip2[static-libs]
+		media-libs/libXcm[static-libs]
+		x11-libs/libXau[static-libs]
+		x11-libs/libXdmcp[static-libs]
+		x11-libs/libXmu[static-libs] )
+	>=dev-lang/ocaml-4.05[ocamlopt?]
+	dev-ml/lablgl[glut,ocamlopt?]"
+
+RESTRICT="!ocamlopt? ( strip )"
+
+PATCHES=( "${FILESDIR}"/${PN}-30-keysym.patch )
+
+S="${WORKDIR}"/"${PN}"-"${MY_COMMIT}"
+
+src_prepare() {
+	default
+
+	# use custom makefile from archlinux with minor changes
+	cp "${FILESDIR}"/Makefile "${S}" || die
+
+	# re-add desktop file removed upstream
+	cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die
+}
+
+src_compile() {
+	emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	dodoc README Thanks
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/mftrace/Manifest b/app-text/mftrace/Manifest
index 3ae265bafd4c..faeacd1e9875 100644
--- a/app-text/mftrace/Manifest
+++ b/app-text/mftrace/Manifest
@@ -1,5 +1,5 @@
 DIST mftrace-1.2.18.tar.gz 79112 BLAKE2B 8c3be27985766690782338dec33955cbac80e7d8f4334ed7b62d3c52d7ea5784c14b12c87afd13099cdae226033ca3324b9e7c6e876badb75a8fb634f68a75f6 SHA512 db26a643a92cfcbb150c5f80af65b1ce6030a266023b4433ea760c3601092c42602617f52a49ce467cd3a4804aa6779e72ee38dc557dc03e1e1c86a36dbd54db
 DIST mftrace-1.2.19.tar.gz 78907 BLAKE2B 894ec3c428020cad8f2e408e141b58d7f1e0969c59e65ccb5379e346d735845f8922be4e046ca8fbd18cfd7c3b8e2179ed7af4756ddb4416b6ad42bdbff27f09 SHA512 410739ced17c5e5bb82c286b6b935c9d8d46299f9c04f0ba4c97df9ada5d7e9c778c720fb8a2377eb6df3c629a6e7264836fe7675733cf60197a817477dc49ee
-EBUILD mftrace-1.2.18-r3.ebuild 870 BLAKE2B da64abe4b474e3fda7b0995559e2a849f1d015d82700693fcf18a70f1b21743b4af79b92935caf3a4afc8daa8c582925e7ff917042687f82c56215414ad71221 SHA512 c993edfe9573492bfba2baa103cc2694a6c9abe96cdefa76cdd09bbe3aa85c515a313a365bd14be1eeb897a046990fd3e3fb70bcf72ef65b28044b6252105fe5
-EBUILD mftrace-1.2.19-r1.ebuild 873 BLAKE2B 7e5b6546db7cbca2644319a336ec817b853ae017d26c61ce110d827a33bf2b3b9e15edb9c64755f50bf9b4119af46788491566a8a49909ffb9c8dc6a7cef4ca8 SHA512 6de1ec0ac3e7d4cd60f47a735dd7e3a5f15e744b7c26b016915cd1019f4526c8f537ecd3aea0b4c2dabe35a4d635a1ce1c62d90812f021034b7358ff2207d479
+EBUILD mftrace-1.2.18-r3.ebuild 894 BLAKE2B f87da179f946ccd6232b05c94ad992311673379dc4283d6eca3c69cd007c31537526a58f9dbb50e278fa0560b9863ea653f86d4e31b921fa858aa01627fd7fea SHA512 ea8495b29c08d633a7a7b062f7c37c0dd7f85a0b616e771c70d6f745ceae260dfbc7c52d1c24d3ac6c4c09f40ddcbcc8f1ba58bc6d3130b24d43bfc26f7f23be
+EBUILD mftrace-1.2.19-r1.ebuild 897 BLAKE2B a260e65974332c44744b3c9f1ee5b6c1f6bc709de97e0a1557920b1215912e476918d02f5b08a533cea4fc80f80fbec5d5356196f37b67a5075c8b61dee231c9 SHA512 676613ea2d2b9146c7f0e31ddfa8a6fdbc08dcb27b083997f88476a749d2d55c05480bd7bbfa7172801521f5e5e010a98a33cfcbed02cca3e2587e1ed8c6a443
 MISC metadata.xml 340 BLAKE2B c05678e707d8559ee9e192a80e8911ed8caf3279f8b240e2554bf2e60a6f10c0c1597d12ee3d236fdcf4e9b10aea677972c1a443eabf507d37f6adf9cc7fbcff SHA512 f8317a47d8515f79517a74e966aa31a05c9900a5a4aa52d9aac86b92d15553d03e6d82051312eb689d62381be05ab0f2fe9234bd520e86faf8226aba0cc9ba21
diff --git a/app-text/mftrace/mftrace-1.2.18-r3.ebuild b/app-text/mftrace/mftrace-1.2.18-r3.ebuild
index 3487a1885759..043340c9e9ab 100644
--- a/app-text/mftrace/mftrace-1.2.18-r3.ebuild
+++ b/app-text/mftrace/mftrace-1.2.18-r3.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
@@ -16,6 +16,7 @@ KEYWORDS="amd64 ~hppa ppc x86"
 # SLOT 1 was used in pktrace ebuild
 SLOT="1"
 IUSE="test truetype"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND=">=app-text/t1utils-1.25
diff --git a/app-text/mftrace/mftrace-1.2.19-r1.ebuild b/app-text/mftrace/mftrace-1.2.19-r1.ebuild
index 8f79db97ec5a..ec0f31be3231 100644
--- a/app-text/mftrace/mftrace-1.2.19-r1.ebuild
+++ b/app-text/mftrace/mftrace-1.2.19-r1.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
@@ -16,6 +16,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~x86"
 # SLOT 1 was used in pktrace ebuild
 SLOT="1"
 IUSE="test truetype"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND=">=app-text/t1utils-1.25
diff --git a/app-text/msort/Manifest b/app-text/msort/Manifest
index c4414b1a5d27..ad01390c0fe9 100644
--- a/app-text/msort/Manifest
+++ b/app-text/msort/Manifest
@@ -5,4 +5,4 @@ AUX msort-8.53-fix-segfault-on-certain-input.patch 384 BLAKE2B bec03b23365bfe010
 AUX msort-8.53-respect-users-cflags.patch 238 BLAKE2B 50efa37a87f42112524bd8e281c634b0e2527dc4d63597433616a9f220a3cf935138a32eab9a11f5acedf37bc1c6b25efe1e862b81c0b3ba930c6545fce05cff SHA512 c157bf5babc42db689cf9e0b9ee8c9f372c065570b2728833036658215ae508565db2ec4f00688766ce5a18ea3589747c7cce7172232fe0493a8037689f8152e
 DIST msort-8.53.tar.bz2 440307 BLAKE2B 024fa62c9424dd7f994fd9aabdb2414116ba78c2f6bbbfd88c11cde4ed1688260d7bb7f7a18dd36822f4725817df93d218c4382e8b15232fc6d3583098d44db0 SHA512 9afba189d8b703cd6668065ace86733b52a39f6783272849b3582308da5a33db8ae6747501846523ba3671c9fb38a7584fe0db2462cff446b15d79200055a573
 EBUILD msort-8.53.ebuild 1025 BLAKE2B 3c7acb0a7fa29c2612588898823c20690f2dee7e2ca35d855fad205a197f7cfd514710dfd77fc3cfe3ad9a7c7431836187100a99b06db51a07bb0c61e9fbf500 SHA512 1f6eec831620854e795d243ef81660a439df1ab99878205f055e758f55ef075315a0b189b69117ff13bd4a21f0d1d31a9df775197f2e219f8cfd1a64ebe30caa
-MISC metadata.xml 1119 BLAKE2B dc935ff36b3a965f890dda09b161d321cad04d3b8f427c8ef611bf6ba728ec97bb0622d012a837fbd8bf2ae1a4bd79b4bfd8314039a515c4b36375b71b69548e SHA512 4185e0b60575cb60fb14392f24286fa8d94a15ce81c6fdbfb5d5031d7dccb170861bfa6b78a2851ad3347fcdd1bd6b9b05973e9b243561a172a69921ccf2fbbc
+MISC metadata.xml 1000 BLAKE2B 97ca2922b7def4cba7a8b30ba037f225985d0f9894bde8697a743b0ae7ca62762bcc5a5407840a67967f705521782b82302577492f7ec7d7986fd12bd670b485 SHA512 6015e576adbc1d3569c30e0e60280b537b313c9eda6c5c78fa8fa9ed107a9e258de5e4bb33158c7a6298d32edf9d6099834f41792cd5f043b17bc25c35a6d438
diff --git a/app-text/msort/metadata.xml b/app-text/msort/metadata.xml
index f7bd381f8067..ff4a65d1fb1f 100644
--- a/app-text/msort/metadata.xml
+++ b/app-text/msort/metadata.xml
@@ -2,13 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
 	<longdescription>
 		Msort is a program for sorting files in sophisticated ways.
 		It was originally developed for alphabetizing dictionaries of "exotic" languages
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 4d8647e403f2..cc4fe4a583f1 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,17 +1,8 @@
 AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6099c35886a6f2e9508f6d08c678dbc1386e88998d01bdacd160020dc6ceefffbe09f4cf2b64d08acfb76f8535ffcc0dc93c65a3a2da78 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b
-AUX mupdf-1.14-CFLAGS.patch 395 BLAKE2B cc841dc186ac09892789664395bf632a33af3fd1e979e6f23809be0de74181004714b7352d52f3e4414147fe565e73ae9a6fe6b35a6674445e88a3d67ef640c8 SHA512 a5029fca7665e417f16062dcad22e084d6d99cd9ff9a6f1ad853d3ba182c8f565c75469d77edda521f7e777e14a55d4126ddd7631e70290c340d9c7411974c47
-AUX mupdf-1.14-Makefile.patch 1294 BLAKE2B 228ab49a5814e24b0fb1995c5137ce513a303f495973699a370a13a2af17e436ad67ecb47bab739740f7593b71087e167461ff188ef0fe8edf3980450d54984a SHA512 33be7134f8f469a4c72daf59d705de2ed2952ba4ff518ab54f5dc44279d4af8c5d05919bd19d4c6b84085f47f3713a752d678e708aa736e703d2f47d94391b84
-AUX mupdf-1.14-fix-big-endian.patch 4086 BLAKE2B c5104e808a83f122f1c1e80fd57b5aabadc017458e1d2383b09eef457ff6bd8809a42efac01d1f5fdfcbc55789696a2ab62dfd7f6f83150a1016e4c07c4fdfea SHA512 2519b33703976465f1411cad10daebe7646c2830ac385df642b326e82ca608bb4662f824ff98a1cc434994191f222ee02f56b296cac526abaa9e69d5786d50be
 AUX mupdf-1.14-libressl.patch 1362 BLAKE2B b52ccec0a03d97b357d5329317143595e0cf3029179b91f3d6134f6b59e313ed71063aee97d1192630fb64bd237997b1a56a6a55461b5e434297756e234990ef SHA512 3094d427a7beedc756e47a367423ffe7c8221f9078bd7bef5e8dddba615e918824778cc8118cd656b2dd1d8c235c770631241eb84a46551c96c32906a7986281
-AUX mupdf-1.14-r3-openssl-curl-x11.patch 1256 BLAKE2B 49bfda1f434fbfcf85c7b38b714b3c471d8d4ce02d625a6716582e0a9b3d1d0f623d401a0e9f4fc8ce4a1a6109925199c9c2b188be8739f274804217fb829efb SHA512 387f282fdd2e450585743de7fa297c24685d12c199c801f930da37795c6406aa9ee0bee335c54ca6ccef46726ebf6b49b389753f061542cf7e5381c979e0786d
 AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed
 AUX mupdf-1.15-Makefile.patch 1189 BLAKE2B 21447e2fd8ca7c396b9b2bd5e1e70ac6ebff5dc8dcbde273e0b23e17281cf2fe16f7a53587f9b0a3b2af1837f3ed5fc4a19666a4cdfa5d491e8b9be71519e1a8 SHA512 6c696b5a522116d075ee1a4759cdf3cae2e8836315f2898a51c15e227d4d57b44095a9927e7d66ab7d522ba6e0c65eed10a379d9e80b791ee8b6022933f615ab
 AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7eed3abfad4d3db15819d5e101ba03e376fc0faea9c4939b7167b276fffe022975bae2e99238d5b4bee92edfb924fd5 SHA512 028930d5e6c86a9052de6e1e0f3e937d89a3f22e10b7fb71f1dba998c480c9914520e4248c21d68291c6fd7684c627b5068c1bb2e027ff6a518d1ca5533eb677
-AUX mupdf-1.3-zoom-2.patch 214 BLAKE2B b9d15ecf6978c4f5c865be0b913448a25852b4a768f8be99b8feb68b1511b203cd22cb7020ccb6447d31082d02a9f3ee80e3ac0153408f3b36db2bdfb68c9f6b SHA512 95bb2d68246dc22eb0fb6e8a312c0f02476f356ee219c417dfa06473b5944d9e63ae6778cd967c70e60fb933eee1aac337efd2476b0bc791df1c69f7b7b822b3
-DIST mupdf-1.14.0-source.tar.xz 41602372 BLAKE2B bb680038344af16c7231a18a009c0d04c5f50b3fcbaf061c9f5907f35d79eea93eeced7c2a43a06a963b93b39c74d0246c5fdad35655953d1aa5efb79737265a SHA512 bd41125dac1a81b7dbbfbb5f5e06e70bb601854731e0945983688da5d8d7c0bca9771fff2e4b6d9c36dbead6146f0a866ed7427d58e13d02ed6dfd94dcfe54bf
-DIST mupdf-1.15.0-source.tar.xz 39828864 BLAKE2B 15d0e4244062a91c7055b98fa61f2b02e0e3effbcf5374fe589f5a0d2ba2a2d4a59318ae3c0f28d866c6b07554e4b1e65ee9264c26a5f4524ef34e998d6c3320 SHA512 ef19362e8b6c2843e214fd2fcdcc9ba91017884383f7e1cfe08ef1f528a233820475ddfdd8aef481e6e37ae69e8b64324eb4b30699baa8055e99e47c2fab31dd
 DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b SHA512 fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50
-EBUILD mupdf-1.14.0-r3.ebuild 3229 BLAKE2B cea1f272cbf41f3fd1bf7b576124cb279e0f6cd9aa52c3ced218c09d77f6f1968bce066288afba74666d6bbe20cdf61958f5b721ed347b1667811900fb852069 SHA512 292695fe366b7f1688b90841d7d1cf5cf11a4d56ad0b6ea8fb3b87bde92c6a21183d42a1ae0baf4ef017d748be6d3a31d3616daa22ca17f797ac86ffa994fbb1
-EBUILD mupdf-1.15.0.ebuild 3505 BLAKE2B be357aae0944fda68a0e95cf12e2936ec94428d5baa645399add9f87ca5127de85898f22fb56762d7fb88d6ed3e61874723f7668fb9c4a2ac942585e3ddbde6f SHA512 41209dd40db318acaa224a031672fb9281dd674a6803b789da1cd673ab18af08c4fcdd2f5d82ccc5076026fec056986d2b67f1adc4b4cf3a7a0aca56787d7b75
-EBUILD mupdf-1.16.1.ebuild 3424 BLAKE2B ad93a4bff578984a1bde0c9cdbd4984e9ff1c574eff56a824d13b17a0fa20d51db23e1a1a38c7f9c59233ebf7ad723c4a9ff4ecd53b13f011f27f5cd47b78c3d SHA512 49238caf871ca374e4e6efb96311632fbe487edd49db4a3cea8074be7a701c07314b42e866379b8df1ebdd7baa30bd8cae03affeb853df528c48685552c61746
+EBUILD mupdf-1.16.1.ebuild 3423 BLAKE2B 617b555931b62636135ca23945b18970063b735ad2dc25b79e0b22600bfc21bacac94ad3a729fa41506246a9d8ab5189911664494370d76812b43639ced8df2c SHA512 fe78c972cca044632fed80a591d101e9ab42e3faabc190ce68fb564ec3b725b8a155030670b6c652c954a9d23db232f8a453ee57025d94ff859ac0f7e25167e8
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch b/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch
deleted file mode 100644
index 90972e8c53ea..000000000000
--- a/app-text/mupdf/files/mupdf-1.14-CFLAGS.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makerules b/Makerules
-index fc9bf998..82f10b28 100644
---- a/Makerules
-+++ b/Makerules
-@@ -21,8 +21,6 @@ SANITIZE_FLAGS += -fsanitize=address
- SANITIZE_FLAGS += -fsanitize=leak
- 
- ifeq ($(build),debug)
--  CFLAGS += -pipe -g
--  LDFLAGS += -g $(LDREMOVEUNREACH)
- else ifeq ($(build),release)
-   CFLAGS += -pipe -O2 -DNDEBUG -fomit-frame-pointer
-   LDFLAGS += $(LDREMOVEUNREACH) -Wl,-s
diff --git a/app-text/mupdf/files/mupdf-1.14-Makefile.patch b/app-text/mupdf/files/mupdf-1.14-Makefile.patch
deleted file mode 100644
index a8c4ef770dce..000000000000
--- a/app-text/mupdf/files/mupdf-1.14-Makefile.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-1. debug build (not sure why...)
-2. build shared library
-3. add optional static lib target
-4. Don't install COPYING
-diff --git a/Makefile b/Makefile
-index 37fc48e6..4303e9fa 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,7 +3,7 @@
- -include user.make
- 
- ifndef build
--  build := release
-+  build := debug
- endif
- 
- ifndef OUT
-@@ -190,13 +190,15 @@ generate: source/pdf/js/util.js.h
- 
- # --- Library ---
- 
--MUPDF_LIB = $(OUT)/libmupdf.a
--THIRD_LIB = $(OUT)/libmupdf-third.a
-+MUPDF_LIB = libmupdf.so.$(GENTOO_PV)
-+MUPDF_STATIC = $(OUT)/libmupdf.a
-+THIRD_LIB =
- THREAD_LIB = $(OUT)/libmupdf-threads.a
- PKCS7_LIB = $(OUT)/libmupdf-pkcs7.a
- 
--$(MUPDF_LIB) : $(MUPDF_OBJ)
--$(THIRD_LIB) : $(THIRD_OBJ)
-+$(MUPDF_LIB): $(MUPDF_OBJ) $(THIRD_OBJ)
-+	$(QUIET_LINK) $(CC) $(LDFLAGS) --shared -Wl,-soname -Wl,$(MUPDF_LIB) -Wl,--no-undefined -o $@ $^ $(THIRD_LIBS) $(LIBS)
-+$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
- $(THREAD_LIB) : $(THREAD_OBJ)
- $(PKCS7_LIB) : $(PKCS7_OBJ)
- 
-@@ -355,7 +357,7 @@ install: libs apps
- 
- 	install -d $(DESTDIR)$(docdir)
- 	install -d $(DESTDIR)$(docdir)/examples
--	install README COPYING CHANGES $(DESTDIR)$(docdir)
-+	install README CHANGES $(DESTDIR)$(docdir)
- 	install docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
- 	install docs/examples/* $(DESTDIR)$(docdir)/examples
- 
diff --git a/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch b/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch
deleted file mode 100644
index dc472153ca6b..000000000000
--- a/app-text/mupdf/files/mupdf-1.14-fix-big-endian.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-vdupras note: exact same patch as in
-https://bugs.ghostscript.com/show_bug.cgi?id=699395 except for tweaked
-diff paths.
-From 5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602 Mon Sep 17 00:00:00 2001
-Message-Id: <5fb79e6ccb805b3d94c8bb8eb0990d9944ae7602.1528041417.git.mjg@fedoraproject.org>
-From: Michael J Gruber <mjg@fedoraproject.org>
-Date: Sun, 3 Jun 2018 17:55:46 +0200
-Subject: [PATCH] fix build on big endian
-
-0dc1153 ("Spread of context into all procedures and removal from
-structures", 2017-04-26) missed a few spots that are relevant on big
-endian only.
-
-Add the missing ContextIDs in the call chain so that the build succeeds
-again.
-
-Signed-off-by: Michael J Gruber <mjg@fedoraproject.org>
----
- src/cmsmd5.c | 22 +++++++++++-----------
- 1 file changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/src/cmsmd5.c b/src/cmsmd5.c
-index 4b8f7f9..dd0925a 100644
---- a/thirdparty/lcms2/src/cmsmd5.c
-+++ b/thirdparty/lcms2/src/cmsmd5.c
-@@ -29,7 +29,7 @@
- #ifdef CMS_USE_BIG_ENDIAN
- 
- static
--void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs)
-+void byteReverse(cmsContext ContextID, cmsUInt8Number * buf, cmsUInt32Number longs)
- {
-     do {
- 
-@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, cmsUInt32Number longs)
- }
- 
- #else
--#define byteReverse(buf, len)
-+#define byteReverse(ContextID, buf, len)
- #endif
- 
- 
-@@ -172,7 +172,7 @@ cmsHANDLE  MD5alloc(cmsContext ContextID)
- 
- 
- static
--void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
-+void MD5add(cmsContext ContextID, cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
- {
-     _cmsMD5* ctx = (_cmsMD5*) Handle;
-     cmsUInt32Number t;
-@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
-         }
- 
-         memmove(p, buf, t);
--        byteReverse(ctx->in, 16);
-+        byteReverse(ContextID, ctx->in, 16);
- 
-         MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
-         buf += t;
-@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
- 
-     while (len >= 64) {
-         memmove(ctx->in, buf, 64);
--        byteReverse(ctx->in, 16);
-+        byteReverse(ContextID, ctx->in, 16);
-         MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
-         buf += 64;
-         len -= 64;
-@@ -216,7 +216,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cmsUInt32Number len)
- 
- // Destroy the object and return the checksum
- static
--void MD5finish(cmsProfileID* ProfileID,  cmsHANDLE Handle)
-+void MD5finish(cmsContext ContextID, cmsProfileID* ProfileID,  cmsHANDLE Handle)
- {
-     _cmsMD5* ctx = (_cmsMD5*) Handle;
-     cmsUInt32Number count;
-@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID,  cmsHANDLE Handle)
-     if (count < 8) {
- 
-         memset(p, 0, count);
--        byteReverse(ctx->in, 16);
-+        byteReverse(ContextID, ctx->in, 16);
-         MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
- 
-         memset(ctx->in, 0, 56);
-     } else {
-         memset(p, 0, count - 8);
-     }
--    byteReverse(ctx->in, 14);
-+    byteReverse(ContextID, ctx->in, 14);
- 
-     ((cmsUInt32Number *) ctx->in)[14] = ctx->bits[0];
-     ((cmsUInt32Number *) ctx->in)[15] = ctx->bits[1];
- 
-     MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
- 
--    byteReverse((cmsUInt8Number *) ctx->buf, 4);
-+    byteReverse(ContextID, (cmsUInt8Number *) ctx->buf, 4);
-     memmove(ProfileID ->ID8, ctx->buf, 16);
- 
-     _cmsFree(ctx ->ContextID, ctx);
-@@ -291,7 +291,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile)
-     if (MD5 == NULL) goto Error;
- 
-     // Add all bytes
--    MD5add(MD5, Mem, BytesNeeded);
-+    MD5add(ContextID,MD5, Mem, BytesNeeded);
- 
-     // Temp storage is no longer needed
-     _cmsFree(ContextID, Mem);
-@@ -300,7 +300,7 @@ cmsBool CMSEXPORT cmsMD5computeID(cmsContext ContextID, cmsHPROFILE hProfile)
-     memmove(Icc, &Keep, sizeof(_cmsICCPROFILE));
- 
-     // And store the ID
--    MD5finish(&Icc ->ProfileID,  MD5);
-+    MD5finish(ContextID, &Icc ->ProfileID,  MD5);
-     return TRUE;
- 
- Error:
--- 
-2.18.0.rc0.294.g786209a621
-
diff --git a/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch b/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch
deleted file mode 100644
index 79efe32c0e41..000000000000
--- a/app-text/mupdf/files/mupdf-1.14-r3-openssl-curl-x11.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/Makerules b/Makerules
-index fc9bf998..f1fd93cb 100644
---- a/Makerules
-+++ b/Makerules
-@@ -113,10 +113,11 @@ else ifeq ($(OS),Linux)
- 	SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
-   endif
- 
--  HAVE_CURL := $(shell pkg-config --exists libcurl && echo yes)
-+  HAVE_CURL ?= not-unless-portage-tells-me
-   ifeq ($(HAVE_CURL),yes)
- 	SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
--	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
-+    # We have to forcibly add -lpthread to avoid linking errors.
-+	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl) -lpthread
-   endif
- 
-   HAVE_GLUT := yes
-@@ -125,13 +126,14 @@ else ifeq ($(OS),Linux)
- 	SYS_GLUT_LIBS := -lglut -lGL
-   endif
- 
--  HAVE_X11 := $(shell pkg-config --exists x11 xext && echo yes)
-+  HAVE_X11 ?= not-unless-portage-tells-me
-   ifeq ($(HAVE_X11),yes)
- 	X11_CFLAGS := $(shell pkg-config --cflags x11 xext)
- 	X11_LIBS := $(shell pkg-config --libs x11 xext)
-   endif
- 
--  HAVE_LIBCRYPTO := $(shell pkg-config --exists 'libcrypto >= 1.1.0' && echo yes)
-+  
-+  HAVE_LIBCRYPTO ?= not-unless-portage-tells-me
-   ifeq ($(HAVE_LIBCRYPTO),yes)
- 	LIBCRYPTO_CFLAGS := $(shell pkg-config --cflags libcrypto) -DHAVE_LIBCRYPTO
- 	LIBCRYPTO_LIBS := $(shell pkg-config --libs libcrypto)
diff --git a/app-text/mupdf/files/mupdf-1.3-zoom-2.patch b/app-text/mupdf/files/mupdf-1.3-zoom-2.patch
deleted file mode 100644
index 353912450236..000000000000
--- a/app-text/mupdf/files/mupdf-1.3-zoom-2.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mupdf-1.3/platform/x11/pdfapp.c
-+++ mupdf-1.3/platform/x11/pdfapp.c
-@@ -866,6 +867,7 @@
- 		break;
- 
- 	case ' ':
-+	case 'F':
- 		panto = DONT_PAN;
- 		if (app->numberlen > 0)
- 			app->pageno += atoi(app->number);
diff --git a/app-text/mupdf/mupdf-1.14.0-r3.ebuild b/app-text/mupdf/mupdf-1.14.0-r3.ebuild
deleted file mode 100644
index fca81cfa02fd..000000000000
--- a/app-text/mupdf/mupdf-1.14.0-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs xdg
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X curl +javascript libressl opengl ssl static-libs +vanilla"
-
-RDEPEND="
-	>=dev-lang/mujs-1.0.4
-	media-libs/freetype:2=[static-libs?]
-	media-libs/harfbuzz:=[static-libs?,truetype]
-	media-libs/jbig2dec:=[static-libs?]
-	media-libs/libpng:0=[static-libs?]
-	>=media-libs/openjpeg-2.1:2=[static-libs?]
-	virtual/jpeg[static-libs?]
-	curl? ( net-misc/curl[static-libs?] )
-	opengl? ( >=media-libs/freeglut-3.0.0:= )
-	ssl? (
-		libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
-		!libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
-	)
-	X? (
-		x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="
-	opengl? ( !static-libs )
-	curl? ( X )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.14-CFLAGS.patch
-	"${FILESDIR}"/${PN}-1.14-Makefile.patch
-	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
-	# See bugs #662352
-	"${FILESDIR}"/${PN}-1.14-r3-openssl-curl-x11.patch
-	# bug #672998
-	"${FILESDIR}"/${PN}-1.14-fix-big-endian.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	use hppa && append-cflags -ffunction-sections
-
-	use javascript || \
-		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
-			-i include/mupdf/fitz/config.h
-
-	use vanilla || eapply \
-		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
-	# See bug #670832
-	use ssl && use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch
-
-	sed -e "1iOS = Linux" \
-		-e "1iCC = $(tc-getCC)" \
-		-e "1iLD = $(tc-getLD)" \
-		-e "1iAR = $(tc-getAR)" \
-		-e "1iverbose = yes" \
-		-e "1ibuild = debug" \
-		-e "1iprefix = ${ED}usr" \
-		-e "1ilibdir = ${ED}usr/$(get_libdir)" \
-		-e "1idocdir = ${ED}usr/share/doc/${PF}" \
-		-i Makerules || die
-}
-
-_emake() {
-	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
-	emake \
-		GENTOO_PV=${PV} \
-		HAVE_GLUT=$(usex opengl) \
-		HAVE_CURL=$(usex curl) \
-		HAVE_LIBCRYPTO=$(usex ssl) \
-		HAVE_X11=$(usex X) \
-		USE_SYSTEM_LIBS=yes \
-		USE_SYSTEM_MUJS=yes \
-		HAVE_OBJCOPY=no \
-		"$@"
-}
-
-src_compile() {
-	_emake XCFLAGS="-fpic"
-
-	use curl && _emake extra-apps
-
-	use static-libs && \
-		_emake build/debug/lib${PN}.a
-}
-
-src_install() {
-	if use X || use opengl ; then
-		domenu platform/debian/${PN}.desktop
-		doicon platform/debian/${PN}.xpm
-	else
-		rm docs/man/${PN}.1
-	fi
-
-	_emake install
-
-	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
-	use static-libs && \
-		dolib.a build/debug/lib${PN}.a
-	if use opengl ; then
-		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
-		dosym ${PN}-gl /usr/bin/${PN}
-	elif use X ; then
-		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
-		dosym ${PN}-x11 /usr/bin/${PN}
-	fi
-	use curl && dobin build/debug/${PN}-x11-curl
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/mupdf/mupdf-1.15.0.ebuild b/app-text/mupdf/mupdf-1.15.0.ebuild
deleted file mode 100644
index 7d1f75d3ee14..000000000000
--- a/app-text/mupdf/mupdf-1.15.0.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs xdg desktop
-
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
-HOMEPAGE="https://mupdf.com/"
-SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
-
-LICENSE="AGPL-3"
-SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="X +javascript libressl opengl ssl static-libs vanilla"
-
-# Although we use the bundled, patched version of freeglut in mupdf (because of
-# bug #653298), the best way to ensure that its dependencies are present is to
-# install system's freeglut.
-RDEPEND="
-	media-libs/freetype:2=[static-libs?]
-	media-libs/harfbuzz:=[static-libs?,truetype]
-	media-libs/jbig2dec:=[static-libs?]
-	media-libs/libpng:0=[static-libs?]
-	>=media-libs/openjpeg-2.1:2=[static-libs?]
-	virtual/jpeg[static-libs?]
-	opengl? ( >=media-libs/freeglut-3.0.0:= )
-	ssl? (
-		libressl? ( >=dev-libs/libressl-2.8:0=[static-libs?] )
-		!libressl? ( >=dev-libs/openssl-1.1:0=[static-libs?] )
-	)
-	X? (
-		x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="opengl? ( !static-libs )"
-
-S=${WORKDIR}/${P}-source
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
-	"${FILESDIR}"/${PN}-1.15-Makefile.patch
-	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
-	# See bugs #662352
-	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
-)
-
-src_prepare() {
-	xdg_src_prepare
-	use hppa && append-cflags -ffunction-sections
-
-	use javascript || \
-		sed -e '/* #define FZ_ENABLE_JS/ a\#define FZ_ENABLE_JS 0' \
-			-i include/mupdf/fitz/config.h
-
-	use vanilla || eapply \
-		"${FILESDIR}"/${PN}-1.3-zoom-2.patch
-
-	# See bug #670832
-	use ssl && use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch
-
-	sed -e "1iOS = Linux" \
-		-e "1iCC = $(tc-getCC)" \
-		-e "1iLD = $(tc-getLD)" \
-		-e "1iAR = $(tc-getAR)" \
-		-e "1iverbose = yes" \
-		-e "1ibuild = debug" \
-		-e "1iprefix = ${ED}/usr" \
-		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
-		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
-		-i Makerules || die
-}
-
-_emake() {
-	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
-
-	# We don't use system's freeglut because upstream has a special modified
-	# version of it that gives mupdf clipboard support. See bug #653298
-
-	# As of v1.15.0, mupdf started using symbols in mujs that were not part
-	# of any release. We thus go back to using the bundled version of it.
-	# Bug #685244
-	emake \
-		GENTOO_PV=${PV} \
-		HAVE_GLUT=$(usex opengl) \
-		HAVE_LIBCRYPTO=$(usex ssl) \
-		HAVE_X11=$(usex X) \
-		USE_SYSTEM_LIBS=yes \
-		USE_SYSTEM_MUJS=no \
-		USE_SYSTEM_GLUT=no \
-		HAVE_OBJCOPY=no \
-		"$@"
-}
-
-src_compile() {
-	_emake XCFLAGS="-fpic"
-
-	use static-libs && \
-		_emake build/debug/lib${PN}.a
-}
-
-src_install() {
-	if use X || use opengl ; then
-		domenu platform/debian/${PN}.desktop
-		doicon platform/debian/${PN}.xpm
-	else
-		rm docs/man/${PN}.1
-	fi
-
-	_emake install
-
-	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
-
-	use static-libs && \
-		dolib.a build/debug/lib${PN}.a
-	if use opengl ; then
-		einfo "mupdf symlink points to mupdf-gl (bug 616654)"
-		dosym ${PN}-gl /usr/bin/${PN}
-	elif use X ; then
-		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
-		dosym ${PN}-x11 /usr/bin/${PN}
-	fi
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins platform/debian/${PN}.pc
-
-	dodoc README CHANGES CONTRIBUTORS
-}
diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild b/app-text/mupdf/mupdf-1.16.1.ebuild
index 80ab08f54cbf..117de7bc1999 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="alpha amd64 ~arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ppc ppc64 s390 x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index 90b0f9b0816d..a0b6ae51d294 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -2,6 +2,6 @@ AUX opensp-1.5-gcc34.patch 263 BLAKE2B f881932f2d35c87a13b28608efe853c54e3dd4608
 AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d96bf5b2f645d2d6706e82ae1767a99fed8f6ca4bd4f1abbc24bf80c4fa00d848f03056b01ac98f5b8a74d3a78c4467 SHA512 dea5fe17ea2662150b201ab6011bb01ba0f0c07689d267ec4086a914cefef3e91967f8db4be0258bac87d3cd73a9b05eb1f879415860552d9853e66e98e16e11
 AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
 DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
-EBUILD opensp-1.5.2-r3.ebuild 1975 BLAKE2B 2e33accb3db11106c812195cb854bba0f814e3da5422a0e18278d373c73f03b7d9eb3ee31d231189ebfbe374b62bfc1927c47e85ce16942f006063f5f4b871be SHA512 6234b977e1d16e2de5271663800b86dc2b018d365e805e510e704d5d6f8085da1ce5a0d141735bb45fadab1ee9b792f3e8a2e9c1b8c0fc959fd12457d29ee039
-EBUILD opensp-1.5.2-r6.ebuild 2052 BLAKE2B c87e9ea747c7cab52374219f3b65039f13a09d1cec034662d583db591a352ea580128cebb4e8e1c2762d6fadbb6f85a0a33de7836f9321e412e14c7adcc06a44 SHA512 136a42ac17642b1edf6541eb5d24295eda6c9d2766c32d76c309a39da916c363e1dd7b36a64a3187adc04ffd5ff59e8528ea292fdd8901797884de6701650844
+EBUILD opensp-1.5.2-r3.ebuild 1999 BLAKE2B b9d5122c2f83642e1b3bc6625e4ef54d59a2ea79981b8f1446caa52cfb78f19eb816f1ae3360326baf81ff2939ab43a8b6503d164e2ac4fa49340e6756ab50ae SHA512 5802cc4d6e4e4bf42e1643135a4be3884a41b8262e0540b8bb928f9a14163e6489d541f5a411a06f75841785b5b29c5dfa5b5b79ba5abf99b629f33d931abade
+EBUILD opensp-1.5.2-r6.ebuild 2079 BLAKE2B 5a42484dcdb0c08abc879636dcd99930eaf101d65cef2f95cba0d9250f4c53f71a13b141d080a8b5a57361c0c6ba0c0285754abc1fb0eecc8e59bcf38cfa2f34 SHA512 f26b1028408a758af06cc7c824bee16648ee67e1f4a0e77f0e3d701b7257bffb916967788ea0410c6d7a80ec187f811525fc641140ffa9fb87ec5ff598ac13c4
 MISC metadata.xml 418 BLAKE2B 2650036a138376fceac69b4ca2ec3c7f2acdc958760902387592c5c5953fa37bbb41e643ed1133975aa8ec48306aa2cd654b7754272e06805f5f134b7dd2f63a SHA512 d69bb957dd6b4af7a13527a7c6fb15b7df9ae62cddafb561557654d4076c3e455b28ed16c081fe6c8843c0ed9ec26bef4d26035ac6389d6d95523953bd940008
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
index 655afe2945f7..8abb9fa4c5fb 100644
--- a/app-text/opensp/opensp-1.5.2-r3.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs test"
+RESTRICT="!test? ( test )"
 
 DEPEND="net-libs/libnsl:0=
 	nls? ( sys-devel/gettext )
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
index 73415f181564..b9081aef1e1e 100644
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r6.ebuild
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_glibc nls static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	elibc_glibc? ( net-libs/libnsl:0= )
diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest
index 77c924f2344f..180107aeb42e 100644
--- a/app-text/pdf2djvu/Manifest
+++ b/app-text/pdf2djvu/Manifest
@@ -4,7 +4,7 @@ AUX pdf2djvu-0.9.12-poppler-0.76-3.patch 1127 BLAKE2B 2556851d29ebe02e0e17b3e2fa
 DIST pdf2djvu-0.9.11.tar.xz 291356 BLAKE2B 726d9132c43c7dabdecf1e6174a3f2627db7f6981b3ba1f280ea131272ea0fef38acdaaa0f78ab0c883dd2cd046017edac46bb10d91e10668a6e480322e465fb SHA512 7b47ff4cd3a49f3fa1fec08490a192725899307d9c2a75a65a21d36abcece2f308e56161ec4c4f77f32fbdedcc167520657cad2b06cf178335f7e2169b7ada82
 DIST pdf2djvu-0.9.12.tar.xz 295088 BLAKE2B 6dd8b04f089e464becd7923c96ac2ca35efc28412c1913270c8c85656b58a74a47777b1b5b932d29e3ee2ad4d75bc6bcb85b835e5aa7e9d9c6a0ef7b242b5c46 SHA512 2a3acd8efa682541f45a0650070c0260903dadbd49ac6d4560e2e5ee3c5a68a1310dcb9d170035ee8fec0e588171f2c402047b3d7dc4e7d4033abe95f2ebde74
 DIST pdf2djvu-0.9.8.tar.xz 268976 BLAKE2B 318ef4fd5677056d2404d769bf54911c9474d6f0f839ef472e121375ee268db31ddaaad2b8ed791ef093d6cb1c665f6431619918ee852e479b4a11a3d7ae0e23 SHA512 5f5330d3d15808b5b6233a15a984d0ebf28619cfb50807a20c8992fed68d17f73d1edd62b1ad7cd3a09d526f6c9f0827e2c5e03d6d7c8ad92c1f106755025f5e
-EBUILD pdf2djvu-0.9.11.ebuild 1225 BLAKE2B c4c692d14b4a18bb79db4b94e6083703e35ba38498a3102455efe648d2ce6dcf69d4d47a2746111ab9b95464cc350f16c10d10fab386d08ceeb10606aab13475 SHA512 b78fd36d772f540321f61bf8535bfa6fbfc262502b0e64c621d36fbe306cad8b4f8a91b9aa21310cf0907124e5ad2564aa6a4c49b0f6a42ec4bc057db3e94c22
-EBUILD pdf2djvu-0.9.12.ebuild 1285 BLAKE2B fd6afef37d026403a007214cd55d91eb90a3627e232685bef996f73182d69bbb0ff836d1be055b39bfe1e3c36bf5244a4b281dde528c7c21b6ea1b52f2810b75 SHA512 7f0b69cc055fd8a8e95ddf79aa81104d0aa226f9c5a134700bcaca46286d9dab67b7c6427f216a40d34a0f43c64dfd0655110035f54eb8877ec6af6678204105
-EBUILD pdf2djvu-0.9.8.ebuild 1225 BLAKE2B 39e76d2d6612844e73ec86092e200bf4e8f22005421358e8326988a5cce654b3c937ec2d369684030c2dc8bf404902c18decbab46d9df5c2391adf0e68e893cb SHA512 3c114609e2cd890e5cf34716709d897a8991989b86b88b40f15553da7333fb8f972319d864542a15089c35c24b277cb8e49fe7e3685cd3929f2a5891e0cd82bd
+EBUILD pdf2djvu-0.9.11.ebuild 1252 BLAKE2B b4ccf61994472843536d4997b853f7bb606b2a0c31369d7169831dfc21820a1224847ce690e91a8f08c4e9a8ad8ac9e6633d99a6cf523b7115b1f3da288f06b5 SHA512 c9f91f83aacabfd2ecb3b017ffcdf77fe10303fd0ffedc6edab762571e8b64437d8797bf5bafccaee1e7e07b997e03efda91401d68ec2e80f455a5b13fd91403
+EBUILD pdf2djvu-0.9.12.ebuild 1312 BLAKE2B ea4e4a3f5b9cc7beca80d68da7b8fd6569cbb4a727501c67d851982e02ed95ec0ce96f25f268ddd4d931aefd119c3d4c977cb29aa5e353dc1a5b8e15ff74091c SHA512 2926b385fea89fd0ef7b80b72791469abd3e6624da12d8f0b30c214a3079f8875f9b7dadb2f62b7fbb0c7ae0f9d32e87bdcef265de48e0154a4df9673e78aa25
+EBUILD pdf2djvu-0.9.8.ebuild 1252 BLAKE2B 7d80189ccf17851ceaf235b02235962385a265670d1c295ddc02a857a85370c8a3d259c26810181063be85a646de1f1e9965f6021cac8fdc4f8fc20d2a8177e0 SHA512 12d8383e20649dc250a0fc41875177a3f9bbe7f2bf209d8c0cdd4698da338c08720914acd5b0a9ae283e51ca9a839747773d644cc3d03c65562304648947a148
 MISC metadata.xml 351 BLAKE2B 68816123c075f603535faa42307dfc58066cc7c9db272b1f6004a9e0bba5d71d0a798b5b2fed9d4af704ed5145264b400f406c5b1185e3b759c97c0ccccc05d1 SHA512 98cfb584785e967dfd11dc82da694ccde0031609c28faca492d2384d6257020ebf8ac264dcb512129f5a681455ce3228b9f443aa2aa99197134ed7957901eb06
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild
index cf33748eec99..484184a9032a 100644
--- a/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+graphicsmagick nls openmp test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=app-text/djvu-3.5.21:=
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
index 1b3b34c9947d..549b587cee2b 100644
--- a/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+graphicsmagick nls openmp test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=app-text/djvu-3.5.21:=
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
index 84bd0e4be6ee..cc21c69c5ee5 100644
--- a/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
+++ b/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+graphicsmagick nls openmp test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=app-text/djvu-3.5.21:=
diff --git a/app-text/pdfgrep/Manifest b/app-text/pdfgrep/Manifest
index b2c97ed3eba5..48b79b5d3a01 100644
--- a/app-text/pdfgrep/Manifest
+++ b/app-text/pdfgrep/Manifest
@@ -1,7 +1,7 @@
 DIST pdfgrep-1.4.1.tar.gz 151926 BLAKE2B 68b846b26c28e8209fa3ac7a7e6fe3d0c4c6a298e9bea2e3929fd82a44482ec914bd3594f3e07da8c56766e94ca3d4c3c2d6997364393e95b3741b1bf9685ec5 SHA512 27ce23c25a5f284b3eba92a0f8dbf02600248548967c1e71dfb41e43528824d9add587ea0ac23899ff07d2ffc6c74c2e6e4c2e7240e69494b8d31b7a4afc3735
 DIST pdfgrep-2.0.1.tar.gz 187217 BLAKE2B f498158e63e2f8419829df0d1801a31d3dff02627ccf0efee7239650203300233d1a19a5c72c57eb24495f2b5403e0e2c6a479b0f28a8d053aa578c732866b1a SHA512 4285f8cb514975a0040cdd6b82133090e27ba5c2f95ca880dccc3dd4fa3427260a5fc73d807df9124a79fa36ac6ed8c11380cde11e00599ed7134d92c50df4a0
 DIST pdfgrep-2.1.2.tar.gz 197289 BLAKE2B 94d20649104f7b17adf2d99bdf2ce215cf16746c649f7ec77d58a41b90b13dd903d47b5ed2d35f56ca7ca12ae49cfb8a57004f9ad3ee6b8930f533b33d7d8463 SHA512 27bc4741e5203b2fd265815a22ad8d702b3455b2ae932641b040fc9ce615bc9ff0abef221eb2ec8aa59c79cb139d31184261d076f9731177129a473d62aa4e5c
-EBUILD pdfgrep-1.4.1-r1.ebuild 607 BLAKE2B a47cbf6264079ace41df672bbd62cb0585aa9ec7b683f42dca5c4f157ac2c461dab5cbe84acfbafaab58fcaf4e3b40aee6a97743c37a983017a009081df36cd1 SHA512 452781a1574939f7ba9e47b601c67a0897ed7f2f422615cc1bc9bfd98e7d1d90700b2de0132134aba9ea930aded068ad7cb4298b88b4d21da33b2bb5078af91b
-EBUILD pdfgrep-2.0.1.ebuild 674 BLAKE2B 11363c82e73113a3ca8fd12877c49e14448abdce32afc5ff36c0a77445b118da99754d2dd63b92f2cd035d0542a7dcd269928949652ec77de4e9a8771e7cec6b SHA512 91d64da237474d4a6220f9ba351c210c823278f66a5bcd7f5d69fa35f771913226f10a0cf593ea3eeff701817d9804588d34fd79c2ff6821142db22cbc022c7b
-EBUILD pdfgrep-2.1.2.ebuild 734 BLAKE2B 3d06f3acf5df296cb7904f444a52dab22ab5b784273363ac081ad2708b46f6e1ae89aadab01a986218e8abc11c7050b5e5793fec32d4248925e0d0e01984678b SHA512 c9375e15c7a0036ce96902a5fdbef8a0610833faf5037640ba98e26c7bada8ce2d08d83119c81c4434688edfef969dabd0b31d3f37a5c354fe9ea5c5b5c98480
+EBUILD pdfgrep-1.4.1-r1.ebuild 631 BLAKE2B f98ddc8be42c8534972df535a2e27bd433278382cc854d23fc34adf75b98cd07eecc22d654e79bfe1149e4fdc1395a3186a815f3947625ae8dbe8335088f28c1 SHA512 3dd3e6515d913d44b749d0491d6120e6ee32a3f3ea458d8d3515c1d6ec0e99719d5dc85005ec4951158dff230cae1cfaf751dfde131324cd079f58bd2a73b7fe
+EBUILD pdfgrep-2.0.1.ebuild 701 BLAKE2B 8b877e130a6d58635312771cb09778454d25fbb87cb2686deb92adbb981b9ecfb5706fe842a6bd8477e67d098d07c4e941809b94f7e92a29f456a0934c843844 SHA512 c1c78707a9cf2589800d275b50dc0a8a97a7f5477c2f1f0773312801aad082c2af4752380d5463aec6b136ead175d4f42cd75d9632da8bebe557c4776b03a879
+EBUILD pdfgrep-2.1.2.ebuild 761 BLAKE2B c6879de906a6b25f22eaa4e24566df386ea4b9545da164084a61465664d82559d24fe5b9ef860902ea6932b05f1580888a8704a7553550f34643b857e10f66ef SHA512 48865871bd3e0f115e7acaf64218703341ef162e637609adbe138f70a73ab32e8d30b46bfb433e447a79ba648a3ad5cdf5b9596d7aebd431fd29971905b6ad7c
 MISC metadata.xml 568 BLAKE2B 0ceff9c7c8c2bdc001b0b356c17c3b0339cc2f9da50469462c6214248cff7ab8ebd9fb0303711cf98268d82004627e4a433a70900132a0c9f7827fec4de50ce2 SHA512 e5cb531f3eb16c53697b58a004f6949a13d2226922c9c32d5defc2f397450bc0e4877b03fd055853fe669b1394dc72c9e505ff252dd517ef5432f132ab56315f
diff --git a/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild b/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
index b3ac59a28b3d..bd8de67b356e 100644
--- a/app-text/pdfgrep/pdfgrep-1.4.1-r1.ebuild
+++ b/app-text/pdfgrep/pdfgrep-1.4.1-r1.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=5
@@ -11,6 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 x86"
 IUSE="+pcre test unac"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-text/poppler:=[cxx]
diff --git a/app-text/pdfgrep/pdfgrep-2.0.1.ebuild b/app-text/pdfgrep/pdfgrep-2.0.1.ebuild
index 94665a7d2fba..1d7d8f6ab178 100644
--- a/app-text/pdfgrep/pdfgrep-2.0.1.ebuild
+++ b/app-text/pdfgrep/pdfgrep-2.0.1.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,6 +11,7 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="amd64 x86"
 IUSE="+pcre test unac"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-text/poppler:=[cxx]
diff --git a/app-text/pdfgrep/pdfgrep-2.1.2.ebuild b/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
index 41a8ff10f22f..d92566b9852c 100644
--- a/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
+++ b/app-text/pdfgrep/pdfgrep-2.1.2.ebuild
@@ -11,6 +11,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+pcre test unac"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-text/poppler:=[cxx]
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
index 425596c92c1c..9aa8f6b30150 100644
--- a/app-text/pdfjam/Manifest
+++ b/app-text/pdfjam/Manifest
@@ -1,4 +1,3 @@
 DIST pdfjam_208.tgz 180725 BLAKE2B 903ce4f0874c9fc9ad23f3db37b882596589d6470dfe9289f65a72fb66ff843bbd49b52086d7b2d2cbbfb1b6406cbbda64d46b933a853d5d681ef88d4033372c SHA512 728c8d304c6d2af773980d20ef4a4be6e0a5dad286ad8cd00be9b1687f5024e00032a750c10c74dcd24431f081368d02b76f03cc5bb1c8725a060cd70be0fd8c
-EBUILD pdfjam-2.08-r1.ebuild 588 BLAKE2B a48ba14d9324e8124442c8c8e8ffdea475754e68e968654558e2232c7643b34ce8a5b782d86c8edb829bdb859c02b1b36a07a98d763d485110b91d26581ec3cc SHA512 a7c93d0fecc8ca4d725401151719ff952fa0880fad036645c42548e21f7abbb6e83f45df748d15e2586193eee43c5accfa48d876392fdc6ba03582f20840f35b
-EBUILD pdfjam-2.08.ebuild 605 BLAKE2B a15b40f8f8bb6c1d696528706d38ea5471cc23170068e886b4361de4cd2a49a2e4ce5f888fb4037716efa816e82be3b7206c6e7a5d7002e89865bfd7f4ccb58c SHA512 f3b3cc6d4a5e64dbddfdf8029c9c18a8c3ff156735047f43ce4bc20d12f3e0e184636928ce78aaa7614429c36db16a6143c9e42c3691ef7f45997300ccb1f8a9
+EBUILD pdfjam-2.08-r1.ebuild 583 BLAKE2B 26e23fca39e0fbaf66613745aef9d44865a806c00d5be73761ae19f37a238a6c6dc6d344d7cd5e7eee150366418c438ebea5368a8325e978e54a4680f685f665 SHA512 71e1d72abab0694b03565c94ebd2f8e687c82c7a8d5523c3e9221ca4fcfedd6504c96cc039a124c6309a345f83689829ff7d85531153a18d708d6e5f167725e6
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/pdfjam/pdfjam-2.08-r1.ebuild b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
index c6aa1b0c2d2d..eb5d6483f273 100644
--- a/app-text/pdfjam/pdfjam-2.08-r1.ebuild
+++ b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.warwick.ac.uk/go/pdfjam/${PN}_${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 S="${WORKDIR}"/${PN}
 
diff --git a/app-text/pdfjam/pdfjam-2.08.ebuild b/app-text/pdfjam/pdfjam-2.08.ebuild
deleted file mode 100644
index 2b3e33154105..000000000000
--- a/app-text/pdfjam/pdfjam-2.08.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-MY_PV=${PV/./}
-DESCRIPTION="pdfnup, pdfjoin and pdf90"
-HOMEPAGE="http://www.warwick.ac.uk/go/pdfjam"
-SRC_URI="http://www.warwick.ac.uk/go/pdfjam/${PN}_${MY_PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE=""
-S=${WORKDIR}/${PN}
-
-DEPEND="virtual/latex-base"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	dobin bin/* || die
-	dodoc PDFjam-README.html || die
-	doman man1/* || die
-}
diff --git a/app-text/pdfminer/Manifest b/app-text/pdfminer/Manifest
index 35dcee7bd9ad..93901c804299 100644
--- a/app-text/pdfminer/Manifest
+++ b/app-text/pdfminer/Manifest
@@ -1,6 +1,6 @@
 DIST pdfminer-20140328.tar.gz 4081233 BLAKE2B 60e8c8409269c158feda0f02b1dbf46d4bcd58e2f0a2ef0102e3c3c691d599eda9164b8e5dde4278522d9cfcca4e6962b31919b08f66053fb986ad3ded7da498 SHA512 8abb2328f7824ee980df0ce42d758c15534e97379ea9213b4aa1d29864d24d73c9e2d6020964e9ab734c0c6f7d1ae70bccbd6605168eaadf83923718a1f4849a
 DIST pdfminer-20191020.tar.gz 4168016 BLAKE2B 53658853f1c6948a3249b56769c4d9e28cfe8e977b8702c3802f2c3d64f5c9f1d228024a3cbc9a5f288f60c991b2738a7aa131021bdb47c1492c83f9682abb15 SHA512 6ba663440f0ac370742f3a300a55d5f810202d960253931dfdb109a30ce3f71cf3e3dd30af9d0f6257365972452813b4ebc2dbee8031e988b7efb9dac15075d4
-EBUILD pdfminer-20140328-r1.ebuild 691 BLAKE2B 3b663daca3079290a88be838dd6381dcd029f3209eefad30881b89e10f0c37169ccc84372b464333accd467885e2e8dec4dc164647648a9d6a1e8e98dca19441 SHA512 8d4a9ba66c8ea67faa802709c799971262c08cfafe72c12d8e2549aa4c5da81f56dc9b7510c354f3c77b33eb6c225ce5122c2f1aaa8c376c7e53fcf9626d4963
+EBUILD pdfminer-20140328-r1.ebuild 715 BLAKE2B 456ace72af27b7e68cd4a4cf673bee75f0fd9a04f4ee89f4bfccc242e39e7b6735b15ffc19a9eae03842d5b5d9e87f4dcb9f1be106b2535c95f1b98632d850aa SHA512 9b33bdaaec3656ba185646a2e1a6efc54133a324af237f030c9afabeaea769fb9e781d55e6b53c06a1de7475822609d4a91aa72d154247aa4699322e17d7aeb3
 EBUILD pdfminer-20140328.ebuild 653 BLAKE2B 1d63ce17c37449a24b22705b0cf347f1b4306bd41b9c6a1d73060d55d75fdf577f9306fb043160a41dee1e7a65c9a561a56b0675d9ab0c492313b9093925ee30 SHA512 b5add0e6d898864ec0ee5ddbe8e73675bb044db37528bbaff1bd37d095b424280f76127f340f9462cf7e708b40cc70dbfada2c91660a51f327179494481ddfe0
-EBUILD pdfminer-20191020.ebuild 771 BLAKE2B 0936d0116558e1f7ca2f56d95b6eb6d7ae3397c294fed6c603050c615fbd1f26b805a075a1cd527f6c3af25518acb47262b51ab9fe1c232bd0711152059dff17 SHA512 ec6dada298ef55686daf5e6e9d1c56ca4e36eea8f010cabaa7de6babf49fcce4c1986cdf04e961b85e59252038675d2125b913d272bf17d9492eaf0b89bed1f5
+EBUILD pdfminer-20191020.ebuild 798 BLAKE2B 8bc3bed31690e0f702f1e5fc8c1660aededda7fddf9c722c3b3a32ec78724cfeb4e1f5419cd11b2165ee75342150529a9cc30fa707420b323e06f231ec2378c2 SHA512 6cf555251c4f10b024df7a61dacd0d8b3887b94627af5ef4ccb0e7e25c8260cde0849fe226e0fd70cf9b5e1f0d8ff15ca08113956e4b6e028a385eceb692f11e
 MISC metadata.xml 238 BLAKE2B 436e60128ac8083524cc8290bfe2eb3eff4af4bafe7a13320972438a85d29da40ada392d2295001add6aed88c9407529e0975a7ae7eefc976655216def9bb36f SHA512 899f64c55b53cf0a2d38498f0b0070d4707a6eb0289d8138c6757f703909dc2b6a009fee9fe640e5c16adca6f2f953cf445ba6e6b8f5f43d9185ef836a611297
diff --git a/app-text/pdfminer/pdfminer-20140328-r1.ebuild b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
index 2fc3e5eeaed6..8f6b64eac22e 100644
--- a/app-text/pdfminer/pdfminer-20140328-r1.ebuild
+++ b/app-text/pdfminer/pdfminer-20140328-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,6 +14,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 python_compile_all(){
 	use examples && emake -C samples all
diff --git a/app-text/pdfminer/pdfminer-20191020.ebuild b/app-text/pdfminer/pdfminer-20191020.ebuild
index 77050f5937cf..f15e077d5f14 100644
--- a/app-text/pdfminer/pdfminer-20191020.ebuild
+++ b/app-text/pdfminer/pdfminer-20191020.ebuild
@@ -15,6 +15,7 @@ LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc examples test"
+RESTRICT="!test? ( test )"
 
 BDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND="dev-python/pycryptodome[${PYTHON_USEDEP}]"
diff --git a/app-text/pdftk/Manifest b/app-text/pdftk/Manifest
index 930c837dc96c..2325e9df3fa1 100644
--- a/app-text/pdftk/Manifest
+++ b/app-text/pdftk/Manifest
@@ -1,4 +1,6 @@
 DIST pdftk-v3.0.0.tar.bz2 546821 BLAKE2B 1d1935322f1468d9e2e8044e748fbb816e399599e445e078866d416d5e99866739134fb794ff42dbfcc37271d66655440f706db46f152722ab7030cba16edf38 SHA512 3b487f7532140366c9ac41222cd366d387b93e67aada845772f60ff20601e25611e34a190a65fbcec9d776a0b5683100fdd54453357bf7c43cebea7dda0c6229
+DIST pdftk-v3.0.8.tar.bz2 1147182 BLAKE2B 3832445eca456c4880dfe0eabab50be0b8e53acee1eb67c871c3c6b6d44d723869662fcb9cbb28acb7847c11be2d3d456b7bca5a18e4ea6069d73717986771ca SHA512 1b7f8b07e97877fe3a7ff42f425da5b1fdf1397f7abf88ef06c5033a3b849f03fed89f02f15c770bcd581537a7b5442e5693a93ff903efc9588ed60e85cdcdc3
 EBUILD pdftk-3.0.0.ebuild 904 BLAKE2B 1639a85321d6fe453d7b16c9c6bb3d4becda977a6cf624feff4abc3aa3964c05eed4ce22c8f74f54c5f1a1edc3ec14c0198d71f0f725482f518f8efc18c52357 SHA512 f0866fb18062a9e7110a7f654747be14f3ebc58a9f20a6bd32fd591851096bac0b5ee33c04b648ec412744b2dcf7e30062696c329d305109a3d1706aa8a2b57b
+EBUILD pdftk-3.0.8.ebuild 888 BLAKE2B 7e1303da5e39813dd95821d57da3a311af2b240997c88aacc2f7c7bf96df64cf2940aed20be5df7a94e1273c030b43bf32b4df8b807a76c0eed4c1c90baab48f SHA512 23313feb465c003692d03f2ab80f22f037865f25dc6a7466163e246f9339cd325a7e5663e783923b3faa71070466f4b274dd2744e30ad155ac6002bada76d544
 EBUILD pdftk-9999.ebuild 891 BLAKE2B f932721020bbd1bc3fa5d1c5df5c109ef4e528d65cdc307ac6c06d0178f5ceb973f985642855fcd4e9e3b668914a4dca658492cbd136cca632c32c4880233624 SHA512 064d9a9673a8659d7e9c1de6fe5d8348701caea7935fb3602a2f72622de0a3ceaf7ab523e0240592b19f8826aab4539b2d6a698417015305608d85f867e42b6b
 MISC metadata.xml 348 BLAKE2B ef51c768c6964646b5e264d379b5c259134b37df3c9d4368b92c44855ee21fa40005fcf1514e95fba43fb683fbf49c35dc251521d1b63f91449c73ecb527a749 SHA512 f7031388d3d15f091e5e477bbcc7291b1e2362cc41fb485875e8a4ec81c9b86ee4a8b9ee640eeffe7e2bc17cc90ab417945bd6aca52cf13c85d979774e8a3572
diff --git a/app-text/pdftk/pdftk-3.0.8.ebuild b/app-text/pdftk/pdftk-3.0.8.ebuild
new file mode 100644
index 000000000000..ed8e3f4b3a5f
--- /dev/null
+++ b/app-text/pdftk/pdftk-3.0.8.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="gcj-free version of pdftk written in Java"
+HOMEPAGE="https://gitlab.com/pdftk-java/pdftk"
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://gitlab.com/pdftk-java/pdftk/"
+else
+	SRC_URI="https://gitlab.com/pdftk-java/pdftk/-/archive/v${PV}/pdftk-v${PV}.tar.bz2"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/pdftk-v${PV}"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+
+JAVA_PKG_STRICT="yes"
+EANT_GENTOO_CLASSPATH="bcprov,commons-lang-3.6"
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+CDEPEND="
+	dev-java/bcprov:0
+	dev-java/commons-lang:3.6"
+
+RDEPEND="
+	${CDEPEND}
+	>=virtual/jre-1.7"
+
+DEPEND="
+	${CDEPEND}
+	>=virtual/jdk-1.7"
+
+src_install() {
+	java-pkg_newjar "build/jar/pdftk.jar"
+	java-pkg_dolauncher ${PN} --main com.gitlab.pdftk_java.pdftk
+}
diff --git a/app-text/peg-markdown/Manifest b/app-text/peg-markdown/Manifest
index 503b7059764d..054f3125d361 100644
--- a/app-text/peg-markdown/Manifest
+++ b/app-text/peg-markdown/Manifest
@@ -1,3 +1,3 @@
 DIST peg-markdown-0.4.14.tar.gz 85692 BLAKE2B a52b894a03921595850d460ced20257096b5a4afb00fca5849c64f7506fd2f39946f2ad13bec50f5032610669bdb14d4f789ceb509b533040a90f228fc443879 SHA512 38e43b548b2cedf04fae87baf91c9e0767914bdb617ee4b6a3cbe950f8cbb0717c457cafabcff606501e889ac196a0aef94317f3bf85f5b88a2285f686b6dd5e
-EBUILD peg-markdown-0.4.14.ebuild 922 BLAKE2B 7ecf5dd892051f8b51b049c852018143caddf3aefbf429bd8e18ce16a22aa83add778ad7d1cfa789b8b416931bf06b1703bf2660e43a759b6e31e5e921f6d89a SHA512 8a75ea5bc64564d25c0e5ed8ff82c361c5b418b40562aca67352396d004754224c83db88ea9d3065aa52abc19f91a84232e540421eca418b326c5d824ba2c1dc
+EBUILD peg-markdown-0.4.14.ebuild 946 BLAKE2B 769b8c31dc317274d3a6bf0dda8671896ca16ff3b6d3961ef9c19a114ceedb8a99123f0f8e05396b6933361052fed42fad62071f0a2fea5211644f25787bdd91 SHA512 73ae050e4802e26b89e1ffea93b361f472cd2f4a438b76438328e571beab421337e632d29d3baa35e776ccb371df2d507604c93fd8637e4fc0568fa38183d04d
 MISC metadata.xml 338 BLAKE2B 2287ec19d83b0cfe1bb293855f47a6107fd7c1a0f076f2e405f6b07ca1c1ca42ef31f1047bc159e20996cdbbf682a46a3684b2a1fb0e63875638fe77d38bc02e SHA512 d95bbb5ca89e46c57e21d2bbebedbdbf9a103db6ee3f5ba01155d69c4d4e091a918fc9cd6dc6787918ad11075cb0160a9490a551475fe0100be57a08c8aea838
diff --git a/app-text/peg-markdown/peg-markdown-0.4.14.ebuild b/app-text/peg-markdown/peg-markdown-0.4.14.ebuild
index 10e5d2c0581c..66f95d01bb91 100644
--- a/app-text/peg-markdown/peg-markdown-0.4.14.ebuild
+++ b/app-text/peg-markdown/peg-markdown-0.4.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,6 +11,7 @@ LICENSE="|| ( GPL-2 MIT )"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/glib:2"
 DEPEND="${RDEPEND}
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index 530f72ea953c..50854c73b49b 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -2,7 +2,7 @@ DIST pelican-3.7.1.tar.gz 784605 BLAKE2B 42adef016f54a931e4fef225af9a4c5c880b66c
 DIST pelican-4.0.0.tar.gz 1314626 BLAKE2B 18924209949b43063416f2e2c6e22a5524a36bab79a801f7cc6953c0822beb1bd5b05e715f5bcdb7c4877aba8d7a62cf4276e8abc43406f3c6fd7af8ef0c7c2f SHA512 5d98f5e13e6dde6b27cc299f9fb166edec79efb3fc53b29567218e0d0ba164989ce51830029ec8359697bc039661f6b0ced8d4155105e29098c038840c97d253
 DIST pelican-4.0.1.tar.gz 1314716 BLAKE2B 1fbe01f5df7f1c730d7a45429369311f77c7e8e278a05cc037e03d8193dc2ae9075ee1346fea072a08ee5d73baf9aaed8c1f8f210fd4331754accca9ebffa4da SHA512 26f91046124bb92de6fa31d17ab89f743cf9408c15b9b259875e2378342133313368418da083d1d4abc5de0537806a9dede327719c8fcf89d135805c47618a4a
 DIST pelican-4.1.2.tar.gz 1329126 BLAKE2B ec6067b9df2bf37877ca23602228b2eff035221ef16ed1f185e2806fd661c8b733603506f3f1d9516422bd8009a0712f726d40559a39b0d100224ee56c3e706c SHA512 9a20e3a16e2caa15b6a47281d4acd6ada344292f011d4fd30c6ac786aebbccffd9cd0b2fd80471d3a383d4cb0ba779c51653705572760e62f6c2d3d49a862a67
-EBUILD pelican-3.7.1.ebuild 1468 BLAKE2B 0fe9e784ad7514b9d92e35c2e6f07bd5d8b5a9fc68e83c7e1367968c809b0f90566f7109789b142cb56c7090e6d4060ea0b754bed7614894848ce18829ef6678 SHA512 f6e81e8e93d6de41516b6e0b018974e8bd8174f10b0bca7047859644a1fbac3b0a199da331cce29a0e205362a0f935000178f4212bc27692a34f592fc8a9cc8d
+EBUILD pelican-3.7.1.ebuild 1495 BLAKE2B f0175e996668d866a2e08a5b9510ea56069fe9a6f793a657dbce68ae4d61c8a3e8b9d4d6d55a00d13f6ef10a8dd4b533e095e8f1addfbe220252630dd8952bb0 SHA512 6bf42ec5e3df1c2cce141ef5696b143fd68b095208b738230876b7d7010f02d6b20d1669eb2c5ae5f0e1c08673865ff326074cf2b6fb9f13f1d6fa016b62442f
 EBUILD pelican-4.0.0.ebuild 1486 BLAKE2B f4359af3f68b0e9e05d7238d3b3cf4efe58bd494b059f13d8e0af92d65f55bbb924b9cb672fcc4651e7dca101051bca43073353895cd6a2501f3d91e3c80a20a SHA512 b87631cf9a40de695173e114cf3fc347a8d7ea876174476b997c7ae9e49d2c7d5906ad90e25c72af401d236e62ee3d653bf88029ca3ab333e743bd3ef82f7a0a
 EBUILD pelican-4.0.1.ebuild 1486 BLAKE2B b1f81ae6d9924380f7181c0af735e3436fc727a14f1a7604e61bf70e7698b73865801cc95bcab17500f91a52150b1416e1a019bc2742423a9144176fc0ae5f32 SHA512 676cb7c561ddd1770da789dffa866aea2725b3eb3c9c0436758aad7c909c8d1fe26b8c7d6a739e8cbcdf3400444d0c217c46ccf2973243ad48b54cebf14c0843
 EBUILD pelican-4.1.2.ebuild 1486 BLAKE2B b1f81ae6d9924380f7181c0af735e3436fc727a14f1a7604e61bf70e7698b73865801cc95bcab17500f91a52150b1416e1a019bc2742423a9144176fc0ae5f32 SHA512 676cb7c561ddd1770da789dffa866aea2725b3eb3c9c0436758aad7c909c8d1fe26b8c7d6a739e8cbcdf3400444d0c217c46ccf2973243ad48b54cebf14c0843
diff --git a/app-text/pelican/pelican-3.7.1.ebuild b/app-text/pelican/pelican-3.7.1.ebuild
index af10a1759f36..ba77960ce0dc 100644
--- a/app-text/pelican/pelican-3.7.1.ebuild
+++ b/app-text/pelican/pelican-3.7.1.ebuild
@@ -14,6 +14,7 @@ LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="doc examples markdown test"
+RESTRICT="!test? ( test )"
 
 DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
 	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index eb7fc1b6ad89..f4766dc5aed4 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -3,7 +3,7 @@ AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32
 DIST po4a-0.55.tar.gz 2892158 BLAKE2B 606236a4bc143d4a5cc003f7dfaf59f605017478fc7ab3fc66af5eed078a8bb0744690b7191cd2ee0b795229e766145ed47545484e3d20e6a14ae1ac0981772a SHA512 95f7408caf2c603f2ea86d8439e99c39be72dca019361106190bd6e1f95679c6627280bcd02a2d9c843071a6ce96747bf5b4d85c9051344b08f32deade2cb599
 DIST po4a-0.56.tar.gz 2994792 BLAKE2B c95905c70d7e1e24367fb128d9096996d026f58dd4cd7fa77f19c6c9b8607cb4101a1a024773d2fd383e905a008e1ce4f0c019a73003168a90cb23328ac1d984 SHA512 4fc1ca5743471577d9e8bd0b80285b9dbd83b964f8e828472787a6deaf8b8388bb7f96e68afab4119c1f5488fe371d3b1fa94b101204a59228d1cc2f0878f3c1
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
-EBUILD po4a-0.47-r1.ebuild 1629 BLAKE2B cfb962e72436e3155e60a3cb7a09ae59294a4ec6eea276dffabceaf9dbfc2557968ca64063e8e504d114d5427f130ba5526487d8a4bf01ae99d0518f1bb06f7f SHA512 2e8398f42828c49bdef9c1623f14df13d5ba3c9e79508ebe9b147f544a60a8358f445347a6b3d9e2b0cb2bc078c850c5bfda099d98a594ffa2ff673441bdbded
-EBUILD po4a-0.55.ebuild 1294 BLAKE2B 77027379281e38cbc94340713ee6fb1aa3365a6a2ce739467bd5fc162455fc6fe1577cae21cc243e6c9916b7f792b5e1690b8ee186a0d8963892c7a4e1081132 SHA512 1e01a1bba154b3b3d86b5ef162ca30adaabe9f468212966c855a986e3fb2ed5f6f9096a4a03ecf0ec02e6291e1e21e2966db0f204ae4ee60ffb8618f8a2a30c0
-EBUILD po4a-0.56.ebuild 1297 BLAKE2B 0941ccf72e14e272c4116b29c87802d3f3d9dec28e5bebedb9600167eefdb9990a48d5875db6a6f9cc53c052e066ca61e42a739f5f2334ac7324e853e5e244b0 SHA512 838e34f23aca519a260b5328f2e54c84f64249311c193c307939ac903fa936ab4d670f7f33b0735d19ae90307d8985489df8c05d6f80d99324133ee9f0d5f58d
+EBUILD po4a-0.47-r1.ebuild 1656 BLAKE2B 60e1a75c84bed91e7bb4728cce7d848835dd819d1e40297137212bb03aab6fb1fc88e1698e7b19ceb0494eda04c97fc5a972726813d7d48e9eda3074e4fbc732 SHA512 d1edabfdeb9ebeb220029b42bb9ef605791215f89b35a6c26d6d8a8ce5025ea710e46030affce56cf356cb63cfada034055e3715a22591c9a9e894c306ae338a
+EBUILD po4a-0.55.ebuild 1321 BLAKE2B 3e38d760c75f676e1686c59650a32676f9aeaa0c25c31a190be635a55a3dead22105ea3e65d10cc0935e8c419f773e73a7eecc06048b44621ea4f5adedd24386 SHA512 4c8f216c0a2365e8999bcf58cc67c945b5a6f9ede3c4fe554fe30a5d8f3723c6cd513aa809b16174a519acab6de17903a3173963bb1e32f094a8269492594c6c
+EBUILD po4a-0.56.ebuild 1324 BLAKE2B b4af81c57aab554457df323e68b1042f3a9d02d2d4353743b71addaa8ba1d14e8a6ac57822927f2a345e07f8daac775acfbdbac812bede7e4c5da98e2f2dccf4 SHA512 66ff950db06217a91de27665594fd2cdc7b8a7f0e295a6fd0f436065ce48029ca79ec91980ed7b186c347cdfb21c9703fd31af0a26b0aa5fed54042f9a6fccf7
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild
index 03f447d5d513..c6cb0275ca5b 100644
--- a/app-text/po4a/po4a-0.47-r1.ebuild
+++ b/app-text/po4a/po4a-0.47-r1.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-text/openjade
 	dev-libs/libxslt
diff --git a/app-text/po4a/po4a-0.55.ebuild b/app-text/po4a/po4a-0.55.ebuild
index 0fe06ed676c8..1ed363d2ffee 100644
--- a/app-text/po4a/po4a-0.55.ebuild
+++ b/app-text/po4a/po4a-0.55.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-text/opensp
 	dev-libs/libxslt
diff --git a/app-text/po4a/po4a-0.56.ebuild b/app-text/po4a/po4a-0.56.ebuild
index c4c7d79c9443..3cf5d3d570b0 100644
--- a/app-text/po4a/po4a-0.56.ebuild
+++ b/app-text/po4a/po4a-0.56.ebuild
@@ -14,6 +14,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="app-text/opensp
 	dev-libs/libxslt
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 429ac5d4a22e..eab51f449084 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -2,7 +2,7 @@ AUX podofo-0.9.6_pre20171027-libressl-bug-635890.patch 840 BLAKE2B f4bca9474abac
 DIST podofo-0.9.6_p20180715.tar.xz 747444 BLAKE2B 96d90add6d290d6722cd7412fd75433f87303bac385964f0967b4f119db4962f6ddbd93b49af8454051f421d77de70ad7ea0f5b01a66eeb690a75dbeec256eff SHA512 4c9b09c716128110b47d6a02f118eb80b6009e9e79dbc83ff804a57f0abc011b789de9287b68a6c1d6704ef386f8062a3a495408af8a832782f0bf0128190a1f
 DIST podofo-0.9.6_pre20170508.tar.xz 919876 BLAKE2B 39be46db0e36755c828373659f681aa6334ec6be01cdcc62616d8ce4e59a2ab916cbfc4aa58d4bf8ab95843a40b7b536cb1b2ccfa14beacf629ff1fbcb699613 SHA512 37d8e844ba5763d06d467e316871436e1a63795d66675677d9775cd1bd311f43b241d58e82213a0342ab69a0f5cd80261aad48c4af29c82f7bcc0c14bd242f10
 DIST podofo-0.9.6_pre20171027.tar.xz 919504 BLAKE2B d03852a25e50085ed2108e90c293600e0515c06918276888e63917ca00a9fe3b392cd9ec9aeb6f651fd7e0b45a5e3c08e3f4d6df6f4a04d8fb224fbdd0599342 SHA512 db1ac836abd7be0d2cc3c27114c7134de9de8ba931a6a8265514fedefe3c6f06a24371f7a5425c8b7251fe7166bc27f07733cba878ad24c12651c8c051cac8be
-EBUILD podofo-0.9.6_p20180715.ebuild 4627 BLAKE2B d17d5adfe0ce038d71af03241217afebdd84c388ea38ab1f7ee893eb89f069a197d4a635656b12c82d6a730a82461d445ad3cb6d19e0b082f22dcb85af55e16f SHA512 598ff491f8ceaaad183872515f0f10c4080ddeca361ebff21cac86e6fc9e8aa315919dafcd9cfc9bea8a25a3b88c1f63061dc19d560aa525fe24b71b737fb2aa
-EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4581 BLAKE2B 7ae073e6e68192232440f925b0bef5cd9a5193ab7cea1d76bf303a2f01ccc3fbba42907408904da4043da0b38532134cff9c9deef868ec8c9d94e70d1360e80d SHA512 abc3b61b00606184996b904475ad9d41d61bbf6e9c301216df47a8c93b8c42f1f03fcd8c200c06e2c9c630105c39546097dc02df153f825aeecc4638a0ae65f3
-EBUILD podofo-0.9.6_pre20171027.ebuild 4643 BLAKE2B 38214968a021b0412e5a52b5d72f3a308a4d5c8fd0d47cef955c352a0f465b3e86e56917e46022cb4aa58767e8f7f4e2c131daefe06dd534d83fa63aaeb4a53b SHA512 5d333d71840298a02ac3bb209ca93946f760e1c443b943fad95ef9fcb726e56f7547979394818061b0fe826490888f39cb7ca53d99dd5b87f4670acc9983ad92
+EBUILD podofo-0.9.6_p20180715.ebuild 4654 BLAKE2B 624e6bf3feaeaafa5a0f54e56ffcc9063b14d36d365156eccd0e22bd2b89515b040eddeb3615096b6365942955ec35abba6d1598ee46362d13427ee773e5fc5f SHA512 b5ebe48d81468eafa266e7813a15241f0afc29a62992bd4363921bad8a0ffb010b74e84b7732fc4194d5db606c046f866e78a56a153e494ee0ee4bf1ba83ffcf
+EBUILD podofo-0.9.6_pre20170508-r1.ebuild 4605 BLAKE2B b1af6d6e60638220fa4ef3d4d6019fd56fdc186911d9fee02fb4cf1e3dad7d9d75d95e2a2860395d7257ce6f7ac6f4bcda391fdab113795c6351d03130bad326 SHA512 64a66ab34e3b7cb2d01bd8214429f3c880d589a7ca469686e37b1ca1f8c3fb2d780bd3da489a8386b8f6d84f994c596791e88f869a1b063cd2d7f01431f02d53
+EBUILD podofo-0.9.6_pre20171027.ebuild 4667 BLAKE2B fe2ee3f4bbfadc0b25f9c30dc94bc01ad041dc4006251748d9c1e9b5cb6307ab5705e71b716cd7b068452b7063d3c189cf9872f35a0b20ead7397633840d17ab SHA512 8fb15f004cc08cdb63d8ed455c53e425def5c67b388c8de6fd06110d0524b510b71bfa056575fd99541e126bd0cfbeffc0b66f288faad57e4c50f98f0b910483
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20180715.ebuild b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
index afde927a0cf1..667a02839159 100644
--- a/app-text/podofo/podofo-0.9.6_p20180715.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20180715.ebuild
@@ -12,6 +12,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/${PV%_*}"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86"
 IUSE="+boost idn libressl debug test +tools"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tools )"
 
 RDEPEND="dev-lang/lua:=
diff --git a/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild b/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
index a75c43638425..bbed6ce6bb91 100644
--- a/app-text/podofo/podofo-0.9.6_pre20170508-r1.ebuild
+++ b/app-text/podofo/podofo-0.9.6_pre20170508-r1.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
@@ -12,6 +12,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/${PVR}"
 KEYWORDS="amd64 ~arm hppa ppc ppc64 ~sparc x86"
 IUSE="+boost idn libressl debug test +tools"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tools )"
 
 RDEPEND="dev-lang/lua:=
diff --git a/app-text/podofo/podofo-0.9.6_pre20171027.ebuild b/app-text/podofo/podofo-0.9.6_pre20171027.ebuild
index b7e200e657a7..4c9b80bd810b 100644
--- a/app-text/podofo/podofo-0.9.6_pre20171027.ebuild
+++ b/app-text/podofo/podofo-0.9.6_pre20171027.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
@@ -12,6 +12,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/${PV}"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="+boost idn libressl debug test +tools"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tools )"
 
 RDEPEND="dev-lang/lua:=
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 5bf7f40d187e..49e8d5fb109c 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -5,12 +5,10 @@ AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27
 AUX poppler-0.78.0-respect-cflags.patch 1140 BLAKE2B 59e87b6957a5aff35cf6ebc8092c0552b8ece31e2fc73765789ac73dc5ac01ba69928f9308de9660ba3cf6b38b921ca341dcf6c5bce1d360b1bcf1a4005e4115 SHA512 713f7a3e3e2ae950fd6406ed076d4e6d2079619e40f00de7ec7d7df587df520373b923d343494902da454423adf29174f1ced11cb874a12851febfc1860988f4
 AUX poppler-0.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2ebac232bb0d0bfe1d55fa9085c6e2819e4a37e54680a95e69d2b3cf49bdb5cb3c18eeede8ca58bf1426e8c9bd47ea79eddcd0860 SHA512 37d3700ac4d4774fefabc88fdc3a9b0031e91d8a7aae6f8229e87acd61710652f9a64f8ac97006131ab7cea479e1e6268c7992818017cf7473b45743a3796440
 DIST poppler-0.79.0.tar.xz 1544140 BLAKE2B b5ecf204c5246f640d9f5ca5ffce9648a1a2c957efdb1e31ace9c1ccdff1be85337b67f7c4019b52eefce17e6f5869aa1911a60e54e421b80ddd3b6eec97a0ec SHA512 f0024fb86887e147ec1cbe9481498d348076dbd6b960716da65defab3365c67ab39626f946758dddbe438634a7116773d8ded8684b65e18abbfc299f56563ec9
-DIST poppler-0.80.0.tar.xz 1548908 BLAKE2B 09a3b10b1ee6a9de900f7a6ca105e98ec266995c3f6a3d56fbefb7b57851462caa4a16a55081efd8b70d02107d8b7a13a74e316d448290bb3b02286c1778ad86 SHA512 0a0d68168ba4d560941de31cb9e32c6cd7b44025e93cd84ace863ffab5b9ff0356524626cb16fb99c29a897738f2ac5862480fc54d42f8aecd2e3457f11c642f
-DIST poppler-0.81.0.tar.xz 1548944 BLAKE2B 23b460d50b22d8b42690c28156398fa3cf299ac24ea883dc8c79044c44aebc126388cab2f31e69c76c50750ef86bd5203958efbb1c353c582c0337e6e0486a85 SHA512 774d650c63afe2a0d6669daad4b286c2412a0c02581d7ea2cc37d71936f77dff92dc22217367561b7e4285c9c27dcfdca4c76c187d9c3c482db2f3549919b25b
 DIST poppler-0.82.0.tar.xz 1553336 BLAKE2B a83d476ce1174cb7789f857a52a8a9ed29dfe8863d082ef662508ad9957667349aa62b038fa1a52e9e7ae3ddf4701eb5fbd58545b041b6aebd69cb8b91376d8d SHA512 1631be30e398dd18a4e8c2cc893cf0d9469a98d93f02f2ffe3bc14857518b76674a10cafe89ee92b9886c3c6b03d50e214a6838c102f673a62789c9832cfa4a2
+DIST poppler-0.83.0.tar.xz 1555456 BLAKE2B 4ab24a85e879d0ddbf24cf7bab5b1da7c15fc026e88b4076dc2b8cd34d69a5bcc0113df20fabda6915afea880480613ba34be6e23b5b0d79a3c6197c92af7853 SHA512 bfde1e3cc4d9c626949aab770d84fccbe47bdde2331d3b9f5b98c24319eb573a5db62acbfa5a524b21ed0f195f8b163fee64677c2bd616d31d0bb219d1e66713
 EBUILD poppler-0.79.0-r1.ebuild 3496 BLAKE2B 71c664164c00a554aa7e524b8e56e32d5d6e05ff68ec88bb4ca45e474cde45b20b653d101c8cafa5467875c1a31ca8184ec956efa278f07e762c2b74a3569449 SHA512 91aad9e8ef1648b5207cf9e20ef6a6475305a39b375109196fcbaed1078ca6fac67f5c70e0ca89668a8d46d9e7d234a39b48d6e5c83b6a4900804393e68ec9fa
-EBUILD poppler-0.80.0.ebuild 3484 BLAKE2B 607e91146b25a87bb690b869d1310c2b7a536912ecb70159bb0087fa6c31c4aa65ee773b3e5254d051e606fc9ca946a32eb48d34869bb5382a598083eade11e4 SHA512 1415779bc776554445fa049ec35a0ba68e9b7ed878da9b0170a3acd1ef575d2b72f62eca14e2ada250b5ceeac5ce7a6491120249c2080034c2afcd6ecedba49b
-EBUILD poppler-0.81.0.ebuild 3367 BLAKE2B 88eefb38717a40ea3adde8c8ddf5189e80a04f48500886470ebe7a7702eb24afb567a041490186765f27cb6978ef866285b64704e7bbe61560bc7578a1383382 SHA512 780f3b1116d35a3a51d5de2d43690580e554814ad1d9f07f2ab54006561fabebe053be42591d07e608fee0de1b3b453fb865ecb056708beb59e013a2ed059e17
-EBUILD poppler-0.82.0.ebuild 3367 BLAKE2B da58dbc5f9cb52c60dadc3f9c9a004338bfdcb4595a2b649952bf04a4b3aa0c13a11a4631d90da2d2f74a9548dc4d0b5bfff8f788be89b0c797a790c32a34147 SHA512 88b21996d1ae6152fec6033574d5d3bb1bee8058d13e4cb2f3f7af282a1f0f99065d7b5fd64b98b19590b5c598ce85bbe03c0db50b057fd4f0c700f9f1ea0e6c
+EBUILD poppler-0.82.0.ebuild 3357 BLAKE2B 2b5fe4322f1fb52674f9f7f8ec9678380267bc913f0140c808f661e45db16736d3a2623c8fd6f92c11d098426d979505c1ff613115960d14be7b88653bcf44d3 SHA512 143641efa624b2af333c7aaece777c767aeaff5a143aa20414c0900de4db5e7aa2c5531feb043363bb446371196704d69332414cf6b3948cf9ecd068ca0b2e82
+EBUILD poppler-0.83.0.ebuild 3367 BLAKE2B bc2dd304b48d9a4a0b9ae7d7646339b723ffd1388b2d5fa05ce0d29575e5675bdab0ab7f4b7a016d8b40965ec3f96d40745acb471ebcfc4368e08796c1f0c967 SHA512 f53d290e73b9c7c5feecd1822fc8267bf81c2d98f1fb6e1a2f7c83779aeef6b0a8972d725e1dcef73a27596e98dd03d78429a3183e1ab46f3acfba6c085f8e71
 EBUILD poppler-9999.ebuild 3367 BLAKE2B da58dbc5f9cb52c60dadc3f9c9a004338bfdcb4595a2b649952bf04a4b3aa0c13a11a4631d90da2d2f74a9548dc4d0b5bfff8f788be89b0c797a790c32a34147 SHA512 88b21996d1ae6152fec6033574d5d3bb1bee8058d13e4cb2f3f7af282a1f0f99065d7b5fd64b98b19590b5c598ce85bbe03c0db50b057fd4f0c700f9f1ea0e6c
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/poppler-0.80.0.ebuild b/app-text/poppler/poppler-0.80.0.ebuild
deleted file mode 100644
index c2f563333cc2..000000000000
--- a/app-text/poppler/poppler-0.80.0.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-utils flag-o-matic toolchain-funcs xdg-utils
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
-	SLOT="0/9999"
-else
-	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/90"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
-fi
-
-DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
-HOMEPAGE="https://poppler.freedesktop.org/"
-
-LICENSE="GPL-2"
-IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
-
-# No test data provided
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-"
-DEPEND="
-	media-libs/fontconfig
-	media-libs/freetype
-	sys-libs/zlib
-	cairo? (
-		dev-libs/glib:2
-		x11-libs/cairo
-		introspection? ( dev-libs/gobject-introspection:= )
-	)
-	curl? ( net-misc/curl )
-	jpeg? ( virtual/jpeg:0 )
-	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
-	lcms? ( media-libs/lcms:2 )
-	nss? ( >=dev-libs/nss-3.19:0 )
-	png? ( media-libs/libpng:0= )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtxml:5
-	)
-	tiff? ( media-libs/tiff:0 )
-"
-RDEPEND="${DEPEND}
-	cjk? ( app-text/poppler-data )
-"
-
-DOCS=( AUTHORS NEWS README.md README-XPDF )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
-	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.78.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Clang doesn't grok this flag, the configure nicely tests that, but
-	# cmake just uses it, so remove it if we use clang
-	if [[ ${CC} == clang ]] ; then
-		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
-	fi
-
-	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
-		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
-			-i CMakeLists.txt || die
-	else
-		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
-	fi
-
-	# we need to up the C++ version, bug #622526, #643278
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-DSPLASH_CMYK=OFF
-		-DUSE_FLOAT=OFF
-		-DWITH_Cairo=$(usex cairo)
-		-DENABLE_LIBCURL=$(usex curl)
-		-DENABLE_CPP=$(usex cxx)
-		-DWITH_JPEG=$(usex jpeg)
-		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
-		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
-		-DENABLE_CMS=$(usex lcms lcms2 none)
-		-DWITH_NSS3=$(usex nss)
-		-DWITH_PNG=$(usex png)
-		$(cmake-utils_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# live version doesn't provide html documentation
-	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
-		# For now install gtk-doc there
-		insinto /usr/share/gtk-doc/html/poppler
-		doins -r "${S}"/glib/reference/html/*
-	fi
-}
diff --git a/app-text/poppler/poppler-0.82.0.ebuild b/app-text/poppler/poppler-0.82.0.ebuild
index a5c4e4a699c8..a0426000e924 100644
--- a/app-text/poppler/poppler-0.82.0.ebuild
+++ b/app-text/poppler/poppler-0.82.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/92"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-0.81.0.ebuild b/app-text/poppler/poppler-0.83.0.ebuild
index 86a7cd33bcc2..33ffc42f9cac 100644
--- a/app-text/poppler/poppler-0.81.0.ebuild
+++ b/app-text/poppler/poppler-0.83.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/91"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/93"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -59,7 +59,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
 PATCHES=(
 	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
 	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
-	"${FILESDIR}/${PN}-0.78.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
diff --git a/app-text/pylize/Manifest b/app-text/pylize/Manifest
index a7b90d4c96f6..0077320a7ab6 100644
--- a/app-text/pylize/Manifest
+++ b/app-text/pylize/Manifest
@@ -1,4 +1,4 @@
 AUX pylize-pillow.patch 375 BLAKE2B 9aaf388fc67d03d9af957a1aee350891ded225b0f0def122120d23e7cb1981fe70a8ba7169806a94de913ddea4d8019687ac3088b2e0b318451dc423e6eb75e6 SHA512 5e6beeb1a0192328039d581eeaf568e606a1fa002f8d91ddb397e27d873e23834fda67cd88a5afb24563a515cb37c234ed2d8c913472ce9fccd431249be852dc
 DIST pylize-1.3b.tar.bz2 70979 BLAKE2B 3b90d60ef7c314e6f7683ebdfa4d518b64ebbfe3bbe39148409d50c41577c7850304eb11e588f99e9c22d550548cf81f5f93265624200395e7abe7557d738a0e SHA512 271be57bdebb605566a7ee0340d34247f8ede4df7ba729c85c23f6df1ca24cadb25c870cce5b1ac35544205d90e716742cd31e150b9a8f98b2dcfae441a76454
-EBUILD pylize-1.3b-r1.ebuild 1029 BLAKE2B e664ef860482affaa8dbc45dd862263a090ce90fbf133bc30436ad1c173c045383761fe4c007cae861b79a313ab8538c6e2bf05e937686e8e71e6bcee10afecd SHA512 dada782c5b6a0f6d146d20ad26ddbaef46cd7476c8c5fa5143904855178676fbe028a22ef01c213af2ae052c7c8b6e227ed506a49dbb8f4e3931708264346fe2
+EBUILD pylize-1.3b-r1.ebuild 1022 BLAKE2B aaf0d9b9d31c62fddce0383cb4dd525b7ae1c080b09cdd2fa2a97f4d6461e9d092e414cc2d61ece6845fd8371b741793da0e786d20a453c636f662e3e188f3db SHA512 eecad9d01435070c7652ca2357bec6c9cbcf289e478fe34af2fb2ca17ef217609d792b6d6b14f79d71c2eba1b0769682daba5b2381b0a6798ff81513c39a2961
 MISC metadata.xml 547 BLAKE2B d6d76c0357be91f51c01a0d0031c2a221e27dcdb65b300bd63bd614bd5fd29ea000903ed7206167ef3055b1da85297319a4d5517a0f80077ae2a0d072124afd1 SHA512 bf43543c0b0c4f90940d0a5b40c342d9151673418994e074421e723ed8242fa742cc06b93cf846bf8b860b997faa68b4f0f978d274434bb33b77c3e9cddec435
diff --git a/app-text/pylize/pylize-1.3b-r1.ebuild b/app-text/pylize/pylize-1.3b-r1.ebuild
index a82f173bad45..799e97bf41da 100644
--- a/app-text/pylize/pylize-1.3b-r1.ebuild
+++ b/app-text/pylize/pylize-1.3b-r1.ebuild
@@ -30,7 +30,7 @@ python_configure() {
 
 python_compile_all() {
 	if use doc; then
-		emake -C doc PYTHON="${PYTHON}" PYLIZE="../pylize" || die
+		emake -C doc PYTHON="${PYTHON}" PYLIZE="../pylize"
 	fi
 }
 
diff --git a/app-text/pytextile/Manifest b/app-text/pytextile/Manifest
index 0371c1547e84..74d4822fa9ae 100644
--- a/app-text/pytextile/Manifest
+++ b/app-text/pytextile/Manifest
@@ -1,5 +1,5 @@
 DIST pytextile-2.3.3.tar.gz 42277 BLAKE2B a6e6e1d96695f3ada03f5da9bd8bd19b99da345d83c62b1d4f2e765303dfbbbee072da4611f1b29b46d28ed334373c809117940ff0c1238dea3b12fb9076656c SHA512 980c872bfdc056753fa5b344cbc828dbdc9ddfc2656f3cfb5c15b3351cfd9e4016f57af14b60af2f2764e556865301d7923a8f0687c5857fc2201bf10f56ab60
 DIST pytextile-3.0.3.tar.gz 48560 BLAKE2B f8d3077e2b8e4de7157dcd9ed17f7889301946c2d3034dbbb0171b4930bd7268c65ce1f950552db2b783aa48acae639d5f4ccfcbca96807562b4a6377c3dd220 SHA512 142fe77c8858b0444428f9ca0f24d1a054a1566f85f00fd5cf860bb705a19666249cd03420d258d5acfc9f45052dd25e52767492a60a10d986d86b711b54612f
-EBUILD pytextile-2.3.3.ebuild 1018 BLAKE2B 141e7e718091d3c64e77a1e7145ac0f0dcfc9b41de64378d7a903a5b6194c73d388b40b8bc10b6b9927edcd632341b29afa2a125b6c633763eb3514bc370d3f7 SHA512 f57a8474877268a42665b4c36042dec0c876afd5b0d986bcf23a4bfe856dc34d9158804654ef9d3cd0f119c0d5e3954cda7cb01ebda27f7d850fd65ab5b5728e
-EBUILD pytextile-3.0.3.ebuild 1016 BLAKE2B 0d0078c4870eeba7cdf970dd1ca55ff3620d3308864447310d8929f690e65982623c2b72913ae598e4668b77a7d5ef5c568861e80ff00aa5155ee5e9dc9f5528 SHA512 db2ae7f208ab478868d858b72bd67583d897fafaed51f00a1ffc74b7670cc22e68fadd2704892063b5d7e5135519c4bb0e8357a8a36f6881ac521199e701047b
+EBUILD pytextile-2.3.3.ebuild 1045 BLAKE2B 04606f9480d8a81b41e4f061c983823f3573d016396ccc093c77aac3c889d9f42e55e0f100daf426c614f015a924834fe666c47078141d5cab0ef063edefc7cf SHA512 010e4c15c02a4f0dce016bf44b711f82d44148bc90ea4b298a49f8a37ecc3278a2c2e103f52edf0f828f2f0c476bac862767601d7a4284fdde005979ed2727e4
+EBUILD pytextile-3.0.3.ebuild 1043 BLAKE2B 0b8584b151b19242cfa11af7c178ee2a5a0a84817ff8d61044a1e82c306dfa4416ec22d25bf0136c746d4e743adb7abdb690d6a411df4a508d7ecb8eb67a9a42 SHA512 025df2eac1817b07e8d1a0509881d8ee78691e389511e7f9e8e55eb36395a7139b538274d45c546def30532945a5f60ae9e0a80bd8be0a23e31e32a27b0e0da3
 MISC metadata.xml 554 BLAKE2B 014b0bb6fd9f0405aca39429a804bf9b3c2ff7dfcbcf55aab6678298c1ce37093c2c0005c315467cbec5c19b1f7da020c8eaabc1d912fd7b5d93567f62c94fff SHA512 6d4de4859070958c55f816ee8692a33f1a7b70de38549e9a6242044ccfdfffc590da29c79c450862537185fe2803bb0e09b2bb46ea76cf5548a2ded01a26434f
diff --git a/app-text/pytextile/pytextile-2.3.3.ebuild b/app-text/pytextile/pytextile-2.3.3.ebuild
index 222e6d2ff4a2..4c257b78c7e3 100644
--- a/app-text/pytextile/pytextile-2.3.3.ebuild
+++ b/app-text/pytextile/pytextile-2.3.3.ebuild
@@ -17,6 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/pytest-runner[${PYTHON_USEDEP}]
diff --git a/app-text/pytextile/pytextile-3.0.3.ebuild b/app-text/pytextile/pytextile-3.0.3.ebuild
index d06e62c366e2..06069bbdd49c 100644
--- a/app-text/pytextile/pytextile-3.0.3.ebuild
+++ b/app-text/pytextile/pytextile-3.0.3.ebuild
@@ -17,6 +17,7 @@ LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	dev-python/html5lib[${PYTHON_USEDEP}]
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index d2a4e7a17a43..757248fdd36d 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,11 +1,5 @@
-DIST qpdf-8.2.1.tar.gz 8256216 BLAKE2B 67e9b897ed938b9dd2e8508efaddd4dd6f63568aa23332ef72918a0888cc1e1b8fe844f0c1424b8ab568ee5ce42f8efd04293cd525e9d8de0c5fe7b352f49367 SHA512 ef3aeb4a7ca3ec48ab62341533eedcb2a6d0985767317ab72c22f0c0ecfef6849bfdc34b1bcec6427c7bde166143adb409c895ff40d8be6628e6323e27697a8c
-DIST qpdf-8.4.1.tar.gz 16990752 BLAKE2B 6e7ccd212cf8d01aea3dc615f5924c0575392f19cdd20b35327a71bd1f97d7e515fe1a73cd2e3901964f621cafa19ab07a1314af19f40ded28d3e9f683c02ab0 SHA512 d5ac3376345650f05278f8b4d99182cd58b927537085a4a6415d3df0b80b7ddd80a7c33778ec8c3b85d9788ea081ea3266bd4a9315eda9820988e9e54a22f80d
-DIST qpdf-8.4.2.tar.gz 16988263 BLAKE2B 358836310575fd0f454d4504a70796b72d2e3120c5820e2c33e84ea79c5c115d1c84f8d58392d870b5357407d0fbed05028bd854d164be0b32b348c587845300 SHA512 9cde046fb5e42dc331933294155583fb20408704a0cab3075cc3e97bd4643e3178e4162b8de7434aa2304097e7734f985fdc8e7b05cc028c37193dce91797f7a
-DIST qpdf-9.0.1.tar.gz 18172693 BLAKE2B ddb389b773b4664c1c3da270f1804f015c8f0a04ed57df7a4a1de9ff80cd47c6fd07c29836573bd6459cde42e8fd3986855a68632495df5363d220d6062669c7 SHA512 1bca5cf39f0019443f744c01ddc93773febca6883063fcec7f3541dd68359d8da44f34cf111cacb3bd9564f10bf1b09ea58173efd3ae06116e5c3832e61e82cc
 DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
-EBUILD qpdf-8.2.1.ebuild 1246 BLAKE2B a5a9de3de8d4c2bbd9f36c6977626d1943eb1332f3b592d2fa0ee19107651c6601d51d5ef7987774c3a1a7d3dc1d89aeffa96bb8f70820a40ede9cb6f1bc5659 SHA512 d54a88037debb98c3e85d354a223a4f682fa1ff7d744244c7a9e9cca089141fe92aadcc6f2ef6006ae54911bccb0e107fe5d8739875483f5e26fa7c150db539f
-EBUILD qpdf-8.4.1.ebuild 1255 BLAKE2B 1b3e6004cc12bbc5e1b89d27b7100d963e9bfba4cc50c823cb356a021884196b11f5f43219e71fc74c31f946ea5da701b5fd7512ee852edab13f4268af55203f SHA512 c135d6a5af42997864e7f348f6464f6249d6a018eae0fb9352e7fa8b8c107702077f1e00daa48ff4e49af08c4d612b430ceac2063b3d8c49edd67ac618ca0e40
-EBUILD qpdf-8.4.2.ebuild 1256 BLAKE2B 8733a9c756fd75c166d6de06420795de427b19c60a5e7411dd271f7493c3a5ec493ac4813555587dd8acb429afc611937089c6f29ed3dd5699a4bc83c864f96f SHA512 8e2e971373eb77502adfa95962e5dddacb9ec781080ff5e5b72d2b43e2a9cc158885168f5dbbc191ba688b8dc20ededeaa3057682ab57d50afb80c8f2730f74e
-EBUILD qpdf-9.0.1.ebuild 1256 BLAKE2B 99fce30ce8d693780d1753027420f7264bedc78a7163f9f37f1a72b1753a18065032508281f72ef052ea3d563b7b2fcc00d80bea959d69d070e8f7d0b30d8c11 SHA512 0bba46803264bbf4e3e2e46c9c0abd5239130b5b58bfb0cd42496d0105a43ebf4638765814f331807cf983169fa54dd3160a55f2e17d42ca2556164742321b71
-EBUILD qpdf-9.0.2.ebuild 1245 BLAKE2B 6707c09f0c5abaca4301b3cc8297168e6b1261530874ed266d09894d25d74c62781f2c69afb2a3f3f3c673e73bbd8bd93d9612f4cccdcd110e9df5183149a383 SHA512 29e2f72f7d72bcea752cd92c608b6967a2aaa16eb84e335f559c0c4c59aff795bbe2ef1c1246743859000078fcffcf19254b18cc149249fbe5f5f6abec7cc1d8
+DIST qpdf-9.1.0.tar.gz 18285597 BLAKE2B ef86cd4192805761e121bcd112e071dacb4bc108335da0ba237476d9f1698e4ba630010e3266fb63d9aa5b97e0e778f76fe226613e91d351b93a53b9fc9abee7 SHA512 7561ffc366dbce9df58cc85ff18480b28b0d46de04733ba463139188bee95690f92cf0960a328619f0c9f34ce865598db490fa1c6aaa76ee87d2c034a5f7f57e
+EBUILD qpdf-9.0.2.ebuild 1273 BLAKE2B e8d72973ae6531dda7e4a6d4b477c7aa96c6f70f4f36f0106bddc1d4a7c3409f1f959762521172100a65dd0968282ba563fc44b93e4107a2bfcddf76ff697ace SHA512 9662f0ea108cf14f766afe6ba649e183a05af9c47f1413495d7fdd2d988dbcc4ab29bb0af50e1b67fbf7abb9ce6dbfcf6a0710c8f00f1f2cc9fba0cee0f000c8
+EBUILD qpdf-9.1.0.ebuild 1421 BLAKE2B fcf852c0c05df1b7699d7dbabe2d01861d41eff1cf3b14bac03fb07fd67a28923cc063dfc8e7111cb1ba20a2485a48c863f86669cf9bfd25849f13b0b66d2663 SHA512 6bd4a49cbfc8972b0bd5781ddc7cd175191156064ae512466556a26eaae36cd7f7a830442744cfe1110810216ac5a98fb20e34f7b8c202c7ebc8880c65357a63
 MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/qpdf-8.2.1.ebuild b/app-text/qpdf/qpdf-8.2.1.ebuild
deleted file mode 100644
index 522fafc80cc9..000000000000
--- a/app-text/qpdf/qpdf-8.2.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-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() {
-	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
-	fi
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-8.4.1.ebuild b/app-text/qpdf/qpdf-8.4.1.ebuild
deleted file mode 100644
index fc19a146e9d4..000000000000
--- a/app-text/qpdf/qpdf-8.4.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-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() {
-	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
-	fi
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-8.4.2.ebuild b/app-text/qpdf/qpdf-8.4.2.ebuild
deleted file mode 100644
index a31c84968611..000000000000
--- a/app-text/qpdf/qpdf-8.4.2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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-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() {
-	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
-	fi
-
-	if use examples ; then
-		dobin examples/build/.libs/*
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/app-text/qpdf/qpdf-9.0.2.ebuild b/app-text/qpdf/qpdf-9.0.2.ebuild
index be3dc4724ee3..16fe35a4e42b 100644
--- a/app-text/qpdf/qpdf-9.0.2.ebuild
+++ b/app-text/qpdf/qpdf-9.0.2.ebuild
@@ -15,6 +15,8 @@ SLOT="0/26"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
+RESTRICT="!test? ( test )"
+
 CDEPEND="
 	sys-libs/zlib
 	virtual/jpeg:0=
diff --git a/app-text/qpdf/qpdf-9.0.1.ebuild b/app-text/qpdf/qpdf-9.1.0.ebuild
index 32bef49367a9..156b5c7a2d93 100644
--- a/app-text/qpdf/qpdf-9.0.1.ebuild
+++ b/app-text/qpdf/qpdf-9.1.0.ebuild
@@ -15,7 +15,10 @@ SLOT="0/26"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
+RESTRICT="!test? ( test )"
+
 CDEPEND="
+	net-libs/gnutls:0=
 	sys-libs/zlib
 	virtual/jpeg:0=
 "
@@ -35,6 +38,10 @@ DOCS=( ChangeLog README.md TODO )
 
 src_configure() {
 	local myeconfargs=(
+		--disable-implicit-crypto
+		--enable-crypto-gnutls
+		--enable-crypto-native
+		--with-default-crypto=gnutls
 		$(use_enable static-libs static)
 		$(use_enable test test-compare-images)
 	)
@@ -53,5 +60,5 @@ src_install() {
 		dobin examples/build/.libs/*
 	fi
 
-	find "${ED}" -name '*.la' -delete || die
+	find "${ED}" -type f -name '*.la' -delete || die
 }
diff --git a/app-text/referencer/Manifest b/app-text/referencer/Manifest
index b93abb5c98d6..9d69499a55f2 100644
--- a/app-text/referencer/Manifest
+++ b/app-text/referencer/Manifest
@@ -1,4 +1,4 @@
 AUX referencer-1.2.2-lib_path.patch 809 BLAKE2B 2cb37ce577ab7b877353489dcaedf32fb135b7970ed70c031de843e0db50d619c8b83d451945dfe9c5d88f60fd21e5243c026c6cf10b0f113fc375bae7f766e0 SHA512 4857eaf468aaba555e7a74b23f91049c68746a6bc1a80d4df287a3363f92871ccb879bdf7f0f8dfb6f18a6f0443fc61f743cbe23b164de4fa0f8a076f59a839b
 DIST referencer-1.2.2.tar.gz 694421 BLAKE2B 2b48b71610d0cb79feaaeae7af203dedd1dc53d194b1b93306c5f022954a5e50f5db1dd693da76b7d4f33045d3174ed82a0764a9dfee6b6bfe98f352575cf59b SHA512 de8d759890f283e7863e6174334bcb051edf70f87a6fb06f724ffa1699be60c83d0191bde0324b571fab0801752a5b92fb507a3cd337fa9adb5ea7d22b280907
-EBUILD referencer-1.2.2-r1.ebuild 1149 BLAKE2B e09a9d137ddc6331bafc040ca57145ac6e92c34a714a2547dd6709aa7a34d53f811b001f1eee344394f7c222304421c00b5ce8abd19756d8a45f260f187faefd SHA512 e3e4a521ae00557df80b142f42d25bb73ce78dea2cad1439f29843ee905542ccef0dfe5eca75c9054ac99f612f6079ec3464079c8491dc6f6bc6d4a2b3fbf37c
+EBUILD referencer-1.2.2-r1.ebuild 1176 BLAKE2B 95b621885a80ec83e9413c4fa0393132d1a4483836772af7ad78b369d01efd8c7d8c4b954639d9794a8c0c5d2e4f2239dffb1dcc51dcc72fa3beb384f2cfa92e SHA512 2ee802541e873f388af523cf0f8aa2c9e1442d62db3a00e0a4e036a1dac5f2c6d83ea3d15c075958a91308b2ffa47c9bd6814ced63c94c0a951362183657ea2c
 MISC metadata.xml 453 BLAKE2B 8422bf3441f4a64d469ed5d1f3935f93d6ef0a9b04dda823d3ab6cd03f53de8794fcc30732d9c5ba7414f925a346d96ba70fbfe52c628b1ba473b4c4c3180cdd SHA512 966bf89a47f9afee99af80214048a21d332e810ec1013ca8c9d7edb9e7038575c7a86fd1603dd9cf34ffe90f2a93ff55f7f1d1c229d66055872123f7b6f20649
diff --git a/app-text/referencer/referencer-1.2.2-r1.ebuild b/app-text/referencer/referencer-1.2.2-r1.ebuild
index 6e6d213af97b..aec67160a1d3 100644
--- a/app-text/referencer/referencer-1.2.2-r1.ebuild
+++ b/app-text/referencer/referencer-1.2.2-r1.ebuild
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 7be100507d0e..f42bd562bf8d 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -1,7 +1,9 @@
+DIST scdoc-1.10.0.tar.gz 12414 BLAKE2B 3111b3ace102aca2f7da86e510e00f552874817b6b9d754770bd94f9482e4e444a4bc4d44a8317376a6c374bb7363eae96a49281fefd95dd663134087123034b SHA512 546743376380d84aa9c8be65529dbbe1634e574203220ce1c057341436bd3a15297f393ca79d29372cb125bf457cfc00f64ba2867b8d2e910ca6531acb552e97
 DIST scdoc-1.3.1.tar.gz 9392 BLAKE2B 609f25252f0ee864ba3500961aa1048c6490278f4861fb4494ca62365a20d0cb128e53a6397bd089bd5a37f25f7f3c080f6921f1c4f4ca7e4af729c87e1994fc SHA512 6064de8c76eb959708b32e93634223565e5d4b390069d4fcd2d87d27bb472a333c60b21de87d676eb57ff5f8ed6445d3c3bd92dfe7dd611f9886abc38e8d21d2
 DIST scdoc-1.5.2.tar.gz 10542 BLAKE2B 07ceb1b3b57026a4e67e575f02042c2c882cdbd29712a4d3726ff39b4356bb63a35a99b21dd68fee31aad6fb2df14b1886bb2694098bc9096c5ff9e41600e7c4 SHA512 755c1c7fbae6cbeb75ca2aa2498cb3b2cf644e5118188c3e4a4636d74764b475b1818dcb5bd08ff70e017af9c1f8cb2e351db36a2cc98885724731e4247201eb
 DIST scdoc-1.8.1.tar.gz 11204 BLAKE2B 0427aae7aa6ad5a5258d3e00f9ea87f4faa9c3c8f9931fbed66659eaf62263c32377ee3ea68afdd7c02720f0550b1c8a9f8849245f1ec560ce86c198f6c44d0c SHA512 16845acac3d59eb878f1a41d5fa95d9910166da3ac292173506b778d29f5289a26a6529aac765c07b2e04bbc6924b32b68ff68f7491a03a1050e53251a193eaf
 DIST scdoc-1.9.3.tar.gz 11479 BLAKE2B 79aa3f18104e06722f087e9c2fa047f6e19fe8eb47ba0b4e6fa86f7abdc52b06a2dfcfd632b16dc7bce6e5ef3b0dbb40ce9170e678bc17c0a4e43dcc0099a1dc SHA512 77be81f042e2099de7fc84b0161bc8a95d5c3dde662284613d84a1e249fa0aa51dad73f53f265c833526d40f5e1f19fce99dc5cd6df35efb0a323c3db6084a55
+EBUILD scdoc-1.10.0.ebuild 1168 BLAKE2B 896d9b2c6a246e64c59e29043ed7805c11362595a6502794de288216459e00e3b6517d4cb0f971b072d51c96b027d3c961228c0f7cf23cb65c364c47d29f3776 SHA512 d4c5631f5e5821753cbbb95dfdfda031032c4502ff89c036424b7e7a29324783b9409b8b4293c2f2ad56782980415d491f544257125e980eb5b0373941dedf56
 EBUILD scdoc-1.3.1.ebuild 1031 BLAKE2B 3da18d09700584dc4c3365ea66c06bdcc5e8363e5dd3ca44a0c36a2237abe6ec444a760ed0ee288e522d6c4ea1994f8c9dc0db09a6b3bb07005f8cc9c379915d SHA512 2a943adf9b0ecac43499c55f74ab56fb0f5cc59d74bb43862726ff4da4aa9a765c09cc8b4ff1de28cae3de0d7856634de65027c83577a61c91c2b222fa6f14cc
 EBUILD scdoc-1.5.2.ebuild 1109 BLAKE2B b4846000a1dfa6d9d5295b8a68286c89374012740bc89fd50003e23ee71ee2e5c580afe8258f5cd2c5d1bd174de778796be606ff420200917304a26c88757243 SHA512 808c5938b686455d4d53d3b430feeee569d90b4c81c6979851d60b2c24a378c2acf20253dad18fd3889367cdf5ea1d9a6a1a4dcbbd9a996ce43d4c915d78291e
 EBUILD scdoc-1.8.1.ebuild 1109 BLAKE2B 9e0265584e2e9dca427d2ecd419a0ab72e723f88d4cb88be78e0ad5266a48534930d848c35a7542d8de89a12c91b7d279002c5d2b6a9550358666737fe191838 SHA512 5fbf573577f5e489e8361c8fc03594a1a4a0c38371e2df40af7178e0bbcc5b4bc78ce01c88e35326c6c66142a491bfb40a25b6be2e6373d10bd382e048bc3e68
diff --git a/app-text/scdoc/scdoc-1.10.0.ebuild b/app-text/scdoc/scdoc-1.10.0.ebuild
new file mode 100644
index 000000000000..a73e37542026
--- /dev/null
+++ b/app-text/scdoc/scdoc-1.10.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Standalone tool for generating man pages with a simple syntax"
+HOMEPAGE="https://git.sr.ht/~sircmpwn/scdoc"
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.sr.ht/~sircmpwn/scdoc"
+	inherit git-r3
+else
+	SRC_URI="https://git.sr.ht/~sircmpwn/scdoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+
+src_prepare() {
+	default
+
+	sed -e 's/-Werror//' \
+		-i Makefile || die 'Failed to patch Makefile'
+}
+
+src_compile() {
+	local MY_HS="./scdoc"
+	if tc-is-cross-compiler; then
+		tc-export_build_env
+		MY_HS="./hostscdoc"
+		emake scdoc HOST_SCDOC="./hostscdoc" OUTDIR="${S}/.build.host" CC="$(tc-getBUILD_CC)" \
+			CFLAGS="${BUILD_CFLAGS} -DVERSION='\"${PV}\"'" LDFLAGS="${BUILD_LDFLAGS}"
+		mv scdoc hostscdoc || die 'Failed to rename host scdoc'
+	fi
+	emake LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}" \
+	PCDIR="${ED}/usr/$(get_libdir)/pkgconfig" install
+}
diff --git a/app-text/scrollkeeper/Manifest b/app-text/scrollkeeper/Manifest
deleted file mode 100644
index 4f3e0061d3db..000000000000
--- a/app-text/scrollkeeper/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-EBUILD scrollkeeper-9999-r2.ebuild 486 BLAKE2B 8b2576d33ff59d44ea1ade106f476e8535f185d01dad7b19597e502160bc61256fa0761228922661e3ef1ad0efcea451a124faa34ba29bb4ea704d154c6eede6 SHA512 ce09195a489eacdba52610b621f54a8d3cc2a66600d31f490eb4dac69881dbe9c7d3c75b951e2f262dfc2ef93af2c1f01f39104faa1fb0dab9cfa75060169ca3
-MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/scrollkeeper/metadata.xml b/app-text/scrollkeeper/metadata.xml
deleted file mode 100644
index 39980802b1da..000000000000
--- a/app-text/scrollkeeper/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>gnome@gentoo.org</email>
-	<name>Gentoo GNOME Desktop</name>
-</maintainer>
-</pkgmetadata>
diff --git a/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild b/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild
deleted file mode 100644
index 3367ac85b1d4..000000000000
--- a/app-text/scrollkeeper/scrollkeeper-9999-r2.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="Dummy scrollkeeper for testing rarian"
-HOMEPAGE="https://gnome.gentoo.org"
-
-LICENSE="metapackage"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-DEPEND="~app-text/scrollkeeper-dtd-1.0"
-RDEPEND=""
-PDEPEND="app-text/rarian"
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index b1680c4649ce..865095c46a4d 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1,5 +1,5 @@
 AUX sdcv-t_interactive.patch 324 BLAKE2B ecdb0d89c4a26050927272f244e43b28e945e3ef5cb93167eaea7c09912e504af2061ec34c2b5f5a32665c784093e2d35ed92e10a00824b619da71e53049e5dc SHA512 9067330c6fa95910b5dd67716c9bc378d29a9ccc5d60c1eb0c1aca12e58478ea381b91c5122c1951bd2f4c9e8b629243ea885bdbbc87a2f88174340919f5cf8d
 AUX sdcv-t_list.patch 588 BLAKE2B ea7106246204d2c18eaecdb05e4bf7a9c1d12d0ef6e1509591ad5afcf529746a6ef3f4a5051add8923c399863f8b56c3144c9d758b7fa2215b6b593eb1e2b305 SHA512 7a2f8fc105988ce6847ce533051ed65ec49b2ac1ffa4ec076a78be59d219d8c18aee7170d965dd429b95b193bf5a4608d20002e9fa58b6abfa5b972bb6879f94
 DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00 SHA512 8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb
-EBUILD sdcv-0.5.2.ebuild 1582 BLAKE2B 509c6433aeb10d633bf9aac30b5f8b4f41d8021b09cbaeab9ee3ca0993af19f12641a388432a767c69bbc114950acb28848942115e27597c41d499347f7359dd SHA512 69ed0bf1a33c915c39ea98fd24b5e148051d0ad8f401848c097246c1fe17fa5bcf6aaaefa244013abe07013bd97206fc33f4ce002e6dbdabc0290af1e9b5a09c
+EBUILD sdcv-0.5.2.ebuild 1609 BLAKE2B 9f3eabd561d63a5d2255cf2efb30d9dbdfe792a65a0c1c6e69be45330e4b5cfc2157bd3d0ea1ea92265b3fbc288c0bad6ba5b9130eecae88531e6bea991ff118 SHA512 6cf930c6fad804bbd6890265183a6c1d2db122ac953f52726cd42f3b223f11a2ba921b81d0935a4a984e03af7a15bc37d700c48571dde050232a255d8f1cd9e4
 MISC metadata.xml 528 BLAKE2B 56e25a716843e62cb0a90bb7e75abf3811dbbb38c5c91a4153d5b340c355efdd4db771a815b116650e696b637deb4dc42320e0300d903ddbbc9b124b57934071 SHA512 0128fc0c89045f17ca1dbd13e18d2351dbcdc7af76451b80ba586ad223025c8c96f9100c09db5857e88f503534c6d699e649bf68c1bb3e23c6972ca2e5536c99
diff --git a/app-text/sdcv/sdcv-0.5.2.ebuild b/app-text/sdcv/sdcv-0.5.2.ebuild
index 59a8f62a0b14..fad5dbbdeee0 100644
--- a/app-text/sdcv/sdcv-0.5.2.ebuild
+++ b/app-text/sdcv/sdcv-0.5.2.ebuild
@@ -16,6 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="darkterm nls readline test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/glib-2.6.1
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
index ead2a3f3f891..ab0f94de8b31 100644
--- a/app-text/teckit/Manifest
+++ b/app-text/teckit/Manifest
@@ -1,4 +1,4 @@
 AUX teckit-2.5.1-mixcflagscxxflags.patch 534 BLAKE2B 98c7ec0325821d6fc8ed4952cce4ec38233302c25e0b6e4157c357693c16ee756c553347cf70aa1381315e0bb1c721e3e423ec6855a5c80fd2a5a298eaeb62d2 SHA512 7b76d3ebc6ecba24a7cd6469b47b35245e73d5c02a32c67a6205434f8c4b73ab6f1a77d0f8cf95081c4b441e876a2d62a1c276f69171d4f9f4679ccccbfd1c87
 DIST teckit-2.5.6.tar.gz 2500800 BLAKE2B a41c51e80b558d9735be782ed655fe36ec673180e559a3063c3b78ece14e470e194740f2039863a6e7a12e006c2314c3b73eff5de4d289c8eca1b6c9744f1e0d SHA512 d3462dbf22658de85fd718c43229259c460730d907226435195742f1ab65accc4ec83f7b6cb32a0e99fa12ddb7f2b7b5f2598c8853636aa5b31c8592ed9b4745
-EBUILD teckit-2.5.6.ebuild 1121 BLAKE2B 7c7766f9ff169a4a71cf29bc909cc377fcbf8ebb1bdf4e83db37bb2447cdff03e36f4a504402f8ec8f2d08b1997b1a49ba85c154d378bf209c3e44126e760cc9 SHA512 bbf93231daf7188eb385a0582547ec3b95b8734a727c1d69ab18acaeb63918d42069a13c779ad8d78775216025f4235612c9badd15e6783aeb618ccd262f5884
+EBUILD teckit-2.5.6.ebuild 1114 BLAKE2B e60a0f40710b941616f2b39f687969e36e96157590037d0d6ebf15c1e70459e50fb05a78e88102fa9b42de370460ae148daef57daef3c381c616f71d62701353 SHA512 0250028ac87cd2db74e717a1b2c0c8ef96d27f2450b09415fdc53867a5de72921eb19d927223372ab5790a0d359305405dd8c0bf24efad20a311941c81b66836
 MISC metadata.xml 328 BLAKE2B 55a9af22d43fe5270c143f0bdd0fdaa5bf58665a47c6386b83611071a25c8e41e0116bd48c3b6ff051b51e28f9f0bbbb1d09a97939f03df5e367a352c99b6f09 SHA512 f4ee21269605eb831d9a6cbe639da9f2bf63aa14ffb69bf41b7fa4304e4680f5e11ff9efaf30b63cbe0f3708468af19c5412353dab4af8d9a49e6f845a2b7f67
diff --git a/app-text/teckit/teckit-2.5.6.ebuild b/app-text/teckit/teckit-2.5.6.ebuild
index 868e68907d9e..4988e808f6d9 100644
--- a/app-text/teckit/teckit-2.5.6.ebuild
+++ b/app-text/teckit/teckit-2.5.6.ebuild
@@ -30,7 +30,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die
+	emake DESTDIR="${D}" install
 	dodoc AUTHORS README NEWS
 	find "${ED}" -name '*.la' -delete || die
 }
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 5451a14ba451..0df7faf6f102 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -156,5 +156,5 @@ DIST texlive-module-typeoutfileinfo.doc-2019.tar.xz 756 BLAKE2B 00d7c631ba681599
 DIST texlive-module-web-2019.tar.xz 524 BLAKE2B ec134eb2d40143e1f45a076e05eafa25f991568c53cef0d812be7415f8979e4da38ed14ab9c6d97f3b2aaaf62720816822939d4e79fb7a18ef77f0025317035f SHA512 0d2d771e8452d67278adec061e1df8cfc06f3af729ea5ae7849acd5fe1b628167b18d86b1037484dbb6b20d5f703bba7ba9fb255788becc53ce22fd87f39ca7b
 DIST texlive-module-web.doc-2019.tar.xz 41588 BLAKE2B e0bb24840f72cf3b8a2b2d314fc82ca124d09700cdce32a4472b69963b0c6d6b1287b573018fa2b4698a3ce6594398031db7becb5b7c09db2fb0f9a7e893e038 SHA512 5647beef7b99a3a552b8f55d12ef669481e8ba3e01beefb014fb8e3cae6e8f419862131379b506ab8197e1717d563c34fa81d69db3c6db8107e6167447d87322
 DIST texlive-tlpdb-2019.tar.xz 2079308 BLAKE2B 5673fa842b129208a7ec027a0b0a097e7b29eb8baa019371e20444dc4386859144e0c88125e0f085a57812fabf41af1a146a8d66f6eb9e4aefe49518c95590f9 SHA512 024c8cbc65b3bf4d3cba7f527bcf5585c5304c88508d03ff8cb14ffd3a10a666dd58af6db2fa58fad2b1d30ec9a1f03f31fc2486526ecee338dcf46aea8906e0
-EBUILD texlive-core-2019-r4.ebuild 11250 BLAKE2B 4961ac6eb055e45afd84c07f231884fb6a19cd2f9f84b5f53a508f6ec2a7fe364f7e7679e92c41d48f94622e387006a164be2fb13623785ea440ef86965c6962 SHA512 c871962fa65f795b2707438489d7054ecea3decb6930c6154126df9d7659c3f83c4c594e107ff7febed1698c3e3bc5a3acf2115b461f98eeefda0b65a9c4f37f
+EBUILD texlive-core-2019-r4.ebuild 11203 BLAKE2B 223fe9c011e12bcbbacbea22dc97a5d8633d593cd9ff38fd2376c51784f24c6cc4d9db8d12a0c1d87afaadef15c03d91cbae12ce60d64065e20db6020e83d700 SHA512 1100efaaa3bbfbf9609b2b5634457ef58a3613d595a73440beef7efa4be87cfe016b2d79fd0d2a3bc5c5a48502ae3f66501d610439fc7c720da8a85543f13cd0
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2019-r4.ebuild b/app-text/texlive-core/texlive-core-2019-r4.ebuild
index be0dc8606b4f..ae11755e6dd6 100644
--- a/app-text/texlive-core/texlive-core-2019-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2019-r4.ebuild
@@ -83,11 +83,9 @@ MODULAR_X_DEPEND="X? (
 	)"
 
 COMMON_DEPEND="${MODULAR_X_DEPEND}
-	!dev-tex/luatex
 	sys-libs/zlib
 	>=media-libs/libpng-1.2.43-r2:0=
 	media-libs/gd[png]
-	>=app-text/poppler-0.58.0:=
 	>=x11-libs/cairo-1.12
 	>=x11-libs/pixman-0.18
 	dev-libs/zziplib
@@ -96,12 +94,12 @@ COMMON_DEPEND="${MODULAR_X_DEPEND}
 	dev-libs/mpfr:0=
 	xetex? (
 		>=media-libs/harfbuzz-1.4.5[icu,graphite]
-		>=dev-libs/icu-50:=
 		>=app-text/teckit-2.5.3
 		media-libs/fontconfig
 		media-gfx/graphite2
 	)
 	media-libs/freetype:2
+	>=dev-libs/icu-50:=
 	>=dev-libs/kpathsea-6.2.3
 	cjk? ( >=dev-libs/ptexenc-1.3.7 )
 	>=app-text/poppler-0.76.1:="
diff --git a/app-text/tkinfo/Manifest b/app-text/tkinfo/Manifest
index 8b50b895fa06..83ca7991561d 100644
--- a/app-text/tkinfo/Manifest
+++ b/app-text/tkinfo/Manifest
@@ -1,3 +1,3 @@
 DIST tkinfo-2.8.tar.gz 56234 BLAKE2B 6351a8c3ee46092a5c46db147006cb462882cc9abec11f49f07f4f4b50888be6537625a0756a8f05837c21d769345e39837f650ad3a6488713adc304880a3674 SHA512 dfce278a1b33eebcebe3f6f9b5885a8c247f3181d154bc35d8b6d894f1f33043e9e40dd4c8dc336fa100700883295e8a648bece6f04ee556d4fa2f69adaecb76
-EBUILD tkinfo-2.8-r1.ebuild 581 BLAKE2B 74ec00b423d73ce6140478228c1377850a345696580acba2dddf5b0250eac222b874d61bb2bcf8a7f3fc4ac9066c369afe6fc2e5ae0ec1f4afe3fa82bbd3ace0 SHA512 eec40f40b689952b707230a1278594eefac0624e3aa4727f86b5607f082daa598c72f09735fbf92b8915c33efc897b253fc1f7305cf1a400584d218439996faf
+EBUILD tkinfo-2.8-r1.ebuild 576 BLAKE2B 8775b69546245ba882d10405a2c68008168c8800d11afbcc2342e2e0166b4187608e97df3cb31406587d59baa82c618baf7d13ef77bfb5fbdb75d2e379590fb6 SHA512 db60db2ae3495cf7195d83ba8d308d4dd268ff2b26daeb5414cdb34236505b30bd9b961e2295f342452d6786c5b3276a60531d2afa3de272da15f64fbca8c7f4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/tkinfo/tkinfo-2.8-r1.ebuild b/app-text/tkinfo/tkinfo-2.8-r1.ebuild
index 517f9ae82166..5be2e0b8d9b7 100644
--- a/app-text/tkinfo/tkinfo-2.8-r1.ebuild
+++ b/app-text/tkinfo/tkinfo-2.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,10 +7,9 @@ DESCRIPTION="Info Browser in TK"
 HOMEPAGE="http://math-www.uni-paderborn.de/~axel/tkinfo/"
 SRC_URI="http://math-www.uni-paderborn.de/~axel/${PN}/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
-IUSE=""
-LICENSE="freedist"
+LICENSE="Old-MIT GPL-1+"
 SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
 
 RDEPEND="dev-lang/tk"
 DEPEND="sys-apps/sed"
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
index 77f1cbf07ab3..ed8f6c1181be 100644
--- a/app-text/txt2man/Manifest
+++ b/app-text/txt2man/Manifest
@@ -1,5 +1,3 @@
-DIST txt2man-1.5.6.tar.gz 16293 BLAKE2B f62836aae1d7c1539ca896ce10a404965ba1794bbf06448693b2f138a28e74c69912cd1e693fa1e6cf9402f703decdd6b76cffd8d63276ce313d075a26cb3fb3 SHA512 dd1cb5a6385d75b459fb61c49e0b73e5cafa5af8b11d9b89e5c206a9c5b65e4daac4d0e768c28963aacde772b715cb11ed0e843e42397b2df894a1f68c70ca65
 DIST txt2man-1.6.0.tar.gz 16941 BLAKE2B 4ca7d13bb61b0b65ff47a6a6f37c5035910804cff71f0c6d848105d7ee9b8285fd6433fe019fc075a5b28769df5044a462296ad63514d44a75abc1fa552b64ba SHA512 7ec2cc0bb685d890cf06504d4faacf7a02c5a321963effb71ff63b7310f64f092e666c055c1dbdb699958a62272fe4dc0f31f3947ca6895aa425753a11b75379
-EBUILD txt2man-1.5.6.ebuild 563 BLAKE2B 0d6cfdc51527745c1ca52eb32d144a222e743f298557d25e2926009a9e05c884f3734b9a5a32b1d1d43c2f9eef184fcda4a875c5f2c2cf51b55b2ba8cf02b419 SHA512 c8336a6c3b8843ce7f56c3ca0b434ca754c79c0a86b401493b0635bc664dd51456078a426e45f5de542064b8c7a58faa1c1020694dce4351ca2020b09ec26837
-EBUILD txt2man-1.6.0.ebuild 618 BLAKE2B 5747acfab2f06b2fc9c112421d1edb3b9e9f562f68369e0e0d2a0cd851cf35c54a43a7d556d32a4a98242c139d28b5d30da8297243a4133c93be0da2c151c2a7 SHA512 3e5a7f816554589b1f05afa45952ece830f712dcd0f2ba65fc82c03e9d35def46bd3f7b575930487e84881829bb20ae8f89ca1155e09cd15912a75f629dbdd94
+EBUILD txt2man-1.6.0.ebuild 607 BLAKE2B 844975db6865e85d5c4f590b3e02ac40b46bc32b901691cdb66c91fa700370099b7cdbe3fb0cfc3e96aa9cb3741b635a5125155e2478269b023cc38455f139fd SHA512 10e24692220d46e7ff209be118b0852e84ec90d495c3429833417fd04d1170bc2d7a34d94c2c96b454c73e73169de6e4fdf4e4d7eadbeeadb22ef78b12a51b40
 MISC metadata.xml 308 BLAKE2B ed6f6f83ed571ef3966c646eb0b58cb8e711f9ddce51fe8e97e0a961c5d2c88fbce7199308f5460005a393ae8b1854037e152d81290e97aba71465d96cc67159 SHA512 bf9580b121de871786c26826a398b5e0c5108b61da60fbbd797a6ff58360f7c983541574bddcf4ee8809ea0ca603a4bb1ace88e725484227fe810a44608ed51b
diff --git a/app-text/txt2man/txt2man-1.5.6.ebuild b/app-text/txt2man/txt2man-1.5.6.ebuild
deleted file mode 100644
index 5f29e5cbf37f..000000000000
--- a/app-text/txt2man/txt2man-1.5.6.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-DESCRIPTION="Scripts to convert regular ASCII text to man pages"
-HOMEPAGE="http://mvertes.free.fr/"
-SRC_URI="http://mvertes.free.fr/download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
-IUSE=""
-
-RDEPEND="app-shells/bash
-	sys-apps/gawk"
-
-src_compile() { :; }
-
-src_install() {
-	dobin bookman src2man txt2man
-	doman *.1
-	dodoc Changelog README
-}
diff --git a/app-text/txt2man/txt2man-1.6.0.ebuild b/app-text/txt2man/txt2man-1.6.0.ebuild
index 52ff0bcf6dc6..d429afa2f5a0 100644
--- a/app-text/txt2man/txt2man-1.6.0.ebuild
+++ b/app-text/txt2man/txt2man-1.6.0.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"
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="app-shells/bash
diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest
index 22dd79de3f09..973ddcfc16b5 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -1,4 +1,6 @@
 AUX 51txt2tags-gentoo.el 214 BLAKE2B f5c5aad466fbc7eaf1ec36dcd4a52a914f1710f10fdce35640391ea4d9599903574967c1a7ab63c66f84ade4443f256d1bc197ec8179a6c3af75f1ec79cdd404 SHA512 e2a76d355c2fb163fc5c9b8013e04240206c8301fe2351fbdbc53d711625121e22cdeb2336488e6bffc355258a6d5dacbd48a2cec2d618dc4db17eebf0496feb
 DIST txt2tags-2.6.tgz 544724 BLAKE2B 9c8c37c6e003c7252276b32bacd373fe9143fdd93fdbc2bf0c23a83e2123c2a9636be5f106d248f2f0ecccd71eb9bc68cf8343557f10a7e6f8deacd8ade975ee SHA512 716e975f45dd304b6fd7d4e5aa8bd12e57c54120d892ae9abe11f1f3b5aeb747d8df0a9ffd34b8b5e6c8d422aac8830477f9a332c9e94040e1aa9946ebfe051e
-EBUILD txt2tags-2.6-r1.ebuild 1674 BLAKE2B 1fd20e256fe9de78c6b5c22e4a29687f7d22d80d25fa528a8f8bd75963144ccf82cf17ecc297e9e56b4f1053ba05b0ca3b6e4c56275694e3e9036a501e7abcea SHA512 a7d13cc9c8ea534b6c1b805051cfa937a379c9f916207be3dad7d86e508afbccf881cf2e5f464652e86d73d59aae3f1150b73fa7f9531c34f6912b3d5694fd69
+DIST txt2tags-3.3.tar.gz 261417 BLAKE2B 6070c23faafc9283e48efdab165c9a0050703d5d04a5ce557afc693161af5e1105435ddb9c991c0e8ef5dbd1e6d25f77c915e8be3f349b790636c904df7553f3 SHA512 a52de3f5226d85af006304a9063b5dd01df2627a45670a91b954f758cb920648f86699acab5cd7822c0183e93eed110ddc7dd8d156b0eccbe1541e7fbc2bdb22
+EBUILD txt2tags-2.6-r1.ebuild 1660 BLAKE2B e80ea10e868c318ff82ec4484217a2c95a23b9ad47e5646fce0baabdf8ff2f1498a69cc25e8ee8c97baf3ca653ad9e2822904c813aa28770614b4918b5185ebd SHA512 70d26497c0eb36efbb652af56705b179c206ffeb4e2498ad3b2d382966b2058aadc39804787937bdf77201ddcbd5720ace1551e21bbf1514b242789525ebf420
+EBUILD txt2tags-3.3.ebuild 519 BLAKE2B 60f010af5ab4ad0049844a005bfdbe93f4f7e198dfe4762f546f83f6de4dd089d7d7b3db234b102ce15c23281285c32dbc3b05b5030ad90b3aa628063138c434 SHA512 00c3e08f27b8d3b852891107f4caf889348b14add838feb03315ac8b444f4be945032eae8f674bc071dde629e4593aa698f47fd1d4c1489554a59eda910a0f01
 MISC metadata.xml 335 BLAKE2B 1852f3f02279c2d959ef2b886fa75f51c98771cf190057de977b730aae4c23941efa4b409b15ff3b859892484bcc559d8467e2b53a815b346b1165ac8af8621c SHA512 257cc7e9d2137e94fdc9d133133ca92b688ac2475a59dd30e1e0b4d548ce399cbf73cbe986f0f816c4be1f84668104e4e90f1257914512987aebb06697282b87
diff --git a/app-text/txt2tags/txt2tags-2.6-r1.ebuild b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
index 701f24a7853a..a1ae6ff89610 100644
--- a/app-text/txt2tags/txt2tags-2.6-r1.ebuild
+++ b/app-text/txt2tags/txt2tags-2.6-r1.ebuild
@@ -61,11 +61,11 @@ src_install() {
 
 	if use vim-syntax; then
 		insinto /usr/share/vim/vimfiles/syntax/
-		doins extras/txt2tags.vim || die
+		doins extras/txt2tags.vim
 
 		echo 'au BufNewFile,BufRead *.t2t set ft=txt2tags' > "${T}/${PN}.vim"
 		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${T}/${PN}.vim" || die
+		doins "${T}/${PN}.vim"
 	fi
 
 	python_fix_shebang "${D}"
diff --git a/app-text/txt2tags/txt2tags-3.3.ebuild b/app-text/txt2tags/txt2tags-3.3.ebuild
new file mode 100644
index 000000000000..f7acea59b38b
--- /dev/null
+++ b/app-text/txt2tags/txt2tags-3.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup"
+HOMEPAGE="https://txt2tags.org"
+SRC_URI="https://github.com/jendrikseipp/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+IUSE=""
diff --git a/app-text/unac/Manifest b/app-text/unac/Manifest
index 7c53695d62f6..4b39ee039540 100644
--- a/app-text/unac/Manifest
+++ b/app-text/unac/Manifest
@@ -1,5 +1,5 @@
 AUX unac-1.8.0-automake-1.13.1.patch 950 BLAKE2B 41be5811b494475d0927f6dc8a3581a4f39d15c6bd315921674e8653c0c87bf07b85e9d72c6ef3cae6463852a78b5f084b4a193ec1412369a818b04737f57f2e SHA512 f6f29885b937b4e3dc21379e1e5d81229de9f1a400d24f3ea83a8cd06db822b0dc7bb8fb1dbfce27aac6d2b83834fe7fe15cdbfabfb6d82ee6311079fe7807f5
 AUX unac-1.8.0-debian-gcc-4.4-bug-556379.patch 1454 BLAKE2B af02bd996b41651305b7f958adf87a0901be40b39312951ddfec4b0c973fa95626de115ed33d0ac609a3ef8b1f97e8673fad3c5d6ef09ac5f2744ef415c8609b SHA512 40294181f611a047c25900235d35b231e4026ff0a2759f90e3b74b0b93c97f64162803bcdfa4041652fe39421291248d189046f7e993d0a88606f4e240d04b7e
 DIST unac_1.8.0.orig.tar.gz 281807 BLAKE2B 1c566d75eef70b37cc6e8d4840d5712783ec01e2cf6ed5dc39a10b5da2af2c35928b62a1e6592bae1bb21682c3a0410582158661b4989f0ecbea80220bd256d9 SHA512 770508daabe7f1cf2fdd2c7cb0f88ed6363a091320547e1f5cafc32db6506c18548be98f6c5780757f3dc914c372a27a336865a0cd92c0a5503245fbb25ca3c8
-EBUILD unac-1.8.0.ebuild 1147 BLAKE2B b5c373eff732bd4533b6067caccf6ed1a47cf6e8b3a5af1d46a80ae983c30364ffdadbf5e4798a3d9953963faf2c6f8ab502e4635a1c3495c5853d524ed5caa4 SHA512 43c2ee5eb87b078d087b5f711ad5d8e4265b5dabd28f67ec47c727cfe292c5501d7f0bd2c548d8346bd5a8f52ca9a3ee34b6aa6a7f33103301130dd7d1bbf3b4
+EBUILD unac-1.8.0.ebuild 1171 BLAKE2B 8b5a9c2fcdcb36897b2c872f868779d61594ce3e436d381588a072698ee1b508aae1936e42126e68253d6a3d988f0f696b026d76223deb2c118017f3b21c17e5 SHA512 78bde946af0b15b836075093f2d0d93b031c4fa1071fcae697c5e6940b80caae970d5418c4c62f3e5e404da93b757f39ace4154edd1344284e266ee80ed35c60
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/unac/unac-1.8.0.ebuild b/app-text/unac/unac-1.8.0.ebuild
index f5dfcb76a2fb..72fcf4f08e3f 100644
--- a/app-text/unac/unac-1.8.0.ebuild
+++ b/app-text/unac/unac-1.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,6 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="static-libs test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="virtual/libiconv"
 DEPEND="${RDEPEND}
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index 94e9aafafb7a..ebb8becaf430 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,4 +1,4 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-EBUILD wdiff-1.2.2-r1.ebuild 863 BLAKE2B 7c437cd06cc63f44f19293a1cc3f3f38abeb70488d82b71eb4cfb288bf64c580418d82e769886d04c10f8f5217b12460d8e80c83d47c49d329050813db06d524 SHA512 0bb87eadca4743acbba9e1db1b25e2c9610f528d6a97b4570d94dc5e58104a6bcd27318bda8c37a3e3f64a8ce6700210e22c09c06be7b4f18a1bd214d29c91ff
-EBUILD wdiff-1.2.2.ebuild 829 BLAKE2B c338db8bfbe6806db40bd6c146716e00df109795ab86529cfbaff6c7caec736846888fe15515e6e7169caee146fa8f7895d0f7513d5a172eeb2bdeaf794df9ae SHA512 c2dea5404dc1808081ee6354a5827e010aea9c448d537975966badee4cdc65b7eef4de991dacc46db1ec7ef16961fed54506a89e93235e3a69848261745faec0
+EBUILD wdiff-1.2.2-r1.ebuild 890 BLAKE2B 6166cd255032106697bcec4ddb6d16241eec5bcc4acdea7a35168e53e562171d34603c2553d332a7d0b461e7a61935596abf05c0bbdae4ae7b0fd0f7f8f1e081 SHA512 c775b29778cfc4084f41cf7946b99124587d27204e255f85aa48e3fdfa79913b123246889e8ca0f030b85b2f1fd1e937fee63f559a2aa1f8fa25f5d1bc1dd8c0
+EBUILD wdiff-1.2.2.ebuild 853 BLAKE2B e729b5dbf7752805a08647969d011ae47269ff25c04119097159d6e3dc770d76ff35719aa59ac0481b9f87a96d0cf3547c2d4b94f79e5bd856688585efdd4e1d SHA512 56414d56a2ced3b215e565454ab9acc31c6e40a38b4183b364c2436c80d05307919f31c16e50829461e5af7ecaf27b8307c225fbaf1fd07c841af98332e69f7f
 MISC metadata.xml 377 BLAKE2B ddada9afaa9d6031b4493ad27870959d71c7ad7852399b36468f41c0c11dbd591e0809101927d82a4f80520562b1fb8b65d577086218cc922a7b0e03b761005a SHA512 675191d217533506137aa85c390cbcf2c9683157b451c862701b5ab59d3ca437266243af0cb458f7ee5150fadb444a7eda648091eaa8b4f7e211e0bd98d92c7a
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
index 1690a2a05365..b1cbdec41d11 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -11,6 +11,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="experimental test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-apps/diffutils
diff --git a/app-text/wdiff/wdiff-1.2.2.ebuild b/app-text/wdiff/wdiff-1.2.2.ebuild
index 3dc14fe01f8d..da067814bd80 100644
--- a/app-text/wdiff/wdiff-1.2.2.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,6 +11,7 @@ LICENSE="GPL-3"
 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"
 IUSE="experimental test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-apps/diffutils
diff --git a/app-text/wklej/Manifest b/app-text/wklej/Manifest
deleted file mode 100644
index d852a0950332..000000000000
--- a/app-text/wklej/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST wklej-0.2.1.tar.gz 4370 BLAKE2B 616126936c37f8f727167745eecca27b7f1ba844b7396bbd2c205c804c90c2632dddb1b74bd9d66cd040c7eaa9a8e179281372b96eeb6d3d8f09ae27250563c7 SHA512 3799a1570f0cc7f1005f69484ceb1c6c88c8a24933beb3e32c0acd758ce29a5a1b6599baeea2b6405ec2da1e4fcb25b2d218b8295c68fa811fa4d53ada96cf0c
-EBUILD wklej-0.2.1-r1.ebuild 761 BLAKE2B 0b80121aaed2d97ac7e179c25005a685fc8c71db045e4bc1bdd12bb9b54d2013fddb26f46b9d068f217fbe4f9bd3ee9d44018ea6c6dd82345e186cf7e467181b SHA512 af54630f519243c7a45f0d93062761ad907b3eb525313e3fde0d0a93606c4a68428bf7529cacfa7a359473cb8496bac4d48060ed5175646aa307e62437a43e13
-MISC metadata.xml 349 BLAKE2B 9abac59717642921e8f8e3c38865b6fb76d96a1a98a60f5947602d6b66719785eda7629d01f3fe5aea22e8ad3a4af8829e53861c5cff3140acd94a055adfee10 SHA512 b65a626f1a38f94be7617bd3b46819425724097af5536d5378372574ace10d96fc33f96c9ac52b480b4d9e3a33ab63b9b127737d6d0d2e9e02013fd3d0d826b0
diff --git a/app-text/wklej/metadata.xml b/app-text/wklej/metadata.xml
deleted file mode 100644
index a6ba9840e60b..000000000000
--- a/app-text/wklej/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="person">
-	<email>aidecoe@gentoo.org</email>
-	<name>Amadeusz Żołnowski</name>
-</maintainer>
-<use>
-	<flag name="vim">Install the vim plugin allowing to paste
-		through ':Wklej'.</flag>
-</use>
-</pkgmetadata>
diff --git a/app-text/wklej/wklej-0.2.1-r1.ebuild b/app-text/wklej/wklej-0.2.1-r1.ebuild
deleted file mode 100644
index 1fbdd5b27cc5..000000000000
--- a/app-text/wklej/wklej-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_5,3_6} pypy pypy3 )
-
-inherit python-single-r1
-
-DESCRIPTION="A wklej.org submitter"
-HOMEPAGE="http://wklej.org"
-SRC_URI="http://wklej.org/m/apps/wklej-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+vim"
-# the vim script is python2-only...
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	vim? ( ^^ ( $(python_gen_useflags 'python2*') ) )"
-
-DEPEND="${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	vim? ( app-editors/vim[python,$(python_gen_usedep 'python2*')] )"
-
-S=${WORKDIR}
-
-src_install() {
-	if use vim; then
-		insinto /usr/share/vim/vimfiles/plugin
-		doins ${PN}.vim
-	fi
-
-	python_doscript ${PN}
-	dodoc README wklejrc
-}
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index a3bd1709baa0..0be750094d88 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,4 +1,4 @@
 AUX wv-1.2.9-format-security.patch 336 BLAKE2B 18641a15c75a32250012771bd8ca8b0739f503ef8d1d2eebe23f2d378996aa3f6e2f0cfa72f8077add3db33f8ece86c57e80cc5b868719472b45ba1bed10a7d0 SHA512 99fef3bec0f129ae2d138c50d1e3e9288d5309db87a72d9b1970d1d230e20be3469b423f0b74c5083a0a5cdca8fed0b2ca32ec1fefdca22f213e4a02a6bbd405
 DIST wv-1.2.9.tar.gz 616256 BLAKE2B 6a6aa6b5f87a934c703c8a74d85af3d7aa84dcd2bc613a3af7fb8d69a9339e71ba2618ae8f725b90c3fe0b0199f4b224bdb32a50c2b6b6614f84b6a14437633f SHA512 ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5
-EBUILD wv-1.2.9-r2.ebuild 1444 BLAKE2B 24c7c7f1025ec40fa175bb8fae6a8c5af968b3fbfa1f8464c3ca092386c64919a165deb85ae41df2cd529c545c810b7dc1f4c96cbf3773d5522f43dc7e5cb23b SHA512 d00de83a1cdcaae62efaf66277457e2b38d00f78d9125b53bb1db7ef6467c60d927df9de84bc9264732fd0488eb2f16d3e417c1f183bc0f779b7b2245e78fa45
+EBUILD wv-1.2.9-r2.ebuild 1437 BLAKE2B 9263afac97d9e1ebc8332392d644ca3ca32098853a34a36fe8fda6cb0807eb96d06408ba12ad3f7a95c1bc46d3760429a5782cc652fc3d70210d584e180ab725 SHA512 d1c7e7fed27797c417b1fcd1d8aa3d738e771ec26530722d9dda5ed96a5a6a0f8a266775fdcd1853fdf731d75b260e301378467783a7ee79f9c62f3795d233bc
 MISC metadata.xml 448 BLAKE2B 2ad03c8351da9b74d3420841cbb63aa4a5f8723bdd698ded80bfbc91f0d7bda75b0f2d671a74882e32f7f7e1b1e3d6bc4f1ff491132af931e5914b853b3ff854 SHA512 f6ed1d52b212ac06af826dea4218cdc3017d2d7e417f943bd14f2f223221da1d8a4401852e4fd8375195a77f4f10465d93b8ce62e3981c41570220b5699e4a55
diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r2.ebuild
index da374a9fc56e..68d702fa29a9 100644
--- a/app-text/wv/wv-1.2.9-r2.ebuild
+++ b/app-text/wv/wv-1.2.9-r2.ebuild
@@ -57,6 +57,6 @@ src_install () {
 
 	rm -f "${ED}"/usr/share/man/man1/wvConvert.1
 	if use tools; then
-		dosym  /usr/share/man/man1/wvWare.1 /usr/share/man/man1/wvConvert.1 || die
+		dosym  /usr/share/man/man1/wvWare.1 /usr/share/man/man1/wvConvert.1
 	fi
 }
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 15f17a879940..12fa632d3014 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -3,6 +3,7 @@ DIST xapian-omega-1.4.10.tar.xz 532952 BLAKE2B dec0ebc7b4de24d6f11ea91f090925c0a
 DIST xapian-omega-1.4.11.tar.xz 533596 BLAKE2B 5002f809a310cfff8b7316c6d1f7fa17f93fd88381aa5ca5de14a443f2b3bfd7f00738bae7b2e3a739a170bd8f454e82f696212fc43282d342946a774b7bfaa0 SHA512 135077e26dc0b0707d1d14c64eeb25db67374b1b7909e9f3e925b10e03b1557263339d2f84c5a82046a159e58a5301834e76e99843d66342666d5694f91ed4f3
 DIST xapian-omega-1.4.12.tar.xz 539324 BLAKE2B 01a9f54dc622699fc4362c3d36a9b529f31c87b6c424f5d55d5dc7e676e8dff895df7e31fa187680afd5eb9e90d65b06d39fc06912b9ae5db8a9e13b694d980d SHA512 2d2c48646f4f06fc4b2666e0901e4f73b2c5da93c4a8e8a5ea6d32e9076a2f18c15c14c7dd2ae2d421a501119ea19b52fe324ad98f9f0bfd6b80f4286721aa2e
 DIST xapian-omega-1.4.13.tar.xz 540216 BLAKE2B a6133e4ac8423f5bbbb67013a8f7a9d936574d8b16dd0adfe42307044e0d0de7773624cd7a7c127bf6cb4bb887ec70a101621ab8077b8918c5b3c83b84b36f66 SHA512 438b015aa554d9a315b1e2a5a2d7a77e0fbf80455f81fc2abc47e7f70d3cb64e4b7811566df2f790cc39b75293de42e2e685dc9df0ac6744763b11216f265785
+DIST xapian-omega-1.4.14.tar.xz 540532 BLAKE2B 193e03bfea5cf7cb5fc5bfca57f80b1390ba63ca999f235a10a7ab9bf4db378273cf6f7f6b3107c80c1ebb44bdb1a94ce3c00585f83ac0bec188163633be843b SHA512 27059d13bbdfc2ee9e8f4f6e74479bac0885cabab97d7eb1ebdc57eacbff1724b2684ba72efdf6d35f608e2e8f0891d47c626aaa100c713f4c2f66f923d841b7
 DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde25402235fee280118a90930888543b2da7821ad7d30143d04d35dccfb0de6c375231f2db4a4f4dcbaeeaf5d4e54045cfc SHA512 895da1e1a3ddf2e5e8576fd41853cc5cb7c6e4f0223a0d25f6303fd01ca26f64c8e41616d6d66b2309a4ca5763b2b20b208dbf6054f0498411f2678422c07893
 DIST xapian-omega-1.4.7.tar.xz 510644 BLAKE2B e2106b07a0ccf765dad25c3e83a745936156b002e638fbd9cbd1fd194f507ad663c305fc4981d72f92a74f645601aa83b1bc3133d10d8d4c308f28657a90a356 SHA512 e7e2c7dfa3e76ccdde103b34aa1b0732033e9f218346a81f1b0b865c6e2d17c356b96a4522a3a2273fb55eb2fbd2dd57e835368771f46c9fb458c0c11329893b
 DIST xapian-omega-1.4.8.tar.xz 521352 BLAKE2B 01d914c0dcd7e8a8cf7ec4b997af49c01883d83a5c9bd1c59da058d3329dab5f517bb4d3aa243a3e47ad36311acafd64505fda1ecf86d3605a38ef70760d8711 SHA512 5d27c03891ff941b23c899b1a293ed9be0129de08ff46156380638408360ea6e4aa2dfb4fe0ffb13726807849802fe8d19f6dc817a52ec5bf50c2bf94ed94c2f
@@ -12,6 +13,7 @@ EBUILD xapian-omega-1.4.10.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b
 EBUILD xapian-omega-1.4.11.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.12.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.13.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
+EBUILD xapian-omega-1.4.14.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.5.ebuild 1152 BLAKE2B 1cdca6a87ec353a468a65a7dc5df903e452128c8df66930d3b7eb651963d211305962cf5b415dca9a56475ff782c4693aa34cd2a91e4d2a444e6a1d2f00b5144 SHA512 540c43a135aaab12509e155b188e17f768d0b9c50a4170f39a29d815532aea4c66c24c65af270c7b906321527f4795a06d325d87b0b67f51600a0da488408944
 EBUILD xapian-omega-1.4.7.ebuild 1151 BLAKE2B 60e49c563df5f5df9b3b29a4ad0aec64c56b045b3bb0f6ac4691d34d46342ae8504a2da8910562cd6dfdd5068b097a9e0d0217c517968f1db9fee114275297c3 SHA512 bd6cc0b52a785d6d205d4faebe6f8dd620623a9c4305da606238bef4026279d6e5c3490c3f398ce51e4fedbf91cb2fd65a1efca8943f8e3ad4ebba829c6e1bf6
 EBUILD xapian-omega-1.4.8.ebuild 1156 BLAKE2B 098b20d7e4f03036303c6a5e63692b0e90b8f64cd9c6c29699e91a4d3d0e795624911546375cb330e8db9aff0cf8962d7392990c1fee6b30c387897c7bd93caa SHA512 4132801108201759b6a7a32eeda1a0ed566c4d9e772df586e174036b9042679ea42fab1f5c80d0d7c8dff6dde4af768f54ca17908e352cba7950a3ee01551108
diff --git a/app-text/xapian-omega/xapian-omega-1.4.14.ebuild b/app-text/xapian-omega/xapian-omega-1.4.14.ebuild
new file mode 100644
index 000000000000..4a7e3ffd806d
--- /dev/null
+++ b/app-text/xapian-omega/xapian-omega-1.4.14.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
+SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
+HOMEPAGE="https://xapian.org/"
+S="${WORKDIR}/xapian-omega-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-libs/xapian:0/30
+	dev-lang/perl
+	dev-libs/libpcre
+	sys-libs/zlib"
+RDEPEND="${DEPEND}"
+
+src_install () {
+	emake DESTDIR="${D}" install
+
+	# Protect /etc/omega.conf
+	echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
+	doenvd "${T}"/20xapian-omega
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+
+	# Directory containing Xapian databases:
+	keepdir /var/lib/omega/data
+
+	# Directory containing OmegaScript templates:
+	keepdir /var/lib/omega/templates
+	mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
+
+	# Directory to write Omega logs to:
+	keepdir /var/log/omega
+
+	# Directory containing any cdb files for the $lookup OmegaScript command:
+	keepdir /var/lib/omega/cdb
+}
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index e8cf47514490..a67fdcf419c6 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -4,8 +4,10 @@ AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab2
 DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f8704d05fa5cae710d9724ed20ca50be9022570832da9954ba2af141a66e5b3ab02554441c84bac1d6ffed SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90
 DIST xchm-1.29.tar.gz 972533 BLAKE2B e114047f4c3e19bb4d4c28a74997c76c54a2dc286f1f0691f105824be693e3b51c7618717b5b5b5f3604ab3f4fa89d703e071a36be0bd05529b6f44710b0bd20 SHA512 678cea2947d58e9b173379d6df809be603ca77431a3181ee45e3c1f4a4a55a6c10a395eecb5c25feb14ad361d044355ae313d537f0abc9278c6e5ab37a8768f6
 DIST xchm-1.30.tar.gz 981171 BLAKE2B 6b2077e9cf8fa849121cee3681bd390218de1ce83c9c49117a186ddef107b15ee8f491eb93ae41ba8a2ea07ede306883ef0f8f0c357142e9ca333bdea8ebc50a SHA512 896d94f4fa3b728e37985b1a2e918596e20bed0a43cf90711d27ebfdcbe49e4a0794c17e1f6cfefb6f272adcc7fb22464e2c25c15d0f0afcbe94b867899eb1a5
+DIST xchm-1.31.tar.gz 981450 BLAKE2B c0c1908332f4d76f2c4dcf64ed713ae500d1b2022dedb5cb0df294fcdd1ce87d5144ca7347d6bc70b43af29f047ee270ffe05f1ee8da2dae5a5e0586c342900a SHA512 b5e1e979948d202163265f99357b361bb78371a2cc7cdedcc2d2c78207466c3f8291f720c92405913c7c5b9f607d3951a8bb3be3ece3ba1f408ceeb79199e9b5
 EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e4033c54c032c438ec91a01ea3dc5afdc401ee0b15d650c8df1fcedd07a0a146c172f1d5cffcd4d8074575c561be SHA512 1e2ea33bb90588ba970930ccd7ab8f4fc696e03e1088dec1f65da5be8f139627cac104d9b53a6131a2c0ad2efca0747e0d17d77a684762967a688fba98016ace
 EBUILD xchm-1.29.ebuild 1212 BLAKE2B a92a0015f18489465890cb9d292aa8e834a732e9d3b13b4df7fff95a42e0a3f2654c0aa59dae7327fd09e1330b5d0d8ab885a757c6fbfdb01227f2c04957c26d SHA512 ae281e0998252802f558ed91ba1ff39ec04144b9b2f6666657bc27d2ed9320a0420cc7ade9aa25cf5846fd1fbb3e4c158c2a4d3f9d164026cbf1fa9d3108399e
 EBUILD xchm-1.30.ebuild 1014 BLAKE2B b78f2480a9fb60cea85e74e185fc69b7cf34b429c53fb4d5a2b02b6287b88d156a29f2229dfa2332d080fbc8fa7b35a6c7165dcaffb60a9da12fb9739b352c75 SHA512 030b6a0e0100e1ba1ab2948eeeacb88fe42aa4d0d40be1746b2fd0a17d90178894a9034d66f8f7921160f2a4052a0e1f85f08c7cf191229f17badcc56ff0ad7c
-EBUILD xchm-9999.ebuild 979 BLAKE2B 237ba16825e09abdf152e072a2fd6db4f596483056a56961e391bb0dc519fde5c27d2eb0293ced5e14f4cda42f5575e1acc2a3c8b4838f062ad020a42f90570c SHA512 5be7614b88a6a2d1b6db510ae78fa2be1e07dd7634479a86593328966b34686d55810c2b07ac7961e13abaa955c55cf37af30587c376d04726fcde6582c38408
+EBUILD xchm-1.31.ebuild 977 BLAKE2B 624e6af9fcc645192601235324dc61af665c23633fdfeb1ef461ea0e30f68f47b9723c0ed80f05aa73cf683b4ce1f37e1ce509966c7aa97b2060a00c24ab87b8 SHA512 ed839bbf9adf445c192518682e2aded1a0a2063f9ff1baa07427121dca675193a8d75ea2c0b23ed999588777a434487e52f1b38e070b6ff1712626c105a96689
+EBUILD xchm-9999.ebuild 970 BLAKE2B 0bee0abacf945c31e9b496be37d5a148639165e475f43e09c18c150da1f4166d915fff896cfffc6ba3823564a8c52e5c1d2d115255f46a31b2b56d50f3f89a37 SHA512 82e21f1bc56388d51e60c84df4ff1bbc4ef3321acf0eea4b5ba583d368d28e9b4b7c7ded1d87bcf3d5768348b9e14b86298950e9e0b3c1ede91c34d08c31f865
 MISC metadata.xml 350 BLAKE2B f6872e04718f72ae186772afc32f65a55ed55f078f53c6b3a8448bffcf006eb65ef1923e98d369af3e9c6fda5977bd148ae13a2d8e32ab2e2a6680a4ec5fe2c6 SHA512 956319a7ec2b136c5a1b38a51ab1fb61f81274dc2898eff1441393ddc4d0c204854093800210b9e44ef214427e4664f61d0ba1c3a8c43d8f21812b55371e3e66
diff --git a/app-text/xchm/xchm-1.31.ebuild b/app-text/xchm/xchm-1.31.ebuild
new file mode 100644
index 000000000000..07a7c38f9ed6
--- /dev/null
+++ b/app-text/xchm/xchm-1.31.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+inherit desktop wxwidgets xdg-utils
+
+DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
+HOMEPAGE="https://github.com/rzvncj/xCHM/"
+SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="nls"
+
+RDEPEND="
+	>=dev-libs/chmlib-0.36
+	x11-libs/wxGTK:${WX_GTK_VER}[X]
+	nls? ( virtual/libintl )
+"
+DEPEND="
+	${RDEPEND}
+	nls? ( sys-devel/gettext )
+"
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+
+	dodoc AUTHORS README ChangeLog
+
+	domenu "${FILESDIR}"/xchm.desktop
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}"/xchm.xml
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/xchm/xchm-9999.ebuild b/app-text/xchm/xchm-9999.ebuild
index b291398e22f6..e47dacf50e3e 100644
--- a/app-text/xchm/xchm-9999.ebuild
+++ b/app-text/xchm/xchm-9999.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
 WX_GTK_VER="3.0-gtk3"
-inherit autotools git-r3 wxwidgets xdg-utils
+inherit autotools desktop git-r3 wxwidgets xdg-utils
 
 DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
 HOMEPAGE="https://github.com/rzvncj/xCHM/"
@@ -25,7 +25,6 @@ DEPEND="
 "
 
 src_prepare() {
-	setup-wxwidgets
 	default
 	eautoreconf
 }
diff --git a/app-text/xml2doc/Manifest b/app-text/xml2doc/Manifest
index cede4b7ac543..21b91ae07d53 100644
--- a/app-text/xml2doc/Manifest
+++ b/app-text/xml2doc/Manifest
@@ -1,4 +1,4 @@
 AUX xml2doc-pointer_fix.patch 627 BLAKE2B 3ca9313b44d88fce3f548874d40ed57b42b9faa66e30574677c911f7d5c9d0a8d5eea8c35781162302543df82c5b38b1327fcaabee0a50c396c95937c3a86e44 SHA512 ebdf69986821fdb1a22e3da4447729433d7f30d08e516b5b28c1f9e4fe6ec98d7a31e925028f940e8a0aaab5c05bd52a1a4d12564fd47a79953b1de606fd2430
 DIST xml2doc-20030510.tgz 53307 BLAKE2B 3f7e44ede6ac0a2ec4762e66181de34ffe553035b54ee302345d1b38a5063106fc4ba65abec042b4ec693b173d70fc4b548ebc942b2a8f6636f84e7beeed2bd6 SHA512 9eb2970b7adef1669b9b0aede2b3d2b42ba234c8294f0f8e6e230d8fcc6cf878675b2f0bff87ee36a255ab29376be844d92d382be7aad0ab11972847cfe49dbd
-EBUILD xml2doc-20030510-r1.ebuild 1217 BLAKE2B 7b48db570d5435d43d48d03e53ee8231aefa570fee8a1965abadfbc0078576575fdeae11af3a0018bc15081cf2455aeb80e22ee49ff56755e763c678e3d0f79c SHA512 19ef01d4a2a2ecf59122073e060ee0b13208a113d3839f71969509cfcef3e12597c37963a77daaa3be5223ec40bc9351ddb583ad680e549354dfc9e36535f07e
+EBUILD xml2doc-20030510-r1.ebuild 1189 BLAKE2B 85aad44ccaee3ae47e8e7e6ffc2e0e352a8b6fe5e3d141bd01bd2be35e55ea84664e4fe86e451218658ad5323f42d41ecae02883292456b947a569ab6c6f2cf6 SHA512 b5faa7a55c0884b083bdfc47ce539a81d4df515b232bc4563ff8a4dd809c886dc9b18c472cca3ae406f872467d59606094df2c59aed5b28d2e3b454fd38b7cc3
 MISC metadata.xml 244 BLAKE2B 6c0f152456a096c4bfbf861d8d7db04d0b8c605deb5f9a3277cd6b60df4a714c77bb12d5e4a491a193da11883447855986468ecf5c707600febbed973253181d SHA512 b4abe1dd13476a480e518e284cb832c2b41893049169975ee44edba8661af79b7cd8f8110e03b920fe90cd8e0e1d926bd5a692a24ecb841bd454659de3422ee9
diff --git a/app-text/xml2doc/xml2doc-20030510-r1.ebuild b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
index ee66dcf4fb06..481bd3d247ee 100644
--- a/app-text/xml2doc/xml2doc-20030510-r1.ebuild
+++ b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
@@ -47,13 +47,13 @@ src_install() {
 	# xml2doc's make install is unfortunately broken
 
 	# binary
-	dobin src/xml2doc || die
+	dobin src/xml2doc
 
 	# documentation
-	dodoc BUGS README TODO || die
+	dodoc BUGS README TODO
 	docinto examples
-	dodoc examples/*.{xml,png} || die
+	dodoc examples/*.{xml,png}
 
 	# manpage
-	doman doc/xml2doc.1 || die
+	doman doc/xml2doc.1
 }
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 8aa129e4f488..56fcb36e230d 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -3,5 +3,5 @@ DIST yelp-tools-3.28.0.tar.xz 210496 BLAKE2B 2904b0ffe50f302d7f0938fecca74b37f6d
 DIST yelp-tools-3.32.2.tar.xz 211668 BLAKE2B b45aef4d03f1954ac33bb05a9c788af40a74d76b54c2a0bcc466098e18435e02eb40004465dda399eb74e986caf404e51a393974d37ef1abeff6d76289840ecc SHA512 c9383426b854ae46ff4587bef07955541de3026f845025f9e99ba095cce11ff307e23d00d07a2da8763bcb6f9f061fc610351170e2abd99b5669912463729a85
 EBUILD yelp-tools-3.18.0.ebuild 653 BLAKE2B eebca2c8369fe16431219fb8a66815fd6246a74d70bf85078bed0685f84f69cb15583209f60653e24eb5fb8c2a498f10407a54bb42ae8f9c374a3613dd2fff95 SHA512 4d5f2c149a3dffb3d10f5854061f2ad35b030a993aa4f02ef43b77a647de7fbe5fee3036b8eef8095cc1a3ed86107b5f62fa0d9a065fca60855b90db0432ef89
 EBUILD yelp-tools-3.28.0.ebuild 632 BLAKE2B 3a0a01ed48e27bb67336da5926e9e25705cdee023272b99bfc18777fd83e46a98bbdf84b253fd85b22625a66f3a2e0f185bccd625faa8eb9b21931dced578879 SHA512 9416cc50f6c4fa52770092f63477b0799d394f25ecfbd418ba715476e39b202325ac67abd03d97e90410316308839fa5b0485d06a9b54011ea26b599b12b0dbf
-EBUILD yelp-tools-3.32.2.ebuild 642 BLAKE2B f9ef83aaa31ba3ddb2f6a545fe1953cc962a5b87c22b07ba54673279daa050d580b8fdcfce6c8bf77b9b7ad1ea936bfd272ec140878edc0f1dfc68782f937665 SHA512 013b643dda6eddf471b0b931a785e92256c434ac379127679c08ed664ca9c673305b602a041ea962149df354e1f13bcbe3116d3518d10a8a96ee9a6e6e0c058a
+EBUILD yelp-tools-3.32.2.ebuild 634 BLAKE2B dcd4e90ce9e1976ac0d6587172081bf9229436a8bd7f7dbc7d03150fc72ddba86e905962c95704bb99f9aa4dcc4821a92e27fc28afaac5d7496097c45aeba9c9 SHA512 6510e48c5aad4fdee41a4f742b26cc5aca2b5fbc0d27e702f8a70b5cbc348977906e5140d457f1b4c6380ea21fc6eccb9ff293f8bed6182a36b1da6479383a63
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
index d4510ed309d3..f8d8b886761c 100644
--- a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 68a043e5d728..3f40d5c19ccc 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,7 +1,5 @@
 AUX 0.3.5-compile-fix.patch 518 BLAKE2B e1e52be08b27459d2125fb44b1767c1f381ce13dfecae02b83afb6bc09db00c145f2b557db0c1515a383ea223eb51c68fdfa32d3effea334c5cddb9af5209ed5 SHA512 7af34317726849aa0eb49b7d7449c23cea1208a72ec1f872bf218b3be9c9b84bb8668523ef8ca0bee9fcdcffa44ba9599ba43f79c88bc3e8811597a91868a1c6
-DIST zathura-pdf-mupdf-0.3.4.tar.xz 8092 BLAKE2B 5e47a9db7fede440c10f8270e02430d2603a93a3fc05bbbcf036f825a534f9083fda3ea536de7b47091aca63409b54a15bec057b7fb3da687507e55efa779075 SHA512 8a885f1faa471d413f09bd6a78b86d419fe433139b2f811dcae9a9ea180beaf693ee8c11c7fe98ed7d5303520f6d9b3efd0d8e7edf978aa5099ef580db79166a
 DIST zathura-pdf-mupdf-0.3.5.tar.gz 8901 BLAKE2B 63595d6a4b305d8cd09eced1cfa3840a5ab3d37a61c42738603691621f1f1dbdfc31d5963b14c7af32f8c504f2470bf1cadb708fefbfd49fb25b2848b2564153 SHA512 1f7a748fee74296a008cef42c8f2e443409c77e16caa8441f74136260aaac7dee4d3c03e8a88532c45a0f9972e1b4965d4cffd488a00123d4d8cee9bcec2cf30
-EBUILD zathura-pdf-mupdf-0.3.4.ebuild 793 BLAKE2B 480774b820e6390885f0a6901fde83b5c7ee777d4921bd4e6a105e325743222c4c8793879249734e33ab2ddb6170056105454e52ed6d358870c7a1f24778d166 SHA512 f0e9fe25289a90e838062f37522255ee6256b04a0deaadc9357f996eb7b8d735903bbec10421c4e985461d4454e697004806a83c756568adca76c54a7ccbdfb4
-EBUILD zathura-pdf-mupdf-0.3.5.ebuild 1017 BLAKE2B c4b9040fd79d9528b07b327ba2120c890956ea7c4ea26145529b85ff7d47592502cf159ea69de5462a1970a6a661f6188bb1ab876cb83000bbe639de00ef6082 SHA512 b11ca0f4f44bc668021f0149f576d8d800942e901dac13e491e26dbe5d8b0cc651a43aa3ef49b20749f3315f82175fc8374f647421cbd5eb84a71277d6b79020
+EBUILD zathura-pdf-mupdf-0.3.5.ebuild 1014 BLAKE2B 7c9c4cbba3522ac96b552bdcc0162e333a213ab4de6f38490af6413d215fb6fd5b714ad804aad9f50aa6ed9ac6a8652bb8fb08926798420b521e2f63236ba712 SHA512 e879efacb15818bf3ca0a7bb0423adda5dabdc1f5354b42ed0d594554cf30c0edbe119aa48192ecdb4b673c46177c4f9272396b3cd17589f33d957eade8f71e0
 EBUILD zathura-pdf-mupdf-9999.ebuild 809 BLAKE2B 848d3a8bd80d7b253fa42f2fa352946cc4f6d6a3da0568f230ee504c6c46c58470fb228e75142313769ddf86cbeadd674a978d70e56b713aadc9f4aa7873c9dd SHA512 b928e7582cd71e4135bc0967f3eea887e9657b41baf83c5b0995580fbac13ef4bc12583029e346b99a15b9a6de99733232f67954033cc6326c1562af9ca92766
 MISC metadata.xml 672 BLAKE2B 539ab88c5ef3fe3ad7ca25d9856bcf6a7755e09c479631c1cbdd835aeb398d2f6052af0980afc35771312397b6858fca2271f5aa8ee64fa8a57130f05b7594ee SHA512 288bfcdc265543b1d5d364af4fe0c6dbdeec0f30019b683ef0bf32619d87ada509cce47c141aac08cf0942f7ad74d1a453e6b5303175ea591e2f661ba044882a
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild
deleted file mode 100644
index 33b1f2deedb7..000000000000
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://pwmt.org/projects/zathura-pdf-mupdf/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="PDF plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-DEPEND="app-text/mupdf
-	>=app-text/zathura-0.3.9
-	dev-libs/girara
-	dev-libs/glib:2
-	media-libs/jbig2dec:=
-	media-libs/openjpeg:2=
-	virtual/jpeg:0
-	x11-libs/cairo"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
-	default
-}
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
index fa515bf718e6..b1b7975e9616 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.5.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-pdf-mupdf.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="https://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /app-text
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)