gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /app-text
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
220 files changed, 2320 insertions, 3721 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 8e65d2aab709..ea5d24a4517c 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/an/Manifest b/app-text/an/Manifest
index f5a7faab4674..4bad34d5d179 100644
--- a/app-text/an/Manifest
+++ b/app-text/an/Manifest
@@ -3,4 +3,4 @@ DIST an_1.2.orig.tar.xz 13196 BLAKE2B bbb19eb16e558f8fc3d331e5ad308611b13a7a88a6
 EBUILD an-1.2-r1.ebuild 770 BLAKE2B f6ac00e6faf8e128ed85f7256fba39e6582cb976640cdc460ed4dee8fb0038b543a3d29e48d6c926cb6c85136626c0adf19970bdef3b642e4c67b88f75462df5 SHA512 618ae33718d53a0702798933fe3ee2c14856f76aee53682ea60c2baddc7c28f4800753cdc1f61a21cc9097824716d1d2237291d306d6642fbdabd4755299b226
 EBUILD an-1.2.ebuild 719 BLAKE2B 89ea6d80bdb55f99dab24ed234bc86ada3ab44202285b5d382c737bc42db8529ee19da1fb5c4f4aa120b95d0829f7bf5d384a5ecb21ff2600d19a358c11c75be SHA512 774b56f85bc3d9812e5824551f83aebca3d08e34e0857030cca8b378f57ab5032d6a6f5f1f0bc6b766df0c2b825b0cf91e30d259e4f6fb772ad374cc4b447d1b
 EBUILD an-1.2_p6.ebuild 900 BLAKE2B c779862faf8e4e49072c63ced71e160dad58fdc5539f291c1ff98693922365bf6ba5a87079c99fe7ce0ed9a68c2a2ed1f45f7096d185c86473e0db0396385f62 SHA512 ce7f2eedd1ec6cfd202e588c21493dbc37110526e1d8de2cdb82022b8b6bdc4906498e0250c1ea4f2fb9d026888161e490eafbe7322d5f20f9ec7108b631817c
-MISC metadata.xml 242 BLAKE2B 719b2221a59fb1ea608b2bab1d89d6694220253a34d1919062de0fd77c3148919ec1ee77a86e3a8699eb8034bec2ca03602fdbcc176784bd7d53e78cd29200e2 SHA512 01fa45ae0901d0f1bbae0a22f72b4c999c24b4718a0a1f7cf8db80ebb29c9a97903246e560ec7e5d5e6800f425b7e32172802206109e67545aa82b2fbac13cf9
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/an/metadata.xml b/app-text/an/metadata.xml
index f5037f14a3cb..6f49eba8f496 100644
--- a/app-text/an/metadata.xml
+++ b/app-text/an/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="person">
-  <email>jer@gentoo.org</email>
-  <name>Jeroen Roovers</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-text/ansifilter/Manifest b/app-text/ansifilter/Manifest
index a592662f3d24..328150e954d9 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,3 @@
-DIST ansifilter-2.16.tar.bz2 441932 BLAKE2B 7a6af4e4b78cd4c26551791b4661a6f41c397a65abe19667f049bd393af0c5e1453a3f7f5f56c7d321c41c2cf36acc05575bb866f5dbf04184de1069d6c64a20 SHA512 ef621087e6d522e08423802d223f826f2fd6fe3b2efd8ed26e09f64e666202cdcdf68d19ebe5ac4b858a4339a8aa4d5f2ba309efa310837808381e09e39d4f90
-EBUILD ansifilter-2.16.ebuild 1016 BLAKE2B 8889822a7d5f469e114971fd0aad097e64ac3b237528d2abec01b36621899220cc015b8193d4eb32cc87e8a049d7cf3c523c0733513b4ce2c978f0aec2c68b78 SHA512 83548025ab5e6384bbbaa3d88bf1a2377b64b17ea9a5bf000a3dda8ba33370f5834210c39a4bad0a93b0bfcd536d9c714b585f15541f838c6c0a962b389e0c56
+DIST ansifilter-2.17.tar.bz2 436116 BLAKE2B 94a1788cffa66343643f48a18748d5359b090803cde723a02bc38f908c262631f1cd2eb150b6a743d66caa04983ea444ba150cf34ce07bdb456979e19631582f SHA512 ab9d590189482f2a27affd62b456c96b947b04d8c8b1214f1ea967971c8ed7df8a7c15d1079f957164d01916d144dcd5dc4b0ac05b452f9f4b8095273d3d3162
+EBUILD ansifilter-2.17.ebuild 1099 BLAKE2B daaf8270898a8c343a1efdee689d8f4449619ed22739a0a12fdc45dd369c4c6520de5dd0b3b5973916f1a80b1a59f9bd244661eb05780106229839a3fd6ab860 SHA512 99579a1b84facba0b5ab905fb1ab643d4c7657179eafeb379c75440d6c7e995954c8b7f11f6d5280171ee60cc8f4df77a2a81e6ba1771a843d6fa48e57bb0c3c
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.16.ebuild b/app-text/ansifilter/ansifilter-2.17.ebuild
index f151d1243229..30c870c62851 100644
--- a/app-text/ansifilter/ansifilter-2.16.ebuild
+++ b/app-text/ansifilter/ansifilter-2.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc64 x86"
 IUSE="qt5"
 
 RDEPEND="
@@ -22,11 +22,15 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 
+DOCS=( ChangeLog.adoc README.adoc  )
+
 src_prepare() {
 	default
 
 	# bug 431452
 	rm src/qt-gui/moc_mydialog.cpp || die
+
+	sed -e "s/-O2//" -i src/makefile || die
 }
 
 src_configure() {
@@ -38,7 +42,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake -f makefile CC="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} -DNDEBUG -std=c++11"
+	emake -f makefile CXX="$(tc-getCXX)"
 
 	if use qt5 ; then
 		pushd src/qt-gui > /dev/null || die
@@ -49,9 +53,12 @@ src_compile() {
 
 src_install() {
 	dobin src/${PN}
-	use qt5 && dobin src/qt-gui/${PN}-gui
+	if use qt5 ; then
+		dobin src/qt-gui/${PN}-gui
+		insinto /usr/share/applications
+		doins ${PN}.desktop
+	fi
 
-	gunzip man/${PN}.1.gz
 	doman man/${PN}.1
 	einstalldocs
 }
diff --git a/app-text/bibletime/Manifest b/app-text/bibletime/Manifest
index e527dba2a744..8e5086300596 100644
--- a/app-text/bibletime/Manifest
+++ b/app-text/bibletime/Manifest
@@ -1,5 +1,5 @@
 DIST bibletime-2.11.2.tar.xz 2533472 BLAKE2B b116bbefaac8106d1f283d1c1a0c4d4c17e67d1cb41066c219ecca243914b0fa355748ebebb23ec88c1749548c853166d391764a454dd77b43c6617072a648a6 SHA512 99e2500e07797549e32ac28238c90a4db1cd98f74ea20f0161db7675127f42363006f20d859504be958bfdecf80a18a96229a1bbc105d332af97644fafc92d31
 DIST bibletime-3.0.tar.xz 1568732 BLAKE2B f1e9cb23d64d566d8b0934cfbdffabb52193f240523ad3ba79bbf0e3cd3ff516354791bf0b057354820cd3303c01d3ec50aa61f2e7843b1083c74d442d915a89 SHA512 85afc2781807345ea8fdefea6d179955fa76085c0a9c97e47321ea37ef9ea05367678c54bacfc10cf1d6085d46ba6fbd1c7d448044ffdfe3c96007ee8d7e5c00
 EBUILD bibletime-2.11.2.ebuild 1304 BLAKE2B 583de78e4e8868c26e509939d2273284db179d41b5207b3ef0bfa31f6abf859031ba239051b4122b42c39fc3a12eb0920786001ee188761fd2422e738e684e3b SHA512 f7b7ffe12fd292e35d910da8323d273c1c69a868ca7a0424f6f97f17f3d0fcb61bb122f3c6c647fd167f20a5f0875166270a3dccd3c0e6985a6eb66936ac2797
-EBUILD bibletime-3.0.ebuild 1468 BLAKE2B b067588a1e999a797ce9d2853eec25ec89319a60c7170dd33cf2a827e40bf3efb2ce6e97f1640cb3c3c517743b9c9060de992aa9d104538e311cf2932f1bf57c SHA512 7c224b59fb239b1ef8fe6ec1683e726691e2004eac2b72e93cbed52eb0a0dc82609c770bc6dae8dfc53783c65214baa28477338aa13c72937185434d8667d74a
+EBUILD bibletime-3.0.ebuild 1466 BLAKE2B 913496634dcfe8e4fa3e3a5bd856d65255ccfed1dda8fbb225bee7ad00cb22f429ba2135cf129d7eaa209dd1910cc316348dd29a7a93162dfc247c916f5d7ef9 SHA512 226d64927296a001d9c8d620c6155daea681c00fd788622f9052d8baad1c3c22b8d2238e93319cbac7c94b5bb7018538f3e01fb5bcac33c294e9a1cd10877b9c
 MISC metadata.xml 656 BLAKE2B 66daf991e55a977a67ff159c7d2bd780308bd580572b8eef8fd5a456cc0932e837c10b175cae7288b0c5097434820b9eb9bdd2b93124f81fe6441e913823674c SHA512 7214abfb4ded4f531e84a2895ece417bb3fe36249fb59ec1d53d231d49d40119c66438931c0cdae79fb4859a70874c3bb03670d554c86f221223530eb12f0bc0
diff --git a/app-text/bibletime/bibletime-3.0.ebuild b/app-text/bibletime/bibletime-3.0.ebuild
index 599fd22e4549..2291044e8729 100644
--- a/app-text/bibletime/bibletime-3.0.ebuild
+++ b/app-text/bibletime/bibletime-3.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Some tests fail due to being unable to find an icon directory relative
 # to ${WORKDIR}, some others segfault. Needs work.
diff --git a/app-text/blahtexml/Manifest b/app-text/blahtexml/Manifest
index 672333f71600..8ddb3e1b7970 100644
--- a/app-text/blahtexml/Manifest
+++ b/app-text/blahtexml/Manifest
@@ -2,5 +2,5 @@ AUX blahtexml-0.9-Makefile.patch 1811 BLAKE2B c84ab5b3781413ff04e771849514ec2443
 AUX blahtexml-0.9-gcc-4.7.patch 672 BLAKE2B 37e3ed661675e36d833f9dcdc535de3ba62ba57fa283f39af7981659d8739798a6d76adf831c042f24813cdcb0f1495f978e5fd822b11a1064cb22e3d7b0cbb4 SHA512 d683ea1113f4aaefb692b8a7b0cb7365673c835fa3c85e229243d0c96ee2b2ff52026dec96d1670cc0e42f1fa9124dfd547445e6e5b0a85f462e881f177d2ad4
 AUX blahtexml.1 3094 BLAKE2B a1b1bd3d1a6952529685b8be5c22f12a1d6168b7d37eea958fd295a593e17ff363c966e46bf26f8f28a2f424a34344c7673e96d976088b9726dfd1717042edb3 SHA512 0f114e4cfb806fe6d120a738118ccd0817d898434a9d878cd20e5ea59d804420f07b90b9763a387e5b29251ca4acf9b1d7b7b845f9f86036d9dc729775155a7d
 DIST blahtexml-0.9-src.tar.gz 168564 BLAKE2B 941f241adf6e423cd0eff4a13b11313d6cad143badb6d862be01bd603f84aa04f224ae2d84abfef05341c66e410ba18bf39d99f636a8a33512e1da9739770a19 SHA512 5a5ddd50c0b3a25954135c44de0ac3a3d992e3e9dd691a552512415c385a39011595683877cdf98aee77d6ef2f9dae750214798ec2af69b8de089d0aec64b042
-EBUILD blahtexml-0.9.ebuild 793 BLAKE2B 1a17181c2e5dc6c8f73e09fbe7b4d4a8b5d7b461965cd73a1406d5d93cbbd7a17b2b0a4cbbb34b1ed9dce4f5ad5d5dc9dfa563f7c289fa4ecf8bdffea2a94bd5 SHA512 a3077051e5cf0638189d51a1bc43711fd7433d17311383f4fbd5d2805a9cb975becaf2e3855d119e588d3fda0a72f49a47f322dbeb3e084cc5c533a0127dea7b
+EBUILD blahtexml-0.9.ebuild 789 BLAKE2B d3f1c35c603c0807449ac9bc33606053202a28cdd60278ef2a65e6fa714d17006ae665f4714a23fc87b165cf8da5ff662f21f7db89d42817e765f3c90ea41b59 SHA512 2ab8a905959213729a6ce826cc17f5e3b433523d1df2469354dcaaf5f5bdbc8fe755e133b8c403eeb803bdde3344e2993a55fa001e18c766dec40e6264860610
 MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274
diff --git a/app-text/blahtexml/blahtexml-0.9.ebuild b/app-text/blahtexml/blahtexml-0.9.ebuild
index ee195e68bed9..7a32d14559cd 100644
--- a/app-text/blahtexml/blahtexml-0.9.ebuild
+++ b/app-text/blahtexml/blahtexml-0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://gva.noekeon.org/${PN}/${P}-src.tar.gz"
 
 LICENSE="BSD CC-BY-3.0 ZLIB"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
 IUSE="doc"
 
 RDEPEND="dev-libs/xerces-c"
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index 24c28da6550f..6afbe666b7c3 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1,4 +1,4 @@
 DIST blogc-0.20.0.tar.xz 347924 BLAKE2B faabb51237ff4ba3b431b84394cb8ca6f977770f9ed8c1ffbcc841773dc707b9a51694d7a5f3dbe5c573bdd7a16971004551b8ae2c0347273d8c246ae329bd82 SHA512 3738eb23341deb755dbfb0d2e98a73fe53f0e38b929606ebb0a3210d0564a626375d5c20ebff220e63be1f61299492da9061db5366d9d53a28f7ff18cff678a5
-EBUILD blogc-0.20.0.ebuild 1144 BLAKE2B a21019e497b03aaa382da9009aff661b547ce3dc93fc6177261b1756e4c08985e186c23e8283a61d238bc5aa4d8de7570dedc1c934aea9fd81a149ca7c8fa0ff SHA512 40eb8a9f49870a79acfe8f1bf7f202ccb5fec1647e88ca58adc83ff5429037f4ee417670f4cb19ea76e2f5f4c85851dc9f99e6e434455f03160bdfe90ab4b950
-EBUILD blogc-9999.ebuild 1144 BLAKE2B 6764ab70e01f55931815fc6602163bf8dd46ea9dbd043f9c7593dfe027d1b1e139da20d5f706d00d34154a213a88e1518424dea7b63dd16e6b0d68c400dba37e SHA512 dd59471fdfb17d2726afd914c8a95a3c07ed093115252786d8e66984cd03e1ed6500910ae1c443907d08bea0b6f21d18c2a0aab380d8d05f5521a908961ab4f1
+EBUILD blogc-0.20.0.ebuild 1081 BLAKE2B 8ab3d7d1170f6c9119463ac8297be1dbb40d03326a3dd326014358a07f3b1b5f46618b8266f0b2488e171d37c23b2093552e9fddcc72afd8b53ace29a255eedf SHA512 f36cbbdb143b6a536f136ef84ce2b137afda8131e6b77addbe431fbef4af229325030d95a4ce54e9ff4523d41300f1487737e81f8af46fb12c6b254f98393c2e
+EBUILD blogc-9999.ebuild 1081 BLAKE2B 8ab3d7d1170f6c9119463ac8297be1dbb40d03326a3dd326014358a07f3b1b5f46618b8266f0b2488e171d37c23b2093552e9fddcc72afd8b53ace29a255eedf SHA512 f36cbbdb143b6a536f136ef84ce2b137afda8131e6b77addbe431fbef4af229325030d95a4ce54e9ff4523d41300f1487737e81f8af46fb12c6b254f98393c2e
 MISC metadata.xml 635 BLAKE2B c6eea4d41dea75444a7a88ea7f8e9ec716465dfcd2db1f83c22b0a0b0ac85812e5211cda0480b6209270f78d1ce8a89584eaf75a9c620c5ccedb55b342993041 SHA512 8c60992b0d0d12556da80de2cf855bf74e44eecdf56f535a4b881305761c94902be189e7fe829f6ba940605f36d669f07030ca39360afe887348e31a8d08e828
diff --git a/app-text/blogc/blogc-0.20.0.ebuild b/app-text/blogc/blogc-0.20.0.ebuild
index 8deec5d2e311..19396606704a 100644
--- a/app-text/blogc/blogc-0.20.0.ebuild
+++ b/app-text/blogc/blogc-0.20.0.ebuild
@@ -24,11 +24,7 @@ SLOT="0"
 IUSE="git httpd make test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	git? (
-		dev-vcs/git )
-	!dev-vcs/blogc-git-receiver
-	!www-servers/blogc-runserver"
+RDEPEND="git? ( dev-vcs/git )"
 
 DEPEND="${DEPEND}
 	virtual/pkgconfig
diff --git a/app-text/blogc/blogc-9999.ebuild b/app-text/blogc/blogc-9999.ebuild
index e436f3de74d1..19396606704a 100644
--- a/app-text/blogc/blogc-9999.ebuild
+++ b/app-text/blogc/blogc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -24,11 +24,7 @@ SLOT="0"
 IUSE="git httpd make test"
 RESTRICT="!test? ( test )"
 
-RDEPEND="
-	git? (
-		dev-vcs/git )
-	!dev-vcs/blogc-git-receiver
-	!www-servers/blogc-runserver"
+RDEPEND="git? ( dev-vcs/git )"
 
 DEPEND="${DEPEND}
 	virtual/pkgconfig
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 39543d874869..80cd03021e2b 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -1,14 +1,12 @@
 AUX calibre-2.9.0-no_updates_dialog.patch 1661 BLAKE2B c75fc49a621e8dbd16ee1bad748110399cf09a404b4a905d3f723bac1827787e4749f464ba026700b6e5b3cc0ee646a92de00f1f58d10cf12dc9bc91195ee8b6 SHA512 9663b95ed64bdc2bc40692922384d1c6073177eee58a49c412883c4d2ae098e4e0b4ea51b80443108b7c0c3e4f3fda60c00fc3be4d0b62a5d79d982697927235
-AUX calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch 2717 BLAKE2B 208686717ad91d2b59b1772352a6ffbe5e564c2243e87e956038a6c019e091e5b9b8fe91a1c51895bec352f61eae96a45831e866da86909fa09c9a8a294b7439 SHA512 9741f59bce3aad80c09aab91fd669bd4da3b05f0db560f4c769556e25e0ff092b7d184f198904d1ed9d86aa6314c4277cdc5e26ad2aeb2eaf063c84cedf13c48
 AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc91031420594445545b98b701f7cce99cf4bb86847eebad1ccebdc20a0d1b67f9fa88a9250fc4926d7c04cb36405323388b3171cf502 SHA512 c152ddd92728a89db10c75a4d00a968bf119bef68da8b9116c76827e3cdc8f8a7e5c45fbb973f6ca8db1f79e461518351ce2d47e5e059c282f36d2df499d1629
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
-DIST calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch 1222 BLAKE2B 14038b4ea5f87d9a8f645b5af8342da90337202b0247b07dccd8995f55bb965b5c2bbdddc24b55b6e92e899f91d5dec19c10ddea8fcc42c8ed3d74ee90eb09d6 SHA512 b0652c3277b8390f47039366380fceacfd3cd9014fe42306a947f6749c6192657b77e3d832044828bea06c43f1f5e745e6b4ff8dd24efc73d9ad5261c4c73a5e
 DIST calibre-4.22.0.tar.xz 36924876 BLAKE2B 19576d5cfc1a4ed6a505ef46656675980b6736be01f55874951a9a0c81a70c82e23e723db1d81d13917eaf615e65752a100fbc1cb43bdca0b3c4543e3b17cf43 SHA512 b9db1c72cf010c25563e3f86a75478ac872249034b3c8b09bb8f0c2519487bb78dea821c9e45564fb645d17431bbee96459a28ee036e57830faedea4cd94b423
 DIST calibre-4.23.0.tar.xz 36908740 BLAKE2B 3a950ac2b3aade547bb686cc99b963357e76b5931049ecb4a5e09ddaf1db26c74fa3b4ebd74e42d83f68c5c9827c534c0247a3c6a9b000641a778cfe5ac33599 SHA512 2a512f29ddc2fed7f6a229314a9f7fceac198c9422b3be19078685032f1d1cb3b9258ac2609c33d15da20683c1277ed09419ea1e9bbc70430cdc676f60395719
-DIST calibre-4.9.1-bug-731786.patch 1069 BLAKE2B 8b57fb89c9ec2d3a435fbc90f514d45468ceb96b46428efd5d2084cc9bb6137b49dd90dc2f7e574b6d8b8d536728392863046b068c39c8f9bcc3ae23678ac590 SHA512 acd158923bb369270155b3032b033a8387bcb53d1b0ea3e2c0724a40ec0cff6add5fca85649caaf37db0a0878fc3dafacc98b2b641cf10a8d58dc719642c6be5
-DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
+DIST calibre-5.4.2-SIP-v4.patch.xz 4640 BLAKE2B e8d20d9e23922885ecc3d24b7dd83579911dc83520037bad4e9323725c3127d348dc745dc725d137a3172e8891764355d3fcdee640a26cd6b142a2c26d00da0b SHA512 e79ee69ba0ca7e44c10c6670743889d0391d708e75c798e345e6228f483347f72b070e01e2a258590420a1eea6313d88d816817886747c699e6783bd965ab557
+DIST calibre-5.4.2.tar.xz 36596800 BLAKE2B 00373cdc9af56a8dacc70096d1e7925f8d3da4eaf37727ad58c211d18e6c593a21c3ad0f283048ae28b1bb83889c8c801baaa5e240eb65d972ebc78a79922ec1 SHA512 ef3839f5ff4ceecb3bbd6c84819d6f57cc4bb2a1ae789a9dcf8f029680bc778ef86f9c2eb01832c4990f68c2de892eedafa449205470cec4d86a3bbe9d4b4527
 EBUILD calibre-4.22.0.ebuild 8692 BLAKE2B 7d394fc987120030e3ca6dfc593ddaf103a52983f13bb95e02c063da6ca9c3500f6c1d60148040bb8c19e70d731145b1ef086493f2817b4512b036c95daf8a1d SHA512 4fbd12df71e6ad2371540595b4aeeed833a465d5c9b6bff70d20949d27671a875e209e5d98a84cad0d16176879d8f4c1b7f7dd46427f5e32a7c9fc600d508955
 EBUILD calibre-4.23.0.ebuild 8735 BLAKE2B dcec79565840c0fca422ea5a973072e46a5233b5440c6eaa2db8049151e4110a1dadc8af8c65e43bd2d1010f7dd63a0f39d30192e4fa1bf28a5141753f923363 SHA512 6fde8b0929df69346aa619e2398ea7f43d03984eef2db967e3047e490c22845641883b78b049c59be62b9053f4ba77a29e325138d7c5c3820456d063fbe7b0ee
-EBUILD calibre-4.9.1-r3.ebuild 8980 BLAKE2B 1df8fd4d5840923c95640475b81805b8b700da66b3980d3f85040291f92e885b6658408426d06f39f1b578048b77051d927af0a0bfff600b83516bb3967eed6f SHA512 1ea1265dea6574b3e2392fd2e2ba3b1173fba9c698ddc636ea8da18a46b219ba66f1d5fb656adafd9b8c2cd73017c6cba45dd2766e0ac88e30d03e2f10ce0d81
+EBUILD calibre-5.4.2.ebuild 8659 BLAKE2B 1b5bac25d97ef4543c94a8646fb44c024918f2302286813fefd328b984368a49cf8ffea55410a339aa4acb407a78b165cd9566ac31d35f538561c96aa54ceea4 SHA512 5a533b3858f0ca63fb7e4a1a9abe0cd44906ce9c1cb54e4045c3e802cca147ff78691a83000daa561c4c1a956a5c63ea047c380c86a6e04a51c3b6c8aa62268b
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-4.9.1-r3.ebuild b/app-text/calibre/calibre-5.4.2.ebuild
index ce4305d2881b..6c46bbdb0639 100644
--- a/app-text/calibre/calibre-4.9.1-r3.ebuild
+++ b/app-text/calibre/calibre-5.4.2.ebuild
@@ -3,16 +3,15 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
-PYTHON_REQ_USE="sqlite,ssl"
+PYTHON_COMPAT=( python3_{6..8} )
+PYTHON_REQ_USE="ipv6,sqlite,ssl"
 
 inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
 
 DESCRIPTION="Ebook management application"
 HOMEPAGE="https://calibre-ebook.com/"
 SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz
-	https://github.com/kovidgoyal/calibre/commit/db7007a25faefb0cc90e64dda1c0793393b9512d.patch -> calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch
-	https://github.com/kovidgoyal/calibre/commit/7b6416ac6522fc40f24f6baf3ca552b17a8b91d6.patch -> calibre-4.9.1-bug-731786.patch"
+	https://dev.gentoo.org/~zmedico/dist/calibre-5.4.2-SIP-v4.patch.xz"
 
 LICENSE="
 	GPL-3+
@@ -33,7 +32,7 @@ LICENSE="
 	OFL-1.1
 	PSF-2
 "
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="~amd64 ~arm ~x86"
 SLOT="0"
 IUSE="ios +udisks"
 
@@ -64,7 +63,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		>=dev-python/lxml-3.8.0[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/markdown-3.0.1[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/mechanize-0.3.5[${PYTHON_MULTI_USEDEP}]
-		>=dev-python/msgpack-0.5.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/msgpack-0.6.2[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/netifaces-0.10.5[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/pillow-3.2.0[${PYTHON_MULTI_USEDEP}]
 		>=dev-python/psutil-4.3.0[${PYTHON_MULTI_USEDEP}]
@@ -73,6 +72,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 		>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_MULTI_USEDEP}]
 		>=dev-python/PyQtWebEngine-5.12[${PYTHON_MULTI_USEDEP}]
 		dev-python/regex[${PYTHON_MULTI_USEDEP}]
+		dev-python/zeroconf[${PYTHON_MULTI_USEDEP}]
 	')
 	dev-qt/qtcore:5=
 	dev-qt/qtdbus:5=
@@ -124,9 +124,7 @@ src_prepare() {
 	eapply \
 		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
 		"${FILESDIR}/${PN}-disable_plugins.patch" \
-		"${FILESDIR}/${PN}-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch" \
-		"${DISTDIR}/calibre-4.17.0-qt-5.15-fontconfig-bug-725020.patch" \
-		"${DISTDIR}/calibre-4.9.1-bug-731786.patch"
+		"${WORKDIR}/${PN}-5.4.2-SIP-v4.patch"
 
 	eapply_user
 
@@ -157,6 +155,7 @@ src_prepare() {
 '-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
 '-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
 '-i', 'Makefile'])" \
+		-e "s|open(self.j(bdir, '.qmake.conf'), 'wb').close()|open(self.j(bdir, '.qmake.conf'), 'wb').write(b'QMAKE_LFLAGS += ${LDFLAGS}')|" \
 		-i setup/build.py || die "sed failed to patch build.py"
 }
 
@@ -166,14 +165,15 @@ src_install() {
 
 	# Bypass kbuildsycoca and update-mime-database in order to
 	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
+	mkdir "${T}/bin" || die
+	cat - > "${T}/bin/kbuildsycoca" <<-EOF
 	#!${BASH}
 	echo $0 : $@
 	exit 0
 	EOF
 
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
+	cp "${T}"/bin/{kbuildsycoca,update-mime-database} || die
+	chmod +x "${T}"/bin/{kbuildsycoca,update-mime-database} || die
 
 	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
 
@@ -206,7 +206,7 @@ src_install() {
 
 	addpredict /dev/dri #665310
 
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
 	"${PYTHON}" setup.py install \
 		--root="${D}" \
 		--prefix="${EPREFIX}/usr" \
@@ -228,25 +228,10 @@ src_install() {
 	python_fix_shebang --force "${ED}"
 
 	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
+	python_optimize "${ED}"/usr/$(get_libdir)/calibre "${D}/$(python_get_sitedir)"
 
 	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
 	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
 }
 
 pkg_preinst() {
diff --git a/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch b/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch
deleted file mode 100644
index fb55e0025b7d..000000000000
--- a/app-text/calibre/files/calibre-4.9.1-py3-Ignore-TypeError-sorting-collections-kobo.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 6f947d88d323bb08bb6e076d442662aa281fe197 Mon Sep 17 00:00:00 2001
-From: Zac Medico <zmedico@gentoo.org>
-Date: Sun, 9 Feb 2020 12:16:04 -0800
-Subject: [PATCH] py3: Ignore TypeError when sorting device collections for
- kobo driver
-
-https://github.com/kovidgoyal/calibre/pull/1098
-
-Use the same approach as the usbms driver when cmp raises a
-TypeError (see a8deb4b1f8dfb768a32b95b1540be32d5d6e871e).
-
-This should suppress the following error which was reported for
-python3 and not python2:
-
-Traceback (most recent call last):
-  File "/usr/lib64/calibre/calibre/gui2/device.py", line 90, in run
-    self.result = self.func(*self.args, **self.kwargs)
-  File "/usr/lib64/calibre/calibre/gui2/device.py", line 543, in _sync_booklists
-    self.device.sync_booklists(booklists, end_session=False)
-  File "/usr/lib64/calibre/calibre/devices/kobo/driver.py", line 970, in sync_booklists
-    self.update_device_database_collections(blist, collections, oncard)
-  File "/usr/lib64/calibre/calibre/devices/kobo/driver.py", line 2398, in update_device_database_collections
-    collections = booklists.get_collections(collections_attributes) if bookshelf_attribute else None
-  File "/usr/lib64/calibre/calibre/devices/kobo/books.py", line 314, in get_collections
-    books = sorted(itervalues(lpaths), key=cmp_to_key(none_cmp))
-  File "/usr/lib64/calibre/calibre/devices/kobo/books.py", line 307, in none_cmp
-    c = cmp(x, y)
-  File "/usr/lib64/calibre/polyglot/builtins.py", line 106, in cmp
-    return (a > b) - (a < b)
-TypeError: '>' not supported between instances of 'float' and 'str'
-
-See: https://bugs.gentoo.org/708742
----
- src/calibre/devices/kobo/books.py | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/calibre/devices/kobo/books.py b/src/calibre/devices/kobo/books.py
-index f725751d00..fc1dee6b7e 100644
---- a/src/calibre/devices/kobo/books.py
-+++ b/src/calibre/devices/kobo/books.py
-@@ -304,11 +304,17 @@ class KTCollectionsBookList(CollectionsBookList):
-                 return -1
-             if isinstance(x, string_or_bytes) and isinstance(y, string_or_bytes):
-                 x, y = sort_key(force_unicode(x)), sort_key(force_unicode(y))
--            c = cmp(x, y)
-+            try:
-+                c = cmp(x, y)
-+            except TypeError:
-+                c = 0
-             if c != 0:
-                 return c
-             # same as above -- no sort_key needed here
--            return cmp(xx[2], yy[2])
-+            try:
-+                return cmp(xx[2], yy[2])
-+            except TypeError:
-+                return 0
- 
-         for category, lpaths in iteritems(collections):
-             books = sorted(itervalues(lpaths), key=cmp_to_key(none_cmp))
--- 
-2.24.1
-
diff --git a/app-text/cb2bib/Manifest b/app-text/cb2bib/Manifest
index 194cd04d5f3e..2d40b980f2ea 100644
--- a/app-text/cb2bib/Manifest
+++ b/app-text/cb2bib/Manifest
@@ -1,3 +1,3 @@
 DIST cb2bib-2.0.0.tar.gz 1337422 BLAKE2B 6b1137c162f69f6d875aa3ae73b5995a067b332b3a7c0a5e69b787f352810768559c227c793204ca40ec594667624d329b5202c28056bca2e13110afebe57f63 SHA512 de1f3a36b98e016c5fa7317ba3fa8c5b767bd4b37bad1318298a57999bead4cc70d18ac49bb87fde57c4379f3347988846a7aa9b88e23a381d6c193bb1354cc2
-EBUILD cb2bib-2.0.0.ebuild 1926 BLAKE2B 6f2436e81d7c08c9fb84bd76da3495c46d32a5054c0263b60980e631226865fe27e776d75e0cbd02d932d1fc661898e7fd6b246332dea1c47a50e21f520839bd SHA512 5f150c5e1b1c9018b4b42342e10e198ffdfdfe667309cfe6960675d4572f8f392601560bab5dc83db5423753e94adfe2f99fb848292364ab6a0c370a1af5276e
-MISC metadata.xml 443 BLAKE2B 84ddb4572f7fe86d4d59515a747dc2e09b185d0f4c0a540c2b4ba6794d3e69f9d371d726eeac7ca4c6e603db121e50d28d395084319798778460f03bb2c049e6 SHA512 d5c544ca2ebdbd563ec4230bcfdb71567902c681c489979d5bc0546faf0fd98a6b3d2107b5dc18c2347cda5db092b012158421286a539dd82747669de34f983a
+EBUILD cb2bib-2.0.0-r1.ebuild 1722 BLAKE2B 303e4032f56190f35d682423fdfeb0dd56014dcbbfd6ed7ce1e238c4035ac791a61d7d9157df1cb173a30e850a2ab9441c5e2612af4719f941cc93529d4ac52d SHA512 bbf29ab8a1cadddbf313196b86ff777c8abedc709d44a152e04d3c2523f05e895b2d0edc5e12af24ce8402405c000870467021573bc1dcb2f0c987ae17c4218a
+MISC metadata.xml 324 BLAKE2B 848e1994f8080ac86285c83193a5862f42ab7ceffc6d627187028a7273ac71614e19c61fde8573d9a0e93c0ee3633023ca11de1cffe1986c995761b224336c93 SHA512 83c02a7e8affe5b5c85621aba513a100d4dcd17e2b896a8a350253f01804557d44545672cdff0deba82d502856e205207132a6de4769a257a37e93e0874f96dc
diff --git a/app-text/cb2bib/cb2bib-2.0.0.ebuild b/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
index 3eb3286f5902..746edabdcd52 100644
--- a/app-text/cb2bib/cb2bib-2.0.0.ebuild
+++ b/app-text/cb2bib/cb2bib-2.0.0-r1.ebuild
@@ -12,18 +12,15 @@ SRC_URI="https://www.molspaces.com/dl/progs/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="+lzo webengine +webkit"
-
-REQUIRED_USE="?? ( webkit webengine )"
+IUSE="+lzo"
 
 DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
+	dev-qt/qtwebengine:5[widgets]
 	dev-qt/qtwidgets:5
 	lzo? ( dev-libs/lzo:2 )
-	webengine? ( dev-qt/qtwebengine:5[widgets] )
-	webkit? ( dev-qt/qtwebkit:5 )
 "
 RDEPEND="${DEPEND}"
 
@@ -32,10 +29,10 @@ DOCS=( AUTHORS CHANGELOG COPYRIGHT )
 src_prepare() {
 	default
 
-	sed -i -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" src/src.pro || die
+	sed -e "s|../AUTHORS ../COPYRIGHT ../LICENSE ../CHANGELOG||" \
+		-i src/src.pro || die
 
-	use webengine || sed -i -e "s/qtHaveModule(webenginewidgets)/false/g" src/src.pro || die
-	use webkit || sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
+	sed -i -e "s/qtHaveModule(webkitwidgets)/false/g" src/src.pro || die
 }
 
 src_configure() {
diff --git a/app-text/cb2bib/metadata.xml b/app-text/cb2bib/metadata.xml
index dca6445c8920..57bbf03e3c97 100644
--- a/app-text/cb2bib/metadata.xml
+++ b/app-text/cb2bib/metadata.xml
@@ -5,9 +5,6 @@
 		<email>qt@gentoo.org</email>
 		<name>Gentoo Qt Project</name>
 	</maintainer>
-	<use>
-		<flag name="webengine">Use <pkg>dev-qt/qtwebengine</pkg> instead of <pkg>dev-qt/qtwebkit</pkg></flag>
-	</use>
 	<upstream>
 		<bugs-to>mailto:webmaster@molspaces.com</bugs-to>
 	</upstream>
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index b7d8ec6a2408..ba115d924131 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -2,8 +2,10 @@ DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb5061
 DIST coolreader-3.2.39.tar.gz 17679570 BLAKE2B e84fb7d8032ae62fec24a74a9cebab086664a2ed3827f0664e667a4ab3b8d76b722790958f71f5fcd79729238e897c6592059f9b45eb4069c9ad483883bc0600 SHA512 1b92b35750174a8ef4df4b7c4f33bb9fcc94b36008c08a7f9d1f8e85c6b642c5b037e0673a783cde1aa98296887bb286c4a2da186911b26f298f689605e1eb4b
 DIST coolreader-3.2.45.tar.gz 20290340 BLAKE2B a4e6218965618a1b0938606ca323534112a5d7b64a1d56e06f56ba8b2e5591d380d7fb2aeb9c37d007fb834963a42e684e2af939720272c3a7494e5afc65501e SHA512 d7dc9921b74d1da236aeb02edcb39d44dfcfb9da5d6d3b1bf428157f67415c19af218c2454a602828d12d0c6d8c80d1335e92101acda1af8abd6bd312900c33c
 DIST coolreader-3.2.49.tar.gz 21398327 BLAKE2B 9a63f34d661f7c12d55e08788edb0c348d33c67708890e89a857975ce3a6fc82d8788dc0a15ad18e025d68254293b1b34977b2ffe24ea19ab4865727d5afbdcb SHA512 06c8416c33ccf939c0292b573352c097c4b2a0b1390181428e5f1bf08e145f1fa1f8ebdcf658bb0f9e8846c1fd5a57a67fb075b8e7285e1e7602e26aba6790b0
-EBUILD coolreader-3.2.2.1-r2.ebuild 2479 BLAKE2B 63c86c1dee137edc9f8937c72cb80c77c0f890347aa1d385b2be771a3fdfc11a1d895ee87b4bd295a52392dc72f9abcd34f019c5f350943d4a9ce45e3971f5b0 SHA512 8df9d4a6337416a8d394cbab4be7f9d166d7ca9febe6e4dc5054d842de4f006adb535342c24a1b80370988edad4c71f9a0e7f50a0aeb832ebcd251fa38f0d8b0
+DIST coolreader-3.2.50.tar.gz 21252394 BLAKE2B 68550656c644d623e24a7da310baf77881c72621db03f481eeaaceddc0a3c77ecd4d2098c4afe0b56fc50a67f471a9a6a20c172590365bd888222894d27c1826 SHA512 01417c1daae5da6ebb4d92fd68693d3aff09013d1f5679a30138941e23f79db58bdf2b20721deb10ad3d0b9ab0530f8237aeaa2b6f1c1fabbff1c43f48d68ac3
+EBUILD coolreader-3.2.2.1-r2.ebuild 2475 BLAKE2B ef04a9149a2ca2b02b82de190fe071aeaa7f3880dfac03f39e4b20d1c408f55114048ec20479bcfc2ae92f396520a583a940f16afe09f3d53418b65ab25169dd SHA512 280a8eaddbb44e09ce50cc02c26f9a07f34ca986d30c79f3b2100c14a73fa63f0970cdf1436dc4f496191cbd423fa5bd8d7afd34e201f938caab0741ed9b54d2
 EBUILD coolreader-3.2.39.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
 EBUILD coolreader-3.2.45.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
 EBUILD coolreader-3.2.49.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
+EBUILD coolreader-3.2.50.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild b/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild
index db5d2760de9a..40a838c4e2c4 100644
--- a/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild
+++ b/app-text/coolreader/coolreader-3.2.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ HOMEPAGE="https://sourceforge.net/projects/crengine/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="wxwidgets"
 
 CDEPEND="sys-libs/zlib
diff --git a/app-text/coolreader/coolreader-3.2.50.ebuild b/app-text/coolreader/coolreader-3.2.50.ebuild
new file mode 100644
index 000000000000..0b26482993e9
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.50.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver
+
+CR_PV=$(ver_rs 3 '-')
+
+if [ "${PV}" != 9999 ]
+then
+	SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-cr${CR_PV}"
+else
+	inherit git-r3
+	# github mirror has some new commits to fix page margins settings
+	# sourceforge mirror saved as backup
+	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
+	EGIT_REPO_URI="https://github.com/buggins/${PN}.git"
+	SRC_URI=""
+fi
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://github.com/buggins/coolreader/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+CDEPEND="sys-libs/zlib
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+DEPEND="${CDEPEND}
+	!wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+for lang in ${PLOCALES}; do
+	IUSE="${IUSE} l10n_${lang}"
+done
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# locales
+	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	local lang langs
+	langs=""
+	for lang in ${PLOCALES}; do
+		if use l10n_${lang}; then
+			langs="${langs} ${lang}"
+		fi
+	done
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if ! use wxwidgets; then
+		mv "${D}"usr/share/doc/cr3/changelog.gz "${D}"usr/share/doc/${PF}/ || die "mv changelog.gz failed"
+		rmdir "${D}"usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
+		gunzip "${D}"usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
+		gunzip "${D}"usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/cpdf/Manifest b/app-text/cpdf/Manifest
index c6d17ad35096..6a95820e7280 100644
--- a/app-text/cpdf/Manifest
+++ b/app-text/cpdf/Manifest
@@ -1,5 +1,3 @@
 DIST cpdf-2.3.1.tar.gz 385720 BLAKE2B fae61c8e62b1c679919512c5fa4c57279e118d7ecc8378b528053a1487731675f47877c6164d92f3770e38db78fd9bcce0635f76f0b2efdf10c775a1e9cf5ed7 SHA512 3f22e76bc6bffe2bcd6b2c27d0aa8dc55b842cf0eee46f23c0f3e23e1a86ac7af4665b48513ae3e2d7d2ae84fc864af3b6c3c92e93d78b7798b801bb9be987a1
-DIST cpdf-2.3.tar.gz 384594 BLAKE2B 391cc2d88ae5ad2decc3911ea2125345cb337e15f059b2411f8e835f91460bc0cb28410ebe8a15bbf3c2c5ba511f89b0bcfec8ccae3aca69658fd6eb55c64dc2 SHA512 db17bd019a6c2a719761662af682cc74a7dbcc673c22867652cef37508b6d3dcbf4d5da9d9db9e8b1b0cf912f03be18f16748ab15dcbdfbdfd37900d4fd04ddd
 EBUILD cpdf-2.3.1.ebuild 823 BLAKE2B f2c254bc43decc98b70086acad8be52f9a3b85f70e51710863be39ef5fdcc237fca32a75dc52ebfa03350b5cccb43646d896fe1d46371874c34edd0cd2563670 SHA512 60855f500235a1fc2a3fc07a24e9699293bbdbffe0bc29ddc822e0cfcf43a4a34a8d54129b0db4022dabe89ff59b879c2b261c33700bfc86a46743b260ca66ed
-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
deleted file mode 100644
index 3df1825ad110..000000000000
--- a/app-text/cpdf/cpdf-2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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/cutemarked/Manifest b/app-text/cutemarked/Manifest
deleted file mode 100644
index 77f5a33899c4..000000000000
--- a/app-text/cutemarked/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX cutemarked-0.11.1-respect-destdir.patch 992 BLAKE2B 17c10668ead3f212a6038d83881faaa09b9e4de0bc6e835236e21eda97581129ced3d3d607147729c942db243e8072c04cf9314cf4b40ebf6a84a812e9ad1dbf SHA512 dc6c48c7c0b9b4684b333d1f1aa000d95422b1cac4e71f16cb84eb8bcede63fcc653528005af17fb6757475c9c05c50bffe859d64d5c568e831de7e7769fc92d
-AUX cutemarked-0.11.3-bgcolor.patch 315 BLAKE2B fa5bcae83522c24d62214eb10852cc991eadefb2fc125bcfb4bca5372e0a766476db8b6adf9cfbe6d9fe9660547233628853cbaabbf0a9bf36d9524f4b1481cc SHA512 f7d1975436dd27b97204fd772a5d210ea1f25e85c3da60b066923e21087eae5d1dcc2db94dfde50705d19a85bbf4667da8b94c4e7284686f9a03876e7807a98a
-AUX cutemarked-0.11.3-qaction-include.patch 367 BLAKE2B dd6686f855ed4e1229d5d0692d7aef167b04fd36aea21e73d5ce5d3ef57731149b19ed33b58e84a1e12fdba3219f62a871b5d807f8cd05daa49c93c7ad438402 SHA512 27b95703c340950b6789266b43c7b5752c56e2d7c45ff86f377f57d39cc56664d266046a06b63411afb23858de318d9c7a2c21c0614ab1713c3953af467acba5
-DIST cutemarked-0.11.3.tar.gz 772238 BLAKE2B 1acc7291d968f26f87a1b2fc1070ca3a61053b8bba04c57d91917ed3dea6a5893b9cab41004cef044ddb656e3d334d177d6765db7624d33f91f749d5787b23b2 SHA512 3b776f6453812ce4afa37532bf03adce01ad3ec2fb0d848e3a0e5f18ca30be6f1e9f6b3c815917a96c9637c722d53a5bc249d5f58b209000d7d794239626ca30
-EBUILD cutemarked-0.11.3-r1.ebuild 809 BLAKE2B 0f879ae1920bf640f7c7c80c3db54cf437d26236e04bcedb13d5a352b66bcf10185f4fe2ecf3cc60fc40fc6d26632d04b39d413ded37964b7e7cd24c1ecd7537 SHA512 7f6cf97a9f8e19ef8667f32bd7e0bf8e4e69aa6469d7a55a6e65c837f97b6a207772f58430ee116ee530247a7259a5400dca2cbe1226dc21c4c391caf16e3590
-MISC metadata.xml 342 BLAKE2B e03fde7a5232c8c6c2134ee0f9441d6f72440d942025655d5ee2c74f7069416057b315bbc5b3f9e468507ec1324f9d9f6abc4598e01590c7dae1efdbbbcfc56c SHA512 4568bb1fe2212d4dcde357798fb5e0c3ab4155e5ff388e6fd545a8a2c2ffad023eefc2e874bebd7005cee77266ee034f11dddf8f260cab0be396094db9e2f39a
diff --git a/app-text/cutemarked/cutemarked-0.11.3-r1.ebuild b/app-text/cutemarked/cutemarked-0.11.3-r1.ebuild
deleted file mode 100644
index d4f1373747d4..000000000000
--- a/app-text/cutemarked/cutemarked-0.11.3-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="Qt5 markdown editor"
-HOMEPAGE="https://github.com/cloose/CuteMarkEd"
-SRC_URI="https://github.com/cloose/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	app-text/discount
-	app-text/hunspell
-	dev-qt/linguist-tools:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qttest:5
-	dev-qt/qtwebkit:5
-"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/CuteMarkEd-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}"-0.11.1-respect-destdir.patch
-	"${FILESDIR}/${PN}"-0.11.3-qaction-include.patch
-	"${FILESDIR}/${PN}"-0.11.3-bgcolor.patch
-)
-
-src_configure() {
-	eqmake5 ROOT="${D}" CuteMarkEd.pro
-}
diff --git a/app-text/cutemarked/files/cutemarked-0.11.1-respect-destdir.patch b/app-text/cutemarked/files/cutemarked-0.11.1-respect-destdir.patch
deleted file mode 100644
index 2ce1469538f7..000000000000
--- a/app-text/cutemarked/files/cutemarked-0.11.1-respect-destdir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ru CuteMarkEd-0.11.1/app/app.pro CuteMarkEd-0.11.1-sane/app/app.pro
---- CuteMarkEd-0.11.1/app/app.pro	2015-07-06 12:02:22.000000000 +0200
-+++ CuteMarkEd-0.11.1-sane/app/app.pro	2015-07-09 14:53:29.398899757 +0200
-@@ -243,7 +243,7 @@
- ## INSTALLATION
- 
- unix {
--   isEmpty(PREFIX): PREFIX = /usr
-+   isEmpty(PREFIX): PREFIX = $${ROOT}/usr
-    DATADIR = $${PREFIX}/share
- 
-    # install desktop file
-diff -ru CuteMarkEd-0.11.1/fontawesomeicon/fontawesomeicon.pro CuteMarkEd-0.11.1-sane/fontawesomeicon/fontawesomeicon.pro
---- CuteMarkEd-0.11.1/fontawesomeicon/fontawesomeicon.pro	2015-07-06 12:02:22.000000000 +0200
-+++ CuteMarkEd-0.11.1-sane/fontawesomeicon/fontawesomeicon.pro	2015-07-09 14:52:45.867901697 +0200
-@@ -39,7 +39,7 @@
- 
- unix {
-    # install plugin
--   target.path = $$[QT_INSTALL_PLUGINS]/iconengines
-+   target.path = $${ROOT}/$$[QT_INSTALL_PLUGINS]/iconengines
-    INSTALLS += target
-    message("The project will be installed in $$[QT_INSTALL_PLUGINS]/iconengines")
- }
diff --git a/app-text/cutemarked/files/cutemarked-0.11.3-bgcolor.patch b/app-text/cutemarked/files/cutemarked-0.11.3-bgcolor.patch
deleted file mode 100644
index 8cf1fe5f1c30..000000000000
--- a/app-text/cutemarked/files/cutemarked-0.11.3-bgcolor.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/app/styles/markdown.css b/app/styles/markdown.css
-index 7c87385..607f025 100644
---- a/app/styles/markdown.css
-+++ b/app/styles/markdown.css
-@@ -25,6 +25,7 @@ body{
-     line-height: 1;
-     max-width: 960px;
-     padding: 30px;
-+    background-color: #ffffff;
- }
- h1, h2, h3, h4 {
-     color: #111111;
diff --git a/app-text/cutemarked/files/cutemarked-0.11.3-qaction-include.patch b/app-text/cutemarked/files/cutemarked-0.11.3-qaction-include.patch
deleted file mode 100644
index 5e585945902c..000000000000
--- a/app-text/cutemarked/files/cutemarked-0.11.3-qaction-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nru a/app/optionsdialog.cpp b/app/optionsdialog.cpp
---- a/app/optionsdialog.cpp	2016-03-28 13:48:50.000000000 +0200
-+++ b/app/optionsdialog.cpp	2018-06-05 07:28:09.086517828 +0200
-@@ -17,6 +17,7 @@
- #include "optionsdialog.h"
- #include "ui_optionsdialog.h"
- 
-+#include <QAction>
- #include <QFontComboBox>
- #include <QItemEditorFactory>
- #include <QKeySequence>
diff --git a/app-text/cutemarked/metadata.xml b/app-text/cutemarked/metadata.xml
deleted file mode 100644
index 522f8101737d..000000000000
--- a/app-text/cutemarked/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="person">
-    <email>zx2c4@gentoo.org</email>
-    <name>Jason A. Donenfeld</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="github">cloose/cutemarked</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 4f52c8b5d16e..2618a0fa9ee6 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -9,6 +9,6 @@ AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a186645274
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
 DIST dictd-1.12.1.tar.gz 423870 BLAKE2B 9a1522a9786fac732c5e8b481b2eaa36d75ab27d3388e40cdf80016a410123907c4b28b1ed32c1fa3b179b27a358447625de6c0c1e9ab9f35c6d5d3f16591b9f SHA512 51bceba36f9e34ffcbbf42a6235aab6097fe66ba8ed086ea60d0df8b7daf91c6449fdf7c5605150c77035d98029053233db106f9188786b30e02ecd61748209b
 DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439
-EBUILD dictd-1.12.1-r2.ebuild 2870 BLAKE2B abfafae14c450faae4ddab7e6067140bf5ffae2fc44c89d22af9055cc0f087dd94ccf70013f423c0874279a3814a288b965d3d566af34b0c923f5885eb81dfb8 SHA512 4b4caa9de69e126ed84b9d00cf086c327ea47a059bfd3fc7e6f541b15153f73d5c9afb87de75da186d36b8226666e6284ae64b6981352273a6b58ee8b729a66a
-EBUILD dictd-1.13.0.ebuild 2953 BLAKE2B cdaeb96e42c3c43901409682b8041230e2404a7aac6e049f33fa2dde0ace10383821b54dd1d8368a79a7e0ea2a0f397f870ef2cf08ff17ac0db5a3e454aa3832 SHA512 52ad5339a8c85847286068d793897bb09906c11fd197b5f31b6bc076fc9bf46edd1e30c104d423cf71cb0788b97a6ae23828125d0d7080f95e22f3cad0abc2cf
+EBUILD dictd-1.12.1-r3.ebuild 2815 BLAKE2B 0db400e2acfba90f98c357705a81f928a3f7e94bfc0a967aa44421daa996049104e9667fcc0bfae89f8a95bb6ea7a4e509ad35273697ee672cd786475d26475c SHA512 a99523b436163398177a8abc2461c9e6be308914634e5d941c58bf7cb5922a3e2551111f54dae12993d124bbee2de11f4a3792d5d7c0c72b2212691ef7304299
+EBUILD dictd-1.13.0-r1.ebuild 2895 BLAKE2B 7b4e5e4a67fb18ad32dded184b647daddb8ec9760481508f349e4b4760aa9a6042d31f26eb751c4e8fd1e87f177f98a1d0cc385df849b04430b2d3f086e5c724 SHA512 8634f4c0bb47368ae01521319526b8cdfc351ac48fa3cbcc819696fe4676e055f71d1fdd572f7641dbf5c294eb71403dbc7381837cb843e3d118e2eb4f144014
 MISC metadata.xml 484 BLAKE2B 8513944c0eaf7007a75c571dd29ad9e408db17a8e68f39424f361d19e488fa644a8467db234692bed15fd2d2425676c09f7187751b507a69967dcd598f9ab30e SHA512 b404b831fbea2146daf29f4bc81af88c5e226134950fa1eff68823bdf0b00208328936983d1e9c8c51e3420a27c0eca99e83d1178451b8e5df265b8623d3385e
diff --git a/app-text/dictd/dictd-1.12.1-r2.ebuild b/app-text/dictd/dictd-1.12.1-r3.ebuild
index 4feb9c4a5c76..7d308344d564 100644
--- a/app-text/dictd/dictd-1.12.1-r2.ebuild
+++ b/app-text/dictd/dictd-1.12.1-r3.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils readme.gentoo systemd user
+
+inherit epatch readme.gentoo systemd
 
 DESCRIPTION="Dictionary Client/Server for the DICT protocol"
 HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/"
@@ -17,6 +18,8 @@ RESTRICT="!test? ( test )"
 
 # <gawk-3.1.6 makes tests fail.
 RDEPEND="
+	acct-group/dictd
+	acct-user/dictd
 	sys-libs/zlib
 	dev-libs/libmaa
 	dbi? ( dev-db/libdbi )
@@ -38,11 +41,6 @@ DOC_CONTENTS="
 	explained in /etc/dict/dictd.conf comments.
 "
 
-pkg_setup() {
-	enewgroup dictd # used in src_test()
-	enewuser dictd -1 -1 -1 dictd
-}
-
 src_prepare() {
 	epatch "${FILESDIR}"/dictd-1.10.11-colorit-nopp-fix.patch
 	epatch "${FILESDIR}"/dictd-1.12.0-build.patch
diff --git a/app-text/dictd/dictd-1.13.0.ebuild b/app-text/dictd/dictd-1.13.0-r1.ebuild
index 510bb16e5845..f9886dc73f58 100644
--- a/app-text/dictd/dictd-1.13.0.ebuild
+++ b/app-text/dictd/dictd-1.13.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit readme.gentoo-r1 systemd user
+inherit readme.gentoo-r1 systemd
 
 DESCRIPTION="Dictionary Client/Server for the DICT protocol"
 HOMEPAGE="http://www.dict.org/ https://sourceforge.net/projects/dict/"
@@ -12,12 +12,14 @@ SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
 SLOT="0"
 # We install rfc so - ISOC-rfc
 LICENSE="GPL-2 ISOC-rfc"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
 IUSE="dbi judy minimal test"
 RESTRICT="!test? ( test )"
 
 # <gawk-3.1.6 makes tests fail.
 RDEPEND="
+	acct-group/dictd
+	acct-user/dictd
 	>=sys-apps/coreutils-6.10
 	dev-libs/libmaa
 	sys-libs/zlib
@@ -45,11 +47,6 @@ PATCHES=(
 	"${FILESDIR}"/dictd-1.12.0-build.patch
 )
 
-pkg_setup() {
-	enewgroup dictd # used in src_test()
-	enewuser dictd -1 -1 -1 dictd
-}
-
 src_prepare() {
 	default
 
diff --git a/app-text/diction/Manifest b/app-text/diction/Manifest
index 7aa29fb15480..e5b3b6060e78 100644
--- a/app-text/diction/Manifest
+++ b/app-text/diction/Manifest
@@ -3,4 +3,4 @@ DIST diction-1.13.tar.gz 145971 BLAKE2B a70a198f356d9c92813d2b60b02e703a61dbefd5
 DIST diction-1.14.tar.gz 147268 BLAKE2B 12e4a56aa6429bb155dd08a0ba01438f79b69ab9d2a990a3d9c2d12e1eccd15ff7c09d634d399f82d09c97b24586e4586bd6521153ae071b3192dc7a3ea10102 SHA512 db704f3c01883b24ce01c5aaaae9a615418e2cfbf851b7f11a4357c853299caf666483e309d84217413732b7abd1abc44f0bcb3dc960b64adfdfa19121607ce3
 EBUILD diction-1.13.ebuild 560 BLAKE2B de58eee9a39d247850564a0699969c8ca6500338f2d047925d182dfb4b85f15c285f2782d3c0e1e497af333a3c314f707e0ef6a74c67d1df0d25b726d2f132e4 SHA512 62214b2d75940fd215871d7d3eefc0adc3198a178e1eb4e0376999f8dc484f5f9d3094495eb128140e3f7b333a5e39820ce665402f19fa25f4d9e884caf45f24
 EBUILD diction-1.14.ebuild 538 BLAKE2B 9ee694676055e676fc0e4ff3e1eb643d0ea31dd18b24a39a6db5a60d03d1ff88ea4b20a829d05564b07b1f92be668ee7dfa6b3e4e810ab6ececeb81e4d15e45e SHA512 576237a3fdd5f3af275cb100942e69e0c3eeff30b27dd1ab25a2500e52a256da4c6dd89127446413eec79682f9c164c1028e988c1db5101fb21b1391be8cf467
-MISC metadata.xml 1006 BLAKE2B eda482a025adacb54d70d937d88c1b2f88d3f1a48ba4c031a2abde7f70037b1b7150c1509a3b67f1421c25fb2fe299d31e11c900dfc48ee76f5502b7ce5bad66 SHA512 f8aa49a2b7cef19bd9658516a2ca5cbac77883c1e1c1615d00a886c46d2505999a383652e1fed8a6341d69b31a0fa4763ff2df7bb0ad2f03f65948982dee4675
+MISC metadata.xml 901 BLAKE2B 5643435f17fdfe599f47305f23c4ccc9b6430a5b5dd8fb9344fed92b760e9715c3aa30adf4a99c02543dc173e07b8e6ba233f4a0389c5d006b3d22d955e6bf34 SHA512 7c48abbc5a289f52d53ea115427794db393fadf18d875edc2419efa2d1426e425adcb955ba3f19790928e21c071cd55327fbfe006f2f5bb571bfd5be12b79b57
diff --git a/app-text/diction/metadata.xml b/app-text/diction/metadata.xml
index 96ba50990142..7d709d04f8f4 100644
--- a/app-text/diction/metadata.xml
+++ b/app-text/diction/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-		<name>Jeroen Roovers</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>jnrowe@gmail.com</email>
 		<name>James Rowe</name>
 	</maintainer>
diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest
index bffdd18f6249..3923ef1e31de 100644
--- a/app-text/diff-pdf/Manifest
+++ b/app-text/diff-pdf/Manifest
@@ -1,3 +1,5 @@
 DIST diff-pdf-0.3.tar.gz 132862 BLAKE2B bb3fa163337482785778fa7cbeab3e9f883d8537e4a905592eb20f4bb876597f500beaa2d9f13706887e1d340dd378c68c231b91a4dd478fb206b32f2cbd768c SHA512 b85585162b498c5abf14020ad04616ebdb5efce25b20604dab81c6068a036a818d7e10ddbbdb69d278d4b5a46ab9b9aa782a52e37f278f3e9db7b4d2259aaa08
+DIST diff-pdf-0.4.1.tar.gz 137715 BLAKE2B f77b7a690f2a99aa003c1a36015113f0b3355acc45346637535231f763aa733174eca6b1f962058c625e06176fa13868965b3b67ddf6ffe249202ff799051e37 SHA512 4b7b49d7008b5920be86af8398dea41933888677b66505af0ca4daecbd1662dc0b3c04e7b2631d86680cdae4b0b58d24bcd4ddc2b7589127b682d4b97a179b88
 EBUILD diff-pdf-0.3.ebuild 1289 BLAKE2B 3eef9f78e56f7f0da662a8ad3fb75e8b5683d58c3dcdc6d4df426d78814b834afec798b0189bf22c65da304d5ccfea1afd324d7f066536f0b162f89715af6596 SHA512 5f667ed5f3391c1fd6bbf426d7947b50e5c75ae0aab61dbe20c1c6efd3710b18d9d2a8c1407e657219db6a58b9450542eacd52bbd382361ba7341d99b00ada23
+EBUILD diff-pdf-0.4.1.ebuild 1290 BLAKE2B 6f960173b5b8fc9a853a47fcc356008f2e98e8a3112a4dae7cb71c381fbb2bc2040212e821c668ea31633b14d83d0e93b54ff80c49c4616aed4416e7fdfd9c24 SHA512 85a2da6028e118be3eabc04f7580bf94a6a164d534fc409262f451fff80fe6ecd7a54b1ae7a15eb7bd60c49873014d9a85cf8cd1a5550a01ec559f0f6f9b7bf6
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-text/diff-pdf/diff-pdf-0.4.1.ebuild b/app-text/diff-pdf/diff-pdf-0.4.1.ebuild
new file mode 100644
index 000000000000..5b18231db4e7
--- /dev/null
+++ b/app-text/diff-pdf/diff-pdf-0.4.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# No EAPI=7 support in wxwidgets.eclass.
+EAPI=6
+
+inherit wxwidgets
+
+DESCRIPTION="A simple tool for visually comparing two PDF files"
+HOMEPAGE="http://vslavik.github.io/diff-pdf/ https://github.com/vslavik/diff-pdf/"
+SRC_URI="https://github.com/vslavik/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+# The COPYING.icons file states that two icons were taken from
+# version 2.16.5 of GTK+, which is licensed LGPL-2+.
+LICENSE="GPL-2+ LGPL-2+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+# The build system checks for "poppler-glib", which is provided only
+# when app-text/poppler is built with USE=cairo. Moreover the glib ABI
+# of poppler is relatively stable, and I can only assume that diff-pdf
+# uses that rather than the low-level libpoppler.so API. Since the
+# subslot on app-text/poppler is ONLY for the low-level API, we
+# therefore don't need a subslot dependency on app-text/poppler.
+#
+# Since diff-pdf.cpp includes glib.h directly, I've included
+# dev-libs/glib as an explicit dependency. Ditto for x11-libs/cairo.
+DEPEND="app-text/poppler[cairo]
+	dev-libs/glib
+	x11-libs/cairo
+	x11-libs/wxGTK:3.0[X]"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	WX_GTK_VER="3.0"
+	setup-wxwidgets
+	default
+}
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 9a33f83ff4bd..31c5ef5b986c 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -4,5 +4,5 @@ DIST discount-2.2.6.tar.bz2 102303 BLAKE2B 6ffcb64ff8889d79832b28db9a824e5a30bd1
 DIST discount-2.2.7.tar.bz2 102277 BLAKE2B 58ec3bce2b8fc41a090d9b81b4326cbf54e36bf774f4f9ef63c2a2b1d34ba464e9f0a021f19b4fef165da426742af3045a631af005371d1a8a4cd81dc0be3367 SHA512 1b61eb7c625bb50da0dbe97350a0ccbb15930ccaef449c4b4659950907bce3c0564dabf20578379a7fdd0e375f5d4d5b61acd34db474a85e942b60373688bd08
 EBUILD discount-2.2.4.ebuild 1821 BLAKE2B f4a6861947e64cff3200ecddbc162543df545cc6b06fb87394c6f5a64d1637c11cafea16db2417352e33600ff6e946e5250bf0feb15c29c6cea130dee72eb663 SHA512 0a73f39f35c11fb0dc7f5321ee754516db1f24e4b1c9dbf831dd9cc3be248ede956093c1b04360b11edca04f5d33f5ee45c18537cefbe3f9ff9b5ac39cafc75f
 EBUILD discount-2.2.6.ebuild 1695 BLAKE2B cfbbb57f39a7da1c13a3aa259ad7cf104c5878eed9fe693e43abd0b755a218f203ed4feb25c8f226159d6ae2b3d3ff6a41a04c9c9570d81acd8a166bc278ef89 SHA512 1e15684ee950a536168ac56806138e49dc473d2f5e525dde90dd4bb7113340a6e9022f38a72690e24b852d5f1db80768f203e33b8f43410c5bf794a2878ccdcc
-EBUILD discount-2.2.7.ebuild 1693 BLAKE2B 423ded3f02f93d87e6bf241d805cebef93535631a0850267e7a70d2f2f92ad593ccc9f4ecf6a17e6e8968057f1f8e4337137761410d7c0c0a3bd3de958a06c80 SHA512 836514bbdb9419b7c804c54e5dae4a38b0b83238e3af5ca9216dcfc0eb5b80d5f7140d3ff336f7c47739bf2474c41e5218a38f2a7c1b6fd82f9b536778b37546
+EBUILD discount-2.2.7.ebuild 1689 BLAKE2B 651427216f362998b152643705915ac341e0fc94472f2de6a2e80463f69169e4695727f7eba414dbda4269f9fc7d32d8369b3a4d10b8ea0439cc92cc00349420 SHA512 e04aa1010ae1c117421c18dc89a0cddbe3db76481450829af53215591f63f1e263198b5abdfead28a4c1565fcbf2b17ad5e5a5fd1fed688cf24ed8f39d793e3c
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-text/discount/discount-2.2.7.ebuild b/app-text/discount/discount-2.2.7.ebuild
index b2c50271d850..a5a6091733f8 100644
--- a/app-text/discount/discount-2.2.7.ebuild
+++ b/app-text/discount/discount-2.2.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index b3337deb95d2..f1f41e6246c0 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,7 +1,7 @@
 DIST dos2unix-7.3.5.tar.gz 662133 BLAKE2B e24f77d92fe0c5931f9ca762b79a1713b14cc39b7566f78d55c4fd58bb7d3c0de1f2a8add8ffd6c3fa26a6bae73c412572fc71701e26b7b52f15b51b0de0d294 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58
 DIST dos2unix-7.4.1.tar.gz 711570 BLAKE2B 3dbe33007aa3e2ef47ec3dc0c3165987986955fffd7ae1435725014d52ba716626e7891911afe11674beec11fa62a12983c8dfc28cff682ca0c3e798449a9b0f SHA512 81e7cff82d95b298fb218b073f54d17fa851a7507fbd54b3cd9af7c1efa6a7bd3cf59f7a84ffbaf395403bf458650763e1755944451b24f708878a9c62316dc4
-DIST dos2unix-7.4.2-beta1.tar.gz 712261 BLAKE2B 020b51a53b3b8ac601efd0f3fa424fbe5a42ca5b06e1f7282c2aca021e22b38aac21e4aa7b42ed428c95053d57bb5c35483881b06dc580b533eac2fe716142a2 SHA512 323c0dd90616bca1891f8228d43bca1c6415b5765f5fba4ccf5ce692da9b545c8f10f908ba5ebd65c3409fb4d9fdaaa2fb36d589faa8b5940d27ecf8f72bc422
+DIST dos2unix-7.4.2.tar.gz 727429 BLAKE2B 5ba8aecfe3a79dfe9f4d7d69453fdcdd573c8889b41240c6bce5fea1b7e9e8213454af98f768cb2d199c85684a7d48192ba4bf856a92b867594b52a2209d5e04 SHA512 3fb77561596bafd83f3f7807ce967e58d5a96e5235afe3a4074ae7112297445690b2586bf652eb0b5bd1984fd41a79478355f6df8244561b4167a8a09593110d
 EBUILD dos2unix-7.3.5.ebuild 2060 BLAKE2B 79addcc1d203a536003d9ac775c520f09a3f816898e1c888e5d3305500db1a18439d9503f365e91e2c5379456101c1e090926191d09f67d5eae00c6cd632f418 SHA512 c486b0abc3b9ca00bd4fc0909298ad4340d6b84e949ffe7f61ac2e0c05a9aa47b83a72616d1b53f867f2b51ec04dd44467f988311cd9a11e031ba2e4a4ed1936
 EBUILD dos2unix-7.4.1.ebuild 2080 BLAKE2B 4ee1a14eabb90520cdfb6a163d2bc04f2c3aa7632914e47efc8d5c77e974d2590d422eab6e59cae6e4ce0ecd0723721a640797b8a5b6390a2041cec6f7919cf3 SHA512 71a45fdfd99e9e0ac65b12f81e7f7ff5d15608f82521f24a5bdc17bf439237aa6546e0bdfa8dc6a5e00b3c02344d14f43ea1ab5dbf219c8221b988e1e87f941b
-EBUILD dos2unix-7.4.2_beta1.ebuild 2143 BLAKE2B 053aa58e57e7c752e0f23db32bc0b4dc0f7d56ed152f9c2d2b0760c9b1b1a37683355bf160b794b5371a54be302238c20939ee45be81d221f6ed4502bb40bcea SHA512 92c0bac78e01a5896b70f3c8199e3f16165b912eaf3388dacf3bcf42bd7cb6e0de77f59c687058ab0cdaa588ce8350c3df77e59bd2b211bb160a8a3b271365cb
+EBUILD dos2unix-7.4.2.ebuild 2147 BLAKE2B 1bbb99a76ee393c233e796ee51262fe5eeed6e6584d192d78cfc150aa845a085c86919170ca8acd78d18e16312dc1b217b4a3091a3e42b3f80d01efd66ff1093 SHA512 28aa107c6cdb86b274e577fcef12f7e46bfa1965bd0ac4b2e9bd0dd0737813a3bda34f0693dd9afbb0c8a5d577cd99cbf326a68d7598b960bd98644a29e4bf05
 MISC metadata.xml 343 BLAKE2B c4023a36777a79352885528afd87e7709255ccf7f02d9ba28e29eb11f6c67c2775eeeec4f2db95b427b94859e70e7cd276984bca828eb872116e7ec33751c31c SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3
diff --git a/app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild b/app-text/dos2unix/dos2unix-7.4.2.ebuild
index 21a971f34cee..591c044b4780 100644
--- a/app-text/dos2unix/dos2unix-7.4.2_beta1.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
+PLOCALES="da de eo es fr fur hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
 
 inherit l10n toolchain-funcs
 
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index 1989ff76d87f..dd605010c312 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,4 +1,6 @@
 AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2dbb51404a3696f61606a4394563b70e2d4a506664d91435b9485417fa8ef61a07051240b8d05861f4bf1e0196a93de69966e SHA512 65fb9900e0b929902713a0c61e5bd2cafd56828a0f294171852bd7d6a5ee44356a26e3f5a3bc57f5e0c532cc6e31a8111ca1daf52945909eecd7b7f1c74c3546
 DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
+DIST dvipng-1.17.tar.gz 171049 BLAKE2B 7165135d818aa399d051977908bf7865774803127312fec515284bd72c4f9e88ffd7f1f7c3c8f1b5adf324fdbb9ac8d039582ede2398123db6ee7655500ac32a SHA512 b56faa6f2b24572233e1f0d9b74122b3bb7fed22cf47c9c05f5530691854dffc9a1953b51803f7d539f9a9de364160d557560c68c369820212837bdbacfb80c7
 EBUILD dvipng-1.15-r1.ebuild 1296 BLAKE2B 50bb4592f8ee749252bda8785b52834bdbd28d9c25e4455a919472310e57c4e3617d7f8b5a7db8df21dcde2a86b9452dfbadf38c165d482ad6020eed2af8547c SHA512 9e89d5e1773cb593936064fdb02b59edd917c74b54f9941a7d9ac3d698d35d27690dd6cd6956b07fafff27d6cdc18b88da4808c4517b811b2c7304d4ca466189
+EBUILD dvipng-1.17.ebuild 1121 BLAKE2B 12ffa5ba1f817099538fb278900def950b94d371c7ae058bc15d8bfc55852cbbec536901897ccdf9732da0c2190d932e45aad14febfebbe91c83a5f69e6a73be SHA512 5e01cb8cc0bfbff5a7cf08671ef72ce40731a136de7263c5428b5856e63c756cf36b9cd625fdb48cad9cbc744fe7a8c784c49e20190b6032938eb7fbbeaa5ae3
 MISC metadata.xml 1122 BLAKE2B fcfe5bf7616dd40ccaa74751ba1c653012de0f263ae8c4764363c4a5b1ce9546a335b7e2c0917a9d2a0a30cde98bcc5b8e3184619b83f1d6267d7172584144d2 SHA512 c2f663c6ae8113fc462e16ce50ef44172c8d5cffaf34e9095701df7e3ae568126bb782c8a02e3d735239ea7263e6cd9778bf21f4d7166c24799a9090ecd8bc26
diff --git a/app-text/dvipng/dvipng-1.17.ebuild b/app-text/dvipng/dvipng-1.17.ebuild
new file mode 100644
index 000000000000..8143ed496cef
--- /dev/null
+++ b/app-text/dvipng/dvipng-1.17.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Translate DVI files into PNG or GIF graphics"
+HOMEPAGE="http://dvipng.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+ Texinfo-manual"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="truetype test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/kpathsea-6.2.1:=
+	media-libs/gd:2=[jpeg,png]
+	media-libs/libpng:0=
+	virtual/latex-base
+	sys-libs/zlib
+	truetype? ( >=media-libs/freetype-2.1.5 )"
+DEPEND="${RDEPEND}
+	virtual/texi2dvi
+	virtual/pkgconfig
+	test? ( dev-texlive/texlive-fontsrecommended )"
+
+DOCS="ChangeLog README RELEASE"
+S="${WORKDIR}"
+
+src_configure() {
+	append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
+	if ! use truetype; then
+		sed -i -e 's/\(--exists.*\)freetype2/\1dIsAbLe/' configure \
+			|| die "sed failed"
+	fi
+
+	export VARTEXFONTS="${T}/fonts"
+	econf
+}
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 82e94c948847..45c59b6eeebe 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,7 +1,9 @@
 DIST dvisvgm-2.1.3.tar.gz 2802278 BLAKE2B 36e523d4b82a71f26ebc50428c56863a3729d1cf79c63660a5a3cecdd7c55c27e7ad811121e8a2ccdaa37f1ec2fb345d1d5d4f7b59011be7877500df5dba1f48 SHA512 dfd6e94b28dcdf2d1be236f3f29eaf4e3e5b7bb34544cdd55ae09de612b02561dd782b693a9a94eea07420c795d31ef210eba34cb663d7de98f438c089369ff2
+DIST dvisvgm-2.10.1.tar.gz 3110061 BLAKE2B 3f3bb50baa587c1d20061d235885b4c921efbd3400aa7e4d2df872e37e0ef57d57ae4713fedfd0587d7fcffe7e0286ca55e319e6e82b3b72b49c5df5fa08f633 SHA512 8faa68b13a0e351ba54b5c9acb1dbda6e081eddd167b2cc599208cc2e7967c116c3d105d29df224165daff88f81acb3135d936ec9b2da4dce2c82c197f6a4e78
 DIST dvisvgm-2.6.1.tar.gz 2911596 BLAKE2B 8dfe85140db4b462c1721a8bad322d52535a0fced4bb8c374c342bd4ca8fe5cf6dfa5751a8a8070b9ce622ab7bb7df14985802c596fdc387f90febc80151fbd6 SHA512 791183f92ec4733574614fd5b8b4247a7b766b62b1aa7b1444d508d0358178b1447b24fb51d09948d99552c2cb7ed3a0f9bce0416b66de8a4835f85476bbdb25
 DIST dvisvgm-2.7.tar.gz 3037242 BLAKE2B f93bcc4220adf4b2c0d7e06deb11416f22c623f07c96ca9aa9093054e18ec72f8da1d93aa4ee467f82f9478bb0c1b8acebbb56de020f47563056dd0dbea5936e SHA512 b706085015d1ab4c9b88997cf6c1c93f6c0ee60c9d1429d3fba7bed7b5acb3392958f64b4207ae27e6eb52abb19ff9640e2b7459e4b19ae21986b82d4b65b182
 EBUILD dvisvgm-2.1.3.ebuild 1108 BLAKE2B 0a391190895375304ad42e95472551a4a92ea583d92a9739befc775b8e9a411d637cafaf8dc84c91aa7314e026a736344162fd1f220d044e7059290af041a6c7 SHA512 58dcfd060f1ab8320ef14956a705adc4a225e35217399b6a8058621c03d46ccc382cb333e0596be7e811a128c5b1851cc35943caf057ec73c489d797178b6508
+EBUILD dvisvgm-2.10.1.ebuild 1166 BLAKE2B 939d7e0f9ac9d0b418d3d2224d0f57a22efd907a392cf804e34bb0616ca45a5ae7c0c2081f4d61902ad48f588fc66a908e7b1a6d3f3d2a62fa43307d6c50235c SHA512 841eeebcac812fbb9297bdce653954b5a39f44a51451ea9315687abf81277917fdbb57a68a6748cd91bf033ca13eb5fd14dbb40ccbbedb1b138e13f42c6416d1
 EBUILD dvisvgm-2.6.1.ebuild 1198 BLAKE2B 43104499f16347592d7b328e575cb528605c852154ee0c9fe7ad468b0cb988347c397d56700ab91ec8404b239a1002ebadb1ed6abbd8aef316892b755a63fb2a SHA512 5a0504d8953c91c552e5c688640400aa16fb11e9add8a6af9a178c44bbe87c7cbe9e0d966f02b47d5d282ec72d738b1617c1e77786f1bc92527762051ba5bd59
 EBUILD dvisvgm-2.7.ebuild 1198 BLAKE2B 7e60b8ea517403fd22f033ed0b3beb8e2adee9a88c575daea688de33088714b4066240e5b764922ccb558b20793bd6d853912325927436fb2afe1e28a0a977db SHA512 7fc67c1d09859469969977d9bcc092267a8970539bd9c6f1d991776de25962138cd74285c5add62f81b443c30fd0f12ff5fdf0ee320d885f5218e377fc0ce693
 MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-2.10.1.ebuild b/app-text/dvisvgm/dvisvgm-2.10.1.ebuild
new file mode 100644
index 000000000000..dd9c838f52f0
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.10.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="https://dvisvgm.de/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+RDEPEND="virtual/tex-base
+	>=app-arch/brotli-1.0.5
+	app-text/ghostscript-gpl
+	dev-libs/kpathsea:=
+	>=dev-libs/xxhash-0.6.5
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	>=media-libs/woff2-1.0.2
+	dev-libs/kpathsea
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local myargs=(
+		--without-ttfautohint
+	)
+	econf "${myargs[@]}"
+}
diff --git a/app-text/ebook-tools/Manifest b/app-text/ebook-tools/Manifest
index c8fa3e876cca..36805001156e 100644
--- a/app-text/ebook-tools/Manifest
+++ b/app-text/ebook-tools/Manifest
@@ -1,3 +1,7 @@
+AUX ebook-tools-0.2.2-crashfix.patch 1883 BLAKE2B 957cdf93efefda23074d762992c71e49b991f634394513923eac93ca9f0c3727ae1c17cbfcd65ede714b9b7876c0abb23945e26b093bf9a8b24193babf3b828e SHA512 1c0b432c1628b7164675df488220aa89a725260cd34e118ec3b96be0e647a899d65418ba4b6a0530a6999dcb4d218023e5541c0f6a1a481c25fee0742b79c5ba
+AUX ebook-tools-0.2.2-fvisibility-hidden.patch 998 BLAKE2B 3595aecd20dd3e046d76517595f337642e0723ac6fddab9a4f74a9e29b3cc415cafce3688f1fbc395e3b681a90ac88c05124b71c69882e1a3cda25c231d5258a SHA512 ae8c8608335e3d7251f4fca959a9ada267cffed6d7abbf7baf5a053490b80789cff3e9fde76ca6c034bf19760a51d6822e2ead7a4f7d15aaa11d5484c463de6f
+AUX ebook-tools-0.2.2-libzip-cmake.patch 3113 BLAKE2B e3b78d2ab278ff759afec16a57f074a722b3f5ff6aeceac9bd736843981d6de205607a0e89ffad0db4fdc14e3d250959a02b642e07b01a77c24aa494a1b37d8a SHA512 d228d9bd192e5cd46c7a991025d995b33e26049053ecd548ab35edace11e10aef6c7ca24c584680f97bb765d7e3485b5e6ea337a0255dcf1041f804213443b78
 DIST ebook-tools-0.2.2.tar.gz 46889 BLAKE2B 20b6ff048e9e31d2e00db3a02b67e21f3031d74aedfc663331b08f626b1816adecad5039e124462f97ff2ff7dc43f002eb39dd625f031ae42fe2b46338e94fcf SHA512 b4518249835ed7cc672392bf2f8b1c62bc218e41c53663bb26ab34c9e43a99b6b7ae794babdb4bd775e467bb17918703a66ee57c8cf94cb7afc4ba2a7f74816a
 EBUILD ebook-tools-0.2.2-r1.ebuild 649 BLAKE2B d39c7352b72d1b8143468be21df3e4f2c094ea6c0b9380ae69d1ec0b6a20f62d820caa4a618861a61c2f00f0402ca2cb1c2c05b5c31346f0da3e929ef487364d SHA512 4cd37a92486ff8fe5a6f62db6016ddc888dcbe27d7d88579721e3ef2fdf3183131108ecb3defce86189401ef5979a236ecba6368202d7c67facf2e94de626fa1
+EBUILD ebook-tools-0.2.2-r2.ebuild 774 BLAKE2B 7e04f816f7f11e9653b571ef0652094431e5390cfa0394b899f8c0b104533c7faf83b7e5a2ace646eda0200934db1f96ee00c40f424a49f9ad0db54bd319173c SHA512 ac365508573ea852bdbb481580f314e313e843ef16b4323c961193a9d84fd8e3c4f5c28ba3e80f593d3241ae8fcdbb4c0848bd9dad297d6f8795087b43380ef9
 MISC metadata.xml 400 BLAKE2B c225e8514134fea3843975618d6bb5b6085785eb71a9b0413bf986d752eff783f973c10fb7e6af504a3efa1c0e05475b421ff4c1f4c24bf51d4a948d485ed103 SHA512 2ab30e14742c63fc54cc75068b57d1c9fa178d6f57fb03b8b15c5649d4bdf35c5068a132c6ee50fe855a2037af67b5c2fd2229cc97b4f3e89f4eecde6d21885b
diff --git a/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild b/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
new file mode 100644
index 000000000000..b8b20f0bdac3
--- /dev/null
+++ b/app-text/ebook-tools/ebook-tools-0.2.2-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+DESCRIPTION="Tools for accessing and converting various ebook file formats"
+HOMEPAGE="https://sourceforge.net/projects/ebook-tools/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="+lit2epub"
+
+DEPEND="
+	dev-libs/libxml2
+	>=dev-libs/libzip-1.7.2:=
+"
+RDEPEND="${DEPEND}
+	lit2epub? ( app-text/convertlit	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-crashfix.patch"
+	"${FILESDIR}/${P}-fvisibility-hidden.patch"
+	"${FILESDIR}/${P}-libzip-cmake.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+	use lit2epub || sed -e "\|lit2epub|d" -i src/tools/CMakeLists.txt || die
+}
diff --git a/app-text/ebook-tools/files/ebook-tools-0.2.2-crashfix.patch b/app-text/ebook-tools/files/ebook-tools-0.2.2-crashfix.patch
new file mode 100644
index 000000000000..1ca8dd4902f2
--- /dev/null
+++ b/app-text/ebook-tools/files/ebook-tools-0.2.2-crashfix.patch
@@ -0,0 +1,50 @@
+From 93ebf942a90f9c95797838f9adab94bc0378671c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
+Date: Tue, 30 Apr 2019 16:36:09 +0200
+Subject: [PATCH] Avoid crash on toc.ncx navPoint without navLabel
+
+Althoug at least one navLabel is required per navPoint, there is no
+guarantee it actually exists.
+
+Avoid crashes due to invalid accesses of a null label in case the toc is
+broken, and spew a warning.
+
+Fixes #8 epub_tit_next crashes on navPoint without navLabel.
+---
+ src/libepub/epub.c | 5 +++--
+ src/libepub/opf.c  | 4 ++++
+ 2 files changed, 7 insertions(+), 2 deletions(-)
+
+diff --git a/src/libepub/epub.c b/src/libepub/epub.c
+index d085503..a259d9d 100644
+--- a/src/libepub/epub.c
++++ b/src/libepub/epub.c
+@@ -469,8 +469,9 @@ int epub_tit_next(struct titerator *tit) {
+   case TITERATOR_NAVMAP:
+   case TITERATOR_PAGES:
+     ti = GetNodeData(curr);
+-    tit->cache.label = 
+-      (char *)_opf_label_get_by_doc_lang(tit->epub->opf, ti->label);
++    if (ti->label)
++      tit->cache.label =
++        (char *)_opf_label_get_by_doc_lang(tit->epub->opf, ti->label);
+ 
+     if (! tit->cache.label)
+       tit->cache.label = (char *)ti->id;
+diff --git a/src/libepub/opf.c b/src/libepub/opf.c
+index 6851db2..09bce9e 100644
+--- a/src/libepub/opf.c
++++ b/src/libepub/opf.c
+@@ -398,6 +398,10 @@ void _opf_parse_navmap(struct opf *opf, xmlTextReaderPtr reader) {
+      
+       } else if (xmlTextReaderNodeType(reader) == 15) {
+         if (item) {
++          if (! item->label) {
++            _epub_print_debug(opf->epub, DEBUG_WARNING, 
++                              "- missing navlabel for nav point element");
++          }
+           _epub_print_debug(opf->epub, DEBUG_INFO, 
+                             "adding nav point item->%s %s (d:%d,p:%d)", 
+                             item->id, item->src, item->depth, item->playOrder);
+-- 
+2.21.0
diff --git a/app-text/ebook-tools/files/ebook-tools-0.2.2-fvisibility-hidden.patch b/app-text/ebook-tools/files/ebook-tools-0.2.2-fvisibility-hidden.patch
new file mode 100644
index 000000000000..933ecb878810
--- /dev/null
+++ b/app-text/ebook-tools/files/ebook-tools-0.2.2-fvisibility-hidden.patch
@@ -0,0 +1,22 @@
+--- a/src/libepub/epub_shared.h
++++ b/src/libepub/epub_shared.h
+@@ -8,7 +8,7 @@
+ #  define EPUB_EXPORT __declspec(dllimport)
+ # endif
+ #else
+-# define EPUB_EXPORT
++# define EPUB_EXPORT __attribute__ ((visibility ("default")))
+ #endif
+ 
+ /**
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,7 +15,7 @@ find_package(LibXml2 REQUIRED)
+ find_package(LibZip REQUIRED)
+ 
+ if(CMAKE_C_COMPILER_ID MATCHES GNU)
+-  set(CMAKE_C_FLAGS "-Wall -W -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -Wshadow -fno-common ${CMAKE_C_FLAGS}")
++  set(CMAKE_C_FLAGS "-Wall -W -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -Wshadow -fno-common -fvisibility=hidden ${CMAKE_C_FLAGS}")
+ endif(CMAKE_C_COMPILER_ID MATCHES GNU)
+ if(MSVC)
+   add_definitions(-D_CRT_SECURE_NO_WARNINGS)
diff --git a/app-text/ebook-tools/files/ebook-tools-0.2.2-libzip-cmake.patch b/app-text/ebook-tools/files/ebook-tools-0.2.2-libzip-cmake.patch
new file mode 100644
index 000000000000..d1a560f1a5da
--- /dev/null
+++ b/app-text/ebook-tools/files/ebook-tools-0.2.2-libzip-cmake.patch
@@ -0,0 +1,83 @@
+From fa125b4223bc8995ed60befbed757ec23eed72e7 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 22 Oct 2020 23:32:33 +0200
+Subject: [PATCH] Use >=dev-libs/libzip-1.7.2 cmake config
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt             |  2 +-
+ cmake/FindLibZip.cmake     | 36 ------------------------------------
+ src/libepub/CMakeLists.txt |  2 +-
+ 3 files changed, 2 insertions(+), 38 deletions(-)
+ delete mode 100644 cmake/FindLibZip.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fc141c2..691cf2b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -11,7 +11,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ set(LIB_SUFFIX "" CACHE STRING "Define suffix of library directory name (32/64)")
+ 
+ find_package(LibXml2 REQUIRED)
+-find_package(LibZip REQUIRED)
++find_package(LibZip 1.7.2 CONFIG REQUIRED)
+ 
+ if(CMAKE_C_COMPILER_ID MATCHES GNU)
+   set(CMAKE_C_FLAGS "-Wall -W -Wno-long-long -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -Wshadow -fno-common ${CMAKE_C_FLAGS}")
+diff --git a/cmake/FindLibZip.cmake b/cmake/FindLibZip.cmake
+deleted file mode 100644
+index c873092..0000000
+--- a/cmake/FindLibZip.cmake
++++ /dev/null
+@@ -1,36 +0,0 @@
+-# - Try to find libzip
+-# Once done this will define
+-#
+-#  LIBZIP_FOUND - system has the zip library
+-#  LIBZIP_INCLUDE_DIR - the zip include directory
+-#  LIBZIP_LIBRARY - Link this to use the zip library
+-#
+-# Copyright (c) 2006, Pino Toscano, <toscano.pino@tiscali.it>
+-#
+-# Redistribution and use is allowed according to the terms of the BSD license.
+-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+-
+-if (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
+-  # in cache already
+-  set(LIBZIP_FOUND TRUE)
+-else (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
+-
+-  find_path(LIBZIP_INCLUDE_DIR zip.h
+-    ${GNUWIN32_DIR}/include
+-  )
+-
+-  find_library(LIBZIP_LIBRARY NAMES zip
+-    PATHS
+-    ${GNUWIN32_DIR}/lib
+-  )
+-
+-  include(FindPackageHandleStandardArgs)
+-  FIND_PACKAGE_HANDLE_STANDARD_ARGS(LibZip DEFAULT_MSG LIBZIP_LIBRARY LIBZIP_INCLUDE_DIR)
+-
+-    # ensure that they are cached
+-    set(LIBZIP_INCLUDE_DIR ${LIBZIP_INCLUDE_DIR} CACHE INTERNAL "The libzip include path")
+-    set(LIBZIP_LIBRARY ${LIBZIP_LIBRARY} CACHE INTERNAL "The libraries needed to use libzip")
+-
+-endif (LIBZIP_LIBRARY AND LIBZIP_INCLUDE_DIR)
+-
+-mark_as_advanced(LIBZIP_INCLUDE_DIR LIBZIP_LIBRARY)
+diff --git a/src/libepub/CMakeLists.txt b/src/libepub/CMakeLists.txt
+index a3208b7..460270c 100644
+--- a/src/libepub/CMakeLists.txt
++++ b/src/libepub/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ include_directories (${EBOOK-TOOLS_SOURCE_DIR}/src/libepub ${LIBXML2_INCLUDE_DIR} ${LIBZIP_INCLUDE_DIR})
+ add_library (epub SHARED epub.c ocf.c opf.c linklist.c list.c)
+-target_link_libraries (epub ${LIBZIP_LIBRARY} ${LIBXML2_LIBRARIES})
++target_link_libraries (epub libzip::zip ${LIBXML2_LIBRARIES})
+ 
+ set_target_properties (epub PROPERTIES VERSION 0.2.1 SOVERSION 0)
+ 
+-- 
+2.29.0
+
diff --git a/app-text/epstool/Manifest b/app-text/epstool/Manifest
index a8ad1f236da2..258e1944051c 100644
--- a/app-text/epstool/Manifest
+++ b/app-text/epstool/Manifest
@@ -1,4 +1,8 @@
+AUX epstool-3.09-no-gcc-linker.patch 763 BLAKE2B e106b30948a7fb12ecf76c58a80336a90ab29602c608a5c966cede91e5ff6034de69957719ff08c7b9942dda81c38459f95430c1c65dfce449774b2f023de6e0 SHA512 9d043a52524a0e15166c0437e11373724068ad1c468bf528eb39fb3d4a3a1e44973e554ec5b82d45fb2e8af8f5768294029fef91eda6b21cad51b3227e6a8a90
+AUX epstool-3.09-no-use-gnu.patch 951 BLAKE2B 22dd85e96cb2ceb4001c0713da541414ab158614352adadc6d523f67abd9fdd28089c8728e52d01659676ac3630c61fbfb467aa1b6a5f95be75aa84c60b058fe SHA512 adcaa0a1f35aaeae8e373147183665ee45db98170784070f7959bbd5e145169bd99ac21fc199a97e93fede6db9ac67eeead4367f434cbc0f46eff727a7d06aa6
 AUX gcc43.patch 632 BLAKE2B 3f4537c7b4e20e50aafa3d8e07379eb8db2e68c1abbe6e096b2e5926b6a3ab539c6478dcff7d03f2c93888abf3dc8c64cd6531c855c9a145fe2c50c9a5a8c144 SHA512 a088a86e2c66469da955a4ba2309142cf54be9d88ca18c8c173d9a285a145c3432ec99d4c212f5f69caeeef17035a063f2ca55d57bf72325258555a0af8ca875
 DIST epstool-3.08.tar.gz 191567 BLAKE2B 6ef2912e10e65809f60444d09facc1ea3800e492e55e87a4f00c95f7dbabd45c4d48b447fd92879e97e9dc2fe9698c1ff7d4cb06bdf3724f16ed89f76a829a8d SHA512 d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1
-EBUILD epstool-3.08-r1.ebuild 903 BLAKE2B d142c8e851ef544dd098b41572a88afcdc70895a8f61538f70a8dcebce677524e509e51987b242f1ace9ae1ebd125b970819c863a787375d23faf100233f7dda SHA512 ec0b4d0c5282fcbc39c726b21809f4a7bbb41dacda97a94e2574574f2cc32d08fe768430710f7ac1e91f28a98a8492d74b9df7d430ec7da4aef0507aa2210d3b
+DIST epstool-3.09.tar.gz 191023 BLAKE2B becb264bf93bdb1244550e0707eb2d513d8c4b8d9eee09356bd2ddaf25bc8b97e0c5e73a02839a0f66f18bd1949cb549525967ec430104c33067d9ca57984a6f SHA512 cb9519be0879ff791f0e243a541538254e24949683aa792f673334d2d1dbd3e449ec36890ccbb3852563cf8da997a035a80df605b395a1b84cbced7522dce291
+EBUILD epstool-3.08-r1.ebuild 904 BLAKE2B 50b366747cd1c79275a6a7c82dfd937ed5d052f81be2ce1c48c0d1f10cf8c59c7dead1ac8e1026fbd8566709ee5aff180c947c26f2b650469128f05a7053b570 SHA512 34323645e925827275dfd63f016a7578eb3d6c0a7bcfa71597afb7b010081caf0bb6e65b8c529dbd7ebb144c6242e71186f6187e76cb3daccdaad3c613016400
+EBUILD epstool-3.09.ebuild 893 BLAKE2B a8fd79b506225de9cf28d7fbdc777baf8caddf34780a6a4afeabd2bdce32f9ef988e13996d4ff74c4cb9f66614d6d5dc1889442355390f5bebf309b0530a04ad SHA512 b826f3b12814d718d523c7d5c2bf66e4bc551b6b81d987ee11841a243ea8d5b0d076b33dad67006366b5b4e63f45d3369fdef32240fe8bfdce8898d2d9cb0c1f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/epstool/epstool-3.08-r1.ebuild b/app-text/epstool/epstool-3.08-r1.ebuild
index 04ef4ccd4060..8db4ff40e2e6 100644
--- a/app-text/epstool/epstool-3.08-r1.ebuild
+++ b/app-text/epstool/epstool-3.08-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -6,12 +6,12 @@ EAPI="5"
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Creates or extracts preview images in EPS files, fixes bounding boxes"
-HOMEPAGE="http://www.cs.wisc.edu/~ghost/gsview/epstool.htm"
+HOMEPAGE="http://www.ghostgum.com.au/software/epstool.htm"
 SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="app-text/ghostscript-gpl"
 RDEPEND="${DEPEND}"
diff --git a/app-text/epstool/epstool-3.09.ebuild b/app-text/epstool/epstool-3.09.ebuild
new file mode 100644
index 000000000000..21df4bab8b64
--- /dev/null
+++ b/app-text/epstool/epstool-3.09.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Creates or extracts preview images in EPS files, fixes bounding boxes"
+HOMEPAGE="http://www.ghostgum.com.au/software/epstool.htm"
+SRC_URI="http://www.ghostgum.com.au/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+
+DEPEND="app-text/ghostscript-gpl"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-no-use-gnu.patch
+	"${FILESDIR}"/${P}-no-gcc-linker.patch
+)
+
+src_prepare() {
+	default
+	tc-export CC
+
+	# parallel make issue (bug #506978)
+	mkdir bin || die
+	mkdir epsobj || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" epstool
+}
+
+src_install() {
+	dobin bin/epstool
+	doman doc/epstool.1
+	local HTML_DOCS=( doc/epstool.htm doc/gsview.css )
+	einstalldocs
+}
diff --git a/app-text/epstool/files/epstool-3.09-no-gcc-linker.patch b/app-text/epstool/files/epstool-3.09-no-gcc-linker.patch
new file mode 100644
index 000000000000..cf3e03dfa609
--- /dev/null
+++ b/app-text/epstool/files/epstool-3.09-no-gcc-linker.patch
@@ -0,0 +1,27 @@
+From cbd73f2bb7dd3a55d0d35b0638e84b8f17e56b52 Mon Sep 17 00:00:00 2001
+From: Helmut Grohne <helmut@subdivi.de>
+Date: Fri, 14 Sep 2018 18:17:39 +0200
+Subject: [PATCH] Make epstool cross buildable by not hardcoding gcc as linker
+
+---
+ src/unixcom.mak | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/unixcom.mak b/src/unixcom.mak
+index 1063b65..ca0b031 100755
+--- a/src/unixcom.mak
++++ b/src/unixcom.mak
+@@ -22,8 +22,8 @@ GSCFLAGS= $(CDEFS) -Wall -Wstrict-prototypes -Wmissing-declarations -Wmissing-pr
+ CCAUX=gcc
+ CC=gcc
+ LFLAGS=$(PLINK) $(LIBPNGLIBS) $(GTKLIBS)
+-CLINK=gcc $(LDFLAGS)
+-LINK=gcc $(LDFLAGS)
++CLINK=$(CC) $(LDFLAGS)
++LINK=$(CC) $(LDFLAGS)
+ 
+ 
+ COMP=$(CC) -I$(SRCDIR) -I$(OBJDIR) $(CFLAGS) $(GSCFLAGS)
+-- 
+2.29.2
+
diff --git a/app-text/epstool/files/epstool-3.09-no-use-gnu.patch b/app-text/epstool/files/epstool-3.09-no-use-gnu.patch
new file mode 100644
index 000000000000..cb42381138e2
--- /dev/null
+++ b/app-text/epstool/files/epstool-3.09-no-use-gnu.patch
@@ -0,0 +1,31 @@
+From 706546a4921b98834ebf241ea751e0db5d0d192f Mon Sep 17 00:00:00 2001
+From: Adrian Bunk <bunk@debian.org>
+Date: Fri, 14 Sep 2018 18:17:39 +0200
+Subject: [PATCH] src/cplat.h: Don't define __USE_GNU
+
+There were two things wrong with it:
+- __USE_GNU is glibc-internal, the external define is _GNU_SOURCE
+- defining such macros after the first include is wrong, in this case
+it caused FTBFS on ia64.
+
+An option would be to pass -D_GNU_SOURCE when building, but as far
+as I can see the define was not (anymore?) needed at all.
+---
+ src/cplat.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/cplat.h b/src/cplat.h
+index 8bbd9c5..ad5cee4 100755
+--- a/src/cplat.h
++++ b/src/cplat.h
+@@ -109,7 +109,6 @@ typedef struct POINT_s {
+ typedef struct _GdkRgbCmap GdkRgbCmap;
+ # endif
+ # include <unistd.h>
+-# define __USE_GNU	/* we might need recursive mutex */
+ # include <semaphore.h>
+ # include <pthread.h>
+ # define ZLIBNAME "libz.so"
+-- 
+2.29.2
+
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index b703eaffc21b..8b946afdcc34 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,6 +1,4 @@
 AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782e56ee9e032d625e51796723a2ad43e3cb9083055bcbc10438cb70b15e7c7c6737db3d7276db1e02b19127c5d75e527 SHA512 f1a98d09a0fee6add7a5a44d756ceaa003cbb3840e74a513c1f01ad6826ee4136cc5b862b675401371951468f1cdb2e5137158c44801a0c9ebe79c60951b8fbd
-DIST evince-3.34.2.tar.xz 2565752 BLAKE2B 76497c34ce2eb460a3f2c3e790a7c44b9eeddd566854061d49fba2ba7cefa3b523d7bfe973d08b7ec1e8d967e4cbd63c73a668a346bd158a67752897f25827ee SHA512 51bfa4671e17a98c536790185ece6f4f77b956062901f840cd298cdc3e42eb7e8cabe9bfa84387f185cdf7462a322ef54bbc463b988a677af68561e55acd9f12
 DIST evince-3.36.7.tar.xz 2580208 BLAKE2B 76ba6d206289f9981af24e5d82c9567c05984ad71efe83391aa1f8fdd94d31c284e600cf81eab9868e01f120f71cde1ae9b6ee6b7a4b1da47458d17b95b78d87 SHA512 dacc26d2d75c3dcadceb0a35c995ae3501bd91e84632cdf87decd359350e74032444707ea152e24c01fb57fe0ef2a426813a33919833cefdeb8699f8c642d910
-EBUILD evince-3.34.2.ebuild 3133 BLAKE2B f98ca75f5c17333f062ca74daf739c1cf0a5c26bf55f54c95be45e1bd2469f4fc28e428ce9e4b59b1d67206f83885b3706f79af25e1ceff19dd61641c253c4e6 SHA512 14eb12ba64aa16e65649be0f41379e887030095c66fba79d46682cd03e1f4d94cd74c0978e2a6d7a37405235c7d214df96a3275449050c1b97d5efc47631b981
 EBUILD evince-3.36.7.ebuild 3133 BLAKE2B d178be50e5460d9d834cbb0b940c19541570fc4b2de8439b06c44db95685ef7e66a95e88c8e42b30b05461586bfbec3188053a7a98fe781d4c514e7aca8cdd0d SHA512 74a824eddcd0caf3c5a87432535bdc779fe1f328baa10f6d3ad3483d4b8e38eaff561785e1920413ee8e4955b259c2755b17ae15b6e2ab0a077d779dd84b7740
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-3.34.2.ebuild b/app-text/evince/evince-3.34.2.ebuild
deleted file mode 100644
index 303e46ceeaa5..000000000000
--- a/app-text/evince/evince-3.34.2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2 systemd
-
-DESCRIPTION="Simple document viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
-
-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"
-
-# atk used in libview
-# bundles unarr
-COMMON_DEPEND="
-	dev-libs/atk
-	>=dev-libs/glib-2.38.0:2
-	>=dev-libs/libxml2-2.5:2
-	sys-libs/zlib:=
-	>=x11-libs/gdk-pixbuf-2.36.5:2
-	>=x11-libs/gtk+-3.22.0:3[introspection?]
-	gnome-base/gsettings-desktop-schemas
-	>=x11-libs/cairo-1.10:=
-	>=app-text/poppler-0.76.0[cairo]
-	>=app-arch/libarchive-3.2.0
-	djvu? ( >=app-text/djvu-3.5.22:= )
-	dvi? (
-		virtual/tex-base
-		dev-libs/kpathsea:=
-		t1lib? ( >=media-libs/t1lib-5:= ) )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0 )
-	gnome? ( gnome-base/gnome-desktop:3= )
-	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
-	introspection? ( >=dev-libs/gobject-introspection-1:= )
-	nautilus? ( >=gnome-base/nautilus-2.91.4 )
-	postscript? ( >=app-text/libspectre-0.2:= )
-	spell? ( >=app-text/gspell-1.6.0:= )
-	tiff? ( >=media-libs/tiff-3.6:0= )
-	xps? ( >=app-text/libgxps-0.2.1:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gvfs
-	gnome-base/librsvg
-	|| (
-		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/appstream-glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.13
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-	app-text/yelp-tools
-"
-# eautoreconf needs:
-#  app-text/yelp-tools
-
-PATCHES=(
-	"${FILESDIR}"/3.30.2-internal-synctex.patch # don't automagically link to synctex from texlive-core - always use internal copy of this small parser for now; requires eautoreconf
-)
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Do not depend on adwaita-icon-theme, bug #326855, #391859
-	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
-	sed -e 's/adwaita-icon-theme >= $ADWAITA_ICON_THEME_REQUIRED//g' \
-		-i configure || die "sed failed"
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--enable-pdf \
-		--enable-comics \
-		--enable-thumbnailer \
-		--with-platform=gnome \
-		--enable-dbus \
-		$(use_enable djvu) \
-		$(use_enable dvi) \
-		$(use_enable gstreamer multimedia) \
-		$(use_enable gnome libgnome-desktop) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable introspection) \
-		$(use_enable nautilus) \
-		$(use_enable nsplugin browser-plugin) \
-		$(use_enable postscript ps) \
-		$(use_with spell gspell) \
-		$(use_enable t1lib) \
-		$(use_enable tiff) \
-		$(use_enable xps) \
-		BROWSER_PLUGIN_DIR="${EPREFIX}"/usr/$(get_libdir)/nsbrowser/plugins \
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-}
diff --git a/app-text/fbpdf/Manifest b/app-text/fbpdf/Manifest
index ef7cc46bc34d..6fe9698085c2 100644
--- a/app-text/fbpdf/Manifest
+++ b/app-text/fbpdf/Manifest
@@ -1,5 +1,4 @@
-AUX fbpdf-0_p20190202-printf.patch 1166 BLAKE2B 41972cfeea7bbc8d1e1840a21882c82050b2f91fff75056067fd00e6ed4a67929f35674cb3e09e5345ce2690cbb92a1676a4ef273f804d866cad5385cc48cc43 SHA512 e91f8158d0a8237010dda66eee289046348b8b657b859e4de1ae22c91424c47775df94f5d58151c930453389e71b4237c07b942c4391afe288e980d19833f183
 AUX fbpdf-0_p20190202-use-pkg-config.patch 1258 BLAKE2B 7542773b6ecf8fed73abcca526d41cfbc7629da44bd3e50649951680469ac7a5f1392a75b4849a8626fe740436bf1bdea9a0131f9e60558f37bb7cdbb1ed89e7 SHA512 6086ff1948ba000c8330aa5fe510b84d74a91254a75ac07c326730c371a4ab47cd2f936ceb888bed4c1520b9fec61a823fb1656533374586cd4fe2466b3160bc
-DIST fbpdf-0_p20190202-dfe9f0067549f759cdc04f2f62b4f89cd6e1b199.tar.gz 7874 BLAKE2B 873da768b0152559536c73b7ed575c3457efe184934a38d0a9600412ac3a8616297194ab045be1d7eddb470d8d73ead4c655797fd7ba1efe6f2be9a19a5318b4 SHA512 f216a0993573e4e491845638b72ff019910f8a333ed618158e81bcb3f68619596f0354b0039c38c7619dd65c040aa599ed8923ac974717b86fb431e5c6954f3b
-EBUILD fbpdf-0_p20190202-r1.ebuild 868 BLAKE2B 577a0505265a3e7f1643722d64436197cc108618861ec4a7970e889c6ca5c51d6484f6bbf0ce404667c59cb87db604523a359c97f8cd8dcc84ea82a17aa27db2 SHA512 482c65a5c6ec5d6c070fe757cfe44c7f05413c3ea66ebef52b6e0d1813323bdf910a14be494f9439fbbbdca60e196ad54a084bf913526942a35bb2c255604654
+DIST fbpdf-0_p20200614-27c9e28e9199a2491d0ee0a885760bedb1d4547b.tar.gz 8432 BLAKE2B 0004f8558b86c349744a37099ef86963d368ee9dedeefca861761f88adc3c94a3db9f46c9e1a6f6026357512a8320b956cd7c48108aa6c6657b84193fd5d4b49 SHA512 e037cd536e3a26b6d2364eb52803de67606bac418db8691c7530a889c95dd1f8661985021237ce7fea95f56ab5a308caf8d470c6c036b51b17211f9c200aba51
+EBUILD fbpdf-0_p20200614.ebuild 848 BLAKE2B 949f4773cc367a87c78f498d90ef810629b4a2cc342bf8b9008db51d76eab9d75a1ac168b0f0c207b2edcdc4c0a4c6dbe0a460b6b2b7e5908609d1e75ae582fe SHA512 c565fd79821adc8c19435d7fc65c779b673a851899d45eb00016dc776e1ddbf4854a97b570aaf9577e717053430b562f648f74bdd483eee30215e530ec28ecce
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild b/app-text/fbpdf/fbpdf-0_p20200614.ebuild
index 79bea0cffbde..964e63527de6 100644
--- a/app-text/fbpdf/fbpdf-0_p20190202-r1.ebuild
+++ b/app-text/fbpdf/fbpdf-0_p20200614.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit toolchain-funcs vcs-snapshot
 
-COMMIT="dfe9f0067549f759cdc04f2f62b4f89cd6e1b199"
+COMMIT="27c9e28e9199a2491d0ee0a885760bedb1d4547b"
 
 DESCRIPTION="framebuffer pdf and djvu viewer"
 HOMEPAGE="https://github.com/aligrudi/fbpdf"
@@ -29,8 +29,7 @@ BDEPEND="virtual/pkgconfig"
 S=${WORKDIR}/${P}-${COMMIT}
 
 PATCHES=(
-	"${FILESDIR}"/${P}-use-pkg-config.patch
-	"${FILESDIR}"/${P}-printf.patch
+	"${FILESDIR}"/${PN}-0_p20190202-use-pkg-config.patch
 )
 
 src_compile() {
diff --git a/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch b/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch
deleted file mode 100644
index 31f9fbe2c8ab..000000000000
--- a/app-text/fbpdf/files/fbpdf-0_p20190202-printf.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/714736
-
-From e89e36c01d09ca6aec03732e922e749257cac3f4 Mon Sep 17 00:00:00 2001
-From: Dmitry Bogatov <KAction@disroot.org>
-Date: Sun, 9 Feb 2020 00:47:09 -0500
-Subject: [PATCH] Avoid passing non-constant format string to printf
-
-gcc complains loudly on any code that uses anything but string literal
-as format string to printf. Right now format string is "const char *"
-and does not contain %-sequences, but should '%' appear in "usage"
-string in future, bad things would happen.
-
-Since formatting functionality of "printf" is not used anyway, replacing
-it with "puts" makes code both safer and easier to understand.
----
- fbpdf.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/fbpdf.c b/fbpdf.c
-index a58797f..65b654b 100644
---- a/fbpdf.c
-+++ b/fbpdf.c
-@@ -351,13 +351,13 @@ static void mainloop(void)
- }
- 
- static char *usage =
--	"usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename\n";
-+	"usage: fbpdf [-r rotation] [-z zoom x10] [-p page] filename";
- 
- int main(int argc, char *argv[])
- {
- 	int i = 1;
- 	if (argc < 2) {
--		printf(usage);
-+		puts(usage);
- 		return 1;
- 	}
- 	strcpy(filename, argv[argc - 1]);
diff --git a/app-text/fbreader/Manifest b/app-text/fbreader/Manifest
index fc466a0f0db9..2295f745a6bc 100644
--- a/app-text/fbreader/Manifest
+++ b/app-text/fbreader/Manifest
@@ -1,4 +1,4 @@
-AUX fbreader-0.99.4-combined.patch 23589 BLAKE2B 81cb00abe9ba0f40723e6c1cac626916f90eede960d8b191bcb48c8186be8fc3d1fb18954f62e3ba5f15de159034a6060dc7efaf94f9531aabad9f76b6f53658 SHA512 c4dd5237113fa9d54ae3e63a19a06841570e5751108befe4d18ae7b4730628d3a4a5613dd302bc426b14c280f2b5abf9e394aedca821de995efb45ae7b32f632
+DIST fbreader-0.99.4-combined.patch 23589 BLAKE2B 81cb00abe9ba0f40723e6c1cac626916f90eede960d8b191bcb48c8186be8fc3d1fb18954f62e3ba5f15de159034a6060dc7efaf94f9531aabad9f76b6f53658 SHA512 c4dd5237113fa9d54ae3e63a19a06841570e5751108befe4d18ae7b4730628d3a4a5613dd302bc426b14c280f2b5abf9e394aedca821de995efb45ae7b32f632
 DIST fbreader-sources-0.99.4.tgz 2345664 BLAKE2B 29d921a953df98def51740d9b7fed5a7164f5df6410c70daf03f30ba8f77e9aa898d6f50038945155dc46243165860ffaf13abc81f662abccdeb6dc91652b3d5 SHA512 d4b11d7ab03df002ad4212db805b10b80a24ea4384e92122b12c25a3f817a0eb343509ae30e31d68417fd4ce27f77e043235436f0081ff2c785a2830d6211dc7
-EBUILD fbreader-0.99.4-r5.ebuild 1963 BLAKE2B 7e57a9735769fb874456cd61ec0b2c6baf4a953847bad977b397753a0ece645bf6c8390663ad5fee1ea925f2c8168209652e13cc5ae9b261eee5054ccf1f76aa SHA512 dd2afce62eed3c7f5b0ad8bfa8f4a065511b1609d29b5bb1f5b2418abe24f487370803c952b52a4c5f6722055347ea6e4523fac637e8c14fc548b935fcf1ac05
+EBUILD fbreader-0.99.4-r5.ebuild 2044 BLAKE2B 4304693bb3ef9c76a768c15793cfa19bc8ff65d89150e38d603a2fd6e462b70b30c564c81288240db29a9414962537aed8fd41cf12c1bfa18ed48821df58b69f SHA512 11e6b89b3eff7e76437fa9b212264e9196bf82b4cb07e4cf0561492092dc5d88658676dd9a808e768313142999dd03c009c2bc118bf569b4f404058a845cff4b
 MISC metadata.xml 217 BLAKE2B ee18cbf5c74b73e82c3d6528706b679f77eaf110c7bef909917ff95a879e1677926033175865b01cd88cf187643bf94dde28c48a6303164d6ddac16a1ee6b6ae SHA512 ede62db62d2516bfa0b6bd9fd3a8f3f54303d57b81f04cc79ac3da39c33b781e35e6cf50a47a2a030a8038d2ec4eb8cabfe00dd3881d838a01c4916828b91396
diff --git a/app-text/fbreader/fbreader-0.99.4-r5.ebuild b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
index 75cd8347fff2..b3b298ab9d81 100644
--- a/app-text/fbreader/fbreader-0.99.4-r5.ebuild
+++ b/app-text/fbreader/fbreader-0.99.4-r5.ebuild
@@ -3,11 +3,12 @@
 
 EAPI=7
 
-inherit flag-o-matic qmake-utils
+inherit flag-o-matic qmake-utils xdg
 
 DESCRIPTION="E-Book Reader. Supports many e-book formats"
 HOMEPAGE="https://www.fbreader.org/"
-SRC_URI="https://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz"
+SRC_URI="https://www.fbreader.org/files/desktop/${PN}-sources-${PV}.tgz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/fbreader-0.99.4-combined.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -33,7 +34,7 @@ BDEPEND="
 "
 
 # bugs #452636, #515698, #516794, #437262, #592588
-PATCHES=( "${FILESDIR}"/${P}-combined.patch )
+PATCHES=( "${DISTDIR}"/${P}-combined.patch )
 
 src_prepare() {
 	default
diff --git a/app-text/fbreader/files/fbreader-0.99.4-combined.patch b/app-text/fbreader/files/fbreader-0.99.4-combined.patch
deleted file mode 100644
index f75c0fdf1e2c..000000000000
--- a/app-text/fbreader/files/fbreader-0.99.4-combined.patch
+++ /dev/null
@@ -1,535 +0,0 @@
-diff -r -U2 fbreader-0.99.4.orig/fbreader/Makefile fbreader-0.99.4/fbreader/Makefile
---- fbreader-0.99.4.orig/fbreader/Makefile	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/fbreader/Makefile	2018-01-11 22:18:18.000208200 +0700
-@@ -23,5 +23,5 @@
- 	done;
- 	@echo -n 'Linking $(TARGET) ...'
--	@$(LD) $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
-+	@$(LD) -fuse-ld=bfd $(LDFLAGS) -o $(TARGET) `find src -name *.o` $(TEXT_LIBS) $(CORE_LIBS) $(ZLUI_LIB) -lsqlite3
- 	@echo ' OK'
- 
-diff -r -U2 fbreader-0.99.4.orig/fbreader/desktop/desktop fbreader-0.99.4/fbreader/desktop/desktop
---- fbreader-0.99.4.orig/fbreader/desktop/desktop	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/fbreader/desktop/desktop	2018-01-11 22:13:58.401219117 +0700
-@@ -22,2 +22,3 @@
- Icon=FBReader
- Categories=Office;Viewer;Literature;
-+MimeType=application/epub+zip;application/rtf;application/x-fictionbook+xml;application/x-zip-compressed-fb2;application/x-mobipocket-ebook;application/xhtml+xml;text/html;text/plain;
-diff -r -U2 fbreader-0.99.4.orig/fbreader/src/formats/doc/OleStorage.cpp fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp
---- fbreader-0.99.4.orig/fbreader/src/formats/doc/OleStorage.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/fbreader/src/formats/doc/OleStorage.cpp	2018-01-11 22:18:33.000207569 +0700
-@@ -60,5 +60,5 @@
- 		return false;
- 	}
--	static const char OLE_SIGN[] = {0xD0, 0xCF, 0x11, 0xE0, 0xA1, 0xB1, 0x1A, 0xE1, 0};
-+	static const char OLE_SIGN[] = {(char)0xD0, (char)0xCF, (char)0x11, (char)0xE0, (char)0xA1, (char)0xB1, (char)0x1A, (char)0xE1, 0};
- 	if (std::strncmp(oleBuf, OLE_SIGN, 8) != 0) {
- 		clear();
-diff -r -U2 fbreader-0.99.4.orig/makefiles/arch/desktop.mk fbreader-0.99.4/makefiles/arch/desktop.mk
---- fbreader-0.99.4.orig/makefiles/arch/desktop.mk	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/makefiles/arch/desktop.mk	2018-01-11 22:18:40.119207269 +0700
-@@ -15,27 +15,9 @@
- CFLAGS = -pipe -fno-exceptions -Wall -Wno-ctor-dtor-privacy -W -DLIBICONV_PLUG
- LDFLAGS =
--EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi) 
-+EXTERNAL_INCLUDE = $(shell pkg-config --cflags fribidi)
- 
--ifeq "$(UI_TYPE)" "qt"
--  MOC = moc-qt3
--  QTINCLUDE = -I /usr/include/qt3
--else
--  MOC = $(shell pkg-config QtCore --variable=moc_location)
--  QTINCLUDE = -I $(shell pkg-config --cflags QtCore)
--endif
--
--GTKINCLUDE = $(shell pkg-config --cflags gtk+-2.0 libpng xft)
--
--ifeq "$(UI_TYPE)" "qt"
--  UILIBS = -lqt-mt
--endif
--
--ifeq "$(UI_TYPE)" "qt4"
--  UILIBS = $(shell pkg-config --libs QtCore QtGui QtNetwork)
--endif
--
--ifeq "$(UI_TYPE)" "gtk"
--  UILIBS = $(shell pkg-config --libs gtk+-2.0 gio-2.0) -lpng -ljpeg
--endif
-+MOC = "$(shell pkg-config --variable=host_bins Qt5Core)/moc"
-+QTINCLUDE = $(shell pkg-config --cflags Qt5Gui Qt5Widgets Qt5Network)
-+UILIBS = $(shell pkg-config --libs Qt5Gui Qt5Widgets Qt5Network)
- 
- RM = rm -rvf
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/LineEditParameter.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/LineEditParameter.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,7 +18,7 @@
-  */
- 
--#include <QtGui/QBoxLayout>
--#include <QtGui/QLineEdit>
--#include <QtGui/QToolBar>
-+#include <QtWidgets/QBoxLayout>
-+#include <QtWidgets/QLineEdit>
-+#include <QtWidgets/QToolBar>
- #include <QtGui/QKeyEvent>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,15 +18,15 @@
-  */
- 
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- #include <QtGui/QPixmap>
- #include <QtGui/QImage>
- #include <QtGui/QIcon>
--#include <QtGui/QToolBar>
--#include <QtGui/QMenuBar>
--#include <QtGui/QMenu>
--#include <QtGui/QToolButton>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QToolBar>
-+#include <QtWidgets/QMenuBar>
-+#include <QtWidgets/QMenu>
-+#include <QtWidgets/QToolButton>
-+#include <QtWidgets/QLayout>
- #include <QtGui/QWheelEvent>
--#include <QtGui/QDockWidget>
-+#include <QtWidgets/QDockWidget>
- #include <QtCore/QObjectList>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/application/ZLQtApplicationWindow.h	2018-01-11 22:18:40.120207269 +0700
-@@ -23,6 +23,6 @@
- #include <map>
- 
--#include <QtGui/QMainWindow>
--#include <QtGui/QAction>
-+#include <QtWidgets/QMainWindow>
-+#include <QtWidgets/QAction>
- #include <QtGui/QCursor>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,6 +18,6 @@
-  */
- 
--#include <QtGui/QApplication>
--#include <QtGui/QPushButton>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QPushButton>
- 
- #include <ZLDialogManager.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialog.h	2018-01-11 22:18:40.120207269 +0700
-@@ -21,6 +21,6 @@
- #define __ZLQTDIALOG_H__
- 
--#include <QtGui/QDialog>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QDialog>
-+#include <QtWidgets/QLayout>
- 
- #include <ZLDialog.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogContent.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,8 +18,8 @@
-  */
- 
--#include <QtGui/QApplication>
--#include <QtGui/QDesktopWidget>
--#include <QtGui/QWidget>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QDesktopWidget>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QLayout>
- 
- #include "ZLQtDialogContent.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtDialogManager.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,9 +18,9 @@
-  */
- 
--#include <QtGui/QApplication>
--#include <QtGui/QMessageBox>
--#include <QtGui/QFileDialog>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QMessageBox>
-+#include <QtWidgets/QFileDialog>
- #include <QtGui/QClipboard>
--#include <QtGui/QDesktopWidget>
-+#include <QtWidgets/QDesktopWidget>
- 
- #include "ZLQtDialogManager.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOpenFileDialog.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,5 +18,5 @@
-  */
- 
--#include <QtGui/QFileDialog>
-+#include <QtWidgets/QFileDialog>
- 
- #include "ZLQtOpenFileDialog.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionView.cpp	2018-01-11 22:18:40.121207269 +0700
-@@ -20,14 +20,14 @@
- #include <cctype>
- 
--#include <QtGui/QCheckBox>
--#include <QtGui/QComboBox>
--#include <QtGui/QLabel>
--#include <QtGui/QGroupBox>
--#include <QtGui/QRadioButton>
--#include <QtGui/QPushButton>
--#include <QtGui/QSpinBox>
--#include <QtGui/QLineEdit>
--#include <QtGui/QSlider>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QCheckBox>
-+#include <QtWidgets/QComboBox>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QGroupBox>
-+#include <QtWidgets/QRadioButton>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QSpinBox>
-+#include <QtWidgets/QLineEdit>
-+#include <QtWidgets/QSlider>
-+#include <QtWidgets/QLayout>
- 
- #include <ZLStringUtil.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.cpp	2018-01-11 22:18:40.121207269 +0700
-@@ -18,9 +18,9 @@
-  */
- 
--#include <QtGui/QApplication>
--#include <QtGui/QDesktopWidget>
--#include <QtGui/QLayout>
--#include <QtGui/QPushButton>
--#include <QtGui/QButtonGroup>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QDesktopWidget>
-+#include <QtWidgets/QLayout>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QButtonGroup>
- #include <QtGui/QResizeEvent>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtOptionsDialog.h	2018-01-11 22:18:40.121207269 +0700
-@@ -21,7 +21,7 @@
- #define __ZLQTOPTIONSDIALOG_H__
- 
--#include <QtGui/QWidget>
--#include <QtGui/QTabWidget>
--#include <QtGui/QDialog>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QTabWidget>
-+#include <QtWidgets/QDialog>
- 
- #include "../../../../core/src/desktop/dialogs/ZLDesktopOptionsDialog.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.cpp	2018-01-11 22:18:40.121207269 +0700
-@@ -20,9 +20,9 @@
- #include <unistd.h>
- 
--#include <QtGui/QApplication>
--#include <QtGui/QDesktopWidget>
--#include <QtGui/QWidget>
--#include <QtGui/QLabel>
--#include <QtGui/QLayout>
-+#include <QtWidgets/QApplication>
-+#include <QtWidgets/QDesktopWidget>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QLayout>
- #include <QtCore/QThreadPool>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtProgressDialog.h	2018-01-11 22:18:40.121207269 +0700
-@@ -23,9 +23,9 @@
- #include <string>
- 
--#include <QtGui/QWidget>
-+#include <QtWidgets/QWidget>
- #include <QtGui/QCursor>
--#include <QtGui/QDialog>
--#include <QtGui/QProgressBar>
--#include <QtGui/QLabel>
-+#include <QtWidgets/QDialog>
-+#include <QtWidgets/QProgressBar>
-+#include <QtWidgets/QLabel>
- #include <QtCore/QRunnable>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -20,10 +20,10 @@
- #include <algorithm>
- 
--#include <QtGui/QSplitter>
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QHBoxLayout>
--#include <QtGui/QScrollBar>
- #include <QtGui/QResizeEvent>
- #include <QtCore/QDebug>
-+#include <QtWidgets/QSplitter>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QHBoxLayout>
-+#include <QtWidgets/QScrollBar>
- 
- #include <ZLFile.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/dialogs/ZLQtTreeDialog.h	2018-01-11 22:18:40.121207269 +0700
-@@ -25,10 +25,10 @@
- #include <QtCore/QMap>
- 
--#include <QtGui/QDialog>
--#include <QtGui/QScrollArea>
--#include <QtGui/QPushButton>
--#include <QtGui/QLabel>
--#include <QtGui/QLineEdit>
--#include <QtGui/QWidget>
-+#include <QtWidgets/QDialog>
-+#include <QtWidgets/QScrollArea>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QLineEdit>
-+#include <QtWidgets/QWidget>
- 
- #include <ZLTreeDialog.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/filesystem/ZLQtFSManager.cpp	2018-01-11 22:13:28.444220377 +0700
-@@ -49,3 +49,4 @@
- 	  path = replacement + path.substr(1);
- 	}
-+	ZLUnixFSManager::normalizeRealPath(path);
- }
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLQApplication.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLQApplication.h	2018-01-11 22:18:40.121207269 +0700
-@@ -21,5 +21,5 @@
- #define __ZLQAPPLICATION_H__
- 
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- 
- class ZLQApplication : public QApplication {
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/library/ZLibrary.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/library/ZLibrary.cpp	2018-01-11 22:18:40.121207269 +0700
-@@ -20,5 +20,5 @@
- #include <QtCore/QTextCodec>
- #include <QtCore/QFile>
--#include <QtGui/QApplication>
-+#include <QtWidgets/QApplication>
- #include <QtGui/QFileOpenEvent>
- 
-@@ -73,5 +73,5 @@
- 	new ZLQApplication(argc, argv);
- 
--	QTextCodec::setCodecForCStrings(QTextCodec::codecForName("utf-8"));
-+	QTextCodec::setCodecForLocale(QTextCodec::codecForName("utf-8"));
- 
- 	ZLibrary::parseArguments(argc, argv);
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/network/ZLQtNetworkManager.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -25,5 +25,7 @@
- #include <QtCore/QList>
- #include <QtCore/QTimer>
-+#include <QtCore/QUrlQuery>
- 
-+#include <QtNetwork/QNetworkCookie>
- #include <QtNetwork/QNetworkRequest>
- #include <QtNetwork/QNetworkReply>
-@@ -150,10 +152,10 @@
- 	if (!scope.request->postParameters().empty()) {
- 		QByteArray data;
--		QUrl tmp;
-+		QUrlQuery tmp;
- 		typedef std::pair<std::string, std::string> string_pair;
- 		foreach (const string_pair &pair, scope.request->postParameters()) {
- 			tmp.addQueryItem(QString::fromStdString(pair.first), QString::fromStdString(pair.second));
- 		}
--		data = tmp.encodedQuery();
-+		data = tmp.query(QUrl::FullyEncoded).toUtf8(); //encodedQuery();
- 		reply = const_cast<QNetworkAccessManager&>(myManager).post(networkRequest, data);
- 	} else {
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.cpp	2018-01-11 22:13:39.639219906 +0700
-@@ -87,5 +87,5 @@
- 
- void QtWaitingSpinner::setRoundness(qreal roundness) {
--	myRoundness = std::max(0.0, std::min(100.0, roundness));
-+	myRoundness = std::max(static_cast<qreal>(0.0), std::min(static_cast<qreal>(100.0), roundness));
- }
- 
-@@ -149,5 +149,5 @@
- 	qreal gradation = alphaDiff / (qreal)(distanceThreshold + 1);
- 	qreal resultAlpha = color.alphaF() - gradation * distance;
--	resultAlpha = std::min(1.0, std::max(0.0, resultAlpha)); //if alpha is out of bound, force it to bounds
-+	resultAlpha = std::min(static_cast<qreal>(1.0), std::max(static_cast<qreal>(0.0), resultAlpha)); //if alpha is out of bound, force it to bounds
- 	color.setAlphaF(resultAlpha);
- 	return color;
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/QtWaitingSpinner.h	2018-01-11 22:18:40.121207269 +0700
-@@ -4,5 +4,5 @@
- #include <QtCore/QTimer>
- 
--#include <QtGui/QWidget>
-+#include <QtWidgets/QWidget>
- #include <QtGui/QColor>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,12 +18,12 @@
-  */
- 
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QHBoxLayout>
- #include <QtGui/QPixmap>
- #include <QtGui/QPalette>
- #include <QtGui/QPainter>
- #include <QtGui/QPaintEvent>
--#include <QtGui/QScrollBar>
- #include <QtCore/QTimer>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QHBoxLayout>
-+#include <QtWidgets/QScrollBar>
- 
- #include <QtCore/QDebug>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtItemsListWidget.h	2018-01-11 22:18:40.120207269 +0700
-@@ -21,10 +21,10 @@
- #define __ZLQTITEMSLISTWIDGET_H__
- 
--#include <QtGui/QWidget>
--#include <QtGui/QFrame>
--#include <QtGui/QPushButton>
--#include <QtGui/QLabel>
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QScrollArea>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QFrame>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QScrollArea>
- 
- #include <ZLTreeTitledNode.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -18,8 +18,8 @@
-  */
- 
--#include <QtGui/QVBoxLayout>
--#include <QtGui/QHBoxLayout>
--#include <QtGui/QScrollBar>
--#include <QtGui/QGraphicsDropShadowEffect>
-+#include <QtWidgets/QVBoxLayout>
-+#include <QtWidgets/QHBoxLayout>
-+#include <QtWidgets/QScrollBar>
-+#include <QtWidgets/QGraphicsDropShadowEffect>
- 
- #include <QtCore/QDebug>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtPreviewWidget.h	2018-01-11 22:18:40.121207269 +0700
-@@ -21,9 +21,9 @@
- #define __ZLQTPREVIEWWIDGET_H__
- 
--#include <QtGui/QWidget>
--#include <QtGui/QPushButton>
--#include <QtGui/QLabel>
--#include <QtGui/QScrollArea>
--#include <QtGui/QVBoxLayout>
-+#include <QtWidgets/QWidget>
-+#include <QtWidgets/QPushButton>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QScrollArea>
-+#include <QtWidgets/QVBoxLayout>
- #include <QtCore/QSet>
- 
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.cpp	2018-01-11 22:18:40.120207269 +0700
-@@ -19,7 +19,7 @@
- 
- #include <QtCore/QDebug>
--#include <QtGui/QStyle>
--#include <QtGui/QCompleter>
--#include <QtGui/QStringListModel>
-+#include <QtCore/QStringListModel>
-+#include <QtWidgets/QStyle>
-+#include <QtWidgets/QCompleter>
- 
- #include <ZLibrary.h>
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/tree/ZLQtSearchField.h	2018-01-11 22:18:40.121207269 +0700
-@@ -22,6 +22,6 @@
- 
- #include <QtCore/QSet>
--#include <QtGui/QLabel>
--#include <QtGui/QLineEdit>
-+#include <QtWidgets/QLabel>
-+#include <QtWidgets/QLineEdit>
- 
- #include "QtWaitingSpinner.h"
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.cpp	2018-01-11 22:18:40.121207269 +0700
-@@ -20,6 +20,6 @@
- #include <algorithm>
- 
--#include <QtGui/QLayout>
--#include <QtGui/QScrollBar>
-+#include <QtWidgets/QLayout>
-+#include <QtWidgets/QScrollBar>
- #include <QtGui/QPainter>
- #include <QtGui/QPixmap>
-@@ -186,9 +186,9 @@
- void ZLQtViewWidget::setScrollbarEnabled(ZLView::Direction direction, bool enabled) {
- 	if (direction == ZLView::VERTICAL) {
--		myRightScrollBar->setShown(enabled && myShowScrollBarAtRight);
--		myLeftScrollBar->setShown(enabled && !myShowScrollBarAtRight);
-+		myRightScrollBar->setVisible(enabled && myShowScrollBarAtRight);
-+		myLeftScrollBar->setVisible(enabled && !myShowScrollBarAtRight);
- 	} else {
--		myBottomScrollBar->setShown(enabled && myShowScrollBarAtBottom);
--		myTopScrollBar->setShown(enabled && !myShowScrollBarAtBottom);
-+		myBottomScrollBar->setVisible(enabled && myShowScrollBarAtBottom);
-+		myTopScrollBar->setVisible(enabled && !myShowScrollBarAtBottom);
- 	}
- }
-diff -r -U2 fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h
---- fbreader-0.99.4.orig/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h	2012-11-30 19:41:25.000000000 +0700
-+++ fbreader-0.99.4/zlibrary/ui/src/qt4/view/ZLQtViewWidget.h	2018-01-11 22:18:40.121207269 +0700
-@@ -21,5 +21,5 @@
- #define __ZLQTVIEWWIDGET_H__
- 
--#include <QtGui/QWidget>
-+#include <QtWidgets/QWidget>
- 
- #include "../../../../core/src/view/ZLViewWidget.h"
diff --git a/app-text/flpsed/Manifest b/app-text/flpsed/Manifest
index c0748af315e7..d3451fe65f4b 100644
--- a/app-text/flpsed/Manifest
+++ b/app-text/flpsed/Manifest
@@ -1,4 +1,4 @@
 AUX flpsed-0.7.2-desktop.patch 247 BLAKE2B 2b1269b3c3ca1fb451db11f0a0b310ccea40612226227574dd4eab020aff348fcfd8c82f3908b253148a5e5135cd3a29a8306ac480c53e3410f19701290b79ca SHA512 b632a6b4948a12910916ef71a4710dcbabf91fdfbc302e3242d9101310101377023e58a12b24b6139d26fa37261a779db21773a8329e3f74d2e74c5cd1c6190f
 DIST flpsed-0.7.3.tar.gz 146788 BLAKE2B 5721d973b1efe02c8c014104d1ed4991dd630a8da86bc191b58df4a7ed469065e37b80248c7a7ab4946e636f869ecbfbfe457ed15a6cc7c4243642a48790ab67 SHA512 b0a8bf2ea08630d280f83f7c32b4574ba4cf7fd989943492e77d1b73c8d83c81a5df40e64bfff744b5518de845eba21119242ff752e16b20816b225ccb7c3321
-EBUILD flpsed-0.7.3.ebuild 589 BLAKE2B ceb75d5abcb17569aeff307c9457ec35f7d8bb0386bd5fc735c9a35a46a75bc3f08c7625f9d5319c150d1824397f7284ea34dd43637078298019231a4d68c18c SHA512 69890343f5d72b20be15921a38cdc7c9294111fe0388c35c3aaeb6e75524d04065d7d43b06389e2c8e68d2fd3508860a805aa0f9a8d5b7d6ed74d10b966fe644
+EBUILD flpsed-0.7.3.ebuild 593 BLAKE2B a901d39d5142dfa3ddcd3487101587bbb3f15feae91e29fb88626332ccf4b798754c335a464b44864abcce1137f7cb0e9181dd50f4232578031496b74b234cca SHA512 92c142ef8bce05da7329bccf56d85122d7e795a5de613e4d5678e53b80d186cc6d41f04893cc829732cf7f1c2c1c51998e0f461d05900309ebfba3e90e8996e7
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/flpsed/flpsed-0.7.3.ebuild b/app-text/flpsed/flpsed-0.7.3.ebuild
index d5c909badb01..f3c15f0bc3f0 100644
--- a/app-text/flpsed/flpsed-0.7.3.ebuild
+++ b/app-text/flpsed/flpsed-0.7.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop
+inherit desktop xdg
 
 DESCRIPTION="Pseudo PostScript editor"
 HOMEPAGE="https://flpsed.org/flpsed.html"
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index 49e1378e2f74..66d12b5529e4 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1,3 +1,5 @@
 DIST foliate-2.4.2.tar.gz 4638211 BLAKE2B 4263e047d7251a0f15a2cda2592ba24dbbb9754a37ba6367f0d1e778e3f926cd46777d505e9f92d74bdcd28a722988b60f064f1a841c53a9b2849130941d9481 SHA512 6dda76c9bd3f9f3273bafdd65463adfcab84d9c81ca89c2fd1cda4c5d7618d84610e11c75936c5df2bb118caa3f3e1e77ded506da670263e5af5b0ad92a97a07
+DIST foliate-2.5.0.tar.gz 4716094 BLAKE2B c2db3116df1117db06dca93cb3ac47e5f5c627c9e424e5add315f8623b9d71b6cc87112729ce6daa5cdfc81f3b8664555623ba55d6cf674369137ecf0859e321 SHA512 3eb3ecff36a105f6d9ba7e019312bef81e34f62f61310eaf3460c7aea41585fc9b410d08f9e4fd03fe60629b1ebb6f9f6a4c900e898ac712b104c615dc3737c8
 EBUILD foliate-2.4.2-r1.ebuild 1208 BLAKE2B 5c7c4ab877dc6682830179250e320f16b1dc743b187a78b1b10a97983df80d78e608a5cd1511f0ed3047ffea8a6319cfe442f23207120fe873cb8eee719342b0 SHA512 012b8a76be83049edf2c4ad3d822a864733dc20090d6cad4e0d57b4612ff8746b491f7527c7b6719543785cafcc7ebc76ef3ec00b1828f144f66e50b355147c0
+EBUILD foliate-2.5.0.ebuild 1220 BLAKE2B 16e86b0fd1a6bb61a0a3ef045d0a640a2240b9b98143ea38b0ab8288db18058697c8d97d7380177c1de079a55687542f2ffc253f459b4e0dbd8070b9e94fa1d0 SHA512 3018c1ad242188c1bb092a5d7c77663992ffdae6ad85bd4738fd3d7660ca15669a44a99c9b480c6dcc22dd2dc1e6318a8c5bb004ec96c3b38448c68c90ccd960
 MISC metadata.xml 606 BLAKE2B 122522b577e0911c008bdc8f6a2b52dbf5514c30011d6a57cebea044e157c26f0dc0075d92ddf70825b26cbd8291c858077a0bc467eeb64c050eee0734125d75 SHA512 ac916591078fae44e77faf87571d7d34eeeebb0253f243a7a560e52a0c3c67276871f7b7f48e9649922ecad13c54cce43c2cc6349dbaab0131a190dee7918208
diff --git a/app-text/foliate/foliate-2.5.0.ebuild b/app-text/foliate/foliate-2.5.0.ebuild
new file mode 100644
index 000000000000..94288a8fb117
--- /dev/null
+++ b/app-text/foliate/foliate-2.5.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PLOCALES="cs_CS de_DE es eu fr_FR id_ID ie it ko nb nl nn pt_BR ru_RU sv tr uk zh_CN zh_TW"
+inherit meson l10n xdg-utils gnome2-utils
+SRC_URI="https://github.com/johnfactotum/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+DESCRIPTION="gtk ebook reader built with gjs"
+HOMEPAGE="https://github.com/johnfactotum/foliate/"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="handy spell"
+
+BDEPEND="${MESON_DEPEND}
+	sys-devel/gettext"
+RDEPEND="dev-libs/gjs
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+	x11-libs/gdk-pixbuf:2[introspection]
+	net-libs/webkit-gtk:4[introspection]
+	handy? ( gui-libs/libhandy:=[introspection] )
+	spell? ( app-text/gspell[introspection] )"
+
+src_prepare() {
+	default
+
+	l10n_find_plocales_changes "${S}"/po '' '.po'
+
+	rm_po() {
+		rm po/${1}.po
+		sed -e "/^${1}/d" -i po/LINGUAS
+	}
+
+	l10n_for_each_disabled_locale_do rm_po
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+	gnome2_schemas_update
+}
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 19bcae067352..a938ad705ba0 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,13 +1,8 @@
+AUX ghostscript-gpl-9.53.3-freetype-2.10.3.patch 508 BLAKE2B 8819f3be84b556adde4808509a1199d08b059a77abeafb6d95076194093a3223cc8c8b7032124eaeaa98dedb237dd94632cb374cb854f7d1594a80b82df79173 SHA512 43bb10cbf6b316d59a616f986fe8bea87af1313ca71138ecdeb531ea2a689c64718c44d0a81f69bdf30e3814fec3b36866c2249d26c6d45c58bd121accc7f8d4
 DIST ghostscript-9.52.tar.xz 39711040 BLAKE2B 317042ae7e2bfdeded2ae9d9a1bd1521422d1ce1dd6b9b2cdedf4c503cce1285684d5329663dc8ee7263591761c33254827d16b1a93f8c10aad4baab1d859f93 SHA512 4c4a33884e1138bad553eee61fac1a72158297ad5c2ce46a4b36150848dea8158affaf2b902f4ff03e4f72ebc8154c198b618112624f409230a610b7648faa67
-DIST ghostscript-9.53.0.tar.xz 41358720 BLAKE2B 9a8b5872dc799f14759033685c37890f2da28450b1e115fcc63a2a920bb22bfc02db078d3f39dc62778da2a2518b82c2fc91f349486e83914c88c70d1e15d7e8 SHA512 fa594ef99e58257074b651e4d078bd1025f7bc2c435cd2a5454ba59c2a98cc82e93339ccd1eaa4fe624275165aacefeabc6f8336476027946f56aeb02e93da30
-DIST ghostscript-9.53.1.tar.xz 41362600 BLAKE2B f4f3e9c067d120195cdcbd8ba3ecbb5618d668e0582408cc76b0e13627aca06c40064a7ae96d0ebe8c313ec282c4d3f5dddddabef3d0194ff9aaf98832b5a50c SHA512 5c78ed0a03983cbf9d55885c5ee8fbfc987db367b020ad0148b8861de42923e38c688447cfc6efcea5521121545ecfbea9690058fd3c4438629a43b5990800c5
-DIST ghostscript-9.53.2.tar.xz 41362364 BLAKE2B 1ff4d00661d28f7f9a14064928182147fa0b20b41accb287b779a40651fbc45047eefc8522242b7dd909324b6e3ebc15f421b351c69fb248fef2095210c81461 SHA512 fe430e96b67a082b58942d66193a89b8af042574929e8299e1f8b1ef2a7f71565ba5a96b72d26db38f4a05e70119a019c5fe73b842d51afd357d642d39d95320
 DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3412bdd3a6707f44d058c20f607e6695cfc878cf5df4c4528686c1c1f488b2dbdb81ef5fdf38b950eb15751d2ebafb0a9 SHA512 eb832c27eecd30f15e346408c592d7096fd23ef0a6fa59bd50ca327578915434530a4868e69249c2594def0910c527302e99d54f0877f726a8ca8bea6f0f17b7
 DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
 DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
-EBUILD ghostscript-gpl-9.52-r1.ebuild 5097 BLAKE2B 748ff28b3a38714562d03d63b267a2cbb762103972d41883d2c5917083cbed564ca36788fdde92ac8366768153d0453ece4b25b760bad6c3d97e08c9e86961bf SHA512 82e9b5f3f1515236197510bb29238ca955cf042a233ef314036b8b88887df2bc8dc353342b09c7d0444d73de9f98412a2c7252d19782e956f15dac2147b3d289
-EBUILD ghostscript-gpl-9.53.0.ebuild 4959 BLAKE2B c1c23d1fb3566ddba0cd9001b1c755fb22c30eb9f940619f512a989c98354c61e4c765bb9e88a4fd4778f6346068412a1ca34ee10eea576fc2aa749e0f7a6c16 SHA512 91db496526a1b7368b4851cc57ca09cbffdc6446c1e142692be2f09a8ef0f80246c605175e4d096a9c21deac3de4489155283311cecf385e1b42057bf80879c3
-EBUILD ghostscript-gpl-9.53.1.ebuild 4959 BLAKE2B c1c23d1fb3566ddba0cd9001b1c755fb22c30eb9f940619f512a989c98354c61e4c765bb9e88a4fd4778f6346068412a1ca34ee10eea576fc2aa749e0f7a6c16 SHA512 91db496526a1b7368b4851cc57ca09cbffdc6446c1e142692be2f09a8ef0f80246c605175e4d096a9c21deac3de4489155283311cecf385e1b42057bf80879c3
-EBUILD ghostscript-gpl-9.53.2.ebuild 4959 BLAKE2B c1c23d1fb3566ddba0cd9001b1c755fb22c30eb9f940619f512a989c98354c61e4c765bb9e88a4fd4778f6346068412a1ca34ee10eea576fc2aa749e0f7a6c16 SHA512 91db496526a1b7368b4851cc57ca09cbffdc6446c1e142692be2f09a8ef0f80246c605175e4d096a9c21deac3de4489155283311cecf385e1b42057bf80879c3
-EBUILD ghostscript-gpl-9.53.3.ebuild 4959 BLAKE2B c1c23d1fb3566ddba0cd9001b1c755fb22c30eb9f940619f512a989c98354c61e4c765bb9e88a4fd4778f6346068412a1ca34ee10eea576fc2aa749e0f7a6c16 SHA512 91db496526a1b7368b4851cc57ca09cbffdc6446c1e142692be2f09a8ef0f80246c605175e4d096a9c21deac3de4489155283311cecf385e1b42057bf80879c3
+EBUILD ghostscript-gpl-9.52-r1.ebuild 5175 BLAKE2B 83b725c22dfae426de0735f8195e6e4477b47d3fff6fb0f3108d344ffee6eba03bdb875078c472a048c2be7ed1f3347cea7e22707bbc1c0c77629ad11a3c5106 SHA512 f242c79f3ac85c147ee9d6ea203b716ebf44170e5574db68fecb04940b2e7c6146631bb2e1a46cf06673d91fc6cad18bf4828ef97af91896815cceb5efba0e17
+EBUILD ghostscript-gpl-9.53.3-r2.ebuild 5037 BLAKE2B 27a37786502df336666206a6afba170fc2f20fccdab41bbba23e2fd3fe91298fb79059ba76bc40db38d831782e27252355b336249ba4be01a1b829f548eca909 SHA512 8bd444fa4f9dcd1f740038828ab09f053a4c03a364832b0bf458760b28ad68d6617c226ecb552c457cea6b340a64f4c338832d826b36cd405cbeab6d33f9642a
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-freetype-2.10.3.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-freetype-2.10.3.patch
new file mode 100644
index 000000000000..59d9ae0095f7
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.53.3-freetype-2.10.3.patch
@@ -0,0 +1,20 @@
+https://bugs.ghostscript.com/show_bug.cgi?id=702985
+https://bugs.gentoo.org/747808
+
+--- ghostscript-9.53.3/base/fapi_ft.c
++++ ghostscript-9.53.3/base/fapi_ft.c
+@@ -125,6 +125,14 @@
+ delete_inc_int_info(gs_fapi_server * a_server,
+                     FT_IncrementalRec * a_inc_int_info);
+ 
++#ifndef FT_CALLBACK_DEF
++#ifdef __cplusplus
++#define FT_CALLBACK_DEF( x ) extern "C" x
++#else
++#define FT_CALLBACK_DEF( x ) static x
++#endif
++#endif
++
+ FT_CALLBACK_DEF(void *)
+ FF_alloc(FT_Memory memory, long size)
+ {
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
index b22f3b060f42..362f03559a7c 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
@@ -60,6 +60,11 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	# bug #747808
+	"${FILESDIR}/${PN}-9.53.3-freetype-2.10.3.patch"
+)
+
 src_prepare() {
 	if [[ -n "${MY_PATCHSET}" ]] ; then
 		# apply various patches, many borrowed from Fedora
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.0.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.0.ebuild
deleted file mode 100644
index 0d3acf4a9d16..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.0.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Interpreter for the PostScript language and PDF"
-HOMEPAGE="https://ghostscript.com/"
-
-MY_PN=${PN/-gpl}
-MY_P="${MY_PN}-${PV/_}"
-PVM=$(ver_cut 1-2)
-PVM_S=$(ver_rs 1-2 "")
-
-MY_PATCHSET="ghostscript-gpl-9.53-patchset-01.tar.xz"
-
-SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
-
-if [[ -n "${MY_PATCHSET}" ]] ; then
-	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
-fi
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="cups dbus gtk l10n_de static-libs unicode X"
-
-LANGS="ja ko zh-CN zh-TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.9:2=
-	>=media-libs/jbig2dec-0.19:=
-	>=media-libs/lcms-2.6:2
-	>=media-libs/libpng-1.6.2:0=
-	>=media-libs/openjpeg-2.1.0:2=
-	>=media-libs/tiff-4.0.1:0=
-	>=sys-libs/zlib-1.2.7
-	virtual/jpeg:0
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
-	unicode? ( net-dns/libidn:0= )
-	X? ( x11-libs/libXt x11-libs/libXext )
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	app-text/poppler-data
-	>=media-fonts/urw-fonts-2.4.9
-	l10n_ja? ( media-fonts/kochi-substitute )
-	l10n_ko? ( media-fonts/baekmuk-fonts )
-	l10n_zh-CN? ( media-fonts/arphicfonts )
-	l10n_zh-TW? ( media-fonts/arphicfonts )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if [[ -n "${MY_PATCHSET}" ]] ; then
-		# apply various patches, many borrowed from Fedora
-		# https://src.fedoraproject.org/rpms/ghostscript
-		# and Debian
-		# https://salsa.debian.org/printing-team/ghostscript/tree/debian/master/debian/patches
-		eapply "${WORKDIR}/patches/"*.patch
-	fi
-
-	default
-
-	# remove internal copies of various libraries
-	rm -r cups/libs || die
-	rm -r freetype || die
-	rm -r jbig2dec || die
-	rm -r jpeg || die
-	rm -r lcms2mt || die
-	rm -r libpng || die
-	rm -r tiff || die
-	rm -r zlib || die
-	rm -r openjpeg || die
-	# remove internal CMaps (CMaps from poppler-data are used instead)
-	rm -r Resource/CMap || die
-
-	if ! use gtk ; then
-		sed -e "s:\$(GSSOX)::" \
-			-e "s:.*\$(GSSOX_XENAME)$::" \
-			-i base/unix-dll.mak || die "sed failed"
-	fi
-
-	# Force the include dirs to a neutral location.
-	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
-		-i configure.ac || die
-	# Some files depend on zlib.h directly.  Redirect them. #573248
-	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
-	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
-	sed -e '/^zlib_h/s:=.*:=:' \
-		-e 's|-DOPJ_STATIC ||' \
-		-i base/lib.mak || die
-
-	# search path fix
-	# put LDFLAGS after BINDIR, bug #383447
-	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
-		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
-		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
-		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
-		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
-		-i Makefile.in base/*.mak || die "sed failed"
-
-	# remove incorrect symlink, bug 590384
-	rm ijs/ltmain.sh || die
-	eautoreconf
-
-	cd ijs || die
-	eautoreconf
-}
-
-src_configure() {
-	local FONTPATH
-	for path in \
-		"${EPREFIX}"/usr/share/fonts/urw-fonts \
-		"${EPREFIX}"/usr/share/fonts/Type1 \
-		"${EPREFIX}"/usr/share/fonts \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
-	do
-		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
-	done
-
-	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
-	econf \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--enable-openjpeg \
-		--disable-compile-inits \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--with-system-libtiff \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_with cups pdftoraster) \
-		$(use_with unicode libidn) \
-		$(use_with X x)
-
-	cd "${S}/ijs" || die
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake so all
-
-	cd ijs || die
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-so install
-
-	# move gsc to gs, bug #343447
-	# gsc collides with gambit, bug #253064
-	mv -f "${ED}"/usr/bin/{gsc,gs} || die
-
-	cd "${S}/ijs" || die
-	emake DESTDIR="${D}" install
-
-	# install the CMaps from poppler-data properly, bug #409361
-	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	if ! use l10n_de; then
-		rm -r "${ED}"/usr/share/man/de || die
-	fi
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.1.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.1.ebuild
deleted file mode 100644
index 0d3acf4a9d16..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Interpreter for the PostScript language and PDF"
-HOMEPAGE="https://ghostscript.com/"
-
-MY_PN=${PN/-gpl}
-MY_P="${MY_PN}-${PV/_}"
-PVM=$(ver_cut 1-2)
-PVM_S=$(ver_rs 1-2 "")
-
-MY_PATCHSET="ghostscript-gpl-9.53-patchset-01.tar.xz"
-
-SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
-
-if [[ -n "${MY_PATCHSET}" ]] ; then
-	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
-fi
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="cups dbus gtk l10n_de static-libs unicode X"
-
-LANGS="ja ko zh-CN zh-TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.9:2=
-	>=media-libs/jbig2dec-0.19:=
-	>=media-libs/lcms-2.6:2
-	>=media-libs/libpng-1.6.2:0=
-	>=media-libs/openjpeg-2.1.0:2=
-	>=media-libs/tiff-4.0.1:0=
-	>=sys-libs/zlib-1.2.7
-	virtual/jpeg:0
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
-	unicode? ( net-dns/libidn:0= )
-	X? ( x11-libs/libXt x11-libs/libXext )
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	app-text/poppler-data
-	>=media-fonts/urw-fonts-2.4.9
-	l10n_ja? ( media-fonts/kochi-substitute )
-	l10n_ko? ( media-fonts/baekmuk-fonts )
-	l10n_zh-CN? ( media-fonts/arphicfonts )
-	l10n_zh-TW? ( media-fonts/arphicfonts )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if [[ -n "${MY_PATCHSET}" ]] ; then
-		# apply various patches, many borrowed from Fedora
-		# https://src.fedoraproject.org/rpms/ghostscript
-		# and Debian
-		# https://salsa.debian.org/printing-team/ghostscript/tree/debian/master/debian/patches
-		eapply "${WORKDIR}/patches/"*.patch
-	fi
-
-	default
-
-	# remove internal copies of various libraries
-	rm -r cups/libs || die
-	rm -r freetype || die
-	rm -r jbig2dec || die
-	rm -r jpeg || die
-	rm -r lcms2mt || die
-	rm -r libpng || die
-	rm -r tiff || die
-	rm -r zlib || die
-	rm -r openjpeg || die
-	# remove internal CMaps (CMaps from poppler-data are used instead)
-	rm -r Resource/CMap || die
-
-	if ! use gtk ; then
-		sed -e "s:\$(GSSOX)::" \
-			-e "s:.*\$(GSSOX_XENAME)$::" \
-			-i base/unix-dll.mak || die "sed failed"
-	fi
-
-	# Force the include dirs to a neutral location.
-	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
-		-i configure.ac || die
-	# Some files depend on zlib.h directly.  Redirect them. #573248
-	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
-	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
-	sed -e '/^zlib_h/s:=.*:=:' \
-		-e 's|-DOPJ_STATIC ||' \
-		-i base/lib.mak || die
-
-	# search path fix
-	# put LDFLAGS after BINDIR, bug #383447
-	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
-		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
-		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
-		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
-		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
-		-i Makefile.in base/*.mak || die "sed failed"
-
-	# remove incorrect symlink, bug 590384
-	rm ijs/ltmain.sh || die
-	eautoreconf
-
-	cd ijs || die
-	eautoreconf
-}
-
-src_configure() {
-	local FONTPATH
-	for path in \
-		"${EPREFIX}"/usr/share/fonts/urw-fonts \
-		"${EPREFIX}"/usr/share/fonts/Type1 \
-		"${EPREFIX}"/usr/share/fonts \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
-	do
-		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
-	done
-
-	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
-	econf \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--enable-openjpeg \
-		--disable-compile-inits \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--with-system-libtiff \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_with cups pdftoraster) \
-		$(use_with unicode libidn) \
-		$(use_with X x)
-
-	cd "${S}/ijs" || die
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake so all
-
-	cd ijs || die
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-so install
-
-	# move gsc to gs, bug #343447
-	# gsc collides with gambit, bug #253064
-	mv -f "${ED}"/usr/bin/{gsc,gs} || die
-
-	cd "${S}/ijs" || die
-	emake DESTDIR="${D}" install
-
-	# install the CMaps from poppler-data properly, bug #409361
-	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	if ! use l10n_de; then
-		rm -r "${ED}"/usr/share/man/de || die
-	fi
-}
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.2.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild
index 0d3acf4a9d16..47929e088e2b 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.2.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r2.ebuild
@@ -60,6 +60,11 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	# bug #747808
+	"${FILESDIR}/${PN}-9.53.3-freetype-2.10.3.patch"
+)
+
 src_prepare() {
 	if [[ -n "${MY_PATCHSET}" ]] ; then
 		# apply various patches, many borrowed from Fedora
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3.ebuild
deleted file mode 100644
index 0d3acf4a9d16..000000000000
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic toolchain-funcs
-
-DESCRIPTION="Interpreter for the PostScript language and PDF"
-HOMEPAGE="https://ghostscript.com/"
-
-MY_PN=${PN/-gpl}
-MY_P="${MY_PN}-${PV/_}"
-PVM=$(ver_cut 1-2)
-PVM_S=$(ver_rs 1-2 "")
-
-MY_PATCHSET="ghostscript-gpl-9.53-patchset-01.tar.xz"
-
-SRC_URI="https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PVM_S}/${MY_P}.tar.xz"
-
-if [[ -n "${MY_PATCHSET}" ]] ; then
-	SRC_URI+=" https://dev.gentoo.org/~whissi/dist/ghostscript-gpl/${MY_PATCHSET}"
-fi
-
-LICENSE="AGPL-3 CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="cups dbus gtk l10n_de static-libs unicode X"
-
-LANGS="ja ko zh-CN zh-TW"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-DEPEND="
-	app-text/libpaper
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4.9:2=
-	>=media-libs/jbig2dec-0.19:=
-	>=media-libs/lcms-2.6:2
-	>=media-libs/libpng-1.6.2:0=
-	>=media-libs/openjpeg-2.1.0:2=
-	>=media-libs/tiff-4.0.1:0=
-	>=sys-libs/zlib-1.2.7
-	virtual/jpeg:0
-	cups? ( >=net-print/cups-1.3.8 )
-	dbus? ( sys-apps/dbus )
-	gtk? ( || ( x11-libs/gtk+:3 x11-libs/gtk+:2 ) )
-	unicode? ( net-dns/libidn:0= )
-	X? ( x11-libs/libXt x11-libs/libXext )
-"
-BDEPEND="virtual/pkgconfig"
-RDEPEND="${DEPEND}
-	app-text/poppler-data
-	>=media-fonts/urw-fonts-2.4.9
-	l10n_ja? ( media-fonts/kochi-substitute )
-	l10n_ko? ( media-fonts/baekmuk-fonts )
-	l10n_zh-CN? ( media-fonts/arphicfonts )
-	l10n_zh-TW? ( media-fonts/arphicfonts )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	if [[ -n "${MY_PATCHSET}" ]] ; then
-		# apply various patches, many borrowed from Fedora
-		# https://src.fedoraproject.org/rpms/ghostscript
-		# and Debian
-		# https://salsa.debian.org/printing-team/ghostscript/tree/debian/master/debian/patches
-		eapply "${WORKDIR}/patches/"*.patch
-	fi
-
-	default
-
-	# remove internal copies of various libraries
-	rm -r cups/libs || die
-	rm -r freetype || die
-	rm -r jbig2dec || die
-	rm -r jpeg || die
-	rm -r lcms2mt || die
-	rm -r libpng || die
-	rm -r tiff || die
-	rm -r zlib || die
-	rm -r openjpeg || die
-	# remove internal CMaps (CMaps from poppler-data are used instead)
-	rm -r Resource/CMap || die
-
-	if ! use gtk ; then
-		sed -e "s:\$(GSSOX)::" \
-			-e "s:.*\$(GSSOX_XENAME)$::" \
-			-i base/unix-dll.mak || die "sed failed"
-	fi
-
-	# Force the include dirs to a neutral location.
-	sed -e "/^ZLIBDIR=/s:=.*:=${T}:" \
-		-i configure.ac || die
-	# Some files depend on zlib.h directly.  Redirect them. #573248
-	# Also make sure to not define OPJ_STATIC to avoid linker errors due to
-	# hidden symbols (https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=203327#c1)
-	sed -e '/^zlib_h/s:=.*:=:' \
-		-e 's|-DOPJ_STATIC ||' \
-		-i base/lib.mak || die
-
-	# search path fix
-	# put LDFLAGS after BINDIR, bug #383447
-	sed -e "s:\$\(gsdatadir\)/lib:@datarootdir@/ghostscript/${PVM}/$(get_libdir):" \
-		-e "s:exdir=.*:exdir=@datarootdir@/doc/${PF}/examples:" \
-		-e "s:docdir=.*:docdir=@datarootdir@/doc/${PF}/html:" \
-		-e "s:GS_DOCDIR=.*:GS_DOCDIR=@datarootdir@/doc/${PF}/html:" \
-		-e 's:-L$(BINDIR):& $(LDFLAGS):g' \
-		-i Makefile.in base/*.mak || die "sed failed"
-
-	# remove incorrect symlink, bug 590384
-	rm ijs/ltmain.sh || die
-	eautoreconf
-
-	cd ijs || die
-	eautoreconf
-}
-
-src_configure() {
-	local FONTPATH
-	for path in \
-		"${EPREFIX}"/usr/share/fonts/urw-fonts \
-		"${EPREFIX}"/usr/share/fonts/Type1 \
-		"${EPREFIX}"/usr/share/fonts \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-CNS1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-GB1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan1 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Japan2 \
-		"${EPREFIX}"/usr/share/poppler/cMap/Adobe-Korea1
-	do
-		FONTPATH="$FONTPATH${FONTPATH:+:}${EPREFIX}$path"
-	done
-
-	PKGCONFIG=$(type -P $(tc-getPKG_CONFIG)) \
-	econf \
-		--enable-dynamic \
-		--enable-freetype \
-		--enable-fontconfig \
-		--enable-openjpeg \
-		--disable-compile-inits \
-		--with-drivers=ALL \
-		--with-fontpath="$FONTPATH" \
-		--with-ijs \
-		--with-jbig2dec \
-		--with-libpaper \
-		--with-system-libtiff \
-		--without-luratech \
-		$(use_enable cups) \
-		$(use_enable dbus) \
-		$(use_enable gtk) \
-		$(use_with cups pdftoraster) \
-		$(use_with unicode libidn) \
-		$(use_with X x)
-
-	cd "${S}/ijs" || die
-	econf \
-		--enable-shared \
-		$(use_enable static-libs static)
-}
-
-src_compile() {
-	emake so all
-
-	cd ijs || die
-	emake
-}
-
-src_install() {
-	emake DESTDIR="${D}" install-so install
-
-	# move gsc to gs, bug #343447
-	# gsc collides with gambit, bug #253064
-	mv -f "${ED}"/usr/bin/{gsc,gs} || die
-
-	cd "${S}/ijs" || die
-	emake DESTDIR="${D}" install
-
-	# install the CMaps from poppler-data properly, bug #409361
-	dosym ../../../poppler/cMaps "/usr/share/ghostscript/${PVM}/Resource/CMap"
-
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	if ! use l10n_de; then
-		rm -r "${ED}"/usr/share/man/de || die
-	fi
-}
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 7249874e2030..e095a23157c1 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,5 +1,5 @@
 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-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-r2.ebuild 1841 BLAKE2B 76ca83ac619e2cfba39039f58e9a07b50a1aa2719677b702425f068974fa1ed65e9c02f15a83521a99a72c1bb16659f858e097baf10001ec80dac806a17ae956 SHA512 ce749e14a34553f7b42f17e0e4ff164c53c65db8cb2cdcec932e0a8f8e242cffa24ece15d72e357912ffdd3837b99567a725c02c63a116a36d4c4a32570f9142
+EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1936 BLAKE2B f8381f9ce44e1ba2feafbc5bc4e64e70ff373f8800dbaad98710bd0e03d626c1bf5b9b1677feb1191367ea772fdb4edcd43c7385278f71edabb799272adb1a9f SHA512 0d7681ca97dc9bd94877de57efc8cd1f43eae0f06d0499264aa0b1f753e0b3fee7590c3bab838828aac8c83c16434a87bb68fbe73ef19e22193057aec63b9470
 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
deleted file mode 100644
index 2c4836974086..000000000000
--- a/app-text/gnome-doc-utils/files/gnome-doc-utils-0.20.10-python3.patch
+++ /dev/null
@@ -1,520 +0,0 @@
-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
index 41e86c4e7136..616ebab3992b 100644
--- 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
@@ -8,6 +8,7 @@ inherit gnome2 multibuild python-r1
 
 DESCRIPTION="A collection of documentation utilities for the Gnome project"
 HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
+SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10-python3.patch"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
@@ -36,7 +37,7 @@ DEPEND="${RDEPEND}
 src_prepare() {
 	# Stop build from relying on installed package
 	eapply "${FILESDIR}"/${P}-fix-out-of-tree-build.patch
-	eapply "${FILESDIR}"/${P}-python3.patch
+	eapply "${DISTDIR}"/${P}-python3.patch
 
 	gnome2_src_prepare
 
diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest
index 29676f42a313..124330622898 100644
--- a/app-text/gocr/Manifest
+++ b/app-text/gocr/Manifest
@@ -1,3 +1,3 @@
 DIST gocr-0.50.tar.gz 419209 BLAKE2B 232fe240d7a559cdd4408a3dba3768818aefbd8b2718c7ae40829d69ab79dd68293eb6adfc52e661f2f6cf1290ae9656c84d9d7a8fc20229c0942a8e18fb3b68 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9
-EBUILD gocr-0.50.ebuild 1187 BLAKE2B 8fc8244c4832d59401f834a69f0faa463f39b25d18c7680aa4607e3a1a04fd5ec51839b3bb6b6d66b920b7c55510c43a02929190816099aac5ca1df68e1fa74f SHA512 f4f039654b015388cee8893d55b5fba24675ee0b238fa0e1a102ec19c001ed9f41efca2c881ba27999d3491db1fff0f7c8dc578719f5c4c751c0d47c45337fc4
+EBUILD gocr-0.50.ebuild 1194 BLAKE2B f2d7b20dc9437bc249deb9c752c516e366245b7f5fc3aaa26ba428bb360cc81b9298412e5be996ad9fb16e3a54f7389564b0e65f6c929a4a0c9328b78e197867 SHA512 8ce80abb20a31d902076ae3408812cbabe6a7911301959a542e639cdfeffdd51940d8a54aab5da71a035fabf7a8e0ce4a7fe27568c623a361e0dda0573eb41a0
 MISC metadata.xml 241 BLAKE2B 0ddb3befa9aa8922cec51c1c82d2927a12fa35eab2474330dd53794dabb7dd58859fc35f02e7b5067111bb9838592f9976fe3ff343aae7f521cdc034cf165a4b SHA512 c0dbe231483dc9dfc42dfe465aa2202145bae8a1ac5794ef9a9f02f687275c525a7826740e3b35fee93ba856ff2a78b214956b02cece209f6322ee3311cbf0ec
diff --git a/app-text/gocr/gocr-0.50.ebuild b/app-text/gocr/gocr-0.50.ebuild
index a8e6c3baca7b..3517d1e07a87 100644
--- a/app-text/gocr/gocr-0.50.ebuild
+++ b/app-text/gocr/gocr-0.50.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www-e.uni-magdeburg.de/jschulen/ocr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="doc scanner tk"
 
 DEPEND="
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index 5f4f390587bd..ffc4b1b0db4f 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,3 +1,3 @@
 DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
-EBUILD grip-4.5.2.ebuild 658 BLAKE2B 8e3699b7ed73f09f7d4e6afdde09a8aa997cf900c8bb77317735fb6ba294571885b7777ae4bfa8d1a6730dca1c33260746dab4bb78d5aba7927f7985c8733918 SHA512 6dc6956688886056b307361feab24abc9c27667e55b00d10dc36a923c74255b8d53501c9bf0cb35299325744ca5015373ab9b14965529a027596d922b5a116ff
+EBUILD grip-4.5.2-r1.ebuild 690 BLAKE2B b5ba74597c21354fb0a52a7945497df8e942f1429d731b897b7792eb5e50033610ef7cc0353bd789a50c3035e56c10e536e8841a6fdef5653242670089d560de SHA512 f7f2dbf2a3c2e8edfd6c478d8e55691b931e5731b92a36e74430ad59756882ecb9c115e76694ba5cc515d28c38fcfbc1ad9dddfdc2a4836b5cc8aafa1b96003a
 MISC metadata.xml 364 BLAKE2B fca014c1c0ff71760e84e1d3d94b435ab030100461eb25c3c988f26aba9f76e205724a17c5bf5440216cd2f6d611c4ab984a843d5ed397f597823b8d66fed205 SHA512 aed97f9543ffa7ed2d52ddc0d47b594e93d390828ee61973c5d2ea7bf248d377bcc247930c3fcc2071c492bae75634012fe817b9dbc1ceb4ea4f7a5f0e7a48c7
diff --git a/app-text/grip/grip-4.5.2.ebuild b/app-text/grip/grip-4.5.2-r1.ebuild
index 529c0af1c38c..883099d1abd2 100644
--- a/app-text/grip/grip-4.5.2.ebuild
+++ b/app-text/grip/grip-4.5.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( pypy3 python3_{6,7,8} )
-
+DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1
 
 DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
diff --git a/app-text/gtranslator/Manifest b/app-text/gtranslator/Manifest
index be000b471635..ef22e6c9ba61 100644
--- a/app-text/gtranslator/Manifest
+++ b/app-text/gtranslator/Manifest
@@ -1,5 +1,3 @@
-DIST gtranslator-3.32.0.tar.xz 2767988 BLAKE2B cf05561d35adaa77e1bb15adb11faad5346a236d6bf82ccc2b474c2478ea537c89852e0c0322067de1bb24c320ad6732eff5a0f6489a97e57c980b0f1c7d56f6 SHA512 4119b64f671ccb4d8132c4b18f53b614a80c6faaecef212b23268b2a189e7b337dd63f9c0d82e139976a6d5615c4c047ad3be97397734930b5c0d07b57e13531
 DIST gtranslator-3.36.0.tar.xz 2121776 BLAKE2B 745ae74a9a1a47af609b30712f5e6e99474081da9136cc15ecf0bd121e0dd01d326574466ddf4551df7255247a6a895dd468b085cee91735fe8883e4feb16c97 SHA512 63393a33db031ea549763113d6bc55cd00c081e671a31654d225968d8d31d671ca7e577b4df8336603fe2c769c5c443e9ebf69d558c888438d194a503e044044
-EBUILD gtranslator-3.32.0.ebuild 1009 BLAKE2B 6a7af19f1b6b4656b8f74f5d1d8176009f9de0333d52d4e6dea5214c88fc4c9576eebf8b96078e2eef5d6f525972f7938f2f07f78375f624ab5ba56bbdb01b7b SHA512 b4efe029a73ba4b6f0ac9438b97860c97a87ae534fcb8e10be079863bc0cdac208c56b167446b502514983c9be9e6f99ff769d079e25ca0752ac949b62c3945f
 EBUILD gtranslator-3.36.0.ebuild 1047 BLAKE2B 078ac2c56e4a4cb779bbb195f4bf5a04735c18eb7e4cc3250ba2d2b2e2a5f456aa0688a20f3787a5c5e8a1b364ae8c06fdad7c4061f2a2e69e716c7120b75039 SHA512 5810d411679934605ac7b8285ff87abedd8eb1ad443392278d8fed50dda3557b8bbcc006abb614879d07c4ece98c5d9a4d7c87ec801ea5c748d17edc4be73fc2
 MISC metadata.xml 812 BLAKE2B 9a347a373b7b39cd522c7bcacd845252798a5b9b06cef89ce14b71160e6b6673d65d5d9eee806c52aa104dde2d937894cb0e12a8d51b8d53feecb4bd52bb3db2 SHA512 e9cab01e3126862ab79cd223d87ed3bb927844b6a0cd7a40e94dc6ece54a2e2c4fe820032b4dd3c25b876a6704c866f3429f5ad98d82b9893ba9337a3a85d6a4
diff --git a/app-text/gtranslator/gtranslator-3.32.0.ebuild b/app-text/gtranslator/gtranslator-3.32.0.ebuild
deleted file mode 100644
index a833ec4d1aa2..000000000000
--- a/app-text/gtranslator/gtranslator-3.32.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org gnome2-utils meson xdg
-
-DESCRIPTION="GNOME Translation Editor"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gtranslator"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/glib-2.36.0:2
-	>=x11-libs/gtk+-3.22.20:3
-	gnome-extra/libgda:5=
-	gnome-base/gsettings-desktop-schemas
-	>=app-text/gspell-1.2.0:=
-	>=x11-libs/gtksourceview-4.0.2:4
-	>=dev-libs/libxml2-2.4.12:2
-"
-DEPEND="${RDEPEND}
-	dev-libs/appstream-glib
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	dev-util/itstool
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig
-"
-#	gtk-doc? ( >=dev-util/gtk-doc-1.28 )
-
-src_configure() {
-	# Needs gtk-doc we don't have at the time of gtranslator-3.32.0 introduction
-	#local emesonargs=(
-	#	$(meson_use gtk-doc gtk_doc)
-	#)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_schemas_update
-}
diff --git a/app-text/htp/Manifest b/app-text/htp/Manifest
index b244e5404530..26e099a00280 100644
--- a/app-text/htp/Manifest
+++ b/app-text/htp/Manifest
@@ -1,4 +1,3 @@
-AUX strip.patch 261 BLAKE2B 760a04284f2b79e942fbee21d7b075d41c047f8f7f5eca563f6754e4a9fec1c372986dbcc965f2a1009ac26f8347868f7c0cb4bb767ac98c3be8b2895c49677f SHA512 2f2a9afb828e9de08fa97ca2798a0d2dc6f65cbf192cbc749c3790ed542f75c49c5fbb4644fb8017f93dc24a42c584914d5659841a211c1fe74a3aa43be633e4
 DIST htp-1.19.tar.gz 208683 BLAKE2B 86837290a2f14b8a0337d9eb6a0fa4ad553c5c51074d5df903ee19aa7ba441898199f0649b39b93c35fa3707e4084a284e02d8802c014bf5c0277e3f18d02c98 SHA512 32d82bb42ef877bd815fe45fa81599a1428ad6d3269cbe53a4e686bcfe6d1c12ac2af280462768d488b1983ca67cc521da4ed78cc82d904575ffeff08c7eec1d
 EBUILD htp-1.19.ebuild 698 BLAKE2B 943bad8608f7c0eb9677747b2a68838204c4c8d0a1137eba07f8a7c8844dc16e99b215745b707d8df7e94616fc08b8802d625bdbf25cf18c176dde59dfdb69b7 SHA512 d7f085bbdc08fb1b1a0afaf076c1593bd4ad96d2ee26e65c98f958cd01fa1112074d2654a39ea3f47e12d787a33dfd1585fa24edad65ec0db0a9a0880535cdab
 MISC metadata.xml 323 BLAKE2B 815632fb1a839f62a7e2201270b77e1cb16955e5bcc978bebd09d0501eb2df6f56bf20a8ed6a7c2ed6d7a5fcb5d0900a06c38f22dc649c731ada0d36478f3aa1 SHA512 f5c0a7720bd23aa0c604e0ffa07e2925afe69f9af09c9364818e16197fdf55c1decac5839234cdb08e483be1bfb4d0a88279e57c2b48c0002d3de27e90616f26
diff --git a/app-text/htp/files/strip.patch b/app-text/htp/files/strip.patch
deleted file mode 100644
index 9c92e757bc9e..000000000000
--- a/app-text/htp/files/strip.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-don't strip
-
-http://bugs.gentoo.org/240110
-
---- src/Makefile
-+++ src/Makefile
-@@ -33,7 +33,7 @@
- 
- install-bin: $(MAINEXE)
- 	mkdir -p $(bindir)
--	$(INSTALL) -s $(MAINEXE) $(bindir)
-+	$(INSTALL) $(MAINEXE) $(bindir)
- 
- #
- # explicit dependency: final executable
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index d1311b9ffd63..63dfa0d3af5a 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,3 +1,5 @@
 DIST iso-codes-4.4.tar.gz 13299605 BLAKE2B 485f3b0240f1892fb96f2b5c391b3f0adc593fac97d53748aa104208936d1bf81de1d40e742ab48e3663cea0ce5b28a20782df2f4eed251bab5b8a7055745d0e SHA512 d22ecdef75cd07b59ea0dbc87d25eb254676ab83297c1a43dbad9d3471ba355630f5588b4590972526f9e885b2e1ec307303ac0bb94b2dd5c707377c1cfa64d8
-EBUILD iso-codes-4.4.ebuild 2632 BLAKE2B b1bfe206ff6b459e953030680265fd94735f296c95bff6667c82acac232f9c5b902cf70de0dc393faa774fcdbce9bd684491a1a8ddf71fadc420fe47e14dfd12 SHA512 dc93f1d790ea5112f9422ce861ba7d292fdf5ee07eb916b1e128849de4a8d5d5d2ca843083850374e9398114d693bdae88c855cb672c19f3b0b1452254e54138
+DIST iso-codes-4.5.0.tar.gz 13635723 BLAKE2B e96cbf80a93fd4901decd59006e51b39eb35b64b6ead28c0f0f1b0103f341dd79849db07f63be16154e5041a85a563d477b6470143ad325f1d25880d539807d0 SHA512 457585de1bfb848bbdbd15754588e690e3214f5d4442c32df4044f8a5b2cf6035c9c0cea84cc9b6e6ef093c0e9c8f7317e5bea920060b09d121b042e66046ca5
+EBUILD iso-codes-4.4.ebuild 2634 BLAKE2B 1d37ce48dada03c8ada9017d5e89fceadd03fdc2e42e951c29af59a8247e9205b51bb19f0e12b2ce743124e9831e574c684c4136131945286f53a330d5d15309 SHA512 a53cf554db840820f34e561d0c298ff2b3663229fca80ce0ef3a7f6ccfa480774d0dc21b847995e3d03eac8e8391e47cbe8f99b501d344ba26fdde2af1b5a19e
+EBUILD iso-codes-4.5.0.ebuild 2648 BLAKE2B 9bc6ffac0709af5b016d96bad98cf91b8418be861fbeec683a295f7aecb6d5c49811fdeac101ac7bfddcc1dc7d23b0cb7687b3d1d347b9bf14db7a15e2cf82c8 SHA512 e3259be91478ff1632ebb8863223dc68553f8691cdb6ba0903310300a83228d9103c2a022cbc6fd34f3f8ce76670e0be9829177eff9ab5196a16425698c93fe1
 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
index b87b8486be9a..b231ef1ff858 100644
--- a/app-text/iso-codes/iso-codes-4.4.ebuild
+++ b/app-text/iso-codes/iso-codes-4.4.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 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
diff --git a/app-text/iso-codes/iso-codes-4.5.0.ebuild b/app-text/iso-codes/iso-codes-4.5.0.ebuild
new file mode 100644
index 000000000000..fea8d4f45fa0
--- /dev/null
+++ b/app-text/iso-codes/iso-codes-4.5.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+PLOCALES="ab ace ach af ak am an ar as ast ay az ba bar be bg bi bn bn_BD 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 ~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"
+
+DOCS=( ChangeLog.md README.md )
+
+# 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/jo/Manifest b/app-text/jo/Manifest
index 57f65c8edb4b..f85494eda2b7 100644
--- a/app-text/jo/Manifest
+++ b/app-text/jo/Manifest
@@ -1,4 +1,4 @@
 DIST jo-1.4.tar.gz 144596 BLAKE2B 0e0a0290d276b18fbfea0c770e134f29ea3f1eea9c7e5ccdd6c7d853dc0a8c70279fa464731f5b231d6d9d48816be4e5a6d93c7abc0e03408a86f0e1691d67a0 SHA512 c283b25e76fa06842c4f7d8ae8d94b207981d92a1bd4a064631e0646bdeedc06c1a00dddac405a455b27bda5eb34aaa7dc6d886ccf750741fd4d7312f692d169
 EBUILD jo-1.4.ebuild 488 BLAKE2B e6fa094208c84a74e8f81715ab621b7323c37d13ba04433e64d7c78b1115b2ec80291df2c898e38b99ed998e01cf17096f21b5d610eabe050ebe7f88c875a2e9 SHA512 3c26934e8a5e3c8be1e16bdc530a5e014af4b2b2b80173d46940c8ff0ce6cb14c78f727d1230ad26fcf08e3e309a5c0f64c4162c7f961c1089b55dc747a6b55d
 EBUILD jo-99999.ebuild 505 BLAKE2B 87c67279bfd395e89ee8e9f2f26cc4bd12abfbf4955da369791b323da30dbc19646c73e19e7a13e6205ab59fac4d383cc41092ff6ba92f4ce6b0ab464c1e9555 SHA512 57988d8a84baab4b7551331ee546a60bd1a3ddb7b0e428d949dd815c53d311a37e6bc956267fc0c77a716ad769ae9c4fbd37dc067b567457dc1173031584f628
-MISC metadata.xml 288 BLAKE2B 8b66970135ed40287f00f96188b1679d936f9f58d59d2991aa36f2641e0a5ae48bdf3f36556be0b0296190a1c8bf59c88e6900de93e32c102b3adb880e524dcf SHA512 c8e9c740f13a6d2e94d28748750b51c44d9291d4fdc8823dc11647e0ae058866c06d49656011398d48fed78192bfe89f50a5fd05d36054974e3e65bdc82c55cb
+MISC metadata.xml 241 BLAKE2B 8172aaae44b397efb4ba4fe86dc06fe4710e4bcee1b13a5cb5b5f349c4d56424426b48816b245a9b3e8cb454cf6898d6105e25f171f56dcb6b2b85c3152ae7b1 SHA512 5581940fb24024b5d69dbd9d9a68aa6b96dd54d6a7798a5afb5f7dbe48563485e010cd1768629f171a85c84933349f29f203d290d222456fffbf072f5862d86b
diff --git a/app-text/jo/metadata.xml b/app-text/jo/metadata.xml
index aa1c918e2462..268a79f76600 100644
--- a/app-text/jo/metadata.xml
+++ b/app-text/jo/metadata.xml
@@ -1,9 +1,7 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">jpmens/jo</remote-id>
 	</upstream>
diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 13af88bb7c3c..4121818416a9 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,3 +1,3 @@
 DIST kbibtex-0.9.2.tar.xz 4196896 BLAKE2B 198b9a44f1aa19aa0f33f5abe6bcd135e5367ccacbc1d947fcdca531259d8b0ff3f1a53dacd8ce660691ea0ca709e5873adfbd79d01fe318fdfa273234d97938 SHA512 b733339f21fac0be3125e375d59f9060514107532372504902240e4e744e2f62cdff73ef0ea267e96f1e58e15ce917d1d1fdd7a3811a89493e0caedc877ca63a
-EBUILD kbibtex-0.9.2.ebuild 2069 BLAKE2B 9aa3159a7840e89c6275b0c9355b7abf8765ca37d6ad18edc2d2d2ef44bd7bb5ba3bbec5ed6b7528fab97fca493314e8f659f32c93973bb67dd9e656dd6cb5e7 SHA512 c86f0d22dfcb5673fe676e5d4b3903f67c4b7d3e17181e7a7a80fe41552f788d1192aac0b325d6d0d82ab708d0ee0db54667d471e7ab76d563f1e86c1a4113c7
+EBUILD kbibtex-0.9.2.ebuild 2046 BLAKE2B a77265d918f7857ffa1cb1773539756b044c508b39aa5f835643f49c62382e417204005f8f36a2ebe5f69e21b5120cf9c1b28fd8e94d48ffad971a77db5fb774 SHA512 751fae344944ea23db4962b2233279a58877ab9e1ccefa3373f5d62929623e4f4baef608d873d93656985795bcf07da046b664b6e55583214964102dfc0c4cab
 MISC metadata.xml 440 BLAKE2B e5121ee173f89412a1bf3339de23a9e13fcec40f52c82129ebd185732759e4ad586b922d31e6470f91e03ba2ce614ba6de75dcb340e0f20d5b799c3476bde23b SHA512 cb2f6751bff9d468dde56635a792813de84b6c383e488ab5764c9656e54a892f5a9b9fd4932d49ec603bae4716f9f0bdd3cbe90b0c796017fceeb6b61196f1ef
diff --git a/app-text/kbibtex/kbibtex-0.9.2.ebuild b/app-text/kbibtex/kbibtex-0.9.2.ebuild
index 57e69f9c8e25..2721357c5c5c 100644
--- a/app-text/kbibtex/kbibtex-0.9.2.ebuild
+++ b/app-text/kbibtex/kbibtex-0.9.2.ebuild
@@ -10,8 +10,7 @@ QTMIN=5.12.3
 inherit ecm kde.org
 
 DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
-HOMEPAGE="https://kde.org/applications/education/org.kde.kbibtex
-https://userbase.kde.org/KBibTeX"
+HOMEPAGE="https://apps.kde.org/en/kbibtex https://userbase.kde.org/KBibTeX"
 
 if [[ ${KDE_BUILD_TYPE} != live ]]; then
 	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest
index 24819237abe5..53fb758f49b1 100644
--- a/app-text/kjots/Manifest
+++ b/app-text/kjots/Manifest
@@ -1,6 +1,5 @@
 AUX kjots-5.0.2-kf5bookmarks-5.69.patch 2734 BLAKE2B 5bbad18ee50f844320a405347eb6f89535b831d42b4751c56d7227e31095dbf0767fff15ea5fe3930bb11a13155bd13db6f9b970be86aee011c0929efaa7dbfe SHA512 13aff021919d8565cce1c6e7c84cdf23e9a405394374451325f229a00ce5d36be070c0efb0726573297a615d709e0a7d1bd60cb5f1e7752aaee50d8021b64fef
 AUX kjots-5.0.2-kontactinterface-20.08.patch 5563 BLAKE2B 2c754b4a31c133c4fe9409e930df855366d0276a35678466b07b4fd54736c1ec64bdac6b3064bceb5044765433f6d953239746e580f4ef150ad274e111829001 SHA512 0fd6cfaaaac12bac57043acec043ad4fabb232a2df666379860b745b6d137e18193abd6447dca60a51596cfa969f4193bafc33d811bf793b547df43efb462026
 DIST kjots-5.0.2.tar.xz 230608 BLAKE2B 3194b0ef072decfa09455ca7e8d6057ea3f37f54d37641a6ddf28e17ef4662a408adc9e9b04394e6002b51e72ef740412bcdd70324d6efcb9e949f9911437559 SHA512 a652765c56cebcaeba7b879cc075555c28667abdba84d11e986e5ffb440fbc776116f363992dd84d939918ae7d80ef5c2e1093da28d114b18041e10e5209b225
-EBUILD kjots-5.0.2-r1.ebuild 1469 BLAKE2B 0e66e6554360a201f1095861cc6f5a65fe5f4ac5b344f4f55ebd87b350c5e412782f5e75f5e56f64a36df1250aebf45d9d07d6afcb4b93f879df50cc1087bf06 SHA512 04e3be8661fb2eff2dd22373fea6c6fb12ce49cac076e661cbf1af9538742405bf71d84f6dcace4c07a5c451639694b6b2dd31c11af11d7a07f1a4a3a7795f90
 EBUILD kjots-5.0.2-r2.ebuild 1343 BLAKE2B ac83e67d01b3375519a0075f776b44c9cd6a4b81a7b5c28f24dd34a91613a92d89aac13b797a6f8a1fe1084389017ee38910c6d1680fb186008692c9d1c5b88e SHA512 50fc1c301a15794f5a14accb24b22f996c94fc364431d41fce024b5b7f342763b797012a058c1cb90c0ff2bff5047b872c7d01979f839234a2713d69893ce4a6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-text/kjots/kjots-5.0.2-r1.ebuild b/app-text/kjots/kjots-5.0.2-r1.ebuild
deleted file mode 100644
index d5159f4edb3b..000000000000
--- a/app-text/kjots/kjots-5.0.2-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.60.0
-QTMIN=5.12.3
-inherit ecm kde.org
-
-DESCRIPTION="Note taking utility by KDE"
-HOMEPAGE="https://userbase.kde.org/KJots https://community.kde.org/PIM/KJots"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="5"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# drop kbookmarks subslot operator when KFMIN >= 5.69.0
-DEPEND="
-	dev-libs/grantlee:5
-	dev-libs/libxslt
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-19.04.3:5
-	>=kde-apps/akonadi-notes-19.04.3:5
-	>=kde-apps/kmime-19.04.3:5
-	>=kde-apps/kontactinterface-19.04.3:5
-	>=kde-apps/kpimtextedit-19.04.3:5
-	>=kde-frameworks/kbookmarks-${KFMIN}:5=
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-"
-RDEPEND="${DEPEND}
-	!app-text/kjots:4
-"
-
-src_prepare() {
-	if has_version ">=kde-frameworks/kbookmarks-5.69"; then
-		PATCHES+=( "${FILESDIR}/${P}-kf5bookmarks-5.69.patch" ) # KDE-Bug 384000
-	fi
-
-	ecm_src_prepare
-}
diff --git a/app-text/krop/Manifest b/app-text/krop/Manifest
index 3fc68e043d49..a4d16eb8c75f 100644
--- a/app-text/krop/Manifest
+++ b/app-text/krop/Manifest
@@ -1,4 +1,6 @@
 DIST krop-0.5.1.tar.gz 42719 BLAKE2B e0baa3c14d9ce63815615eae004a08af720868d584262901eccbc569852177e07d5df659ea560d7e9cbdc4325daef8c35acd9c200440a8dfd73c19b274d8de37 SHA512 2bfd2a5d762454ab45538707c6f333d2b0947b6b203d6e7bd2d9d0d574d79de8ee6b30d87b17d6afea604456b915f323b855c9c9af5c169c192b0a01634075ca
+DIST krop-0.6.0.tar.gz 48331 BLAKE2B ca6a00a410ed4e18a401fab3a21bc49c86f73165f68b192ab83c8fad74111ba9a9941f464a2646faa5a3317bbb45cdc89bed19c901999c0b11db353ac2997a65 SHA512 51a988e4fcb65d11cc26cf5b0c808e79097a66ef8ec4751a6c051289cd77b3328ebc8ecd9829adc466f87330beb8bc715d290cc20be415a7b8f179378b7bcb4f
 EBUILD krop-0.5.1-r1.ebuild 890 BLAKE2B 2a22e3e81c0c6d8154275fb8265a7dd2aab8e5528fc3e1dcd2bdd77e37f314b86e5dfa93577434fa56ffd8467c35a05a37914cffc747061fc46a43ca7e5d27c1 SHA512 6cab7d003e17681c842c2755887ac648cd7d90bcb46f557d18d6dc4c605a22d7584ff2af93eac336e8a8d316aa55b5d286272a792a9edb617301766b38b367c1
-EBUILD krop-9999.ebuild 891 BLAKE2B 560fb4ab2aa90d452dfe4a2f86666e50ab35e50501e9146c016d8c251d831e90f7ec089859f5ad1bab32d6698fcf8b62797453b2c36402660ee26e1009b181ce SHA512 71c2fe9b14063cd71200575a03b1a358703f1f5f33b351c496521dcc3660321a33fbd07a930dc64ef0c7270c489c54bb3b043903a89a9fd9c51e15e25324133c
+EBUILD krop-0.6.0.ebuild 947 BLAKE2B b179310ce8c3df53b833081a4d7e0798d9c95ebef78e65f518467589ca86ddc73581ec91278df2a3ee0482b535436326ecca9015b1ba307c7ce230691955382c SHA512 9d01edf0eda212529af80075a0609aa4e936d6ced2392441907d5a975fd51af5d76ecf82c20abf56db6741b1afe5fad7385284188d6f3c5db305a0b900def386
+EBUILD krop-9999.ebuild 947 BLAKE2B b179310ce8c3df53b833081a4d7e0798d9c95ebef78e65f518467589ca86ddc73581ec91278df2a3ee0482b535436326ecca9015b1ba307c7ce230691955382c SHA512 9d01edf0eda212529af80075a0609aa4e936d6ced2392441907d5a975fd51af5d76ecf82c20abf56db6741b1afe5fad7385284188d6f3c5db305a0b900def386
 MISC metadata.xml 333 BLAKE2B b62d23170b13a4d2375de72955c2708368a34435f022231b829b19b60c9f38a1546ec62887dae545691eb1df45998ab7810aa58df3b94729632991e49c4c098f SHA512 30ec13878bbe3b50c90f1849bbc5bf0f8dc05bf1b6a8f79695590f48c76618eef4666965b8130d1909db3c960a43d3149dba525017f342ce9635afc530b873f0
diff --git a/app-text/krop/krop-0.6.0.ebuild b/app-text/krop/krop-0.6.0.ebuild
new file mode 100644
index 000000000000..3f7134934cdd
--- /dev/null
+++ b/app-text/krop/krop-0.6.0.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit desktop distutils-r1 xdg-utils
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/arminstraub/krop.git"
+else
+	SRC_URI="https://github.com/arminstraub/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A tool to crop PDF files"
+HOMEPAGE="http://arminstraub.com/software/krop"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="dev-python/python-poppler-qt5[${PYTHON_USEDEP}]
+	dev-python/PyPDF2[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP},gui,widgets]"
+
+src_install() {
+	distutils-r1_src_install
+	domenu "${WORKDIR}/${P}/${PN}.desktop"
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/app-text/krop/krop-9999.ebuild b/app-text/krop/krop-9999.ebuild
index 5dbe780b3d81..3f7134934cdd 100644
--- a/app-text/krop/krop-9999.ebuild
+++ b/app-text/krop/krop-9999.ebuild
@@ -3,6 +3,7 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit desktop distutils-r1 xdg-utils
 
@@ -10,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/arminstraub/krop.git"
 else
-	SRC_URI="http://arminstraub.com/downloads/${PN}/${P}.tar.gz"
+	SRC_URI="https://github.com/arminstraub/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
diff --git a/app-text/libebook/Manifest b/app-text/libebook/Manifest
index abbfe7b8735b..a8b1b0034f8a 100644
--- a/app-text/libebook/Manifest
+++ b/app-text/libebook/Manifest
@@ -1,7 +1,5 @@
-AUX libebook-0.1.2-boost-1.59-makefile.patch 335 BLAKE2B 21b62202de334b214e4dd04ea2d06e23fdacb49d35020a7e874f27cadecc13dd96221826469bac50d063583b2f10e93cd325d53fa6cff181ab806bb83623cf02 SHA512 fe435d531d0b4646d8642dfa471352519e3e606b31c3fe727ebbd1ebecdeef58663aadbd7ae95ac902055074b550b659c7eb5cc981a078315462da9a892abe43
-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
+AUX libebook-0.1.3-icu-68.patch 991 BLAKE2B d8b7cbd831e65cdd82131d13c50558e2ffe4ed5ab72c6f576267921176ff5d65be2a0c71b3c1cbd853db9456d6a7c20ba27516fbb7f4b7a83e22fa0680cd23ad SHA512 5378d95e926e4b385b8dfa957254b5a1d2b943be5562124b897ead5a81e2922a39d37768afdd010e18655f2a184d82c837b19ab7f862b19ff71c0d5e664c076b
 DIST libe-book-0.1.3.tar.bz2 510498 BLAKE2B e29f9f80a85210447494af20cf30ce7f231ef43f40af9683df7f63e172f5ff8d944d74b995b5850856b2736044b1a5a1ac386262e52a48575325339224a1d339 SHA512 9afa2949f702a34fd6278145ce8d18d504326ed5a103bbc872d0493fcf3e2166d41d094bb0d74b80aa913ca6d082f5bd3259799a4a3c7359331ccdfa1e029a21
-EBUILD libebook-0.1.2-r1.ebuild 1102 BLAKE2B 746d4d4dda955395419b8c316650e2048496da0ea0684732b668edbbf4e1fb3859c22ff7e08e3388d707cbc1f8bba6923a5d4e89ccb45e95ef8512615b9e0b30 SHA512 cefcdac481822765c7ff42d90183e3c90c3122b75b8380f694d3bba000205a184ff114772aff47fe1266528a6ea4a7c90845454af7f8c3e9db48065d9e9c968d
+EBUILD libebook-0.1.3-r1.ebuild 1062 BLAKE2B 34ec7e280b67c138c15a47f46d867490150cbfdf95e520824a267bbe0734c715ea1dc9aa784d388b0a7673146668af0043ef3038672cdf0f3f2a8fa7eea052ed SHA512 2c98c078ebb77ff932f760b68316a98e0bc0d0989bf6d05d58208b1948a0bbd5407d7cde85d6539f2ec06e6997f115d45aa6418dfe599f0082f9939ed8eb1586
 EBUILD libebook-0.1.3.ebuild 1039 BLAKE2B 78ed938aef8e76bd9470bfb0fb2de9d318c5c503efaf49d82f5ddcf973190d042715271a62204fc7b0b3d33be827a7e042dc85bd0b6cb44fe995e590a891892a SHA512 98eb112d3ff3c5b5b2572b38c42a933b47860622f21980b703f7d9154189915d93a4b54b33a759c0e16ddd9f36761e30944da12eac25b52014467141c861db0f
 MISC metadata.xml 404 BLAKE2B 69f06dd52ba8be857d504941c4aeb6778381d87d61f1c9a889a6c1ad16a9d7014dabf76c707db2ed6a160be300a010e6d15c2162d35e59ddd038181a4aa7fae8 SHA512 8e0679b60d1fd56fcb165fd7b5a8e1367f4ee472d7a58e157e6bb1445b502b1fee56b18d099837dcabaa35f7b18f52515cbb51f7bfe9c4c2a824210e4003a275
diff --git a/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch b/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch
deleted file mode 100644
index 9869b308c73c..000000000000
--- a/app-text/libebook/files/libebook-0.1.2-boost-1.59-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/lib/Makefile.am
-+++ b/src/lib/Makefile.am
-@@ -64,6 +64,7 @@
- libe_book_@EBOOK_MAJOR_VERSION@_@EBOOK_MINOR_VERSION@_la_SOURCES = \
- 	EBOOKDocument.cpp
- 
-+libe_book_internal_la_CPPFLAGS = -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED
- libe_book_internal_la_SOURCES = \
- 	EBOOKBitStream.cpp \
- 	EBOOKBitStream.h \
diff --git a/app-text/libebook/files/libebook-0.1.2-tests.patch b/app-text/libebook/files/libebook-0.1.2-tests.patch
deleted file mode 100644
index 624051a757aa..000000000000
--- a/app-text/libebook/files/libebook-0.1.2-tests.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 263d95ce191421a51d4b2d088297700032a8987b Mon Sep 17 00:00:00 2001
-From: eroen <eroen@occam.eroen.eu>
-Date: Mon, 19 Dec 2016 19:53:15 +0100
-Subject: [PATCH] Check for librevenge-stream if tests are enabled
-
-X-Gentoo-Bug: 603098
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=603098
----
- configure.ac | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 6e00ed5..ecbd14b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -357,6 +357,8 @@ AS_IF([test "x$with_tools" = "xyes"],[
-     PKG_CHECK_MODULES([REVENGE_GENERATORS],[
-         librevenge-generators-0.0
-     ])
-+])
-+AS_IF([test "x$with_tools" = "xyes" || test "x$enable_tests" = "xyes"],[
-     PKG_CHECK_MODULES([REVENGE_STREAM],[
-         librevenge-stream-0.0
-     ])
--- 
-2.11.0
-
diff --git a/app-text/libebook/files/libebook-0.1.3-icu-68.patch b/app-text/libebook/files/libebook-0.1.3-icu-68.patch
new file mode 100644
index 000000000000..964b8b7e195d
--- /dev/null
+++ b/app-text/libebook/files/libebook-0.1.3-icu-68.patch
@@ -0,0 +1,27 @@
+From 9ea3b4c2552770b66b83d44b6e6ccdd338296316 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 30 Oct 2020 10:52:10 +0100
+Subject: [PATCH] Fix build with icu-68.0
+
+icu-68.1 removed public macro definitions for TRUE and FALSE
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/lib/EBOOKCharsetConverter.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/lib/EBOOKCharsetConverter.cpp b/src/lib/EBOOKCharsetConverter.cpp
+index 0d85fa3..c9f8be0 100644
+--- a/src/lib/EBOOKCharsetConverter.cpp
++++ b/src/lib/EBOOKCharsetConverter.cpp
+@@ -124,7 +124,7 @@ bool EBOOKCharsetConverter::convertBytes(const char *const in, const unsigned le
+       m_converterToUTF8.get(), m_converterToUnicode.get(),
+       &outText, outText + out.size(), &inText, inText + length,
+       nullptr, nullptr, nullptr, nullptr,
+-      TRUE, TRUE, &status)
++      true, true, &status)
+     ;
+     if (status==U_BUFFER_OVERFLOW_ERROR)
+     {
+-- 
+2.29.2
diff --git a/app-text/libebook/libebook-0.1.2-r1.ebuild b/app-text/libebook/libebook-0.1.3-r1.ebuild
index d7fb8e609183..8f1af5bceffe 100644
--- a/app-text/libebook/libebook-0.1.2-r1.ebuild
+++ b/app-text/libebook/libebook-0.1.3-r1.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-MY_PN="libe-book"
-MY_P="${MY_PN}-${PV}"
+EAPI=7
 
+MY_P="libe-book-${PV}"
 inherit autotools flag-o-matic
 
 DESCRIPTION="Library parsing various ebook formats"
-HOMEPAGE="https://www.sourceforge.net/projects/libebook/"
+HOMEPAGE="https://sourceforge.net/projects/libebook/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="MPL-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="doc test tools"
+
 RESTRICT="!test? ( test )"
 
 RDEPEND="
+	app-text/liblangtag
 	dev-libs/icu:=
 	dev-libs/librevenge
 	dev-libs/libxml2
@@ -35,10 +35,7 @@ RDEPEND="${RDEPEND}"
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-	"${FILESDIR}/${P}-boost-1.59-makefile.patch"
-	"${FILESDIR}/${P}-tests.patch"
-)
+PATCHES=( "${FILESDIR}/${P}-icu-68.patch" )
 
 src_prepare() {
 	default
@@ -46,18 +43,17 @@ src_prepare() {
 }
 
 src_configure() {
-	# bug 618854
-	append-cxxflags -std=c++14
-
-	econf \
-		--disable-static \
-		--disable-werror \
-		$(use_with doc docs) \
-		$(use_enable test tests) \
+	local myeconfargs=(
+		--disable-static
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable test tests)
 		$(use_with tools)
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index 5cc85b6d5687..c99290d4c916 100644
--- a/app-text/libgepub/Manifest
+++ b/app-text/libgepub/Manifest
@@ -1,3 +1,3 @@
 DIST libgepub-0.6.0.tar.xz 26092 BLAKE2B e578ce1085f35ef56ae32e7c32dcd5aa3b54c4d4b2c3d3826a91984b220bed90e185e724fac338f8a95cf4bbdd7969ca19298be7f9a80ecfeddfcb113149c7df SHA512 90c8df55c2465ab3c44092a772d568b412cea60f20d0f32d33b124d70ece1655dcf53d87c5effa2c494bf103c2e51d31192edf0ad71b46fa61471f94b5768c99
-EBUILD libgepub-0.6.0.ebuild 644 BLAKE2B df2cf465d0d68cd90e2f8bedc84c38b9ebc88891bf1f2194fc1e68b2ba3eb9c23a2a0b8b8c5acf4842959d4f70ee7f5bbc0f8d884a1ffc20f5f95a706be50ef4 SHA512 324a75f046affb0911b7a95a5b3aba11c5aeb65cb969e87f5028028be1868901ea612f597a82796c73a13f7031ed584a63c0d11302704b13f7be3a189bf3610f
+EBUILD libgepub-0.6.0.ebuild 663 BLAKE2B b82a2b55a892c18655ca728a0aa081520cb0cb668053e7923a1c465373ef2919764231d98bc94842e7bbeb4329471285c8d8c295394d6e1cffaa2d42dea41cff SHA512 f0c3b5c9b5584bcdc6cca2c0595457304f65d913fc6261ab614e569128d4e5facaefbaa507207213f7993967566d3bcca88dfb14de9d4eabd4027268d0cdfe55
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/libgepub/libgepub-0.6.0.ebuild b/app-text/libgepub/libgepub-0.6.0.ebuild
index 9685b374db7e..c8eae9e5f272 100644
--- a/app-text/libgepub/libgepub-0.6.0.ebuild
+++ b/app-text/libgepub/libgepub-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgepub"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index 1578fe2895ba..ff473167ffe8 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,4 +1,6 @@
 DIST libmwaw-0.3.16.tar.xz 1306872 BLAKE2B 29c39ddb2cfe63116cbe7152a4dc3b7f16d402745c0dffd67c07dc42fa1ddee71f391695ead2519b3e1da206e8f437fbd24fa78ce1decfaa55e38a13d5d144e8 SHA512 c043d77e4b0efd7da594c1e370f24ee2d85afcb8a5e28179b4c3d76c8b7925f41ca5361bee12b35af732ef39f34fac46aa3636cb27c179ef9bb2b6feeaa19b0a
+DIST libmwaw-0.3.17.tar.xz 1349700 BLAKE2B 4b5ba8d5133144973609dfbd273ca36cc95e52608c78f6143f7c4283bc2bc6d7ceb22836a693d64fa7408957a3b02a7c9d0a5ab9235aa2d0b9725170441babfc SHA512 c3a1bb079d7e74cd7a23de1501730be21b1b089ef6d4f81ee0001775483c6346da3105b0d67f75523e4e088987bc92b97acb056ec7fc11bb29047109a1cf5ac4
 EBUILD libmwaw-0.3.16.ebuild 1032 BLAKE2B 24628116e25ae32185374858f2bc466eaff8c435ef4974789c204672551d939a4e19483ea610bb2fc141978c71fbcd3237fac386fa7928546513671a9bf5777f SHA512 9c6ef217f07414f0806f17aa9b13f2c32bf931f2b61fd85f4021d47c9082ffabe3b534de73870fbacfe13322d0a2b9e102f246445bc10b4035662782d134e151
-EBUILD libmwaw-9999.ebuild 1027 BLAKE2B e51984196fe26cf9e7ba8ebe2e6de35c58443d3db82a65ee5d0358ac05f7905227670e05106e89d52ecb264f1e3833fe38917fce36a1fb6a2449228d90409d82 SHA512 9b530edcb03829b26715e09c5b99dc5f08bda876317813bf4589a7366a4bf20c5e2f0604792d103d6f50f2f7c4439a19dc60e362bef8627026508910eabf7837
+EBUILD libmwaw-0.3.17.ebuild 1004 BLAKE2B bd99841d18279477318ce13e9c80907572ecbb1de67ec738bf32afda9df36ed9e4d0e6ec695a386e535b41e19d0088f2635778448a0b6480bdc71c84da44a62e SHA512 f822bef23ebbe99c097d20a6b312014abb2091e61a54f4a8cf184252f13db23deccc3c0ac6b09f68309d4cf95479a58be6a8a9ba508dfd30e327ea6a5958fb95
+EBUILD libmwaw-9999.ebuild 1007 BLAKE2B 0d5cee2920040a56940cf0e916f4734433875c73fe541d7918c3bdaea0d4820a40975a0d67c154ef23a02f6b70e3fe49b9ceaaacc79cfd82c6ee74d552f455e4 SHA512 d65054c2dbd389041d5c55bfa8f8819507987ef862474f218ba6115d818dda293ecc7473f67b33cdd89679f706a7b2d717e22f6c071e922d79aeea1a37917a16
 MISC metadata.xml 403 BLAKE2B cbddacc98e4f22e521d739150ee4044b93c297dbd6d220a445192a3d1a6316491d6ed72ada8bd138c287133fcaf1b3d5ce580e68dd3ec071d36abbc1b05b4b6d SHA512 12cebd7bdaff6a793598f40cb11f4ae6681dcb29b18ecb7db92681abf1f6d4ce0281ae292c84106a143c0ff5ff3395e37604b3576c6a479001fc351dba10c7ed
diff --git a/app-text/libmwaw/libmwaw-0.3.17.ebuild b/app-text/libmwaw/libmwaw-0.3.17.ebuild
new file mode 100644
index 000000000000..094644ec7197
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-0.3.17.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+if [[ ${PV} = 9999 ]]; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/libmwaw/libmwaw"
+	inherit autotools git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+fi
+
+DESCRIPTION="Library parsing many pre-OSX MAC text formats"
+HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc tools"
+
+BDEPEND="
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+DEPEND="
+	dev-libs/librevenge
+	sys-libs/zlib
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == 9999 ]] && eautoreconf
+}
+
+src_configure() {
+	# zip is hard enabled as the zlib is dep on the rdeps anyway
+	local myeconfargs=(
+		--enable-zip
+		--disable-static
+		--disable-werror
+		$(use_with doc docs)
+		$(use_enable tools)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/app-text/libmwaw/libmwaw-9999.ebuild b/app-text/libmwaw/libmwaw-9999.ebuild
index cc207bd575ba..bd259959df53 100644
--- a/app-text/libmwaw/libmwaw-9999.ebuild
+++ b/app-text/libmwaw/libmwaw-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ HOMEPAGE="https://sourceforge.net/p/libmwaw/wiki/Home/"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-IUSE="doc static-libs tools"
+IUSE="doc tools"
 
 BDEPEND="
 	sys-devel/libtool
@@ -38,9 +38,9 @@ src_configure() {
 	# zip is hard enabled as the zlib is dep on the rdeps anyway
 	local myeconfargs=(
 		--enable-zip
+		--disable-static
 		--disable-werror
 		$(use_with doc docs)
-		$(use_enable static-libs static)
 		$(use_enable tools)
 	)
 	econf "${myeconfargs[@]}"
@@ -48,5 +48,5 @@ src_configure() {
 
 src_install() {
 	default
-	find "${D}" -name '*.la' -delete || die
+	find "${D}" -name '*.la' -type f -delete || die
 }
diff --git a/app-text/libnumbertext/Manifest b/app-text/libnumbertext/Manifest
index d9197b2ed096..755a048c9a4f 100644
--- a/app-text/libnumbertext/Manifest
+++ b/app-text/libnumbertext/Manifest
@@ -1,5 +1,3 @@
-DIST libnumbertext-1.0.5.tar.xz 281640 BLAKE2B 5480c72fed80a9d4825b37a876efa8588c8efb187ee5a65629ac800d98a2882312f443736f4c967ee0ae2fc32a0dbe758b1c275378d807df3d1da4cee6dff9bc SHA512 4d61464f26f631d272ef7285fbb931d3931b08240b58166b7e9a28c95ff5a537ca04af4c9673541b73997339d66061858c9cd18873b4c16f9ad2ccd1b68e81a3
 DIST libnumbertext-1.0.6.tar.xz 283416 BLAKE2B d02a521db19a21c6036412f902af7227d7442ca25d38e5e35339f74c8ee6e275ed085aeb4c4f07f998bcdc33ac62be84ce6915dd430594dedad1fa0f65b388b6 SHA512 0b2a5226f363af9a6df90f788f6cdc5fe95ddb524d96ad2db1caf2e7f414649ce2975eae3c9e5fceecbf825a90c736a0717b02ec9671e980ab9cfb3e2df73b8d
-EBUILD libnumbertext-1.0.5-r1.ebuild 544 BLAKE2B 886724679f53691089fe45359180712ee3bf74c16c7a939fda4b84493283065fc6f9cf9ca4b6890adf6e0f2f390cac52fe4c20294232db7f96fb278e28da4b83 SHA512 d3737fb073898718813b7b0465a295a9e772f6fb119250b6d70522ca09802f79e2a3741788f63985a29c1d55d25f78f55e2f3271ae9b7327b013e486fe38b786
-EBUILD libnumbertext-1.0.6.ebuild 546 BLAKE2B 525a518f93f30c5f039a44ec638db8fb655637d45ae0441d38be80609eda2d3489970a85fadc3e1e9b6dc26eccfe513318f269afb88b95d9fd6e47a1d3ca5f12 SHA512 c4ed0b8bba6f24349340ce6a5e6bb5fa64ad1ab482912aaac5363886967f9467d327fe0337bcf7d22dfb4aba4dd8dc5c7a3926dba68b70e01f2622757f839d43
+EBUILD libnumbertext-1.0.6.ebuild 544 BLAKE2B 886724679f53691089fe45359180712ee3bf74c16c7a939fda4b84493283065fc6f9cf9ca4b6890adf6e0f2f390cac52fe4c20294232db7f96fb278e28da4b83 SHA512 d3737fb073898718813b7b0465a295a9e772f6fb119250b6d70522ca09802f79e2a3741788f63985a29c1d55d25f78f55e2f3271ae9b7327b013e486fe38b786
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libnumbertext/libnumbertext-1.0.5-r1.ebuild b/app-text/libnumbertext/libnumbertext-1.0.5-r1.ebuild
deleted file mode 100644
index a0453adf49fc..000000000000
--- a/app-text/libnumbertext/libnumbertext-1.0.5-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Number to number name and money text conversion libraries"
-HOMEPAGE="https://github.com/Numbertext/libnumbertext"
-SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE=""
-
-src_configure() {
-	econf \
-		--disable-static \
-		--disable-werror
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/libnumbertext/libnumbertext-1.0.6.ebuild b/app-text/libnumbertext/libnumbertext-1.0.6.ebuild
index eb21ab61e89d..a0453adf49fc 100644
--- a/app-text/libnumbertext/libnumbertext-1.0.6.ebuild
+++ b/app-text/libnumbertext/libnumbertext-1.0.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/Numbertext/${PN}/releases/download/${PV}/${P}.tar.xz
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 src_configure() {
diff --git a/app-text/libwps/Manifest b/app-text/libwps/Manifest
index 88b4a532d911..ab5e059af186 100644
--- a/app-text/libwps/Manifest
+++ b/app-text/libwps/Manifest
@@ -1,5 +1,3 @@
-DIST libwps-0.4.11.tar.xz 706000 BLAKE2B e733b2fed9a05352b41126b2c0225807b3fe9a57f01f3b2a3bf35f99bd0adbd47bab8ef058f45de749332d407d589f6c33a03a3579fc76551548cb92c236e09f SHA512 6c81342b68fd93974c10ec0907dd46e9417cafa46d06205843941650828f4299a8793a7ace5c0ca755b8b9fb91fc1d6ef63304c641e7b5de36885e9995566e36
 DIST libwps-0.4.12.tar.xz 713008 BLAKE2B c95bdab54f8853cd1d13b59904ee4064cded3741cb91f2b067f139d80cdae6ea19bac68e6855cad74878403bc1a04c6f4bdd3181407b69b7e50f1e7bf4255f58 SHA512 d23667681f443b0c718b55006bee881e8a07d6b071cda742a783a89e9ed0e4c60c66c7dc9612a3fb4a419ff6d6e572f5981cec1d9470422e10cf9837e92a4649
-EBUILD libwps-0.4.11.ebuild 782 BLAKE2B 74bd852c8cce0c5ccacf6d96f30f9dfb4b1f68a022c7f75fa11ec86f29bab9a5d8c5e671645bb3bcf6813771b06f0d2778b1a15b0d70773a402c8129e73dd65a SHA512 b27f0287b4ac60676578b94e0398aaa2b820b068b716478fdd73681ee91b451aaa8a66edb9f8d0970dc2cddacd04fd29c049c5c0d9b6a4f1cd647b678384c11b
-EBUILD libwps-0.4.12.ebuild 756 BLAKE2B b2ca793800d38a7fe1073b241d71b89e19f551aec31a0ab8340046c3bf17008df90a64ef4006582da9fdb9f4ce14605a86dabf144b332a99bfac1fed158a4d02 SHA512 7311f62ef7c72dbb95a10beb63b4a4d1b37111dea4dc9a84bb5b9a73691574522f2aa256ff388750768d309738c321429dbca32d487c518f0d7edb7a506a76b9
+EBUILD libwps-0.4.12.ebuild 754 BLAKE2B 449bac5a80ec3d994028817f12be1f52febda1fca07d3c0032597d01664eacbbc797f135d20b61a3b5218a575b07b888ad7a74c3ac8de41b2459f3a79a5ac19c SHA512 aa620b7702fb33a16d725d1614e7a5957dab8fc6de535eded49c4e4c1cdf2eb8948312aa83a8e8e3823b98ad12e5856cd3d1d913d1ddd2fe7451a63063590f4a
 MISC metadata.xml 512 BLAKE2B e2125277139c062748282be37319771c209ba9b9c6f68e0ab9b8e9b5d10c4dfda9f6369aca792be2f21db8c1dcf3e840f78f159190162114458ed9279bf46270 SHA512 971b6f541825d73b66f09bc6b6ab677c2b1f1430a6cdd469dfe57162528d13b048681c8e00de061aa8ef5f98914b36b8bce7e13a35044937e65298469241bc1e
diff --git a/app-text/libwps/libwps-0.4.11.ebuild b/app-text/libwps/libwps-0.4.11.ebuild
deleted file mode 100644
index 469c52effde1..000000000000
--- a/app-text/libwps/libwps-0.4.11.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Microsoft Works file word processor format import filter library"
-HOMEPAGE="https://sourceforge.net/p/libwps/wiki/Home/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 x86"
-IUSE="debug doc static-libs tools"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="
-	dev-libs/librevenge
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_with doc docs)
-		$(use_enable static-libs static)
-		$(use_enable tools)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/app-text/libwps/libwps-0.4.12.ebuild b/app-text/libwps/libwps-0.4.12.ebuild
index fa7139d22038..4e131ee40afe 100644
--- a/app-text/libwps/libwps-0.4.12.ebuild
+++ b/app-text/libwps/libwps-0.4.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="|| ( LGPL-2.1 MPL-2.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc64 x86"
 IUSE="debug doc tools"
 
 BDEPEND="
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 64fc10f73e89..de4ec17a09c2 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,12 +1,9 @@
 AUX Makefile 2810 BLAKE2B 9c8ad849e95dc4037813bc575b5627b54bdf1eae3085235489e1a1c0fdf3aa3c679b5884d4044fce828f2feef02afcb82c7762b09af2c9b167c1c2dd7d0c5c7c SHA512 28014bbf81cb22c28963b594f8ef15a16740e41de2d6ad7421017fc5a50015e33ca1d449ea43a9976f741a269dac4045b2ed459cb74081690f919a4218542303
 AUX llpp-30-keysym.patch 1669 BLAKE2B 4df35a04c4b5de7e8fa4eaf7efe6a63f203292f12c03d1c232a0c54fa7f9f47b92f1618042e998a006f9c9822f335620b6c0c40fe0d547ea6871cfff51e75676 SHA512 003d085650ee88ee3f7f12657aa81c8a46653f3fe4a13527aa18cd52f669b7135de7686169dfed706400a557c6654fdb8041a3cf2348014425f2063be67d494f
+AUX llpp-33-makefile 2733 BLAKE2B b98e6ce0573d4461a9dcbda41e8f54c5c652fd21b0db5b43df28c9e7117cee3415860b0dae9ec6030392cfdbcfe73844ddc824959b9e7a5f5fd34e8c6d41c01b SHA512 64895d517d6b973ed34b374d3bccd6c06233887aceb3df1fba350db7c54f62fe7756a6c0e02700dbab1e350087fb483f549c8c589067c2a50fa23d769f32f0bb
 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
-DIST llpp-31.tar.gz 169199 BLAKE2B 3f60db741fb94bf1b4753f5443705e68f062a68212fd3d0d8062f54b3b71002dc0ee3ba3040f9be028a40d8e96de11c8c53966196e631458f65d863f90f7226f SHA512 d9e213078899ece4a92291199bc2ea962c40a185b9908a7db241a773f57c64e08b004a8433984b86cc4b59088f97991b2ee8ee94e75d71536ce378dd32316e57
-DIST llpp-31_p20191016.tar.gz 169480 BLAKE2B af8f01d156863b642ad1c062b4b1a00a744955fdc1e7446b7a5023e6d03b58af77c699140b54d337c0eeacf65fba7a06ccfd6baa6ab9e1920bd7fd0fcfa90d97 SHA512 6fdd2621aec9f026e175c52957c77293a105adc81e42dad33f24631d5d2ae6775978834e84e1cab73cc8d1246af684384f9057a0f613438a19eaf7b607f92ddf
-EBUILD llpp-30.ebuild 1716 BLAKE2B c7c87a02e1ce23d4cd01645cd33469eff8be4cb109d5fa388b54fff60230a5eaca7adc6e432ce2385ef6e286ec23f06800ffdf4e194bd7bc31560e8ad3134575 SHA512 5afd881e7944eb01a77fbd1766ecbe131e1043f90d5809db99b5da24da4353d151a4b1a11e1e55e49d1046a5fb332178ed6a9bedb1d08929c9781f13ca460bef
-EBUILD llpp-30_p20190316.ebuild 1776 BLAKE2B b2b63fafd4d9f0a6303519e8ca017918fdbd2af6ece74c1e26f1faaac8c0d6efc71ea6d213bf5f5ef8176d6c5a49eb93c330c8ac64fe46da34636d0ba4daa1fa SHA512 7feef827c5fcd7b879f1878929ad0365e4c439fb0426f0b35c9839726aa425c253d08a938635a30c7ddb460c08db02434c1ee8ff7f132ae7698414fb07688a7c
-EBUILD llpp-31.ebuild 1514 BLAKE2B e106b5f401dc0105b10708c0d265ea1b92dfc4a80a3c985299a3e15b291c0314cf162239b738620326ee2f76a3e578e17f9d294fed9e9af2e9ca8cb3da54b0f8 SHA512 e9016e6e9efbb40491ac480565e186543dfb10f1c0683517169d8968eb3b9fa8787dcba92fda2a244a8c75137701f221862bd60b28bef3b04ffc24fbd3944c32
-EBUILD llpp-31_p20191016.ebuild 1770 BLAKE2B 8119c7951afbea57e5d84cfca036730b523ded54f31a01bb76947fa840dc17c66649fc1fd83b512a0f911a3322e382295a1f11d8374fe39e1595f5c27b0a8e80 SHA512 3c1ddfad6605e177c25a3b3605ac9368017df3806b16b3e276bc1354353d310c00de44172fef37dfe2f84fe4ae97efcbeaf5cf6c4cebb2b40279666b036975db
+DIST llpp-33.tar.gz 172410 BLAKE2B 6f45d262520bb9e09a08088b9d6b6a1c272ca32d44b507537e7887c76f17ec782d805f4fb94e528d7bca5a9eb87c35ff64b883bd0fdab5609f2807bc8043b1d5 SHA512 f14669eab8934ddc0ac530a67055199a73c7f0c2906dc4a80a729326340691ad53433afce2e638848471852901c88fcc99ae1d66b1abf179e4f5892976b585e8
+EBUILD llpp-30.ebuild 1311 BLAKE2B 7374170bd2d6c13e4f270017d34c235a35d1008be4163b9bcbb24b930156202abb6590f1e05d3aaa53915f11c01f15575f9857da0bca5b05c615c89eb300ab39 SHA512 fe1d9d4518bfcf14d7679e988da30ba501d7f26c02b87dae0e0407fc7e0cb533089e6aae117334bd5e1e2f7d24275b7e1c99c9300a189d0ce6bcb332720acb9d
+EBUILD llpp-33.ebuild 1312 BLAKE2B 2754cc2cffaa99ac9213e3b1a80629697664bc45318329cb135179168b73f1bdd35854a2b50716d9972d74627b258a0b9fe6c681955a92a49804607bca5a6484 SHA512 5a47ece59fdd4eef4ec453e73ac0d9e320c90b2c37bbea16fe04b48717d581e1a1f2ecc76d3331abda60e49eb0ff978513205155d175f1874c76b89de65ea5eb
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/llpp/files/llpp-33-makefile b/app-text/llpp/files/llpp-33-makefile
new file mode 100644
index 000000000000..3a5c3122e251
--- /dev/null
+++ b/app-text/llpp/files/llpp-33-makefile
@@ -0,0 +1,91 @@
+VERSION = $(shell test -d .git && git describe --tags --dirty 2>/dev/null)
+ifeq "$(VERSION)" ""
+VERSION = 33
+endif
+
+# paths
+PREFIX ?= /usr/local
+LIBDIR ?= /usr/lib
+
+# includes and libs
+PKGCONF_DEPS := freetype2 harfbuzz libopenjp2 libjpeg mupdf x11 zlib
+CPPFLAGS += -D_GNU_SOURCE -DFFP
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -Wshadow $(shell pkg-config --cflags $(PKGCONF_DEPS))
+LDLIBS = -L$(LIBDIR) -lpthread -ljbig2dec $(shell pkg-config --libs $(PKGCONF_DEPS))
+
+# ocaml
+CAMLOPT = ocamlopt
+CAMLFLAGS = -g -w +a -safe-string -I +lablGL
+
+VPATH = wsi/x11
+
+C_SRC = cutils.c keysym2ucs.c link.c xlib.c version.c
+C_OBJ = $(C_SRC:.c=.o)
+OCAML_SRC = utils.ml wsi.ml confstruct.ml parser.ml config.ml ffi.ml glutils.ml help.ml keys.ml utf8syms.ml listview.ml main.ml
+OCAML_OBJ = $(OCAML_SRC:.ml=.cmx)
+MOD = unix.cmxa str.cmxa lablgl.cmxa
+SRCMANS = $(wildcard adoc/*.adoc)
+MANS = $(SRCMANS:.adoc=.1)
+
+DISTFILES := Makefile $(OCAML_SRC) link.c glfont.c keysym2ucs.c wsi.mli
+DISTFILES += $(wildcard *.sh) KEYS README BUILDING
+DISTFILES += misc/ adoc/
+
+all: llpp $(MANS)
+
+# dependency ordering
+config.cmx: wsi.cmi parser.cmx utils.cmx confstruct.cmx
+confstruct.cmx: wsi.cmx utils.cmx
+ffi.cmx: config.cmx
+glutils.cmx: ffi.cmx
+help.cmx: help.cmi config.cmx utils.cmx
+listview.cmx: utils.cmx glutils.cmx config.cmx utf8syms.cmx
+main.cmx: main.ml utils.cmx config.cmx glutils.cmx listview.cmx ffi.cmx keys.cmx wsi.cmx
+main.cmx: CAMLFLAGS += -thread
+parser.cmx: utils.cmx
+wsi.cmi: utils.cmx keys.cmx
+wsi.cmx: wsi.cmi
+
+link.o: glfont.c
+version.o: CPPFLAGS += -DLLPP_VERSION=$(VERSION)
+
+# ordinary targets
+llpp: $(OCAML_OBJ) $(C_OBJ)
+	$(CAMLOPT) -o $@ $(CAMLFLAGS) $(C_OBJ) -ccopt '$(LDFLAGS)' -cclib '$(LDLIBS)' $(MOD) $(OCAML_OBJ)
+
+
+confstruct.ml: genconfstr.sh
+	sh $< >$@
+
+# pattern rules
+%.o: %.c
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) -cc $(CC) -ccopt '$(CFLAGS) $(CPPFLAGS)' $<
+
+%.cmx: %.ml
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) $<
+
+%.cmi: %.mli
+	$(CAMLOPT) -c -o $@ $(CAMLFLAGS) $<
+
+%.1: %.adoc
+	a2x -d manpage -f manpage $<
+
+# special targets
+clean:
+	$(RM) llpp link.o help.ml $(OCAML_OBJ) $(OCAML_OBJ:.cmx=.cmi) $(OCAML_OBJ:.cmx=.o) $(MANS) $(MANS:.1=.xml)
+
+dist: clean
+	mkdir llpp-$(VERSION)
+	cp -r $(DISTFILES) llpp-$(VERSION)
+	tar czf llpp-$(VERSION).tar.gz llpp-$(VERSION)
+	rm -rf llpp-$(VERSION)
+
+install:
+	install -Dm755 llpp "$(DESTDIR)"$(PREFIX)/bin/llpp
+	install -Dm644 -t "$(DESTDIR)"$(PREFIX)/share/man/man1  $(MANS)
+	install -Dm755 misc/llppac "$(DESTDIR)"$(PREFIX)/bin/llppac
+	install -Dm755 misc/llpp.inotify "$(DESTDIR)"$(PREFIX)/bin/llpp.inotify
+	install -Dm755 misc/llpphtml "$(DESTDIR)"$(PREFIX)/bin/llpphtml
+	install -Dm644 misc/llpp.desktop "$(DESTDIR)"$(PREFIX)/share/applications/llpp.desktop
+
+.PHONY: all clean dist install
diff --git a/app-text/llpp/llpp-30.ebuild b/app-text/llpp/llpp-30.ebuild
index 782d76c46a45..31eafbf3035e 100644
--- a/app-text/llpp/llpp-30.ebuild
+++ b/app-text/llpp/llpp-30.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs xdg-utils
+inherit toolchain-funcs xdg
 
 DESCRIPTION="graphical PDF viewer which aims to superficially resemble less(1)"
 HOMEPAGE="https://github.com/moosotc/llpp"
@@ -12,29 +12,32 @@ SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
-IUSE="+ocamlopt static"
+IUSE="+ocamlopt"
 
-LIB_DEPEND=">=app-text/mupdf-1.12.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]"
-RDEPEND="x11-misc/xsel
-	!static? ( ${LIB_DEPEND//\[static-libs]} )"
+BDEPEND="
+	>=dev-lang/ocaml-4.02:=[ocamlopt?]
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=app-text/mupdf-1.12.0:0=
+	media-libs/openjpeg:2
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/jbig2dec:=
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-misc/xsel
+"
 DEPEND="${RDEPEND}
+	app-arch/bzip2
 	app-text/asciidoc
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND}
-		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.02[ocamlopt?]
-	dev-ml/lablgl[glut,ocamlopt?]"
+	dev-ml/lablgl:=[glut,ocamlopt?]
+	media-libs/libXcm
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-libs/libXmu
+"
 
 RESTRICT="!ocamlopt? ( strip )"
 
@@ -55,16 +58,6 @@ src_compile() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="/usr" install
+	emake DESTDIR="${ED}" 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/llpp/llpp-30_p20190316.ebuild b/app-text/llpp/llpp-30_p20190316.ebuild
deleted file mode 100644
index 019afdb0c6c4..000000000000
--- a/app-text/llpp/llpp-30_p20190316.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 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/llpp/llpp-31_p20191016.ebuild b/app-text/llpp/llpp-31_p20191016.ebuild
deleted file mode 100644
index 71908e87e152..000000000000
--- a/app-text/llpp/llpp-31_p20191016.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 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="25c10de38cbfe0874d377e7599108e6b2a8a92ff"
-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.17.0:0=[static-libs?]
-	app-arch/bzip2[static-libs?]
-	media-libs/fontconfig:1.0[static-libs?]
-	media-libs/freetype:2[static-libs?]
-	media-libs/jbig2dec:=[static-libs?]
-	media-libs/openjpeg:2[static-libs?]
-	sys-libs/zlib[static-libs?]
-	virtual/jpeg:0[static-libs?]
-	x11-libs/libX11[static-libs?]
-	x11-libs/libXau[static-libs?]
-	x11-libs/libXdmcp[static-libs?]
-	x11-misc/xsel"
-DEPEND="${RDEPEND}
-	dev-ml/lablgl[glut,ocamlopt?]"
-BDEPEND="
-	>=dev-lang/ocaml-4.09[ocamlopt?]
-	app-text/asciidoc
-	virtual/pkgconfig"
-
-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
-
-	# remove empty interface definition
-	rm "${S}"/main.mli || 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/llpp/llpp-31.ebuild b/app-text/llpp/llpp-33.ebuild
index 439e1c537abe..d8c83ada0750 100644
--- a/app-text/llpp/llpp-31.ebuild
+++ b/app-text/llpp/llpp-33.ebuild
@@ -11,38 +11,37 @@ SRC_URI="https://github.com/moosotc/llpp/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="+ocamlopt static-libs"
-
+KEYWORDS="amd64 ~ppc x86"
+IUSE="+ocamlopt"
+
+RDEPEND=">=app-text/mupdf-1.17.0:0=
+	app-arch/bzip2
+	media-libs/fontconfig:1.0
+	media-libs/freetype:2
+	media-libs/jbig2dec:=
+	media-libs/openjpeg:2
+	sys-libs/zlib
+	virtual/jpeg:0
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXdmcp
+	x11-misc/xsel
+"
+DEPEND="${RDEPEND}
+	dev-ml/lablgl:=[glut,ocamlopt?]"
 BDEPEND="
 	app-text/asciidoc
-	virtual/pkgconfig"
-RDEPEND="
-	=app-text/mupdf-1.16*:0=[static-libs?]
-	app-arch/bzip2[static-libs?]
-	media-libs/fontconfig:1.0[static-libs?]
-	media-libs/freetype:2[static-libs?]
-	media-libs/jbig2dec:=[static-libs?]
-	media-libs/openjpeg:2=[static-libs?]
-	sys-libs/zlib:=[static-libs?]
-	virtual/jpeg:0[static-libs?]
-	x11-libs/libX11[static-libs?]
-	x11-libs/libXau[static-libs?]
-	x11-libs/libXdmcp[static-libs?]
-	x11-misc/xsel"
-DEPEND="${RDEPEND}
 	>=dev-lang/ocaml-4.09[ocamlopt?]
-	dev-ml/lablgl[glut,ocamlopt?]"
+	virtual/pkgconfig
+"
 
 RESTRICT="!ocamlopt? ( strip )"
 
-PATCHES=( "${FILESDIR}"/${PN}-30-keysym.patch )
-
 src_prepare() {
 	default
 
 	# use custom makefile from archlinux with minor changes
-	cp "${FILESDIR}"/Makefile "${S}" || die
+	cp "${FILESDIR}"/${P}-makefile "${S}"/Makefile || die
 
 	# re-add desktop file removed upstream
 	cp "${FILESDIR}"/llpp.desktop "${S}"/misc || die
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index cec8e7870a1d..c4c296fe938c 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,7 +1,9 @@
 DIST master-pdf-editor-5.2.20_qt5.amd64.tar.gz 16261577 BLAKE2B 112c8d308875d36e3a71d28ae407eb78a0f714383fc005dc020cdb911a5596548274a55466133d8e03cbf47df29c062973f243f88ad0b1e9caa8410fbdfe2b8d SHA512 85b095603da1114cd4749ddbcf7bdd513c868ee17434df47037f7e0b914546fd13a6911949579ee981b5c33dcb13eb0ffa9585d4cbedd9bff4dc56e32bdcf4cb
 DIST master-pdf-editor-5.3.22_qt5.amd64.tar.gz 16410658 BLAKE2B fc9cb09e58625534d12b8fe4ff657917f76a14578341c678d6be909a5f2e7a75b4587c2f1abfac66741c088b43943a30874f6ae1414ae735ee01254f019c02b3 SHA512 033914e94c9ae4114243e79be445f523a6bbc6c39527db786613ef7220bedb2412ea75c83210ed8b6096d045afce73bc8f6141b55995f2f9c464ef4a7fd69d16
 DIST master-pdf-editor-5.4.38-qt5-all.amd64.tar.gz 38044035 BLAKE2B 60fbbaaaea47a1a572ea39a0c15e0d5a9b8a2f6d9fa68c06eea6279e5728cc84016514db5e91fc2a2a0b35a462325fc8cd66b1f9eb5bff5b4815c926587eeec5 SHA512 1f94bdd6a70d352c246081a40cd81801cf9b658ff1121572a91ee5bb3589e36d6db3c5db7ad54692334e04487c29ce6ef0b9381a6895467f1bb6ef0d9e00e00e
+DIST master-pdf-editor-5.6.42-qt5.x86_64.tar.gz 15961232 BLAKE2B b4d4fc35e55753fc6c86305a037817c0a62e7753cb171b4098b651316ad5e120d9de5b02350899c89a798b407a79e24e6b0c733255d2c5f9757258c29e43b22b SHA512 600796efc92be65fa82346cf02836e43aa467188c82a0f6a59ed7dc7d0e44f9ad6f004e099f7afdd5d37fb5c9b585dc812d68bba808603b42c0da3ef12c98aa9
 EBUILD master-pdf-editor-5.2.20.ebuild 1174 BLAKE2B d5522b2277cdae788777071681ad00edab0c32897cdb204ade78167a42004e90119000e1dfcf11bd9f7059616fbb0f93bb231dcba236817082b5e00c25d20941 SHA512 1e462a4d9a8d30fc831cd70411ed028581d6c4d44038f9541f900a81763c122079c301056a230630d812aaac3db92ebd9e0889c7b1fb192a0ad34043697ef4ff
 EBUILD master-pdf-editor-5.3.22.ebuild 1174 BLAKE2B 9c347747f3b2692d4fa368b3f7b0bcf2baa4b461aeb530bb09345db7a1145f67870a6bca8c154c13c4cb29799ede5c80af298c915992484d34df3524f157ffb0 SHA512 82a6fa658e4678239662a28225b21383ebecc2c0af17882cfb83a436ef0bfb09d75de123b45851411800d7d6565687aa373157c8496ed10e60b6170641de484c
 EBUILD master-pdf-editor-5.4.38-r1.ebuild 1585 BLAKE2B 7f8ef524fda232910acb17f42f90aac4781070bb841976616c50cd6a7d2cd5c5529647b59927ee8a75f9be09f5112cc516f0c75387a1e17802be6398d14c7c26 SHA512 1a9f0e9d6ed6935ea1c02f7badd19206c0d7b3ba9a59ea6949e858bfcc9d23c942fab255a312c18b37b781b0f3f80b92d371483319be011244dd1a563d7a3639
+EBUILD master-pdf-editor-5.6.42.ebuild 1175 BLAKE2B c7a9bb6efb5956d705a506b241e8188cb5ff423f7603a8390ed2d40428728c97e488990ffe5fd41cd0ae7321318b7f51fef68c0dd660d7b6c58c3854d425c86c SHA512 078ea181f06b944a6e0436c0d7b51d4949fd4df67255588aed988a457584e66c6ea1630064b9d7de675730a2529f14113a043d5ff1c42c77c9fc0ae8b072bad0
 MISC metadata.xml 367 BLAKE2B 8636a0f12f2f2a38aaa943268b978e9269877950e8ec447f4d012e9c1833c474cff5b1d7f53a99f2ec29315858812068e7ab7f42df60127944c8edcda3a5746e SHA512 d54bf635e54008ebabde5039e2527297b8f80204138c90c7744d928041445ca667232a92e6b7ca357f844f2c8ada6b80f13b7de4ae4768e30ec676b55ae73156
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.6.42.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.6.42.ebuild
new file mode 100644
index 000000000000..6c0124f20cc4
--- /dev/null
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.6.42.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg-utils
+
+DESCRIPTION="A complete solution for viewing and editing PDF files"
+HOMEPAGE="https://code-industry.net/free-pdf-editor/"
+SRC_URI="https://code-industry.net/public/${P}-qt5.x86_64.tar.gz"
+
+LICENSE="master-pdf-editor"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="mirror"
+
+RDEPEND="
+	>=dev-qt/qtcore-5.9.8:5
+	>=dev-qt/qtgui-5.9.8:5
+	>=dev-qt/qtnetwork-5.9.8:5
+	>=dev-qt/qtprintsupport-5.9.8:5
+	>=dev-qt/qtsvg-5.9.8:5
+	>=media-gfx/sane-backends-1.0
+"
+
+QA_PREBUILT="/opt/${PN}/masterpdfeditor5"
+
+S="${WORKDIR}/${PN}-${PV%%.*}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r fonts lang stamps templates masterpdfeditor5.png
+
+	exeinto /opt/${PN}
+	doexe masterpdfeditor5
+	dosym ../${PN}/masterpdfeditor5 /opt/bin/masterpdfeditor5
+
+	make_desktop_entry "masterpdfeditor5 %f" \
+		"Master PDF Editor ${PV}" /opt/${PN}/masterpdfeditor5.png \
+		"Office;Graphics;Viewer" \
+		"MimeType=application/pdf;application/x-bzpdf;application/x-gzpdf;\nTerminal=false"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 2eee55978e35..6ddeaf5e2d33 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,12 +1,15 @@
 AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6099c35886a6f2e9508f6d08c678dbc1386e88998d01bdacd160020dc6ceefffbe09f4cf2b64d08acfb76f8535ffcc0dc93c65a3a2da78 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b
-AUX mupdf-1.14-libressl.patch 1362 BLAKE2B b52ccec0a03d97b357d5329317143595e0cf3029179b91f3d6134f6b59e313ed71063aee97d1192630fb64bd237997b1a56a6a55461b5e434297756e234990ef SHA512 3094d427a7beedc756e47a367423ffe7c8221f9078bd7bef5e8dddba615e918824778cc8118cd656b2dd1d8c235c770631241eb84a46551c96c32906a7986281
 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.16.1-freeglut-fg_gl2-gcc-10.patch 3410 BLAKE2B 1181234b618d52766e159366bd4358776ec39fc7091c05025a6a70cf626427fb3a36c0909569d4be22aba8c9695366d0b8a61592f5bbab766efbe8190077d66d SHA512 069c8150402fc463def14ff5690ecfe8a376579ad8319bf79f90823a04799bef1bfa25e79b759a0e027595a114bd3cf48f613541eeb2eec2c85e31d2105062f6
 AUX mupdf-1.17.0-cross-fixes.patch 4554 BLAKE2B 7956aea05180adc50805f56c000b0704cbaf1eb538889f1569e9f536984fb11581c36956edabb704f519285513aad01cbe0ba5a107838996937c2efa398a9c07 SHA512 0fc71632744a5fe15cace6c7b185b108e78b6676c03f204ba52e90826e7be17039b427a50697004798d51ea357828035e897d2d3ce91da95ea0f2a1a0c668fba
-DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b SHA512 fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50
+AUX mupdf-1.18-Makefile.patch 1246 BLAKE2B e0054c441b067ef4aec069cb0fd4342f16919af51ac53096f20a2dbc87a81e2bece8478441df493d6825eedca53f4c9634cfe8724980da119d0ac20035a4d423 SHA512 def7524e0468ca15220b2d9c718ef61da4ce007c43f591ae3ad80afe55f86549985b1c5ec3d3d266045a0a6ca399580f8f4e001893d4feaabb7785a8a4df278e
+AUX mupdf-1.18.0-cross-fixes.patch 5830 BLAKE2B e91e41b4889f2716d20b112b18924799db5d21274feb3699f2bca04fd3d93528d86e2ef05ccf25d1a0800e81a333d0703f837d45fef926746aeec1ece60c6ced SHA512 0e7a91474c3f31a5d5f7ddc461d74f1bc0cc8de7eb7bedbaa0f6335a6038327f5c7261d16baade5dba567b3d1ad49adf7a65ea40b226fca5f1eb58cc7bc0b07a
+AUX mupdf-1.18.0-fix-oob-in-pdf-layer.c 3462 BLAKE2B 861f5d6d0f81aed837d19ed19ba54158856bed5cab3ce8202bad11bb509b017e554ea37d9ebd05213386251b26bce10f83311c3de99fe663bf2995adc1231a9e SHA512 91620d0d429d2f4068e1834ec9466d9e9f9bfb363fba33247636e38651196580a89bd36785e42b31328070c42bd2210585ddabea8a0a970d72e7066e61804d6c
+AUX mupdf-1.18.0-fix-oob-in-pixmap.c 1123 BLAKE2B d49194b540b489ad9d3a4b5057bbe6ac3a1414d0123b7c2d4710adad1ed7fd439f8e83162d07a86aee6bd778c35ea6798da166461ac6e358af6910cc6b492624 SHA512 1d836c1a3f37c21ed349da799d5cb0c57d3fc275a632a42343cda81aae76394273c06230fc9c22a6d5366498b51a057d5a11797376a4b2af96b937618ba31e11
 DIST mupdf-1.17.0-source.tar.xz 48559964 BLAKE2B f46b09a6d288054da79bea356df4d7d98fe2759cf82bea1f0df2e961b94acebbab58826f7a731c4c68e8b086fd9367fddcabea6c7d2838f25ed84ddc1a0c2bd9 SHA512 39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5
-EBUILD mupdf-1.16.1.ebuild 3482 BLAKE2B 2f8f19e665bb7f60a55f08fd841a05e2f5388831d1eeb7bf903bc2014d2723c93bc363fb4930295d54b932e42ec0ef05dc966e5b64cc1c9af0e89727251d84c1 SHA512 90b0634cd1ee1c29c6dc91e563c26f24736429c7be164855df4ece40967ca6b5e1af2d10e5743bcb83e05aed607ffb771115960bb7c299696ec796fb4704e211
-EBUILD mupdf-1.17.0.ebuild 4380 BLAKE2B d0eafbaef397afb3369730800a075c50210c5e057bd598faa59eb40cd52a5258016a61664ad2b6e1787922412a49934dcd2bf288a28f20e7af95f6cf58b0f8a7 SHA512 474615ea48c4cb505b48cb2b59c2ca7456a4da7cf5b2610f9e3dd977a88161a6aaf64946f7c0e63faaf7c5bc1609244a2db4ff429a53a4ff07babd7212d07f37
-MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
+DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
+EBUILD mupdf-1.17.0.ebuild 4380 BLAKE2B 3c75b04d913c07617c738c1fdb6b87a6ab762f5fbf51cf723c8e485516b6de55aabd42857d9f84bc7131f8fac360df9cba112d0e5e40314f4624fdfb5d2ec7f1 SHA512 ae5b7d2b3374cdef700b65669fe3179b63e343a319e1f3c0ca1e624dcf8eca0819d8ec82d33ab348cd2e5d051a94b686e4f2dc3e4f9ad32a09b9a15cd966ff28
+EBUILD mupdf-1.18.0-r2.ebuild 4109 BLAKE2B 6478c0ad3f650356d8e9a0ffc1eabeb569ec0f2eb545356793575ab1e37a4f91d5cb5eb008f83c33fe5baee80622e75e5b1dc503442d6e093fd11e57806c9204 SHA512 6efc10e3f3c5f5f7a4fe86f909589dd0c7ea2a58fbf1e94bcde66de61b649d924023601774cb22f1c5ba89d33fd489938058a796c5f0a687e2267b162caee7b2
+MISC metadata.xml 345 BLAKE2B 6adf08490e4a701eeb6ab07c2e5619cff42ff02bf75ec38fd94f215f000972f0b3d88c8b0fab827728dd12d7906dd580b7650f11da1d77964eb5fddd773ee4a9 SHA512 32902c1fac57a44927a53dbb52fb22cb04317bcdf3dd2ae8e9863bef557178e33565bb122e128908c61ade9a5e2d1f067c530ff05e7ed0242eccf193e6fa2026
diff --git a/app-text/mupdf/files/mupdf-1.14-libressl.patch b/app-text/mupdf/files/mupdf-1.14-libressl.patch
deleted file mode 100644
index fcc0a7205c1c..000000000000
--- a/app-text/mupdf/files/mupdf-1.14-libressl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 8561b744ac95ab6145a1163fa1d7c490a3329465 Mon Sep 17 00:00:00 2001
-From: William <wonko@undefined.re>
-Date: Mon, 12 Nov 2018 16:50:07 +0100
-Subject: [PATCH] hardcode missing ssl functions
-
----
- source/helpers/pkcs7/pkcs7-openssl.c | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/source/helpers/pkcs7/pkcs7-openssl.c b/source/helpers/pkcs7/pkcs7-openssl.c
-index 58dbf65..2b1f9e9 100644
---- a/source/helpers/pkcs7/pkcs7-openssl.c
-+++ b/source/helpers/pkcs7/pkcs7-openssl.c
-@@ -511,6 +511,28 @@ static void signer_drop_designated_name(pdf_pkcs7_signer *signer, pdf_pkcs7_desi
- 	fz_free(osigner->ctx, dn);
- }
- 
-+int
-+PKCS12_SAFEBAG_get_nid(const PKCS12_SAFEBAG *bag)
-+{
-+    return OBJ_obj2nid(bag->type);
-+}
-+
-+const STACK_OF(PKCS12_SAFEBAG) *
-+PKCS12_SAFEBAG_get0_safes(const PKCS12_SAFEBAG *bag)
-+{
-+    if (OBJ_obj2nid(bag->type) != NID_safeContentsBag)
-+        return NULL;
-+    return bag->value.safes;
-+}
-+
-+const PKCS8_PRIV_KEY_INFO *
-+PKCS12_SAFEBAG_get0_p8inf(const PKCS12_SAFEBAG *bag)
-+{
-+    if (PKCS12_SAFEBAG_get_nid(bag) != NID_keyBag)
-+        return NULL;
-+    return bag->value.keybag;
-+}
-+
- static void add_from_bags(X509 **pX509, EVP_PKEY **pPkey, const STACK_OF(PKCS12_SAFEBAG) *bags, const char *pw);
- 
- static void add_from_bag(X509 **pX509, EVP_PKEY **pPkey, PKCS12_SAFEBAG *bag, const char *pw)
--- 
-2.19.1
-
diff --git a/app-text/mupdf/files/mupdf-1.18-Makefile.patch b/app-text/mupdf/files/mupdf-1.18-Makefile.patch
new file mode 100644
index 000000000000..32ee7e57c493
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18-Makefile.patch
@@ -0,0 +1,42 @@
+diff --git a/Makefile b/Makefile
+index b0fb617..528e117 100644
+--- a/Makefile
++++ b/Makefile
+@@ -3,7 +3,7 @@
+ -include user.make
+ 
+ ifndef build
+-  build := release
++  build := debug
+ endif
+ 
+ ifndef OUT
+@@ -214,13 +214,15 @@ MUPDF_LIB = $(OUT)/libmupdf.$(SO)
+ 
+ $(MUPDF_LIB) : $(MUPDF_OBJ) $(THIRD_OBJ) $(THREAD_OBJ) $(PKCS7_OBJ)
+ else
+-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) -o $@ $^ $(THIRD_LIBS) $(LIBS)
++$(MUPDF_STATIC): $(MUPDF_OBJ) $(THIRD_OBJ)
+ $(THREAD_LIB) : $(THREAD_OBJ)
+ $(PKCS7_LIB) : $(PKCS7_OBJ)
+ endif
+@@ -374,7 +376,7 @@ install: libs apps
+ 
+ 	install -d $(DESTDIR)$(docdir)
+ 	install -d $(DESTDIR)$(docdir)/examples
+-	install -m 644 README COPYING CHANGES $(DESTDIR)$(docdir)
++	install -m 644 README CHANGES $(DESTDIR)$(docdir)
+ 	install -m 644 docs/*.html docs/*.css docs/*.png $(DESTDIR)$(docdir)
+ 	install -m 644 docs/examples/* $(DESTDIR)$(docdir)/examples
+ 
diff --git a/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch b/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch
new file mode 100644
index 000000000000..0576033a03a2
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-cross-fixes.patch
@@ -0,0 +1,128 @@
+Refreshed patches based on:
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0004-MuPDF-crossbuild-use-target-arch-pkg-config.patch/
+https://sources.debian.org/patches/mupdf/1.17.0+ds1-1/0005-MuPDF-crossbuild-use-host-cc-for-utils.patch/
+--- a/Makefile
++++ b/Makefile
+@@ -147,6 +147,9 @@ PKCS7_OBJ := $(PKCS7_SRC:%.c=$(OUT)/%.o)
+ 
+ HEXDUMP_EXE := $(OUT)/scripts/hexdump.exe
+ 
++$(HEXDUMP_EXE): scripts/hexdump.c
++	$(QUIET_CC) $(MKTGTDIR) ; $(CC_FOR_BUILD) $(CFLAGS) -o $@ $<
++
+ FONT_BIN := $(sort $(wildcard resources/fonts/urw/*.cff))
+ FONT_BIN += $(sort $(wildcard resources/fonts/han/*.ttc))
+ FONT_BIN += $(sort $(wildcard resources/fonts/droid/*.ttf))
+--- a/Makerules
++++ b/Makerules
+@@ -6,6 +6,9 @@ OS := $(OS:MSYS%=MINGW)
+ OS := $(OS:Windows_NT=MINGW)
+ OS := $(OS:Darwin=MACOS)
+ 
++PKG_CONFIG ?= pkg-config
++CC_FOR_BUILD ?= $(CC)
++
+ ifeq ($(findstring -fembed-bitcode,$(XCFLAGS)),)
+   # clang does not support these in combination with -fembed-bitcode
+   CFLAGS += -ffunction-sections -fdata-sections
+@@ -128,51 +128,51 @@ else ifeq ($(OS),MACOS)
+ else ifeq ($(OS),Linux)
+   HAVE_OBJCOPY := yes
+ 
+-  ifeq ($(shell pkg-config --exists freetype2 && echo yes),yes)
+-	SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
+-	SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
++  ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
++	SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
++	SYS_FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
+   endif
+-  ifeq ($(shell pkg-config --exists gumbo && echo yes),yes)
+-	SYS_GUMBO_CFLAGS := $(shell pkg-config --cflags gumbo)
+-	SYS_GUMBO_LIBS := $(shell pkg-config --libs gumbo)
++  ifeq ($(shell $(PKG_CONFIG) --exists gumbo && echo yes),yes)
++	SYS_GUMBO_CFLAGS := $(shell $(PKG_CONFIG) --cflags gumbo)
++	SYS_GUMBO_LIBS := $(shell $(PKG_CONFIG) --libs gumbo)
+   endif
+-  ifeq ($(shell pkg-config --exists harfbuzz && echo yes),yes)
+-	SYS_HARFBUZZ_CFLAGS := $(shell pkg-config --cflags harfbuzz)
+-	SYS_HARFBUZZ_LIBS := $(shell pkg-config --libs harfbuzz)
++  ifeq ($(shell $(PKG_CONFIG) --exists harfbuzz && echo yes),yes)
++	SYS_HARFBUZZ_CFLAGS := $(shell $(PKG_CONFIG) --cflags harfbuzz)
++	SYS_HARFBUZZ_LIBS := $(shell $(PKG_CONFIG) --libs harfbuzz)
+   endif
+-  ifeq ($(shell pkg-config --exists lcms2 && echo yes),yes)
+-	SYS_LCMS2_CFLAGS := $(shell pkg-config --cflags lcms2)
+-	SYS_LCMS2_LIBS := $(shell pkg-config --libs lcms2)
++  ifeq ($(shell $(PKG_CONFIG) --exists lcms2 && echo yes),yes)
++	SYS_LCMS2_CFLAGS := $(shell $(PKG_CONFIG) --cflags lcms2)
++	SYS_LCMS2_LIBS := $(shell $(PKG_CONFIG) --libs lcms2)
+   endif
+-  ifeq ($(shell pkg-config --exists libjpeg && echo yes),yes)
+-	SYS_LIBJPEG_CFLAGS := $(shell pkg-config --cflags libjpeg)
+-	SYS_LIBJPEG_LIBS := $(shell pkg-config --libs libjpeg)
++  ifeq ($(shell $(PKG_CONFIG) --exists libjpeg && echo yes),yes)
++	SYS_LIBJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libjpeg)
++	SYS_LIBJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libjpeg)
+   endif
+-  ifeq ($(shell pkg-config --exists libopenjp2 && echo yes),yes)
+-	SYS_OPENJPEG_CFLAGS := $(shell pkg-config --cflags libopenjp2)
+-	SYS_OPENJPEG_LIBS := $(shell pkg-config --libs libopenjp2)
++  ifeq ($(shell $(PKG_CONFIG) --exists libopenjp2 && echo yes),yes)
++	SYS_OPENJPEG_CFLAGS := $(shell $(PKG_CONFIG) --cflags libopenjp2)
++	SYS_OPENJPEG_LIBS := $(shell $(PKG_CONFIG) --libs libopenjp2)
+   endif
+-  ifeq ($(shell pkg-config --exists zlib && echo yes),yes)
+-	SYS_ZLIB_CFLAGS := $(shell pkg-config --cflags zlib)
+-	SYS_ZLIB_LIBS := $(shell pkg-config --libs zlib)
++  ifeq ($(shell $(PKG_CONFIG) --exists zlib && echo yes),yes)
++	SYS_ZLIB_CFLAGS := $(shell $(PKG_CONFIG) --cflags zlib)
++	SYS_ZLIB_LIBS := $(shell $(PKG_CONFIG) --libs zlib)
+   endif
+ 
+-  HAVE_LEPTONICA := $(shell pkg-config --exists 'lept >= 1.7.4' && echo yes)
++  HAVE_LEPTONICA := $(shell $(PKG_CONFIG) --exists 'lept >= 1.7.4' && echo yes)
+   ifeq ($(HAVE_LEPTONICA),yes)
+-	SYS_LEPTONICA_CFLAGS := $(shell pkg-config --cflags lept)
+-	SYS_LEPTONICA_LIBS := $(shell pkg-config --libs lept)
++	SYS_LEPTONICA_CFLAGS := $(shell $(PKG_CONFIG) --cflags lept)
++	SYS_LEPTONICA_LIBS := $(shell $(PKG_CONFIG) --libs lept)
+   endif
+ 
+-  HAVE_TESSERACT := $(shell pkg-config --exists 'tesseract-ocr >= 4.0.0' && echo yes)
++  HAVE_TESSERACT := $(shell $(PKG_CONFIG) --exists 'tesseract-ocr >= 4.0.0' && echo yes)
+   ifeq ($(HAVE_TESSERACT),yes)
+-	SYS_TESSERACT_CFLAGS := $(shell pkg-config --cflags tesseract)
+-	SYS_TESSERACT_LIBS := $(shell pkg-config --libs tesseract)
++	SYS_TESSERACT_CFLAGS := $(shell $(PKG_CONFIG) --cflags tesseract)
++	SYS_TESSERACT_LIBS := $(shell $(PKG_CONFIG) --libs tesseract)
+   endif
+ 
+-  HAVE_SYS_CURL := $(shell pkg-config --exists libcurl && echo yes)
++  HAVE_SYS_CURL := $(shell $(PKG_CONFIG) --exists libcurl && echo yes)
+   ifeq ($(HAVE_SYS_CURL),yes)
+-	SYS_CURL_CFLAGS := $(shell pkg-config --cflags libcurl)
+-	SYS_CURL_LIBS := $(shell pkg-config --libs libcurl)
++	SYS_CURL_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcurl)
++	SYS_CURL_LIBS := $(shell $(PKG_CONFIG) --libs libcurl)
+   endif
+ 
+   HAVE_GLUT := yes
+@@ -183,14 +183,14 @@ else ifeq ($(OS),Linux)
+ 
+   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)
++	X11_CFLAGS := $(shell $(PKG_CONFIG) --cflags x11 xext)
++	X11_LIBS := $(shell $(PKG_CONFIG) --libs x11 xext)
+   endif
+ 
+   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)
++	LIBCRYPTO_CFLAGS := $(shell $(PKG_CONFIG) --cflags libcrypto) -DHAVE_LIBCRYPTO
++	LIBCRYPTO_LIBS := $(shell $(PKG_CONFIG) --libs libcrypto)
+   endif
+ 
+   HAVE_PTHREAD := yes
diff --git a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c
new file mode 100644
index 000000000000..dc4000b4cde6
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pdf-layer.c
@@ -0,0 +1,102 @@
+From b82e9b6d6b46877e5c3763cc3bc641c66fa7eb54 Mon Sep 17 00:00:00 2001
+From: Robin Watts <Robin.Watts@artifex.com>
+Date: Thu, 8 Oct 2020 16:15:40 +0100
+Subject: [PATCH] Bug 701297: Harden populate_ui against unexpected repairs.
+
+We count the number of layers, and allocate space for them in
+an array. We then walk the tree reading details of those layers
+in. If we hit a problem that causes a repair while reading the
+information, the number of layers can magically increase. In
+the existing code we run off the end of the array.
+
+In the new code we watch for hitting the end of the array and
+realloc as required.
+---
+ source/pdf/pdf-layer.c | 32 +++++++++++++++++++++++++-------
+ 1 file changed, 25 insertions(+), 7 deletions(-)
+
+diff --git a/source/pdf/pdf-layer.c b/source/pdf/pdf-layer.c
+index 177f0c947..b8e9d7cad 100644
+--- a/source/pdf/pdf-layer.c
++++ b/source/pdf/pdf-layer.c
+@@ -104,10 +104,27 @@ count_entries(fz_context *ctx, pdf_obj *obj)
+ }
+ 
+ static pdf_ocg_ui *
+-populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *order, int depth, pdf_obj *rbgroups, pdf_obj *locked)
++get_ocg_ui(fz_context *ctx, pdf_ocg_descriptor *desc, int fill)
++{
++	if (fill == desc->num_ui_entries)
++	{
++		/* Number of layers changed while parsing;
++		 * probably due to a repair. */
++		int newsize = desc->num_ui_entries * 2;
++		if (newsize == 0)
++			newsize = 4; /* Arbitrary non-zero */
++		desc->ui = fz_realloc_array(ctx, desc->ui, newsize, pdf_ocg_ui);
++		desc->num_ui_entries = newsize;
++	}
++	return &desc->ui[fill];
++}
++
++static int
++populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, int fill, pdf_obj *order, int depth, pdf_obj *rbgroups, pdf_obj *locked)
+ {
+ 	int len = pdf_array_len(ctx, order);
+ 	int i, j;
++	pdf_ocg_ui *ui;
+ 
+ 	for (i = 0; i < len; i++)
+ 	{
+@@ -118,7 +135,7 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *
+ 				continue;
+ 
+ 			fz_try(ctx)
+-				ui = populate_ui(ctx, desc, ui, o, depth+1, rbgroups, locked);
++				fill = populate_ui(ctx, desc, fill, o, depth+1, rbgroups, locked);
+ 			fz_always(ctx)
+ 				pdf_unmark_obj(ctx, o);
+ 			fz_catch(ctx)
+@@ -126,14 +143,14 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *
+ 
+ 			continue;
+ 		}
+-		ui->depth = depth;
+ 		if (pdf_is_string(ctx, o))
+ 		{
++			ui = get_ocg_ui(ctx, desc, fill++);
++			ui->depth = depth;
+ 			ui->ocg = -1;
+ 			ui->name = pdf_to_str_buf(ctx, o);
+ 			ui->button_flags = PDF_LAYER_UI_LABEL;
+ 			ui->locked = 1;
+-			ui++;
+ 			continue;
+ 		}
+ 
+@@ -144,13 +161,14 @@ populate_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_ocg_ui *ui, pdf_obj *
+ 		}
+ 		if (j == desc->len)
+ 			continue; /* OCG not found in main list! Just ignore it */
++		ui = get_ocg_ui(ctx, desc, fill++);
++		ui->depth = depth;
+ 		ui->ocg = j;
+ 		ui->name = pdf_dict_get_string(ctx, o, PDF_NAME(Name), NULL);
+ 		ui->button_flags = pdf_array_contains(ctx, o, rbgroups) ? PDF_LAYER_UI_RADIOBOX : PDF_LAYER_UI_CHECKBOX;
+ 		ui->locked = pdf_array_contains(ctx, o, locked);
+-		ui++;
+ 	}
+-	return ui;
++	return fill;
+ }
+ 
+ static void
+@@ -188,7 +206,7 @@ load_ui(fz_context *ctx, pdf_ocg_descriptor *desc, pdf_obj *ocprops, pdf_obj *oc
+ 	desc->ui = Memento_label(fz_calloc(ctx, count, sizeof(pdf_ocg_ui)), "pdf_ocg_ui");
+ 	fz_try(ctx)
+ 	{
+-		(void)populate_ui(ctx, desc, desc->ui, order, 0, rbgroups, locked);
++		desc->num_ui_entries = populate_ui(ctx, desc, 0, order, 0, rbgroups, locked);
+ 	}
+ 	fz_catch(ctx)
+ 	{
diff --git a/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c
new file mode 100644
index 000000000000..d19f0593a119
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-fix-oob-in-pixmap.c
@@ -0,0 +1,41 @@
+From 32e4e8b4bcbacbf92af7c88337efae21986d9603 Mon Sep 17 00:00:00 2001
+From: Robin Watts <Robin.Watts@artifex.com>
+Date: Thu, 8 Oct 2020 18:10:28 +0100
+Subject: [PATCH] Bug 702958: Fix overflow in fz_clear_pixmap_with_value.
+
+---
+ source/fitz/pixmap.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/source/fitz/pixmap.c b/source/fitz/pixmap.c
+index 66873d214..80d8bb62f 100644
+--- a/source/fitz/pixmap.c
++++ b/source/fitz/pixmap.c
+@@ -555,7 +555,8 @@ void
+ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value)
+ {
+ 	unsigned char *s;
+-	int w, h, n, stride, len;
++	int w, h, n;
++	ptrdiff_t stride, len;
+ 	int alpha = pix->alpha;
+ 
+ 	w = pix->w;
+@@ -572,7 +573,7 @@ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value)
+ 
+ 	n = pix->n;
+ 	stride = pix->stride;
+-	len = w * n;
++	len = (ptrdiff_t)w * n;
+ 
+ 	s = pix->samples;
+ 	if (value == 255 || !alpha)
+@@ -584,7 +585,7 @@ fz_clear_pixmap_with_value(fz_context *ctx, fz_pixmap *pix, int value)
+ 		}
+ 		while (h--)
+ 		{
+-			memset(s, value, (unsigned int)len);
++			memset(s, value, len);
+ 			s += stride;
+ 		}
+ 	}
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 15fd2f3a22be..82b29f9cae62 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -5,4 +5,8 @@
 		<email>johu@gentoo.org</email>
 		<name>Johannes Huber</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/mupdf/mupdf-1.17.0.ebuild b/app-text/mupdf/mupdf-1.17.0.ebuild
index 73a2ee992231..f195aa318853 100644
--- a/app-text/mupdf/mupdf-1.17.0.ebuild
+++ b/app-text/mupdf/mupdf-1.17.0.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit desktop flag-o-matic toolchain-funcs xdg
 
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+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"
 S="${WORKDIR}/${P}-source"
diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild b/app-text/mupdf/mupdf-1.18.0-r2.ebuild
index d93fa2a0f2ed..dcce0f82d29a 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0-r2.ebuild
@@ -3,65 +3,66 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs xdg desktop
+inherit desktop flag-o-matic toolchain-funcs xdg
 
-DESCRIPTION="a lightweight PDF viewer and toolkit written in portable C"
+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"
+S="${WORKDIR}/${P}-source"
 
 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"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 x86"
+IUSE="X +javascript libressl opengl ssl"
+REQUIRED_USE="opengl? ( javascript )"
 
 # 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.
+BDEPEND="virtual/pkgconfig"
 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:= )
+	dev-libs/gumbo
+	media-libs/freetype:2=
+	media-libs/harfbuzz:=[truetype]
+	media-libs/jbig2dec:=
+	media-libs/libpng:0=
+	>=media-libs/openjpeg-2.1:2=
+	virtual/jpeg
+	javascript? ( >=dev-lang/mujs-1.0.7:= )
+	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?] )
+		libressl? ( >=dev-libs/libressl-3.1.4:0= )
+		!libressl? ( >=dev-libs/openssl-1.1:0= )
 	)
 	X? (
-		x11-libs/libX11[static-libs?]
-		x11-libs/libXext[static-libs?]
+		x11-libs/libX11
+		x11-libs/libXext
 	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="opengl? ( !static-libs )"
-
-S=${WORKDIR}/${P}-source
+DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
-	"${FILESDIR}"/${PN}-1.15-Makefile.patch
+	"${FILESDIR}"/${PN}-1.18-Makefile.patch
 	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
 	# See bugs #662352
 	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
-	"${FILESDIR}"/${PN}-1.16.1-freeglut-fg_gl2-gcc-10.patch
+	# General cross fixes from Debian (refreshed)
+	"${FILESDIR}"/${PN}-1.18.0-cross-fixes.patch
+	# Additional security patches post-1.18.0
+	"${FILESDIR}"/${P}-fix-oob-in-pdf-layer.c
+	"${FILESDIR}"/${P}-fix-oob-in-pixmap.c
 )
 
 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 hppa && append-cflags -ffunction-sections
 
-	# See bug #670832
-	use ssl && use libressl && eapply "${FILESDIR}"/${PN}-1.14-libressl.patch
+	append-cflags "-DFZ_ENABLE_JS=$(usex javascript 1 0)"
 
 	sed -e "1iOS = Linux" \
 		-e "1iCC = $(tc-getCC)" \
+		-e "1iCXX = $(tc-getCXX)" \
 		-e "1iLD = $(tc-getLD)" \
 		-e "1iAR = $(tc-getAR)" \
 		-e "1iverbose = yes" \
@@ -74,20 +75,36 @@ src_prepare() {
 
 _emake() {
 	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
-
+	# Bundled libs
+	# * General
+	# Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
+	# recommendations. It does not mean "always use system libs".
+	# See [0] below for what it means in a specific version.
+	#
+	# * freeglut
 	# We don't use system's freeglut because upstream has a special modified
 	# version of it that gives mupdf clipboard support. See bug #653298
-
+	#
+	# * mujs
 	# 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
+	# of any release. We then went back to using the bundled version of it.
+	# But v1.17.0 looks ok, so we'll go unbundled again. Be aware of this risk
+	# when bumping and check!
+	# See bug #685244
+	#
+	# * lmms2
+	# mupdf uses a bundled version of lcms2 [0] because Artifex have forked it [1].
+	# It is therefore not appropriate for us to unbundle it at this time.
+	#
+	# [0] https://git.ghostscript.com/?p=mupdf.git;a=blob;f=Makethird;h=c4c540fa4a075df0db85e6fdaab809099881f35a;hb=HEAD#l9
+	# [1] https://www.ghostscript.com/doc/lcms2mt/doc/WhyThisFork.txt
 	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_MUJS=$(usex javascript) \
 		USE_SYSTEM_GLUT=no \
 		HAVE_OBJCOPY=no \
 		"$@"
@@ -95,9 +112,6 @@ _emake() {
 
 src_compile() {
 	_emake XCFLAGS="-fpic"
-
-	use static-libs && \
-		_emake build/debug/lib${PN}.a
 }
 
 src_install() {
@@ -105,15 +119,13 @@ src_install() {
 		domenu platform/debian/${PN}.desktop
 		doicon platform/debian/${PN}.xpm
 	else
-		rm docs/man/${PN}.1
+		rm docs/man/${PN}.1 || die
 	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}
@@ -121,6 +133,10 @@ src_install() {
 		einfo "mupdf symlink points to mupdf-x11 (bug 616654)"
 		dosym ${PN}-x11 /usr/bin/${PN}
 	fi
+
+	# Respect libdir (bug #734898)
+	sed -i -e "s:/lib:/$(get_libdir):" platform/debian/${PN}.pc || die
+
 	insinto /usr/$(get_libdir)/pkgconfig
 	doins platform/debian/${PN}.pc
 
diff --git a/app-text/nuspell/Manifest b/app-text/nuspell/Manifest
index b5ae215fd9d7..dd02f8f8c5b1 100644
--- a/app-text/nuspell/Manifest
+++ b/app-text/nuspell/Manifest
@@ -1,9 +1,9 @@
-DIST nuspell-3.0.0.tar.gz 403043 BLAKE2B b437012e4fb327f13d9ff0944dadf7e865c670daf153be00dd48e9d2fc01c87d410ebd5aeaa094f6446d3035346738010cdba961cfaada3751bedce264beaa6a SHA512 d9cd7dd276e2bca43dec3abaf11c5206695949b9fda8c9b86f2772cc7e8fa95bf17c685a2ef9ca87fe3c4f0b55f2fcb435bc21c187355f5e3fa35dcafab2c8c2
-DIST nuspell-3.1.0.tar.gz 407196 BLAKE2B 688f6f59ba2f7bceaafe9a7cc707c008be93341e855ca60f07d6de67a626539693048af6f5ca40246ccc51e2573b76ba2bd4439aa9c0acb66a212bebd9219617 SHA512 a9bedfd6e2d77fd34d249cf7aa1fcb6bde5bced26f02f8a2dd860416a61488c9b7016a0df6015052fcccb272b342e6205db601107f46efa44c9d78ce261a826c
-DIST nuspell-3.1.1.tar.gz 379636 BLAKE2B 952cbe6f15221c0050f108b9f95718cc1d1ca9a94a7b15e0b6f2a53a92a2c95cf54f317b110bfc4b297943b9128bae8968a735ce68e7c752ff159359f4562f4b SHA512 239855051d9f49ba16913283090c4214a8f6a6cc290d359ab54014ff76fc297c131b67c6748bd1d4cdcec43c00dccc7f0c1bf8b07e06c9c648bff52ff193e096
 DIST nuspell-3.1.2.tar.gz 379029 BLAKE2B 80f773ffdcbfbeee0dd13cd325bb4fec5efa5b54ece92ac1589c418aab46c925419e9e1bc7e257a8320e24399f49bb867600679e34a5e40070b01a660578c92c SHA512 ed5206cb9ffa7e4ec6843988a75627d4ae7d5170444b6e7bd3496c1bf61c25412c4e68864800f2ad238d014b4e50d25282f367de2900f8a230f3ecc9ae5772be
-EBUILD nuspell-3.0.0.ebuild 1091 BLAKE2B 07c8fa7a2b9c03c18821ccd35bc1d9fa5f72490c4a9ec4d52cd4f4f90cb2d295771e2110b6ab50ab8c0bb34db075349735993e61f3d5ddca1380d5cec4e467f8 SHA512 eceed5f031c930296ed451dad77718cd07e4b052598026b4c59219467eb26c7eb050239d1869339791bd9e4bf437af9e54cefa1981ffe939394331a5dde8adff
-EBUILD nuspell-3.1.0.ebuild 1152 BLAKE2B 0ab1b278f6423bcb16a3133fb7c2223bdd654e2757a15d606100794459c411e1703b0426f28edec6b32d767ad4c7071e6b4db5e0c6b1f2e0fab0085cb96cf671 SHA512 ef38093ed47b99964a263505cf3374e4390830b482464082154358c860e47988fb076da79304ad540121424e1f7345652f9f646ed595502fdea364fc833064e2
-EBUILD nuspell-3.1.1.ebuild 1166 BLAKE2B 7e6a0daafb668d060b12dc4484619776d4db960d22710af3aef2161e9f359ae0719103c0a501b3545f1045c31a03677a331efe99fc6585e953c83ac5819da66a SHA512 34406e14d7def8e0f8c92373318dc4e4d7d810108fc3bd040faa76f237e6fddeefceec977399f4649517658c0131f38cfb37f536cdfa5c38a351000951f14b1d
-EBUILD nuspell-3.1.2.ebuild 1166 BLAKE2B 7e6a0daafb668d060b12dc4484619776d4db960d22710af3aef2161e9f359ae0719103c0a501b3545f1045c31a03677a331efe99fc6585e953c83ac5819da66a SHA512 34406e14d7def8e0f8c92373318dc4e4d7d810108fc3bd040faa76f237e6fddeefceec977399f4649517658c0131f38cfb37f536cdfa5c38a351000951f14b1d
+DIST nuspell-4.0.0.tar.gz 379136 BLAKE2B 90aebe8318cd28240dfb7c1b034b2c045ac208c6d25344a3f2fc2f1a38995a1d6f81e70399c644c70255fbbb30f61e340808d1a71dfccab1726f89b742cf7b65 SHA512 2b08e30c4ac91a243c74f21eaf4a8d55d8b1c834e0f293fea76a9f02660f2ee89fe4d4071b1b9ed97b8c1db80b0645c71f8746738d97fc3ae779a65dc1583d3b
+DIST nuspell-4.0.1.tar.gz 379342 BLAKE2B be52797ddd737c523a6141fc1c2683690cfcd1aa09e6548d7eed593ab023d2b45d3538f2a9964a7c2b4abc6506c67058cdc2479ec12ae5438ffe9faa00f0680c SHA512 122616fd24c2de35000ba12d680d3617e7fe97881d33febbcb106ce70d3bac356a00d90680a1bc8ee631ed532ace0f4b4f9fce4760a25b0f7fc1d60553e74528
+DIST nuspell-4.1.0.tar.gz 380814 BLAKE2B 500da0797e4f0d1939afd8451b734f309b5c58e66532150614dd3463eda95ab421094e6c0485396b7ef1dd4b7fc03cadf10316d9cfdb1390b2769ddcc963d8b3 SHA512 d0c01dd73fefd8b9c800e6419fe916e55a53b8b19f5848d3766cdcb50383fdcd9e9bb49362b5cea4d9d2d7fda21aed055f28cb47b006e2049b2a904355f7f9ed
+EBUILD nuspell-3.1.2.ebuild 1170 BLAKE2B 016ae5d2d29907d7ddd8bfde4f17f6b17259a79e75f1de133ea9074d777dd1a9bb7a3a6d53c188232720360d0714e849cd821cb80477dada5c89fb7e7508696c SHA512 eb61874975da9232e1dcacef814560c4eb43e8664e0130561e20b976c4b1a98b3b3fe7a64a90ccc2adc4c8c4ff707eda831658ca609a31122e41d49fef16cf0c
+EBUILD nuspell-4.0.0.ebuild 1170 BLAKE2B 2492c07d1f7b6ab3ab9bbbec92e1ab493931ec69352ec2b8f4dc6559e905982938c25bdd3cd30f6f04e9c153f495a3228ab5719ec8fde7a2c98d0b565e28bf1d SHA512 4f9b2ba615a77757d70c9e1ab1569ec8330d6c5ef89c7f32570e7dd41b7bdcd08ff2569c7c2951996a8b83706b77e572d0f9500a5acfe4b2de3300e33c7d3ae5
+EBUILD nuspell-4.0.1.ebuild 1172 BLAKE2B 71b47bc2e71e680cbaf050c851332e0c58fa63e61fbeec724c740571132f8fe38fae1abbe758d4236456ab788aad1b931c346df72d71eb5733ad155548259034 SHA512 140180c0c6f8f2a9e8bca2677601a8129dfb4761db93265affee61f0f57fcb33b428817b03a8619f2b1cc775a1c126e73ae58e24ca84fde3787fd127d0464ede
+EBUILD nuspell-4.1.0.ebuild 1172 BLAKE2B 71b47bc2e71e680cbaf050c851332e0c58fa63e61fbeec724c740571132f8fe38fae1abbe758d4236456ab788aad1b931c346df72d71eb5733ad155548259034 SHA512 140180c0c6f8f2a9e8bca2677601a8129dfb4761db93265affee61f0f57fcb33b428817b03a8619f2b1cc775a1c126e73ae58e24ca84fde3787fd127d0464ede
 MISC metadata.xml 489 BLAKE2B 51835316b4f8b1b1a016324955d48f6f5126ef7b7caf11f4b46ea858469fc9ebe3154de4fbc99d528bfef3808fe7c95dd2f540038572ae640b00dad9fccbeacf SHA512 ea959020e4b2a90f475d296fd1a43c2ba8efc1c39f2dde70b930165bce165df1011e04af8f54b37740f28e009502a5c64ec0fdb2b7221003388cd47b1ccadeb5
diff --git a/app-text/nuspell/nuspell-3.1.2.ebuild b/app-text/nuspell/nuspell-3.1.2.ebuild
index d5c3f19e7d56..57cbf24e8c75 100644
--- a/app-text/nuspell/nuspell-3.1.2.ebuild
+++ b/app-text/nuspell/nuspell-3.1.2.ebuild
@@ -18,7 +18,7 @@ RDEPEND="dev-libs/icu"
 DEPEND="${RDEPEND}
 	doc? ( app-text/ronn )
 	test? ( >=dev-cpp/catch-2.3.0:0 )
-	>=dev-libs/boost-1.62[icu]"
+	>=dev-libs/boost-1.62[icu,nls]"
 
 DOCS=( CHANGELOG.md )
 
diff --git a/app-text/nuspell/nuspell-3.1.1.ebuild b/app-text/nuspell/nuspell-4.0.0.ebuild
index d5c3f19e7d56..b7de7c6dd8c8 100644
--- a/app-text/nuspell/nuspell-3.1.1.ebuild
+++ b/app-text/nuspell/nuspell-4.0.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
 SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3+"
-SLOT="0/3"  # due to libnuspell.so.3
+SLOT="0/4"  # due to libnuspell.so.4
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
@@ -18,7 +18,7 @@ RDEPEND="dev-libs/icu"
 DEPEND="${RDEPEND}
 	doc? ( app-text/ronn )
 	test? ( >=dev-cpp/catch-2.3.0:0 )
-	>=dev-libs/boost-1.62[icu]"
+	>=dev-libs/boost-1.62[icu,nls]"
 
 DOCS=( CHANGELOG.md )
 
diff --git a/app-text/nuspell/nuspell-3.1.0.ebuild b/app-text/nuspell/nuspell-4.0.1.ebuild
index 84d7b5101d04..f38131dbab56 100644
--- a/app-text/nuspell/nuspell-3.1.0.ebuild
+++ b/app-text/nuspell/nuspell-4.0.1.ebuild
@@ -9,23 +9,26 @@ DESCRIPTION="Spell checker library and CLI for complex natural languages"
 HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
 SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="test? ( || ( MPL-1.1 GPL-2+ LGPL-2.1+ ) ) LGPL-3+"
-SLOT="0/3"  # due to libnuspell.so.3
+LICENSE="LGPL-3+"
+SLOT="0/4"  # due to libnuspell.so.4
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="dev-libs/icu"
 DEPEND="${RDEPEND}
-	doc? ( app-text/ronn )
+	doc? ( app-text/pandoc )
 	test? ( >=dev-cpp/catch-2.3.0:0 )
-	>=dev-libs/boost-1.62[icu]"
+	>=dev-libs/boost-1.62[icu,nls]"
 
 DOCS=( CHANGELOG.md )
 
 RESTRICT="!test? ( test )"
 
 src_prepare() {
-	rm -R external || die
+	rm -R external/Catch2/ || die
+	if ! use test ; then
+		rm -R external/hunspell/ || die
+	fi
 	cmake_src_prepare
 }
 
@@ -43,6 +46,6 @@ pkg_postinst() {
 	einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
 	einfo
 	einfo 'Besides MySpell dictionaries, for other options please'
-	einfo 'see https://nuspell.github.io/#languages-and-users .  Good luck!'
+	einfo 'see https://nuspell.github.io/#languages-and-users .'
 	einfo
 }
diff --git a/app-text/nuspell/nuspell-3.0.0.ebuild b/app-text/nuspell/nuspell-4.1.0.ebuild
index 91e224ba8293..f38131dbab56 100644
--- a/app-text/nuspell/nuspell-3.0.0.ebuild
+++ b/app-text/nuspell/nuspell-4.1.0.ebuild
@@ -9,21 +9,29 @@ DESCRIPTION="Spell checker library and CLI for complex natural languages"
 HOMEPAGE="https://nuspell.github.io/ https://github.com/nuspell/nuspell"
 SRC_URI="https://github.com/nuspell/nuspell/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="test? ( || ( MPL-1.1 GPL-2+ LGPL-2.1+ ) ) LGPL-3+"
-SLOT="0/3"  # due to libnuspell.so.3
+LICENSE="LGPL-3+"
+SLOT="0/4"  # due to libnuspell.so.4
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
 RDEPEND="dev-libs/icu"
 DEPEND="${RDEPEND}
-	doc? ( app-text/ronn )
+	doc? ( app-text/pandoc )
 	test? ( >=dev-cpp/catch-2.3.0:0 )
-	>=dev-libs/boost-1.62[icu]"
+	>=dev-libs/boost-1.62[icu,nls]"
 
 DOCS=( CHANGELOG.md )
 
 RESTRICT="!test? ( test )"
 
+src_prepare() {
+	rm -R external/Catch2/ || die
+	if ! use test ; then
+		rm -R external/hunspell/ || die
+	fi
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
@@ -38,6 +46,6 @@ pkg_postinst() {
 	einfo 'e.g. package app-dicts/myspell-en or one of its siblings.'
 	einfo
 	einfo 'Besides MySpell dictionaries, for other options please'
-	einfo 'see https://nuspell.github.io/#languages-and-users .  Good luck!'
+	einfo 'see https://nuspell.github.io/#languages-and-users .'
 	einfo
 }
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index 84001ef7094f..e75f287dfc8d 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,3 +1,4 @@
 DIST paperwork-backend-1.3.1.tar.gz 62343 BLAKE2B 2d391f63b0eaa010695b3c11b35a6c89df9df9f60d45401d8bad711743037379cdb856d8f6b0ba9f7837ac272c2d6fcbe6f58808d8b5047dccf210fbd9a3c98c SHA512 e845ddd4d01be0f4d89e7e4a0a728d06b90b87a551dca3a88426d1ce6487bc000676c997df73d13662ea8f93aced8e8dee8d44ed4fa588a4c8bd514135610c35
+EBUILD paperwork-backend-1.3.1-r1.ebuild 930 BLAKE2B 157568e2a86721c631f47b56eafc3edb0518f0546d532cad3fc447753eb87dda439292626e87aa87d9184e134701bbfe8d2e5473e08d0dd225d06a82d5972b7b SHA512 e46fe56f0268243697e073fa26b6f03218b698e468bf14adad662c4410539e57ad8c4ab0d6f58b81b40f94505697a7d266c817f5dde5d9c8fc28dacd4fed047a
 EBUILD paperwork-backend-1.3.1.ebuild 897 BLAKE2B 4591e27b0320fd1b6229ed7a728a64140aba43ac63f5d64a73ddc3ee6538c6b0bf01d15cd74a9aadffe9793ac1615b6314a7a3a1ccb003d203e3cda57fd0cf44 SHA512 94ae8e539bac5457b970c98a62b6fd2b8bddc428b3fbc352f68de6dc7d41957184fac61387a74025123475554fb6cf9bae4caf6db6cf2ce96ab5533d501a83b6
 MISC metadata.xml 342 BLAKE2B a73c59727e066a3ffa217b622c58343a42d34351791f6619aa94d1a659b9d43ccbdfc9682901fb074c876a3e66b19403c02657aac3956502f400a93bd73ba6b9 SHA512 5a3a63678f9d83107a83c1bc6e4181544627279e89b3b589fcd2b745221dddb0201779f7b8c3ec1d7b2812a92ec7ad8d290ba58c11860f46f3c5329840bf1730
diff --git a/app-text/paperwork-backend/paperwork-backend-1.3.1-r1.ebuild b/app-text/paperwork-backend/paperwork-backend-1.3.1-r1.ebuild
new file mode 100644
index 000000000000..3b1b1ba13b5d
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-1.3.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=rdepend
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler[introspection]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/pdf2djvu/Manifest b/app-text/pdf2djvu/Manifest
deleted file mode 100644
index 8ead126fedec..000000000000
--- a/app-text/pdf2djvu/Manifest
+++ /dev/null
@@ -1,12 +0,0 @@
-AUX pdf2djvu-0.9.12-poppler-0.76-1.patch 1038 BLAKE2B 5867bf9bb8a9eceec872c6d366bf9acf489c2d7eaaea374115e7c308a58acf1c55ef0f85b0d8326414af2d84d489e5b7aa3c5fd42c8ab860cacad989a50e8c71 SHA512 ce2d2f486ba451e630ec2f7b4763b92f29d5546ced5600ba34205dec9f50cd26d5ed3464a6cec1431935976c3061dc21eccbe899951b5b5826264b8c3b502c5d
-AUX pdf2djvu-0.9.12-poppler-0.76-2.patch 2083 BLAKE2B 6d861148705ca78b03dead9a7e2c1e98039d0bdc5a8e70fafbd6ddb71c428c2df242e74f956ae972cccb73aeb5dbddafc95cbf9a05f5acdb34ac6af3e65d26a4 SHA512 ebe0594918f421cfa396ec0291da9da71f482dc2e869f8dd2374e8638253b150a4896b3c361f5e972dbda03994df18959c2ee9665da63225ec19a98d4ed5fca3
-AUX pdf2djvu-0.9.12-poppler-0.76-3.patch 1127 BLAKE2B 2556851d29ebe02e0e17b3e2fa733a533cbf98b61fa6a20b7fb9f9befe800d2ed0d5826b61d7aa1deade63277ef61173a6080782e0c33d5946fd1fd076c064fe SHA512 07ee2c2b8277d4c9ba90fc192885c299451b20558b3ee5c268030bf21e69e37c0e3f750b1158b9cb927d7504ee2458ced8fb662cb65ad2ecae76d14ae729ce10
-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.15.tar.xz 296208 BLAKE2B 19a88e3d38c80b6a67b5c79b4c9d03b882385ffdf4602a8fcde189bee4d25a70ed8feac7a14310c159327b126607673df57985522b2eff5699e85193729b3529 SHA512 825b1a01ea4fdda8d2354ef5c0702f1deea44a30893bdab3d4292a31a812b093d682c94ad73b85b6bb7dca5d865cc0357e2911aa4edd1133737a14dd102ad34f
-DIST pdf2djvu-0.9.8.tar.xz 268976 BLAKE2B 318ef4fd5677056d2404d769bf54911c9474d6f0f839ef472e121375ee268db31ddaaad2b8ed791ef093d6cb1c665f6431619918ee852e479b4a11a3d7ae0e23 SHA512 5f5330d3d15808b5b6233a15a984d0ebf28619cfb50807a20c8992fed68d17f73d1edd62b1ad7cd3a09d526f6c9f0827e2c5e03d6d7c8ad92c1f106755025f5e
-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.15.ebuild 1265 BLAKE2B 81aa84f90d49053cd511d461a3f4b6e86f422cf13ade704d5f1a5d02cd948ca4c6fa981df9903168bb82eb701454328b60ff4e17a8931c766026777e218d25e7 SHA512 3b6b17c88e328cd725623ec4eed10ba2878b4594a287dfe51277ce26e635d96315e7d57eeca675c942259f745b5d3cd25156a9628f4416e6b727ac29e9373b27
-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/files/pdf2djvu-0.9.12-poppler-0.76-1.patch b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-1.patch
deleted file mode 100644
index 06341298ff68..000000000000
--- a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-1.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From aa3fdae51c19ad2865f92882ec9007feeb7e477a Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Mon, 1 Apr 2019 08:23:51 +0200
-Subject: [PATCH] Put Ref in pdf namespace.
-
----
- pdf-backend.hh | 1 +
- pdf2djvu.cc    | 2 +-
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/pdf-backend.hh b/pdf-backend.hh
-index 43899c0..d7872c3 100644
---- a/pdf-backend.hh
-+++ b/pdf-backend.hh
-@@ -82,6 +82,7 @@ namespace pdf
-   typedef ::Catalog Catalog;
-   typedef ::GooString String;
-   typedef ::Goffset Offset;
-+  typedef ::Ref Ref;
- 
- /* type definitions — annotations
-  * ==============================
-diff --git a/pdf2djvu.cc b/pdf2djvu.cc
-index 669eba5..d9e1532 100644
---- a/pdf2djvu.cc
-+++ b/pdf2djvu.cc
-@@ -86,7 +86,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata
-     int page;
-     if (dest->isPageRef())
-     {
--      Ref pageref = dest->getPageRef();
-+      pdf::Ref pageref = dest->getPageRef();
-       page = catalog->findPage(pageref.num, pageref.gen);
-     }
-     else
diff --git a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch
deleted file mode 100644
index 356153b5cca0..000000000000
--- a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-2.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 8b0348b3d5f33494d7e637411633fbea511a78d7 Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Mon, 1 Apr 2019 08:49:02 +0200
-Subject: [PATCH] Use Catalog::findPage(Ref) as alternative to
- Catalog::findPage(int, int).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fixes:
-
-    pdf2djvu.cc: In function ‘int get_page_for_goto_link(pdf::link::GoTo*, pdf::Catalog*)’:
-    pdf2djvu.cc:90:56: error: no matching function for call to ‘Catalog::findPage(int&, int&)’
----
- pdf-backend.cc | 15 +++++++++++++++
- pdf-backend.hh |  2 ++
- pdf2djvu.cc    |  2 +-
- 3 files changed, 18 insertions(+), 1 deletion(-)
-
-diff --git a/pdf-backend.cc b/pdf-backend.cc
-index f1d7662..a1b9b63 100644
---- a/pdf-backend.cc
-+++ b/pdf-backend.cc
-@@ -631,4 +631,19 @@ const char * pdf::get_c_string(const pdf::String *str)
- }
- #endif
- 
-+template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
-+{
-+  return catalog->findPage(pgref.num, pgref.gen);
-+}
-+
-+template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
-+{
-+  return catalog->findPage(pgref);
-+}
-+
-+int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
-+{
-+  return find_page_impl<pdf::Catalog>(catalog, pgref);
-+}
-+
- // vim:ts=2 sts=2 sw=2 et
-diff --git a/pdf-backend.hh b/pdf-backend.hh
-index d7872c3..d88c956 100644
---- a/pdf-backend.hh
-+++ b/pdf-backend.hh
-@@ -436,6 +436,8 @@ namespace pdf
- 
-   const char * get_c_string(const pdf::String *str);
- 
-+  int find_page(pdf::Catalog *catalog, pdf::Ref pgref);
-+
- }
- 
- #endif
-diff --git a/pdf2djvu.cc b/pdf2djvu.cc
-index d9e1532..21f2d50 100644
---- a/pdf2djvu.cc
-+++ b/pdf2djvu.cc
-@@ -87,7 +87,7 @@ static int get_page_for_goto_link(pdf::link::GoTo *goto_link, pdf::Catalog *cata
-     if (dest->isPageRef())
-     {
-       pdf::Ref pageref = dest->getPageRef();
--      page = catalog->findPage(pageref.num, pageref.gen);
-+      page = pdf::find_page(catalog, pageref);
-     }
-     else
-       page = dest->getPageNum();
diff --git a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch b/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch
deleted file mode 100644
index b3d8cfad6df2..000000000000
--- a/app-text/pdf2djvu/files/pdf2djvu-0.9.12-poppler-0.76-3.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 8325358a9769e8aa33693fc5ea2ac771dd82716f Mon Sep 17 00:00:00 2001
-From: Jakub Wilk <jwilk@jwilk.net>
-Date: Tue, 23 Apr 2019 08:23:46 +0200
-Subject: [PATCH] pdf-backend: simplify find_page() implementation.
-
----
- pdf-backend.cc | 16 +++++-----------
- 1 file changed, 5 insertions(+), 11 deletions(-)
-
-diff --git a/pdf-backend.cc b/pdf-backend.cc
-index f6f5267..a94383e 100644
---- a/pdf-backend.cc
-+++ b/pdf-backend.cc
-@@ -631,19 +631,13 @@ const char * pdf::get_c_string(const pdf::String *str)
- }
- #endif
- 
--template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(0, 0))
--{
--  return catalog->findPage(pgref.num, pgref.gen);
--}
--
--template <typename C> static auto find_page_impl(C *catalog, pdf::Ref pgref) -> decltype(catalog->findPage(pgref))
--{
--  return catalog->findPage(pgref);
--}
--
- int pdf::find_page(pdf::Catalog *catalog, pdf::Ref pgref)
- {
--  return find_page_impl<pdf::Catalog>(catalog, pgref);
-+#if POPPLER_VERSION >= 7600
-+  return catalog->findPage(pgref);
-+#else
-+  return catalog->findPage(pgref.num, pgref.gen);
-+#endif
- }
- 
- // vim:ts=2 sts=2 sw=2 et
diff --git a/app-text/pdf2djvu/metadata.xml b/app-text/pdf2djvu/metadata.xml
deleted file mode 100644
index 7ae0b54679c3..000000000000
--- a/app-text/pdf2djvu/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>printing@gentoo.org</email>
-    <name>Gentoo Printing Project</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="bitbucket">jwilk/pdf2djvu</remote-id>
-  </upstream>
-</pkgmetadata>
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild
deleted file mode 100644
index 484184a9032a..000000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.9.11.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/djvu-3.5.21:=
-	>=app-text/poppler-0.16.7:=
-	dev-libs/libxml2:=
-	dev-libs/libxslt:=
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/pstreams
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
-	doc/{changelog,credits,djvudigital,README}
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# bug 626874, poppler headers require C++11
-	append-cxxflags -std=c++11
-	default
-}
-
-src_configure() {
-	local openmp=--disable-openmp
-	use openmp && tc-has-openmp && openmp=--enable-openmp
-
-	econf \
-		${openmp} \
-		$(use_enable nls) \
-		$(use_with graphicsmagick)
-}
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
deleted file mode 100644
index 549b587cee2b..000000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.9.12.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/djvu-3.5.21:=
-	>=app-text/poppler-0.16.7:=
-	dev-libs/libxml2:=
-	dev-libs/libxslt:=
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/pstreams
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
-	doc/{changelog,credits,djvudigital,README}
-)
-
-PATCHES=(
-	"${FILESDIR}"/${P}-poppler-0.76-{1,2,3}.patch
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# bug 626874, poppler headers require C++11
-	append-cxxflags -std=c++11
-	default
-}
-
-src_configure() {
-	local openmp=--disable-openmp
-	use openmp && tc-has-openmp && openmp=--enable-openmp
-
-	econf \
-		${openmp} \
-		$(use_enable nls) \
-		$(use_with graphicsmagick)
-}
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.15.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.15.ebuild
deleted file mode 100644
index 988a47a28bb8..000000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.9.15.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/djvu-3.5.21:=
-	>=app-text/poppler-0.16.7:=
-	dev-libs/libxml2:=
-	dev-libs/libxslt:=
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/pstreams
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
-	doc/{changelog,credits,djvudigital,README}
-)
-
-PATCHES=(
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# bug 626874, poppler headers require C++11
-	append-cxxflags -std=c++11
-	default
-}
-
-src_configure() {
-	local openmp=--disable-openmp
-	use openmp && tc-has-openmp && openmp=--enable-openmp
-
-	econf \
-		${openmp} \
-		$(use_enable nls) \
-		$(use_with graphicsmagick)
-}
diff --git a/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild b/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
deleted file mode 100644
index cc21c69c5ee5..000000000000
--- a/app-text/pdf2djvu/pdf2djvu-0.9.8.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="A tool to create DjVu files from PDF files"
-HOMEPAGE="http://jwilk.net/software/pdf2djvu"
-SRC_URI="https://github.com/jwilk/${PN}/releases/download/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graphicsmagick nls openmp test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/djvu-3.5.21:=
-	>=app-text/poppler-0.16.7:=
-	dev-libs/libxml2:=
-	dev-libs/libxslt:=
-	graphicsmagick? ( media-gfx/graphicsmagick:= )
-"
-DEPEND="${RDEPEND}
-	dev-cpp/pstreams
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
-	)
-"
-
-REQUIRED_USE="test? ( graphicsmagick )"
-
-DOCS=(
-	doc/{changelog,credits,djvudigital,README}
-)
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	# bug 626874, poppler headers require C++11
-	append-cxxflags -std=c++11
-	default
-}
-
-src_configure() {
-	local openmp=--disable-openmp
-	use openmp && tc-has-openmp && openmp=--enable-openmp
-
-	econf \
-		${openmp} \
-		$(use_enable nls) \
-		$(use_with graphicsmagick)
-}
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index e18ae53f16d3..e59550541928 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -1,12 +1,6 @@
-DIST pelican-3.7.1.tar.gz 784605 BLAKE2B 42adef016f54a931e4fef225af9a4c5c880b66c96660c2a34137a425f879688822ddc8bbc19805444bf2b49369c3dccf8a5303748ff9e7cbde3910d6ba501652 SHA512 9e04e6a2009cc134f74410d8c8349831467192e7524287e23cad0b68232f2b5dd04f5d98505222d71eb3441e466bccec1cafc7f6e3c6bfcb4c5e57e4ab0fadda
-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
 DIST pelican-4.2.0.tar.gz 1332348 BLAKE2B 879a9d51f2b2956e895302dd613c877ff65bf8d420cd70144618ada07723037bca680f6983bdf3860d144ebae4eca8198219dad9caf0d6ecc06745a3881447fa SHA512 9c9f41306739acc4c6c6a7ddf50d955d958af7be1da197b42859b95405b18ab5b597fee4f9aabdf98cd508204558bff9c4f0c11bf4e5367b16e32568682a21e6
-EBUILD pelican-3.7.1.ebuild 1485 BLAKE2B c89985ae05b04c766a245b9c7b67d0c42a07f725859f3e35a1bcb765a485d9956d22869dca96438d25275f8f97939be41bc7c2e40ff16d304dab45f72f07c944 SHA512 d7fa4dac06fbe2f5a14b4e268c7f5fd616c120e011f803f9e578f8258bb9551dc875945a10d5d90727666afb7a5379cd491796a25bc3901a3f28295d3607b890
-EBUILD pelican-4.0.0.ebuild 1476 BLAKE2B 8398a4b2a07c8feb3d5c2ff59a2c4c11f6259357e5778fe7d979473d890a06a4e3e7a7192e968df9035e5a8e60321c36e0ea844b5a583c5b99e614409d525deb SHA512 6eef2b4031047462b97cd3b290551d002242655fc7695859d55d4d02b9932f44f1af084fd593d065367860143fe9faef9f46a22ac10a3f5d292c2f0cb9841f56
-EBUILD pelican-4.0.1.ebuild 1476 BLAKE2B 2e448917f219828c2ac769af3cc555306462bf7aaeb292ecf09f2a04e58a08e76a0278aa7eb2e0e5606818b7857e45d3c03c6959a0327c65e369e7a4d4e74657 SHA512 c8b0d401aa2e336e480f85c0aa9e9add412de82bbe5e2a6fe30f3a5ae8e66c64426bfd05df5bceb8d1cc092b7210b9c23188a6781d65570a5a5efa5979283ee3
-EBUILD pelican-4.1.2.ebuild 1476 BLAKE2B 2e448917f219828c2ac769af3cc555306462bf7aaeb292ecf09f2a04e58a08e76a0278aa7eb2e0e5606818b7857e45d3c03c6959a0327c65e369e7a4d4e74657 SHA512 c8b0d401aa2e336e480f85c0aa9e9add412de82bbe5e2a6fe30f3a5ae8e66c64426bfd05df5bceb8d1cc092b7210b9c23188a6781d65570a5a5efa5979283ee3
+DIST pelican-4.5.1.tar.gz 1397023 BLAKE2B f12b16045feaf001c8f6e57116fb8e807ce1d51f16bf7a373203edec3d1edb91a2386dbf8fb008efbc11654ae1cbe678b4a3cbf99349340db1d784962e81ab5b SHA512 cb27399d3c280981d1e8cd01dbfd54b1a8bd11d9b87c4717226a2a467d73c3ad4e038a8e544534289a73e9e3cc64b4414e2b3bbf2cdd05b917d02df79ab40b5a
 EBUILD pelican-4.2.0.ebuild 1484 BLAKE2B 61feaa13e44ac0efbd0e07f94ab7d1bd53245a0ecfc1b2a6e6d2f4674dc38f78b92753261c598165ca4005790dd8d2475e2c2c561cf2ff5711f0e92739111f8d SHA512 dc6f0ce017071f66f2e24cc4f6fdea986bf31d3980e08f7cd0c4b073eed2a6456e87af2a1cda8fd08cb8095c695a8598db49035d72f84dbd21161e4a7ba7e33c
+EBUILD pelican-4.5.1.ebuild 1519 BLAKE2B c8d21aed61f0d488d3515e587705bb467398bb3d462b659d84e5ed1f002d1d13e18f7ffee223ee3ccf77a5cf4ad50b7844d1144f84c8874d01a8202437c4ca00 SHA512 ab1f4db1cfc194f81f91c376401b8ba04400ebc2d4091be004e450405e8a952dd5f3186c58a3bf51a6b83c8a63ee82802b38d03345adaa658752447e4fd4ee90
 EBUILD pelican-9999.ebuild 1541 BLAKE2B 2b961dc8dc31d683360f063c90d727a0f8553796b4017774c6f97ab1e3386ca6aea5ba600aafd5eaaeae6c09bb480290b5407e2807d3b1ac5a4dd2cca31b2363 SHA512 6470c2a01b936cd22e8405346deac26330b627d6a05147055697775aa40f2dc87194f521c871da98c90800262930161084c1d1b441d754af51767f1fc8c1dcb9
 MISC metadata.xml 520 BLAKE2B bcf1bbb92ce3d045a3dde410f9566322f5605796b3fdc1947b1ae08967f2af21319922001d1942ccbb46dda2a911c3ea4efacf95ae67af32f8a3183c734ab2e1 SHA512 1a10d48a737dd95edb40e5190e45bddd30fdbe50db08394d21834d1ebd4f7e5b267477a52f90934b9ba92252b5a2b1d60e208399ab96559d169f550055c3e65c
diff --git a/app-text/pelican/pelican-3.7.1.ebuild b/app-text/pelican/pelican-3.7.1.ebuild
deleted file mode 100644
index 28cced5b2014..000000000000
--- a/app-text/pelican/pelican-3.7.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
-SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-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}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-
-DOCS=( README.rst )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}"
-		docompress -x "/usr/share/doc/${PF}/samples"
-		doins -r samples
-	fi
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/app-text/pelican/pelican-4.0.0.ebuild b/app-text/pelican/pelican-4.0.0.ebuild
deleted file mode 100644
index 8f8778fe8166..000000000000
--- a/app-text/pelican/pelican-4.0.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
-SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples markdown test"
-
-DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-RESTRICT="test"
-
-DOCS=( README.rst )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}"
-		docompress -x "/usr/share/doc/${PF}/samples"
-		doins -r samples
-	fi
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/app-text/pelican/pelican-4.1.2.ebuild b/app-text/pelican/pelican-4.1.2.ebuild
deleted file mode 100644
index e3b6b62d0cee..000000000000
--- a/app-text/pelican/pelican-4.1.2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-inherit distutils-r1
-
-DESCRIPTION="A tool to generate a static blog, with restructured text or markdown input files"
-HOMEPAGE="https://blog.getpelican.com/ https://pypi.org/project/pelican/"
-SRC_URI="https://github.com/getpelican/pelican/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples markdown test"
-
-DEPEND=">=dev-python/feedgenerator-1.9[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.7[${PYTHON_USEDEP}]
-	dev-python/docutils[${PYTHON_USEDEP}]
-	dev-python/pygments[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/unidecode[${PYTHON_USEDEP}]
-	dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/six-1.4[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	markdown? ( dev-python/markdown[${PYTHON_USEDEP}] )
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/markdown[${PYTHON_USEDEP}]
-	)"
-RDEPEND=""
-RESTRICT="test"
-
-DOCS=( README.rst )
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	if use examples; then
-		insinto "/usr/share/doc/${PF}"
-		docompress -x "/usr/share/doc/${PF}/samples"
-		doins -r samples
-	fi
-	distutils-r1_python_install_all
-}
-
-python_test() {
-	nosetests || die "Testing failed with ${EPYTHON}"
-}
diff --git a/app-text/pelican/pelican-4.0.1.ebuild b/app-text/pelican/pelican-4.5.1.ebuild
index e3b6b62d0cee..82ec89501413 100644
--- a/app-text/pelican/pelican-4.0.1.ebuild
+++ b/app-text/pelican/pelican-4.5.1.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index 4ebcd571f0db..a54e4c0a60a5 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -4,4 +4,4 @@ AUX pinfo-0.6.9-lzma-xz.patch 614 BLAKE2B 0b84247de91a42f75d0664f4ccab23e3d57bc6
 DIST pinfo-0.6.13.tar.gz 157103 BLAKE2B 18af4a5ae1bbd2abccb174ce1a3a16e4d17207a10015042723c58f80695c2580ca0c1c60f4f6f4f08e67eb01316fe48cd848a887e65159a6cd4463eca14bdecd SHA512 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
 EBUILD pinfo-0.6.13.ebuild 1079 BLAKE2B a98ac680f4eadc81f710912a8c5f98696dd779318fcda5d23b2dbb99aad033abcc9c4bc385419d8e92b4b207a58be764f145864374e2dfa7110fe971a6e7e336 SHA512 001ba727cb2dea10f08f437d488847ee2e585dafc97d4786ce0140c6d8c7fa91970c015c55a300f1cd1f78aab8ed1334669c5e6f0692aba1ed039814b6b64bab
 EBUILD pinfo-99999.ebuild 965 BLAKE2B 70eea0fb86462f8cea446b270fcde21247bb2d497946ddf585bbf5f21651de0068746f82133cb0dbf8b3802be02af7ccbd8189118bc4da21e525b2cf456872eb SHA512 38490ae9c934f6a73e31b4e30df86d249f5c54199622ec6d9c9185f3d13cc83cc56a711b62c9fb639ffd80ae8448ccd9c8548121bcbb21356e272c3f44a7381f
-MISC metadata.xml 214 BLAKE2B 2714d2d15a382508ac07f9e3cf3c042bbba715d1a3f679a37d45fb68cbb7931bffe3479e8a9c3ef61c0f76d1b5822f9696d203ed0153a2e713865cce16ed2403 SHA512 6bd18312d33fe28edbaf93fa559dab76a4eb813f37bf3accccd113e111507617827f4423e81f6448edc51245f86c73a5b1d65c0a9310c3aa1d1b910597303fc1
+MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-text/pinfo/metadata.xml b/app-text/pinfo/metadata.xml
index ece6b81bfbdf..3e5026ee3754 100644
--- a/app-text/pinfo/metadata.xml
+++ b/app-text/pinfo/metadata.xml
@@ -2,6 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>jer@gentoo.org</email>
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 </pkgmetadata>
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index e327c1520bbf..2fb3f1ea0f59 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,3 +1,5 @@
+DIST poppler-data-0.4.10.tar.gz 4497684 BLAKE2B 2c262223a971fe49b7f9848e424ba78a6d96e193d18b0bbad4eb343deea7808a6d9e234ebbb252c5becd40840221ba86d2b87ad36595fe982546b32ea6201f0b SHA512 4bebad0791b55b5e2805cf864393d1f777a7996c962398fc178211d2abbf110f75ef2fa6699e275b126aca0540eabb89542a672e0587248db9414e357a32bfd3
 DIST poppler-data-0.4.9.tar.gz 4196919 BLAKE2B a986dcff2c2295eeb952adbb4bfc59ccbc53c27668ecc44fcf862bbe3d65062ccdb9302ebdd9b530d9d0ed155666922086b368c81c0772bdab284e323e6ac436 SHA512 45afd378d0bb415c5e1bc9718025328058712c0bde6d529d2c7a4813b12f600be46ecd2ed2454b3f83fb9f8cad157b75d11d8c5d1ca849f347c310b58132ff7a
+EBUILD poppler-data-0.4.10.ebuild 760 BLAKE2B cb29bd60394719ef71edbebb0640f59ca53de60441bd0b75e4abb3c80030470b4243007b7f2613bf4e0efb6e725bfddc0b768e7e1499bc9dbd323c40b8988109 SHA512 d2919f63e27d4e86b560ef915b42d578c6fbd863f4048fb15fb15b4b93074921ca9196bb9c156bb420ee6e9380b796c1109a62f2696487ecc33df1b4de44a195
 EBUILD poppler-data-0.4.9.ebuild 760 BLAKE2B 38b06c1797185f673aa67e77fd75c9c50abc2470db7134707c29f5adcabbf9f0c48875e3348ff1bc14ca257f508535bb5250aa3f75e6f189647a4f713de434cc SHA512 9eac446d1d0c52b90f6f4ac4c9978a71beffa0f522ffac8b143fb563b15a3c213400cd8a61a078079f7a9cf7182dddeac8d718afd6afbe27644c407b93ace307
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/poppler-data/poppler-data-0.4.10.ebuild b/app-text/poppler-data/poppler-data-0.4.10.ebuild
new file mode 100644
index 000000000000..57fe52f3d938
--- /dev/null
+++ b/app-text/poppler-data/poppler-data-0.4.10.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Data files for poppler to support uncommon encodings without xpdfrc"
+HOMEPAGE="https://poppler.freedesktop.org/"
+SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
+
+LICENSE="BSD GPL-2 MIT"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+SLOT="0"
+IUSE=""
+
+src_install() {
+	emake prefix="${EPREFIX}"/usr DESTDIR="${D}" install
+
+	# bug 409361
+	dodir /usr/share/poppler/cMaps
+	cd "${D}/${EPREFIX}"/usr/share/poppler/cMaps || die
+	find ../cMap -type f -exec ln -s {} . \; || die
+}
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index a1335d81a2fc..93e794c2f74c 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -2,10 +2,8 @@ AUX poppler-0.28.1-fix-multilib-configuration.patch 813 BLAKE2B 74133e82a1969d80
 AUX poppler-0.57.0-disable-internal-jpx.patch 892 BLAKE2B 811ce3bbeb3b3c0720902a2a57463d352d102a2d6faef209723558eb93d638f35108f83674e29314632ebcf5fae521bcd8893eb1f77b931c7348b9d7446dae76 SHA512 aca1738fa33fcb5efcc8b0f5062abca2f32d329d3e2e1609386f15cce33d2e7aeae3e36b41dae292d3dceea7bde62210d2527b2552047d33d57ea4f44dabc1ee
 AUX poppler-0.60.1-qt5-dependencies.patch 934 BLAKE2B 5af7f7adfb802905737abc22003d00dda6f25bc992d73c01570a560938e5aef166905c519ea7e4968f8e637b2dc47c61bb1c49cd5ab14fb2076e2a1e38545499 SHA512 fc2e3297da9dbbb6ba9377958c08626db44790ec6ba3acdbc1c348d3e909bd7b061fa64995d584d89a42d1bc9cb278827590b303bd1ff57c0557f2bae450b81c
 AUX poppler-0.61.0-respect-cflags.patch 3012 BLAKE2B 24ac0b8067f1f8aea6e1b328b27ff9a5be0fa457354a251bb5066e6a63ffbf953c2d761e53e5d78e1b8593dbd5740420cffaa7f4a01f1366b712b12fbfad2cf9 SHA512 b680ac77711d845a93586084d1a4523860af33c2d494cbf16ea42f799612548b96fbdaadf53100dc74e933e0d09ba98ce3aa49b7ba6655907aad01e09561fa6d
-AUX poppler-0.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2ebac232bb0d0bfe1d55fa9085c6e2819e4a37e54680a95e69d2b3cf49bdb5cb3c18eeede8ca58bf1426e8c9bd47ea79eddcd0860 SHA512 37d3700ac4d4774fefabc88fdc3a9b0031e91d8a7aae6f8229e87acd61710652f9a64f8ac97006131ab7cea479e1e6268c7992818017cf7473b45743a3796440
-DIST poppler-0.90.1.tar.xz 1633804 BLAKE2B 5c7256bca74af6cc2732fb6c413bec10ea579f28fe623ccb5d4863c62d39329a4264c240ee0e395a78de577a960a5156ba20f957990c0cde91efcee72dbc2fef SHA512 c0a38c3c40196f8b847f0737152d0cbb40656870a8ceb766134ee22ec7c21bc979a13f56b7596a13ae2f08f1a9a2c396ba7f5ff176d02c262af7e863c2afde34
-DIST poppler-20.09.0.tar.xz 1642932 BLAKE2B be61275560bf57c639f185b5ebbd8b37b99fd008412f49890ed644e95f4d8f2c4ca865b081eea99f2604d44fa1c0c31bd551339340f03cb43ab7f5a03992f760 SHA512 fbd57dd0754279d4b0a20ccbdbfb06abc5a5d84e63915676353fd42d5b80318904cf7e6ae462db445ed6c6e011fc24675dccbb8bd3597fc6532657a4ea23406a
-EBUILD poppler-0.90.1.ebuild 3374 BLAKE2B cbf9b5bcb9d888c7ed553519305dda004948e931573266564ac46c550e77bd8a52e8e93270d0c4f2ba1241d6a9ae2112b6c21ee10c0c1f8a472a8abfe6322c19 SHA512 2e9832d3fd0f7b81796364cbf532d6a212c6b3b0f5211f23f501cb93daadf838e2aff6797675f496d27b95e1199839f441240b1eab37acb8317523d64fdec219
-EBUILD poppler-20.09.0.ebuild 3383 BLAKE2B 81acaa7ba9d630ef363f32ed52f101300be2976ee93d7c6232e39caa1f740bbc7184693c1667ced11433a4b65ce0760dc4aecbf3f89598fda48c830477686c63 SHA512 19079ba04783a8f38f3b689d8f5b739f23721259b893555686727cd4ea359ea0eda698eef2b04b1cdc19403178d1af6bc4e4e5a25692f639d66bda5f40b4e494
-EBUILD poppler-9999.ebuild 3383 BLAKE2B 81acaa7ba9d630ef363f32ed52f101300be2976ee93d7c6232e39caa1f740bbc7184693c1667ced11433a4b65ce0760dc4aecbf3f89598fda48c830477686c63 SHA512 19079ba04783a8f38f3b689d8f5b739f23721259b893555686727cd4ea359ea0eda698eef2b04b1cdc19403178d1af6bc4e4e5a25692f639d66bda5f40b4e494
+AUX poppler-20.11.0-respect-cflags.patch 2797 BLAKE2B 8c37ed086fa823eac8d04e47c04f79afc76c0e6caa6d921b21bb5d99928be9c9bc683126e42e249aa8ccd96470d7ecf9eb1b0d8e749bd85bf4a455bb5d513e01 SHA512 421760c08f351449b7c899e4a04c3d93a26cf914326c58427031d4398f7cd4d2ed68d5ab42f930d663aa4f918fa11534e310ae6a9c005bdb3c9a191a497e6386
+DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335
+EBUILD poppler-20.11.0.ebuild 3375 BLAKE2B 0b355ab38e00f5f0ce9fbbb95463ef4b990534e4f60f9923a8d21b5d6e0fa30e40520861ca6681a5fae3986ab0c358400170cb159b5ddc8e87a3cb6a4684156f SHA512 d96627f44264078a1d95325ffa3fe71f8d6819d809ebeea608080dc1e9b73019d3c30c32b216797b4a5a72bcf3c3c69830df75e367ea72a70311fbeb1b324be0
+EBUILD poppler-9999.ebuild 3384 BLAKE2B 53af7b182a6b978219cc2d198956d881c59e9471f1d4696331b78a49b5057717728fd903a27ee38ed3c3a2bf91f4186e6765a6affa09f3c0fc36eca2bd3012c9 SHA512 b2b89c68eb89f4414ce6f2c560519803d2c43c5492b9362e3c972699c4726f12a6b273e3e2e3a5aa868c61e78908f6a008a56b42bc9622ffbe5da62f06b22e6e
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/files/poppler-0.82.0-respect-cflags.patch b/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch
index 6f7b2a7c175b..9845c0970174 100644
--- a/app-text/poppler/files/poppler-0.82.0-respect-cflags.patch
+++ b/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch
@@ -1,6 +1,17 @@
---- poppler-0.82.0/cmake/modules/PopplerMacros.cmake
-+++ poppler-0.82.0/cmake/modules/PopplerMacros.cmake
-@@ -145,46 +145,6 @@
+From 083bc159ce35e21ab5bb942e91e98a95ce1f8f99 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Mon, 2 Nov 2020 14:30:22 +0100
+Subject: [PATCH] build: respect cflags
+
+---
+ cmake/modules/PopplerMacros.cmake | 41 -------------------------------
+ 1 file changed, 41 deletions(-)
+
+diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
+index 6e5f0050..1a3d0f9f 100644
+--- a/cmake/modules/PopplerMacros.cmake
++++ b/cmake/modules/PopplerMacros.cmake
+@@ -145,47 +145,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
    endif(GCC_HAS_AS_NEEDED)
  endif (CMAKE_COMPILER_IS_GNUCXX)
  
@@ -18,6 +29,7 @@
 -  set(_warn "${_warn} -Wundef")
 -  set(_warn "${_warn} -Wzero-as-null-pointer-constant")
 -  set(_warn "${_warn} -Wshadow")
+-  set(_warn "${_warn} -Wweak-vtables")
 -
 -  # set extra warnings
 -  set(_warnx "${_warnx} -Wconversion")
@@ -47,3 +59,6 @@
  if(CMAKE_C_COMPILER MATCHES "icc")
    set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
+-- 
+2.29.2
+
diff --git a/app-text/poppler/poppler-20.09.0.ebuild b/app-text/poppler/poppler-20.09.0.ebuild
deleted file mode 100644
index 39d7375ed1b8..000000000000
--- a/app-text/poppler/poppler-20.09.0.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 2005-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake 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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/102"   # 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.82.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
-)
-
-src_prepare() {
-	cmake_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
-}
-
-src_configure() {
-	xdg_environment_reset
-	local mycmakeargs=(
-		-DBUILD_GTK_TESTS=OFF
-		-DBUILD_QT5_TESTS=OFF
-		-DBUILD_CPP_TESTS=OFF
-		-DRUN_GPERF_IF_PRESENT=OFF
-		-DENABLE_SPLASH=ON
-		-DENABLE_ZLIB=ON
-		-DENABLE_ZLIB_UNCOMPRESS=OFF
-		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
-		-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_use_find_package qt5 Qt5Core)
-		-DWITH_TIFF=$(usex tiff)
-		-DENABLE_UTILS=$(usex utils)
-		-DENABLE_QT6=OFF
-	)
-	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_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.90.1.ebuild b/app-text/poppler/poppler-20.11.0.ebuild
index 46e8ad792b99..dc53016a1218 100644
--- a/app-text/poppler/poppler-0.90.1.ebuild
+++ b/app-text/poppler/poppler-20.11.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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/101"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/104"   # 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.82.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-20.11.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/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 39d7375ed1b8..88fc60ed4b7c 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.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 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/102"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/104"   # 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.82.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-20.11.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/qpdf/Manifest b/app-text/qpdf/Manifest
index 6aa67aded2a8..3c79c9aa4563 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,7 +1,9 @@
 DIST qpdf-10.0.1.tar.gz 18399985 BLAKE2B 5e113790e7c2b48987c18aa7f562ff18f0efb544c48be8c36ba201ba1420168a7f32ebfe2e5754e8af679557df29093e0fd550c991b5201e4246be827952b3d3 SHA512 b73c0839b08905052d90ed78645cc9fb4fda4a0fa803db7b46f3d77a2c2f7e8cec52173834b1e1f008f3a3475a7d913362d22e1ebece11187a90c9035b81de94
+DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
 DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
 DIST qpdf-9.1.1.tar.gz 18312457 BLAKE2B 0bbfaa782e46a911b20440bcf122d2745dde62de16423307cb02f7f3cd9a4976c79c7f6371322f793abfd8eaf9d5cc4f49b6854e58039595b5a488a2fec98d88 SHA512 008a11fef663a57ca173631f2053988023babea6c333cfe01db0ef955c8cd36d387ed9f2039f55bd5f9ca94c7a8e400461a09a15c5f89e03bc0817fdd0d3d585
-EBUILD qpdf-10.0.1-r1.ebuild 1344 BLAKE2B 90fedf92ea6fea520b7eea282a05cd2d8c98c00331fc34af6a1720bc66c98f54f732d9ff607e7279c2b9e609d2bfbf1d460b1489f71b7e732c0e299cd3dd71c0 SHA512 8d5484d57c7f8f0987ac3044951a8a7387f082f3a24920820dfbf350320d12219b2870fbeb83eb916281e494ad14ad5d80a1d60c1999a9e39718a407d7638f76
-EBUILD qpdf-9.0.2.ebuild 1275 BLAKE2B 734241fc7d46a3340ea6b5561b5a5bdeaeedcbc27df2cdbe1a56314ac3da57b8cd450ff0dc5413bc9eb05349d52382838b77fcdc37c675da84eae0318bdc4359 SHA512 d17952de2eed88b93d3236e80328c4816a30add65ff0bf3f6588530ec25d0d1e2e84724ff400216cce537a1e1013a243c5c54deea7d1ec6332aad763d6d161a1
-EBUILD qpdf-9.1.1-r1.ebuild 1209 BLAKE2B a41341bc00ad325e8fc52b7bb72cc93d9fa615a82452c436518cc26310678f3fa1148a72f1ea26c50da5a2b366d69d53327c3138eff72370d06ab6be9ccfa673 SHA512 e94d36930a5c3ed832630ada53181acd18d487ed81e387dcbb0ea1fc9b46d99ec1e336dc9e352888f10e3661c9e0a01469e6d2fef2fc83b5896f8b276305d747
+EBUILD qpdf-10.0.1-r2.ebuild 1347 BLAKE2B cf0992aa1050c973626473a84654f718c119ab6400d9c9b26e73909c47033ac6efa647c49c1d286d919cbfbf6ad4a989df0aa2e4a0a0e7bfa71e35c0b0400eb1 SHA512 5bed37858577a8c440ed8f0b5ca03a126c142e0af31b82184466705ac2275d8cd4c0393abd10b1c3a5b46db4abfc3137e08f76fa453b420ae5e4bf8153058b05
+EBUILD qpdf-10.0.4.ebuild 1324 BLAKE2B 829dec1a35fb315fb838f8fdd956d013ca6e1219d291528db6fca90eac4d681f431fd6dab2d72eabb394bda4b50aa46dad122dd1e98d2a8f6df7aff475a839ab SHA512 a1e994d3b83566e8b048474e1ecf249289018c8d31836fa97e9cc52992617e35199e8a6a3185513994b2cd819d91a28426162d9a6fa29e7c5a8812070772cf46
+EBUILD qpdf-9.0.2-r1.ebuild 1278 BLAKE2B a7ddc49812f5307f62c51df2175eea83baa3e029d7f77c049a0533426dc3b81f27bb5ae10d1d8ae19dab1ddc80819db986bf803b2d218355195c71dfeda65360 SHA512 1bcf863d03efb215fe98517fe099e04f464cc14dcd49bd23eede86dc55d38e0428c32b90e654b9412aa899695b7422f1a936ed49d4f8e1d6eb8d552bf9c9d12f
+EBUILD qpdf-9.1.1-r2.ebuild 1212 BLAKE2B 267f67e4b5115ef494996ad283d10f952bf78d405b860bb8c72cb39227236cccff3e122d8addeee35eeb1f285d564faf6cc90e014fa93ff20070b17a8fb5f7e9 SHA512 24c72250383f4bc98e1e7778f04dada81a26c0192166251f0e5a6cd76d7cf46440e62a4454dc3ed69add76d303f6fed21faf24f345edc939b6c30a803ffae7e7
 MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/qpdf-10.0.1-r1.ebuild b/app-text/qpdf/qpdf-10.0.1-r2.ebuild
index 5f164234bfe4..21b1ec14df96 100644
--- a/app-text/qpdf/qpdf-10.0.1-r1.ebuild
+++ b/app-text/qpdf/qpdf-10.0.1-r2.ebuild
@@ -30,7 +30,7 @@ DEPEND="${RDEPEND}
 	test? (
 		sys-apps/diffutils
 		media-libs/tiff
-		app-text/ghostscript-gpl[tiff]
+		app-text/ghostscript-gpl[tiff(+)]
 	)
 "
 
diff --git a/app-text/qpdf/qpdf-10.0.4.ebuild b/app-text/qpdf/qpdf-10.0.4.ebuild
new file mode 100644
index 000000000000..d49539fd3d48
--- /dev/null
+++ b/app-text/qpdf/qpdf-10.0.4.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2020 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/28"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples libressl ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-libs/gnutls:0=
+	sys-libs/zlib
+	virtual/jpeg:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl[tiff(+)]
+		media-libs/tiff
+		sys-apps/diffutils
+	)
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	local myeconfargs=(
+		--disable-implicit-crypto
+		--enable-crypto-gnutls
+		--enable-crypto-native
+		--with-default-crypto=gnutls
+		--disable-static
+		$(use_enable ssl crypto-openssl)
+		$(use_enable test test-compare-images)
+	)
+	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/qpdf/qpdf-9.0.2.ebuild b/app-text/qpdf/qpdf-9.0.2-r1.ebuild
index ca0335153b20..96a73f1968d7 100644
--- a/app-text/qpdf/qpdf-9.0.2.ebuild
+++ b/app-text/qpdf/qpdf-9.0.2-r1.ebuild
@@ -25,7 +25,7 @@ DEPEND="${CDEPEND}
 	test? (
 		sys-apps/diffutils
 		media-libs/tiff
-		app-text/ghostscript-gpl[tiff]
+		app-text/ghostscript-gpl[tiff(+)]
 	)
 "
 # Only need perl for the installed tools.
diff --git a/app-text/qpdf/qpdf-9.1.1-r1.ebuild b/app-text/qpdf/qpdf-9.1.1-r2.ebuild
index 34cb46051867..58f00748384d 100644
--- a/app-text/qpdf/qpdf-9.1.1-r1.ebuild
+++ b/app-text/qpdf/qpdf-9.1.1-r2.ebuild
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}
 	test? (
 		sys-apps/diffutils
 		media-libs/tiff
-		app-text/ghostscript-gpl[tiff]
+		app-text/ghostscript-gpl[tiff(+)]
 	)
 "
 
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index 91d8333ed8dc..703d411ff9d2 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,4 +1,6 @@
 AUX qpdfview-0.4.18-qt-5.15.patch 342 BLAKE2B 34ecd868ba9f38f43433f425c173b5cf07c0c9a2c7097e62d0af1b85bf49a3ef2f68064be88a12f300356633471ea8f04b69b66f9874cb5a8dbae3962021402b SHA512 ac6a742b957eb192117aece45cef8f2a9d76fe45d4cc87246dba8e52a15ac11c6892175fd73c8af3bd22a34ff36645828a5f12d66c240b6305d9621387fc3261
 DIST qpdfview-0.4.18.tar.gz 786577 BLAKE2B 07ef444ba39435578481e549fcbbd2d97362c6bda3092a17f1daa8b8437febf50cd2f145cd5e80cc1be565c5a658e85a428314a1bcd2a5a38efce0830f1cffba SHA512 38741520b20e3ed7100e52982930abac26e994a69df68c54dfa7180be8b2a4f377b91ba03993bab67b0a505ad79d62164f0f168a6715f4306b635ceba6840d66
+DIST qpdfview-0.4.18_p1.tar.bz2 448818 BLAKE2B 690f93c7f0af376e2b60d69a9802cdb159a97eb66b572a913badcd7ce3b9303d69bf8fbb359b5aa09ad1c63b1b6865e3602c8dc9cdad2506a43273d410a64d89 SHA512 41152596e39e6084e4e46c1aca28dfa4c619bf31068ee3272c6119793da5d99c58868ecf682ed0dc81e740f20193372e2780cf7d7fb917545662c93e6a2a1b4a
 EBUILD qpdfview-0.4.18.ebuild 2259 BLAKE2B f36c70e222fe667853016cd5a4b35c086b2224ea1b65ee23c5d84e6e4baaef395f5cb865b3b8b16a6f217a50f955426e84eef5a33395e2a1ada12c889c74fba9 SHA512 ef3481e73d7bd71965712604cdddfb3d3257f9440aa5eedb1bb348ad95072054b2474a322befdc37c7802846732ff308bd3d882fbf4c36d51e24af4d44ce04b5
+EBUILD qpdfview-0.4.18_p1.ebuild 2204 BLAKE2B b90c8b9bade168972e39f6d3565252c94749d5121163aaeb1abf7f1e2a717ad6eedba35f389e56593277f4f414d5d65460e717ac38409dca728c7211e2e50760 SHA512 c010cb9689608e032893ed2fd0de134d6451dc635749bfaeaa149f5d6dbc63546c955fb016390c659e6afdce8797709d6c4f3bac9b528a2ba121fc7a4d9f3df2
 MISC metadata.xml 534 BLAKE2B db66db041dd0875c8d4e36e3223d7f82263555f2d6a1dcc5270279b3fc8bc77499712253d43b56e278187f163af0495ca9e7e6aa0ba0dc8e9a5fe9cf7f2daf99 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133
diff --git a/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild b/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
new file mode 100644
index 000000000000..e7a36da831a8
--- /dev/null
+++ b/app-text/qpdfview/qpdfview-0.4.18_p1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="ast az be bg bs ca cs da de el en_AU en_GB eo es eu fa fi fr gl he hr hu id it ja kk ko ku ky lt lv ms my nb nds oc pl pt pt_BR ro ru sk sr sv th tr ug uk uz vi zh_CN zh_TW"
+inherit l10n qmake-utils xdg
+
+DESCRIPTION="A tabbed document viewer"
+HOMEPAGE="https://launchpad.net/qpdfview"
+# bzr revision 2107
+SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
+
+REQUIRED_USE="?? ( fitz pdf )"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
+RDEPEND="
+	cups? ( net-print/cups )
+	djvu? ( app-text/djvu )
+	fitz? ( >=app-text/mupdf-1.7:= )
+	postscript? ( app-text/libspectre )
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtprintsupport:5[cups?]
+	dev-qt/qtwidgets:5
+	dbus? ( dev-qt/qtdbus:5 )
+	pdf? ( >=app-text/poppler-0.35[qt5]
+		dev-qt/qtxml:5 )
+	sqlite? ( dev-qt/qtsql:5[sqlite] )
+	svg? ( dev-qt/qtsvg:5 )
+	!svg? ( virtual/freedesktop-icon-theme )
+	synctex? ( app-text/texlive-core )"
+DEPEND="${RDEPEND}"
+
+DOCS=( CHANGES CONTRIBUTORS README TODO )
+
+src_prepare() {
+	default
+
+	local mylrelease="$(qt5_get_bindir)"/lrelease
+	prepare_locale() {
+		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
+	}
+
+	rm_help() {
+		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
+	}
+
+	l10n_find_plocales_changes translations ${PN}_ .ts
+	l10n_for_each_locale_do prepare_locale
+	l10n_for_each_disabled_locale_do rm_help
+
+	# adapt for prefix
+	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
+}
+
+src_configure() {
+	local myconfig=() i=
+	for i in cups dbus djvu pdf svg synctex; do
+		use ${i} || myconfig+=(without_${i})
+	done
+	use fitz && myconfig+=(with_fitz)
+	use postscript || myconfig+=(without_ps)
+	use sqlite || myconfig+=(without_sql)
+
+	local myqmakeargs=(
+		qpdfview.pro
+		CONFIG+="${myconfig[@]}"
+		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
+	)
+	eqmake5 "${myqmakeargs[@]}"
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	einstalldocs
+}
diff --git a/app-text/restview/Manifest b/app-text/restview/Manifest
index f8286b0970d4..e62f14d2d2ce 100644
--- a/app-text/restview/Manifest
+++ b/app-text/restview/Manifest
@@ -1,3 +1,3 @@
 DIST restview-2.9.2.tar.gz 47181 BLAKE2B 6812e39eb2f830cedacc359fe24988191fc6c7b46b4ddc7005e6e6ee3e52d6998b4b99687892842710154eb2bceb22dc161986f0c8f5f0d1910733226084b0b2 SHA512 4b8627248097368a06fba5dba8994d349b96e605ebde0965a9100c213d9c8bb9320e6ff33a93ce40d80a6b5f3150e4094e2824b5ef5b4757d1e3bd39399a8e0c
-EBUILD restview-2.9.2.ebuild 731 BLAKE2B 7a264d5de70348454f438fa3d753309aebad61764f2d28c628e7db2143ba2ab7b7c43bd7e28648dee2fa5b567db28a99c8895ea727390bee18dd7ddbaf829206 SHA512 1d70c44a8be0bbaa62da6a8cca1079ce1c417f6f51db250d8cbd7a3c895ce48adee1f7c330645d0a1cdf202bc1f37511b02bb678e9e49f0ec6b5a186cf618a5b
+EBUILD restview-2.9.2.ebuild 724 BLAKE2B d2ff6b227558f697a3bf9ee415c6f26f3cc2ecb5d8e04861563cfe4c92e01e2a90dbc6169b99d3c001c1d34b244ef70bc58aa2d2d240b2638bbc4550df27295f SHA512 56973ec9f6d012b549cfc33db3f1b7bcf2bb5e13f4a5f299c4ecdd425f80e5498cc2f9f5e744460c7642e72dc98c379f7f49dcf798bc0b861e464de31bed442e
 MISC metadata.xml 243 BLAKE2B 60e9636de2cbdae69a508d7f370662af030d8cebb04ac02967c0c9a274c2d066314c0add0ca28c98674d215c8bd3b1209a2c9bb916a538f171243df00c865e2c SHA512 773c027b6753265835a85d22ded35a3a46ff7c0341d9d802639d0fa796c4211ee46f8810785662ce05c3dee74489c0fa08be6ee50248c2a84b4de839b8f8cf23
diff --git a/app-text/restview/restview-2.9.2.ebuild b/app-text/restview/restview-2.9.2.ebuild
index e8fc0287a8f2..65da061a477c 100644
--- a/app-text/restview/restview-2.9.2.ebuild
+++ b/app-text/restview/restview-2.9.2.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1
 
@@ -17,7 +18,6 @@ IUSE="test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
 	dev-python/docutils[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/readme_renderer[${PYTHON_USEDEP}]
diff --git a/app-text/rnc2rng/Manifest b/app-text/rnc2rng/Manifest
index dc5219bde196..8ecbf881bc20 100644
--- a/app-text/rnc2rng/Manifest
+++ b/app-text/rnc2rng/Manifest
@@ -1,5 +1,7 @@
 DIST rnc2rng-2.6.1.tar.gz 14330 BLAKE2B 04d316f03da1e936603ca69cf5c8e087dd3a45f457d2b245452544e2a74a730d4c20a655a3eea5856f7f91e9154a7196bee89e8cc052cae887c6188da89b0574 SHA512 ab18b713d8756153fe03c76901dac7b090c7eab12042a251f2e97d7ae4e1ebfdf969a826305704f073c9df5a0980a6d8cd5d4e7a12a8caed018cab46a9196159
 DIST rnc2rng-2.6.2.tar.gz 17981 BLAKE2B 202b7f540197a5a17367a28524c4ca2b532d9e051b349654978754a0b96ecc89536a2a0857a1244027e0815ac1351581054c818787faff8e9a0ebd034c1c08ee SHA512 d305e902e16b3c30f6654475b28b2c71dec40bd6f7046bba8e56b81b947086e004b6b572ab3851c8622d00ddbfd7c65228d2b39b1f1cd647ebfd1e3082886f28
+DIST rnc2rng-2.6.4.tar.gz 18005 BLAKE2B 4725f9a8dfcc5e7ed26c4560d9198939d51376aad8feaa5e592bf28c9014d1abe0e90c47f6aff9ec0d7cecc815660a3a41270c118e4db87030e5a1fa208f3177 SHA512 c26103943ecac440dbeb4db6f913e57c2e4b1f84f92d7e8693e66b6a1e5af051c49ace8172fb94dae2d447ee042e432af15cc578e606452b50ca843d8bd85378
 EBUILD rnc2rng-2.6.1.ebuild 530 BLAKE2B 0d7182953a75186e6819182d7b52c4970f0ebc29b8e5ac1b42a7fc06f338e72e55f7a5c262b6ff532b2507c71bd6ab6fe712afddebe8f91cffb6eea29130a0d3 SHA512 dcc21fc62363aa6aa99adbf82b39e61bc3dbf58fd9d636ecf89143a6e1a4c61f5bca1af8bc363c74bcb2a58a0f33ffbe0b3e618e148737a4af3dca822f081546
 EBUILD rnc2rng-2.6.2.ebuild 520 BLAKE2B 9b089cfc741a24ed785ce109c9693fa0673f083e46645baa2389ecb957877586242479048f9d4f34602520277acab52b632e684fe5ff97f59ab26977a3dc4cc5 SHA512 e789868bb19ba5d2e154fba81fe68dc910357a57e7280dbe59cbad9841e3cae7bf2c6da59a5ff36a4983c5a764d7f055f777cfe6fe30587d30798a71da3e5a01
+EBUILD rnc2rng-2.6.4.ebuild 553 BLAKE2B 5cd45765b64a92dcaba48ad6fa93dc64a599cf43fdbd861eac16effa3a9ce6ab2d16937da2bddc7cd3907609b87cf3fe862858176f49625f885036c255afd39f SHA512 9de12b3dfa1d78614ad58f6ce4685d1904465a18a545affeb27e6ea974aa653d1aeeb9e6f07f75e3ae0427bf6fbe3b9d06d0b9d96b78f685817ff16f58a296c4
 MISC metadata.xml 366 BLAKE2B eb80555c7d3d419c9a0a0dca27330a2c4db11e2c0fd6d3edbc681733f12b33926842ccfebb2e818087876c92cd8ff17fd0e0a0ce8709e01237b70afa30a40ce5 SHA512 2c981a0862251c7fdb89078f62ed3eded580c221b3f1bbab7e2941b6e247f03cc7d86efb5174c5649b456bb9c6c5890b0664b32228c2c7ea1d6d18f2e6240198
diff --git a/app-text/rnc2rng/rnc2rng-2.6.4.ebuild b/app-text/rnc2rng/rnc2rng-2.6.4.ebuild
new file mode 100644
index 000000000000..034398c5e38f
--- /dev/null
+++ b/app-text/rnc2rng/rnc2rng-2.6.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="RELAX NG Compact to regular syntax conversion library"
+HOMEPAGE="https://github.com/djc/rnc2rng"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+DEPEND="dev-python/rply[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+RESTRICT="!test? ( test )"
+
+python_test() {
+	"${PYTHON}" test.py
+}
diff --git a/app-text/scdoc/Manifest b/app-text/scdoc/Manifest
index 6c4aebd483df..0f5b94e153b6 100644
--- a/app-text/scdoc/Manifest
+++ b/app-text/scdoc/Manifest
@@ -2,9 +2,9 @@ DIST scdoc-1.10.0.tar.gz 12414 BLAKE2B 3111b3ace102aca2f7da86e510e00f552874817b6
 DIST scdoc-1.10.1.tar.gz 12422 BLAKE2B 4aa5b28994cd03f5d3fc9fff253a02f1052653d25d41225665219ebb6322ebe69f2671d91c5cfe201fd7f9b1ac06f38db3dd126492da06fef0b692fc040300d5 SHA512 356aee85c4676a1fbd7367c6087dd7f6f4d33793be0f3fef74803ceb93c0a9e45c78022d219dc08a7d79d71c393849fa3113c36a85d5d60ed474b62bf5f89743
 DIST scdoc-1.11.0.tar.gz 12616 BLAKE2B 3aec60e51b949dc94e8339e400c366428a217c1bd44f79716cbd6993a7f8051a0796dc96163e071db4808c0edde071408e3eb1ee0ae3bb8ccd718479960ab8f3 SHA512 4c8248a12e69e53cc2182af5375912f7af64f3807163dbe3c52e85d817b1bfa7e461d02a627c73d93bdaa96e49668ff894d37817ceb70ee3186da9e3f8372d49
 DIST scdoc-1.9.3.tar.gz 11479 BLAKE2B 79aa3f18104e06722f087e9c2fa047f6e19fe8eb47ba0b4e6fa86f7abdc52b06a2dfcfd632b16dc7bce6e5ef3b0dbb40ce9170e678bc17c0a4e43dcc0099a1dc SHA512 77be81f042e2099de7fc84b0161bc8a95d5c3dde662284613d84a1e249fa0aa51dad73f53f265c833526d40f5e1f19fce99dc5cd6df35efb0a323c3db6084a55
-EBUILD scdoc-1.10.0.ebuild 1165 BLAKE2B aa225065ba9decac9e3a4beb0331f740c3d1513e2d775d0e74e7d619609c474915d75b3b18b84284a353eaf197681a050e68eae0c0cbf5fe6d82dea0fc6e7738 SHA512 ddd56e88a5e19c0282252035b653512bd62cec03de42b6311e443954f86708440d8488522c0dc0d3e575513ceff313c6b630914d746eedc4582bb8ba00fe076d
-EBUILD scdoc-1.10.1.ebuild 1168 BLAKE2B ebe65c78c3eefe79dc5efa4a5a76abe1480ce975ca0dec3de56e74e37f8af799cf1f878e0019b4d69231470aaa507287dcae8c3005bbda2c48007784a2f2b0d1 SHA512 bcfd36c54713470010a6ccb3d3066a83d9e4090fb1ec9c365ab0e9aebac743275dfb79a0ddb9e0392122711dd7e55d2a2e83911c5f7bc9471cffaadf58b9d591
-EBUILD scdoc-1.11.0.ebuild 1165 BLAKE2B aa225065ba9decac9e3a4beb0331f740c3d1513e2d775d0e74e7d619609c474915d75b3b18b84284a353eaf197681a050e68eae0c0cbf5fe6d82dea0fc6e7738 SHA512 ddd56e88a5e19c0282252035b653512bd62cec03de42b6311e443954f86708440d8488522c0dc0d3e575513ceff313c6b630914d746eedc4582bb8ba00fe076d
-EBUILD scdoc-1.9.3-r1.ebuild 1165 BLAKE2B acddab79253fec1c4e2c59f8ee70b9ab0d86c4fea2784a41afe94aa62909af7b2664e20f69b610484452aaeaf1ed597567439af8b4aa12e0462226b9c8108522 SHA512 9e8bf612cf40478c23dae4fa2934a09115f9ee813d2a9eb904710c638b605ad28a9938a7f90a0e6da024e0338e7dfbce66cf79f3e202c992a1140a0bc0b10eba
+EBUILD scdoc-1.10.0.ebuild 1182 BLAKE2B b52c95f0dbabac5b4eb7487cd48e59bd1b361a3a944d53c7b007bb52c7b3f0c68c6d80cd22be964b97d95f82474722a005745cf34c9d0ed0d36dac0887183e86 SHA512 a810dfca019775b6aa54e76dd8f2d411550360e86ac883498ba9e769224de6067c225eec31e93735a4f5fc6585507e780fd94c4ecf19b77677188d7118537a2a
+EBUILD scdoc-1.10.1.ebuild 1185 BLAKE2B 461515e1fe30b3c6213e9d58c9d005ba3a8866c493a90785b6907a30d3ba2dc819122ed44a79c38d11141ec4df14edb56e998a469776e0cb619db26ba838c37b SHA512 f740888fa375d7ee55730b3ed099ff3f233e88f0d8f80deb8ce063f717ab1dc9eb7df945aef834b026aa2fa9243b9a2658b6015683213ec08b914ed20f9ed7ab
+EBUILD scdoc-1.11.0.ebuild 1182 BLAKE2B b52c95f0dbabac5b4eb7487cd48e59bd1b361a3a944d53c7b007bb52c7b3f0c68c6d80cd22be964b97d95f82474722a005745cf34c9d0ed0d36dac0887183e86 SHA512 a810dfca019775b6aa54e76dd8f2d411550360e86ac883498ba9e769224de6067c225eec31e93735a4f5fc6585507e780fd94c4ecf19b77677188d7118537a2a
+EBUILD scdoc-1.9.3-r1.ebuild 1182 BLAKE2B 1d6f07981f9117ae906d84b52e8f65eb10da65b993506e2a24a465c59933af440d38d3d136613a47e936bf622f8a9879ff957ab4111a510ec812002b6b381bf0 SHA512 f2e021e0df03289c46e163c5f07f73898871795f250ca3a1e2d52f06af2de6718e8b1b5c9b7e2fbad368c0e0595cf0778a707026dd767135360811015b1b0b7d
 EBUILD scdoc-9999.ebuild 1168 BLAKE2B ebe65c78c3eefe79dc5efa4a5a76abe1480ce975ca0dec3de56e74e37f8af799cf1f878e0019b4d69231470aaa507287dcae8c3005bbda2c48007784a2f2b0d1 SHA512 bcfd36c54713470010a6ccb3d3066a83d9e4090fb1ec9c365ab0e9aebac743275dfb79a0ddb9e0392122711dd7e55d2a2e83911c5f7bc9471cffaadf58b9d591
 MISC metadata.xml 422 BLAKE2B ec662d4bd34390be05318e8816524f206decf6e3cf97ee6e132405a7a2bdd33839b5b82e8083bd3fedc8d390871275ecc9490252cdeb883994e35d511cb8b7d4 SHA512 09dc27076a9ffd2c3f94b40b9df84cbb02317dee7235cb0ce358890c93667dacfc3a7adfe09cf949b8f63970983a7ed7ff654a9ec290b58c6f4ac6b05f9579e1
diff --git a/app-text/scdoc/scdoc-1.10.0.ebuild b/app-text/scdoc/scdoc-1.10.0.ebuild
index f32f05fc9bf6..9460e30e3a9a 100644
--- a/app-text/scdoc/scdoc-1.10.0.ebuild
+++ b/app-text/scdoc/scdoc-1.10.0.ebuild
@@ -35,7 +35,7 @@ src_compile() {
 			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}"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
 }
 
 src_install() {
diff --git a/app-text/scdoc/scdoc-1.10.1.ebuild b/app-text/scdoc/scdoc-1.10.1.ebuild
index 15ecbe1b112a..cb6340289500 100644
--- a/app-text/scdoc/scdoc-1.10.1.ebuild
+++ b/app-text/scdoc/scdoc-1.10.1.ebuild
@@ -35,7 +35,7 @@ src_compile() {
 			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}"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
 }
 
 src_install() {
diff --git a/app-text/scdoc/scdoc-1.11.0.ebuild b/app-text/scdoc/scdoc-1.11.0.ebuild
index f32f05fc9bf6..9460e30e3a9a 100644
--- a/app-text/scdoc/scdoc-1.11.0.ebuild
+++ b/app-text/scdoc/scdoc-1.11.0.ebuild
@@ -35,7 +35,7 @@ src_compile() {
 			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}"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
 }
 
 src_install() {
diff --git a/app-text/scdoc/scdoc-1.9.3-r1.ebuild b/app-text/scdoc/scdoc-1.9.3-r1.ebuild
index 13560ac4771e..88d71fc2d038 100644
--- a/app-text/scdoc/scdoc-1.9.3-r1.ebuild
+++ b/app-text/scdoc/scdoc-1.9.3-r1.ebuild
@@ -35,7 +35,7 @@ src_compile() {
 			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}"
+	emake CC="$(tc-getCC)" LDFLAGS="${LDFLAGS}" PREFIX="${EPREFIX}/usr" HOST_SCDOC="${MY_HS}"
 }
 
 src_install() {
diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest
deleted file mode 100644
index 597a13c33b05..000000000000
--- a/app-text/sgmltools-lite/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST nw-eps-icons-0.0.1.tar.gz 8733 BLAKE2B 467fa3f341c1d6ea20af059cfa88529a0b3bc729cefac72d5b3c264d3a224e8bfb05a89b5f491a22aaf4c194b72cd27ac103a381adb671d9867ef8fceb41f030 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a
-DIST sgmltools-lite-3.0.3.tar.gz 61342 BLAKE2B 8fcac5b48fcdbb8fbbfdbf8ad055ab00cb3fb6a8447a27bf5b14faef968845554a86f04b4984c1ccc1e26d9c64dc5654d5831896bbc44bd3dee0ef3fc28109e5 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81
-EBUILD sgmltools-lite-3.0.3-r16.ebuild 2556 BLAKE2B 2832e1838b9cce160538d9c57539d9887a2813f68e92dd59e1f14e8d77692be27092c23d27817574b171ac477a12cb56b0bc6ba525065899cc1a9b41d0c1a67d SHA512 6553c2c8ac76f45a6ca5cdbdccf1575071328c041aa2e695b5a5286c4b6695254c854c01409ffa22d65abdd290e72308f94896a965c8f01a44610664d6aefc66
-MISC metadata.xml 459 BLAKE2B 1a92db84d9abf25e81f6d603fe2b37f68106ebd8485fe7df7983881455826f686f4d923065a14c26e316e55f5a2feb9c244af4b520fdac6dd5f555c565dcc4b9 SHA512 6faa350897ac1a1a3e833ed29c039632333f8874ff0b1f139ffa4a8cbdc21e220357d073ee244665c668ed9c959c93bcd9d471056af75f7a825517436942a413
diff --git a/app-text/sgmltools-lite/metadata.xml b/app-text/sgmltools-lite/metadata.xml
deleted file mode 100644
index ccd674f2e5f6..000000000000
--- a/app-text/sgmltools-lite/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mgorny@gentoo.org</email>
-		<name>Michał Górny</name>
-	</maintainer>
-	<use>
-		<flag name="jadetex">
-			Add support for processing tex files produced by the TeX
-			backend of Jade
-		</flag>
-	</use>
-	<upstream>
-		<remote-id type="sourceforge">sgmltools-lite</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r16.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r16.ebuild
deleted file mode 100644
index 508be43372cb..000000000000
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r16.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 sgml-catalog-r1
-
-DESCRIPTION="Python interface to SGML software in a DocBook/OpenJade env"
-HOMEPAGE="http://sgmltools-lite.sourceforge.net/"
-SRC_URI="
-	https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
-	https://downloads.sourceforge.net/project/${PN}/support%20files/0.0.1-1/nw-eps-icons-0.0.1.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="jadetex"
-
-RDEPEND="${PYTHON_DEPS}
-	app-text/sgml-common
-	app-text/docbook-sgml-dtd:3.1
-	app-text/docbook-dsssl-stylesheets
-	app-text/openjade
-	jadetex? ( dev-texlive/texlive-formatsextra )
-	|| (
-		www-client/w3m
-		www-client/lynx
-	)"
-DEPEND=${RDEPEND}
-
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-src_configure() {
-	econf \
-		--datadir='${prefix}/share' \
-		--mandir='${prefix}/share/man'
-}
-
-src_install() {
-	# yes, it does not respect DESTDIR
-	emake install \
-		prefix="${ED}/usr" \
-		etcdir="${ED}/etc/sgml"
-
-	dodoc ChangeLog POSTINSTALL README*
-
-	insinto /usr/share/sgml/docbook/dsssl-stylesheets/
-	doins -r "${WORKDIR}"/nw-eps-icons-0.0.1/images
-
-	rm "${ED}"/etc/sgml/catalog.{suse,rh62} || die
-
-	# Remove file provided by sgml-common
-	rm "${ED}"/usr/bin/sgmlwhich || die
-
-	# List of backends to alias with sgml2*
-	# Do not provide sgml2{txt,rtf,html} anymore, they are part of
-	# linuxdoc-tools
-	local backends=()
-	if use jadetex; then
-		backends+=(ps dvi pdf)
-	else
-		# Remove the backends that require jadetex
-		rm "${ED}"/usr/share/sgml/misc/sgmltools/python/backends/{Dvi,Ps,Pdf,JadeTeX}.py || die
-	fi
-
-	# Create simple alias scripts that people are used to
-	# And make the manpages for those link to the sgmltools-lite manpage
-	local b
-	for b in "${backends[@]}"; do
-		newbin - "sgml2${b}" <<-EOF
-			#!/bin/sh
-			exec sgmltools --backend=${b} "\${@}"
-		EOF
-
-		dosym sgmltools-lite.1 "/usr/share/man/man1/sgml2${b}.1"
-	done
-
-	insinto /etc/sgml
-	newins - sgml-lite.cat <<-EOF
-		CATALOG "${EPREFIX}/usr/share/sgml/stylesheets/sgmltools/sgmltools.cat"
-	EOF
-
-	python_fix_shebang "${D}"
-	python_optimize "${ED}/usr/share/sgml/misc/sgmltools/python"
-}
-
-pkg_preinst() {
-	# work-around old revision removing it
-	cp "${ED}"/etc/sgml/sgml-lite.cat "${T}" || die
-}
-
-pkg_postinst() {
-	local backup=${T}/sgml-lite.cat
-	local real=${EROOT}/etc/sgml/sgml-lite.cat
-	if ! cmp -s "${backup}" "${real}"; then
-		cp "${backup}" "${real}" || die
-	fi
-	sgml-catalog-r1_pkg_postinst
-}
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index 3aecb7d1ff77..ccb3b3a40a8c 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -2,5 +2,5 @@ AUX sigil-1.2.1-qt5.15-fix.patch 1228 BLAKE2B 61c4b8de1d7e6a65668f45b6aadebb7c93
 DIST sigil-1.2.1.tar.gz 21462439 BLAKE2B b615304d80ae1bc8b202398e4e00e25e6f13130ba5f27239d78cb847813fac6d13ddd868ed8daa496b5a5f2f37914603b3014b2c0ecb9f8ae2f0e5f6f2bdf84b SHA512 763648e5c77df9c34568790700f76a1793445f0ba061e2c8c2032c1de72bc5d5c0e0f671d87140df1b4404d571f6c1c73aa99c57208f7383aa2b0d50ed3c15a1
 DIST sigil-1.3.0.tar.gz 21697294 BLAKE2B 0ded5f2fa4a85a583113d268a0c287727faa9548a95ca3b564efac5db3528e0bf52b0df12f88cda46ae02851b0b85967c23c07cd3cd55073a87bcffbae8dec87 SHA512 fe1cbc2591dbfb54a2c561a3c53684447a4e90d944714bb182ee6ef160df74cc886c4d178d88d24a217643099ff9f409048ea2e5bb8ac88746fd280e48daa1b8
 EBUILD sigil-1.2.1-r1.ebuild 2062 BLAKE2B 246ab17ee83adb4f841c772e44402adc01239e6f3130536b6db2cc0546da219650401afca1bb044c611741e9fdcbf348e47acca07786c42bd341b08bf37672c4 SHA512 62da8924b149912b88d998b5c9431b6061e2290627c8d4d138b514132650d1b8c90894f330b5b1391886c919e5f4c0b4a1f8d063e555061152b313420bcb9589
-EBUILD sigil-1.3.0.ebuild 2014 BLAKE2B bded5f0282a62236f4d7f781c4662e18c89d507d537b746101509dc716c82ebe92f61b5a3d89950c31cb89295213d531847fa8f037aaf52236c80d713b038857 SHA512 9af94b73883ae8f6c58372e126848df9d8a3355aac3b4d5a67afd8b653aa33a414c22d4f1edee5a286974b35161a75cc9d1a0602b8bb3acb2b25375c18243d26
+EBUILD sigil-1.3.0.ebuild 2012 BLAKE2B 630aa4dce4218438f0b22179d33def2e62f6683e0c692970a3ac3c9a4dd8ca0d854576613c29231736fee4bf80bb9f73b44de940ad7e5b3c56e971780abc8565 SHA512 413cbfcff215f4d4bf19c8a8ea4bab4a8b86549e448aefa50e4391a289c0fc7e71410dfa342ea52cf9c4a5e72b7d3dbb9350a8f34a147238b8e9189b3dee4002
 MISC metadata.xml 932 BLAKE2B c7bf8b421a098f818c9a394cfe656f49fdf6349d762ca2bea588f24dbb0492ca426673f255dffe57dab54fde53408b6fe74bd2cd3b6bfbf31b9814c331de21ca SHA512 0e5c7366b3e0defbc8675c6a33313f6680bb51bc3b67963e79ff03d2f02aa201e5237af43645d1c0e6eb550fad17ca8f9ada9c85a9c4105ddb7a45ef487f726c
diff --git a/app-text/sigil/sigil-1.3.0.ebuild b/app-text/sigil/sigil-1.3.0.ebuild
index 82de9563cb56..c3e4d3bb5d4e 100644
--- a/app-text/sigil/sigil-1.3.0.ebuild
+++ b/app-text/sigil/sigil-1.3.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Sigil-Ebook/Sigil/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-3+ Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+plugins system-mathjax"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/silvercity/Manifest b/app-text/silvercity/Manifest
deleted file mode 100644
index e6f4c4f799f9..000000000000
--- a/app-text/silvercity/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST SilverCity-0.9.7.tar.gz 278396 BLAKE2B 30419ee4d2cafe56cbfc1b73a3b188214c58e29a154810bed9b837d9fdc6709f7691c1662cc1da0a5eb1b326a430f958d66bb5629ae2f3a3afe2442f2e11957d SHA512 230c4ce61a0dfef36ba63dfa2d290c2368ae0a1055445b1e17cd12ff436ec80ec91e5a8ff47870c19a3f7a50f958ce59bbe5be06aa07dd0bf0a70038ca3150b0
-EBUILD silvercity-0.9.7-r1.ebuild 913 BLAKE2B 5ced5eab8dc1732efca681bbb2ad654a7ac5cde137fe25fb8e402b982ba0274b994485a6a26f4c55d898126e7af3db83549f62e6247fd0a975bdea68ccd90b79 SHA512 f5e69707bdbd9fb7a8acbc30c440c64a88f4f34c81920d4733cef02954edae1bfce17c1a08fa9c4471aad2c43bdbcf274828bea474513d355439cbfb6be726ce
-MISC metadata.xml 330 BLAKE2B dc1e089aa92ecf442d42c3a1dce93b9735a2c58a5fb6488c6825110125e2292c94e6bc0fa6471a56b58e72e6a130162dc77dff3f548f70e470ba628d21b6ff07 SHA512 6ae025cf1a3a56a19a6fbf436c293fe57365e87d11386797f94fd680bd0d044c8c13860670e070af9c1cad7c0a5f6bd4c29468ac5177456d20196844482676bd
diff --git a/app-text/silvercity/metadata.xml b/app-text/silvercity/metadata.xml
deleted file mode 100644
index 624b33e3a10e..000000000000
--- a/app-text/silvercity/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">silvercity</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/silvercity/silvercity-0.9.7-r1.ebuild b/app-text/silvercity/silvercity-0.9.7-r1.ebuild
deleted file mode 100644
index 29e26f3f30bf..000000000000
--- a/app-text/silvercity/silvercity-0.9.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils
-
-MY_PN="SilverCity"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="A lexical analyser for many languages"
-HOMEPAGE="http://silvercity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/silvercity/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-python_prepare_all() {
-	# Fix line endings.
-	find -type f -exec sed -e 's/\r$//' -i {} + || die "sed failed"
-
-	# Fix permissions.
-	chmod -x CSS/default.css || die "chmod failed"
-
-	# Fix shebang.
-	sed -e 's:#!/usr/home/sweetapp/bin/python:#!/usr/bin/env python:' \
-		-i PySilverCity/Scripts/cgi-styler-form.py || die "sed failed"
-
-	distutils-r1_python_prepare_all
-}
diff --git a/app-text/talkfilters/Manifest b/app-text/talkfilters/Manifest
index 2202f00cb095..560814cd3eb5 100644
--- a/app-text/talkfilters/Manifest
+++ b/app-text/talkfilters/Manifest
@@ -1,4 +1,4 @@
 AUX talkfilters-2.3.8-format-security.patch 862 BLAKE2B f8050b5527c9777a2a500611989ee0eaa90fc1360ddb76a659ef334ec97cb3904f5051605bcf6b10dcad8b1b571d0a0001613358f1aa9c1b617a75ee893e6af6 SHA512 b210777c038878cdd06365a13591c723151356864c08bee700005e509b2f0f6aec4819730ca631d401e4cbb9d3dbd3a4a6551f0920819fa6097585ae43f6c8f4
 DIST talkfilters-2.3.8.tar.gz 821338 BLAKE2B 1ed5904829380858e5599458d54d3e7a339c10f057a94ce17f38b330d89ad5aba972cf234c10aa2ed7ffbf67c8b4c01a9bba0ebe73b4ba2bf32230e9e36eda3d SHA512 3fb317c572e95756fea9dcbaeac01e9576b05f5b0710e64513ecd05ec219f8050dec3bc5bc5d0d5f00c642487925765843da03525cfcb23925cab3c321272b28
-EBUILD talkfilters-2.3.8-r1.ebuild 544 BLAKE2B 3f659931c5f6ed6ea139247e737f578bd6236bfae8a9f2d89e3fd83d10e3fd137133b131548c7bf37a540623078f9d60b66aef515c52a766ff1375866f723f18 SHA512 bd4453b8020001e7af1285c370d566d36fedd791cfe79039ea84e7aafdd6ea3bf2cc5297f06159cb5b85a2a946c4e1fafbf8208995126c8d55635585287baaa1
+EBUILD talkfilters-2.3.8-r1.ebuild 648 BLAKE2B 49d1e118817d63c53777a74479ea316a085c255d81f8472251d376616a79e4e8f8bc71b326d351139b5747b0393dbf85111e6b104746822508b1dd864d0d70be SHA512 911738ff8e4511e7b9064e6721935b4addff3f74770088d1efffd04d804242a36ca960fac4af26ae5c41e4f54c2c27ab3e4bf89df9927f19873a0d18131fc4fb
 MISC metadata.xml 957 BLAKE2B 2f66b167131788d1df1195fd9f4d372cfe2ada94c10ad6ce6d0a1bcd28582f3249344ef5733e39838453dca5b54456066ae93e976437e239a4a556982b436426 SHA512 d1b664bff6db93a8289a01b6ef00df35a06207722360ca753853fde6cd667abd739acbbadc9eacb16d46536326c61d6b1673ab50940f778c7ed7c228a082b52e
diff --git a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
index 483918e1ca11..f9e61be4a138 100644
--- a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
+++ b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,6 @@ SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
 PATCHES=(
 	"${FILESDIR}"/${P}-format-security.patch
@@ -21,3 +20,12 @@ PATCHES=(
 src_prepare() {
 	epatch "${PATCHES[@]}"
 }
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/teseq/Manifest b/app-text/teseq/Manifest
index 786bdb8d49d6..2f39cf9ac61c 100644
--- a/app-text/teseq/Manifest
+++ b/app-text/teseq/Manifest
@@ -1,3 +1,3 @@
 DIST teseq-1.1.1.tar.xz 240256 BLAKE2B 657579ba89c2e7cd4cd2e54234d3ae79d9f8d999475a33ba78945da223457a065a631baa397ab06a137cfdfac360d83992a5f39d5bd3b97fd8cd96cf29c68ac2 SHA512 c7747c734e640f7cc607389e001ab2cb9e368b504bd41406eea4dd7ba8bfead79659c68b148e33e797b843e9a46de38d104172303329b88e3fde0266aa1ffd7c
 EBUILD teseq-1.1.1.ebuild 335 BLAKE2B d8ec644e842fd8fd288f83e214497534cbce055654e63c998ece6dcf8f6b2690bf4433be5b8940439c2a7aa3fc7dadf1e0aae3138865f316f022d2062ba22e53 SHA512 25033bf62d9ec10a6078fa383fffb86bad4a4bb2bd2a8feaf7f05c1ac3ef435e26b47b568e69514254185ba69e2c755e6a05a248c28f7c3b0578feb7ef885af2
-MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/teseq/metadata.xml b/app-text/teseq/metadata.xml
index 5ba62861f1c4..6f49eba8f496 100644
--- a/app-text/teseq/metadata.xml
+++ b/app-text/teseq/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/app-text/tofrodos/Manifest b/app-text/tofrodos/Manifest
index 3633599c75b4..79fe4ef6a6e5 100644
--- a/app-text/tofrodos/Manifest
+++ b/app-text/tofrodos/Manifest
@@ -1,5 +1,4 @@
 AUX tofrodos-1.7.13-CFLAGS.patch 192 BLAKE2B a83cb40a82e2034820315423d4da8dd800cbf5c5e3f5e50c04e7d489e5b68c471c19c846ae40db4f69c2568d03ce79640e8bb5b6438c6dcaebbfb0f1d103067e SHA512 137b0d00edd1a534eba7a415b46ddc455eb5954a06148ca2132579bcca859b18b642deeb6e5bc364e1ec1824a5f0d72512de58109acbbad2ba958b6071aa9723
-AUX tofrodos-1.7.8-CFLAGS.patch 306 BLAKE2B 4e3b3ec28cb47d758d053394c4a0c806f27bc2bb97f0b715e85c21c6c3646924fcdb0b520dd819460f84c787a5852e0aab3ff67479c16dd959aa202b3c04711d SHA512 d96573638ba4cc4c3413ad42b903a08ac84286571317097aabcba7dfc69f794e53601154b5faf3e19ca0833377a742df745209ae3958ec9e7d2895e13bce5b2d
 DIST tofrodos-1.7.13.tar.gz 99975 BLAKE2B 677b5cf7b1ef061b86a60229e083dc19ddcb7887b1319685ccd5a50493c1f02feb8556db3c2866f3ca1851304d0e97592a8abdd880a5f4e70eb7032f4238445d SHA512 629804caf20ac7bfc6f47637b7bc575766f032e324142df3be14347f050c61d969e023f8fed0ce5c87d8fc57b25c60c4e0214600738c5079d5e731045dae4843
 EBUILD tofrodos-1.7.13.ebuild 678 BLAKE2B 506e4bffe84c7af833a70ba1db010c57e097ac17aded77c4d222e1bfc6bb78ef23d77008f96ecd7e3069b0a211bff3de87b350c932dd054176d7bb7ee2e4c9e1 SHA512 43401bdad6358fc79d96015dae8df3dbfdfaee3c02535fe6540660e7f9b6c07eace732df3aaf29864f48d003cee0768d29c3f7b75cf2be5a81f842ef8d5e391a
 MISC metadata.xml 325 BLAKE2B 89b80fe9769278e73ae9aaeea66f6037a6321f25725f6645a0b02220d1ba06a18213bdf71a2d7676150d75f58ba67ad79a4f4f5fe8c8ba7e5dd4d95054c0e45f SHA512 d32c6a8e3e9bd397896145130afc1328ed86f507af35e2ab5b0a9b385462624542728178a06530af5cda863aee10e961bf3d189fbe3d1cf64619ba3d0a8f0b8b
diff --git a/app-text/tofrodos/files/tofrodos-1.7.8-CFLAGS.patch b/app-text/tofrodos/files/tofrodos-1.7.8-CFLAGS.patch
deleted file mode 100644
index 5aa0e8358565..000000000000
--- a/app-text/tofrodos/files/tofrodos-1.7.8-CFLAGS.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- Makefile.original	2009-04-11 22:46:08.000000000 -0600
-+++ Makefile	2009-04-12 14:30:55.000000000 -0600
-@@ -92,14 +92,10 @@
- OBJS =	emsg.o \
- 	init.o \
- 	tofrodos.o \
- 	utility.o
- 
--# implicit rules
--.c.o:
--	$(CC) $(CFLAGS) $<
--
- # user visible rules
- all: $(FROMDOS) $(TODOS)
- 
- clean:
- 	$(RM) $(OBJS)
diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest
index d7d49492f2ac..c0288a5e359e 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -1,3 +1,5 @@
 DIST txt2tags-3.3.tar.gz 261417 BLAKE2B 6070c23faafc9283e48efdab165c9a0050703d5d04a5ce557afc693161af5e1105435ddb9c991c0e8ef5dbd1e6d25f77c915e8be3f349b790636c904df7553f3 SHA512 a52de3f5226d85af006304a9063b5dd01df2627a45670a91b954f758cb920648f86699acab5cd7822c0183e93eed110ddc7dd8d156b0eccbe1541e7fbc2bdb22
-EBUILD txt2tags-3.3.ebuild 514 BLAKE2B 9c8f5e2adaa6362cb62ceddefb156e69a04bb26fe0568477d228f6c1134027caa909fe4d5ce9c78e2a18ce4bff076790225d8489f9c0883ce71cfe6321d3e471 SHA512 c03da7aa20627b69eb300f0ee465dacaa9d7caedfef925908bea9a310a346e4beea68f81fa76951fdd9b1a82e371b154128071ca25854141757993402a5b501c
+DIST txt2tags-3.7.tar.gz 248392 BLAKE2B cad49f9815f2e8e466a0fa83715eee27c16cc67fac4c0c55324a3ebc22707857a4bb59176b62fbc1a922c465f60dbc6a057b326789f82a9a9b4babb7b8041486 SHA512 70f6b72b9555b881149e29581a200bf5195d740ca134fffb9faab3a8a04909173f40fe7758659bde44efa9aa50e9816e7164d8164f84b2046de500a49906072b
+EBUILD txt2tags-3.3.ebuild 542 BLAKE2B 2c4d3d8baf02068f7e616cff10f714cf9075620f876a3801db2f767cb2bc9a10565847607482e19cc19e918c3bdbd942004ba914f80e36356498fd808a4bb4d2 SHA512 4b5c17e1d3ca3ca848e7f87c28984c322f747291d5762aa865559c7b5be594a1b053d75fdb6999b7216b9f51330bd76f5a4cb67c41308daa0ce42279c0876a21
+EBUILD txt2tags-3.7.ebuild 541 BLAKE2B 0fa081196b5c005f4df20d707d424c768f14c25cd2d81bcd36f7e0c83838f76b0b8e5e27e46cd8579592e405d41ad34655e515ef94d46af2b30c9084a57d0c92 SHA512 27b61c88b23dbf8d1b957bfbbe5e2eb32a71e6012d3ce12f7abe8b3da99bd039b249ce9431f2e00b35a60f41cc940ec4c6e417c98cd712711bb563269c2a8e71
 MISC metadata.xml 245 BLAKE2B e2a831e97b1c75aa3e161109943ede73b2d686a83fbb11b84d3f201c8214b997d759c93298c2d7f14a6a8486443cc52ea9369fc12476747528509d9d8807b1c9 SHA512 4fa0282e97338eef99cd0be8c2cda4a5eb6d6c1393a41782a45ad172c9b99690d572598f3de81f5828ab568fe32d4b28890c22908f86c73ac8e399837f28fddb
diff --git a/app-text/txt2tags/txt2tags-3.3.ebuild b/app-text/txt2tags/txt2tags-3.3.ebuild
index 48eab7803a3d..83374fa38499 100644
--- a/app-text/txt2tags/txt2tags-3.3.ebuild
+++ b/app-text/txt2tags/txt2tags-3.3.ebuild
@@ -4,14 +4,14 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{6,7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 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"
+SRC_URI="https://github.com/jendrikseipp/txt2tags/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/txt2tags/txt2tags-3.7.ebuild b/app-text/txt2tags/txt2tags-3.7.ebuild
new file mode 100644
index 000000000000..38feaf39ef12
--- /dev/null
+++ b/app-text/txt2tags/txt2tags-3.7.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup"
+HOMEPAGE="https://txt2tags.org"
+SRC_URI="https://codeload.github.com/txt2tags/txt2tags/tar.gz/${PV} -> ${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"
diff --git a/app-text/unrtf/Manifest b/app-text/unrtf/Manifest
index 252137bd890f..dc7de37520f7 100644
--- a/app-text/unrtf/Manifest
+++ b/app-text/unrtf/Manifest
@@ -1,5 +1,3 @@
-AUX unrtf-0.21.8-automake-fix.patch 191 BLAKE2B ca81dbbebd8ab2ae786e6291018ecae848ee79a0193c0c176e15052712363f196776b2014a83a2f294d718528588251087c896c87f24335dc4f1fcaf76b926a3 SHA512 7df52c8bc5a6955096fdb3a0e2c151ecec8226c4f703a7d6095f9ca4e4507084b0b0a97b10d853b5da0e27b01bb4e73a6080aec35e5fef14fb015c36bed222ad
-AUX unrtf-0.21.8-iconv-detection.patch 301 BLAKE2B 53d3125d59e44da9c539a13f76d99828be94261e61e367c3582da17cb8625caa75accdd38bfb59b6a7e15a3879ed8ecaf62df3ff26d5e757a86f963ef6c3094f SHA512 57d51baa1160b772896a7fa2ce88c5ea70110d2d7edf6cac121d86849e7352e34ff0cb684161ef9a68e96e886beb6072323c9a66517691e42dce852e04035ca0
 DIST unrtf-0.21.10.tar.gz 812696 BLAKE2B 3edc654feee461bb785877c3c3829462b9f55556e352bd12a19e426911336e161431badf5fdf5e00b0c488ca1804a0922ac7eb6980ebec58232112f6cf156f34 SHA512 31bedd1a23a052c1235e1328a12b346a0fe48b3f3cf78d72c068fe0d3edf18bc78f4c9dfe2f093ee8b4f3c79e923c6ceda49bc257d191dd5371f9273809343c9
 EBUILD unrtf-0.21.10.ebuild 410 BLAKE2B cd3520f0d3fc77ae683afe34210b2cd6c93d293274aa944f9f23df3c2d19b4856fc95525e2c8a82f0d72974eba1db24ec3704f866cf1e7af629826a231821ae9 SHA512 749fdba434a8788d2ede21351de8d5fa09119b3bfd4c1652ad8e0053ea7480243b7e845ae07026de447e4e9abbaf682a510f883a01d456cee280ce35f39466c4
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-text/unrtf/files/unrtf-0.21.8-automake-fix.patch b/app-text/unrtf/files/unrtf-0.21.8-automake-fix.patch
deleted file mode 100644
index fdfb52a4637b..000000000000
--- a/app-text/unrtf/files/unrtf-0.21.8-automake-fix.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- unrtf-0.21.8/charmaps/Makefile.am
-+++ unrtf-0.21.8/charmaps/Makefile.am
-@@ -1,2 +1,2 @@
--outputsdir = ${libdir}/${PACKAGE}
-+outputsdir = ${pkgdatadir}
- dist_outputs_DATA = SYMBOL.charmap
diff --git a/app-text/unrtf/files/unrtf-0.21.8-iconv-detection.patch b/app-text/unrtf/files/unrtf-0.21.8-iconv-detection.patch
deleted file mode 100644
index d5bb142ce558..000000000000
--- a/app-text/unrtf/files/unrtf-0.21.8-iconv-detection.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- unrtf-0.21.8/configure.ac
-+++ unrtf-0.21.8/configure.ac
-@@ -46,6 +46,7 @@
-     *-*-cygwin*)	AC_SUBST(LIBS, ["-liconv"]);;
-     *aix*)		AC_SUBST(LIBS, ["-liconv"]);;
-     *-*-darwin*)	AC_SUBST(LIBS, ["-liconv"]);;
-+    *-*-solaris*)	AC_SUBST(LIBS, ["-liconv"]);;
- esac
- 
- AC_CONFIG_FILES([Makefile
diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
index 952415ee10f3..d7e0e0706141 100644
--- a/app-text/vgrep/Manifest
+++ b/app-text/vgrep/Manifest
@@ -1,7 +1,12 @@
+AUX vgrep-2.5.0-remove-sudo.patch 293 BLAKE2B ea7e903326134859f2d278d568fd02dd13c75442fb27d9261105638bf6597c5fed819ceb834b50edf57925bb614b57716e3c2ae035bd7552584f27276cde9395 SHA512 8879a73a4afa8b2058409311e6b4a8862f853b6eba1edaa158aefaccef58da32f1067c61f359dc6e5fa8223d4c11a3df126b81c366739c6c0ea5412e4388d29e
 DIST vgrep-2.3.1.tar.gz 1149421 BLAKE2B c4c9a414bba5e509d57faa9ca6f6ce5cae1dbb001ff8b410ad54691ec6bf39f41c535fd25bdd5d93fdf89b4e4b49acf4dfa9a8956653e5c5e2ce39bd7da8d484 SHA512 0fa65151ae40f7fefc4e5b1af8e6ea332b50b1136849ec0902dd110786ca14204441e27c65a036b08fa56bf04a6325d8aa8ef2d4d02cdb0e0fe219896e24d694
 DIST vgrep-2.3.3.tar.gz 1149769 BLAKE2B 59f15e0f2d9fd069b4926cb26a0517cb1d201dccce53d7c6b3ec1954693a3286396e8d4d72e2c3bcc4bb8e70083ba1ea349dfc4bec244caa112fcc2289063c25 SHA512 b745ec24bb5c329a3d0e4e756e54432f3acf9c24f9492339b69850d5a8e688074323d7e56c584e59f3aedf3a41b84997497791512dae2950424eaed56d6b7329
 DIST vgrep-2.4.0.tar.gz 1196159 BLAKE2B f8b6b8166feb17ddeea7978ff14fd729ee395feb9658cbfc838f978f33169c7ca15dcd4008af54582aca25a0803924c508da11603d02e42d1e597a5813f78c3b SHA512 c614b52fe7fa720d3d2bb57830805c1ebb7c47db549aadda9309676b9c286447e693e51f74f969ccd0450934510bfe79c1603717022dd69c9f7f2709cbfd4465
+DIST vgrep-2.5.0.tar.gz 1355064 BLAKE2B 7a724fed16ec4589ace159dd5dcbea8e4450393f2c356430d9e8e87b799191b06137e20f2d0c32c53b71ff79d5abaa5551f6254ef6989631d9f6b9d771a5fe18 SHA512 95ee8ff1ca705cec8deaabf8e20d39df23dbac1ab797d025ca253904bcb7f4cbedda3ef052d006064c8d652c06b50cc3e5e532108b23a95511ee7b85b8abb3d4
+DIST vgrep-2.5.1.tar.gz 1355092 BLAKE2B 82b9da137400ede07b3fc2472168139385df8ee639aa0ba34832d20e437ac3da5a86f89fcc9139faa0ca3a037a358a50947b982473d114056483aaf9cfdde52e SHA512 97561ac933fa8a716c9205910d088bf0bb852f2d68ea2226e27e30b5885aabd37223ec4368d72cd0ae5c72735e273004bd054a2b633e61ecb7fd854254cfaecd
 EBUILD vgrep-2.3.1.ebuild 656 BLAKE2B 8d1ec68257d10e042ec75ca12b8f8a0df43f7ecb92ae3be1dffed18cbb326e713b95e460b3c630919b40ec51af30dbe71f82e0f011381b2ba8ce754cffd7e45c SHA512 254a81ae86eed74e50457ebe1041eb526340c6f9075044a68853d802d7f2d724791790b5912db9eae76e3180046d0ef7f4aef253623eb8d0f0c43a20310ab5b8
 EBUILD vgrep-2.3.3.ebuild 656 BLAKE2B 8d1ec68257d10e042ec75ca12b8f8a0df43f7ecb92ae3be1dffed18cbb326e713b95e460b3c630919b40ec51af30dbe71f82e0f011381b2ba8ce754cffd7e45c SHA512 254a81ae86eed74e50457ebe1041eb526340c6f9075044a68853d802d7f2d724791790b5912db9eae76e3180046d0ef7f4aef253623eb8d0f0c43a20310ab5b8
 EBUILD vgrep-2.4.0.ebuild 656 BLAKE2B 8d1ec68257d10e042ec75ca12b8f8a0df43f7ecb92ae3be1dffed18cbb326e713b95e460b3c630919b40ec51af30dbe71f82e0f011381b2ba8ce754cffd7e45c SHA512 254a81ae86eed74e50457ebe1041eb526340c6f9075044a68853d802d7f2d724791790b5912db9eae76e3180046d0ef7f4aef253623eb8d0f0c43a20310ab5b8
+EBUILD vgrep-2.5.0.ebuild 741 BLAKE2B b84a646cab1567983482132464b41a6adfaa29963a36e2bc3381efd8c0ba4164217e03b2df9d9ea2c2852368f26eabaf3d3cc230a6cbbae175ed3e26a73716e4 SHA512 191ebb96d53388ce332a205d2dcc4070a6b676b8c2c4f5a4489f47458cbaec8eff83d5191a477fb83880be1598afa0e1f17bd0078e1a25674896bda39cdbdacb
+EBUILD vgrep-2.5.1.ebuild 684 BLAKE2B b4f4d2c4d18340ebe2f481055097975ac3479a5303b0d2d0b4b55aa87e7876ec6c4f3619064afb4916b3bf408863cf2d632ac18d413a91385adf3a8eaf4a5934 SHA512 4fa96a4333593bc247ad8c072d3b75845a5f343da687e09c923f86d5bea3da2d1ea953b225ba327d24f099a7c4ad69de6b49de5b4954dfea836095d393944d8e
 MISC metadata.xml 394 BLAKE2B 52d95eb8f47c5002203258b8077e0104423472b1f4bdae387fa8194b5056fd4986a9b795d0bbaa7939497ce45ff2ee0ca90e1c44ebeaf31b40725b36ddf1390a SHA512 9f44f00b50a654d27819e20172dc338d3dac8abcdac3933df88153156871612e1c414dcc5b0590795eb58c972302c3b54546b7dbbd539ca60737bcfa5a8989f3
diff --git a/app-text/vgrep/files/vgrep-2.5.0-remove-sudo.patch b/app-text/vgrep/files/vgrep-2.5.0-remove-sudo.patch
new file mode 100644
index 000000000000..25764d199b45
--- /dev/null
+++ b/app-text/vgrep/files/vgrep-2.5.0-remove-sudo.patch
@@ -0,0 +1,15 @@
+https://github.com/vrothberg/vgrep/issues/130
+
+--- a/Makefile
++++ b/Makefile
+@@ -113,7 +113,8 @@ install: install-docs
+ 
+ .PHONY: install-docs
+ install-docs: docs
+-	sudo cp docs/*.1 ${MAN_DIR}/man1/
++	mkdir -p ${MAN_DIR}/man1/
++	cp docs/*.1 ${MAN_DIR}/man1/
+ 
+ .PHONY: uninstall
+ uninstall:
+ 
diff --git a/app-text/vgrep/vgrep-2.5.0.ebuild b/app-text/vgrep/vgrep-2.5.0.ebuild
new file mode 100644
index 000000000000..3875d5478206
--- /dev/null
+++ b/app-text/vgrep/vgrep-2.5.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit go-module
+
+DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
+HOMEPAGE="https://github.com/vrothberg/vgrep"
+SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Uses golangci-lint
+RESTRICT="test"
+
+BDEPEND="dev-go/go-md2man"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}"/vgrep-2.5.0-remove-sudo.patch )
+
+# go binary
+QA_PRESTRIPPED="usr/bin/vgrep"
+
+src_compile() {
+	emake build
+}
+
+src_install() {
+	local prefix="${D}/usr"
+	mkdir -p "${prefix}"/bin || die
+
+	emake PREFIX="${prefix}" install
+}
diff --git a/app-text/vgrep/vgrep-2.5.1.ebuild b/app-text/vgrep/vgrep-2.5.1.ebuild
new file mode 100644
index 000000000000..6b7efaf86cf6
--- /dev/null
+++ b/app-text/vgrep/vgrep-2.5.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit go-module
+
+DESCRIPTION="A pager for grep, git-grep and similar grep implementations"
+HOMEPAGE="https://github.com/vrothberg/vgrep"
+SRC_URI="https://github.com/vrothberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD GPL-3+ MIT MIT-with-advertising"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Uses golangci-lint
+RESTRICT="test"
+
+BDEPEND="dev-go/go-md2man"
+
+DOCS=( README.md )
+
+# go binary
+QA_PRESTRIPPED="usr/bin/vgrep"
+
+src_compile() {
+	emake build
+}
+
+src_install() {
+	local prefix="${D}/usr"
+	mkdir -p "${prefix}"/bin || die
+
+	emake PREFIX="${prefix}" install
+}
diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index 803e72d89c34..a1b39716c3e3 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -7,8 +7,12 @@ AUX vilistextum-2.8.0-gentoo.patch 278 BLAKE2B 6fc580c02c38bd65855ff5866555360c6
 AUX vilistextum-2.8.0-list-alignment.patch 827 BLAKE2B cbe9415e3d807c247531c3b81537aa76fd3b25d9930a41cd4506434246cab2b820803fdb9f4ef9ed0ffdaae23e52b186c1f39b74ba80dc0a230bc7db90962180 SHA512 29b3657d999106cd4fb4b4d539c8a977271d4f526551dddc7f5370363c8c3914a277f54950a06657994d9c7574d5f659f9ff248d1ebd560a3783f9a0c28df2a6
 AUX vilistextum-2.8.0-prefix.patch 784 BLAKE2B 4aeab8e91012cc1302aa7a94337069973c9cea8b179658f30346f3d95bb9d0a351e1430666d6465888432fb74e3454d2eaadedbd8af64e2b57cfe00e9633c65e SHA512 95a92905c68e357c40f64696cf20c9639bed5da3c651c75df803eef4c991bb56424893a40a2a9ca80a9e66a16e1e986d0589dd43d751130146697348c5b0205f
 AUX vilistextum-2.8.0-towlower.patch 274 BLAKE2B b6c043049bf6d928ecb147465aeff6ac959c3320b76ff92c6ebfffb9dda0d8719fe1c1d5dded60e00e6a10a3fab9f177ccbfc053c9daee81b7a95d6ba29044e1 SHA512 3283ebd7694be279f9956df31f6b1e62de3f674f3af0a6d4d5cc139f2cc04c3be322d103faaf1bf0f9845dbcc2f9a12e89d49178df48c90020267fec73f2ecd5
+AUX vilistextum-2.8.0.20200411-blockquote.patch 4500 BLAKE2B 1f1c996181771b20b9570d4f7cc322f773590943470d10021820a84acd9fbfb48e496506b42df2ec2b2c05a214953ab854d70b777289639de9f26346e4b815c8 SHA512 5d280336f9bc3363d35d5136fe6a5cbcdb08cc90ff8826063ce9f594fc241b4f7db94852aba6cf278a34872a9abf55693f04ac01b0f191045792114473857dd8
+AUX vilistextum-2.8.0.20200411-list-alignment.patch 855 BLAKE2B e23391c5e3e33d05fa17403dacf027e066e5fb75cd62a2707ddf10edd45c16c71ed591a99f3d99939258718591e747bce38cfaa1ca8303cb63401828afc52bb4 SHA512 b5674a76b8ca6f63b2dd30f273219767fe3863ee16eb0d63a0c675334ca9f2b99d059c3276f31473efb1576bc0ed8a6546f37d278130902ddd4c1efa0e1e4549
 DIST vilistextum-2.6.9.tar.bz2 147743 BLAKE2B 1cf6f187cb277271ddd9946984afb4d59336ea0cd446e62df3593070ccc63b3510a107e2b7e7b8dc757c63e4f5caf3790c7d998b6be325f4d22d2a6b9fea3432 SHA512 ce76a4061b766e4544d1a86986333314a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d
 DIST vilistextum-2.8.0.20191023.tar.gz 219395 BLAKE2B 5e3962b4b18b9e6e3896f26e04a63394b3ed58473862f264a3255641b5d13474e12529acadcff3d2f71eb5a41ec7b11a1367f3da15e473551e87e554472f6727 SHA512 99023b4801159047e1433dc5a887e6164192f7aa25bdc79594e717f047f83177612e5120d55cbbc22f3ad4e225bc229a0b186f7fc337c6081ff27ac781422f4e
+DIST vilistextum-2.8.0.20200411.tar.gz 219791 BLAKE2B 95b86d17e8dbf29b520aa48c88eb8c9e8abb01a234848ed55bdad0a63a7c0ec8ca9ae7c437fe7f84bbf7f4dad74fc8437a9e3b53493552e9e01b8029b10ef18a SHA512 40a219ebe7bebd61548a3bad794690cf091b67b70e8e6c44548a0c1b9f61077b141a035335e7128b191a8501103707f5324b00326a407e29ec0fee383c4d0917
 EBUILD vilistextum-2.6.9-r1.ebuild 1806 BLAKE2B 9692e921e5f06d757f4b47c753829e2439135eea8727fc6dc9900842abe0e991ad312fb30381d8b7e248fdcbd979f35bc18492cbd11ffb444d64d6ade0e7d997 SHA512 261bc0e2152ac048f39508c57e5affda589df7ed5d53cd2e204adcbcd636bda4cd67753ae88e4a6a48e855b4f0e0ed90ab8b9f3fbd8e368bcdb840e5e5780fce
 EBUILD vilistextum-2.8.0.20191023-r1.ebuild 2053 BLAKE2B 41e02bcc3319ec55627824665b66b09c1892bda67ef6ec5964eac3aaea0b144ac8f89b3528753383a51d5c3127c4145bc2204e388ee886d367891951c3ea3e1e SHA512 72a7041a04141e6b3dcb27c03c546e898c0926f3e6164f731b17a3aaea34b62b749c0c63c8c0c0d57ea71cace8e6a86f9baac036bc97dce991cd0fd76c97e6e3
+EBUILD vilistextum-2.8.0.20200411.ebuild 2024 BLAKE2B 9417906045d9e0db48e70fbed1955638d07534432c481e0f0f1612929f0e8ace58e60a8a372662ff21c00c4b93e85efd6bf25ad75ad62352535d2d09e45a31bb SHA512 40566437e477aa0945e7abf4aebf1c40eaeca526b8545cf4cb9d7226674151c556a30c7376190ef83bacc95d0a2acecd52bc658036ddf1def6625cfc5032e5af
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0.20200411-blockquote.patch b/app-text/vilistextum/files/vilistextum-2.8.0.20200411-blockquote.patch
new file mode 100644
index 000000000000..c8a7da2c212e
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0.20200411-blockquote.patch
@@ -0,0 +1,120 @@
+Many clients seem to use blockquote tags to flag quotes these days, so
+write them out as quotes, so they remain readable.
+
+--- a/src/html_tags.c	2019-10-23 16:25:27.000000000 +0200
++++ b/src/html_tags.c	2020-02-05 20:11:57.308596941 +0100
+@@ -261,6 +261,7 @@
+ 		line_break();
+ 	} else {
+ 		start_p();
++		quote++;
+ 	}
+ } /* html_pre */
+ 
+@@ -271,6 +272,7 @@
+ 		line_break();
+ 	} else {
+ 		paragraphen_ende();
++		quote -= quote != 0;
+ 	}
+ } /* html_pre_end */
+ 
+--- a/src/multibyte.h	2020-02-05 20:08:43.863715764 +0100
++++ b/src/multibyte.h	2020-02-05 20:12:34.401382354 +0100
+@@ -18,6 +18,7 @@
+  #define ATOI(n) wcstoi(n)
+ 
+  #define ONESPACE L" "
++ #define QUOTE L">"
+  #define WORT_PLUS_STRING(str) wort_plus_string(L##str)
+ 
+  #define STRSTR(haystack, needle) wcsstr(haystack, L##needle)
+@@ -43,6 +44,7 @@
+  #define ATOI(n) atoi(n)
+ 
+  #define ONESPACE " "
++ #define QUOTE ">"
+  #define WORT_PLUS_STRING(str) wort_plus_string(str)
+ 
+  #define STRSTR(haystack, needle) strstr(haystack, needle)
+--- a/src/text.c	2019-10-23 16:25:27.000000000 +0200
++++ b/src/text.c	2020-02-05 20:16:04.852164539 +0100
+@@ -28,6 +28,7 @@
+ int breite=76,
+ 	hr_breite=76,
+ 	paragraph=0,
++	quote=0,
+ 
+ 	tab=4,         /* tabulator */
+ 	spaces=0,      /* spaces at beginning of line */
+@@ -378,6 +379,12 @@
+ 			printf(" z0: zeilen_pos: %d\n",zeilen_pos);
+ #endif
+ 			print_zeile();
++			if (quote > 0)
++			{
++				i=0;
++				while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
++				zeile_plus_wort(ONESPACE,1,1);
++			}
+ 			i=0;
+ 			while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
+ 			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
+@@ -398,6 +405,12 @@
+ 			printf(" z2: zeilen_len: %d\n",zeilen_len);
+ 			printf(" z2: zeilen_pos: %d\n",zeilen_pos);
+ #endif
++			if (quote > 0)
++			{
++				i=0;
++				while (i<quote) { zeile_plus_wort(QUOTE,1,1); i++; }
++				zeile_plus_wort(ONESPACE,1,1);
++			}
+ 			i=0;
+ 			while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
+ 			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
+--- a/src/text.h	2019-10-23 16:25:27.000000000 +0200
++++ b/src/text.h	2020-02-05 20:18:40.792261818 +0100
+@@ -26,6 +26,7 @@
+ 
+ extern int tab;
+ extern int spaces;
++extern int quote;
+ 
+ void print_zeile();
+ int is_zeile_empty();
+--- a/tests/test_functions
++++ b/tests/test_functions
+@@ -12,6 +12,9 @@
+   rm -f testcases/$prefix.output.test
+   ../src/vilistextum 2>/dev/null $args testcases/$prefix.html testcases/$output_prefix.output.test
+ 
++  # remove (block)quotes
++  sed -i -e 's/^>\+ //' testcases/$output_prefix.output.test
++
+   diff >/dev/null testcases/$output_prefix.output testcases/$output_prefix.output.test
+   retval=$?
+   if [ $retval -ne 0 ]; then
+--- a/tests/testcases/utf-8-sampler.output
++++ b/tests/testcases/utf-8-sampler.output.test
+@@ -100,8 +100,8 @@
+ ვეპხის ტყაოსანი შოთა რუსთაველი
+ 
+ ღმერთსი შემვედრე, ნუთუ კვლა დამხსნას სოფლისა შრომასა, ცეცხლს, წყალსა და
+-მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას ჩემსა
+-ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა.
++მიწასა, ჰაერთა თანა მრომასა; მომცნეს ფრთენი და აღვფრინდე, მივჰხვდე მას
++ჩემსა ნდომასა, დღისით და ღამით ვჰხედვიდე მზისა ელვათა კრთომაასა.
+ 
+ Tamil poetry of Cupiramaniya Paarathiyar: சுப்ரமணிய பாரதியார் (1882-1921)
+ 
+@@ -446,7 +446,8 @@
+ д, п, and/or т:
+ 
+  Bulgarian:    [ бгдпт ]    [ бгдпт ]     Мога да ям стъкло и не ме боли.
+- Russian:  [ бгдпт ]    [ бгдпт ]    Я могу есть стекло, это мне не вредит.
++ Russian:  [ бгдпт ]    [ бгдпт ]    Я могу есть стекло, это мне не
++вредит.
+  Serbian:  [ бгдпт ]    [ бгдпт ]     Могу јести стакло а да ми не шкоди.
+ 
+   ------------------------------------------------------------------------
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0.20200411-list-alignment.patch b/app-text/vilistextum/files/vilistextum-2.8.0.20200411-list-alignment.patch
new file mode 100644
index 000000000000..65541b7a74f0
--- /dev/null
+++ b/app-text/vilistextum/files/vilistextum-2.8.0.20200411-list-alignment.patch
@@ -0,0 +1,43 @@
+--- a/src/lists.c
++++ b/src/lists.c
+@@ -74,6 +74,7 @@
+ 	}
+ 
+ 	spaces += tab;
++	orderedlist++;
+ #ifdef proc_debug
+ 	printf("start_uls() ende\n");
+ #endif
+@@ -82,6 +83,7 @@
+ void end_uls()
+ {
+ 	spaces -= tab;
++	orderedlist--;
+ 	line_break();
+ 
+ 	if (bullet_style=='%') { bullet_style='$'; }
+--- a/src/text.c
++++ b/src/text.c
+@@ -387,7 +387,11 @@
+ 			}
+ 			i=0;
+ 			while (i<spaces) { zeile_plus_wort(ONESPACE,1,1); i++; }
+-			if (orderedlist>0) { zeile_plus_wort(ONESPACE,1,1); }
++			if (orderedlist>0)
++			{
++				i=(spaces%tab) + 1;
++				while (i>0) { zeile_plus_wort(ONESPACE,1,1); i--; }
++			}
+ 			zeile_plus_wort(wort, wort_len, wort_pos);
+ 		}
+ 		else if (zeilen_len != 0)
+--- a/src/text.h
++++ b/src/text.h
+@@ -27,6 +27,7 @@
+ extern int tab;
+ extern int spaces;
+ extern int quote;
++extern int orderedlist;
+ 
+ void print_zeile();
+ int is_zeile_empty();
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
new file mode 100644
index 000000000000..dd8c207c466e
--- /dev/null
+++ b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic
+
+GITID="06cc8a637efd9097af4f138b1b7c755120ffaa88"
+DESCRIPTION="HTML to ASCII converter programmed to handle incorrect html"
+HOMEPAGE="https://bhaak.net/vilistextum/"
+SRC_URI="https://github.com/bhaak/vilistextum/archive/${GITID}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${GITID}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="unicode"
+
+DEPEND="virtual/libiconv"
+RDEPEND=""
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-2.8.0-prefix.patch"
+	eapply "${FILESDIR}/${PN}-2.8.0.20200411-blockquote.patch"
+	eapply "${FILESDIR}/${PN}-2.8.0-towlower.patch"
+	eapply "${FILESDIR}/${PN}-2.8.0.20200411-list-alignment.patch"
+
+	eapply_user
+	eautoreconf
+
+	# wcscasecmp needs extensions, which aren't enabled
+	export ac_cv_func_wcscasecmp=no
+}
+
+get_locale() {
+	locale -a | grep -i "$1\.utf.*8\$"
+}
+
+find_locale() {
+	local l t
+
+	# we basically prefer to find en_US.UTF-8, but it may not always be
+	# available, in which case it is better not to hardcode to use it
+	l=$(get_locale en_US)
+	if [[ -z ${l} ]] ; then
+		for t in "en_GB" "en_.*" ".*" ; do
+			l=$(get_locale ${t})
+			if [[ -n ${l} ]] ; then
+				l=${l%%$'\n'*}
+				break;
+			fi
+		done
+	fi
+	[[ -z ${l} ]] && die "Failed to find a unicode locale"
+	echo "${l}"
+}
+
+src_configure() {
+	# need hardwired locale simply because locale -a | grep -i utf-8 | head -n1
+	# isn't always returning the most sensical (and working) locale
+	econf \
+		$(use_enable unicode multibyte) \
+		$(use_with unicode unicode-locale $(find_locale))
+}
+
+src_test() {
+	if $(locale -a | grep -iq "en_US\.utf.*8"); then
+		emake -j1 check
+	else
+		ewarn "If you like to run the test,"
+		ewarn "please make sure en_US.UTF-8 is installed."
+		die "en_US.UTF-8 locale is missing"
+	fi
+}
+
+src_install() {
+	default
+	doman doc/${PN}.1
+	dodoc doc/changes.xhtml doc/htmlmail.xhtml
+}
diff --git a/app-text/wscr/Manifest b/app-text/wscr/Manifest
index 1227db98e1a2..48794d42e33e 100644
--- a/app-text/wscr/Manifest
+++ b/app-text/wscr/Manifest
@@ -1,3 +1,3 @@
 DIST wscr-1.2.tar.gz 3502 BLAKE2B 4a6684dd6d9eb9c23caa92f9ddf62332f59b20eb4aba0f475015ddc7e66c592177b0d15ec25249fed86e2302a53463f59d608bd727d97bc33a42d903ecd04281 SHA512 8a26c7fb190f830f6436240fc00dcf61405b1818ff311999e02c64b3506fa6abf13a6f212dbb9b15794ecae4f122def563f9301eebdd7e8d09f22cd647467ee3
 EBUILD wscr-1.2-r2.ebuild 615 BLAKE2B 18ec7f574e279bd960b9609673ce34af861c6aa390f4a238f89f82a7ec56f0c297029142ac08e4a20dc9baf8a43eaf74a800b954c1369dd7bb242a118f7e36e7 SHA512 945b79643488740ce22f6e255a61b7618bcdeeb6c7f8bfa06f0c2b51f4a9fafb152de0376bf322ea6136ae8deef602369a93f2f6fc72208f5dd59d4a27c43190
-MISC metadata.xml 421 BLAKE2B dd48a7b914e790db0db06781519466d05de32f96ff8399e9fcb24ff040119dcec5380677910d9155c611c28203ac1ee7bf5d9602faeed69d4bff35a8cb1d6b3d SHA512 70722daa9c12a7e783b5fb3651f207c057648287e104739043f96c726820268ceb8e4ec211af9a3e2f8fcf7a5e03c9346cea7a25a70478dfdb60f333112b70e7
+MISC metadata.xml 377 BLAKE2B 0294997eab049ed7014cd57635f16aa2dfd1facdc78ad4ea361698e9d12d19ce309d53d9842c8d9daa4000a29d577a5d36dd4e543c2b98c4cc61fc0cb8c43046 SHA512 ffab350944d436ef12dbcff2d8b29eb7291c942e920517264d3e8861aa2c5cd59f0c5ba969bd90b66c167e3b7b099a349687ec7c04de5e15307274ce067fe797
diff --git a/app-text/wscr/metadata.xml b/app-text/wscr/metadata.xml
index d5f156b045c3..63ca2d1443d9 100644
--- a/app-text/wscr/metadata.xml
+++ b/app-text/wscr/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 <longdescription lang="en">WSCR is a program to solve word jumbles, print all
 permutations of a string, and print pseudo-anagrams. It will use /usr/dict/words
 or a user-specified wordlist file</longdescription>
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 436d0b0eda97..1f6f6b70ab77 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -5,5 +5,5 @@ DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae
 EBUILD xapian-omega-1.4.14.ebuild 1154 BLAKE2B 8811fc7b98c00a549752cc33f1f6ee53a5c9af856e3bc534b830e89aae2a8f2e4dc9b33f14bb5de528bde8941c5629e3c31660daa9e20c5a77133203befd539d SHA512 58671f926670abde77437ed28e6b602777475bc5e5a57775d65d02ff0c6e0ef2c6fa1eb3c2db250c44496697ca6fe4c2bac9a48f73a0b6b8d2d657114227c347
 EBUILD xapian-omega-1.4.15.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
 EBUILD xapian-omega-1.4.16.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
-EBUILD xapian-omega-1.4.17.ebuild 1161 BLAKE2B 5324c482030c68c492ee1bebe5a010e8614278ea0092476ca8eac5b69e622e12e5897529ef5823c34fadd0dd0f1e6c52efbb0887ddb64d701256dc7894b22c21 SHA512 a1843680dbc57a14bd3b78fa853b00feb546311d4ba4478cc2ea428bab0b48e481c00582d5ae1ee3139c7f32d079dc9f327b874ddd0ec5b8ca72a830d404e91e
+EBUILD xapian-omega-1.4.17.ebuild 1156 BLAKE2B cce7bddb39c30a9d26017db0401d295b83701572362de81d2347038cb3431851652b7b1a6408b9189ac341a452ad0be22dadc0316ac6857068597bfc3451b485 SHA512 b8a1c0c4796bf75b9c79905f490a7ca7bd3d6ad6de1296de5feefa59e9d7008c5bed5ce21a64b3d7d324bded36591179f7de5d461a6286055ef6c9df2ff44916
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild b/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
index 844423d980fa..5724ce6d468f 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-text/xlsx2csv/Manifest b/app-text/xlsx2csv/Manifest
index cc558a5f1924..5179169bf16e 100644
--- a/app-text/xlsx2csv/Manifest
+++ b/app-text/xlsx2csv/Manifest
@@ -1,4 +1,4 @@
 AUX xlsx2csv-0.7.6-tests.patch 2180 BLAKE2B 173aa4d2650b86648a7b0897a86f49650acffd1603cb6af4f8fa603d70bc902b23cd280cba0453176e477907e7e93447693ff8ec28b531213c1aa690e9288d7b SHA512 7374e315fbe73532e91278eea825d0171642f4d4d5c412e904932c67ecde0b71291c37d8f5cf8908449663435a587f11e10f409bc82128ef9388be0c002da22e
 DIST xlsx2csv-0.7.6.tar.gz 231283 BLAKE2B d0271c6a82b7ed2825e3224f0e34637db3dacda3fe99c6ef5a087cc8d248592efc169b466514abd18b50f6625e8d9743c812b46ecb6f76ce7d1fdc51dfe34fc4 SHA512 7fc8e0da0c050e12d0cfd73f16ffd9c00f19bf05925b54cc68d6a0858a75db89d52e46312956dfd149e0ec88778f68056942a090db44e6148796fad33fa26489
-EBUILD xlsx2csv-0.7.6.ebuild 656 BLAKE2B b0661c464f21e5b7e702a4087a0b4f0b5255ca08266804f674172561b61c8f8ecffee70cedbac15b0e899e25c769488815df18ee182346144263e9f571caacd2 SHA512 f192bf1195caf81a7452dff12654921124068cf0138f7b4788727c3ddf5844cc8fdd95770f05bbc027eb62399b6ae6b3c4d45c0a9d97a239661b8ff9a2855fb7
+EBUILD xlsx2csv-0.7.6.ebuild 684 BLAKE2B a7e2894b84601bc84d2850a963117ba8f7ea8420eb760131e2dcf6cfdd8c878fa1605c1221632ee307f4756bfe0904377620199c2f46b4ad9808a227a9782f6e SHA512 9f27f16cdb026a4823478188c06cb34624200b2b7a33a21af2f0ee4c27c8209e09714530ce80dedab33963320324e60ad8faaca69ecc133d366123d7a55c323e
 MISC metadata.xml 301 BLAKE2B b6bbde41ddb21a05cbfaf8a75bbc5e0d2eb24ce3b62bb93966e7712811cbda3cd258d351f584253d1e831806e2c26fc499092311d2c2d36fa0a8f7323e0b85e0 SHA512 bd16895b82a69676daacc8cf9f4c196423b61600a7dc9ffe8b8d3962cb0a06e46bee7e38a4c692c368a93879be4a83d7d70ce1fb82db6ef4bec25d21a86203c8
diff --git a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
index 804e56281aff..bb4698b812d2 100644
--- a/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
+++ b/app-text/xlsx2csv/xlsx2csv-0.7.6.ebuild
@@ -5,6 +5,7 @@ EAPI=7
 
 PYTHON_COMPAT=( python3_{6..9} )
 PYTHON_REQ_USE="xml"
+DISTUTILS_USE_SETUPTOOLS=no
 
 inherit distutils-r1
 
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 7813200f2850..406f8d8c270d 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,3 +1,5 @@
 DIST xmldiff-2.3.tar.gz 92561 BLAKE2B f18805a9aa00a99a3f63640de60d3ea37393208ade00a14b817d42706bb1b3e407f2645d7df5b5e9f4d60d75d48afe6475e5c1f1bab24ea6fdd78d8646c79b58 SHA512 1dc3f76f51df3c506af827c9a7f67386143b4ce49c2159302e07c5f56054ffd9e858f086bb76d64a038b7e9ae7c116d1146714d4528ea9d53e23e1bacb4bb812
+DIST xmldiff-2.4.tar.gz 93437 BLAKE2B 9f0001da8e39b7a3e7d0af052ce60a43899b2cd644b3fa6c6cb7cfa08ebf71439bda3e3dc6cf497120f20cb0f9346b0a074b8e442b42531fd3bdbaaebdf73bf6 SHA512 d8a0c9cb850259b3288d8fb5fde50c69f24036bc46ea48f24f3d63c592ccdd2aab4daf416f0f75b38fd70cc58e00c12db626e61a983d1a002972a6720d62c6ae
 EBUILD xmldiff-2.3.ebuild 636 BLAKE2B 2624f1ede10d236dd47d79c9a1773001d5246ea5363271d1b6823ad49ce7836fa2f117877c45c1ab8f5799422b27376d6906ff5fc900eef501395ff29c0ea9f0 SHA512 31e29d00d330a3c198e7a0daab2ddae51d0604352df01e350bcec40eb4b0e0b1bd6d7bf39b7937229012fc3d9850b0f14b93e74408eca616f1575bcf3994c510
+EBUILD xmldiff-2.4.ebuild 642 BLAKE2B 1668b52a63100ea22ee659dd08bdc5cb7ab26d974fb3bf01c7c2c81f90ba0e39ceefa844804324a68ce80d26cf96d9766ab7339d8965851fcc050c993c2f160b SHA512 74318d14ef0931a3e470200bb5c190f7a2bc30b1a41bb662ed51f52bcfe60dee6dcd4c56e5eab7bc8cbd3d4964119a97d558df7a99d9295003f16051430e4ae9
 MISC metadata.xml 776 BLAKE2B a2813ad30729db3a2e48ef6fefc7603df138326e05231b955475ec61cd44a175f4ba83c7fa7ce4c2da208676b0f72f1b08e371670af1ba368c9223e947eda4f7 SHA512 579b4593545777f8c244e8b3f0532bd968a420409b946dac93ff875358b814064e8d24548f2d2417602e2840f6e3844dc2c6ccbd07804f948f22e5467ff5254a
diff --git a/app-text/xmldiff/xmldiff-2.4.ebuild b/app-text/xmldiff/xmldiff-2.4.ebuild
new file mode 100644
index 000000000000..c1261561d3c4
--- /dev/null
+++ b/app-text/xmldiff/xmldiff-2.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+DISTUTILS_USE_SETUPTOOLS="rdepend"
+inherit distutils-r1
+
+DESCRIPTION="A tool that figures out the differences between two similar XML files"
+HOMEPAGE="https://github.com/Shoobx/xmldiff"
+SRC_URI="https://github.com/Shoobx/xmldiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
+
+RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]"
+
+distutils_enable_tests unittest
+
+DOCS=( CHANGES.rst README.rst )
diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest
index 93867f5f6ff8..aa7c8deb4097 100644
--- a/app-text/xournalpp/Manifest
+++ b/app-text/xournalpp/Manifest
@@ -1,5 +1,5 @@
-AUX xournalpp-1.0.17-translations.patch 716 BLAKE2B df50ccfdf86069f08b29168af42955d80b363db5d271bd0c97f07cdc626995922471186cd83f7860f0eecbf8e53982639e23a5a2b817310f6d3d12e529577c45 SHA512 83ae3ff7ae1dd4933f063c9e35a38684eeb6638fbc9ec52b863bd1499d2fe958b7565e8609060d9ba8388eb6c89e046b8908c0fd7387981154cf86da3b574184
+AUX xournalpp-1.0.18-nostrip.patch 498 BLAKE2B 451eff71c86eff703d7b9dbee910c8938e10fe963d416c10fc0a5da04071672a26313d7c6fd887e960df3dc9b717a74d7b3974020ea6dfafefe2f06ec539cd6e SHA512 b883ba8094f46462c8415df10154fcbe2e773df981bc31fae5695a7d34de97bb984aa7b912cab3c9dcb121f10d52796c766f295d1d6a6ff424fa4d99a9f04e2e
 DIST xournalpp-1.0.18.tgz 14892343 BLAKE2B d2aaede0e85d724cf8032f38a6fa2c3c4862f26d410dbab8264dd50ab8ee0d26889eeab433ef615fe9ce271710192eca380ff80149431d5368125926cf8d2b25 SHA512 90568a2674a18ff711ecef5f1a66ea1c5746d7f1fde271b36342d9bf48e096e63075cf7fd8b69e39e144273a4d1b922c415eee929eba94b2fa515a0bb481815a
-EBUILD xournalpp-1.0.18-r1.ebuild 852 BLAKE2B 0aadb7823ff69ec04308c4c0a70e5c69724912342cbface8855c9aac2639d89ef5d738a4dc376793d24f31aa2f0b15a8e8ee190b1fcfaf2fec15323412b380ef SHA512 4abf0f2f5cf053d58b4200aa11e6b44ef961ae1cec62a62f93db0c9550923751af32a56201f60095a2c6a2647fa568c3b064ea19ba7f5d9e174386c9f705ff53
+EBUILD xournalpp-1.0.18-r1.ebuild 911 BLAKE2B a00d8ba904bfa33a5323d8dc8a80c457886263e08240e364423f99b26b4278e4d6f54532207e7a33a122b8b7bd9b7dac2083697e4f756277bf616824b88cb2ab SHA512 019fabd488c5418652583c15aa0e06f13a3d68eec69b4dce656ca27c5d464201307c31c45c501e96ef86021de8b6ca8e93e386dc5abc56d61fee2e5c6e84110f
 EBUILD xournalpp-9999.ebuild 852 BLAKE2B 0aadb7823ff69ec04308c4c0a70e5c69724912342cbface8855c9aac2639d89ef5d738a4dc376793d24f31aa2f0b15a8e8ee190b1fcfaf2fec15323412b380ef SHA512 4abf0f2f5cf053d58b4200aa11e6b44ef961ae1cec62a62f93db0c9550923751af32a56201f60095a2c6a2647fa568c3b064ea19ba7f5d9e174386c9f705ff53
 MISC metadata.xml 220 BLAKE2B a2c3e050477292c8000b5bb0ffa26d84a57fb435ba5c96dac5c5f4d6f3e823c07116520102eacefd24227a4490dd340c7836cf8d1ba28d23fc76eeaadf04c7b9 SHA512 594861f664581733d740d9f501b84c56f9c9c67f932e97f5905a37d4f19b5a19ef4045c50571a412fbc64d318f3ad1d403ed37c61449b37e74df3d5753aedda8
diff --git a/app-text/xournalpp/files/xournalpp-1.0.17-translations.patch b/app-text/xournalpp/files/xournalpp-1.0.17-translations.patch
deleted file mode 100644
index 95283b014009..000000000000
--- a/app-text/xournalpp/files/xournalpp-1.0.17-translations.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 12387b01a1c7e529580c6f27e92dad3e8b4f9858 Mon Sep 17 00:00:00 2001
-From: Bryan Tan <techniux@gmail.com>
-Date: Fri, 7 Feb 2020 19:47:18 -0800
-Subject: [PATCH] Fix translation target
-
-- Do not modify po files in place
-- Always build translations
----
- po/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
-index f957a199d..73ce0f04f 100644
---- a/po/CMakeLists.txt
-+++ b/po/CMakeLists.txt
-@@ -20,7 +20,7 @@ if (XGETTEXT_FOUND)
-       "${PROJECT_SOURCE_DIR}/ui/*.glade"
-   )
- 
--  gettext_create_translations ("${potfile}")
-+  gettext_create_translations ("${potfile}" ALL NOUPDATE)
- 
- else (XGETTEXT_FOUND)
-   message (ERROR "Gettext not found!")
diff --git a/app-text/xournalpp/files/xournalpp-1.0.18-nostrip.patch b/app-text/xournalpp/files/xournalpp-1.0.18-nostrip.patch
new file mode 100644
index 000000000000..120e86ff586f
--- /dev/null
+++ b/app-text/xournalpp/files/xournalpp-1.0.18-nostrip.patch
@@ -0,0 +1,15 @@
+diff --git a/src/xoj-preview-extractor/CMakeLists.txt b/src/xoj-preview-extractor/CMakeLists.txt
+index b2029d68..2e1d68ba 100644
+--- a/src/xoj-preview-extractor/CMakeLists.txt
++++ b/src/xoj-preview-extractor/CMakeLists.txt
+@@ -36,10 +36,6 @@ target_link_libraries (xournal-thumbnailer
+ 
+ set (THUMBNAILER_BIN "xournal-thumbnailer")
+ 
+-add_custom_command (TARGET xournal-thumbnailer POST_BUILD
+-  COMMAND ${CMAKE_STRIP} ${THUMBNAILER_BIN}
+-)
+-
+ ## Install ##
+ 
+ install (TARGETS xournal-thumbnailer
diff --git a/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild b/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild
index 7057d336d41d..f04ebe22737e 100644
--- a/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild
+++ b/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git"
 	unset SRC_URI
 else
-	KEYWORDS="~amd64"
+	KEYWORDS="amd64"
 	SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz"
 fi
 
@@ -40,6 +40,10 @@ BDEPEND="
 	sys-apps/lsb-release
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-nostrip.patch" # bug 745255
+)
+
 src_prepare() {
 	cmake-utils_src_prepare
 }
diff --git a/app-text/xpdf/Manifest b/app-text/xpdf/Manifest
index 96d7d3aae682..19a2ca748b62 100644
--- a/app-text/xpdf/Manifest
+++ b/app-text/xpdf/Manifest
@@ -15,5 +15,5 @@ DIST xpdf-korean.tar.gz 526847 BLAKE2B e1640f6df0bc1e126b2e0f010403fc3ff068a8171
 DIST xpdf-latin2.tar.gz 1431 BLAKE2B db8c823c4e90643b9d08c9a4106f479470236a00115d2dc6f3a71da4bc9b5e33561da5ac5dce81cbf5fc943a65572f3595601f6e9f31a3fba9bc0d35f28e0016 SHA512 5fe0b60bfac7f0f4a26e3e7216de5043f6b94446f464c984b7c25431ec01a5912952c0dc66bb2c7159c9f63e4805689c6cfc761086aad9e59f1f21d0cddb5d15
 DIST xpdf-thai.tar.gz 1878 BLAKE2B dbcc2aa2652c40c2220688767a58cadcfbe39310d6c2664b98392a03b00de6d558fa3f333a085e7c6ff3476b6ffcd98fcc228eeb8dd59e905f870c8a39143ac9 SHA512 5584b590e34da29285c379e3b7a7243c28241ec6fddb3e4a8e2e7bf88b8f7aaae3483061d12c332a1ff042ec5e2b31869a67d60512ac48f7903c5e2fc871aa87
 DIST xpdf-turkish.tar.gz 1137 BLAKE2B f735e9842361a5a73fabe40aa4e9cb552475d3751df3e885c5a1a68e0de8ca7b5a031e6332495f70abdc1e943fa615f09185e9ba22922f37f02e42f59ddfc57c SHA512 a73e90bce8f2a12154b06ef29333a45d96258c0d653d5cb15afd2e5ad9e79a9b617e5f8ebeb20bde545684d50f3bc1349800c99f70c863bdd502c24c266b4fb1
-EBUILD xpdf-4.02-r4.ebuild 3854 BLAKE2B d2419081bb8fdf75f82edf9b071b621ae0d7dcd01e6f8ac134b87989baf475de0501e88934d053fb47e504bfeb8013f07145434c472e0215f90bec2e9e2fb989 SHA512 a59a7dc6c78b6075f50f0076c49cab91fddd0f4dfbcb389eb47865aeaf7d10740ae5f874316ffb8b2af0498005ff325d91b3b2e4509a62c43a58c6deb1bed87e
+EBUILD xpdf-4.02-r4.ebuild 3643 BLAKE2B f32b43e6d1245c3402106561af127228d750d101304a12f0b056c7f1f89e1eaad3f42e7889344a8bee1daa0599cd83f295736305fa57fd3353e80d25c48f5f8f SHA512 d0503404456f99204cc8a3525605bcc814a9572d246444a638803e11152e63c3109485dc70e562fc8788cad49fdd1b188dc7a3d1d1970959f78360217e71c214
 MISC metadata.xml 992 BLAKE2B da5a96221c19ec9db95204df4ddd68644d14f3940ef4fc367bbf2fad9a6c69368401f8a299d14210fb6706d479b7950621360967c7549f7c78c2cda87398767d SHA512 2916fbad9b12267929b58fa8b385df4bdfa8cbe0e32d51c9298e421f2e21729c920b18faec4f648b87aab37150c67b1aad441e36a3d6014e45f226d9baa0a568
diff --git a/app-text/xpdf/xpdf-4.02-r4.ebuild b/app-text/xpdf/xpdf-4.02-r4.ebuild
index 288d1e759015..e887f2ce9966 100644
--- a/app-text/xpdf/xpdf-4.02-r4.ebuild
+++ b/app-text/xpdf/xpdf-4.02-r4.ebuild
@@ -28,7 +28,7 @@ KEYWORDS="amd64 x86"
 IUSE="cmyk cups +fontconfig i18n icons +libpaper metric opi png +textselect utils"
 
 BDEPEND="
-	icons? ( media-gfx/inkscape )
+	icons? ( gnome-base/librsvg )
 "
 DEPEND="
 	cups? (
@@ -88,18 +88,12 @@ src_compile() {
 	cmake_src_compile
 
 	if use icons; then
-		# in some cases inkscape tries to write font cache to the
-		# system dir, see bug 739166
-		addpredict /usr/share/inkscape/fonts
-		local inkarg="-e"
-		has_version -b '>media-gfx/inkscape-0.99' && inkarg="-o"
-
 		sizes="16 22 24 32 36 48 64 72 96 128 192 256 512"
 		cd xpdf-qt
 		mkdir $sizes
 		local i
 		for i in $sizes; do
-			inkscape xpdf-icon.svg -w $i -h $i $inkarg $i/xpdf.png
+			rsvg-convert xpdf-icon.svg -w $i -h $i -o $i/xpdf.png
 		done
 	fi
 }
diff --git a/app-text/zathura-pdf-mupdf/Manifest b/app-text/zathura-pdf-mupdf/Manifest
index 26278a7a6776..e68fe9e2b97f 100644
--- a/app-text/zathura-pdf-mupdf/Manifest
+++ b/app-text/zathura-pdf-mupdf/Manifest
@@ -1,6 +1,8 @@
 AUX 0.3.5-compile-fix.patch 518 BLAKE2B e1e52be08b27459d2125fb44b1767c1f381ce13dfecae02b83afb6bc09db00c145f2b557db0c1515a383ea223eb51c68fdfa32d3effea334c5cddb9af5209ed5 SHA512 7af34317726849aa0eb49b7d7449c23cea1208a72ec1f872bf218b3be9c9b84bb8668523ef8ca0bee9fcdcffa44ba9599ba43f79c88bc3e8811597a91868a1c6
 AUX 0.3.5-fz_location.patch 1710 BLAKE2B fc6a13a495f3121466da5553c044d7de31c9a1c37984cc36b219d32aa2d9cfefb894f9f8225a5d93e96bbe4c25a6a4d76c2e24da24c583273bddf7efd4de4436 SHA512 fbab10cff2bc28da23effa17f05e17ef332b4ace23e7c995e1bfd6126f5dba66bb825ead78e91b70549e41c60ca089c64ba4961f2bc0d509c4e5bd6fa2b169e4
 DIST zathura-pdf-mupdf-0.3.5.tar.gz 8901 BLAKE2B 63595d6a4b305d8cd09eced1cfa3840a5ab3d37a61c42738603691621f1f1dbdfc31d5963b14c7af32f8c504f2470bf1cadb708fefbfd49fb25b2848b2564153 SHA512 1f7a748fee74296a008cef42c8f2e443409c77e16caa8441f74136260aaac7dee4d3c03e8a88532c45a0f9972e1b4965d4cffd488a00123d4d8cee9bcec2cf30
+DIST zathura-pdf-mupdf-0.3.6.tar.gz 8925 BLAKE2B ee74a1655da7d16070b8909dd0f44239eb21055a40a525b766dc3d9e81f84377abe0623ba33925a25739bccf885f8967496be30c27e421d30b1a78dd64b84aee SHA512 f6783c3fc08849d7dc6fd527b7fcdb51d4ef9214379ca6b4dc6d29e75b10f37e3ada2046e205449a7d0465f07e65a6cf3f2f44fba98360cba16676e705390a97
 EBUILD zathura-pdf-mupdf-0.3.5.ebuild 1112 BLAKE2B 12620e265b0ce055f23ce2562faa958dcc9d5796fda2a9614e54e59567281fe8e77d7fb484ae6feae4b5602fa0481d62766c1df4ef0209e9e961ed62c6537ca7 SHA512 98db4e1cc241b331a76d6b357b837f54a5edc0ed2dc7a03afb6668c9ee611888f94e5ac4e0ad3b637dd28886ee9c66b5daaf956b9a1bf0b33650fd3abc3d178f
-EBUILD zathura-pdf-mupdf-9999.ebuild 809 BLAKE2B 848d3a8bd80d7b253fa42f2fa352946cc4f6d6a3da0568f230ee504c6c46c58470fb228e75142313769ddf86cbeadd674a978d70e56b713aadc9f4aa7873c9dd SHA512 b928e7582cd71e4135bc0967f3eea887e9657b41baf83c5b0995580fbac13ef4bc12583029e346b99a15b9a6de99733232f67954033cc6326c1562af9ca92766
+EBUILD zathura-pdf-mupdf-0.3.6.ebuild 820 BLAKE2B 8b7e4971575be372a30c98a8fbd348e3df257adcc1e4e2a02a0c09d8c3967e3e7c6c352fb98c239aff269eddbd765f6fce0e0995ef07f8b6fc56bcd4851a8cb8 SHA512 866df18c6496c891994782243fcea2fbd3301042e12f1cdb1358fe7195e30fa23e469ec462c604ad27250f235ff4833ec65664cfc571f0751b507b790d6ef4b6
+EBUILD zathura-pdf-mupdf-9999.ebuild 823 BLAKE2B ed4be465381eb7313c35873f9d479b3119c49b9175744511349b5345d6f6fba1ec2f341f05b0e5679eca91bed6f2b2a6d146706e25cfdc45caa894a312b07ba3 SHA512 2314179fdeac75c52412d950e449a5edaed5d3846d56e35c775086d17aa572fa53c25032b6251664422351618f920f909846ae4ef705fa06c06b5469ecfa8d30
 MISC metadata.xml 592 BLAKE2B 1159f04d19816c03115b8b2fd20ddbee3c420ffbd6276c9c48b80b4e6d43377354ae935d01c0ae7b3d81f8fc1f7b0f0928ee72ddcac6826c2775efd109b33e32 SHA512 449cce725a42bb2f05746e9af3e474547e83b4f7d25357b948ab8f24a9a6182dbd627a8cfa66b4385e396cfe3bc7e9dcadb9a6672eef354b49eb229e89640de8
diff --git a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild
new file mode 100644
index 000000000000..c9664c2423f9
--- /dev/null
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-0.3.6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson xdg
+
+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://github.com/pwmt/zathura-pdf-mupdf/archive/${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="PDF plug-in for zathura"
+HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND=">=app-text/mupdf-1.17:=
+	>=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-9999.ebuild b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
index a8c73f86302b..f3f90d3b0870 100644
--- a/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
+++ b/app-text/zathura-pdf-mupdf/zathura-pdf-mupdf-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit meson
+inherit meson xdg
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -20,7 +20,7 @@ HOMEPAGE="https://pwmt.org/projects/zathura-pdf-mupdf/"
 LICENSE="ZLIB"
 SLOT="0"
 
-DEPEND="app-text/mupdf
+DEPEND=">=app-text/mupdf-1.17:=
 	>=app-text/zathura-0.3.9
 	dev-libs/girara
 	dev-libs/glib:2
@@ -35,5 +35,6 @@ BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
 	sed -i -e '/mupdfthird/d' meson.build || die "sed failed"
+
 	default
 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /app-text
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)