gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /app-text
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
324 files changed, 2953 insertions, 2467 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index c99eb77a6480..ec1797b5b20f 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest
index 825fd2fc8194..db893f428f65 100644
--- a/app-text/antiword/Manifest
+++ b/app-text/antiword/Manifest
@@ -1,5 +1,5 @@
 AUX antiword-0.37-CVE-2014-8123.patch 528 BLAKE2B 612718b3af9f3e91b5b755401a124c65268c482075b4f96ea71260f63e43d8fc5a1e009dce5a6ec527a56e013e4627855ea20259a6d72154e51ca0abf870554b SHA512 412884a236abb5ee75e5c707581c7e0158614d0e168cd9a8fe02dd8dcb8c0963ae2269c9575cd9cb9f4876efb3bec6bef7934fec5c7738530012495637a2d694
 DIST antiword-0.37.tar.gz 317884 BLAKE2B f47c815e2c6a1ddb33fefa33b3579fa5ba6e3900d3b9339350d28ebd0223853ad60ed717a1bccf4960c835427ebacc4de944548f9b354cd34889f0742de4e74a SHA512 6cd8fb9137238417544cf8754829a2d5296055d730ea62a8a025236baa79516190317d146401ff40cde73e1ee2c3c374a2ea01b2e5d24e149310bcabb8bfdce8
 DIST antiword-gentoo-patches-r2.tar.bz2 1747 BLAKE2B c01aa7c02539fb5148cb1ec01983a8406315bc3cb2f909118c022c2f218660919e6862582cda34dbd4c08a21beb02c928f685273853d1ff3350548957ae30cde SHA512 45ed3ee1c514a9ee78bc8963e56be18426b47ea628f02934dbcec83c2d632162e458f75f998da438daae4794fcce36fd8922a172804c0fc83c6f32c9a8092ffe
-EBUILD antiword-0.37-r1.ebuild 1359 BLAKE2B a2a34aaf741a67f871f78d6b8a8ca72abf21fd6e9ccfd0fc40e8fbf622b99e60f0400e960a8ebfc87ba04544c14b6db4087411dccedc9f8e0575b46878ea9684 SHA512 53a818bae5c6935bb085a15a8f5125928ef07bd493e223e40f645aef320e01998501a14b14f8cdb85d0bae8748ff468efe8bd9e0d31bf32cbbffceb0d4d27d4b
+EBUILD antiword-0.37-r1.ebuild 1359 BLAKE2B 439002b6ce33a663b68c282770dbb3b43f86bb8e3255a8e15027c5a480f0642cfa71359be9628a5ca0a77520d1aa45ff337aa7c00902a77ed198941b0b06f6f5 SHA512 5ec8979802319c426e7899a56700bed2beecc656a5469b86f86cb353efe172cd221e0940f65457894b1af607b511459e947a02eb488b55ca27a8b2089df9e544
 MISC metadata.xml 342 BLAKE2B 18f1014abb7ea6d52728e80c15d3e6e3f7cd554777774cb5060e5305643f5bdb1471bdb8a20d171bd88e44556dc00d6907e64d650571faa7eebc68267714a23e SHA512 420c79c983e7b4b69118228cf6cb62fe69c2fc6ff4de2d024a31663b8646fb809cef3b1cb7510346536eb7cd3447dac156d45b923daf23dfd853f54a91f4b30e
diff --git a/app-text/antiword/antiword-0.37-r1.ebuild b/app-text/antiword/antiword-0.37-r1.ebuild
index e0384dc06f81..b9ae5e10151d 100644
--- a/app-text/antiword/antiword-0.37-r1.ebuild
+++ b/app-text/antiword/antiword-0.37-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-inherit eutils toolchain-funcs
+inherit epatch toolchain-funcs
 
 IUSE="kde"
 PATCHVER="r2"
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 12853043f137..a0a3fefb5481 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,7 +1,7 @@
-DIST asciidoc-9.0.2.tar.gz 1144308 BLAKE2B 5f5deca6b8c15d4b86e2bd6fdb131908eecd862a5fdbbd8418937050d335a25ad012a3b1bc716379f5623db676176fc6da1a09691c2b42a213a6230281626b69 SHA512 ea8f64ce54d2f1aa38eceb3c1c9be17b388776de58038f3b888ac5ebed76337fa2779e43eb7f47174adf0a0446ee808dbd1e4f8f7e1d7db99db7c4c8584d5624
-DIST asciidoc-9.0.4.tar.gz 1111102 BLAKE2B 3c073e20e0b4cb1c3e43d45217240675d5a1349c5d27c8e03c4499505c17ad0a149f9495a42e28490f9c89f29dc25a1216e9145a6fd1483e589b5fee49a6279f SHA512 9e24aaaf33ab56cf1dfa510a6be9722af364633234c9ffb20eeee3d0ba756059290f443de53b040570654a316ab4782a177c31377fc69747814da75760fcc88b
-DIST asciidoc-9.0.5.tar.gz 1119318 BLAKE2B 3e5a454f4d47bb3c71e4c180ab05a0d23985473ca83d987435614ddafc9ee0d340a6e6cdafcb7371f719487954233f6d4bae69b4fc7d3818fc1d8e91c94ef36e SHA512 5b79d74c1efd43a960e8a415d3a68f26dcd3a3eee748b830101cec69475b0af40de7ad190ae105cade8ee558a59a643d04f38c1be490d253e3a6740c347d94e3
-EBUILD asciidoc-9.0.2.ebuild 2337 BLAKE2B 19c198213cc90c59641f89cfa9f483b1d5796c2b1e53329ed5a45774607e72cb60dc6a54caab8c32e0061e4d55e9f935dd760cb2106ff7f6cbb063f65aefde73 SHA512 b2491f68d4ebf1fece0af110f465755f8e2bbb97f575923e8f3788f01496a2adb2ec56aa543ef2a2de10bfff3f335fef0b7a2c11b4241cb025b772c31121304a
-EBUILD asciidoc-9.0.4.ebuild 2339 BLAKE2B d70827665f449472bb892754a1e591b3cf30706534b92998dae33869bd5af8032ae8ae74719e95d8462aa100efcc579c07072e3f4d471fa6a7b5e7268de8bd46 SHA512 483afdbb7ff4e0691e423f593d2b2b9c0fe8cafa8efcd0fda5a5083981efafcdb62f58a668db85269673f36b1400e5c287c7bc4f11bbe66c2753694101ece09f
-EBUILD asciidoc-9.0.5.ebuild 2346 BLAKE2B 80653cf44e489e875e63225de8cc7e5a16690093b456d85503cf81167161623dfc656fbc727b0f6d508a3b52d52e5ca4f3b668b6fbfe12e6b825757aba531b38 SHA512 97ebf07a34348e36fbb56d190978c333b2df2c5b196114bfd8123187f5f86f42024f640fc1825d99a5acf9e5235eddfbf6b436559706db0249ebd426c6809e55
+DIST asciidoc-9.0.2.new.tar.gz 1269444 BLAKE2B 0041073c572267628b8bbfd56258d86c35edb0e7f3a222743ce1476b405483b01144faf768ab1492fd3f378960f6cc8e17d92ef61671d84c318fbe7c1ca8cd7c SHA512 c20629001704f1c3acfef0407b82f35f6077f5b32ef754fcbeee03a5a86d4e01e374e89b79cbdb236fc2c7fc76bf47ba81efd691f2f9e1c87dc85a7111f5e030
+DIST asciidoc-9.0.4.new.tar.gz 1233878 BLAKE2B 506a2c82d95ce0d522f45b20eee31f7ce2b114e0ad43c78bb313f34b210a7bdd282a8a3779a3ea29025e865847eb8298bd5a6ddac7ee338e4b878ae79bdf149e SHA512 59be96514d0c4c82e5842ddea412ddd6e06647ebe09e0f1828b7c07e787d890896bab4271e7566ed038eb2da6755a67c725bee07bcfbd7aa31475f39c3abc089
+DIST asciidoc-9.0.5.new.tar.gz 1225334 BLAKE2B c3e428098dc4d71704ed13b54fd5f640b9de81d12939facb5faaf38a3123794e57201ecd9c312a22c220a2ec6b06c88a76ab47f05ffa972fc8751089b3471cfc SHA512 9125631fdee464f96f7e3c76a60fe37331905e9e55a81db27aece4065b246dc05a35db4c157dc7dbb2345eb95c153b474251d6a447d65774bf1b3f57e1883895
+EBUILD asciidoc-9.0.2-r1.ebuild 2327 BLAKE2B 0473c9ae0a7874dc202acfaf7d37e13eda32955a3eb1f03a267ad7afcd5c6c8e86857bcf83e4665e18788b6b12681df88772c903de1dd4611bb3011964436979 SHA512 7ffc91972c4085c1b652f8a9f43f6c4e57aa98993b541fc653cdecb15c2783bd30babce176b4ac4abcdb82f1400035d0fd968b43ca6141bcdbd334adf67dc011
+EBUILD asciidoc-9.0.4-r1.ebuild 2328 BLAKE2B d588dbbc01d45a302006b51840ae5c9d1a741e8121a594cb9911af8e4b24933fddf091e6d50fd63ea9e66654d868dc1a7745a6a629c76a036dfbd0f7917c4810 SHA512 ba4fe05a83d22dad37d7bbf875a76150798fe7da9bf48229bb0279ad182b986008c52fb753fedbc6d97c49fd570fc1dabd31a8890d3b7d2ee470c4911f82d52d
+EBUILD asciidoc-9.0.5-r1.ebuild 2335 BLAKE2B 83aa93b9f4e8b71c6bc38032f224fdf99514d1494876591dab51440337946a9af4c145e19a7f8830e5fea7e145d34173082eb357a1c17b3082d497907fbe43dc SHA512 60b08c90e97c4ecd81bd77cc71c2c33547029c25aaea3ebc6259056690bf2432896a8b36239184fc9d43ba6c921f699cd195ee3ab5a2f71691ee3b753dec60e3
 MISC metadata.xml 465 BLAKE2B 7add2c9dc126e1538251b0ba0001a624d7ddb9406adc5151d8388d7a8549e2968fc5a02219f79e63ac1577c4ee55cda9b4ebdfa138eb9d6142375943d8da0e39 SHA512 986aa9ed2b95d5d5a61bfea9aecd3c4371ba76a1a6e9cfe8833b7cdef449527dcde14879565f0302d55533501e082c2f1d4734004218299061bcd87b7adbc8a7
diff --git a/app-text/asciidoc/asciidoc-9.0.2.ebuild b/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild
index 20fa53eb44bc..952821000c67 100644
--- a/app-text/asciidoc/asciidoc-9.0.2.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.2-r1.ebuild
@@ -9,11 +9,11 @@ inherit autotools optfeature python-single-r1 readme.gentoo-r1
 
 DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
-SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
@@ -46,8 +46,6 @@ DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
 	   docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
 	   filters/code/code-filter-readme.txt )
 
-S="${WORKDIR}/${PN}-py3-${PV/_/}"
-
 src_prepare() {
 	default
 	# Only needed for prefix - harmless (does nothing) otherwise
diff --git a/app-text/asciidoc/asciidoc-9.0.4.ebuild b/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild
index e83f4aa564af..e9c29e8b5279 100644
--- a/app-text/asciidoc/asciidoc-9.0.4.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.4-r1.ebuild
@@ -9,7 +9,7 @@ inherit autotools optfeature python-single-r1 readme.gentoo-r1
 
 DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
-SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -46,8 +46,6 @@ DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
 	   docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
 	   filters/code/code-filter-readme.txt )
 
-S="${WORKDIR}/${PN}-py3-${PV/_/}"
-
 src_prepare() {
 	default
 	# Only needed for prefix - harmless (does nothing) otherwise
diff --git a/app-text/asciidoc/asciidoc-9.0.5.ebuild b/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild
index 3b4cdbf3dd7c..42256c4e6f70 100644
--- a/app-text/asciidoc/asciidoc-9.0.5.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.5-r1.ebuild
@@ -9,7 +9,7 @@ inherit autotools optfeature python-single-r1 readme.gentoo-r1
 
 DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="https://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
-SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/asciidoc-py/asciidoc-py/releases/download/${PV}/${P}.tar.gz -> ${P}.new.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -46,8 +46,6 @@ DOCS=( BUGS.txt CHANGELOG.txt README.asciidoc
 	   docbook-xsl/asciidoc-docbook-xsl.txt dblatex/dblatex-readme.txt
 	   filters/code/code-filter-readme.txt )
 
-S="${WORKDIR}/${PN}-py3-${PV/_/}"
-
 src_prepare() {
 	default
 	# Only needed for prefix - harmless (does nothing) otherwise
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index d28605c37c63..d7bd3449eb08 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -4,6 +4,6 @@ AUX aspell-0.60.6-darwin-bundles.patch 967 BLAKE2B 2b159dbac972ad9a246723fd7fbbd
 AUX aspell-0.60.6.1-clang.patch 1288 BLAKE2B fa2da2471f3ec3c6d5c9a98c0afd000bd86cd116b8380ea7ef2acdd1ffb1bf4f241fa60222b2228c60cfd643bb5f310c5671a649e71850ec830ec6d5fcc44cf8 SHA512 453e46b6057dc9fba5e80aa9a3c569f5aa2bc04deeebc4951539e6f251babfba0f6ea2e4f51c59d6e870bf69b1ef7d03b76816d7557a6b673ed0d276f0b3244f
 AUX aspell-0.60.6.1-unicode.patch 8273 BLAKE2B ceadde03ffb1904e58c76074444013d2517a20dafeb5847963b6d8e3dbd4ab7fb00fe0d13fd26d3381edeb4e68b2feefb2c8b44186336bdfe197d483920dd509 SHA512 8601183d2e84801c193f5a4412e021ff79ccd27e031c0e8ec85a879619868d13389cb60fb0f4fa971114da64645dd4fc5cbe480f49e88d575826cf429a533b98
 DIST aspell-0.60.8.tar.gz 3486448 BLAKE2B a72e70af65749059a576740377f93b20ab283f73fa7919894f6af189b5aa73581fa0410800851c9396e7d13f4cbc2f7edc23c53d46874d0389ffdb2432ff08c2 SHA512 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29
-EBUILD aspell-0.60.8-r1.ebuild 2792 BLAKE2B 9052ec2d7c4e0ff269886b95c4dc81628eae8d508caea503b1bb654fd0e770d09bd80a3612af0e8c14157fc1dc14bf0de318b9bcc2ce78c76670da148ea11389 SHA512 318f5965672715c6bde5cbcb72591711240a97781152e94837d96b633a223bf45b024e83bc0c2d0cd9630cf4c2d1d9a33b952efbe5960f7eb29289f9d66d14b3
-EBUILD aspell-0.60.8.ebuild 2751 BLAKE2B 0d8a9e5e2b9ee9d9ff1a6afbc6762972822d3660d8a7655eda144dcff94a19e0007f7924d8db44125a800b78db3f80c64144cf7d7ea44045509109778a6440f7 SHA512 3909f4147e56d8a1a241648be5f40890a390cda116bdaec66f57673deeb84ee6492c05cfc237c4c1da906558f812fe61239c219a2e8370ada459b5504ab34d3c
+EBUILD aspell-0.60.8-r1.ebuild 2785 BLAKE2B 00825b68a63d55438388d5186910efb724e2afd6a4bd8bb2973f75b136a754666753a1ed43bdeb906e9fc1051597eca1129c99496cb842a08d2d3672cc1ccc76 SHA512 48ce8e82a61f1180f81e87826f9c97ba9fe7c44a70f082a5dfa76cc9797c54d6d5ace73d2e3198e008772e9b82a614987415b8c02016759e5be108c30def6cbb
+EBUILD aspell-0.60.8.ebuild 2752 BLAKE2B b1c87a21ba2a4675e9f5365c81468a6d6d898a1f93b767b9793373edff8429b50635945df2fd4983107391a9b3c86236290165a83c5b5dd5462f874566150e89 SHA512 7b5539e78cda5f7a901558bbc35de1ef4374651d26d71520b671d80c276d20ecad4d9aa093b71fa81dc549beb4fb5fe8b56d681514fa5ed66a08c6678fc9039f
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/app-text/aspell/aspell-0.60.8-r1.ebuild b/app-text/aspell/aspell-0.60.8-r1.ebuild
index 70e130e54c32..8f4ef0b3e3ce 100644
--- a/app-text/aspell/aspell-0.60.8-r1.ebuild
+++ b/app-text/aspell/aspell-0.60.8-r1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 # All available language app-dicts/aspell-* packages.
diff --git a/app-text/aspell/aspell-0.60.8.ebuild b/app-text/aspell/aspell-0.60.8.ebuild
index 6207c44dc5a8..287ddb29290a 100644
--- a/app-text/aspell/aspell-0.60.8.ebuild
+++ b/app-text/aspell/aspell-0.60.8.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/atril/Manifest b/app-text/atril/Manifest
index 718e8881a525..7c12c2c6b189 100644
--- a/app-text/atril/Manifest
+++ b/app-text/atril/Manifest
@@ -1,5 +1,5 @@
 AUX atril-1.24.0-make-synctex-optional.patch 16815 BLAKE2B 13c65b9dbf1afa43aa32d147462c90dbad94366b1795b1409746cde2991180a3b2a3266908469b2ff5a4b3107b457ae86a3cb3bc058384877f885a512fabab2d SHA512 cb4493eca4e0bc1bd4a9bdd4540033aad3318023f6101f5548c14c7c7134ce6a4618849df44573af39af7d561ebca4b9b549668e81c50c7432a525db7d0f620b
 DIST atril-1.24.0.tar.xz 2062468 BLAKE2B 374c7769f5c9753b1d9a6143c796a317914aebbb638b6f0a85b732b43b0e9ad2fff1374a5f3f4dc1abc8c265ce003bfef2cddc47cdb18ddc7f24c4905ef5232c SHA512 dfdd5ed82ba76c4f0a446a95b0a6201bedf8b4d00ff46ce697a5b937251f6d7a1888ca76eef623eb84dcddb425c7ad662e179f593686bba064b7491d4d940293
 EBUILD atril-1.24.0-r1.ebuild 2253 BLAKE2B ae262b9f622fbbd916898c936e83d5411501596bd4b1c36ddf057ae4a25aca707f6f4eb7ea8a56ffd3662e9db0b46aaafde49e879ddbd32b67eaeee5871b4de0 SHA512 c76e3f3ebcb797648ee2290e6adcd5920c5a55e01b8f529ca3c58a9b4132baa388bb4aceaadd8e2322821b0cf0f135e1950de096f6b6681299c65cf4a145440f
-EBUILD atril-1.24.0-r2.ebuild 2929 BLAKE2B 68e8dbe1ce7aa368a97a0db6e249ced1a98b211e0f6b2449b6573c8a37e5bb2751c364c68901fc4748dd1cc0b59d83dca26af1d2a9646eed2f5b16406a91aa16 SHA512 b7c4d362dd1315de82dee74abb58ef068f279cf07f586ac6069f96f09cbe85d2fd07beafaa6d2fe0efdcd8876b319bf1f81eb47a3b2ac29fefa6f90e212f0396
+EBUILD atril-1.24.0-r2.ebuild 2934 BLAKE2B e6b0b357612c85719aacd949293184c3e359c63eec5a05df80e18067e7cc1ced444dbe72d24025518cfbe4d7fc28029bf1b48a2972178b5e24f5c82be1bff7d4 SHA512 6a58b9d39d4c17cfac29a7af4a41cf8dbf5d4587586e5fb6caf48652bfee0100b984351e82debbb59da63a4479508fb4198a7a320a3da71bb5b3d9daf2a65f17
 MISC metadata.xml 887 BLAKE2B 38b14cf53af3c9728f59bc846fe8664092c545703fe542b9264f20aa867e26186c2a0ade2910c8f9040d33f1f882af5b00fb85b181e9a5ddcae92aa0732f385d SHA512 dbf93874246a0f8da95bf6b80968211b58e15c9d14ceddf7bafcee7f073be9d1eedbf0203c796411b2be38d651b110903501dda4a0ee7a1fb6429d1b3d926934
diff --git a/app-text/atril/atril-1.24.0-r2.ebuild b/app-text/atril/atril-1.24.0-r2.ebuild
index 643926b9b3ac..1cf25b1ae899 100644
--- a/app-text/atril/atril-1.24.0-r2.ebuild
+++ b/app-text/atril/atril-1.24.0-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 MATE_LA_PUNT="yes"
 
-PYTHON_COMPAT=( python3_7 )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit mate python-any-r1 virtualx
 
diff --git a/app-text/bibutils/Manifest b/app-text/bibutils/Manifest
index b4d16c363412..71d96696e580 100644
--- a/app-text/bibutils/Manifest
+++ b/app-text/bibutils/Manifest
@@ -1,5 +1,3 @@
 DIST bibutils_6.10_src.tgz 590002 BLAKE2B 91ea6c961978d381a65c1d5071c541409609dd9fdeb664cd7e66eb4871c2ecd0dfd6b06857294ae6ec049751a5939be23518782a5e1f14fdf848918849269402 SHA512 43cf107ee6d1bf6bf27a6bf46e1f4cbd83a4b78ef355730a9f37282fac399ee21d78538248730be85c0a8f724344782dcc6ab68e50f857d8ac4ea24cc4102911
-DIST bibutils_6.7_src.tgz 580792 BLAKE2B 29c5863bc414ef7b2f362d95352c0e042c1bcc3275017df82b0206d96520b3f5c3fe1e12563577b84a8bd94b0677bf1ad04ecbd80dcbcc194a71037bbd6facba SHA512 08db07408eee26bce42dbd00b7e821ef41dc12c7ce847425e81145927bcfc6ea7180ff719056e089917811aa9675a09dd52e1e02b8187b8618f67647efcb1236
-EBUILD bibutils-6.10.ebuild 787 BLAKE2B f9c8ab8eeb0ffd5102b7c0a2131f1091a32a2757e02f6ef31c71570c5bee85286cb1c85cd6748a454d4ea6bcf1f64cdf5f3e2648f6cb20e500170a700dbecb8c SHA512 01d36badaf6b0369d82173e20f50f0c8c27c0255e058e544e6294f0b9e44c4ed1e6fc971dbec72243a34374e2f9e6a7b2932e89378f81da5bc93d987da0ad9fd
-EBUILD bibutils-6.7.ebuild 1358 BLAKE2B 2377af5aaafc016c14a8b0f60d4d292ac334307d5303fca1c6daef64aafc077eaae93cf9c48048681805743f7bd4ab6feb7e91e8746d425037657b0001076ce9 SHA512 42582a705867653304c13bbac9a860892000c6ef3f8d11f69bdc7f6150fea61a27910e18d11fd24f30435be3d5fc1988a3b4d991a790e34a1c67910d107c887c
-MISC metadata.xml 249 BLAKE2B 03207049d5e7c62319639b2c37769d9d8c0d9cbf1e44fbc6cab9ea006e60bff3526193fea60902a0e64a362b02463104969700074602e31d8fb8f86a042d1ed8 SHA512 29a9c1817fd4299246d5fa995b73b9f1996b112b70f468139cf9cd8f07077d831e0788d3b93aaba67bb38dce5850830c27543fccbddbac02b0da4ff899def519
+EBUILD bibutils-6.10.ebuild 786 BLAKE2B 69b2c6974fcae13f854ed65a231721d54a2b8111dfa2e37c1e58e09534b108043fd12d9390195e26f3316ae45ead4de445057873ec7fa861c6dfc06fb07d234c SHA512 06f292f7569893b17a3f996fc9c474d7e26db3415ee6ff74c263a4ca5b12ac8fe30733230098101d7bbd8acd524497ad2c892f8e334dbfbcd19118bec4438847
+MISC metadata.xml 331 BLAKE2B 4c03c4b29798f311d30bc4056784f3f999a703ace4e099ba980c4af28b858e712d7b59c73f0fa9899e06ac83d5b29076a1711753685e61dff49253a9822159cc SHA512 7f5bdb652e9a72fa17c0194acd99ad9c72197f3a434af9ab35635e940a7ecf03bfa7bc469b828256a378f7c657a104de8f3e3dfe9c2e7f65e7854fc4d646cbbe
diff --git a/app-text/bibutils/bibutils-6.10.ebuild b/app-text/bibutils/bibutils-6.10.ebuild
index fca15d38d420..fb3e20024c41 100644
--- a/app-text/bibutils/bibutils-6.10.ebuild
+++ b/app-text/bibutils/bibutils-6.10.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/app-text/bibutils/bibutils-6.7.ebuild b/app-text/bibutils/bibutils-6.7.ebuild
deleted file mode 100644
index ae30674daea3..000000000000
--- a/app-text/bibutils/bibutils-6.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-MY_P="${PN}_${PV}"
-DESCRIPTION="Interconverts between various bibliography formats using common XML intermediate"
-HOMEPAGE="https://sourceforge.net/p/bibutils/home/Bibutils/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_configure() {
-	# The custom configure script still sucks several releases later, so we'll
-	# just do its job ourselves
-	rm -f Makefile configure || die "Failed to purge old Makefile"
-	sed \
-		-e "s:REPLACE_CC:$(tc-getCC):g" \
-		-e "s:REPLACE_EXEEXT::g" \
-		-e "s:REPLACE_LIBTARGET:libbibutils.so:g" \
-		-e "s:REPLACE_LIBEXT:.so:g" \
-		-e "s:REPLACE_CFLAGS:${CFLAGS}:g" \
-		-e "s:REPLACE_CLIBFLAGS:${CFLAGS} -fPIC:g" \
-		-e "s:REPLACE_RANLIB:$(tc-getRANLIB):g" \
-		-e 's:REPLACE_POSTFIX::g' \
-		-e "s:REPLACE_INSTALLDIR:\"${D}/usr/bin\":g" \
-		-e "s:REPLACE_LIBINSTALLDIR:\"${D}/usr/$(get_libdir)\":g" \
-		-e 's:make:$(MAKE):g' \
-		Makefile_start > Makefile \
-		|| die "Failed to set up Makefile"
-
-	cp lib/Makefile.dynamic  lib/Makefile || die
-	cp bin/Makefile.dynamic  bin/Makefile || die
-	cp test/Makefile.dynamic test/Makefile || die
-}
-
-src_install() {
-	dodir /usr/bin
-	emake install
-	dodoc ChangeLog
-}
diff --git a/app-text/bibutils/metadata.xml b/app-text/bibutils/metadata.xml
index 0c6991d7902b..cc8df557e380 100644
--- a/app-text/bibutils/metadata.xml
+++ b/app-text/bibutils/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>sci@gentoo.org</email>
-	<name>Gentoo Science Project</name>
-</maintainer>
+	<maintainer type="project">
+		<email>sci@gentoo.org</email>
+		<name>Gentoo Science Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="sourceforge">bibutils</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/blahtexml/Manifest b/app-text/blahtexml/Manifest
index 8ddb3e1b7970..45aae7cf9386 100644
--- a/app-text/blahtexml/Manifest
+++ b/app-text/blahtexml/Manifest
@@ -1,6 +1,6 @@
 AUX blahtexml-0.9-Makefile.patch 1811 BLAKE2B c84ab5b3781413ff04e771849514ec244354a39c65d3568d698f48bd1b77d13374664e72007d0a8ab9cf69c10398d01f7d8c3cf63a7759a4bc66b566836deab1 SHA512 e27fc386b4392d33fe6b78379d364d3b17586c12843acf18fa16244169d151f8e750804289114c24f179fca6b0abe94f4eb622089af90c538dd7e9f3182d8d18
-AUX blahtexml-0.9-gcc-4.7.patch 672 BLAKE2B 37e3ed661675e36d833f9dcdc535de3ba62ba57fa283f39af7981659d8739798a6d76adf831c042f24813cdcb0f1495f978e5fd822b11a1064cb22e3d7b0cbb4 SHA512 d683ea1113f4aaefb692b8a7b0cb7365673c835fa3c85e229243d0c96ee2b2ff52026dec96d1670cc0e42f1fa9124dfd547445e6e5b0a85f462e881f177d2ad4
+AUX blahtexml-0.9-gcc-4.7.patch 614 BLAKE2B 1b4f8418c1a5d18271a721328c68dfe86ff9e1ddb4900557e35503a3c1af791d21f8b1ae1cf63045826d0d95c9968a197a9435a5a7fe28015a778ec8c2db02f6 SHA512 2f4d65ae7aec887bcee4719f23cfef762f0a25a4815e86691df86e7675e600211e285a6aab8389cff7adc9899a669a34caa70da5fa42d80c7257636d11ff4eee
 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 789 BLAKE2B d3f1c35c603c0807449ac9bc33606053202a28cdd60278ef2a65e6fa714d17006ae665f4714a23fc87b165cf8da5ff662f21f7db89d42817e765f3c90ea41b59 SHA512 2ab8a905959213729a6ce826cc17f5e3b433523d1df2469354dcaaf5f5bdbc8fe755e133b8c403eeb803bdde3344e2993a55fa001e18c766dec40e6264860610
+EBUILD blahtexml-0.9.ebuild 822 BLAKE2B 815fc988c5a323fdd3f285bb9c4fb15233165458efcf7c5f24b95c05310b8fdef2e956bdad898e20cb574bc855612e4789f5545e64f58b1e318386034b262671 SHA512 7fa1dedf01f73cc8bf7f9fc4f1e083a951fccd5bd68ebd14ff56c61a04f1f7033afa40364bbd5b893cbb5c2aaa813da39306728b203713f4db22fca2e9e02474
 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 7a32d14559cd..f470b6197643 100644
--- a/app-text/blahtexml/blahtexml-0.9.ebuild
+++ b/app-text/blahtexml/blahtexml-0.9.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="TeX-to-MathML converter"
 HOMEPAGE="http://gva.noekeon.org/blahtexml"
@@ -15,16 +15,24 @@ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86"
 IUSE="doc"
 
 RDEPEND="dev-libs/xerces-c"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 	doc? (
 		app-text/texlive-core
 		dev-libs/libxslt
-		dev-tex/latex2html )"
+		dev-tex/latex2html
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-{Makefile,gcc-4.7}.patch
+)
 
 src_prepare() {
-	tc-export CC CXX
-	epatch "${FILESDIR}"/${P}-{Makefile,gcc-4.7}.patch
+	default
+
+	tc-export CC CXX PKG_CONFIG
 }
 
 src_compile() {
diff --git a/app-text/blahtexml/files/blahtexml-0.9-gcc-4.7.patch b/app-text/blahtexml/files/blahtexml-0.9-gcc-4.7.patch
index c570e1de679b..9b3e53047fb3 100644
--- a/app-text/blahtexml/files/blahtexml-0.9-gcc-4.7.patch
+++ b/app-text/blahtexml/files/blahtexml-0.9-gcc-4.7.patch
@@ -2,8 +2,8 @@ Description: Fix FTBFS with gcc 4.7 by fixing missing <unistd.h> includes.
 Author: Cyril Brulebois <kibi@debian.org>
 Bug-Debian: http://bugs.debian.org/667116
 
---- blahtexml-0.9.orig/Source/main.cpp
-+++ blahtexml-0.9/Source/main.cpp
+--- a/Source/main.cpp
++++ b/Source/main.cpp
 @@ -24,6 +24,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIG
  #include <stdlib.h>
  #include <sstream>
@@ -12,8 +12,8 @@ Bug-Debian: http://bugs.debian.org/667116
  
  using namespace std;
  using namespace blahtex;
---- blahtexml-0.9.orig/Source/mainPng.cpp
-+++ blahtexml-0.9/Source/mainPng.cpp
+--- a/Source/mainPng.cpp
++++ b/Source/mainPng.cpp
 @@ -27,6 +27,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIG
  #include <stdio.h>
  #include <stdlib.h>
diff --git a/app-text/bogosort/Manifest b/app-text/bogosort/Manifest
index 0201c0572d8d..4aed3b7f9f75 100644
--- a/app-text/bogosort/Manifest
+++ b/app-text/bogosort/Manifest
@@ -1,5 +1,6 @@
-AUX bogosort-0.4.2-glibc-2.10.patch 1479 BLAKE2B 6d5a6e9ff7f43a5275e8db8d1478a06ab69863105ffdfb3ed821bdbb7b901f2b0ed9b9158ee0795ca4e1dc01b01c5a3fdaedf5bd4996d3d9bc5ec4a89492e6eb SHA512 742b473df18b8eee876857fc3fa14bacc95bce4e14d083deb066d4451385437cd040cf40b6c572762c047b1aaa3e2ee973f2d880c5915993bf6a4ba130a776e4
-AUX xmalloc.patch 395 BLAKE2B 0ec83824e8ac740512c3c241cf2df352ca5b5d05a38507288fe5f96512eebb94d5532af0cfb6e05fcfcac9c10c96091584b917966629268e9921d964e8adb0c5 SHA512 c1479f342d71e1c53a2b038bc7bf858292c6585b8360b41c6006a4ef0efbafc3260cf8523efedee945c084247851186dda3450ab0533465c33176b038a8c0243
+AUX bogosort-0.4.2-glibc-2.10.patch 1141 BLAKE2B f920abc08b250297c3569cab2c6bb1d8f5f1ff29ae352ba1664fd576bb6929c08c447062e4a2577e82f74c26bf7ae70724ab2bf9e0b600c2bebf36aa9d6c32e6 SHA512 4eecb3ce4463054ae0fe83a909951abb5db27d1b9adcec4d9206a07166c324fb568fe894930f7eed12e7f85c543df3ae36e13a4df301950654c801d268007e41
+AUX bogosort-0.4.2-implicit-decl.patch 786 BLAKE2B cf35c37e2d79e71f56bb0aef7ae6cba8340c4da8eb0cff9e78322e85a8fadb5132c448866cd1aef822c8fbe8fb68c91ef51a7f900da68158fe19aa454603157e SHA512 ec07bea1762cafd6f50706a5a22277305c6e5d856488dd6b9c50dc3e07876329229dd3d16e0de31e8b82f2a3da58cc3f02fea226328351b591c6628670a00eaa
+AUX xmalloc.patch 322 BLAKE2B 577c24ee19016f67f7c7e4510b60c8bdcbfcbb340f34def3efc1d3100f5f4e65dad74f16a6c1052b5c21b3341ba1967b97c95c7dcc56398160884608fb66cca8 SHA512 7a600c173db0502b42163474d75a50b1af539a55d704b000f7c9189af563569db8026499f082e02fe935a6b5fec7dd4a1c40cb2f224c8e96b7b0286ddb798191
 DIST bogosort-0.4.2.tar.gz 161628 BLAKE2B 92abbb809747e3fdfd2a6e33f7f753f1ddccd4ecd9883f0a02fc843f8f680e0a5e6e6b65c3943708ed074a944e5187bb889297365ae0dd34292215b056bd46fc SHA512 2d2f7be36ec08aa78323cbdc5f1030297706c364d6fc82554065cf737295d11c90dd6061323f2732b63c70401d710b2018075bff6d1e6ab0078069b405ea62e9
-EBUILD bogosort-0.4.2-r1.ebuild 689 BLAKE2B 2d8ccfe27f2dad5b91e6efb908e232f7b2aa08570442c1fffecbfe74669cbaf2bb0bf9bd7a9020a0507b6bec506bb327e958020a4e58f2e29e1e099b8e43fb50 SHA512 3e62d6ad521595f78f41d99561668e87f9bbeac80363c7472fca13353b9106ef70c7246d62081ae8f99606c7eda547f28ee454c4e373e41ce38216a3f7e504d7
+EBUILD bogosort-0.4.2-r1.ebuild 835 BLAKE2B 8ae3edd69ecd40f9d3d4b1dee28198d31ee56b7402bae2d8c7fa0fc89be96ad72e51107738edd313f59dd257e2bac649878db8058f3a4bc66ee1c5bd8a6baadd SHA512 ae6fc5959696aa2f3102799592c33035ccb7152d92de7b9ae8836bda327ba4d05c5323fca7a5b191b9fe6861047471c6f72ca4424309270d922175c96b94bcac
 MISC metadata.xml 500 BLAKE2B aeef2d2944fbcde35a34db35b8461e3fb22d5da60e0e6fee48cecbcd45991d44aa4511e0907587369c2a7c7bf2c735260ed516b5b9292e1fb60bd7a2e9c3859d SHA512 4975f3dcbf7a97db8c64835a83f45a0be5d3c34aaa9fe9f8b2e2e8bd5aaf102fe35a2f4dc609bbcd115ad08d86707818033c7b7759c17a3f233417af67604edb
diff --git a/app-text/bogosort/bogosort-0.4.2-r1.ebuild b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
index c8b07c12cae0..a8a12ad1ae77 100644
--- a/app-text/bogosort/bogosort-0.4.2-r1.ebuild
+++ b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="A file sorting program which uses the bogosort algorithm"
 HOMEPAGE="http://www.lysator.liu.se/~qha/bogosort/"
@@ -12,15 +12,23 @@ SRC_URI="ftp://ulrik.haugen.se/pub/unix/bogosort/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ~mips ppc sparc x86 ~x86-linux ~ppc-macos"
-IUSE=""
 
-DEPEND=""
-RDEPEND=""
+PATCHES=(
+	"${FILESDIR}"/xmalloc.patch
+	"${FILESDIR}"/${P}-glibc-2.10.patch
+	"${FILESDIR}"/${PN}-0.4.2-implicit-decl.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/xmalloc.patch \
-		"${FILESDIR}"/${P}-glibc-2.10.patch
+	default
+
+	mv configure.{in,ac} || die
+
+	sed -i \
+		-e 's:-O0::' \
+		-e '/maintainer-targets/d' \
+		Makefile.am || die
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch b/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch
index ac54c8b61b05..98a9eceb1377 100644
--- a/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch
+++ b/app-text/bogosort/files/bogosort-0.4.2-glibc-2.10.patch
@@ -1,6 +1,5 @@
-diff -ur bogosort-0.4.2.orig/getlines.c bogosort-0.4.2/getlines.c
---- bogosort-0.4.2.orig/getlines.c	2002-05-04 23:22:22.000000000 +0300
-+++ bogosort-0.4.2/getlines.c	2009-08-06 14:32:22.000000000 +0300
+--- a/getlines.c
++++ b/getlines.c
 @@ -49,7 +49,7 @@
      char **ss = NULL;
  
@@ -28,9 +27,8 @@ diff -ur bogosort-0.4.2.orig/getlines.c bogosort-0.4.2/getlines.c
  {
      int c, numchars = 0, allocated = 0;
      char *s = NULL;
-diff -ur bogosort-0.4.2.orig/getlines.h bogosort-0.4.2/getlines.h
---- bogosort-0.4.2.orig/getlines.h	2002-03-16 00:04:38.000000000 +0200
-+++ bogosort-0.4.2/getlines.h	2009-08-06 14:32:48.000000000 +0300
+--- a/getlines.h
++++ b/getlines.h
 @@ -39,6 +39,6 @@
   * getline: return a pointer to a newly allocated string containing the next
   * line in stream
diff --git a/app-text/bogosort/files/bogosort-0.4.2-implicit-decl.patch b/app-text/bogosort/files/bogosort-0.4.2-implicit-decl.patch
new file mode 100644
index 000000000000..2eefc4099fa4
--- /dev/null
+++ b/app-text/bogosort/files/bogosort-0.4.2-implicit-decl.patch
@@ -0,0 +1,38 @@
+diff --git a/xmalloc.c b/xmalloc.c
+index a2c7689..dd00346 100644
+--- a/xmalloc.c
++++ b/xmalloc.c
+@@ -29,6 +29,7 @@
+ 
+ #if STDC_HEADERS
+ # include <stdlib.h>
++# include <string.h>
+ #else
+ VOID *calloc ();
+ VOID *malloc ();
+diff --git a/system.h b/system.h
+index 993dd36..b9fee80 100644
+--- a/system.h
++++ b/system.h
+@@ -159,20 +159,7 @@ struct utimbuf
+ 
+ /* Don't use bcopy!  Use memmove if source and destination may overlap,
+    memcpy otherwise.  */
+-
+-#ifdef HAVE_STRING_H
+-# if !STDC_HEADERS && HAVE_MEMORY_H
+-#  include <memory.h>
+-# endif
+-# include <string.h>
+-#else
+-# ifndef HAVE_STRCHR
+-#  define strchr index
+-#  define strrchr rindex
+-# endif /* HAVE_STRCHR */
+-char *strchr(), *strrchr();
+-char *memchr ();
+-#endif
++#include <string.h>
+ 
+ #include <errno.h>
+ #ifndef errno
diff --git a/app-text/bogosort/files/xmalloc.patch b/app-text/bogosort/files/xmalloc.patch
index 41545ca34ba8..ed137e83727c 100644
--- a/app-text/bogosort/files/xmalloc.patch
+++ b/app-text/bogosort/files/xmalloc.patch
@@ -1,5 +1,5 @@
---- xmalloc.c.orig	2004-12-15 23:44:16.880786468 +0100
-+++ xmalloc.c	2004-12-15 23:44:21.846546805 +0100
+--- a/xmalloc.c
++++ b/xmalloc.c
 @@ -68,12 +68,6 @@
     The caller may set it to some other value.  */
  int xmalloc_exit_failure = EXIT_FAILURE;
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index c0bb35677dd6..25b47e4f802b 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,3 +1,3 @@
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-EBUILD build-docbook-catalog-1.21.ebuild 1046 BLAKE2B be8bc32f58722ad67f4599bef10e847b75d43068c03c2be0ecfa6d8598f04cf73dea0e1c15b9be3b248bc9f19135d42f55990adecf28b4b9f4c98afe4b76e276 SHA512 4762c79b15b211e3afc0bf0389deada685b538334d5b05413d6c782f7292cac7d12a7e81b38d74ade14299523fd964389f27adf5e76ca413b8640da53171693f
+EBUILD build-docbook-catalog-1.21.ebuild 1047 BLAKE2B 1177894ea7aae61fa11faff28d57446d3bb4122eaf981c534965b0c9cb4c0ce63ca350cc931bade5a43c4eeb09f9bd5f7b8fe508fa0e088df6bd06676dff9e2b SHA512 0275ad1fd268dc1fe65ca15bb74f22dfe6dd739b9a8e9f15556524d151346f190ee2f557a94be9a1610acb9fbacad796e82e124045f4352a33de8c12cb6db352
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
index 00efd553725c..faaa5b36fd23 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-libs/libxml2
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 165359188aac..8ea6d47f95c4 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -6,6 +6,8 @@ AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb8
 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-5.13.0.tar.xz 36746972 BLAKE2B b011114fa558c2dd7418a449b2a43bbbbe6e850ad6ba14bdb8ee70d63b475839a6f489eb273c1c88eb841156feee1f0a6f13b19a38eab11820e8e14a05242a6d SHA512 99f2e007af70e4de9ffc05fc4ed41ac3e62ed5196d05e066ab2624e15694f8a0aa149769e0a2cf163f59e330ed7ab43bc938e65064ac2a9825d641b1735f13cf
+DIST calibre-5.16.0-SIP-v4.patch.xz 6768 BLAKE2B b939233266c7cab0fa71ccdeb748bbcffbf16248081ccf0ab313420fe3898954da71e0796b3d6c44e93c636113221f95fa6affc6be97bf41f4086a909b2849f9 SHA512 eb19e6bb328f60eb4af2c38d54c3d2a09989d41d71d27de10ab5ae443af902c3c12fc70042d4735dd785573cb63bb7d7a10ae5f7ed72afc1e1a9c6aacaf64aec
+DIST calibre-5.16.1.tar.xz 36757204 BLAKE2B 71114eed723180142f5428a680d8c5ceabcd007acbc6a70a9298e45a9f21fc793f0ef86bf60b36c96bbd15e9e3f8d8638d179872fb6ff1f9b9f5e31a93e65ba1 SHA512 41cf29cc32c7af08215baf80609f8f099d44f2b82d34181451cbf3ed1648e07d64712dba9ff0ddec5bad3d342c7d8bde40bb822f6bd5fb93a4b29d25cf188aae
 DIST calibre-5.4.2-SIP-v4-04ad7b.patch 1534 BLAKE2B a0d3a49e13499ec55098c8639ba93c21e04a1b23b857ca8c7e0cb665f6e40b138f44a13c78b7a240784919effa9870817b2ec7ce5b494448807a4b77dd95b06f SHA512 f0acd97fc57bce9b22dd2061be7a85f4b39b7a9c3492304dec4108ede087a9e58ee886e21734823021709686dc1317f41eb1ac99a947a7dc07660b5c1849bc1b
 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
@@ -13,6 +15,7 @@ DIST calibre-5.6.0.tar.xz 36653328 BLAKE2B 44941c50873c285aa552c5b4ac716e5d3dd6b
 EBUILD calibre-4.22.0.ebuild 8777 BLAKE2B b78353ba501d4ac3368da8299922e33fe2d7fc58664ff5ca05b266b0925118c866fc2716f41a9c106c8a3c837826c2980bdff44459fef341625515e8fdc768c6 SHA512 88b39be1bbeafbf26b4b0ffd1e0db7384dcbacf6a70c38b0faed20b60d9e1cbaf78630de58876fdd8aa92d54c8d22861ff94a4c489f44448ebcd7aa0ea9877b2
 EBUILD calibre-4.23.0.ebuild 8820 BLAKE2B 0261c81666ec54dfe6f57f39c8ca053fcec41a1c517fb529114c9717821279dc3ad3b0ea58c27674db50af66bacb5a45149ca4713890915b90d98cea35b95005 SHA512 664e403f05da722425f51d6d95dc7acbadabbbffd2f82aee483b3cccee83ae5f13d13108987e82020625e018278c5f42626f78cdc2d851edf3e1fdd2c2c00a4c
 EBUILD calibre-5.13.0.ebuild 8749 BLAKE2B 409524828435e53a9e6db54d1c53db7a1279090473667cf8efbdc2ef7fbfe24696bf77ad079352b7af5a0cf36d9dca600fde92fa47045546c881a922e0b3ae4d SHA512 ecca2407914b1b9a94a8cb6a52759154e01669b5187b00364a544f3c18d1132373670747362e99f0c1d4c7de4c5a37d8d9efae5d614ec1f1eb8c50ca8edd889a
+EBUILD calibre-5.16.1.ebuild 8630 BLAKE2B 743341235c45d100dc119734e0c39ae07283645dae857e752ac73935f2ad683cff99bd2459b31c71259834e77a59c16a9270bdbfe959e2a062e4cad26ed7edad SHA512 44bb0e646a73bb7c943c19dd4c6611f08e1c6bf01ec906966c06475314df50754e3aca541caf6d50fccf883b4418ac97a9f47f3c6d38d26051f23d9ceaa6c688
 EBUILD calibre-5.4.2-r1.ebuild 8769 BLAKE2B 89ceb815e215bded42d3be69be882a973fc86f4bcb30871c7cceb527113e83185f71a7c230af5320e44b20f433c84d3ebe71d937c7b3af2c83cc902fca20e1ce SHA512 d445de23fa2826877e562f9b95a21bba21a173dc244d68320c39110215b58a0ee32cabf57edd4184ed571b50ce898a1725877122aab195f62a813a638d4b4a2f
 EBUILD calibre-5.6.0.ebuild 8713 BLAKE2B a26ee08f18f7e819a6d28e18162036b67a1bbb6459a7a3be5afee012ee9fc254f83c29fb0953ed9310cda882dbdd36a6819101e707418be2b70f26077a78d6a4 SHA512 592fce01d289f6c3206e0ba9d7139122f767bb035acff99bc5c73a88752759458b03eb50c93c99b941b6b39b59b1dc6a16b3cceb8929dd501caace7c38d829f7
 MISC metadata.xml 303 BLAKE2B f50da5b3e8c1e9b4553180ccce38939e7c8e11e5a0527f94c3df7ac4d93a37d5e838c633e58b3fe960dc60ce52c6c6ec6901eedbcd99039c0cc1ccf6dc8a0a44 SHA512 38da4e43d91a3a1d1adf6daf32e4ec69696ab7df6179788fbda75a40219acf01cedbff28943c0b169b2de9f490f3a324285294a9b2783c90757c8cd23aa9e847
diff --git a/app-text/calibre/calibre-5.16.1.ebuild b/app-text/calibre/calibre-5.16.1.ebuild
new file mode 100644
index 000000000000..f6277c0e2d9c
--- /dev/null
+++ b/app-text/calibre/calibre-5.16.1.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..9} )
+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://dev.gentoo.org/~zmedico/dist/calibre-5.16.0-SIP-v4.patch.xz"
+
+LICENSE="
+	GPL-3+
+	GPL-3
+	GPL-2+
+	GPL-2
+	GPL-1+
+	LGPL-3+
+	LGPL-2.1+
+	LGPL-2.1
+	BSD
+	MIT
+	Old-MIT
+	Apache-2.0
+	public-domain
+	|| ( Artistic GPL-1+ )
+	CC-BY-3.0
+	OFL-1.1
+	PSF-2
+"
+KEYWORDS="~amd64 ~arm ~x86"
+SLOT="0"
+IUSE="ios +udisks"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+	>=app-text/hunspell-1.7:=
+	>=app-text/podofo-0.9.6_pre20171027:=
+	>=app-text/poppler-0.26.5[qt5]
+	dev-libs/glib:2=
+	dev-libs/hyphen:=
+	>=dev-libs/icu-57.1:=
+	dev-libs/libinput:=
+	>=dev-libs/dbus-glib-0.106
+	>=sys-apps/dbus-1.10.8
+	$(python_gen_cond_dep '
+		>=dev-python/apsw-3.25.2_p1[${PYTHON_MULTI_USEDEP}]
+		dev-python/beautifulsoup:4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/chardet-3.0.3[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/cssselect-0.7.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/css-parser-1.0.4[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/dbus-python-1.2.4[${PYTHON_MULTI_USEDEP}]
+		dev-python/dnspython[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/feedparser-5.2.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html2text-2019.8.11[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/html5-parser-0.4.9[${PYTHON_MULTI_USEDEP}]
+		>=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.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}]
+		>=dev-python/pychm-0.8.6[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/pygments-2.3.1[${PYTHON_MULTI_USEDEP}]
+		>=dev-python/python-dateutil-2.5.3[${PYTHON_MULTI_USEDEP}]
+		>=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=
+	dev-qt/qtgui:5=[jpeg]
+	>=dev-qt/qtwebengine-5.12
+	dev-qt/qtwidgets:5=
+	dev-util/desktop-file-utils
+	dev-util/gtk-update-icon-cache
+	media-fonts/liberation-fonts
+	media-libs/fontconfig:=
+	>=media-libs/freetype-2:=
+	>=media-libs/libmtp-1.1.11:=
+	>=media-libs/libwmf-0.2.8
+	>=media-gfx/optipng-0.7.6
+	>=sys-libs/zlib-1.2.11:=
+	virtual/libusb:1=
+	x11-libs/libxkbcommon:=
+	x11-libs/libX11:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	x11-misc/shared-mime-info
+	>=x11-misc/xdg-utils-1.0.2-r2
+	ios? (
+		>=app-pda/usbmuxd-1.0.8
+		>=app-pda/libimobiledevice-1.2.0
+	)
+	udisks? ( virtual/libudev )"
+RDEPEND="${COMMON_DEPEND}
+	udisks? ( sys-fs/udisks:2 )"
+DEPEND="${COMMON_DEPEND}
+	$(python_gen_cond_dep '
+		>=dev-python/setuptools-23.1.0[${PYTHON_MULTI_USEDEP}]
+		dev-python/sip[${PYTHON_MULTI_USEDEP}]
+	')
+	>=virtual/podofo-build-0.9.6_pre20171027
+	virtual/pkgconfig"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 6 ]]; then
+		eerror "Calibre cannot be built with this version of gcc."
+		eerror "You need at least gcc-6.0"
+		die "Your C compiler is too old for this package."
+	fi
+}
+
+src_prepare() {
+	# no_updates: do not annoy user with "new version is availible all the time
+	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
+	eapply \
+		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
+		"${FILESDIR}/${PN}-disable_plugins.patch" \
+		"${WORKDIR}/${PN}-5.16.0-SIP-v4.patch"
+
+	eapply_user
+
+	# Fix outdated version constant.
+	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
+	#	-i src/calibre/constants.py || \
+	#	die "sed failed to patch constants.py"
+
+	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
+	# calls xdg-* (bug #258938).
+	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
+		-e "s|, PreserveMIMEDefaults():|:|" \
+		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
+		-e "s|cmd\[2\]|cmd[4]|" \
+		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
+		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
+		-i src/calibre/linux.py || die "sed failed to patch linux.py"
+
+	# Disable unnecessary privilege dropping for bug #287067.
+	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
+		-i setup/install.py || die "sed failed to patch install.py"
+
+	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
+\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
+'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
+'-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"
+}
+
+src_install() {
+	# calibre works with python 3, so remove the python 2 constraint
+	export CALIBRE_PY3_PORT=1
+
+	# Bypass kbuildsycoca and update-mime-database in order to
+	# avoid sandbox violations if xdg-mime tries to call them.
+	mkdir "${T}/bin" || die
+	cat - > "${T}/bin/kbuildsycoca" <<-EOF
+	#!${BASH}
+	echo $0 : $@
+	exit 0
+	EOF
+
+	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"
+
+	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
+	# violation with kbuildsycoca as in bug #287067, comment #13.
+	export -n DISPLAY
+
+	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
+	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
+	#    return _parse_localename(localename)
+	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
+	#    raise ValueError, 'unknown locale: %s' % localename
+	#ValueError: unknown locale: 46
+	export -n LANG LANGUAGE ${!LC_*}
+	export LC_ALL=C.utf8 #709682
+
+	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
+	# variables to point to our fake temporary $HOME.
+	export HOME="${T}/fake_homedir"
+	export XDG_CONFIG_HOME="${HOME}/.config"
+	export XDG_DATA_HOME="${HOME}/.local/share"
+	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
+	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
+
+	tc-export CC CXX
+	# Bug #334243 - respect LDFLAGS when building extensions
+	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
+	local libdir=$(get_libdir)
+	[[ -n $libdir ]] || die "get_libdir returned an empty string"
+
+	addpredict /dev/dri #665310
+
+	PATH=${T}/bin:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
+	"${PYTHON}" setup.py install \
+		--root="${D}" \
+		--prefix="${EPREFIX}/usr" \
+		--libdir="${EPREFIX}/usr/${libdir}" \
+		--staging-root="${ED}/usr" \
+		--staging-libdir="${ED}/usr/${libdir}" || die
+
+	find "${ED}"/usr/share -type d -empty -delete
+
+	cd "${ED}"/usr/share/calibre/fonts/liberation || die
+	local x
+	for x in * ; do
+		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
+		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
+	done
+
+	einfo "Converting python shebangs"
+	python_fix_shebang --force "${ED}"
+
+	einfo "Compiling python modules"
+	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
+}
+
+pkg_preinst() {
+	# Indentify stray directories from upstream's "Binary install"
+	# method (see bug 622728).
+	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
+	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
+		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
+}
+
+pkg_postinst() {
+	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
+	local x
+	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
+		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
+			elog "Purging '${x}'"
+			rm -rf "${x}"
+		fi
+	done
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	xdg_icon_cache_update
+}
diff --git a/app-text/chasen/Manifest b/app-text/chasen/Manifest
index 2eb05c8c70b9..14f43dc9aa2d 100644
--- a/app-text/chasen/Manifest
+++ b/app-text/chasen/Manifest
@@ -1,4 +1,4 @@
 AUX chasen-2.4.4-cve-2011-4000.patch 559 BLAKE2B ee5085a642c1b04ab5cefeaedd09690f988e5cb600953d0ffecd479fe8ddc207e67a27980ebb3df2fbf31dab1f9cc55d597ea09d25dd0c0b29b8fe1d0eddc6c6 SHA512 308a82dfcba13fc33733df853f0abf9979f2d8ff18e1c3f552ac7cd3b6c844dd40e125790fa62844a326ef7e546d0b24fc01c801f3e6cee0aa8b7b2a08474623
 DIST chasen-2.4.4.tar.gz 845720 BLAKE2B ae18e71d78588c108f747abc6f28835f90d0a2c84616a01d87acea2ae5e0e54ef6ff296ebb9dbdce9047a223bd34203cf2763e9b3d4fb28522a4add7bc823860 SHA512 4551d28be6c0de7a585decf03cf5b56def3d181cfdfd975565ac7236e2c3e8cc0bcf5331f1ae309a914f95c6715e13ba3e9d80ebbd6e86c2316a43b7ed831075
-EBUILD chasen-2.4.4-r3.ebuild 1088 BLAKE2B c38191a89acb2d7525698ae899703a02e11bee43b421a2a043c6f7b90802a1081108aa98752a26b5558ed89d4bc5da5a8092646e55458cf9d5b1134bd9bfa280 SHA512 48c130de04beb906397e6dfac10b07f197e64ff5748e933ab77e1e0e4aa958639aeb748dc467b2cf3dcd9a397fde5398e26166aaf8aebd0ce19356275c31b7a5
+EBUILD chasen-2.4.4-r3.ebuild 1088 BLAKE2B 23e3d5d13b60cb4aa0b84d6b8c4d7de319ebc64a017c22b56fa38c40fbdd2accfe081f72e1c7a1abf28f68a6c70e512e9a0cad2a93164520a0bd0aabe9fc28c1 SHA512 8958c36689409d4c4041e9ac65b21d9fb85b5ab5c949adf5d9d7598fd9ca5654ce7b8f914ab4894040a8b00c44c491667e1b070cd77ddc2cbe5f6c95fdf17059
 MISC metadata.xml 320 BLAKE2B a218844660f8614413b8afeec00615885e71d7ba7fc1784496ca28fe8c2d689eedb160dfe56080f24cfa369c0652de87597c14b63ab4879cba1970761c8d2ac8 SHA512 1bf81a4a404bd57dd50b071ec19fa00e17b2a733d3988251d195406a8229d0fb3500498ebbb634f863df5d1d56445ceb1605a470421c54697a130769f0f4263c
diff --git a/app-text/chasen/chasen-2.4.4-r3.ebuild b/app-text/chasen/chasen-2.4.4-r3.ebuild
index 913b177defb5..1e618a384ee1 100644
--- a/app-text/chasen/chasen-2.4.4-r3.ebuild
+++ b/app-text/chasen/chasen-2.4.4-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit eutils ltprune perl-module
+inherit epatch ltprune perl-module
 
 DESCRIPTION="Japanese Morphological Analysis System, ChaSen"
 HOMEPAGE="http://chasen-legacy.sourceforge.jp/"
diff --git a/app-text/cherrytree/Manifest b/app-text/cherrytree/Manifest
index dc55518b29ad..cec05bef592d 100644
--- a/app-text/cherrytree/Manifest
+++ b/app-text/cherrytree/Manifest
@@ -1,4 +1,3 @@
 DIST cherrytree-0.99.0_p20200523.tar.gz 10452221 BLAKE2B cbac9b5b1c4fc1454d229a56784a59f1622b134d640db720e496cc0f1b4f95ee097343572f33d8b0626903f58ae188e8b85065144fcad8c647732e7eddadd0b9 SHA512 4eb142368bd1d3838879669d5bf1742689b02f08f50edd51a6fa6f22fef83d0f1871147aca3c346e9fcd1193c3f494e112cdc9e10eda4b3124587f605f89cc54
 EBUILD cherrytree-0.99.0_p20200523-r1.ebuild 2088 BLAKE2B ba7d653c4736c3efcdfab9c02bcd5179fc5d15915106b33cd93448e5acb1520822ea6751b60b86820fa38fcd1d573efaa19c4cb7d0802fe1b949bc7a4da18809 SHA512 3f350c0d1f0a7f1ef337d6947775846cab20a829b201c0a003daf861ee355a7b4a32b3f2162dbba82c3881631f7b8e1bb8ba4ee6853fc6ae38e75a4631e7f85a
-EBUILD cherrytree-9999.ebuild 2088 BLAKE2B ba7d653c4736c3efcdfab9c02bcd5179fc5d15915106b33cd93448e5acb1520822ea6751b60b86820fa38fcd1d573efaa19c4cb7d0802fe1b949bc7a4da18809 SHA512 3f350c0d1f0a7f1ef337d6947775846cab20a829b201c0a003daf861ee355a7b4a32b3f2162dbba82c3881631f7b8e1bb8ba4ee6853fc6ae38e75a4631e7f85a
-MISC metadata.xml 474 BLAKE2B a271f5a9c93dffce9f0ae9a3f977d3262707fce091f3b74eb40ed334546432cee1d6eddb0f85ede0c9299dbb3b8fd4d922215736380998df83f3eef48461c07a SHA512 95a2ed35beb4f1cc8db913a07f3b7a9ae4e4e601e118fa657cd151b4391400ee8db465109600fae8afbdd91e4ab0383c6deaa40ddbce6c96f8e412639690ee8c
+MISC metadata.xml 250 BLAKE2B 9f586a12b964da0dbeb5a079a39f8145e2e33e41c4edcd5c937d86a1746b0d291ebc8c6bff25def4d8f433577e2eb6f68892028e06c68044274df0ca782ed3a1 SHA512 d64c36dfd03da64937992558c892459cc634ba06c2d988087299b8c02c497be99875a16038246728a6320ecfaf385d03ca30d6f4fc823f3379bb6f0f48875e06
diff --git a/app-text/cherrytree/cherrytree-9999.ebuild b/app-text/cherrytree/cherrytree-9999.ebuild
deleted file mode 100644
index 55a62632c259..000000000000
--- a/app-text/cherrytree/cherrytree-9999.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-
-inherit cmake python-any-r1 xdg-utils
-
-DESCRIPTION="A hierarchical note taking application (C++ version)"
-HOMEPAGE="https://www.giuspen.com/cherrytree https://github.com/giuspen/cherrytree"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/giuspen/cherrytree"
-	S="${WORKDIR}/${P}/future"
-else
-	COMMIT="074a09ce3c1130ec60f5f5a3b8be958337b6d5ab" # 20200523
-	SRC_URI="https://github.com/giuspen/cherrytree/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-	S="${WORKDIR}/${PN}-${COMMIT}/future"
-fi
-
-# GPL-3 — future/src/ct (CherryTree)
-# LGPL-2.1 — future/src/7za (7zip)
-# MIT — future/src/fmt (libfmt)
-LICENSE="GPL-3 LGPL-2.1 MIT"
-SLOT="0"
-IUSE="nls test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-text/gspell:=
-	dev-libs/glib:2
-	>=dev-cpp/glibmm-2.64.2:2
-	dev-cpp/gtkmm:3.0
-	dev-cpp/gtksourceviewmm:3.0
-	dev-libs/libxml2:2
-	dev-cpp/libxmlpp:2.6
-	dev-cpp/pangomm:1.4
-	dev-db/sqlite:3"
-DEPEND="${RDEPEND}
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')"
-BDEPEND="${PYTHON_DEPS}
-	virtual/pkgconfig
-	nls? (
-		dev-util/intltool
-		sys-devel/gettext
-	)
-	test? ( dev-util/cpputest )"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-python_check_deps() {
-	has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	# disable compress man pages
-	sed -i -e \
-		'/install(FILES/s|${MANFILE_FULL_GZ}|${CMAKE_SOURCE_DIR}/data/cherrytree.1|' \
-		CMakeLists.txt || die
-
-	if [[ ${PV} != *9999 ]]; then
-		sed -i \
-			-e "/^set(CT_VERSION/s|\"\(.*\)\"|\"${PV}\"|" \
-			CMakeLists.txt || die
-	fi
-
-	python_fix_shebang .
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPYTHON_EXEC="${PYTHON}"
-		-DUSE_NLS=$(usex nls)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/cherrytree/metadata.xml b/app-text/cherrytree/metadata.xml
index 9b740e32b848..33e0b9203757 100644
--- a/app-text/cherrytree/metadata.xml
+++ b/app-text/cherrytree/metadata.xml
@@ -1,14 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>email@linxon.ru</email>
-		<name>Yury Martynov</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">giuspen/cherrytree</remote-id>
 	</upstream>
diff --git a/app-text/code2html/Manifest b/app-text/code2html/Manifest
index f37518e06c4a..8b60a6f513f6 100644
--- a/app-text/code2html/Manifest
+++ b/app-text/code2html/Manifest
@@ -1,6 +1,6 @@
-AUX code2html-0.9.1-prefix.patch 1393 BLAKE2B 84fc0e9c60772dab33ddee16fe62e96c36c321a92b973006aef6238a78a8aa7d769b14fe8e74fc993112ce7ff227876b8db467e3c10b60ccadab4f26f8b80a0c SHA512 3331c0590e992b098548cc10deffc270b4ed7cb790b747124a2053ba8a96274bcdaa08eaf8513f24a6ec8d9fb6b9bb93f8690a55d00e767085c005dc2e5f7ca4
-AUX code2html-0.9.1-scalar.patch 1435 BLAKE2B aff200017e0cb68ce17a9d8f7ee7eee6576cec4002b04ff4022f37232267169130fe1ab438258daf8f5a32283d99d4911e1203baa02b71486c9da3aef6c35632 SHA512 5e7124876b2888b24792d351d958efc09daee90422cf457a2a820920d6185df0d53dbd68f79acb084e4b4fed45fece8dcfc642ae94f0def78567e4f8366022b6
+AUX code2html-0.9.1-prefix.patch 1397 BLAKE2B aafe82f7970ae42c94b4685ca592baba66f66ed04e2991b6d948717a44339c04850eb08dabb60690183ba969be553626bcadb33ca7916e428616a6525b6b7b0b SHA512 eaa1fe1a79cac901db6de60b0bef4f24154c3cdd5b3ad8e5bccac340eb84af0637707e111bd3e1ce56719147b48d3b1508f03753a7622056d2214bc5a99652b2
+AUX code2html-0.9.1-scalar.patch 1362 BLAKE2B 3f4f543aa68717c51cd84604cbdb818804007cce230baac3e9bcded96cc9bf283681e20a5802a21c86a7797eae96e05e9dc76af61726908d8d4622c848fc6c17 SHA512 dce486e436509c1bb923d5187aaa3ef9ce44a3f2d2d626cbc2e0df4b2ccfabd29e8ee86e2b494208fc3d1f226dd38aa5d56288c8a6bfa90db6794698dd8873e6
 DIST code2html-0.9.1-gentoo_patches.tar.bz2 2666 BLAKE2B 31c750aae9dbe9eddc77840a70535a5a6f1d495aa2015efe4afbded2481f2b7b171a95ab20ffcafd38a953170a6da0e8ccf895fded432ca7a16de6cdbc0d58d0 SHA512 cd478b53f0c11b9b4838a842bd8cb344698c85b1c3e09f03a75214f4002f4748a15f995530d6b6c743a4edb784c8aa703786ec10d3bda971b9485153e7090fdc
 DIST code2html-0.9.1.tar.gz 39811 BLAKE2B 57724d636d53066458b806266fc0a61e44919608ad44d65c540d0b6442e93acd822fcdc68c6c3279614b0887a9b7e6553e2de2c1a27679bd34c971ad1a05d70b SHA512 97fb8cadfe64a389711c58b13b7b5d977849f3a242c32a2456f93d7abd39f5d0a4152416f5c73aa05f151316ea0d8486b2b9923a5390eefec3e9d8253cc0b2d3
-EBUILD code2html-0.9.1-r2.ebuild 1025 BLAKE2B 63d8658b18d577abaf642bc6d0ce868a703294c77217806848799f8bb695215ecdc499db739ac189bd8a38d3306e8250011193dc6c715beda1093902789d94e2 SHA512 c321ed2fe69c976e24911434c1b2ddc8613ba4e4f36ebb99390297090c1aa9ab5f1c34741e7e5834e247c0c09d1ab7ec8986a9d57482154729451d84228cdd5a
+EBUILD code2html-0.9.1-r2.ebuild 985 BLAKE2B 3f7a6363d1f01741cc27bec0b1e69a18c8d427f87f148e2105dc1e162e009dace11067f3ef1e34224d752efbbad26803051b406941fc15a3290e46268167db1b SHA512 a7f2594e8d7baba79c74ef6b1cc70d824a2ffbc657869a39f0faea142d1375a0927426978486762f6dcc9a7f6f21bd170cb404ad5489183921a76c7ce52b1127
 MISC metadata.xml 363 BLAKE2B 7c3380eb1a4e1f2e83e72891a54030ee93e271468afff70a22034736f9a62475f2b275f8ec47b2e4d10de4aa5590987a04db1f0ea64b17b07bf163ced3a6ef3f SHA512 52e56f49ca7fa6b899f18be6602bd2e1c2987e5a4663593cc2e857a47e0f55637585801e656f79029e68d277a2b89d83f27953644fc778f6e7d425e2c3adb00f
diff --git a/app-text/code2html/code2html-0.9.1-r2.ebuild b/app-text/code2html/code2html-0.9.1-r2.ebuild
index d56c83132575..37f32dd7a3c8 100644
--- a/app-text/code2html/code2html-0.9.1-r2.ebuild
+++ b/app-text/code2html/code2html-0.9.1-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils prefix
+inherit prefix
 
 DESCRIPTION="Converts source files to colored HTML output"
 HOMEPAGE="http://www.palfrader.org/code2html/"
@@ -13,27 +13,30 @@ SRC_URI="http://www.palfrader.org/code2html/all/${P}.tar.gz
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-DEPEND=""
 RDEPEND=">=dev-lang/perl-5"
 
-src_prepare() {
+PATCHES=(
 	# Be consistent in color codes (bug #119406)
-	epatch "${WORKDIR}"/${P}-lowercase_color_codes.patch
+	"${WORKDIR}"/${P}-lowercase_color_codes.patch
 
 	# Improved C++ support (bug #133159)
-	epatch "${WORKDIR}"/${P}-cpp_keywords.patch
+	"${WORKDIR}"/${P}-cpp_keywords.patch
 
 	# Improved Ada support (bug #133176)
-	epatch "${WORKDIR}"/${P}-ada_identifiers.patch
+	"${WORKDIR}"/${P}-ada_identifiers.patch
 
 	# For prefix paths
-	epatch "${FILESDIR}"/${P}-prefix.patch
-	eprefixify code2html
+	"${FILESDIR}"/${P}-prefix.patch
 
 	# For newer Perl, bug 523610
-	epatch "${FILESDIR}"/${P}-scalar.patch
+	"${FILESDIR}"/${P}-scalar.patch
+)
+
+src_prepare() {
+	default
+
+	eprefixify code2html
 }
 
 src_install() {
diff --git a/app-text/code2html/files/code2html-0.9.1-prefix.patch b/app-text/code2html/files/code2html-0.9.1-prefix.patch
index cc27296fb71c..fbfc9d6b5356 100644
--- a/app-text/code2html/files/code2html-0.9.1-prefix.patch
+++ b/app-text/code2html/files/code2html-0.9.1-prefix.patch
@@ -1,5 +1,5 @@
---- code2html
-+++ code2html
+--- a/code2html
++++ b/code2html
 @@ -1,4 +1,4 @@
 -#!/usr/bin/perl -w
 +#!@GENTOO_PORTAGE_EPREFIX@/usr/bin/perl -w
diff --git a/app-text/code2html/files/code2html-0.9.1-scalar.patch b/app-text/code2html/files/code2html-0.9.1-scalar.patch
index eddc89a6a8f7..b8f56f1a7d1a 100644
--- a/app-text/code2html/files/code2html-0.9.1-scalar.patch
+++ b/app-text/code2html/files/code2html-0.9.1-scalar.patch
@@ -1,5 +1,5 @@
---- code2html.orig	2002-01-12 22:17:02.000000000 +0100
-+++ code2html	2014-09-24 13:52:52.000000000 +0200
+--- a/code2html
++++ b/code2html
 @@ -1357,7 +1357,7 @@
  								   my @lines = split ( /\n/, $_[0] );
  
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index f581181b3f40..67a8343f5426 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,5 +1,5 @@
-DIST coolreader-3.2.54.tar.gz 13231261 BLAKE2B aac948ab4535238caf0541f25b3fb1332d17aa46dc7b116543d37c4cd5d900f0e7861e1ab745ba455feec236c6dc05fde6faad2f4e378e33441cee7736b22b9f SHA512 11ca3588a3794dcc5c5970dc508ade43e29a9d6db7d8ef01c7f04d7cfad2c50a21f6f333574d057c45c8f6d7eb619b5f0f072b1163327f694dcbdcc4b7539220
 DIST coolreader-3.2.55.tar.gz 13230319 BLAKE2B 1cb414f38b76072f66705370162a28505ba2273282755704bb8ad28a7b0eb2928aba0a929291ae33fdf9ce42b442c4b941740d59f4f329a401470e2fceceef18 SHA512 4eef99c86259642d6a5c3d9eb388a11c27b7438c0f05a055ef61a1df93af567d30fa39790cc5d5b3d10dcaa4b2931a51773f967904ff75f7fff2040f313c09d6
-EBUILD coolreader-3.2.54.ebuild 1839 BLAKE2B 673b2b3ae56bca9431a6e7511cda0d9327f6c84ffa2f5b8d9400380c9b8d7fae57b67f8b8901db1e4a5a1fba8745535ddfe40ef93be5509aa2145c16169a6e94 SHA512 88d66c608f741744c644dd98527cd379082a86d50395fd6413939db28cd5493858704ef8c7f71aee374a3d8cb87b84c512a5815a86dc719280de554a6e2f1c14
-EBUILD coolreader-3.2.55.ebuild 1840 BLAKE2B abd3453c6fe24d69196b10c6046e64ee0ca2639220287955a9453a3f170a85f7da536934518f1486402d593d5e2697be5bd5e90e32b29daf10ee1fcc3525e967 SHA512 a4aa23bd15bd0388e06f782fb90817a70056052277b3ac1cc0c05eab7202ed3ca2dc859809e55a1da0b88a865cad3a428413bf8e2540791f75e8015362769ada
+DIST coolreader-3.2.57.tar.gz 13281238 BLAKE2B 8a6739f38d72b13af7b79160dee8cfc08bd9e54d3698fd44c7f6ad8bd575b1f389c2c349c1e2ef71a55fb0068e9d64b5baa4a0a8b945cdb873e833178d81cbbe SHA512 d5bf46f7dbf19177a54742d5c300002c8b7a504052bd003d2e1a7380ac3460dbe648d7f923d26e6390e9296ce6b090c947204725ab2a30c78f26893868a61161
+EBUILD coolreader-3.2.55.ebuild 1838 BLAKE2B f5c912d33d88c0a9040ca6b495aa7a202b4d1f0eb043a57275fe1e9ff61081ed069acd9ae2c86381d7299a13ebfcc46f4eeb5f5bafe92da6c04c86750b8ea8c7 SHA512 50159e31e21ded5890111091f26ee10d91aab33714130be060d8ba7f4510ea90de2eb5f722be9007f67a2bbb71096ec39df3367f235643dfb97d02b3ecd37f4f
+EBUILD coolreader-3.2.57.ebuild 1840 BLAKE2B abd3453c6fe24d69196b10c6046e64ee0ca2639220287955a9453a3f170a85f7da536934518f1486402d593d5e2697be5bd5e90e32b29daf10ee1fcc3525e967 SHA512 a4aa23bd15bd0388e06f782fb90817a70056052277b3ac1cc0c05eab7202ed3ca2dc859809e55a1da0b88a865cad3a428413bf8e2540791f75e8015362769ada
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.55.ebuild b/app-text/coolreader/coolreader-3.2.55.ebuild
index 7c75f5c7adcc..115cf9e91673 100644
--- a/app-text/coolreader/coolreader-3.2.55.ebuild
+++ b/app-text/coolreader/coolreader-3.2.55.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/buggins/coolreader/"
 
 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.54.ebuild b/app-text/coolreader/coolreader-3.2.57.ebuild
index 9167008cc902..7c75f5c7adcc 100644
--- a/app-text/coolreader/coolreader-3.2.54.ebuild
+++ b/app-text/coolreader/coolreader-3.2.57.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/buggins/coolreader/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="wxwidgets"
 
 CDEPEND="sys-libs/zlib
diff --git a/app-text/dbacl/Manifest b/app-text/dbacl/Manifest
index d777932b3fad..73702856eda3 100644
--- a/app-text/dbacl/Manifest
+++ b/app-text/dbacl/Manifest
@@ -1,5 +1,5 @@
 DIST dbacl-1.14.1.tar.gz 923956 BLAKE2B a98b7e01a0cafaee8178120069beaa6fbfe716eaa02eeb9505aa498f11b1c54ef599ea3a40bbc6ddfe235d571f550381a9c8026e80208c56a4a44a80750f00e1 SHA512 910fe5d8e56a92a643f16eab73fc3376489f303e22c470b3d78428d65340b01073f336ac8febb7d911eae0995f08ba265cac09628efd55a64955814a810b7372
 DIST dbacl-1.14.tar.gz 922969 BLAKE2B 9d16c1736b9bc062135daa2fd810b527324abe1fa4cdab650bee45949c21f44fef4197a09d9059e89bdc36dc038f073e7d67b295f6a460fad5dd22d688bd464d SHA512 1cf0877c8bea9c47e055f9291efbb934b65cfd7d26d4ef375ee9fb154b557c691e760543254c5128eb1a04b0724462078f47477a91c4e396e7096ef88d2d77c9
 EBUILD dbacl-1.14.1.ebuild 703 BLAKE2B 529e455038ca4240ce6d18b6b1e8e8cd09fe3462e2262cb1711c719dda7758597326b5eeb31e53fc6338a92d882c61ba0bdfc9291e381e819a694407bec839ab SHA512 1cebd8459c13ed191bd3b764a122e97391a5671a5d5f0bcc246bb68357f8e8fc8761d8cf46f7d6f89c9da8307c1964ac770b2f2b9f19b32cd437c15957aa787b
-EBUILD dbacl-1.14.ebuild 691 BLAKE2B 76eade783235f2e18be637389418723f932e7c8ac3f6c5487fe8ef1b4071e505f6b20c342ede3a47393f6c2d766126f772a72c020f766fb87beca21aa2c75c4c SHA512 f1e641efd5c91738768db14ce7609ae25dc9ac686b25f772f6b97215a654a379d9952bd034111dabdda8e4053b6445ceda8855ff585edce7b70b3f753e108079
+EBUILD dbacl-1.14.ebuild 692 BLAKE2B 81c2b6a44c5233d71031b1d5b1e7cced88e7ba26a952cefcc756fdbf77fd18d144dfe8ceb0615639ca1b33c26ebb50ad32d558681a9446aacf4b7b2a7c586580 SHA512 535358fc4ceb38dafb62fc3950ef77e8852dd5490b66ecb356ffe67939e630ae7f2444ae6fa8bb37c33f5a4dd82e73c97250619195b3aed385edce7dee9c32d4
 MISC metadata.xml 528 BLAKE2B 3012b17ec6ee1031dbe6b902bfc4e73e0dd3c4b924ec2aade1b48badcab38bb2838c9582b8cb8618b0f48912b79469a0fa1aec4b1790b10f4381c60a14da59fd SHA512 daa208bc4c05d4035c88c350a8d742409eaa916ee9a64ed853b6a1eabbbc174881003807e57811437088cce132f17888c73f494d1eb87fc5dd765f5ba2a240ac
diff --git a/app-text/dbacl/dbacl-1.14.ebuild b/app-text/dbacl/dbacl-1.14.ebuild
index ff1c35d70389..2d58f06146d4 100644
--- a/app-text/dbacl/dbacl-1.14.ebuild
+++ b/app-text/dbacl/dbacl-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ SRC_URI="http://www.lbreyer.com/gpl/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~s390 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="interactive"
 
 RDEPEND="interactive? (
diff --git a/app-text/delta/Manifest b/app-text/delta/Manifest
index 4dfac448a6e4..32174d8a20ed 100644
--- a/app-text/delta/Manifest
+++ b/app-text/delta/Manifest
@@ -1,3 +1,3 @@
 DIST delta-2006.08.03.tar.gz 32804 BLAKE2B 6e070aea4e9bb4ef849fb0e193cdef08771e74bcd46219bc380f58219d05d2c73ab0738a2d611e3c2bce72a92b82276ec4b8c741f33f092dc348acb153aaa6f4 SHA512 3720f164f3721ad06bf5a73e654c70a67d6e7a56d0ce574fb0e8571b33269e56611a909f915bd0ea46434d94206a9548fd99fdef98181efe41e7fb03de75c585
-EBUILD delta-20060803-r1.ebuild 735 BLAKE2B f22ea31f529e9de9f4fe5a2adcf66a7c7976b6e62475d39d3bbded3ad659add2d425503e13b5cb33b4405db9acf6d58e579cb7816509dc004389dbf7f801099c SHA512 5f1b3ab0cc0378fe43b44d12ef80030a2960c86acb457c775fba8bca802ce7e4a82d1c5a06caaa3130577cf67953624c640d9efff80781409772322d898bed51
+EBUILD delta-20060803-r1.ebuild 736 BLAKE2B f46aa7a8cd4c42c001f09961e5ce91c9f0e37aa4d9d9941cf2cb89caf5571514f770bcb9deed63a83e7fb80fb8d21b3f5727ead6fcdba549a4a5adeb3389daaf SHA512 c56087e2c9350d446853eddab76e5f81e69c9f85982ae1c08b5460fe73f787c5ef60c153f3f647fce0bc69926db9e88b59288633674726972287cd82a231781a
 MISC metadata.xml 553 BLAKE2B 9cda4f71d8e01943e664d2802e9c048a200cb7d6b171d99cfbf42fb9578b48600506130571b030bc4ef001d2c898727f2c69330049425d84a9e74b2634c7dd92 SHA512 c85367dc67630d0879e88dbc93b73f7283f1dd526a03a7c44eaba69556d69c5c60f5b0c187daf05f05a90d6ae644c1a72ce47ab5a6fe8ec46e92a827f0f1c9b4
diff --git a/app-text/delta/delta-20060803-r1.ebuild b/app-text/delta/delta-20060803-r1.ebuild
index 4f0369adcbb8..9334fa0e374c 100644
--- a/app-text/delta/delta-20060803-r1.ebuild
+++ b/app-text/delta/delta-20060803-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://delta.tigris.org/files/documents/3103/${STUPID_NUM}/${PN}-${MY_P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x64-macos"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/diff-pdf/Manifest b/app-text/diff-pdf/Manifest
index c9c5842732ba..e7cbcaf30eca 100644
--- a/app-text/diff-pdf/Manifest
+++ b/app-text/diff-pdf/Manifest
@@ -1,4 +1,4 @@
 AUX diff-pdf-0.4.1-no-poppler-cairo-check.patch 798 BLAKE2B f3932e5e7babd37b0df89f37536b91eee4978b3ac34b8c9e628f0db3f2d0a617f872b137cabc257e6cf470d6b80aade4c835e91310ec84b296d46d24c457f5f3 SHA512 2f4c399e482ace0e00995a732f0489d8b614e31396ed6279b0399e8c009b228386319a611ee52b784ba2313561e7aef27ae5b9090d3fb78fa09660992d483cc8
 DIST diff-pdf-0.4.1.tar.gz 137715 BLAKE2B f77b7a690f2a99aa003c1a36015113f0b3355acc45346637535231f763aa733174eca6b1f962058c625e06176fa13868965b3b67ddf6ffe249202ff799051e37 SHA512 4b7b49d7008b5920be86af8398dea41933888677b66505af0ca4daecbd1662dc0b3c04e7b2631d86680cdae4b0b58d24bcd4ddc2b7589127b682d4b97a179b88
-EBUILD diff-pdf-0.4.1-r2.ebuild 1411 BLAKE2B 78fbab50fa4d9f795edbf09793f753ba30d2dc7be1cea8d480e62fac471f2bd3e93528746622b70f6e608a7530bc06f44a92fa62b8d939b20783a42c87128da5 SHA512 5c4b8cd1e8c3c0c693b1a6508e0a0b2b057f8ef7798ca271e16f781df1e5a15f7a0424480aa833c6f16afd5a1552201f94348e43e22795b954a96134e770b5db
+EBUILD diff-pdf-0.4.1-r2.ebuild 1374 BLAKE2B ca6e7afb7d7d3eccc6df6878b47ab57e7d65234bb0c8c141f1508548313093501a782b1fd83468b6a89091e5769b802fc59402c1f11c07a13f2561b9fdfbf5d0 SHA512 a4f96f2776ad48a378e2c48329d29f0ecab5cce13058cf775332d7b6c3d61e2669402819ff57310b640fa583cbada3fb9e33da2b207bd3a4430cf4cf79fa8212
 MISC metadata.xml 252 BLAKE2B fa9e1dbdc0de3313b50ecd9de7ac59006074b8b75ecb97a8fc4de5fb14609cb00dc1b24ba95a2e7fb11cbc6f8c8f0c068bd0311713cc2aa7e6016992dbd6e8bd SHA512 92f660063c96ac5b3e24e58733006d4a72a7e2f41605988efb575546a2539a92b1ceb3a37e018fcb5c08264a42af26950d6520ea80ba60130ad25ce6092ce742
diff --git a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
index 0a5bdf8683ff..ec808cb9bab2 100644
--- a/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
+++ b/app-text/diff-pdf/diff-pdf-0.4.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-# No EAPI=7 support in wxwidgets.eclass.
 EAPI=7
 
+WX_GTK_VER="3.0-gtk3"
 inherit autotools wxwidgets
 
 DESCRIPTION="A simple tool for visually comparing two PDF files"
@@ -29,7 +29,7 @@ IUSE=""
 DEPEND="app-text/poppler[cairo]
 	dev-libs/glib
 	x11-libs/cairo
-	x11-libs/wxGTK:3.0-gtk3[X]"
+	x11-libs/wxGTK:${WX_GTK_VER}[X]"
 RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-no-poppler-cairo-check.patch" )
@@ -40,7 +40,6 @@ src_prepare() {
 }
 
 src_configure() {
-	WX_GTK_VER="3.0-gtk3"
 	setup-wxwidgets
 	default
 }
diff --git a/app-text/ding/Manifest b/app-text/ding/Manifest
index ce88a092dd17..18d2785b91f4 100644
--- a/app-text/ding/Manifest
+++ b/app-text/ding/Manifest
@@ -1,5 +1,5 @@
 DIST ding-1.8.1.tar.gz 6543141 BLAKE2B 5393113bc8952553b3b5e5ee8dcd98b4cf6fec2d92069354e83b38808289053b0cc5a2c08968068f9b393b5a5e296541718c129ccbe23076ce591f6254c8293b SHA512 7d1b459d40e26482c3c16a79565cb897a492fa5807f44c5c3ed1022bcf65ba90bec9cb503cc67970742c2beeb34bd653c684e56ef5492f536254bf475d3f70a4
 DIST ding-1.9.tar.gz 7864078 BLAKE2B 9a25a2eb940b96393f556e374167a5b0aae8d26ff81de364e693f01acf79b0a5896704c39e1fe1ab2b48a875785483b2bc71339b01d3999664b78b48ecb041dc SHA512 fa5500d1ced311ba21ef8a16a25f3a3cdcebc24daacff79c05351a46cc2a1d466891caa1dec3a77ae9a4d7e59332d991974917875f967d93ac1358f5532e8a72
-EBUILD ding-1.8.1.ebuild 574 BLAKE2B 9bb23d1ea267414a09adcb74f0c1a1c9f169b2d8718e8f91f88151045a84a30a62955b5e7a7d27bcdebdefbf422affe45a949333c6171f7d0550314b3fb2aab2 SHA512 8ed18b6c2fd4bbf29b27f475453e0c87c5812f9aac5df180a3906d6c588d3e27b74db2c4d2da2083689d46e7155508186d808b9f76d911eeadd66b691aec5936
+EBUILD ding-1.8.1.ebuild 564 BLAKE2B 1d23c835cc41e680564d6d82b64c145c967432189aa3f8eae75d77b2d5af9c8a4f7db3ff8afe4d87f30e777538ee0e9d51c7b0c733e1d2a9eccfbe2af2ef6aa2 SHA512 e374d2294f1f56c3d17f0bd7b36c0a24874480771595ed74e9675b061beadcfda97d9774b0833a72952fbe153fffe437ab28bdcc6d1bc361c0708a738e1ec2c2
 EBUILD ding-1.9.ebuild 582 BLAKE2B 785753a604911eee32c78c1ffbd5a6901aabf236f4ae211e89bc6a567cb553faed1f7e054ac744d964cc604ca3a00a33c2219555fcc2e711b1d1ed8b6d675512 SHA512 f6c399012816652fd50389324746f59866b1c3d86a802ad28b3c02a80bb680c2d96e2a7fc93baac6c8d0b2f22f2b3f894e97d9d75b508249c4aa92be95a3c78e
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/app-text/ding/ding-1.8.1.ebuild b/app-text/ding/ding-1.8.1.ebuild
index c2318824efe3..c9cdbf0e1e8c 100644
--- a/app-text/ding/ding-1.8.1.ebuild
+++ b/app-text/ding/ding-1.8.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
+inherit desktop
 
 DESCRIPTION="Tk based dictionary (German-English) (incl. dictionary itself)"
 HOMEPAGE="https://www-user.tu-chemnitz.de/~fri/ding/"
@@ -12,7 +12,6 @@ SRC_URI="http://wftp.tu-chemnitz.de/pub/Local/urz/ding/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ~sparc x86"
-IUSE=""
 
 RDEPEND=">=dev-lang/tk-8.3"
 
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 666e32442fb1..7b250f418117 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,4 +1,4 @@
 AUX gethopt-undefined.patch 358 BLAKE2B ccc264eece330bc0c8979731410488b070c91e73381ed4f00ff95f04c5f023948f304dd70c0f8ec4ff67abf266d80ce8931fa46f53486e2e0e003f151fbda4b7 SHA512 a7504f3ab60ff49b72e475e558e128522757874d4328abf7e488313dff7c2fc3650fffc12a03109601a14348f24f21a83ed0e83f9d6fe1176207ac2692800dc1
 DIST discount-2.2.7.tar.bz2 102277 BLAKE2B 58ec3bce2b8fc41a090d9b81b4326cbf54e36bf774f4f9ef63c2a2b1d34ba464e9f0a021f19b4fef165da426742af3045a631af005371d1a8a4cd81dc0be3367 SHA512 1b61eb7c625bb50da0dbe97350a0ccbb15930ccaef449c4b4659950907bce3c0564dabf20578379a7fdd0e375f5d4d5b61acd34db474a85e942b60373688bd08
-EBUILD discount-2.2.7.ebuild 1689 BLAKE2B 651427216f362998b152643705915ac341e0fc94472f2de6a2e80463f69169e4695727f7eba414dbda4269f9fc7d32d8369b3a4d10b8ea0439cc92cc00349420 SHA512 e04aa1010ae1c117421c18dc89a0cddbe3db76481450829af53215591f63f1e263198b5abdfead28a4c1565fcbf2b17ad5e5a5fd1fed688cf24ed8f39d793e3c
+EBUILD discount-2.2.7-r1.ebuild 1690 BLAKE2B 710bd40dc677328a0f8aaa6ad3a387d75fe939b289186d889f35002c08c82b52bfaa5fe138816eb7ecdbfd6ec437b863df0c248448cd99e92452a2cafeb995a1 SHA512 27008019ccf6fb42d7e364990baa6facb7f0c8d8e40375dcc44594ccef7c792648f8d1dcd6c69a895c5a059c3799722d43338bbbc1c443dc284433ac0da4156d
 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-r1.ebuild
index a5a6091733f8..1ecc2092dae3 100644
--- a/app-text/discount/discount-2.2.7.ebuild
+++ b/app-text/discount/discount-2.2.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -34,9 +34,9 @@ src_prepare() {
 src_configure() {
 	local configure_call=(
 		./configure.sh
-		--libdir="${EPREFIX}"usr/"$(get_libdir)"
-		--prefix="${EPREFIX}"usr
-		--mandir="${EPREFIX}"usr/share/man
+		--libdir="${EPREFIX}/usr/$(get_libdir)"
+		--prefix="${EPREFIX}/usr"
+		--mandir="${EPREFIX}/usr/share/man"
 		--shared
 		--pkg-config
 		$(usex minimal '' --enable-all-features)
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index e1217c33e503..a96629b2330d 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,5 +1,5 @@
 DIST djvu-3.5.27.zip 3567522 BLAKE2B c074468a2fedf097b9b8fea4c449f26b61bffb31d10114081554e59256a23315ecffc203b5223468ca0c3338118b53aba65eee4cb5e7ad5c8d55470e90f43843 SHA512 dc1cd1bce2fb6245946f9409b3a3826ef2dc77a20be079c929b17508c3d967a0b5d8acd61bad00357e46a845f7f97717a043db9ffd1fe23e9a09441b7d21cbd6
 DIST djvulibre-3.5.28.tar.gz 3701161 BLAKE2B 74681f00d5f116ab08ccadb6c6f536f5d23f1fafdfae1239add6d800c0446298e65cd5dad293e28aa4d309dc93eaeec9036a7144f6fa42ff1104a4b945ca6bce SHA512 db3b8a5b56d700e911be32057f721a2a597e6f52e6fade203ad75ad76ab2d8facff2e474fd18beea703ccd5fa6425352e619a8fda40e69add1724dbee26050c6
-EBUILD djvu-3.5.27-r2.ebuild 1660 BLAKE2B ed005e78e907b2caf89118c2e37448a0951b08db834004f480e644534bf337b5dfa6220697dbf8b07f80f651afcfc6bccabe826242eefb6e05432040582ab981 SHA512 c6d5b6e7997fb7d8ab9ab688c3679ca150d92d2a6c787c63001780a30e51de630fec300911979803c4556e4186096ca4600eb0e2b67a3daa6cc8e1033791063c
-EBUILD djvu-3.5.28.ebuild 1521 BLAKE2B 5b2cf5c72347e4b7232d7e34152121f4f83b837f1c38b2b59de68959ee4a636294490a010a2b519d07e2bd271e827c327663a6208e09249a0fef6db441ec0206 SHA512 318a4a16aa1a52bf890dae8a6df302c38dde3ab62869201d7e2dff50ea2e90099ef5c80bed3f3ab176bda3a8749c5f032d990375e701c37a35895847206206f0
+EBUILD djvu-3.5.27-r2.ebuild 1656 BLAKE2B c198997bd2b46f796e5ce31812830be1073d02fe4d716d5cd7e9d04c01b3bc792134e0f715f330f73e5e73e083206fda8211269eb9cfcda83e85221572fa0ef8 SHA512 774cae08ce0940d27e2bb4961509e005fe134bf2eeb59aa3b60dd98aca1786acc4bd6b6d438d8f936424eaa17a3bc174b77f89dbccee4908c23c3aebe2005e0b
+EBUILD djvu-3.5.28.ebuild 1460 BLAKE2B 0676c99f9d5a56f052ee72787096fbcf109e4bf18783ec5e0f3d8604af04b4e927916951ec5c0936f73f42a6e65a4eb66f98148ac99921c1682f57cd15b22e2c SHA512 c90c9f93d60fc510a6da17027d3f85b9b15867e1c83359ba3c34c87c71083a6d3602eec24731dd8c9fc36117a271691bfb405366a5c43830c7796310b4b9cf3d
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.27-r2.ebuild b/app-text/djvu/djvu-3.5.27-r2.ebuild
index e3d9bbf4d761..2887ff6e9fbf 100644
--- a/app-text/djvu/djvu-3.5.27-r2.ebuild
+++ b/app-text/djvu/djvu-3.5.27-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -64,7 +64,7 @@ pkg_postinst() {
 	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 	has_version app-text/djview || \
-		optfeature "For djviewer or browser plugin" app-text/djview
+		optfeature "djviewer or browser plugin" app-text/djview
 }
 
 pkg_postrm() {
diff --git a/app-text/djvu/djvu-3.5.28.ebuild b/app-text/djvu/djvu-3.5.28.ebuild
index d0b67dcb3a51..1a910c109796 100644
--- a/app-text/djvu/djvu-3.5.28.ebuild
+++ b/app-text/djvu/djvu-3.5.28.ebuild
@@ -61,6 +61,5 @@ src_install() {
 pkg_postinst() {
 	xdg_pkg_postinst
 
-	elog "For additional features, you may wish to install"
-	optfeature "for djviewer or browser plugin" app-text/djview
+	optfeature "djviewer or browser plugin" app-text/djview
 }
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index 73e2c52e89a7..9af06f464aae 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,3 +1,3 @@
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
-EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2470 BLAKE2B 7e0d5e34acd48629c6a244829ddcd19e5f495ba472625c4204b1f16d271cd5dc13c6a3c46adc9eca567265f3120f5121a85d65874cbc5a52bee661edafa3ebd9 SHA512 6ec770297c4c5a6f0cfc7798c93fa3f8811177e92204e15b92e44b7dc643cf4629346bfdd646b2e483603760c0496e3208d611ef161d2048707e3bb92b209f39
+EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2471 BLAKE2B 63ee170d023783eac55f2880e120da5afa01a84872828b114f2510ab8c08d68369bbdb843121c85adc8d1972ecfdf3fe21c59684788dc51c9ca0ea662f789edc SHA512 4ecaae6e781e52b7f1089e770c5c4f9f06b9d35a9d1d88edecd3b15f06f61068631f327fdb7ac6b889f1edd8555c42fcaf7c6436432eb79651851d38fcbf12e3
 MISC metadata.xml 377 BLAKE2B 035eb23363be52cbeb11b0ca2fbcedbb608dad9d4b26dbd2155a538db51cafe7296614f5005c0460ec4ce02a35378d98f2c7834fe2f098d7b05ef835bdbf520b SHA512 c965e64e4582a7452d8cf7eb46b794788cc8ccd9d93a48ab14e7ef606979cee706f682545bfebc2c5e380e9e18db0b671ce0f9ad935a0812472fc1586c989c28
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
index ff35e2651fe5..e3203a498c06 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/$
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index 1bb55b092eee..510f3f024b3a 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -14,12 +14,12 @@ DIST docbook-4.2.zip 61830 BLAKE2B f9a26e9aefe2da7c785f065374bb082f15e3f39dded7b
 DIST docbook-4.3.zip 66117 BLAKE2B d92d69b6f94c85bc2e8ead87dfb31db331206ea3d014e7dc240b47d8b07f43f8c1053003f50c398c4723726980e553dee7b34db629f1eee19ef6ae95f06c6ae8 SHA512 18ead2e683a9e9bc39e1487ee06fb72542557fa0c76f0e899b566cb52207e3bbfcb415ed59163c6d59e8d58f92289e115416d56bc6ed8f182910f7a18565b227
 DIST docbook-4.4.zip 66879 BLAKE2B 7a21c99e934851bc7c6be77da2b65079b3b6b32365672b40b70b1819e7aa6987cb65f8725ed2b9cc804d8cd0fc7c17f02601466dcd48f5314439df626db6aa89 SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8
 DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b485d5bc34af1a02596d577eb7b48c3884acd04965014819e4a23a444c198134fec14f2c2e7c2d5bcac58d SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df
-EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1238 BLAKE2B 87a26f4bc28de4d728d8a2bcd066e62b1e72e6cf6579e48999bd6102d9c38491d9ea587ead966fc7126a0c44b34daacb78b2657c7f74985d7f1a36578c63a26c SHA512 926a260a31195368606bdcee7cc37751aea546c67ebe5f1aed6eab015b44ea474090b961665d3e5c1c05ad879da1524597bb3768c52531a918dbd21b75dea502
-EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1238 BLAKE2B 87a26f4bc28de4d728d8a2bcd066e62b1e72e6cf6579e48999bd6102d9c38491d9ea587ead966fc7126a0c44b34daacb78b2657c7f74985d7f1a36578c63a26c SHA512 926a260a31195368606bdcee7cc37751aea546c67ebe5f1aed6eab015b44ea474090b961665d3e5c1c05ad879da1524597bb3768c52531a918dbd21b75dea502
-EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1231 BLAKE2B ddf85c9ab16c48026ccf0bfd652d8839b5bdbc2d957b76522b58a7ff75ea325e4b3211a954326339b0fe1d1da01b6cb54ebe2e9a064fd54ec95e1bb80b0607e0 SHA512 a5050fd247a2f93e4f0296ffe842342afc2b7d062825df6fdc22245f44f0f6b02c163f121745123fe048f7bdef222dab3a6f3f82e7fb3dfdd76b2242e697932e
-EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1272 BLAKE2B 77a66f4296ccae649a22dbce1b804c8025c0b2557d4632c71677a5a7a23007ae98df513b0d6b0841279f60c05589ce4f99508eec7eccd01078ea8660be7d0eb1 SHA512 8fbfef320c3e5760e774dd8788c5f400b3b6412a31730d22a8a7c135e3500aa303eebc7a2dba9fbd6758b610f956d7b675dc37e90f6d4c2ddfdb1d0434058ccf
-EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1242 BLAKE2B ad1d5bb8cfe599fc2532f42312e94f278fd47aab93caae99cdea0135bdbc940b03953c8f5f8643516db90dfb6fa158b05c8db9b2fa324f93c5c58c04b3800a19 SHA512 c85ce5031aac0c6ab02363f43aaacd9233c8b77c4a0945692aeb01c238b2d00abbbcf3acdfe1c69ddce8af5187740ef2a248088d0b0e395de1e9d122ebd65061
-EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1227 BLAKE2B 9fde28427fe6bd0682f12e67b0e13e9e2374f1d2520a917da1cf63ac2686546f835509f9d833f786b50561f256aa432bf7d0ec2e403552ecfead8e176d3cf22e SHA512 f99b46a247b75632ede4e7b60e39bace80019458285579b34c1fefe877e7ebb1b7cf09304e819d8e7d134bdb07a38fc881aab1362a976a14c009b8d457c8afd3
-EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1227 BLAKE2B c83633234f8ed449837093e831161c39346613159174c4bcb573602cbd1a50914046d982fa274e44b02280093c124f1b1ab41a67478d6aadcae36a4b9eefa3e5 SHA512 3954b4358b46ec6c09c70f49db9efd44988420f93f01ac2a03655e64be090c57cd3ce43e4bf3b4178f053f60dec13281999308ff763dc9f0f61937dfc411cfe5
-EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1230 BLAKE2B d76e4805293f1697dc4ad27bb6609ebed53db816240626af3bd2da1fd409f21ccd4773cfd7f9174061b3fd3e905f4060ba11502dc89843997344aa86e36a4efc SHA512 159d6600c14bc9ec234d8e94d195242066b99584d68b033e7b062e386a0036463b67da7c9deb6479f0f5c9c9eb68f6899dae55da789d907f23f05dbf4291ca51
+EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1239 BLAKE2B 239eef1bf4f81b163dd02f064a27ad55c5a180d627f674bbf76fc9b1936adba5d13df8e8dea08ca7eda35e6ca37bdcee932eac3e4eb6d61f9104ac6aa8870e8b SHA512 a638ef7cbdab3f3189a8cff6b76bf15db2d94aa1ea41761c685c3cf963c0b48c1393b40ec0f823991b29abc84df82baa4397e11482954ffd930c65e0f4a2c0c3
+EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1239 BLAKE2B 239eef1bf4f81b163dd02f064a27ad55c5a180d627f674bbf76fc9b1936adba5d13df8e8dea08ca7eda35e6ca37bdcee932eac3e4eb6d61f9104ac6aa8870e8b SHA512 a638ef7cbdab3f3189a8cff6b76bf15db2d94aa1ea41761c685c3cf963c0b48c1393b40ec0f823991b29abc84df82baa4397e11482954ffd930c65e0f4a2c0c3
+EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1232 BLAKE2B c2483720ef4ef27504127501af5f7d44a03f9f9333af5145a84c60153c017d6eb663fb6a0c50433ae2022dc5d71e0051994847ee20c35c15f5fbe3cf38a2469e SHA512 edf606fed086249b923748496c04ef5a74f20e3143c1d0669184646d8ce663361eb498c45618258551ea6b59ad365b855a2077c28ce25824436cfe6b68baf575
+EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1273 BLAKE2B 3f84dad5ef3a82aad8a9fc62fd05d309943f65a1138d136101d5c5484ac2e97125fed7dd68206510a99822edad7174aea10dd056c92c883e30540873b2cadd7b SHA512 c42a392feec6611b34d2d4b18a423a8634021986020449207fa3f28e329e08d8399c938ff79c18da39266a3dadf7f25df38b2f4e41f1b77e32ca4b560fee58f5
+EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1243 BLAKE2B 99c9f189727a9888950cdb57444ed4e828449119ce6cc316e01eeac1771b0db8eb7759fc4490cb70a0132206df2a79d5996b853f110459ff9c21a36494a7d19d SHA512 b9b45a3902358fc2e339198bb0c158375b0e793ec991f50d78d3e4b80cc032d02ebd92736ea64afe1a6cf3385e52ceb636ef7a54ebb06e0f2f0d7ae10c1384d0
+EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1228 BLAKE2B e52d47ea5e1b6e293d0db85fa22cf97e37d337dd995327426c2b5039436c050648f2f82aa9e2b250fb67dc61ca604aa73c9df6e9554a22bb8a5cf38064f36cde SHA512 bee5d2c27aaa39ab117a2db8a87583b81cce96498b3651e1d2c26a000b90a30d96f4ce4d3301ebebc1c9caf8b2c4140788a53cc1d37404b7917b8f5498df4fba
+EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1228 BLAKE2B 86ee53c87d3b24c59dc396bed4dfdd92606737fb66048617f6c5d44e5bd18401d3f2c6cefe10402147b2a29c26b1959a6f7a02fa1cb971dce6f2cc3277d0aeb9 SHA512 284353f760b4de149db6516ec0a82357353837a27cb1855e2ca2a5b6e5ae34a2421e2c689512f627ddf688d3b1ae6a636b06a76f9afda47f87e2316bd195d790
+EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1231 BLAKE2B 1985a0cd42ee53986870a2e06b18427ef13d4da33f3ffe8f90b1fa3c9c883914d2c1c69db15a7f4d7a82a34ee21d3b54ef10f2f8be19bc7f05077f328185854e SHA512 a6f17d4326f74f593d8b706ad59370b752711ba3d01a65fb585eddd37a05bac34827e1ff87c6e34ea253b5f7714556f7b6a46b171ab8a838ec2596e5b3312754
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
index 928f01013d7e..b416d65c3188 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
index 928f01013d7e..b416d65c3188 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
index 8f58b7ab5143..852ffee2772c 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
index de80f946e64e..cbe5e272c54d 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
index 42cd2d5cbe69..84f3d91be5b6 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
index a4ed3e2f4d15..99211490d99c 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
index 14f15f538111..22e1cdd8526f 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
index ebaf2e04218b..484d0e72473a 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 0b40f9f0b88a..4a5f9043785b 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -2,5 +2,5 @@ AUX docbook-sgml-utils-0.6.14-grep-2.7.patch 603 BLAKE2B 9b7832675ae7776e25c2a76
 AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73c8e080f2d64bdd0cdecb86618bd6e46e2b00fc076570b26bb16490a47ed9d83ba28e630ecf95c00166ce12ab31b4b40f0b SHA512 67985be1ef2cea086a1029ebce17edbb9508e9b8498cdb304cde71ca3a58a48c461c9a1ff5ec83758864c67cdbc4fa7e414270a7783a41b8cfe95f0526e00f42
 AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
-EBUILD docbook-sgml-utils-0.6.14-r4.ebuild 1835 BLAKE2B a3e226d4c9b70af0a2fd4ca5d66b8e9a091fc0f97de2a54bb3163cbc989b632491de1798a67c5d435be75fe527ddaf46501f7e43196cf766523137d1edb11674 SHA512 82c3d7216821ac376ba8ed065f244340b1474b8ed453ba7f37fa875f1049fa63a483b4da4fe473b286142f0824388cc1393e270df55c0ccb5055c6d2817ef6be
+EBUILD docbook-sgml-utils-0.6.14-r4.ebuild 1836 BLAKE2B 1874ac1cb67ccce73e969a7de043129ebb068200678c14d5539a38d81f17400b636ba3644b5e47e76a23b3f546e982f9042b94ff761b58b84f3126ad40136d24 SHA512 1944ebf181d59ce6d6c7d8daf17d874f982633473a75d76b6a8a18ee861bbb6412fda53497743dc0bbc217a3c96a4e8480841b9d2280c86d2e98e283a8d44e75
 MISC metadata.xml 375 BLAKE2B f1655f0698fe7e1374db6464010f2dbfee8db3c32e7bb35a2c6b275faa9555ee163cc9aefdb069eaf05cb795333af67d4f8c2594b7426d885132eb228ecedfdf SHA512 1ee377b0ace2956254d9d8751eb25463f6e7034328ce0a620e4a2a36c01d70d3f8e3e8b94da1f25b83536468aac558d410348b9e0d4890409104347f712fa0a6
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
index d87738d5d619..f3a0e790fbe6 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index 312d270d7894..ad203632413e 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -3,9 +3,9 @@ DIST docbook-xml-4.2.zip 78428 BLAKE2B 542a2b658a10e0eee4928666a2edbdbff12e96dbc
 DIST docbook-xml-4.3.zip 83865 BLAKE2B d231a6e6ba3d8023d83358080d136880a5d65b4b3b135b2f60e3a784d2f2231d12e1e9d1b5284a7d3fa1b9281466591e0438adbf6160d33732e3611f5c58f21b SHA512 f5090fb74884bae3d4fac8a3c5060bffff5d6a74272de183c181a7642e4b91f4ed32ad028537d198010782c3d98575ce679672f76a9749ed124432195886a7cb
 DIST docbook-xml-4.4.zip 96107 BLAKE2B 3616c20758de6c14e08f2a9b32682da33be741153d4586c8062d6ff895f0158decc188c5e1db4f0caafbea14afb139e39bd6805842f7bedc18f0770d22e0d2d3 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76
 DIST docbook-xml-4.5.zip 98497 BLAKE2B 3487f4488a9e3dbc3e366d63b61940727287a97f4e0ee2d2dda031cbba96cd4d85e5b729b7ee4d32e8a6842748fc688f85c94e1a0ab2f7ebc062dd8c7b800e20 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27
-EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1587 BLAKE2B bf4f1a7e199137917b4881fafdb1ce0f8043866c0022256e5c6bfb73d0623da6a56617b9e7c1978a52661edf1c88aca5d7ac06bf400c90e70f653c30c10083db SHA512 26e8c346a3125cb285aeaaa70ebc8ef186fe125af60a3e4f1fdbe95b51505b051f28f98d4aa751bfa60aed847d5f6393800007ab279183f88791f50d5909cb8f
-EBUILD docbook-xml-dtd-4.2-r3.ebuild 1581 BLAKE2B 98d4c9c04ac68d90f72f114b601f89008eb0de0e019c176e72ea320df46ce03ffc22edbe749e9bd52d51af38829f2da9524753c54f43754adb80cd04ea20007e SHA512 c72caa63dee2625e0f17f487028d2d60f117d079a049ceb03cc96f8078e6b5dada694072e012f0f571a1e9e27432a73952549dc6c695415b7c634fe2c14f5e33
-EBUILD docbook-xml-dtd-4.3-r2.ebuild 1581 BLAKE2B 98d4c9c04ac68d90f72f114b601f89008eb0de0e019c176e72ea320df46ce03ffc22edbe749e9bd52d51af38829f2da9524753c54f43754adb80cd04ea20007e SHA512 c72caa63dee2625e0f17f487028d2d60f117d079a049ceb03cc96f8078e6b5dada694072e012f0f571a1e9e27432a73952549dc6c695415b7c634fe2c14f5e33
-EBUILD docbook-xml-dtd-4.4-r3.ebuild 1614 BLAKE2B 2f5ce6e9ade1cc708af3e6111037d3e7f1f278a0a4d67ba1579b748ee58f53dac0b33e3bd956316e43b6380d61006b4f02e33bd8a7d3d54450120cf662e4cb75 SHA512 07b4ea235f77ee22e92385b5c55d0063711a3d514a90d62b21e9bb56f083df5f8b71f4bf80d9fcdb63f3477ecb6a5a9ab6a1d74e66b98095d7460985059e9c90
-EBUILD docbook-xml-dtd-4.5-r2.ebuild 1614 BLAKE2B 2f5ce6e9ade1cc708af3e6111037d3e7f1f278a0a4d67ba1579b748ee58f53dac0b33e3bd956316e43b6380d61006b4f02e33bd8a7d3d54450120cf662e4cb75 SHA512 07b4ea235f77ee22e92385b5c55d0063711a3d514a90d62b21e9bb56f083df5f8b71f4bf80d9fcdb63f3477ecb6a5a9ab6a1d74e66b98095d7460985059e9c90
+EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1588 BLAKE2B 73d9a0d59518e3acb6a1dc3ec01769029161400642e1f686a7ea33a4cc0d409a88790d5f53418328b7bd07025f9eb0aa7da15a65717aaa20b7fe7e432f3a69ff SHA512 c02b1444770ea6ecdc73f194f9d1ea2d6651885465836f0a847ff90ae8ed727c58cfe7985b969c7158ff859b7a1e82a86f5f2cd9ee25020d507334bfa902a6d8
+EBUILD docbook-xml-dtd-4.2-r3.ebuild 1582 BLAKE2B 2b6bac21849b642d48efe05e64652697f956a726c34c396b7934baa2d1d360f510961dd64d401cd0c68070481c10cbdcf936d0e51c05d3ad999a1f3ac130f732 SHA512 264f0f2599dd323eee76760573b83ec3e5f9230e2e85a4aa3c5a9b2fac3b17f3022010ff24c59198c54bf411aff8d6d5ec67170a4b476a10447c07459b06ac4c
+EBUILD docbook-xml-dtd-4.3-r2.ebuild 1582 BLAKE2B 2b6bac21849b642d48efe05e64652697f956a726c34c396b7934baa2d1d360f510961dd64d401cd0c68070481c10cbdcf936d0e51c05d3ad999a1f3ac130f732 SHA512 264f0f2599dd323eee76760573b83ec3e5f9230e2e85a4aa3c5a9b2fac3b17f3022010ff24c59198c54bf411aff8d6d5ec67170a4b476a10447c07459b06ac4c
+EBUILD docbook-xml-dtd-4.4-r3.ebuild 1615 BLAKE2B 367eda96ba82a870d66e72d7e1d808be2505caf6bc264ff6bf6996e1d8cef8733078854aa42f324b7ae7ca16f0cd99c4c8a399aeab8100325eeb965c4cd9ccf2 SHA512 d5d109e9e80efbea312ae0669c1d050e0e0291f5877ffbfe522c01872accf833e0a9f2a45295b1ad51f585a949e47c25cb2d6e49ba9b4117c003cef64ae729ed
+EBUILD docbook-xml-dtd-4.5-r2.ebuild 1615 BLAKE2B 367eda96ba82a870d66e72d7e1d808be2505caf6bc264ff6bf6996e1d8cef8733078854aa42f324b7ae7ca16f0cd99c4c8a399aeab8100325eeb965c4cd9ccf2 SHA512 d5d109e9e80efbea312ae0669c1d050e0e0291f5877ffbfe522c01872accf833e0a9f2a45295b1ad51f585a949e47c25cb2d6e49ba9b4117c003cef64ae729ed
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
index 0bda68359cde..f049bf68fffd 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
index cb13e91ee151..ee06649a6b4a 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
index cb13e91ee151..ee06649a6b4a 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
index 901970ab03b6..175a7581c5ed 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
index 901970ab03b6..175a7581c5ed 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-simple-dtd/Manifest b/app-text/docbook-xml-simple-dtd/Manifest
index 2438b0496f35..8f4b8dd84615 100644
--- a/app-text/docbook-xml-simple-dtd/Manifest
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -4,7 +4,7 @@ AUX docbook-xml-simple-dtd-4.1.2.5.catalog 1728 BLAKE2B a5ba21fb9f622b7427adf142
 DIST docbook-simple-1.0.zip 31173 BLAKE2B b19054783553be68eaa2a689cb673bb4a270f546e7c45416b3176cf413bd3be46b1b7321ff9360018c93d7f2eb2db904c9d194dcb3b4de6eff4ea33dcbd228f1 SHA512 5be8a2fb48b95912412eb250d2dad6126c78f81155b7eb115d175d32831430ede285d5f4bbebd0d8a50a1a3159fe1b7d133adf84ff8447111ca88a441b415643
 DIST sdb4124.zip 35199 BLAKE2B bee2de887a662978b6f0bf8b9ae663d37c4da1859f07a09e869cff91943bd65946dfd493b9bbe9244ffb8794f3cc5c828c647ab00b183326b63e179540765664 SHA512 b5c158cfcaaa4150d5ee719d11f3fc2b5a207cace241a147b39ab4a9f721cae2a894a88cd3dd944ecd24feae850b387faa03c669747b02de839f5d6a3ff0821f
 DIST simple4125.zip 29839 BLAKE2B 83f2b65e5192334bf6a9b5b5388a77d8b566a924837d041329d16f0ab864d5e69b7ea0a60b70fec4affcf0161fb724c5ed99fe16dd230dc0984100e40642709c SHA512 21c8d411f5b37c82442283dadbde99352778efe90fcf7eab7cc6a74fe9b702f14ffa5bd39e058d8f29fada7dbcdb197d5c880c29b207e3509ba856c5d19cfef1
-EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1312 BLAKE2B 095110735259d67ecc95095a21e0619d05844be847b5d729c8dd291f2bf3649e77fe0e23c76a7aa19b2933ee90cda841b6174327958277ad8c33dc1ae530d6e1 SHA512 782539ed931170657b932ac6ca5d9c9654ed029347f17a7a71eb5f5be30cfded2c91edb79cdf76136f1ebbec9a435b5d9fbb7b4a6aed78573e5fd504f960f3b9
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1342 BLAKE2B 698dea3e68b98bd199c7598b64f2a8686aab3d5d0db5e427d371a4a4e8d036fe5c4f2c940768dd952fac4d19b4c73a2bac18290948f783fcd3dd731260cee83e SHA512 79789d9bbab7b5e689262ac589b31d2b33b3fb99167c13dc11e066afcd92245e5038c3a32a7e480678b7cfbc345a644a36bf8b0f65eb46a71890c65d7630fa9c
-EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1330 BLAKE2B 097f3ec3909760c74af2f4135cc2d1b5e35fc3412c1d64973c2b6bbf4449e1908bc6a97bb3e8ff2bed9f0eb7f8a5d62920bc80de42851f410488ca5f9587b1c9 SHA512 12ee85086a37b816b7903e8ef3c353ad6e97a2c95b49daae923553fab33ab30dc54b699ff3fa0f858f05792810cce0ab754a9d4015efffd70986992f00c7fbed
+EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1313 BLAKE2B 74012a18060ab765a54ae90babde334639171294ffb921c4b98b5e81d804ee764522c27eea6d77bad57140d7da1dd1a1eeaffacf5504eee39be5ced8554ad176 SHA512 984e954ddeb31fe0ba88d184b700b6600ddacb79cfdd5ae2c829354b2ca18df05d53a397c98029b4aa5bf9b23ec40b64669d2eea51eab7d66b94a9a58f3f6c18
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1343 BLAKE2B e942fceda3e409a402b32a320f51b91f1c31d26a622c8216c78f54fd665a6ab5e14e38b820187f12e1c1e69d5950f60d5e22bcc868a62ebf79c818330a6eb4d5 SHA512 b13d7ef06328e15b82194bf89edf23e2e331868e2c5876d055c9c36556a247995b278f96e5d0c6387a10d7344ab981b66da87af0c2cb7d45c73f412117a80fd1
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1331 BLAKE2B b3754950bb7cfbd0610b414f5a74df190072c5952c693a4d2c0ee30762622c21f39c2e1cefa3dfed9e71e15b2e92d7a5913656181a704d49ef99993c35bf4d80 SHA512 7ef1699a465aa5c7fab24837c470309801084ff8df4c4fd73a3a08cdd3666d19f0aeb4156f7a62a390c344c4bdf8cc9e04e7ec27b16c6783d45359a307a3f6b5
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
index e62bebcb25ce..ed1cf3333f8f 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
index ffae4c7c48e5..aff340d83df8 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
index bfec21f1fcec..dbc3dcd8699a 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xsl-ns-stylesheets/Manifest b/app-text/docbook-xsl-ns-stylesheets/Manifest
index 3e0075a081ea..7d08f50ad6be 100644
--- a/app-text/docbook-xsl-ns-stylesheets/Manifest
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -1,3 +1,3 @@
 DIST docbook-xsl-ns-1.79.1.tar.bz2 21962317 BLAKE2B a68cc31ea8cb98fc07e198fe55f242c6438284d6fa75d4920a9ca7b5038732f966cc6653e058d7fafb26c0ff49f2039025a48a0f8c0392ee892951723703bce3 SHA512 23fd06870bd5afe4efcd08c8ad679821c202a62442b50657c093cbe9cd71b585a3c56a5534a0d41119f58bf98b1f9014a53ff2e48ab59075ec1827e7363980e9
-EBUILD docbook-xsl-ns-stylesheets-1.79.1.ebuild 1663 BLAKE2B afd99e3ecb49c51f48662e034d3e13b936e726176a5083547b068c0b79dd6b748d66fbda4360eee67f8a18e7b9e292b41f8512063ae47c61f87288a63ef3b160 SHA512 e254052c593abd3f786eedd89d7b4ce04b69412447140839e8ed18071589cb54091e163ea487d9290a67f94d7f814b20a7031cf38071617ed9f812d0ac07fa65
+EBUILD docbook-xsl-ns-stylesheets-1.79.1.ebuild 1664 BLAKE2B 1efbdbc8d8de28bfad7f5e2f6fb0cde288ce48ea826118c975285635b10da6f9e23f727aa4be3b0d0f13ebd72a1fe8ac1cefc65d7d847afd7305a403d7293288 SHA512 51767f1e7bade7c37e3198d63410fc0b0585f433cbd9453f41e1c1b185757ae0a3fdb44761885e9b2a48e74a8fdc40f51b179bb933fdc6f40adf4da89a70fefc
 MISC metadata.xml 435 BLAKE2B ad101421ffb8e517aeb459f60058c45e6c022f496e5053fa25d6f4543b814be1940f327b934cc88d5545844c9a4e6ac9c01954b4f96b2697307425ec0b487e61 SHA512 3d7ea2c260b9d5ebe5517a8b8841d36114433b7276ef247dc88bd2f728c1d0336d83e508fba1ef2d020bdceaf4ecf6750d74bda1678422c083e18323b539b18d
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
index 579c448bc0a7..81f3232d06e4 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.4
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 593f7a46fff8..61ee3230eb24 100644
--- a/app-text/docbook-xsl-stylesheets/Manifest
+++ b/app-text/docbook-xsl-stylesheets/Manifest
@@ -1,4 +1,4 @@
 AUX nonrecursive-string-subst.patch 1205 BLAKE2B 0c7bb8e3ba646a137bc0b50722448c65437881672a4bbb3f3dc7a181e5074f667fca0fbcb4475b83f04ac63bdddbf3dae800b7a7094b5d9aea270faeb81d9e50 SHA512 6a26838078a3ce28273dddfa1af6a378cffc28b6d1ba48a4cfc839addd7bf58ce217d6584b735f9c75381954744ab2386c75fa3c593858b6e27882be55c00d04
 DIST docbook-xsl-1.79.1.tar.bz2 21967928 BLAKE2B 42b7e989616d16fa100c2dad713830ecedf6c7e26f56f99a9bf9330385c753f282cea1033e689196352bd41f9dca59a06ff09fc4638051cb478a630df9bfeb0b SHA512 83325cbaf1545da6b9b8b77f5f0e6fdece26e3c455164b300a1aa3d19e3bd29ae71fd563553a714a5394968d1a65684c6c7987c77524469358d18b8c227025c7
-EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2117 BLAKE2B e6f00ad1030955f310ffe5e0316369e126a42a4c5d43f1f0de388712ca4f64b155c116bc9cfacbd288cde647d9b3268e7a6597e8cd9a02642e53eebe918b4ee5 SHA512 91d2b6215555d1b9fb2ea2ef80a1471a023530259837227e3184f8edc296887522655b7c5259c0b4a1dc659b9d3f3a8fac2331eaf2d604fc1eff18aebc06ac0a
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2118 BLAKE2B a2aa3f6567ac4c3894d43c793e36ea75583e18260b33957bc45d3ee21c9c1b30886ec15dcf297d97d8b156ce3e8eef7d4a4596efacebe70f2fe6d37ef68d2907 SHA512 86572fa6c4d1d864fda79ac9426a95a5207a7d7e1ecc2baf3681b39311cc4b4dd4799bef74f5f6746337f7b05714a2b327c3679457cc49b1058736298430e5ff
 MISC metadata.xml 413 BLAKE2B c4ba1418a2d7499d953111afac5907a4dd53c183f8a2613218aa0f0f510f1b75d04c6839c5407f20703ebab963d505dc09e081cfb053970147b07001caea6920 SHA512 7c32b5261d0bfe9f552efd08854233b47958d04cab7b932ddb67cfe163319f8f8ea82d1b169203b9e2158d3a436862d7050dcc762d3b525ba806690640ad3892
diff --git a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
index 2d652f9131f6..c09f42d5032a 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
 RDEPEND="
diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest
index 8b3c8eb29758..47ecddd84a71 100644
--- a/app-text/docbook2X/Manifest
+++ b/app-text/docbook2X/Manifest
@@ -3,5 +3,5 @@ AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1099 BLAKE2B 814d2102ea782d9
 AUX docbook2X-0.8.8-filename_whitespace_handling.patch 1702 BLAKE2B e72498323f32b6e8ba8d98bd1a3f5a614eedad4fb6d939f699ab7abf6d674ffab76b99f4ee218864c0f7b1351c6a62399dbb6606c466c4acbbd4b8300b655576 SHA512 38920a5f9dd142f7f76a5aa1ceb6a3c0e71dbb5c73b4f0408e249f5151a32898821f3e28c5f8250c2e2c29dd7453fde387a69890768d7d89f090f61a5db74b16
 AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3048 BLAKE2B 556e6c51091710087fb951430e83358978f00247629a7f5242e388e019f7ace467efbc7e6a1559642ceef6b7e941ed26c0bf00643ed8c81586998e215481a1a0 SHA512 9cbe0850aa255531b24cded169dc114f12cc40b34bb0d0be0d9461f413655633aaaa61267840d6b288d9090340d00631d717ab0d0f346e140dee16c92f1bc9e6
 DIST docbook2X-0.8.8.tar.gz 723909 BLAKE2B 17593d104a8b50a3ab56e5de464785d86d41c8a3fd04f76037c5482de867efa6dfa1ed4047e11814ed18275cd3b856440deafb637dcec17267a946d5cb1bd085 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c
-EBUILD docbook2X-0.8.8-r4.ebuild 1468 BLAKE2B 28d165a69eccff74e7bdc8c4d949f771d31ed680c7741e9574546c312d76ae7498da0e73c022847c13494caa91cb87fbd5541f7da44abc59dd8317f4ffa320f9 SHA512 c4a77d087f1a9845ab54b32240fdd67c93f90a2ce4fdd0663c5a552f48be0c41948f6eba066a0217dce79c6de67b2db56d8334521f5dc0c055e1c8a83a1c143f
+EBUILD docbook2X-0.8.8-r4.ebuild 1469 BLAKE2B 939f88ddb518781884c687aa82bb8202075ed27bd084134b127665b268b0b2321d96883c746becc1efe73c0a7ac228e4283cfe0c6b15e92eb628fbd80efb87b5 SHA512 0d82aa562a64bc7323d9cd113f65f41ae0fbbf69c83d4f96a7dbb2eece1ee1f98fa85e540e163f0fb690ae9dac4ae20fca222dfd7c9668389e3bf182cd7812af
 MISC metadata.xml 246 BLAKE2B aa5c9c8df66314e0c3f156b1f79b96a87103809e228bff9935544e5b0d9e61165dc0bd0080ecb78595e6e93d0e06c1b8c979b47b8a29f6bdae22fc3abe7a3f95 SHA512 751233aacee2a81a9b2e02bf872dc788d2fe39fa6d6b3781146dbd19e4eebf5854620b2ae9d62e0d4dada2a64903ecf789e94b3eefecedd131808bc575617759
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
index bd850d269574..b3d97459e00e 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
 HOMEPAGE="http://docbook2x.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv s390 sparc x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~x86-linux ~x64-macos"
 IUSE="test"
 RESTRICT="!test? ( test )"
 LICENSE="MIT"
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 5e1bbacb4910..d465eb3c1866 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,7 +1,3 @@
-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.tar.gz 727429 BLAKE2B 5ba8aecfe3a79dfe9f4d7d69453fdcdd573c8889b41240c6bce5fea1b7e9e8213454af98f768cb2d199c85684a7d48192ba4bf856a92b867594b52a2209d5e04 SHA512 3fb77561596bafd83f3f7807ce967e58d5a96e5235afe3a4074ae7112297445690b2586bf652eb0b5bd1984fd41a79478355f6df8244561b4167a8a09593110d
-EBUILD dos2unix-7.3.5.ebuild 2050 BLAKE2B c97f63d9cb7551e5c69c78487cc61fdba549f76c79a91c28b76fbe252e02ec9e34e4c448e6feca677df62a175600e21282816b903c023acd6b4d5a9dc6282514 SHA512 8329df38d2efc3e120b063a0df2505da939437acbb45a091a2bc0abcc52976486cb0e6219a850d3a4f9d298757572f181531490936a6d424cad6333a4f755216
-EBUILD dos2unix-7.4.1.ebuild 2069 BLAKE2B 3b8c79f046a011136ab334b5b8e177802d0519301d00bf8f3362cfded559157e6355bd627a62e7cf0924f741b214a67c310350f916df76a0d16d000a9aa4f6ed SHA512 7fa928c0b91275a08468ea3de683bc16c5ba998a863f5e5ca5a2fc7cef750cc122d1ef1fbae754f0f00d110f43bab3f677b84afe850fe96ffc3c19c7e3f76b25
 EBUILD dos2unix-7.4.2.ebuild 2136 BLAKE2B 66a7561e3fa2d5f498c221fd4e2291d840e1779dcf3f138bc3668d0542459c5c286a652ce12f2bdf076e7fc2e3a16941df1487036a81aedfd543e9542e318bff SHA512 6082dedaf500f71c19efc7c338680eda4f75aff4656f31fbb209ffcaaa8cac8f93f159d0862fe6cd306dd939f9d0b17166650e03a45e6bac809b590bef7a8537
 MISC metadata.xml 343 BLAKE2B c4023a36777a79352885528afd87e7709255ccf7f02d9ba28e29eb11f6c67c2775eeeec4f2db95b427b94859e70e7cd276984bca828eb872116e7ec33751c31c SHA512 12f79ed9fdd8df3c05110ea2a31123ca92a855cdf9287910802cb4e68c384764cc84c29929376426b23bfe9699574dbbdc2105d82c6e2701aa9fe67079d867f3
diff --git a/app-text/dos2unix/dos2unix-7.3.5.ebuild b/app-text/dos2unix/dos2unix-7.3.5.ebuild
deleted file mode 100644
index 21b83510afaf..000000000000
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
-
-inherit l10n toolchain-funcs
-
-DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
-HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
-SRC_URI="
-	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug nls test"
-
-RDEPEND="
-	!app-text/hd2u
-	virtual/libintl"
-
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )
-	test? ( virtual/perl-Test-Simple )
-	dev-lang/perl"
-
-RESTRICT="!test? ( test )"
-
-handle_locales() {
-	# Make sure locale list is kept up-to-date.
-	local detected sorted
-	detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
-	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "PLOCALES: ${sorted}"
-		eerror "po*/*.po: ${detected}"
-		die "sync PLOCALES"
-	fi
-
-	# Deal with selective install of locales.
-	rm_loc() { rm po*/$1.po || die; }
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_prepare() {
-	default
-
-	handle_locales
-
-	sed \
-		-e '/^LDFLAGS/s|=|+=|' \
-		-e '/CFLAGS_OS \+=/d' \
-		-e '/LDFLAGS_EXTRA \+=/d' \
-		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
-		-i Makefile || die
-
-	if use debug ; then
-		sed -e "/^DEBUG/s:0:1:" \
-			-e "/EXTRA_CFLAGS +=/s:-g::" \
-			-i Makefile || die
-	fi
-
-	tc-export CC
-}
-
-lintl() {
-	# same logic as from virtual/libintl
-	use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl"
-}
-
-src_compile() {
-	emake prefix="${EPREFIX}/usr" \
-		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		$(usex nls "" "ENABLE_NLS=") install
-}
diff --git a/app-text/dos2unix/dos2unix-7.4.1.ebuild b/app-text/dos2unix/dos2unix-7.4.1.ebuild
deleted file mode 100644
index 3b359905bb71..000000000000
--- a/app-text/dos2unix/dos2unix-7.4.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="da de eo es fr hu ja nb nl pl pt_BR ru sr sv uk vi zh_CN zh_TW"
-
-inherit l10n toolchain-funcs
-
-DESCRIPTION="Convert DOS or MAC text files to UNIX format or vice versa"
-HOMEPAGE="http://www.xs4all.nl/~waterlan/dos2unix.html https://sourceforge.net/projects/dos2unix/"
-SRC_URI="
-	http://www.xs4all.nl/~waterlan/${PN}/${P}.tar.gz
-	mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris"
-IUSE="debug nls test"
-
-RDEPEND="
-	!app-text/hd2u
-	virtual/libintl"
-
-DEPEND="
-	${RDEPEND}
-	test? ( virtual/perl-Test-Simple )
-"
-BDEPEND="
-	dev-lang/perl
-	nls? ( sys-devel/gettext )
-"
-
-RESTRICT="!test? ( test )"
-
-handle_locales() {
-	# Make sure locale list is kept up-to-date.
-	local detected sorted
-	detected=$(echo $(printf '%s\n' */*.po | sed -e 's:.*/::' -e 's:.po$::' | sort -u))
-	sorted=$(echo $(printf '%s\n' ${PLOCALES} | sort -u))
-	if [[ ${sorted} != "${detected}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "PLOCALES: ${sorted}"
-		eerror "po*/*.po: ${detected}"
-		die "sync PLOCALES"
-	fi
-
-	# Deal with selective install of locales.
-	rm_loc() { rm po*/$1.po || die; }
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_prepare() {
-	default
-
-	handle_locales
-
-	sed \
-		-e '/^LDFLAGS/s|=|+=|' \
-		-e '/CFLAGS_OS \+=/d' \
-		-e '/LDFLAGS_EXTRA \+=/d' \
-		-e "/^CFLAGS/s|-O2|${CFLAGS}|" \
-		-i Makefile || die
-
-	if use debug ; then
-		sed -e "/^DEBUG/s:0:1:" \
-			-e "/EXTRA_CFLAGS +=/s:-g::" \
-			-i Makefile || die
-	fi
-
-	tc-export CC
-}
-
-lintl() {
-	# same logic as from virtual/libintl
-	use !elibc_glibc && use !elibc_uclibc && use !elibc_musl && echo "-lintl"
-}
-
-src_compile() {
-	emake prefix="${EPREFIX}/usr" \
-		$(usex nls "LDFLAGS_EXTRA=$(lintl)" "ENABLE_NLS=")
-}
-
-src_install() {
-	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" \
-		$(usex nls "" "ENABLE_NLS=") install
-}
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index 01f4d72f10a1..2dfa79edb251 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,3 +1,3 @@
 DIST dvipng-1.17.tar.gz 171049 BLAKE2B 7165135d818aa399d051977908bf7865774803127312fec515284bd72c4f9e88ffd7f1f7c3c8f1b5adf324fdbb9ac8d039582ede2398123db6ee7655500ac32a SHA512 b56faa6f2b24572233e1f0d9b74122b3bb7fed22cf47c9c05f5530691854dffc9a1953b51803f7d539f9a9de364160d557560c68c369820212837bdbacfb80c7
-EBUILD dvipng-1.17.ebuild 1101 BLAKE2B b95fb6f2c3ef006b5477e3acf017829ed355f9ddd22e08206d6daf5d25a3e66f1e69a2cbfb8695b3d0865a49963d1c6971ede5236c7677422142343024089e5f SHA512 2392c88334ce53e3d73fce4e53f37b89435ef77c6b02f46237e893ecc25630b73c0a82b1e1ba32ab6734103eb95a2f1eeab3b44996740ffa0cfd73db7a6f0fd1
+EBUILD dvipng-1.17.ebuild 1102 BLAKE2B 6065c23f7b8944d39293d24a0c52e28926390987421c776a39a83efa4c3729ac191f69775c17518a8fad0bec07fd5fb73c95f20bb0d2867b5faa7abdd50d6441 SHA512 7024d5302582be69b1823fde6c5c460fe932d5588b2a793e20577a464ceafea59be1c503f492eb9d448d13d0a65ba15c9482aa463820996c4713ebca4d9e0c70
 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
index 068bb18ba2aa..80b7d38c3a40 100644
--- a/app-text/dvipng/dvipng-1.17.ebuild
+++ b/app-text/dvipng/dvipng-1.17.ebuild
@@ -11,7 +11,7 @@ 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 ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
 IUSE="truetype test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
index e62e3a07356e..8e94e3c9eaf3 100644
--- a/app-text/dvipsk/Manifest
+++ b/app-text/dvipsk/Manifest
@@ -1,5 +1,9 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
+DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
 DIST tl-dvips-2020.tar.xz 58076 BLAKE2B 329b4ffbb759a040143269d492b58037dd803e1e832f263da9db918d9cdbe66dce86a0bc23d2ac421a52da017e33a38b6986c89be9ae9ae0591c9261f4510b7a SHA512 835a289ac24755904d7d39e09846420b286c0aaf5c57a081ea8da78dfc29e2289bc326d735a0281f5559418dead10ad0d040e2fe6362947e15df672c82d7900e
+DIST tl-dvips-2021.tar.xz 58076 BLAKE2B 23105928a22ecb0fb9d9b3b9bc8e5edb2eb42c7cbcb48e80d9e72ea613a30a82c2d825eb4caae00bd04241260257e6feb400767fa3a12c55522799272dff2996 SHA512 1eec2ddbbc5d211f1d38237289a2bcfe716fe41210d47f6f9111a009dc179ca3dcaefde11e49d28d4cdd26b992dfed7fca3bff3178a6ca273f396afc45118013
 DIST tl-dvips.doc-2020.tar.xz 521496 BLAKE2B 1a19670ea2a6339f983564580bfc15374737014fe5dbccc4fb3f3f81455bab2c0ee9cec9ea0b9858ccd3d75cff6465d825a4a2fb095e7d4e70edb459e76634b5 SHA512 6f97f38327335ea711ec467133d1fa4e3124f3362d177e19af2cca06a50be1cf1de4d9e5b1aacbd1ba9779e0062a49a7572d47c5de918030fd5f78476e2bfac1
-EBUILD dvipsk-2020.1_p20200406.ebuild 1562 BLAKE2B a7874bfa7e1cfc899066612d254d80d8ca6c0dce1eba6c58b4871fa8976c6bd20c80b525231080cc4bf1d4c6077265bcd376c4cf7ed320e6fa6fba8f2f8f4b67 SHA512 670bada7c10c8c239152aafdf198177e69766991d73015c5ab38abbcf7b63f8132352c342d13e4603b8fead3e5ed5e02f057284b87e422db30756769379529e8
+DIST tl-dvips.doc-2021.tar.xz 521496 BLAKE2B 7c366af47a1ea967e871e5740d8debb1751b67b9e41a35aada0327c1aa26c04a90baf1898c1c50965ab766006028f5fb13264f5d7cda87fc630dd99300995b5a SHA512 07b00a4bfe557a04a93b22667f4854e2d55f76f33d2fa767d445b3301835aafafd4b8046b7126d5f516b65a743b1d0fe32a8fa3d0dc9b7b29e47bcfdfc790138
+EBUILD dvipsk-2020.1_p20200406.ebuild 1563 BLAKE2B 8c0e32dd0e55888d1b47411efd967fb6c22e127fcb5682ba18c2a16ea92abd26fdc8a9205d3024890c71f7cdbc61e570c8bf6237e04c7717e82bc6754e7120ba SHA512 b10e98aec4a2511a07f8f84949a4d694319244258310a512570b72f6e14bb34290fbecd8703d22642452713891bac48442f935f40f07b818ea05b61d86a133ed
+EBUILD dvipsk-2021.1_p20210325.ebuild 1571 BLAKE2B d9909c8d8cf206761f4d9cd6206969bb0420e8effe7ea8cb8c7651a16883a130ed6402247bbb60416eb7079370bdb2a88f112ce4631e7d17b8b3078630d641fd SHA512 cbacaca5bacc63aacb8f48aeb931790c1a5734abf840d1ef1e02d8a7bca003b6d511608e567dab4a0b0427d98eeccd0ce87fb6ea5ff916434ac8c41395d8e378
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild b/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild
index e9431319423e..4c38721a3d80 100644
--- a/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild
+++ b/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild
@@ -25,7 +25,7 @@ SRC_URI="${SRC_URI} ) "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild b/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild
new file mode 100644
index 000000000000..627e1168083b
--- /dev/null
+++ b/app-text/dvipsk/dvipsk-2021.1_p20210325.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit texlive-common
+
+DESCRIPTION="DVI-to-PostScript translator"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz"
+
+TL_VERSION=2021
+EXTRA_TL_MODULES="dvips"
+EXTRA_TL_DOC_MODULES="dvips.doc"
+
+for i in ${EXTRA_TL_MODULES} ; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${EXTRA_TL_DOC_MODULES} ; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${TL_VERSION}.tar.xz"
+done
+SRC_URI="${SRC_URI} ) "
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc source"
+
+DEPEND=">=dev-libs/kpathsea-6.2.1"
+
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_configure() {
+	econf --with-system-kpathsea
+}
+
+src_install() {
+	emake DESTDIR="${D}" prologdir="${EPREFIX}/usr/share/texmf-dist/dvips/base" install
+
+	dodir /usr/share # just in case
+	cp -pR "${WORKDIR}"/texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	if use source ; then
+		cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
+
+pkg_postinst() {
+	etexmf-update
+}
+
+pkg_postrm() {
+	etexmf-update
+}
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 3f48edff0582..afb1478c3342 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,8 +1,6 @@
 AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060b20c709f920aa7ef29e1560f4a194d744064f59ae7c812cc27debe30c1082a9f76d3eac8723f850803c5eb06c213fe39e91d SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
 DIST enchant-2.2.15.tar.gz 990693 BLAKE2B 09d380fc90cf8404345e88fb4e676f92e795b43e1caa5f21e52c6f3037268b1959e9cd1adf04b08e05fce78dbbcfd3163795e8d2079c484c530065566a0307f2 SHA512 e29b3a85d993af28044a86dd23a3ca74c7d50b4218e542c380053a3eaf70c3ea2406feb3361ba8e793bac586c252330bb20fb56c65f3a0a54f63f103cc0abb35
-DIST enchant-2.2.8.tar.gz 976715 BLAKE2B 50a96c69b6f6575db0a8d6f30420db4b273901a9a0261ae606d81d96b044ece03078a2549f34972fef47a36f0b85c27af90c90c2f2efab2fb258e17621d927af SHA512 4bfa771af0deab3d0ca5523abab1fdb14cb596747dba7cf887e8cd812601015f52502cbd3df68247f102bba259cb281414e9ccde83b8bdd3c8cc83c2fcbc9090
 EBUILD enchant-1.6.1-r1.ebuild 1618 BLAKE2B 339676eff2871a9abd5bf85a3509924677ec5d9939e49416d4d09b71d4d228b45e81f8ac6b207c449c8ca837aab0d8d63add052598a0ce9430873bf0ea3df250 SHA512 eedb24e76290dffa83a68a565e2f5dc10544360a62617bea107a4270d13b5a6dbb19418a245c84923ad3dd5d6e77dda2338f14bee2b3a17ddeff1b7c2414ad2c
-EBUILD enchant-2.2.15-r1.ebuild 1239 BLAKE2B ccc49b3b36e88096516ace10c7a6725c68adbb381849e641a3547bc2dfbdc1b5282c09a43208cb7a6517830f1c7f8340f1c6b33d1a924c1a4c998856de2f84d4 SHA512 3f69599d7dc4849a9090afcc8d5416bf00fca24ce7887cda1807681522ff1446925a1737b223f32d61a458662b071df682ff98bbc6cf2af5dfb2f3b6d81bce3c
-EBUILD enchant-2.2.8.ebuild 1219 BLAKE2B a68741164e6cb8eb2e96ae2349bc18e584327a10aeb4fe9c6ee0a294a2101709327afda22567832248b36fbeb4d84f6281e99acd0840ba93619d9daa3180ba44 SHA512 a3549c67b4543d18180e6b09072f56b234b04cb374535b3535f71ce5f9156e90705748f0289f127ff5c1074349c57a467f77f2669172abb9b3f6c3929686aebc
+EBUILD enchant-2.2.15-r1.ebuild 1234 BLAKE2B 581181d56ebf49b2d414dbbc9b5b10978b00995af9c1351fde61323c7a82037f7d1ad9bf04e45fab52d493724d77c1b722d363c5dd83e7be9bf61d674c8f0bd3 SHA512 ffd97fbf9221420bce5cac19b147c65f945ee5c612728f7e400a9172fad1b62aae24ddcf811a6ea12fe9bdef9fb73fc1bef41d50a11c012db75352e253d48c91
 MISC metadata.xml 536 BLAKE2B 5f66bf0da00c6cfd8d6e22b9644486d0df8cf81cf5875768572965f60927edbe4d46ed2502659bcb71431c715129d1d7da051f9320b3f2834905a0cac3c2556b SHA512 920c2056608571d6a2e52d0c52b995b664c95aa53c8f8cb51129b059c32180d977ab3c840ef7fb59af3dec5f984f3e1488de26cf3ba4d93c2eb81c08e6688d5b
diff --git a/app-text/enchant/enchant-2.2.15-r1.ebuild b/app-text/enchant/enchant-2.2.15-r1.ebuild
index 7108074ab661..148aae6be617 100644
--- a/app-text/enchant/enchant-2.2.15-r1.ebuild
+++ b/app-text/enchant/enchant-2.2.15-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="aspell +hunspell test voikko"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/enchant/enchant-2.2.8.ebuild b/app-text/enchant/enchant-2.2.8.ebuild
deleted file mode 100644
index 69e96cf4c78d..000000000000
--- a/app-text/enchant/enchant-2.2.8.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
-
-IUSE="aspell +hunspell"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-RDEPEND="
-	>=dev-libs/glib-2.6:2
-	aspell? ( app-text/aspell )
-	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-#	test? ( dev-libs/unittest++ )
-RESTRICT="test"
-
-src_configure() {
-	# TODO: Add app-text/nuspell support
-	econf \
-		--datadir="${EPREFIX}"/usr/share/enchant-2 \
-		--disable-static \
-		$(use_with aspell) \
-		$(use_with hunspell) \
-		--without-nuspell \
-		--without-hspell \
-		--without-voikko \
-		--without-applespell \
-		--without-zemberek \
-		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest
index 295734c81630..08ed38e04bff 100644
--- a/app-text/enscript/Manifest
+++ b/app-text/enscript/Manifest
@@ -1,9 +1,9 @@
 AUX ebuild.st 6047 BLAKE2B 661a427601920a448b829bbbeb8472199f4ba17cccf698eb206e0651247eb9a115afd50553116f542b31d7ce6436f4bfce3ceef3a894b40087ae7a7c5c6080cc SHA512 1c01943ec901dc4ea314715232fac279fa051b441b39e8cc5bca759b67dda87c4982eba23a37f3b60b041815c347ea85faf774e5574471232e4e941eb186caf5
-AUX enscript-1.6.2-ruby.patch 661 BLAKE2B 119c3b301f0a9811b65a509ced694b049796600e65b10fd29a200fabee37fa73e7ba6e78705329979f619c7515d14294003fd33b364cad62e058357f1d48a7bf SHA512 6ca804c1f9e1bc19eb896c88c4e710b5212e570d5e0d84b5b40100d4645bdb483c55ad902ae5db9a617268387d6b1d6db54f69e9ba3479f0f669dc1b2314d65c
-AUX enscript-1.6.4-ebuild.st.patch 332 BLAKE2B 88feff57f5dabfb09dce2c11c65e64005f667b6a98107fc4a608ccb4e0d7a16a3fbc1b15bdb64f8538b417387a0d82f4f3df87ef2564eb384498d3f1606617c6 SHA512 8e86a7b2966810852703a7f3636b0c92e940d3fba21a46be46086830799cfecd2870cd38679f009cb9d984bf3c475e843df67970619cf43ebf272c209b204fd9
-AUX enscript-1.6.4-fsf-gcc-darwin.patch 832 BLAKE2B c16294bf4a42827bf7af1b4df233305ad1dec4abb9f4c9b01c23299c914e7c07e71759f00ebed8a8429b499acfe839fd5e093f43e17e107611b19f111632b9cb SHA512 d14f707cce8609555efa72d9c3a9ce1662fe8153c00e26eca5c08540d2b5fa0e024426f574601311f946012728c15240569ebe47586519fdf82b0ab117eebed6
-AUX enscript-1.6.5.2-php.st.patch 410 BLAKE2B 84e35ea8441b60bc5da3085b969f1b20334ed4f9632681b12cd50fbd95d144e40fcd1874aed99a08986432885efdeb70653b0ffed7e5a5b83d5bf1edbff60cbd SHA512 71bf65c91d6d362bbb700ef26b72137e524a969da0971b7f0c30ac409a7f002103769cc25c02222d0ccb1bf69919a419481af9ea479828e3df18ec7a2e1d29b0
+AUX enscript-1.6.2-ruby.patch 588 BLAKE2B 24b450e360861f8c747979cf84d06921252aff6bcb5faec1187bf9ab5b0135a41e01c40079e5da5620b6ccc43a5c889157c349a4cd112eac60a42243d154a60e SHA512 76bd21efc3f252fb2b6488af25d1f5721e4a05975b4f0f3b6b4062726e505a2a583517400f39bedcdcb1bb4f92da4a10cf747c98e97c7e8e8c0edf147d6c4ec9
+AUX enscript-1.6.4-ebuild.st.patch 292 BLAKE2B db5048eac6d3ebfe1b5a3bdd50148f4975b95e19e64523a461f1db5244d5e3b40ac2962890802c24199d6d6aa1f4d51264bad6173743642ba553fdf561e9cd81 SHA512 c033340f988731717f8e0bba7e94e5625089af7184e2bf28e99cfa758c1c794174a1948f0bf7d83580f677452a30f82cf32813f7b39c98982297a00c52064aa6
+AUX enscript-1.6.4-fsf-gcc-darwin.patch 836 BLAKE2B 88248e38e4963dc7d5d00cab8739c0f955d59c67ed725836c7444b239ccfcc9483861757de5d3adfe71a2a4a5e64e9eca77473554a30083b16d85ded5c077365 SHA512 282b87be1e71df04d3f8161386f41d29f808de33e2709f2ef143a678a4cf752c0394921f51ea9f51a90b6949fe60757b26e7d2f24fd13ca7f0522f6e460d1324
+AUX enscript-1.6.5.2-php.st.patch 210 BLAKE2B 85f6531797d84e8b6ad3933785e5a019c9ef0b36e716ba1714892408cbb370b2cbe11dc7badbe6a8ee5dea1654cd214e7c65fcfcc03fcd1fc9d1e07c1fb6f294 SHA512 8440c2bcf761b4e2151b1c6caa31aa4019b329253b7cc8ce1a0181c310908e1cae471b1ea0f1d2bb0bd24c206688b76b1d235a7fddea6afc5d00c7b61fe8a505
 AUX ruby.st 3904 BLAKE2B 854c86166a43715e85e91802f2d82eae71773d9caabf604bd5edc0e53046ed0fa9944ec61c5ff7516e22740cc90ac73dc1d8edbdc0e9722ec876be3a129d2183 SHA512 43af0998ebe95530129aec126b9f91878bbbf7dd52530cb162b25f5779f9eb5b870f41727665e66dd5cf42a6d5e790899bf03c38c1a914adf2b0eecac83154e2
 DIST enscript-1.6.6.tar.gz 1330493 BLAKE2B 02e333271ac6716e049402d5904b0ad6926b31d4533c813a9e5bcf76045d4100def2476426b97c52585e8f5c0a741159fb3e78de79c817e75de81ebd464c0d61 SHA512 bf1c2b9ea7723518a1ef312145ddcd6ffdef0c6e8b5795ea84cb55d76fccc02f441d0c2dc6897e970368186e6a829ab74a090716624e0f7a8f575653fa495ebc
-EBUILD enscript-1.6.6.ebuild 1249 BLAKE2B c42f8f6142e1fbd3c7f704e6c9ff11c562818473f424ffb87a0c736f4acd036766d59ad8e7de4d669a8ae86f77a9d0c5273edc972f0d1d43b2e0b48f35e8aedc SHA512 4b16d2ca248f020bd4bfdb699e2a71a7fc1e3466941d2a3290daceab3ed5015f4175f94d894ce256808dd46f24f33d20205828b0289827c6e05677a866850cd2
+EBUILD enscript-1.6.6.ebuild 1248 BLAKE2B 74c2fb68de023bde9b491da0271cbfdd89fbee2b8b2ced2649d93863d6efdf4f3b3bc69127bd7eb03ad346d18fdbb88724756d6a4037dd2a5851403f6a8f7f55 SHA512 f1b8557d1e0d46cc18ff1033916f35be598f2f66e49103df7f63342ccb58009fb631974c1cbcf5e752bf44718da4df1dbb5011ddb827a47e37a899ce4271d774
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/enscript/enscript-1.6.6.ebuild b/app-text/enscript/enscript-1.6.6.ebuild
index b613378cc142..bb889e8b0db3 100644
--- a/app-text/enscript/enscript-1.6.6.ebuild
+++ b/app-text/enscript/enscript-1.6.6.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Powerful text-to-postscript converter"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
@@ -14,20 +14,26 @@ SLOT="0"
 LICENSE="GPL-3"
 IUSE="nls ruby"
 
-DEPEND="
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-devel/flex
 	sys-devel/bison
 	nls? ( sys-devel/gettext )
 "
-RDEPEND="nls? ( virtual/libintl )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.4-ebuild.st.patch
+	"${FILESDIR}"/${PN}-1.6.5.2-php.st.patch
+	"${FILESDIR}"/${PN}-1.6.4-fsf-gcc-darwin.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/enscript-1.6.4-ebuild.st.patch
-	epatch "${FILESDIR}"/enscript-1.6.5.2-php.st.patch
-	epatch "${FILESDIR}"/enscript-1.6.4-fsf-gcc-darwin.patch
-	use ruby && epatch "${FILESDIR}"/enscript-1.6.2-ruby.patch
-	sed -i src/tests/passthrough.test -e 's|tail +2|tail -n +2|g' || die
 	default
+
+	use ruby && eapply "${FILESDIR}"/enscript-1.6.2-ruby.patch
+
+	sed -i src/tests/passthrough.test -e 's|tail +2|tail -n +2|g' || die
 }
 
 src_configure() {
diff --git a/app-text/enscript/files/enscript-1.6.2-ruby.patch b/app-text/enscript/files/enscript-1.6.2-ruby.patch
index b492ca4f44f7..1404daa823d5 100644
--- a/app-text/enscript/files/enscript-1.6.2-ruby.patch
+++ b/app-text/enscript/files/enscript-1.6.2-ruby.patch
@@ -1,5 +1,5 @@
---- states/hl/enscript.st.orig	2006-12-17 02:10:37.000000000 +0100
-+++ states/hl/enscript.st	2006-12-17 02:10:13.000000000 +0100
+--- a/states/hl/enscript.st
++++ b/states/hl/enscript.st
 @@ -489,6 +489,7 @@
    /\.idl$/					idl;
    /\.(hs|lhs|gs|lgs)$/				haskell;
diff --git a/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch b/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch
index 0741576226af..413039729675 100644
--- a/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch
+++ b/app-text/enscript/files/enscript-1.6.4-ebuild.st.patch
@@ -1,5 +1,5 @@
---- states/hl/enscript.st	2006/01/31 05:37:23	1.1
-+++ states/hl/enscript.st	2006/01/31 06:48:32
+--- a/states/hl/enscript.st
++++ b/states/hl/enscript.st
 @@ -509,6 +509,7 @@ namerules
    /\b(rfc.*\.txt|draft-.*\.txt)$/		rfc;
    /\.inf$/i					inf;
diff --git a/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch b/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch
index 3ea4bf97efd0..23196ca0c3c4 100644
--- a/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch
+++ b/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch
@@ -3,8 +3,8 @@ darwin: __private_extern__ is an Apple-ism, we really don't want
 In particular FSF GCC barfs about this, which is much preferred over
 ancient gcc-apple (4.2.1).
 
---- compat/regex.c
-+++ compat/regex.c
+--- a/compat/regex.c
++++ b/compat/regex.c
 @@ -5539,9 +5539,6 @@
     It returns 0 if it succeeds, nonzero if it doesn't.  (See regex.h for
     the return codes and their meanings.)  */
diff --git a/app-text/enscript/files/enscript-1.6.5.2-php.st.patch b/app-text/enscript/files/enscript-1.6.5.2-php.st.patch
index b146d998ee41..9b3930103ab4 100644
--- a/app-text/enscript/files/enscript-1.6.5.2-php.st.patch
+++ b/app-text/enscript/files/enscript-1.6.5.2-php.st.patch
@@ -1,6 +1,5 @@
-diff -ruN enscript-1.6.5.2.orig/states/hl/enscript.st enscript-1.6.5.2/states/hl/enscript.st
---- enscript-1.6.5.2.orig/states/hl/enscript.st	2010-06-02 00:17:49.000000000 +0200
-+++ enscript-1.6.5.2/states/hl/enscript.st	2011-06-02 12:43:13.869855504 +0200
+--- a/states/hl/enscript.st
++++ b/states/hl/enscript.st
 @@ -510,6 +510,7 @@
    /\.tex$/					tex;
    /\.wmlscript$/				wmlscript;
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index b529b5d954be..856857fe1e65 100644
--- a/app-text/epspdf/Manifest
+++ b/app-text/epspdf/Manifest
@@ -1,3 +1,3 @@
 DIST epspdf.0.6.3.tgz 335975 BLAKE2B aacd6e222bfe74636dba796fd6e878fa9970f469d096eb77acf4a336a0ab5620629de7ba1c763afa62b181887724db55be57d1929a041a945c7d74ea3028d6de SHA512 ddb0d8c17b6b0bbb934312e6253a2b689d2545c892af989efac9782022c501109f2ff57bb2ea7c26d63d7747e2a510c18bd22a6076bb7137fe0252c38b2125ea
-EBUILD epspdf-0.6.3-r1.ebuild 1343 BLAKE2B cd941f093434f753035f7718ee1f6704238d781ce4d0cc11ca21c1104933e2d3662dabd3d37cc3869819ca81abd1a1bf1d92b75e904b33300771dd4d66eaf08c SHA512 474de1a76ede7376fff767f5ccb2d019c95b2930b521af587239f0b5f98c4fa421f17f6d8309e301b3c2b4462338f27521b7ffd741179329ba5d9c3a54d6f78b
+EBUILD epspdf-0.6.3-r1.ebuild 1344 BLAKE2B 3107fc17f92c58007cbb85c24e9b9aa8cf79accb4b7d890b5fa68a557550c69093171c2446ac33129b57208f0b9b175ee504fce839ec19173446facfab6e4bfc SHA512 f2207054f038b8f1b13d4435722873f56636bf1cfd1d20016681a5dc745403ac374481cd7649dfd2c442afac168c1f7487da1161d165783f6908ad3c8a041519
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/epspdf/epspdf-0.6.3-r1.ebuild b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
index e71c82bf02d9..d19bd91cc735 100644
--- a/app-text/epspdf/epspdf-0.6.3-r1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc tk"
 
 DEPEND="sys-apps/texinfo"
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index ab9774360567..cd6afebae4c5 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1,8 +1,10 @@
 AUX 3.30.2-internal-synctex.patch 964 BLAKE2B cce1d02b40b18a23773985e2d9f39b1782e56ee9e032d625e51796723a2ad43e3cb9083055bcbc10438cb70b15e7c7c6737db3d7276db1e02b19127c5d75e527 SHA512 f1a98d09a0fee6add7a5a44d756ceaa003cbb3840e74a513c1f01ad6826ee4136cc5b862b675401371951468f1cdb2e5137158c44801a0c9ebe79c60951b8fbd
+AUX 40.0-avoid-changing-soname.patch 2136 BLAKE2B 3e9c25711ab9e5e83f3e9407fb03f8259c6bc035e384d1394319df987584cbd71dfe2970a503d0d7939ec4f7744bae498466a34512a35e1b4c1f2e783f621eaf SHA512 c723fce354f0a034f2ad4846d4b9f637f4985a03bdb7caef348328c74ab9488ef3d2f2204583248e35e0d8a27456b7327ac2e8e0ca14e0ab92e8db25e0197dda
+AUX 40.0-internal-synctex.patch 921 BLAKE2B d970afe7dd3ac16d7f285baeb157bba0271a6816326a17527d91b68d481d23ed3ad982211c07c412a61157d17cecafa591cc80482ec22abad3ce29101068bbd5 SHA512 703d9b5ca4e718660fe5af2d59a60b3187beda965e3a7b6eeaf1f7bf61013f3acde54b0ba89c8b493b1f0b1950cd52893ff1fb00a74c6d97645df29a1829902c
 DIST evince-3.36.10.tar.xz 2430584 BLAKE2B 7c8b5e3dec7168f4ab6976022bb85041fd8cc9f55b8c032bbf03cf492d243dc49f00d6913c1f2f09498c1b4091b4be126a9367dd3ed235635e9d08e6a9ae5a0d SHA512 2a17fc1fbd18e2685c254194d0e195ec0c6126f37212ae64297fb06f30f2e07f926cb768affb4d5c9c407c4dfc43db3578ffd244c9a6e121d1d3c9b5e653b4d2
-DIST evince-3.36.7.tar.xz 2580208 BLAKE2B 76ba6d206289f9981af24e5d82c9567c05984ad71efe83391aa1f8fdd94d31c284e600cf81eab9868e01f120f71cde1ae9b6ee6b7a4b1da47458d17b95b78d87 SHA512 dacc26d2d75c3dcadceb0a35c995ae3501bd91e84632cdf87decd359350e74032444707ea152e24c01fb57fe0ef2a426813a33919833cefdeb8699f8c642d910
-DIST evince-3.36.9.tar.xz 2429740 BLAKE2B 7154d473561955df9be545bbda520034e7de1556ea241dd30833ac014af2bb20fc3ef1d7fe6777cdcfab90553eb3f0562e1452df62c1c1eeb6b47b5bb64298bf SHA512 54f2dfc287fa627e1474c4bb23e6127bc5daa7044c2158805e5af487b7d65e776da9b86adbb83ec63fad3ce4c339f57483a3a2d7b95ad14de2dc76e29a29a8fb
-EBUILD evince-3.36.10.ebuild 3084 BLAKE2B e6e11a3ac3b73977fa9c0f1b8dff67a9009a596520004ec77c1553bedf473a4db2e138a6f5694057ea935180d6c4f54c4c717af39e774eadfb791ac42bb8a087 SHA512 945e1e90ac2a93bdb7d4e8556429c0a5810be6e50a5f3d437daf6c62057e0d1224b455c851db6b258876e10f48c85f652524f2a4edc6f4c50051a61b3dd8d1f6
-EBUILD evince-3.36.7.ebuild 3133 BLAKE2B d178be50e5460d9d834cbb0b940c19541570fc4b2de8439b06c44db95685ef7e66a95e88c8e42b30b05461586bfbec3188053a7a98fe781d4c514e7aca8cdd0d SHA512 74a824eddcd0caf3c5a87432535bdc779fe1f328baa10f6d3ad3483d4b8e38eaff561785e1920413ee8e4955b259c2755b17ae15b6e2ab0a077d779dd84b7740
-EBUILD evince-3.36.9.ebuild 3085 BLAKE2B 2a03f08a70a2601cf8d7bfec6407467e894c5e90abb44f95bf85c8153cdb08ab15035f4e092329cb381b18724002fcfcde179ce98fc28e9f7a9b5dd95a966998 SHA512 f47f5d5ce87b54ac71d319186b8de8092dad584d8035e98488e63ba62f8c18f9a566e46f777c8dd559a24f6f887340814d529927e3c4b87a94e7a4baeb7246da
+DIST evince-40.0.tar.xz 2928668 BLAKE2B 852c532b595f50e849893670b536b5b8c25f0407a719cbe659faa3f72b51f43a0471c3df9197fa5bd11735c14e0779d8cf28a88cd79aabec4dffa797443b9819 SHA512 995693e4a6e1a3bb31e1d4f3538dc53519102a5a6afa58ba61454a1e2ca582df26bd368876210fce6fab8ff4e218305644fa7a7a88c99e1a1ca5bda8d8f1ece2
+DIST evince-40.1.tar.xz 2928924 BLAKE2B e9376c186da9fed132b820b2e9a1ef6bb0997f22abca3d7b271691291ea4870132b48075ada5a992e056193e6af51bdf95e6bbdac79c789475fb985d692f9ccc SHA512 c688ee962cfff8b024b572161bae689d25b5b566ac623abeff38b4b8e6e541ce343023ed2c1ba0df1f65d6ec9a631aac3a748c940db556dbb89ab45ac565147d
+EBUILD evince-3.36.10.ebuild 3083 BLAKE2B ff940dcedd304464ba5cb06451aa14a1c8943d45f616532e93eeca3b5f6399ff9f6949c676473646f9c4f5d863086dc1388800077022afde3497feb5bd09027e SHA512 58b7f5b0013c9fb6af17e9782dc5b9738412c5bb6c63e744ec66018e4a25dc5b997d5bd75b9e165b4df0f1eed781ea310a8005c1116e11b23f5abca5d92e01a9
+EBUILD evince-40.0.ebuild 3281 BLAKE2B 5fee649a184d6340a05f80503d4737f5a4b58f6aed88b805324a988c4bba0177a909a42fcc0d6f8cc8f6f488edbd2f75f43909968a343de60e6b2f02158ec2ef SHA512 9d2a0a6eba4cfb68a07d5ccfcac21dceb42799fc3b921f67358685d5d86b1281d68615ca820993b5d9567c4111e9befd55d03e06007f4b09e59ffcd65dd292fa
+EBUILD evince-40.1.ebuild 3237 BLAKE2B 7d9d95e411fadc2e13e198e70570ebad650ab1d8de08de3845cb733398a47d95235b6ef0b0fd237e0358e3b253565f6bd239917134e5e047120a2edb4ac4bd61 SHA512 cfd61d25977419401c8599b1fbefab1f233e7cebc06e990053fedcd93884f2151385598b8e29676884c35d1b5314a052700389d1c120e843e904934a91354fab
 MISC metadata.xml 881 BLAKE2B 180e93316fad8f1bf7b80028a86c18964e695c93292b724e864ed50f3fbd951f810fd490b91944f30e42f632ce090dbe34aadf9679b2e62c118aa75b7b0ea834 SHA512 ece377a284a548444c185a7c1fa4c36546709ec00754d066eb4186fba0f079de60b02dcb75f3fd101d50c8ea8f4d4d654d7efd0d8ff8db7b2b85c097c18b43c5
diff --git a/app-text/evince/evince-3.36.10.ebuild b/app-text/evince/evince-3.36.10.ebuild
index 64014ae0e5a1..8a39036dc003 100644
--- a/app-text/evince/evince-3.36.10.ebuild
+++ b/app-text/evince/evince-3.36.10.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2+ CC-BY-SA-3.0"
 # subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
 SLOT="0/evd3.4-evv3.3"
 IUSE="djvu dvi gstreamer gnome gnome-keyring +introspection nautilus nsplugin postscript spell t1lib tiff xps"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 
 # atk used in libview
 # bundles unarr
diff --git a/app-text/evince/evince-3.36.7.ebuild b/app-text/evince/evince-3.36.7.ebuild
deleted file mode 100644
index c58451165d69..000000000000
--- a/app-text/evince/evince-3.36.7.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-3.28.0 )
-	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/evince/evince-40.0.ebuild b/app-text/evince/evince-40.0.ebuild
new file mode 100644
index 000000000000..6236265c87f2
--- /dev/null
+++ b/app-text/evince/evince-40.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org meson 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="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +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
+DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.44.0:2
+	>=gui-libs/libhandy-1.0:1=
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.40:2
+	>=x11-libs/gtk+-3.22.0:3[cups?,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? (
+		>=app-text/libspectre-0.2:=
+		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-3.28.0 )
+	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="${DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10
+	)
+"
+BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.33 )
+	app-text/docbook-xml-dtd:4.3
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/40.0-internal-synctex.patch
+	"${FILESDIR}"/40.0-avoid-changing-soname.patch
+)
+
+src_prepare() {
+	default
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
+
+	# https://gitlab.gnome.org/GNOME/evince/-/merge_requests/336
+	sed -i -e 's:T1_initLib:T1_InitLib:' meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Dplatform=gnome
+
+		-Dviewer=true
+		-Dpreviewer=false
+		-Dthumbnailer=true
+		$(meson_use nsplugin browser_plugin)
+		$(meson_use nautilus)
+
+		-Dcomics=enabled
+		$(meson_feature djvu)
+		$(meson_feature dvi)
+		-Dpdf=enabled
+		$(meson_feature postscript ps)
+		$(meson_feature tiff)
+		$(meson_feature xps)
+
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_doc=true
+		$(meson_use introspection)
+		-Ddbus=true
+		$(meson_feature gnome-keyring keyring)
+		$(meson_feature cups gtk_unix_print)
+		$(meson_feature gnome thumbnail_cache)
+		$(meson_feature gstreamer multimedia)
+		$(meson_feature spell gspell)
+
+		$(meson_feature t1lib)
+
+		-Dbrowser_plugin_dir="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+}
+
+src_test() {
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
+}
diff --git a/app-text/evince/evince-3.36.9.ebuild b/app-text/evince/evince-40.1.ebuild
index 55eb01fe8865..05e5b8fd667b 100644
--- a/app-text/evince/evince-3.36.9.ebuild
+++ b/app-text/evince/evince-40.1.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-GNOME2_EAUTORECONF="yes"
 
-inherit gnome2 systemd
+inherit gnome.org meson systemd xdg
 
 DESCRIPTION="Simple document viewer for GNOME"
 HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
@@ -12,25 +11,26 @@ 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"
+IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +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
 DEPEND="
 	dev-libs/atk
-	>=dev-libs/glib-2.38.0:2
+	>=dev-libs/glib-2.44.0:2
+	>=gui-libs/libhandy-1.0:1=
 	>=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?]
+	>=x11-libs/gdk-pixbuf-2.40:2
+	>=x11-libs/gtk+-3.22.0:3[cups?,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
+		>=app-text/libspectre-0.2:=
 		dev-libs/kpathsea:=
 		t1lib? ( >=media-libs/t1lib-5:= ) )
 	gstreamer? (
@@ -51,56 +51,80 @@ RDEPEND="${DEPEND}
 	gnome-base/librsvg
 	|| (
 		>=x11-themes/adwaita-icon-theme-2.17.1
-		>=x11-themes/hicolor-icon-theme-0.10 )
+		>=x11-themes/hicolor-icon-theme-0.10
+	)
 "
 BDEPEND="
+	gtk-doc? ( >=dev-util/gtk-doc-1.33 )
 	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
+	"${FILESDIR}"/40.0-internal-synctex.patch
 )
 
 src_prepare() {
-	gnome2_src_prepare
+	default
 
 	# 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"
+	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
+
+	# https://gitlab.gnome.org/GNOME/evince/-/merge_requests/336
+	sed -i -e 's:T1_initLib:T1_InitLib:' meson.build || die
 }
 
 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)"
+	local emesonargs=(
+		-Dplatform=gnome
+
+		-Dviewer=true
+		-Dpreviewer=false
+		-Dthumbnailer=true
+		$(meson_use nsplugin browser_plugin)
+		$(meson_use nautilus)
+
+		-Dcomics=enabled
+		$(meson_feature djvu)
+		$(meson_feature dvi)
+		-Dpdf=enabled
+		$(meson_feature postscript ps)
+		$(meson_feature tiff)
+		$(meson_feature xps)
+
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_doc=true
+		$(meson_use introspection)
+		-Ddbus=true
+		$(meson_feature gnome-keyring keyring)
+		$(meson_feature cups gtk_unix_print)
+		$(meson_feature gnome thumbnail_cache)
+		$(meson_feature gstreamer multimedia)
+		$(meson_feature spell gspell)
+
+		$(meson_feature t1lib)
+
+		-Dbrowser_plugin_dir="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins"
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+
+	)
+	meson_src_configure
+}
+
+src_compile() {
+	meson_src_compile
+}
+
+src_test() {
+	meson_src_test
+}
+
+src_install() {
+	meson_src_install
 }
diff --git a/app-text/evince/files/40.0-avoid-changing-soname.patch b/app-text/evince/files/40.0-avoid-changing-soname.patch
new file mode 100644
index 000000000000..6742d967b10c
--- /dev/null
+++ b/app-text/evince/files/40.0-avoid-changing-soname.patch
@@ -0,0 +1,66 @@
+From ca4b7aaff690095971de96370317fdf1bcd3af8f Mon Sep 17 00:00:00 2001
+From: Kalev Lember <klember@redhat.com>
+Date: Fri, 26 Mar 2021 14:48:51 +0100
+Subject: [PATCH] Avoid changing soname
+
+Bumping the major version to 40 in commit
+288be740b5bbb59757db5038ab435ceb7a334dcf inadvertently changed the
+soname for shared libevdocument and libevview.
+
+Fix this by making the soname calculation independent from the project
+version as the library ABI hasn't actually changed.
+---
+ libdocument/meson.build | 2 +-
+ libview/meson.build     | 2 +-
+ meson.build             | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/libdocument/meson.build b/libdocument/meson.build
+index 74fe2fb1..e09de7fc 100644
+--- a/libdocument/meson.build
++++ b/libdocument/meson.build
+@@ -138,7 +138,7 @@ cflags = [
+ ]
+ 
+ libevdocument = shared_library(
+-  'evdocument' + ev_major_version.to_string(),
++  'evdocument3',
+   version: ev_document_version,
+   sources: sources + enum_sources + [version_header],
+   include_directories: top_inc,
+diff --git a/libview/meson.build b/libview/meson.build
+index 20179aff..74c86d51 100644
+--- a/libview/meson.build
++++ b/libview/meson.build
+@@ -82,7 +82,7 @@ if enable_multimedia
+ endif
+ 
+ libevview = shared_library(
+-  'evview' + ev_major_version.to_string(),
++  'evview3',
+   version: ev_view_version,
+   sources: sources + marshal_sources + enum_sources,
+   include_directories: top_inc,
+diff --git a/meson.build b/meson.build
+index 1ed37e96..cafb9023 100644
+--- a/meson.build
++++ b/meson.build
+@@ -43,13 +43,13 @@ ev_document_version = '@0@.@1@.@2@'.format(ev_document_current, ev_document_revi
+ ev_document_current_minus_age = ev_document_current - ev_document_age
+ 
+ # Libtool version of the view library
+-ev_view_current = ev_major_version
++ev_view_current = 3
+ ev_view_revision = 0
+ ev_view_age = 0
+ ev_view_version = '@0@.@1@.@2@'.format(ev_view_current, ev_view_revision, ev_view_age)
+ ev_view_current_minus_age = ev_view_current - ev_view_age
+ 
+-ev_api_version = '@0@.0'.format(ev_major_version)
++ev_api_version = '3.0'
+ 
+ ev_include_subdir = join_paths(ev_name, ev_api_version)
+ 
+-- 
+GitLab
+
diff --git a/app-text/evince/files/40.0-internal-synctex.patch b/app-text/evince/files/40.0-internal-synctex.patch
new file mode 100644
index 000000000000..8c45548c639a
--- /dev/null
+++ b/app-text/evince/files/40.0-internal-synctex.patch
@@ -0,0 +1,28 @@
+From ce976d98317535d17d8aabd67729918a94b24cea Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Mon, 12 Apr 2021 23:07:50 -0400
+Subject: [PATCH] build: always use internal synctex instead of automagically
+
+We don't have a separate synctex package and would have to pull in
+all of texlive-core; so instead of fixing the automagic use of it,
+just remove support for external synctex, as that's easier.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index abee124d..63c5040c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -251,7 +251,7 @@ config_h.set('HAVE_DESKTOP_SCHEMAS', gsettings_desktop_schemas_dep.found())
+ 
+ # *** libsynctex ***
+ synctex_dep = dependency('synctex', version: '>= 1.19', required: false)
+-external_synctex = synctex_dep.found()
++external_synctex = false
+ 
+ # *** Mime types list ***
+ mime_types_list = {
+-- 
+2.26.3
+
diff --git a/app-text/fictionup/Manifest b/app-text/fictionup/Manifest
index e5b0d2db6dfb..3138dc90591e 100644
--- a/app-text/fictionup/Manifest
+++ b/app-text/fictionup/Manifest
@@ -1,5 +1,3 @@
-DIST fictionup-0.1.tar.gz 322407 BLAKE2B 73b464b73f58d725a1973450c2ecb79e140d2a2a4f6a563ea9d5fc1c25ff417a98f487fd26f1c578234007ccb52902390e6292fd3f1b3ec0331a31d00e25e9c3 SHA512 375dbfb27cab05693197b0774875ebbafdb5c4a1bc67db318e00712b821d37fc647b5047fbca083ad145847aa61b81486e4f5192524c233d3facdec3447beb6e
 DIST fictionup-0.2.1.tar.gz 375892 BLAKE2B 1aa80517116e2154227fbc374efe6f051c665c7a2cbc0b2f7c71373a1f535ea41189db4528134b0031f754507d214e6f787df3b571443b6dc5d17f60535069c6 SHA512 c6fadac5bfbd88356dd90b4d2673d2d3dd4d7b5cc26d0b0e1141862143d79b8cfbb71cbbe1c82fe52e4777aed43a677efba1479d14ac64d3931d6bcf31dbc127
-EBUILD fictionup-0.1.ebuild 514 BLAKE2B 80f508bdee2c8308d840fca9ec476e0252c32c25d2a64bb6e19b8430e1ff580ae632c26ee1fbbd1a9a2f69195aea0e0a11caf5edc5ee6da8edf9af692f18751e SHA512 ca95b1d8b0553d899c3c86d77c7f5175888d74d5b734ad6b66f90d3cf6eb916c851897cdad07706adb3ed83c2398a468257197ffc9344a641ee5ae8346f724dc
-EBUILD fictionup-0.2.1.ebuild 388 BLAKE2B ccbc1036f9dce129e3c88092852822b53f0b969094e7a837472e53192258c6a3131b2e34213cd091900aecced115e69eb272ae1b204f4cdc4a367e00859af780 SHA512 eb848b5bb9d9e36940ea980b866240c22b1b5fe890332cda30f6ca0bfb1ec9038c434131509df708105a4ab323ad25ab982ab35dd1baad394443f8fc7828b8b8
+EBUILD fictionup-0.2.1.ebuild 375 BLAKE2B 951c6bf5ee86c5fe81de7d179495122e293ac1362e0b54c15bc2e6dd6475ca5bc08719a834d4547292c4841fd13f2da95ba1b2710327902a9f1117a156aaccce SHA512 b2d4bcc8159b95d7e338adbceffd22823fecbe243c2d476a283111deb33a03b342633e15728c30f6f9270649d47d99ab8746b6d20bd0d345c35d0e17a54e7e7a
 MISC metadata.xml 466 BLAKE2B 4e60cfd84216bde52c111ec55c721701e8c39e5628aa7dfbd64db39d730311ab4990a8741fac47937e1c50e82b120e204ca9d745b7fa6c1d060dc31ccb032981 SHA512 4a7d987b4fc9f9544ee6deef1773c319aceb13e0364ac11bfb4434a224ede3f25e7e2d84088d0f13551cbbe6f993d509a0f6d75bbc27b023e24f39d60bba08a5
diff --git a/app-text/fictionup/fictionup-0.1.ebuild b/app-text/fictionup/fictionup-0.1.ebuild
deleted file mode 100644
index 08b5f5315776..000000000000
--- a/app-text/fictionup/fictionup-0.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="A command-line markdown to fb2 convertor"
-HOMEPAGE="http://cdslow.org.ru/fictionup/"
-SRC_URI="http://cdslow.org.ru/files/${PN}/${P}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-KEYWORDS="~amd64 ~x86"
-DEPEND="dev-libs/libyaml"
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	mv "${D}"usr/share/doc/${PN} "${D}"usr/share/doc/${PF} || die "doc mv failed"
-}
diff --git a/app-text/fictionup/fictionup-0.2.1.ebuild b/app-text/fictionup/fictionup-0.2.1.ebuild
index fde9cbdf0fb8..8ed3f78991ae 100644
--- a/app-text/fictionup/fictionup-0.2.1.ebuild
+++ b/app-text/fictionup/fictionup-0.2.1.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils
 
-DESCRIPTION="A command-line markdown to fb2 convertor"
+inherit cmake
+
+DESCRIPTION="Command-line markdown to fb2 convertor"
 HOMEPAGE="http://cdslow.org.ru/fictionup/"
 SRC_URI="http://cdslow.org.ru/files/${PN}/${P}.tar.gz"
+
 LICENSE="GPL-3"
 SLOT="0"
-IUSE=""
 KEYWORDS="~amd64 ~x86"
+
 DEPEND="dev-libs/libyaml"
 RDEPEND="${DEPEND}"
diff --git a/app-text/foliate/Manifest b/app-text/foliate/Manifest
index 66d12b5529e4..ca8e01556619 100644
--- a/app-text/foliate/Manifest
+++ b/app-text/foliate/Manifest
@@ -1,5 +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
+DIST foliate-2.6.2.tar.gz 4760966 BLAKE2B 299dd8ab9f489772d18b85749cb312c8ddd4b21855452f87176ddfe068ff9e1e78cb5465fec97dbf70de22e7a773cf0910c11c3be7d0adb19279f4d9813249a1 SHA512 30bff00c34f90bfbd26b9e2b567a7cbcb1243cc5da17ff060762b7f1aafa4159daacee615de7f9bfef7d29d8209c8191094a154564f04321280037d2ec76a63e
+DIST foliate-2.6.3.tar.gz 4822251 BLAKE2B c6cedf4f5ae4e728ab2a7fc35a9fa1e9c69f9d2f8af92060b5363675d5e3fc5cb90698f4b184e792852d66a51e90c361b14d38034149304d10cdacc94100dda7 SHA512 b3dd5bc5a02d3f2210b0c7376426a7ea1668a81fa64fea179da2ab1d852778414cce45171143814d2010d6c03b0287dbbc512884107774ec211e24c6ed8127cb
+EBUILD foliate-2.6.2.ebuild 1220 BLAKE2B 516426a8ea456fb55c9d7b1cddeddf6ff5c0254f651f859b6b109d0944214765cce2419efb6113a51c61d4a218cabfd5b28290d4a16c9e229915fab4fd926f31 SHA512 73eadd416713d9ca5d958e0e5af4b4cd55e58c1dd5de38036b1fed776e702b1a136b08d26ae3691e473ab4473f077684a5948c785c374c70bb236221a68f0d29
+EBUILD foliate-2.6.3.ebuild 1205 BLAKE2B 304a2b902ac9907c4742739ef6d7b26da0471c0f3b96b7273f07185c4a29e01504e4741a564bd535e581ec77239a96478562aafc39cddcc9ef890b3932a46870 SHA512 a59b1104d80a96fe716399a42b8b23d7b32bae607657e671b4b25c091a00e3c52d5ed20bb0752e14e75164623a8879ecf300ad70ca6d292ab1f2a69741830391
 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.6.2.ebuild
index 94288a8fb117..3352adbbf96b 100644
--- a/app-text/foliate/foliate-2.5.0.ebuild
+++ b/app-text/foliate/foliate-2.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/app-text/foliate/foliate-2.4.2-r1.ebuild b/app-text/foliate/foliate-2.6.3.ebuild
index 6a96690330e9..c7f653b4b7a7 100644
--- a/app-text/foliate/foliate-2.4.2-r1.ebuild
+++ b/app-text/foliate/foliate-2.6.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PLOCALES="cs_CS de_DE es fr_FR id_ID ie it nl pt_BR ru_RU sv tr uk zh_CN zh_TW"
+PLOCALES="cs de es eu fr id ie it ko nb nl nn pt_BR 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"
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 2d2cae9971ca..c73de23f41c8 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -2,8 +2,11 @@ AUX ghostscript-gpl-9.53.3-fix-ps2epsi.patch 537 BLAKE2B fe6bf851c52751e3653e8e7
 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.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3412bdd3a6707f44d058c20f607e6695cfc878cf5df4c4528686c1c1f488b2dbdb81ef5fdf38b950eb15751d2ebafb0a9 SHA512 eb832c27eecd30f15e346408c592d7096fd23ef0a6fa59bd50ca327578915434530a4868e69249c2594def0910c527302e99d54f0877f726a8ca8bea6f0f17b7
+DIST ghostscript-9.54.0.tar.xz 56001768 BLAKE2B 4a98b1af74c4b4caf8d263cd5529059304a76884418c90401b0fc9a89e0f5de5417a439f6e08b95374e62158eec65528ef5f949497d5050a6408fb7c87e54aa9 SHA512 a3c96925f4dbf5e276fc543b88df185a0435c68166db15ac532094329ba8db314d739a292da18be7954daaafeeb290e641ea03edf888854d7e752998ec6062cc
 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 5175 BLAKE2B 83b725c22dfae426de0735f8195e6e4477b47d3fff6fb0f3108d344ffee6eba03bdb875078c472a048c2be7ed1f3347cea7e22707bbc1c0c77629ad11a3c5106 SHA512 f242c79f3ac85c147ee9d6ea203b716ebf44170e5574db68fecb04940b2e7c6146631bb2e1a46cf06673d91fc6cad18bf4828ef97af91896815cceb5efba0e17
+DIST ghostscript-gpl-9.54-patchset-01.tar.xz 2600 BLAKE2B e89f16f149ba3c46b1e81d774a3dca8345dfb60ec959249292cc0f3d8bc811ac169e232e3fb85de9d0ce65dd41453f90461798007b8b9fdd2c6e44d55e7a9d10 SHA512 0c49fbe6ece86b0c7729421cf06a6a210341fbe676efd89c0f97c96a426d3156e6a8ee596e050b8ee6a1af7a94ea8d1d54a6166f020a7d40fec95949cd7f3b12
+EBUILD ghostscript-gpl-9.52-r1.ebuild 5176 BLAKE2B db5d5ca4785c48ca75d55c980f9e1aae1132f3e68dd52e2443fe8bf0202b7c82367893167a8cc8a700c7ef12ff9d8743eb41732b8ba450b9fd9606a274210a36 SHA512 44a43ed682065164dafcfe7eb62918fb9906197569be216bfcc800d232d2ffc33702090844ad8b10f65492c60cb90a5b162560ad26b828973ca46ea85f993a8c
 EBUILD ghostscript-gpl-9.53.3-r5.ebuild 5297 BLAKE2B 2e113f1d62339e4f09612787a016bcb67fa12cb93e40480a536d621fe4530005dd5827cd6141bd9cbab739fdf5870522ff7082faef73ef3fa955c98b50e6603c SHA512 0ed8f0571efe2853937ec4fe79c6f875728721a1b66d29df5f2e99de329e54354243c148a64493d969ac64b82bf56ba4333fe43cc93f3f1e27dea9fe955ec33b
+EBUILD ghostscript-gpl-9.54.0.ebuild 5143 BLAKE2B d9f1444bc320b4c7747722ffafdf5b8d47edc9ec60abc682d0ce91c53d8ff3e047b51a06af5d3acf2d09603b775bce0a199c9647f3ba2a61b3a249891327b29e SHA512 a6a5623daad8e504a8afe6e18a1fc9783ce9eb6dc2b8504eaa161d4d51dfedda2a45c85802eb72519ddb47fa2278c104946fc66dd9feafd763fc999d54e90be6
 MISC metadata.xml 764 BLAKE2B 9e484085e597e1e465a5092d57ab3ab46b428d016db7ac6780b62c06bd27754079eb38d6fc2b2fac5cb8577cb75b4c3fde6a2d410c40b6fce9b6ef6fcdc8b005 SHA512 f410375fc8a20c69e1b6859054d2776826392048b321912ec8f4ed9a6e6651b824f8ad12d1e74c6a12bbe57126bc9123680b23a7d2edf6d2ee28fffdd906eaa2
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 362f03559a7c..29656ad43154 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.52-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0.ebuild
new file mode 100644
index 000000000000..6b35ee1d7bda
--- /dev/null
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.54.0.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2021 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.54-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/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cups dbus gtk +jpeg2k 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/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 ) )
+	jpeg2k? ( >=media-libs/openjpeg-2.1.0: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/${PV}/$(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 \
+		$(use_enable jpeg2k openjpeg) \
+		--disable-compile-inits \
+		--with-drivers=ALL \
+		--with-fontpath="$FONTPATH" \
+		--with-ijs \
+		--with-jbig2dec \
+		--with-libpaper \
+		--with-system-libtiff \
+		$(use_enable cups) \
+		$(use_enable dbus) \
+		$(use_enable gtk) \
+		$(use_with cups pdftoraster) \
+		$(use_with unicode libidn) \
+		$(use_with X x) \
+		DARWIN_LDFLAGS_SO_PREFIX="${EPREFIX}/usr/lib/"
+
+	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/${PV}/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 594e9eaf6c38..1c3fc590f438 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
 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 1925 BLAKE2B 656a3a1d6a296cb911a76ac7a607633e7cd0787cfed2369f2e4f14ed98aa739a13698dab5928ee77db4de653e8f4609a160ac5aff6dbd594638e76738a2e714f SHA512 2632966c042420b28a96f4510164e501b471896d6d0dd42575e89b8f2ba29b7da9bf6e05cf717225fc027cbdfdbaabd9646ed750d0bd7e03db1910eb334484d4
+EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1924 BLAKE2B 15ed597dc47ae7a5fbcd46991dfeeb3097d6b3e7e2c7b5707f72cf0c7c7752a6dfe996fd9dba7c5bb3f1eb117c069360f64221171f5c6d199758e757cdbe11e1 SHA512 b423ec742e42357bd045630cc7c630cb505a4d4594599f9d3374339d51f86758660d353ad2a832f5aa44d5b3e68243cea112cacd851582c5b3ad8b3368e64287
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
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 a0119126f7ec..d4447989d81b 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
@@ -12,7 +12,7 @@ SRC_URI+=" https://dev.gentoo.org/~juippis/distfiles/tmp/gnome-doc-utils-0.20.10
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest
index 124330622898..68b3a87b3cca 100644
--- a/app-text/gocr/Manifest
+++ b/app-text/gocr/Manifest
@@ -1,3 +1,5 @@
 DIST gocr-0.50.tar.gz 419209 BLAKE2B 232fe240d7a559cdd4408a3dba3768818aefbd8b2718c7ae40829d69ab79dd68293eb6adfc52e661f2f6cf1290ae9656c84d9d7a8fc20229c0942a8e18fb3b68 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9
+DIST gocr-0.52.tar.gz 445401 BLAKE2B 1f22f5377bb95053e3ab4ede074b3fceca4065f9ca0ede05a8023ebe807f41074f5ead84e133281e98be7f68f13b036dc759cccaf4a5688bf776f62f2de1970a SHA512 e2e6e690e7a32e32237c8b64b1a11719680c560592349df43f4b230f3c92bf324f98e473979b0913c42e33e8abbaf27952b6af173ea06eb5535878a9f608ce6d
 EBUILD gocr-0.50.ebuild 1194 BLAKE2B f2d7b20dc9437bc249deb9c752c516e366245b7f5fc3aaa26ba428bb360cc81b9298412e5be996ad9fb16e3a54f7389564b0e65f6c929a4a0c9328b78e197867 SHA512 8ce80abb20a31d902076ae3408812cbabe6a7911301959a542e639cdfeffdd51940d8a54aab5da71a035fabf7a8e0ce4a7fe27568c623a361e0dda0573eb41a0
+EBUILD gocr-0.52.ebuild 1199 BLAKE2B f7e32eead75ee686c1c7a1dca38e4929c0d24834121b87c9e94202c9d7efb23e3057abda259c7ef9db75145e2971f4b9e18a092f8bd47829cfe852abd36c4063 SHA512 cd651aaf4810346d1fef811e6c52ff59451daf5426b8e80c322e1074def566e63e7c6b0cd55fa8cdfcdc6ecce9a3b2c227a7b2519b928b086ce1254efb27c63c
 MISC metadata.xml 241 BLAKE2B 0ddb3befa9aa8922cec51c1c82d2927a12fa35eab2474330dd53794dabb7dd58859fc35f02e7b5067111bb9838592f9976fe3ff343aae7f521cdc034cf165a4b SHA512 c0dbe231483dc9dfc42dfe465aa2202145bae8a1ac5794ef9a9f02f687275c525a7826740e3b35fee93ba856ff2a78b214956b02cece209f6322ee3311cbf0ec
diff --git a/app-text/gocr/gocr-0.52.ebuild b/app-text/gocr/gocr-0.52.ebuild
new file mode 100644
index 000000000000..cced5ddc3583
--- /dev/null
+++ b/app-text/gocr/gocr-0.52.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="An OCR (Optical Character Recognition) reader"
+HOMEPAGE="http://jocr.sourceforge.net"
+SRC_URI="http://www-e.uni-magdeburg.de/jschulen/ocr/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc scanner tk"
+
+DEPEND="
+	>=media-libs/netpbm-9.12
+	doc? (
+		>=media-gfx/transfig-3.2
+		app-text/ghostscript-gpl
+	)
+	tk? ( dev-lang/tk )"
+RDEPEND="${DEPEND}
+	tk? (
+		media-gfx/xli
+		scanner? ( media-gfx/xsane )
+	)"
+
+src_compile() {
+	local targets=( src man )
+	use doc && targets+=( doc examples )
+
+	emake "${targets[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" prefix="${EPREFIX}/usr" exec_prefix="${EPREFIX}/usr" install
+	einstalldocs
+	dodoc HISTORY REMARK.txt REVIEW
+
+	# remove the tk frontend if tk is not selected
+	if ! use tk; then
+		rm "${ED}"/usr/bin/gocr.tcl || die
+	fi
+
+	# and install the documentation and examples
+	if use doc; then
+		dodoc doc/gocr.html doc/examples.txt doc/unicode.txt
+
+		docinto examples
+		dodoc examples/*.{fig,tex,pcx}
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/app-text/groonga-normalizer-mysql/Manifest b/app-text/groonga-normalizer-mysql/Manifest
index ef7fa46e44ac..8a36c326296a 100644
--- a/app-text/groonga-normalizer-mysql/Manifest
+++ b/app-text/groonga-normalizer-mysql/Manifest
@@ -1,3 +1,3 @@
 DIST groonga-normalizer-mysql-1.1.1.tar.gz 548788 BLAKE2B c2f06ffa4aaf52266dabf1397d592b772a10a45fe8b9184ffb7fc5f30a8db3c81011c19a80d3d14a228ea47b4b6ba21b7ab7f81e283533beef4596065d0c4b6b SHA512 40686a50133149b614057907c58f5b37d596fcaf697b4a6f3e68b776ac8c728cdd4c8a6e7c5676fe92ff96a4358b623f2b3740f6b72d317f1650c006cfb34369
-EBUILD groonga-normalizer-mysql-1.1.1.ebuild 677 BLAKE2B 43c428007fc189bc6fc1f1ff62251c99ade97f9bb2f0775f4fa4bad48cf15733a2886cb1700f773817ef38386d1585c234303b61c8756d89eb3deda2047e7a3b SHA512 6b387668dee0f7c4d68dc1b690ef028ff8e14da6f8a15a764d300497b1eca16329adfd1a2adfe98e3aecbb8c2267acd742b1f02c31904dc3c7264d2ee0e0edac
+EBUILD groonga-normalizer-mysql-1.1.1.ebuild 670 BLAKE2B 862f37e2d473ab0ab79840015579ce6c543600cc01af198d31b12957479ef99c4e8cfbc4b7bee3184e92b8e515fb5df9c6de0bc1638a43e73bb47da63e3d84c9 SHA512 1ca087f80bb60dc1235eef772a4a1950904dec3d495b317414324ef9a19d6105ec9a4f5eead5670d12d12c0c86443496be9aa4227e405723d6cec147205c6278
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
index d9d9ecefbd64..b6a789075490 100644
--- a/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
+++ b/app-text/groonga-normalizer-mysql/groonga-normalizer-mysql-1.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils autotools ltprune
+inherit autotools ltprune
 
 DESCRIPTION="Groonga plugin that provides MySQL compatible normalizers"
 HOMEPAGE="https://groonga.org/"
diff --git a/app-text/groonga/Manifest b/app-text/groonga/Manifest
index f3b18628a2f5..1d669054a387 100644
--- a/app-text/groonga/Manifest
+++ b/app-text/groonga/Manifest
@@ -1,7 +1,5 @@
 AUX groonga.confd 259 BLAKE2B 440b084d0e41da1b81e27ffa1e42963ce22d83027841039d488d516dce8beffce0e2ca03f5ca78a6aae02fa7bf238f0cf900e770ebfba04cfac581a13bd2381f SHA512 489feed6a4c22eb2ac02be070dd84ed3eb677b4f250b7eacd5619c1749b322b302bdff36fc3586e83125ac7ef02569054c4f267ddd7b26e5aa378af428cbc8ea
 AUX groonga.initd 715 BLAKE2B 0cf870704257490477a7a254a670ef5ce48141b8c9c4119446bcfab92972319857c77ebe41044c7d338b10bb720744788ce0313f8b2ee50277571513d0cfdb83 SHA512 7b4f789c9201f40fee0d99b94554bc33aebf024da02794143317215713cea3f2a9fda2e87d2a8bb864a7d0c8a2c44e824c65deecd4c95360423f7d3a4f04f8c2
-DIST groonga-6.1.2.tar.gz 14028916 BLAKE2B c05a1a5a73bce63655eb588b3021570d22a0016837810c12813bb4f208bf9b114fc514a8887e4f756fb0ec27ad2c991eea026bf57391e9234e49ee084656d26c SHA512 cd2dd667608fac856b36a824c5ea285da937cc11b6d4e5ad2f84581f6fbc714b4bb381515ec7b467ddccfad77c77c080000def653d9cdd8725c0f512c7b83f20
 DIST groonga-8.0.2.tar.gz 15095427 BLAKE2B fa83034a434edaa35dede08cb042e48f15e1e2edd78a121f9341f53f53a5eef863d02e2ea6384428c720c4ff9acf1083504046c8c11a1ea8d7bfc4b541db66b5 SHA512 bc5590604054c4adfbc80b39c7cf367e8a989c47d80c37c48feffb9a427b4b4e360289f3d732f6affa7d26a1c8559f23bda1c70b6736a06601398fce9a53acf1
-EBUILD groonga-6.1.2.ebuild 2419 BLAKE2B bf0fd1932677a7542a6865794fe5c4decb70013b727bc6b9e320c4acdf9fa3000440b49bdd916b659dc20965017f29138c011877086af70546d83d2f7771743b SHA512 8c8cca7676eb0c8d3769a774ea87c019189d9ee3c2c098a60dca1da38cb34e245677afc64788dd2b2a46b676549f6913f5adb08c99faad46e2fc20702cfe82ed
-EBUILD groonga-8.0.2.ebuild 2643 BLAKE2B bdda1f1a9fac1df44ed2cf51897d87752a44b80313a621e3607bacbff659fe5e37a387b5da9933177701f93d1857cdbc4200cdab1748f1bcb2e296b2f2276950 SHA512 7615cf4c3bb5efd15dc45199f87615105b5fd5147ebe32374a6e2e4c10043556f4fceaf65e8104a80f06c53c69c4c1ae4760c94cb03d7889ac4ef3ab63e1a548
+EBUILD groonga-8.0.2-r1.ebuild 2584 BLAKE2B ad2382d7dce6b97fe39eea60f78fdbcb498b03186b88a58e543df78d41926440008854f8695563a0d695bafb0491e92dec646675510ffae6480083ce959db3f1 SHA512 c37fe43c619cf8f19884cf0d9323cd30b26afc344a795d0d6d9e397c6830952a1003eb31cd2349c33511cd4200118f785f7f4365b4252707e38c1b5f2c16d709
 MISC metadata.xml 1156 BLAKE2B a6fdcf212e2de097ea99dee4c071da0af7c4024a9c4390aaee67a94f1940ff3483e08a5c20e301e47de63dffc59856a2114c2bf72de9f22e2031bd60c719fe6d SHA512 a1e8936921f6688690cc70ef39eee1abfcdb7b6940de9a29c6f1f3750c3dab4e8f50d1e189ee57ca87085e8e0daf81ff52a93cd81076745f6f479d291fabe079
diff --git a/app-text/groonga/groonga-6.1.2.ebuild b/app-text/groonga/groonga-6.1.2.ebuild
deleted file mode 100644
index 436498af5536..000000000000
--- a/app-text/groonga/groonga-6.1.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils libtool ltprune user
-
-DESCRIPTION="An Embeddable Fulltext Search Engine"
-HOMEPAGE="https://groonga.org/"
-SRC_URI="https://packages.groonga.org/source/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex libedit libevent lzo mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib"
-
-RDEPEND="benchmark? ( >=dev-libs/glib-2.8 )
-	libedit? ( >=dev-libs/libedit-3 )
-	libevent? ( dev-libs/libevent )
-	lzo? ( dev-libs/lzo )
-	mecab? ( >=app-text/mecab-0.80 )
-	msgpack? ( dev-libs/msgpack )
-	sphinx? ( >=dev-python/sphinx-1.0.1 )
-	zeromq? ( net-libs/zeromq )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sphinx? ( dev-python/sphinx )"
-
-REQUIRED_USE=" abort? ( dynamic-malloc-change ) fmalloc? ( dynamic-malloc-change ) sphinx? ( doc )"
-
-pkg_setup() {
-	enewgroup groonga
-	enewuser groonga -1 -1 -1 groonga
-}
-
-src_prepare() {
-	default_src_prepare
-	elibtoolize
-}
-
-src_configure() {
-	# httpd is a bundled copy of nginx; disabled for security reasons
-	# prce only is used with httpd
-	# kytea and libstemmer are not available in portage
-	# ruby is only used for an http test
-	econf \
-		--disable-groonga-httpd \
-		--without-pcre \
-		--without-kytea \
-		--without-libstemmer \
-		--with-log-path="${EPREFIX}"/var/log/${PN}.log \
-		--without-ruby \
-		$(use_enable abort) \
-		$(use_enable benchmark) \
-		$(use_enable debug memory-debug) \
-		$(use_enable doc document) \
-		$(use_enable dynamic-malloc-change) \
-		$(use_enable exact-alloc-count) \
-		$(use_enable fmalloc) \
-		$(use_enable futex) \
-		$(use_enable libedit) \
-		$(use_with libevent) \
-		$(use_with lzo) \
-		$(use_with mecab) \
-		$(use_with msgpack message-pack "${EPREFIX}/usr") \
-		$(use_enable nfkc) \
-		$(use_with sphinx sphinx-build) \
-		$(use_enable static-libs static) \
-		$(use_enable uyield) \
-		$(use_enable zeromq) \
-		$(use_with zlib)
-}
-
-src_install() {
-	local DOCS=( README.md )
-
-	default
-
-	prune_libtool_files
-
-	newinitd "${FILESDIR}/${PN}.initd" ${PN}
-	newconfd "${FILESDIR}/${PN}.confd" ${PN}
-
-	keepdir /var/{log,lib}/${PN}
-	fowners groonga:groonga /var/{log,lib}/${PN}
-
-	use examples || rm -r "${D}usr/share/${PN}" || die
-	# Extra init script
-	rm -r "${D}usr/sbin/groonga-httpd-restart" || die
-}
diff --git a/app-text/groonga/groonga-8.0.2.ebuild b/app-text/groonga/groonga-8.0.2-r1.ebuild
index 19c48773526c..34c3b85d328f 100644
--- a/app-text/groonga/groonga-8.0.2.ebuild
+++ b/app-text/groonga/groonga-8.0.2-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit libtool user
+inherit libtool
 
 DESCRIPTION="An Embeddable Fulltext Search Engine"
 HOMEPAGE="https://groonga.org/"
@@ -13,8 +13,14 @@ LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="abort benchmark debug doc dynamic-malloc-change +exact-alloc-count examples fmalloc futex jemalloc libedit libevent lzo +mecab msgpack +nfkc sphinx static-libs uyield zeromq zlib zstd"
+REQUIRED_USE="
+	abort? ( dynamic-malloc-change )
+	fmalloc? ( dynamic-malloc-change )
+	sphinx? ( doc )
+"
 
-RDEPEND=">=dev-libs/onigmo-6.1.1:0=
+DEPEND="
+	>=dev-libs/onigmo-6.1.1:0=
 	benchmark? ( >=dev-libs/glib-2.8 )
 	jemalloc? ( dev-libs/jemalloc:0= )
 	libedit? ( >=dev-libs/libedit-3 )
@@ -25,24 +31,18 @@ RDEPEND=">=dev-libs/onigmo-6.1.1:0=
 	sphinx? ( >=dev-python/sphinx-1.0.1 )
 	zeromq? ( net-libs/zeromq:0= )
 	zlib? ( sys-libs/zlib:0= )
-	zstd? ( app-arch/zstd:0= )"
-DEPEND="${RDEPEND}"
+	zstd? ( app-arch/zstd:0= )
+"
+RDEPEND="
+	${DEPEND}
+	acct-group/groonga
+	acct-user/groonga
+"
 BDEPEND="
 	virtual/pkgconfig
 	sphinx? ( dev-python/sphinx )
 "
 
-REQUIRED_USE="
-	abort? ( dynamic-malloc-change )
-	fmalloc? ( dynamic-malloc-change )
-	sphinx? ( doc )
-"
-
-pkg_setup() {
-	enewgroup groonga
-	enewuser groonga -1 -1 -1 groonga
-}
-
 src_prepare() {
 	default
 
@@ -78,7 +78,7 @@ src_configure() {
 		$(use_with lzo)
 		$(use_with mecab)
 		$(use_enable msgpack message-pack)
-		$(use_with msgpack message-pack "${EPREFIX}/usr")
+		$(use_with msgpack message-pack "${ESYSROOT}/usr")
 		$(use_enable nfkc)
 		$(use_with sphinx sphinx-build)
 		$(use_enable static-libs static)
@@ -92,8 +92,6 @@ src_configure() {
 }
 
 src_install() {
-	local DOCS=( README.md )
-
 	default
 
 	find "${ED}" -name '*.la' -delete || die
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index c847e04a1a55..79d76f1a7ff0 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,5 +1,3 @@
-DIST gspell-1.8.3.tar.xz 421468 BLAKE2B 70a8c0649a9f1f0d5e1bbc170734c6ce7aeb4875ed1cca52c4c582688c56553ad2363b9fed732c504f3ff6bc33d994fc4ba12cd3754e4f3b602be2a2015144df SHA512 4116231fdfb416e70ee34c73e0ecf81f0071e81ad477135e3c1e270534dfe4be20c7f45e316e13d33c79944d282ed3223251122983a0f3199ea57c3431a24c1d
 DIST gspell-1.8.4.tar.xz 424356 BLAKE2B 031787c4f5c3f3cfe21d5f74ec72117818da43313c5e6dffb79581ca07033aede2ecf236ffdf2197938d62727c5bd3913d1362e02be7109b0d498304949e1d44 SHA512 adb481590442d81040151746c7747791d76248b1b35af1702dc5389efbd2e0c6bdda070b8e84384d22f4922b5a382ac2c6519e425f417ec85c8efbe22dc38c82
-EBUILD gspell-1.8.3.ebuild 1477 BLAKE2B 6ad6e2c4522506edbd658ba763a3620fb5b7b7f7ea88d4268b0312b38bd6d6774cc208808953a9035b11e9d6dc5c8ca99f7adeb8f53e82255dfe53eac93bd752 SHA512 3b57665e5aadbe512253792b41b1f688b23653a56da2b90ef5370bc33781682937670e719b69c9eed89d7924abbc9d23ad4b3f4535a2cbac3baeb01ebee223fd
-EBUILD gspell-1.8.4.ebuild 1479 BLAKE2B ef21a34dc5b1de6892f81db4985828dbcf8c4790f8847887a9317e7dddaaa02905efb8e8bb5518c1f18a2fa75d0b1fc1c942a77d5fbea847234b56df1bacbdca SHA512 3c468218f7655c14be37e05d6702133ffabdda48c15366b9bdde42440c97f557548068580def6938a180aa6cfecc521f737a4df58428fc6b7580c03449e48124
+EBUILD gspell-1.8.4.ebuild 1477 BLAKE2B 1f646c4fbff986066b6ac3304082a6fd724dbec71bcec313d17039c2d0849f9ef7ee1679c633d8dc98b38dfe12db10358f76a1d5bd93bdff34ceaa6714fc4e36 SHA512 464249fffd2f300ccccd0f59443010b132328bec054863760a097816a100588a83af5df29162351c2ce37315ceb9d3ecc034d1501245b0441a404811b98d82df
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.8.3.ebuild b/app-text/gspell/gspell-1.8.3.ebuild
deleted file mode 100644
index fcd271945a62..000000000000
--- a/app-text/gspell/gspell-1.8.3.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"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Spell check library for GTK+ applications"
-HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	app-text/iso-codes
-	>=app-text/enchant-2.1.3:2
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.20:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.6
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-	test? ( app-text/enchant:2[hunspell]
-		|| (  app-dicts/myspell-en[l10n_en(+)] app-dicts/myspell-en[l10n_en-US(+)] ) )
-"
-# Tests require a en_US dictionary and fail with deprecated enchant aspell backend:
-# So enchant[hunspell] + myspell-en ensure they pass (hunspell is ordered before aspell),
-# however a different backend like hspell or nuspell + their en_US dict might be fine too,
-# but we don't support them at this time (2020-04-12) in enchant:2
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/app-text/gspell/gspell-1.8.4.ebuild b/app-text/gspell/gspell-1.8.4.ebuild
index 64919831d8ba..8c255e7c8d2c 100644
--- a/app-text/gspell/gspell-1.8.4.ebuild
+++ b/app-text/gspell/gspell-1.8.4.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/2" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index aabc893d18bd..f8de800c95da 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,5 +1,5 @@
 DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B ccb49b99c4f9059ed4461bb5ffda4dbeb691c5a062184ba7b51d8464d2461c5be0d648e4f69dbc36fe345be2addbc271af9701a0a387975265585dd3a7926e99 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
 DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B aa167e9e5068e9c6c5fcf6933a28246de0be8386be43ab3af80a45dfbc092e1381503822d09742d20dde2e0b8dae77210001c955e37a8dab263b832ee52675a1 SHA512 3b1ceaa9ffa06bd3f6dae39c95db951588e5cf2edf4f551cac6972822ba230af3415c5045fa24f7a4dfe05c2e386ab3f67cb80cb779576b4e54293b7b9fbc28e
-EBUILD gtkspell-2.0.16-r1.ebuild 978 BLAKE2B 4ce2d2ebc6fb10c9070a9cf4797df8c7be291349537e347eefec020e59082525d45353277692ae95d9bbac4336dd10d3172eca6fd01ead4fb40d1a99e570c8b1 SHA512 3637d73b28a5fb05885871837e7540f8d8f5e4832b4ec71cc1527e6c8bf68925c23da78fc4787b51f84121ca791c709b2eceef95dfd0644ac1784f2bc8500b6c
+EBUILD gtkspell-2.0.16-r1.ebuild 962 BLAKE2B 3b1b2c8698e33546a966d52540f5bef5e2530bd1f243a7e535df2d0c7875b1090acff688a9caa5cafc8deef8adfb4fbaeec92c13f68ac961b8fa4adc78cc251d SHA512 ba597329153e1c094e47332052cbcb558a807f18ced4cabe315090d03948ee45064453e3033d470124cf014272d5700ca9d9a7febcffdec46679701eddecf3da
 EBUILD gtkspell-3.0.10.ebuild 1049 BLAKE2B 571ae5c4eb78934fed4a53dc7c882c598f75318d472fca3b9e29ec0baa87bb999ab3cf00a2bdc23b0252db43fdad249840100c5c938f7dab1f9d422fef3cb0f1 SHA512 4066930b06f1ffa693a339460af9f73e426994dd55361c13b198d3ae227736ad15b91c2d53f30890256cf35b250b05b58d47d802a87bfdefe30a2966070123eb
 MISC metadata.xml 331 BLAKE2B 09488ce0a015e7f7321a4a72cf8b046c63a5497694736ea7d9450455f447be0a328bb5d6f607d86032cf1fa77ce3d204373dea048a5b089f0eb7b38c4626ddc3 SHA512 51f55422f9e5a13f8cff5ae6ed6e00f2be248ccd4b472c0d8519c73fcda34d19129fc3183d4c570480198f14468fd8b208ddab0c70df05431ab8470399221514
diff --git a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild b/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
index d6db37423a36..4dcc29ecf4b8 100644
--- a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
+++ b/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI=7
 
-inherit eutils
-
 DESCRIPTION="Spell checking widget for GTK"
 HOMEPAGE="http://gtkspell.sourceforge.net/"
 # gtkspell doesn't use sourceforge mirroring system it seems.
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 916452430323..646305c3c714 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -2,5 +2,5 @@ AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c
 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
 DIST highlight-3.60.tar.bz2 1412486 BLAKE2B 3651a44c7e492ce02de04d21ed2e25afb40e871e21eacef88416f98226046e99a2a0a27c3354119715f320df1653ad7065c1c9a4a23b3081971df4d72c6fa19c SHA512 e4d0822592675115c7c2121d6ed066f997d315fecea384caeb506de1933f6bd60fd0dea57dcdafba85465f9f6b922ed168db57ce725bd7f19689d30624412f1b
 EBUILD highlight-3.57-r100.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
-EBUILD highlight-3.60.ebuild 2411 BLAKE2B f54d453c059429ff41b94df35d81dba0c790a0217da0587bb031e4fd19f4cc05259514100987b5685d4596c1d498c2e9cbe043819d2211b9e8b993822e666d3b SHA512 5cbd35e733755c4bc11fce2f830bcf848fbf30b0822dc6ed271642177c72581ee7a20b491933627dc70c3de8640715079b81b6f7b32e36abb05102c9ef7ab6b5
+EBUILD highlight-3.60.ebuild 2403 BLAKE2B d79cb8210548b2d9f1f0ef73a78604cda2d30b380c4b0746a3d86ff80dff0f2a28d55e2e4353339c23920d55dc4826a1410e465505d56a80ab02c5def18f6651 SHA512 5e8133de9a08bf33f473a94c4aea907f997d4b12c60da43886af556cf77efd632df445909f272b15f8fd7094e99f32d92352bc5ed1cbfc6291163e3291c54c05
 MISC metadata.xml 330 BLAKE2B 3e7c157a3d1763cb2b5c6c65a9259c03ac3863056d55ddb6eddbb76e66f98bcd11f87a04ddae616657f88e0a6b1f7bab0d028b97c8b0091ab8daa9e8fb5bc70a SHA512 3b6739ebce190bd586ad2e1657460b3540ae5056f2f90fdeb68121da3215e32dc382a1e965038968ec23f0c46d4626231f1e261aa7aca184dc8e08d80a82a681
diff --git a/app-text/highlight/highlight-3.60.ebuild b/app-text/highlight/highlight-3.60.ebuild
index 323a92ad3acc..30e6ae8553b7 100644
--- a/app-text/highlight/highlight-3.60.ebuild
+++ b/app-text/highlight/highlight-3.60.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"
 
 REQUIRED_USE="${LUA_REQUIRED_USE}"
diff --git a/app-text/htmlc/Manifest b/app-text/htmlc/Manifest
index 6df0efbe45fe..851e4f656728 100644
--- a/app-text/htmlc/Manifest
+++ b/app-text/htmlc/Manifest
@@ -1,6 +1,6 @@
 AUX werror.patch 791 BLAKE2B 0a456ddfac9f5d20c9eb2734c2d1f7c154e0cf96f3e831ca62c47e395aa850ce39c7c6d3c0b6e27146de639c13a573e2b6233d85517c057a0ee64769b419ea81 SHA512 fe62de854558ad673e8d88b42d6c71543e32f846afaca1e5062d365b18b4613216e0021ffb4b59e923c4aaba1db6c621c65744de2ac3c864e17e61384022b4bd
 DIST htmlc-2.4.0.tgz 132584 BLAKE2B 42f0948e7f896130b539d8d0f0936ddfa21986d3eeab2b30598572eca12952a0010edb1044b259ed13242534a66351c9855e43bbac613028d926370f6221e0d2 SHA512 8de81041cea0c6d07188cb0d8cd553c1d20ea37d01a8d7425d23a10c7fd3d93dc1f7c1e3de473cb624720dc7588a3d891432d5945a23d1f253d2109cdafc15dc
 DIST htmlc-2.6.tgz 286727 BLAKE2B 47e5460c08f7ce5010615e0dec99bc60b2e0f6857d0347c50357837930ca68b369a66001846ef3855cd54cdf6f1dac73ab45546be659a05b1e202438e4914865 SHA512 fa268cf547d60babcbf1aee73f75d3516b08e83158dc0bee36f724abfe2f46ad4b571c09d9d14f97315c70f88d3ea29000fe2d838042242325adce201d60a8f4
-EBUILD htmlc-2.40.0.ebuild 877 BLAKE2B 9feb912ac666df0925693b585e5f71ec10acd0f9b42c7f6fc842824e1cf8d5cefa94c6a066be449a5614e1125221c9e246fff27acba0c86f181909099c8ccc8d SHA512 f97c54930c582ef4a1f9d969ac3d8bf2a5f1af368af8f90a2b4214468cfb51e3841c19eacd47b1e0fec1f666d7c21fb5c699261950715d26feeaac9bbc67c9f2
-EBUILD htmlc-2.60.0.ebuild 951 BLAKE2B 7c2a307ee8d6216d168f1cfc22b396bebefc8a4cff350e6870b3e34c2228bff307c4a8c64a73a547d18e9561fc94ec652c3c5e832700ec7e163498bde7e53e04 SHA512 180a18c3586dc3d7a0fa9ede3c1083c3d70c54454faeb24d8ad1f64746d3586cbbbb0cfbe4a7627f474edeeace6998c11cc0ae79fe15b50a2c31916969fe3a7b
+EBUILD htmlc-2.40.0.ebuild 875 BLAKE2B ba9411820575b360da96a4ed16acdc963ccaa152a7a10e2565cb102149f9c63b4562ec7e347fb779a7580fff069fce1ce2ba1c615d5e801e4e2d2a44a0ceb242 SHA512 1a6209382c85a429c43a10ef52ff14fceb4bd06c92cef70e4f14dbe5bbd379e1550e010aed4b9b788a635ec82af0dbf3012b2d30903dfab67e8fb348e97c8c77
+EBUILD htmlc-2.60.0.ebuild 920 BLAKE2B 8a118fc625e858f93f40b762c65ed908afbe3cc9025dbd284f1b073e81c2db524182e5e9a0c9b3228ae88c607b033894b95893ec3a40b3f73c0ad30c8a545073 SHA512 d05e0e443be093a37ef5bb4ffd57c3ca71a7b08168f1059747d853b9814b688f43c087e94cfb363e17343a2f81b56603e50109967590973c6dfa4affcf7e04ce
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/htmlc/htmlc-2.40.0.ebuild b/app-text/htmlc/htmlc-2.40.0.ebuild
index 8f9c4893199b..488950ddc494 100644
--- a/app-text/htmlc/htmlc-2.40.0.ebuild
+++ b/app-text/htmlc/htmlc-2.40.0.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 # Override version: 2.4.0 > 2.21.0 so we name it 2.40.0
 MY_P="${P/0[.]/.}"
@@ -9,6 +9,7 @@ MY_P="${P/0[.]/.}"
 DESCRIPTION="HTML template files expander"
 HOMEPAGE="http://htmlc.inria.fr/"
 SRC_URI="http://htmlc.inria.fr/${MY_P}.tgz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="htmlc"
 SLOT="0"
@@ -20,11 +21,9 @@ IUSE="+ocamlopt"
 DEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
 src_configure() {
 	./configure \
-		--install-root-dir "${ED}usr" \
+		--install-root-dir "${ED}/usr" \
 		|| die
 }
 
@@ -42,6 +41,7 @@ src_install() {
 	else
 		emake installbyt
 	fi
+
 	emake MANDIR='$(PREFIXINSTALLDIR)/share/man/man$(MANEXT)' installman
 	dodoc README Announce* CHANGES
 }
diff --git a/app-text/htmlc/htmlc-2.60.0.ebuild b/app-text/htmlc/htmlc-2.60.0.ebuild
index b10f6905b522..38f7c831c39b 100644
--- a/app-text/htmlc/htmlc-2.60.0.ebuild
+++ b/app-text/htmlc/htmlc-2.60.0.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 # Override version: 2.4.0 > 2.21.0 so we name it 2.40.0
 MY_P="${P/0[.]/.}"
@@ -11,6 +9,7 @@ MY_P="${P/0[.]/.}"
 DESCRIPTION="HTML template files expander"
 HOMEPAGE="http://htmlc.inria.fr/"
 SRC_URI="http://htmlc.inria.fr/${MY_P%.0}.tgz"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="htmlc"
 SLOT="0"
@@ -22,15 +21,13 @@ IUSE="+ocamlopt"
 DEPEND=">=dev-lang/ocaml-3.11.2:=[ocamlopt?]"
 RDEPEND="${DEPEND}"
 
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	epatch "${FILESDIR}/werror.patch"
-}
+PATCHES=(
+	"${FILESDIR}"/werror.patch
+)
 
 src_configure() {
 	./configure \
-		--install-root-dir "${ED}usr" \
+		--install-root-dir "${ED}/usr" \
 		|| die
 }
 
@@ -48,6 +45,7 @@ src_install() {
 	else
 		emake installbyt
 	fi
+
 	emake MANDIR='$(PREFIXINSTALLDIR)/share/man/man$(MANEXT)' installman
 	dodoc README Announce* CHANGES
 }
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 9d74f042d356..9c5fb0fb3f9e 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -3,5 +3,5 @@ AUX htmltidy-20090325-tidyrc.patch 923 BLAKE2B 1ce5800a8991d37edb48d652c03525ce6
 AUX htmltidy-5.10.26-strip-O2-flag.patch 370 BLAKE2B 7c2a58a6a8c00460871278f59676d3b8b8077a7cf2fc1f65dc9ae2987e06d760c73177baa37a197eb0f45f3a5c09bc2030f556948cfd2470fabe2bd734527e3d SHA512 671a0ef17388fb39d5623e0dd2b8aa6c55c22d9f3ba8eea093ddea1234a2786ef983cbe9dd7002fe04b2986ae888458f4f44120c47aa34dc145d34d9db2f81d7
 DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
 DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
-EBUILD htmltidy-20090325-r2.ebuild 1965 BLAKE2B 04ab29f7753a0d48324d8d4f82a5ac1ef2ad6c3ff6fc0b56d49f2a2fd10632d4c86c636dfe8706342bc770fb5ab0007f460a2f4d95af041c56b0e36ec08903ac SHA512 5c96b385acca7929545a25b7d0682e50cbc2ccdbe34bc5662dc8b0d0a868e02b90a82d8efaccfc1d35fe15ec6a7b7cbb6c9e0bf5b31467db519c5f7ec1fd748a
+EBUILD htmltidy-20090325-r2.ebuild 1965 BLAKE2B 7e90c59b30fb3888b51fcae2b901c69c364f9b994728dafd7a3125430db13e918c98feca48ce7d862d76da0a4bcdb49ebdffa612fe193d95e4c11304094471f5 SHA512 bd5cd045050d4dc99d982dbc6532cb003cf34b20123e0b782aa1649c3558f6d49c789c56274f6181d1fac7e4868e57f78d6e501ce7ba99af13d367d4492e541b
 MISC metadata.xml 299 BLAKE2B 45af58b9f27f8329d072008a1089edae34741b855b1626cc56eb97efef684b316ce5573308ef1e73d4aa7e1cde74b0c10d5d7becee71707f5b3439f451a433ea SHA512 cd21089fbc56a2608734a5821826da373a5112e1676bf3c3481320236f5583ff1240e118e0021130625826c76cb426ca681e0dec3c6e4d2df22f8967da15321d
diff --git a/app-text/htmltidy/htmltidy-20090325-r2.ebuild b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
index abb1985534cf..dcca33053d66 100644
--- a/app-text/htmltidy/htmltidy-20090325-r2.ebuild
+++ b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 MY_PN="tidy"
 MY_P="${MY_PN}-${PV}"
 
-inherit eutils autotools
+inherit epatch autotools
 
 DESCRIPTION="Tidy the layout and correct errors in HTML and XML documents"
 HOMEPAGE="http://tidy.sourceforge.net/"
diff --git a/app-text/htp/Manifest b/app-text/htp/Manifest
index 26e099a00280..389af7bb93f7 100644
--- a/app-text/htp/Manifest
+++ b/app-text/htp/Manifest
@@ -1,3 +1,3 @@
 DIST htp-1.19.tar.gz 208683 BLAKE2B 86837290a2f14b8a0337d9eb6a0fa4ad553c5c51074d5df903ee19aa7ba441898199f0649b39b93c35fa3707e4084a284e02d8802c014bf5c0277e3f18d02c98 SHA512 32d82bb42ef877bd815fe45fa81599a1428ad6d3269cbe53a4e686bcfe6d1c12ac2af280462768d488b1983ca67cc521da4ed78cc82d904575ffeff08c7eec1d
-EBUILD htp-1.19.ebuild 698 BLAKE2B 943bad8608f7c0eb9677747b2a68838204c4c8d0a1137eba07f8a7c8844dc16e99b215745b707d8df7e94616fc08b8802d625bdbf25cf18c176dde59dfdb69b7 SHA512 d7f085bbdc08fb1b1a0afaf076c1593bd4ad96d2ee26e65c98f958cd01fa1112074d2654a39ea3f47e12d787a33dfd1585fa24edad65ec0db0a9a0880535cdab
+EBUILD htp-1.19.ebuild 688 BLAKE2B 260c735a88959148e91d0987c1310459003284e82dd1de4d9565ef744a48ae6c640f5d8585b304fd07ecc057ba4a87312bea49bbb7127db85558538d4d2aa898 SHA512 b29c85c8f3c7a513d790182fb45f84e27fd7474b8207cab1d13f35d7c8d09175d31ec2742306c08ad15723ecbcc4469bb80ff2b367397e6baffc674a4bd5d8bd
 MISC metadata.xml 323 BLAKE2B 815632fb1a839f62a7e2201270b77e1cb16955e5bcc978bebd09d0501eb2df6f56bf20a8ed6a7c2ed6d7a5fcb5d0900a06c38f22dc649c731ada0d36478f3aa1 SHA512 f5c0a7720bd23aa0c604e0ffa07e2925afe69f9af09c9364818e16197fdf55c1decac5839234cdb08e483be1bfb4d0a88279e57c2b48c0002d3de27e90616f26
diff --git a/app-text/htp/htp-1.19.ebuild b/app-text/htp/htp-1.19.ebuild
index 962eb9f37525..da6613e0dfbc 100644
--- a/app-text/htp/htp-1.19.ebuild
+++ b/app-text/htp/htp-1.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="An HTML preprocessor"
 HOMEPAGE="http://htp.sourceforge.net/"
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 5f35a6f36b87..309d9f641df0 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,7 +1,3 @@
-DIST iso-codes-4.4.tar.gz 13299605 BLAKE2B 485f3b0240f1892fb96f2b5c391b3f0adc593fac97d53748aa104208936d1bf81de1d40e742ab48e3663cea0ce5b28a20782df2f4eed251bab5b8a7055745d0e SHA512 d22ecdef75cd07b59ea0dbc87d25eb254676ab83297c1a43dbad9d3471ba355630f5588b4590972526f9e885b2e1ec307303ac0bb94b2dd5c707377c1cfa64d8
-DIST iso-codes-4.5.0.tar.gz 13635723 BLAKE2B e96cbf80a93fd4901decd59006e51b39eb35b64b6ead28c0f0f1b0103f341dd79849db07f63be16154e5041a85a563d477b6470143ad325f1d25880d539807d0 SHA512 457585de1bfb848bbdbd15754588e690e3214f5d4442c32df4044f8a5b2cf6035c9c0cea84cc9b6e6ef093c0e9c8f7317e5bea920060b09d121b042e66046ca5
 DIST iso-codes-4.6.0.tar.gz 14089611 BLAKE2B 0e85ca49dd40ca053af4b06aca440e55c2b9bb2061fcdceaa25b31ac7fd7942a590756db90c10db64e5e1ffcedbce5a552e60a6d495bb9d60621bc7b862e630b SHA512 fcee802a3f92ef035371ff45fa9d8acbf1e2f490e38d84d2e27d2226d250ad02d088156d0889c0fc0fc09f30c4541b30dc7eb65ca4f40c3764599c1b2143013f
-EBUILD iso-codes-4.4.ebuild 2622 BLAKE2B 1d50fe1b7b86ddb2e4ea632db1913f3484b1d320e0826486d56a2ff325b43e20cc388f3fb650897860f5acbb9807829f98d6733ecdcbd0f74a83f8bbb4a1ac15 SHA512 32416dba78245fe22d42fa75b6cb53175145ac7e450498fa1df7906836e97cb8bf722c448d8ef3d10ec497b63cedebc5526619dd249286d86c90efc129f2b1b9
-EBUILD iso-codes-4.5.0.ebuild 2633 BLAKE2B 525d41f158ed7d59faecd9841c801f66cd9e7a3f586aacbab8804884a62a355461a5d7b5da509573865c8ea4049330e3fae1673ad629f1c0bbe798cc47988b8a SHA512 159a6393ad54bae9d0daa6ae31419ff24bbbfa5fae7cae09b8b872a9a440514285f95a6b633f2bddbcf8fa7ccaf499f76906b74cc5d0e51d075b977e44e31a18
-EBUILD iso-codes-4.6.0.ebuild 2643 BLAKE2B c240244958af247e1330cfb72befd20d48e9f9232c0c839bf509ec2db03aaddf6c127fc181c1dba4b93150b1e615d35d8eb119adf4d7dc52829f8921eda7ad1f SHA512 91885f9b953eb3db67ad374db26a9672a5b025c66165e1b8dfe28f76cd94a11150698a34bf4a793491523c156525b511cc0cb35b569b0f9208e876d91a685a45
+EBUILD iso-codes-4.6.0.ebuild 2636 BLAKE2B 6ff8645817888c1af9b3ca06fbe1250867de884f2c83a9cda7d1387842bc90694146c64515a65e5f2bf5503e546f1ad0f75578129584f806b56c8483759a167b SHA512 0ab62c60e85ebe7a79f81c270ebdf1c81125560a3a262cf8639d03089f86ad84f079fd565f028613e6dcf78a67daadea1e10851cbe2df61fa496b1d301085d11
 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
deleted file mode 100644
index 0331e8f6b964..000000000000
--- a/app-text/iso-codes/iso-codes-4.4.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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
-
-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-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/iso-codes/iso-codes-4.5.0.ebuild b/app-text/iso-codes/iso-codes-4.5.0.ebuild
deleted file mode 100644
index 29a8518d9f68..000000000000
--- a/app-text/iso-codes/iso-codes-4.5.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{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-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/iso-codes/iso-codes-4.6.0.ebuild b/app-text/iso-codes/iso-codes-4.6.0.ebuild
index 606b0e7ba92b..0ec9beee2ec4 100644
--- a/app-text/iso-codes/iso-codes-4.6.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://salsa.debian.org/${PN}-team/${PN}/-/archive/${P}/${PN}-${P}.tar
 
 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-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/kjots/Manifest b/app-text/kjots/Manifest
index fe4c4f51221f..c7f3dcf09e84 100644
--- a/app-text/kjots/Manifest
+++ b/app-text/kjots/Manifest
@@ -1,8 +1,4 @@
-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
 AUX kjots-5.1.0-unused-dep.patch 1423 BLAKE2B 154509cafb0c5822e5ceff10513967e3899d474fb471bb312e0686d6e2875d57c5a7bb8b7392efb211c74f0d31e274a62643998132bdcfc09334ffb26c78c1b7 SHA512 ebad6d5f26af8ca1c55302f9a2fbedcfb70f07bf09cfc8fa4446bdac7ac9ec182523659701e35a69d559772e65786958d3ef434fef4bdf9d75420b5c41241269
-DIST kjots-5.0.2.tar.xz 230608 BLAKE2B 3194b0ef072decfa09455ca7e8d6057ea3f37f54d37641a6ddf28e17ef4662a408adc9e9b04394e6002b51e72ef740412bcdd70324d6efcb9e949f9911437559 SHA512 a652765c56cebcaeba7b879cc075555c28667abdba84d11e986e5ffb440fbc776116f363992dd84d939918ae7d80ef5c2e1093da28d114b18041e10e5209b225
 DIST kjots-5.1.0.tar.xz 184972 BLAKE2B 28bea486bcaa552b7463f9a2132230d5729ade7a2eadb06f66f958c660117bd3a1976d6da14f1339abfbd39930708fe77ae923042a0bc8ca59bf074e409375ae SHA512 71c30e0810157cf3d039e683d368cfa9fa3ec88918eee2d85477a9eb9f073af43dfb2318957019f35503d484e2521289bcb043ff9bfc2822eb900a2f5b8d5d62
-EBUILD kjots-5.0.2-r2.ebuild 1343 BLAKE2B ac83e67d01b3375519a0075f776b44c9cd6a4b81a7b5c28f24dd34a91613a92d89aac13b797a6f8a1fe1084389017ee38910c6d1680fb186008692c9d1c5b88e SHA512 50fc1c301a15794f5a14accb24b22f996c94fc364431d41fce024b5b7f342763b797012a058c1cb90c0ff2bff5047b872c7d01979f839234a2713d69893ce4a6
 EBUILD kjots-5.1.0.ebuild 1283 BLAKE2B 5d001a7d9f3bebd982ab6a4eef595a3f17f675c479863f04d57064fb220358f646608553ac2d6cfd501b09909ad1864916a09c238b6f774d47bef0dab10cc077 SHA512 1e7d7cfc3239c4ee568478697e9140f3e7ab6e0aac2e79aa826f0496881a6e3f2b21baf9c0f29e7360e983e9bb56a10bcad9ad8d6dc975bf02e0065a244b7db8
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/app-text/kjots/files/kjots-5.0.2-kf5bookmarks-5.69.patch b/app-text/kjots/files/kjots-5.0.2-kf5bookmarks-5.69.patch
deleted file mode 100644
index 63bda683122f..000000000000
--- a/app-text/kjots/files/kjots-5.0.2-kf5bookmarks-5.69.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From ca6f4b963e83ed91cc7314e1b60fe6607b61b53e Mon Sep 17 00:00:00 2001
-From: Igor Poboiko <igor.poboiko@gmail.com>
-Date: Sun, 12 Apr 2020 17:55:24 +0300
-Subject: [KJots] Fix bookmarks actions
-
-Summary:
-This patch ports KJots from deprecated `KBookmarksMenu` API (see {D25660}).
-
-On my machine, it also fixes a crash (`bm_action` was null for some reason,
-I did not investigate it though).
-
-It also fixes the shortcuts collision (`action->setShortcut` was not enough,
-one also needs to run `actionCollection->setDefaultShortcut`).
-
-BUG: 384000
-
-Test Plan:
-1) Start KJots
-2) It don't crash, and `Ambiguous shortcuts` dialog does not appear)
-3) Open `Bookmarks` menu, the shortcut is `Ctrl+Shift+B`.
-
-Reviewers: dvratil
-
-Reviewed By: dvratil
-
-Subscribers: winterz, kde-pim
-
-Tags: #kde_pim
-
-Differential Revision: https://phabricator.kde.org/D28775
----
- src/kjotswidget.cpp | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/src/kjotswidget.cpp b/src/kjotswidget.cpp
-index 865129b..e343bbd 100644
---- a/src/kjotswidget.cpp
-+++ b/src/kjotswidget.cpp
-@@ -353,17 +353,20 @@ KJotsWidget::KJotsWidget(QWidget *parent, KXMLGUIClient *xmlGuiClient, Qt::Windo
-     bookmarkMenu = actionCollection->add<KActionMenu>(QLatin1String("bookmarks"));
-     bookmarkMenu->setText(i18n("&Bookmarks"));
-     KJotsBookmarks *bookmarks = new KJotsBookmarks(treeview);
--    /*KBookmarkMenu *bmm =*/ new KBookmarkMenu(
-+    KBookmarkMenu *bmm = new KBookmarkMenu(
-         KBookmarkManager::managerForFile(
-             QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).first() + QStringLiteral("/kjots/bookmarks.xml"),
-             QStringLiteral("kjots")),
--        bookmarks, bookmarkMenu->menu(), actionCollection);
-+        bookmarks, bookmarkMenu->menu());
- 
-     // "Add bookmark" and "make text bold" actions have conflicting shortcuts (ctrl + b)
-     // Make add_bookmark use ctrl+shift+b to resolve that.
--    QAction *bm_action = qobject_cast<QAction *>(actionCollection->action(QLatin1String("add_bookmark")));
--    Q_ASSERT(bm_action);
--    bm_action->setShortcut(Qt::CTRL + Qt::SHIFT + Qt::Key_B);
-+    QAction *bm_action = bmm->addBookmarkAction();
-+    actionCollection->addAction(QStringLiteral("add_bookmark"), bm_action);
-+    actionCollection->setDefaultShortcut(bm_action, Qt::CTRL | Qt::SHIFT | Qt::Key_B);
-+    actionCollection->addAction(QStringLiteral("edit_bookmark"), bmm->editBookmarksAction());
-+    actionCollection->addAction(QStringLiteral("add_bookmarks_list"), bmm->bookmarkTabsAsFolderAction());
-+
- 
-     KStandardAction::find(this, SLOT(onShowSearch()), actionCollection);
-     action = KStandardAction::findNext(this, SLOT(onRepeatSearch()), actionCollection);
--- 
-cgit v1.1
-
diff --git a/app-text/kjots/files/kjots-5.0.2-kontactinterface-20.08.patch b/app-text/kjots/files/kjots-5.0.2-kontactinterface-20.08.patch
deleted file mode 100644
index 608a50d98567..000000000000
--- a/app-text/kjots/files/kjots-5.0.2-kontactinterface-20.08.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From bcf49fb95bee12bbc4bef0578285ad296deafcae Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Fri, 24 Apr 2020 01:25:43 +0200
-Subject: [PATCH] Install the kontact plugin into kontact5, with JSON metadata.
-
-Summary: This will allow kontact to use KPluginLoader one day.
-
-It also fixes compilation with current kontactinterface API.
-
-Test Plan:
-rm $prefix/lib64/plugins/kontact_zanshinplugin.so ; make install
-kontact still finds the zanshin plugin
-
-The same steps (other than old-kontact-interface compatibility) were already
-pushed to all other kontact plugins.
-
-This commit is very similar to https://phabricator.kde.org/D28847
-and its predecessor commit, in zanshin.
----
- src/kontact_plugin/CMakeLists.txt      | 11 ++++++++-
- src/kontact_plugin/kjots_plugin.cpp    | 34 ++++++++++++++++++++------
- src/kontact_plugin/kjots_plugin.h      |  5 ++++
- src/kontact_plugin/kjotsplugin.desktop |  2 +-
- 4 files changed, 43 insertions(+), 9 deletions(-)
-
-diff --git a/src/kontact_plugin/CMakeLists.txt b/src/kontact_plugin/CMakeLists.txt
-index 8a6b5e1..dec4b8b 100644
---- a/src/kontact_plugin/CMakeLists.txt
-+++ b/src/kontact_plugin/CMakeLists.txt
-@@ -1,13 +1,22 @@
- include_directories(${kjots_SOURCE_DIR}/src)
- 
-+# TODO: remove once kontactinterface 5.14.42 is required
-+if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
-+  # CMake 3.9+ warns about automoc on files without Q_OBJECT, and doesn't know about other macros.
-+  # 3.10+ lets us provide more macro names that require automoc.
-+  # KF5 >= 5.42 takes care itself of adding its macros in its cmake config files
-+  list(APPEND CMAKE_AUTOMOC_MACRO_NAMES "EXPORT_KONTACT_PLUGIN_WITH_JSON")
-+endif()
-+
- set(kontact_kjots_PART_SRCS
-     kjots_plugin.cpp
- )
- 
- add_library(kontact_kjotsplugin MODULE ${kontact_kjots_PART_SRCS})
- target_link_libraries(kontact_kjotsplugin KF5::KontactInterface)
-+kcoreaddons_desktop_to_json(kontact_kjotsplugin kjotsplugin.desktop)
- 
--install(TARGETS kontact_kjotsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR})
-+install(TARGETS kontact_kjotsplugin DESTINATION ${KDE_INSTALL_PLUGINDIR}/kontact5)
- install(FILES kjotsplugin.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/kontact)
- install(FILES kjots.setdlg DESTINATION ${KDE_INSTALL_DATADIR}/kontact/ksettingsdialog)
- 
-diff --git a/src/kontact_plugin/kjots_plugin.cpp b/src/kontact_plugin/kjots_plugin.cpp
-index 66e7ed5..b74d601 100644
---- a/src/kontact_plugin/kjots_plugin.cpp
-+++ b/src/kontact_plugin/kjots_plugin.cpp
-@@ -33,7 +33,25 @@
- #include <QIcon>
- #include <QStandardPaths>
- 
--EXPORT_KONTACT_PLUGIN(KJotsPlugin, kjots)
-+#if KONTACTINTERFACE_VERSION < QT_VERSION_CHECK(5, 14, 42)
-+/**
-+  Exports Kontact plugin.
-+  @param pluginclass the class to instanciate (must derive from KontactInterface::Plugin
-+  @param jsonFile filename of the JSON file, generated from a .desktop file
-+ */
-+#define EXPORT_KONTACT_PLUGIN_WITH_JSON( pluginclass, jsonFile ) \
-+    class Instance                                           \
-+    {                                                        \
-+    public:                                                \
-+        static QObject *createInstance( QWidget *, QObject *parent, const QVariantList &list ) \
-+        { return new pluginclass( static_cast<KontactInterface::Core*>( parent ), list ); } \
-+    };                                                                    \
-+    K_PLUGIN_FACTORY_WITH_JSON( KontactPluginFactory, jsonFile, registerPlugin< pluginclass >   \
-+                              ( QString(), Instance::createInstance ); ) \
-+    K_EXPORT_PLUGIN_VERSION(KONTACT_PLUGIN_VERSION)
-+#endif
-+
-+EXPORT_KONTACT_PLUGIN_WITH_JSON(KJotsPlugin, "kjotsplugin.json")
- 
- KJotsPlugin::KJotsPlugin(KontactInterface::Core *core, const QVariantList &)
-     : KontactInterface::Plugin(core, core, "kjots")
-@@ -63,15 +81,17 @@ QStringList KJotsPlugin::invisibleToolbarActions() const
-     return { QStringLiteral("new_page"), QStringLiteral("new_book") };
- }
- 
-+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
-+KParts::Part *KJotsPlugin::createPart()
-+{
-+    return loadPart();
-+}
-+#else
- KParts::ReadOnlyPart *KJotsPlugin::createPart()
- {
--    KParts::ReadOnlyPart *part = loadPart();
--    if (!part) {
--        return Q_NULLPTR;
--    }
--
--    return part;
-+    return loadPart();
- }
-+#endif
- 
- QStringList KJotsPlugin::configModules() const
- {
-diff --git a/src/kontact_plugin/kjots_plugin.h b/src/kontact_plugin/kjots_plugin.h
-index cd62373..4945d25 100644
---- a/src/kontact_plugin/kjots_plugin.h
-+++ b/src/kontact_plugin/kjots_plugin.h
-@@ -24,6 +24,7 @@
- #define KJOTS_PLUGIN_H
- 
- #include <KontactInterface/UniqueAppHandler>
-+#include <kontactinterface_version.h>
- 
- namespace KontactInterface
- {
-@@ -62,7 +63,11 @@ public:
-     QStringList invisibleToolbarActions() const Q_DECL_OVERRIDE;
- 
- protected:
-+#if KONTACTINTERFACE_VERSION >= QT_VERSION_CHECK(5, 14, 42)
-+    KParts::Part *createPart() override;
-+#else
-     KParts::ReadOnlyPart *createPart() Q_DECL_OVERRIDE;
-+#endif
-     KontactInterface::UniqueAppWatcher *mUniqueAppWatcher;
- 
- private:
-diff --git a/src/kontact_plugin/kjotsplugin.desktop b/src/kontact_plugin/kjotsplugin.desktop
-index 1339753..d5a198f 100644
---- a/src/kontact_plugin/kjotsplugin.desktop
-+++ b/src/kontact_plugin/kjotsplugin.desktop
-@@ -3,7 +3,7 @@ Type=Service
- Icon=kjots
- X-KDE-ServiceTypes=Kontact/Plugin,KPluginInfo
- 
--X-KDE-Library=kontact_kjotsplugin
-+X-KDE-Library=kontact5/kontact_kjotsplugin
- X-KDE-KontactPluginVersion=10
- X-KDE-KontactPartLibraryName=kjotspart
- X-KDE-KontactPartExecutableName=kjots
--- 
-GitLab
-
diff --git a/app-text/kjots/kjots-5.0.2-r2.ebuild b/app-text/kjots/kjots-5.0.2-r2.ebuild
deleted file mode 100644
index 07aaf94d7b1c..000000000000
--- a/app-text/kjots/kjots-5.0.2-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KFMIN=5.70.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=""
-
-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-20.08.1:5
-	>=kde-apps/akonadi-notes-20.08.1:5
-	>=kde-apps/kmime-20.08.1:5
-	>=kde-apps/kontactinterface-20.08.1:5
-	>=kde-apps/kpimtextedit-20.08.1: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}"
-
-PATCHES+=(
-	"${FILESDIR}/${P}-kf5bookmarks-5.69.patch" # KDE-Bug 384000
-	"${FILESDIR}/${P}-kontactinterface-20.08.patch"
-)
diff --git a/app-text/languagetool/Manifest b/app-text/languagetool/Manifest
index 246435b4aaef..02c5c7e36920 100644
--- a/app-text/languagetool/Manifest
+++ b/app-text/languagetool/Manifest
@@ -2,6 +2,6 @@ AUX languagetool.desktop 191 BLAKE2B 726e670645f78c3ea11c788a6440116753d66cf9886
 AUX logo.svg 2824 BLAKE2B 7653478b44ebd3dc80691849751745aba14a652d1ffaf52ef27910a52fae15b39c9ef0224795f698b1ac6f95a3e677ee46603b29261dff0d50d9eedba5e09de5 SHA512 501e3dee99f762556774f42829a9e450fc412271a7ade87f17ffb211929d24564ea3385b2bfc1c261e46d4b0b3562be62903b111ecd1c7dacb97c3c8ffb0d6d5
 DIST LanguageTool-4.5.zip 189327638 BLAKE2B b0ba0a67ee3de4ef6e452e6c47d5c03800f4e93acdaee03da37dca1a626e808bef91a167a62bd1fd7e732c86010523193d197083179cd40aa22de67bbbe5c4d5 SHA512 66bf6c99425d66ca8bc03b609f07d85f3989dbe73d7a93e81b6dc21d751fe05dd439d4753b51282d359a08ecdd92a18d9deab53d7b3a144c605d4429b2949eef
 DIST LanguageTool-4.6.zip 170185393 BLAKE2B 323b313933f7fd5c4ea4ab32d2b31c85495daac02ba1aba678482d9077f4f86331caa5d98546735ab1cee213276488ca00ad3181499bd09cbb26a9fffff5642f SHA512 eff159a1387a914447e3dcf1061efe445d2d939cbfcfa0a19e427cda58cbe5ca90db074dd1bb7e52c939ada3924cbe2e3c5392ac57a93a07922114dc354e849d
-EBUILD languagetool-4.5.ebuild 1403 BLAKE2B 768659205fb056d38477b36a3aeff2b7d1fe98120be9695fad67dbf12f86e215ee18aa1ac54206319c437340094e4a103d0b091d3a888809fc4bd0115a2d9a2e SHA512 0d9395e3e66add0c47833f0af42dba20ec4ba9484cdbfbaaa7b650afe61939350d90abb6fba2d727289ee85c655458370fd0aa3676f7afc9431c2e16a6e94deb
-EBUILD languagetool-4.6.ebuild 1664 BLAKE2B a50c355841864b2c1ce8cfa1d3cd4175fa903a9c461495249c6a7b0c61da74e1d97385d2627075c442fa3742b227b23bc3de5647b58c70b246492d9458b5ec00 SHA512 b3b99da572e63ffaadc0bd43a033d7df1c2a68bc51c42c2ab8c26640a55d2a095c6e749a1d22067ad57bca9b796b0d1d514cff9bfdb2e2ec443ecec31a559658
+EBUILD languagetool-4.5.ebuild 1404 BLAKE2B 2b2717f6a7a5e934461f865e924bc97db50a02eebab44c0e3d6ab44c4342cd8844950e1592cd509ac6ca76ba8cd996efbf7096112167c1f551930fe5ec33bc36 SHA512 d438bcb7e1b9125793501fd923ab1703efd5d4532e6099a8887cd5a42d48d69ddd4fbbefafa192683e6cee3ae306534a8b6682e4b3df037902d745c93a9016f7
+EBUILD languagetool-4.6.ebuild 1665 BLAKE2B 62e05624a11e46aef1aa2e4e8b4b1f2ad2a743d3ee6843f5b6dcff449451518e50740acf7a6a579f414fb9ca919407a053d65b3be2bf03c3603d188f13fe31b2 SHA512 52b40e0af61da7098716c52e21343d069055bdef56ba25b2f631c90553204e73153780b89612971975ed76afce381b47c741f34396ae28e14ea0de3f02b7d0f7
 MISC metadata.xml 255 BLAKE2B c3c51ff357cdf3ea565d7f4bf7cb236342061e471b67eacc0a436c26d52532ce7499657a76fc92a845321318a65f9eb877573104341ddae66dc3a554a35f7362 SHA512 305ae93d2bb3da79ee181cf36bb0ca2bbac016c20555967d7281cd5c0edfc26c1450dacd7a7de57078650dab0e815be9169c0b25a24d71488185f71ae8834167
diff --git a/app-text/languagetool/languagetool-4.5.ebuild b/app-text/languagetool/languagetool-4.5.ebuild
index c50594e3392d..afb2f0cde174 100644
--- a/app-text/languagetool/languagetool-4.5.ebuild
+++ b/app-text/languagetool/languagetool-4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ CP_DEPEND="
 RDEPEND=">=virtual/jre-1.8
 	${CP_DEPEND}"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/app-text/languagetool/languagetool-4.6.ebuild b/app-text/languagetool/languagetool-4.6.ebuild
index 1e732211206c..8f9296077b67 100644
--- a/app-text/languagetool/languagetool-4.6.ebuild
+++ b/app-text/languagetool/languagetool-4.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -32,7 +32,7 @@ CP_DEPEND="
 RDEPEND=">=virtual/jre-1.8
 	${CP_DEPEND}"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S=${WORKDIR}/${MY_P}
 
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index 24eccc28e9e3..87a23652d0a2 100644
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@@ -1,5 +1,3 @@
-DIST lcdf-typetools-2.106.tar.gz 643503 BLAKE2B cb016da74dfbad92808292842de653badec4dd3b703fee5e177016856a795e1383ceeed68de668846cce167b7b9c74bd7e0b17ea3a60b2f9b9caa0b73444e02d SHA512 039215132585214e6518864161885f7a06f08f8b36b002a961b1d83182e388b31eb034eaa4466ba56a2af52e1cfb202e88f004be17c22df1343f94481e3114cf
 DIST lcdf-typetools-2.108.tar.gz 651350 BLAKE2B c60986672a31bcf47b876fa75d04a976be761442b04b1541f7f9082521d716708542b8708fd3da558f9df6b459cca1043a7e1ee2eb006f94054611dd4ef348d5 SHA512 2c7afe1c6838f432ddd5bbd5fa86a58743242d5a2203220d3cd0153c0c69f23ca734e8d4352ed3c8a6bffc1c61bb93c19d00c6483545a09d6f8363f870bf2fd0
-EBUILD lcdf-typetools-2.106.ebuild 853 BLAKE2B acb7103b146925009b3e9b0d48cc3c28b47cec11cbc1a95769c79e908934d7f3755697dae11cbedd169a34e25f54b937009af6bed6eaaded1aca9da156399910 SHA512 d85c7af83d30ac65b2aee65fcf057e950a41e62bcd4e73f7b2b1cba1044c678232b8db3b616438af97cb1563627bdd2f10f361567e3da42a35a3b9dcbd550d70
-EBUILD lcdf-typetools-2.108.ebuild 850 BLAKE2B ad1f8d6d2a1247a5109a5dcb63c780fd7e5e9d2236aa35fee82350838909fc7fd582e531135bc67818bae22751abf64c01b7faf20e8c8bbacb319b2bb3356628 SHA512 bd65ed23271d55f8a0e807072535c46f6c240eac36fb82c6f35d12ac0b9903a28480353be6b4100a950fe6605660417d70edf0c413c135263eecd162da8fda9e
+EBUILD lcdf-typetools-2.108.ebuild 849 BLAKE2B b123f79c383133a1a3ccf816f3c176aaca4965114f6ddced5f8ed2910116b6c8428312a09411e78a44995a2d2a4badbe64ae74c3b48cf12df543686b1a869763 SHA512 24b966c3b3eb789ec29a1e9d3d6ec14f65aa3bc33102da6fc9f91e260ab1ed84c523cbfee5a1d26f07a84a13f23837db951bb89d9bafe0a968c194bcbd3be49d
 MISC metadata.xml 794 BLAKE2B c611036ee3c2daf88b72b026f0d8bec0e05595db2f73df051fb37793eda6304e1a32137e7759028ef4eb75bc56426d6ee2649d5384bbcc41c2da56d32a647b8e SHA512 9ae4e29814e34012d731aacc0a8b4a38649c95a988049f3fc10c7f260cb6ebcc57caa0a93d21eb8e66e64207673842ab7ab2fb71792ed3d537b7eca891609cba
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
deleted file mode 100644
index dc9d70eebb0d..000000000000
--- a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Font utilities for eg manipulating OTF"
-SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
-HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-SLOT="0"
-LICENSE="GPL-2"
-IUSE="+kpathsea"
-
-RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	use kpathsea && has_version '>=dev-libs/kpathsea-6.2.1' && append-cppflags "$($(tc-getPKG_CONFIG) --cflags kpathsea)"
-	econf $(use_with kpathsea)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc NEWS.md README.md ONEWS
-}
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
index c83aaa454cd3..dd313076fa41 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://lcdf.org/type/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="+kpathsea"
 
 RDEPEND="kpathsea? ( virtual/tex-base dev-libs/kpathsea )"
diff --git a/app-text/letterize/Manifest b/app-text/letterize/Manifest
index 751f7139daf8..e0ecfe3eca8d 100644
--- a/app-text/letterize/Manifest
+++ b/app-text/letterize/Manifest
@@ -1,3 +1,3 @@
 DIST letterize-1.4.tar.gz 7464 BLAKE2B 2739388697a462884826e4b0ac2f1d48bd12f903cc9cc11302104c3e27f56479b1494609c3dee5671bf5464a034a0e5cf6da7255f2ad265590054111022cd1b7 SHA512 7e57c6ebe8c5a1bfa16e6cf3f1b01f7e27127c32a1ea373a5221d807d5926b7064153c16c0081a83fec64bdb72379fc18540dedb639d7ec3cf318747438e414a
-EBUILD letterize-1.4.ebuild 475 BLAKE2B f7059a573ac12c8a1cbc89e04795a9f3ed42f9c84c6f4f78a17e279737770fe320a616a4c105917622302ca7b488cdf6a2ac082d5d4b6c99fe17a7b353386bc3 SHA512 7a39848329399dbaec5ebabf56dd70b227fd9d4ec39b9927f913ca44895a8c392c6632f2a0a66fb49090ffee8c8368fe298e0fa1c65d2a280ff1ba310921e9e9
+EBUILD letterize-1.4.ebuild 475 BLAKE2B 600be5e6c0b1c844ab86d09f55981ecafd5b7181dfebfbf4da370d535f8961550abcc17e86250f7242080746ee6dbbabfed8917c1741b8dc497402fe72706169 SHA512 93814d4178fe3c9b20c10bc5a86684e502c95a0793938fc3a5eccb51099ce2838c7838b37aaefdb62104b63ac2c3467a44e2e9c0dc2c0dafbd93b6c062ac160b
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/letterize/letterize-1.4.ebuild b/app-text/letterize/letterize-1.4.ebuild
index ef254475f276..91dbcfff516e 100644
--- a/app-text/letterize/letterize-1.4.ebuild
+++ b/app-text/letterize/letterize-1.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit toolchain-funcs
 
@@ -12,10 +12,10 @@ SRC_URI="http://www.catb.org/~esr/letterize/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
-src_prepare() {
+src_configure() {
 	tc-export CC
+	default
 }
 
 src_install() {
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
index 24e817d6d809..fc4cb07d9d2e 100644
--- a/app-text/libexttextcat/Manifest
+++ b/app-text/libexttextcat/Manifest
@@ -1,3 +1,3 @@
 DIST libexttextcat-3.4.5.tar.xz 1041268 BLAKE2B 2686345b90fd4a4345dac3cab5a801b7eabfb380f7d298c32fbb86bdb36939f6b873ccdfc6d7ef976655b0cfc8ab457e110e966ed4fc586f53023e7cb47e810e SHA512 f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6
-EBUILD libexttextcat-3.4.5.ebuild 630 BLAKE2B 5626c242dd01df6843f1021a394a5c881792dbc97d2b5b777067ca6b1bffc60431beabe09aef1ac2ef1a9ee4506dc199a048452558583cbad758081c917b0b5e SHA512 99a6c0809045d3537e0e211ce690b850918d68efc67e7714a58edba6f57bdd864af25189fef9d8113255683fe035f2bbfb8aa24bcc621c3d8058d34e28eddde3
+EBUILD libexttextcat-3.4.5.ebuild 631 BLAKE2B 7d0891dec4d9979dd90757edca0f92a5c604341b474b4f6c40e633a481750b03c66d9481bc065115166aa16ddfdb0d964dbef52300bce43fb21a5bd1d7130679 SHA512 d2c329d9b083168a29ef6d1a94fbad6d846997c1204a721decb33ac8f716278f5378e03563a58a9f916df3d4c19f7ce19acdcf574386d16de95b1b92d318175d
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
index c0e6600643fa..01e091381ee4 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/app-text/libgepub/Manifest b/app-text/libgepub/Manifest
index 68f698de0734..4415849109f7 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 668 BLAKE2B da9020893df65ddf5dd807c2fe450420c044f05226d2a993708b317731ac47737d755e0c91d1321c131ed8a4a1f1df4efb5f6e3cb08754b5bec2dba7610580a5 SHA512 1f6675e1dee6af125d045e46497ee5cd18cd66464c46683030857a03f78599f3b1dcbb6850764b3d877caf67eaecf2ebeef1673ff3b3905e49e8b3cff3e96f6a
+EBUILD libgepub-0.6.0.ebuild 667 BLAKE2B 6a285b37b47982defe12eafa904b9f5d57be6c2a81d15a0e64233dd319178c9f8d84f8edcf9bf79dc8474234c43cf2b574461d67b9a88dabb4e549c4db0cb853 SHA512 ddf96a4557b5985fef119fdaf1d6ec0b0473d235f75fa7a7eb2c090cfcac5441c9c438b0418fc40a9e1675a9c6d6a2de11f0ec5fbecdb6bbc24a27217762dec9
 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 0eb332f120bd..5dfee6811c9e 100644
--- a/app-text/libgepub/libgepub-0.6.0.ebuild
+++ b/app-text/libgepub/libgepub-0.6.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgepub"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ppc64 ~sparc x86"
+KEYWORDS="amd64 arm arm64 ppc64 ~sparc x86"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/app-text/libgxps/Manifest b/app-text/libgxps/Manifest
index dfeee45b08cc..bccff727c716 100644
--- a/app-text/libgxps/Manifest
+++ b/app-text/libgxps/Manifest
@@ -1,5 +1,3 @@
-DIST libgxps-0.3.1.tar.xz 93132 BLAKE2B 63af298ef1dc345ef7c40fae4006ba73aa7529381cc6cbc8cf86f4d5b69c8c5617b902bef833ed7d3fa968d927b441e888889179f598b06e2ca13084d3b199af SHA512 80401bd3c9753c74e425c5c08510cac314ad255ebeda9676bd5396a217770c7f5d8733c64b649cc6fdaa43423bb1a4ad21e1e0e3f7903f486e75a1d678850239
 DIST libgxps-0.3.2.tar.xz 79956 BLAKE2B 4e41361a90fe24816aff33e90dc1084d0c1c799a4c9368364e73d9a5df34a45be75bb9906ee272cd1956b3631894d4be63070cce57983e2401dc1496f08c3e33 SHA512 d3d56e4906477b68d088bf83bde666f9ea8bf383add592772aad53dd571e727f1bc0410dd020e12212ede5ff8e26cb46150a9860a6f7af29c4d195f03e946fe9
-EBUILD libgxps-0.3.1.ebuild 1223 BLAKE2B b80393ea587682f60e9f76f1e953dabd8a8589b51e302a71ea8d341be8df4d125485aa8f0b672b4ec94eae9a89b8426f165b1c02b406d12a60efcb4733da2878 SHA512 eb5351ef6f8e40e7b9d27b532966f53d655f84ca992769712fe05aa698974b55d32033ef2c2bf7f1b8fb3c215145f18a77be8b1fcca45a78522a12323dac914a
-EBUILD libgxps-0.3.2.ebuild 1241 BLAKE2B 291e05bd7686e0c5ee28febf16bdb702d91f01f567f75b120183f3d66f953c6a4e0c932261cab0517a74e83d7eacb034437b486b977f6b432774567d889ace55 SHA512 9e7a2460a2fa7b0358c807387baf73ce2f72134c6346f41b01245e81918b1059033a8f907d2937d3ccfc66cfac0171fff81827231bd850f5518c43b28f2c98be
+EBUILD libgxps-0.3.2.ebuild 1234 BLAKE2B 1bc51f19dc5d89ea57ebfc908deeea8f60943539cceee457ee8d03d6786abafa69348fa0d08bc53f4ebcde69217c744d5272b7ed0fae944828b7275091e5f374 SHA512 ad2b62911598c7e869843d945a3297b2b84f327657957ef789373ee56da150c793ed3a1bf1172948bd955b36065d1c07530bd89bbea9d563105934254c2ee0be
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/libgxps/libgxps-0.3.1.ebuild b/app-text/libgxps/libgxps-0.3.1.ebuild
deleted file mode 100644
index f6787ca4794b..000000000000
--- a/app-text/libgxps/libgxps-0.3.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome.org meson xdg-utils
-
-DESCRIPTION="Library for handling and rendering XPS documents"
-HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="gtk-doc +introspection jpeg lcms tiff"
-
-RDEPEND="
-	>=app-arch/libarchive-2.8
-	>=dev-libs/glib-2.36:2
-	media-libs/freetype:2
-	media-libs/libpng:0
-	>=x11-libs/cairo-1.10[svg]
-	introspection? ( >=dev-libs/gobject-introspection-1.54:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	tiff? ( media-libs/tiff:0[zlib] )
-"
-DEPEND="${RDEPEND}
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	gtk-doc? ( dev-util/gtk-doc )
-	virtual/pkgconfig
-"
-
-# There is no automatic test suite, only an interactive test application
-RESTRICT="test"
-
-src_configure() {
-	local emesonargs=(
-		-Denable-test=false
-		$(meson_use gtk-doc enable-gtk-doc)
-		-Denable-man=true
-		-Ddisable-introspection=$(usex introspection false true)
-		$(meson_use lcms with-liblcms2)
-		$(meson_use jpeg with-libjpeg)
-		$(meson_use tiff with-libtiff)
-	)
-
-	xdg_environment_reset
-	meson_src_configure
-}
diff --git a/app-text/libgxps/libgxps-0.3.2.ebuild b/app-text/libgxps/libgxps-0.3.2.ebuild
index 051579ab2eaf..4ed7f9aa4718 100644
--- a/app-text/libgxps/libgxps-0.3.2.ebuild
+++ b/app-text/libgxps/libgxps-0.3.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="gtk-doc +introspection jpeg lcms tiff"
 
 RDEPEND="
diff --git a/app-text/libmwaw/Manifest b/app-text/libmwaw/Manifest
index 0ceed8bf5a3a..d0718ef37f3a 100644
--- a/app-text/libmwaw/Manifest
+++ b/app-text/libmwaw/Manifest
@@ -1,4 +1,6 @@
 DIST libmwaw-0.3.17.tar.xz 1349700 BLAKE2B 4b5ba8d5133144973609dfbd273ca36cc95e52608c78f6143f7c4283bc2bc6d7ceb22836a693d64fa7408957a3b02a7c9d0a5ab9235aa2d0b9725170441babfc SHA512 c3a1bb079d7e74cd7a23de1501730be21b1b089ef6d4f81ee0001775483c6346da3105b0d67f75523e4e088987bc92b97acb056ec7fc11bb29047109a1cf5ac4
+DIST libmwaw-0.3.18.tar.xz 1382328 BLAKE2B eae75e24826a963032d866be1834221850a762447495a209ad1fe268c1072c877e4c19843d61e2e4d9322a48a03b459fa9a4cc734af0eabbb09813ff9626e466 SHA512 4666c0dcc567e3e4c0ae5d9651a7003d2f32acda841bd1e297d46e566430c9227588e29b219987c56f1347f6e5656b52b00d8d6d8fa7902e19d175505e345b7e
 EBUILD libmwaw-0.3.17.ebuild 1004 BLAKE2B bd99841d18279477318ce13e9c80907572ecbb1de67ec738bf32afda9df36ed9e4d0e6ec695a386e535b41e19d0088f2635778448a0b6480bdc71c84da44a62e SHA512 f822bef23ebbe99c097d20a6b312014abb2091e61a54f4a8cf184252f13db23deccc3c0ac6b09f68309d4cf95479a58be6a8a9ba508dfd30e327ea6a5958fb95
+EBUILD libmwaw-0.3.18.ebuild 1007 BLAKE2B 2042912c93c84d2c590f2f6d11ee0b936f71c8d6811425f3cc00a3ec2b18edd44714cdcd69467acc84da93e2a0096f86a32df4a1d0e5e847b49a1986c718ddbb SHA512 03834bd3781edd22c3c71008aec707a855e28e54227ffe2e54c52c8c48639fb283f472b32e646484f9d6679fae25c585a95fc013c00d09583bd49f55d7a44427
 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.18.ebuild b/app-text/libmwaw/libmwaw-0.3.18.ebuild
new file mode 100644
index 000000000000..7363e33a0479
--- /dev/null
+++ b/app-text/libmwaw/libmwaw-0.3.18.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2021 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/libpaper/Manifest b/app-text/libpaper/Manifest
index c8817ba17f52..96c9224f5021 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,5 +1,5 @@
 DIST libpaper_1.1.24+nmu5.tar.gz 49032 BLAKE2B 27a684dc02d5d25c84a92161e7178d1f369444d50c316e7303579a2f8ede8590d4a19637b7066fcc8909f7942fa965d8421d468b28e99b8e963f4b2b170f2ab3 SHA512 4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56
 DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc
-EBUILD libpaper-1.1.24_p5.ebuild 1198 BLAKE2B c87cb19e0c116e8bbf45fb2073978fa74b657da6d10265ddf0474c68dc42c2b99185ba6875f2393b79811a5dbfc30624af11826c4d36ecec9d8a07a473cbced4 SHA512 8c95be4e8c74f98e3d35b25c146f5c283afd562cbe3e69d2803feec5d0e0d5e549e2ea69f742e426aaa2bd05295143776754a8d9cbb2a17cbfa287e12a79a159
+EBUILD libpaper-1.1.24_p5.ebuild 1199 BLAKE2B ee864bb78ec30f830d0fa66e01f7de3bd31afaf51cb4dbac316997f25f8fc1281cc99217a9fc62b51a7be5dda03a9ab0540d0b944c1ef2fb19b8ce562da3ff96 SHA512 33a26ef7217a5fbc9e9873b18a8f32a5cb13c0bd4c6cc94824a3875fc27f51976a991edee82608f0117a91ae7cb7b4c4abed2dca2b397a8f2f19de9f7236af08
 EBUILD libpaper-1.1.28.ebuild 1149 BLAKE2B 82fb96c254f7c440f27bd5a8792764df0edc50366832a465002866b3156726d8423c530af196d10933290656f2fe3c5507c2b9c16022a59d0cc25a6e40e5baa2 SHA512 e4a5e79d3203017e6af6ae21674dd8fcd03bd0c4d287174060773d603fdf0175b21ebea2057332bc1cbbb8a73c9bee54e209f7f2dfbf2291616a507a753924c9
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/libpaper/libpaper-1.1.24_p5.ebuild b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
index 82f55efb16ed..04b3e1b4c65b 100644
--- a/app-text/libpaper/libpaper-1.1.24_p5.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/llpp/Manifest b/app-text/llpp/Manifest
index 5f75270cf537..7c2e11e97289 100644
--- a/app-text/llpp/Manifest
+++ b/app-text/llpp/Manifest
@@ -1,6 +1,6 @@
-AUX Makefile 2810 BLAKE2B 9c8ad849e95dc4037813bc575b5627b54bdf1eae3085235489e1a1c0fdf3aa3c679b5884d4044fce828f2feef02afcb82c7762b09af2c9b167c1c2dd7d0c5c7c SHA512 28014bbf81cb22c28963b594f8ef15a16740e41de2d6ad7421017fc5a50015e33ca1d449ea43a9976f741a269dac4045b2ed459cb74081690f919a4218542303
-AUX llpp-33-makefile 2733 BLAKE2B b98e6ce0573d4461a9dcbda41e8f54c5c652fd21b0db5b43df28c9e7117cee3415860b0dae9ec6030392cfdbcfe73844ddc824959b9e7a5f5fd34e8c6d41c01b SHA512 64895d517d6b973ed34b374d3bccd6c06233887aceb3df1fba350db7c54f62fe7756a6c0e02700dbab1e350087fb483f549c8c589067c2a50fa23d769f32f0bb
+AUX Makefile 2816 BLAKE2B e085abb4c68696ac7317de55ad46b8796db40d33d97c170226749c13af48218c0578f74aa5eeb7225cce981e997b3099a559e1e39af35f5555d60698b0f87843 SHA512 62aeb5cb3298bef267f7be6dcea308d7d2d5b4a8edf72b83ae7e405471a815805778ffe688cab43344725031064d68a506d30beec37e2313bf3c8435211a54ae
+AUX llpp-33-makefile 2739 BLAKE2B 57d43faa9d6e4e2f90997288acaf38fd94125aff67b41d667c8de85609eaf1bc2b147f3c004521859dc86317fbbfa5c4b0094b69e2ffba5dc470c69bf24d4151 SHA512 2d23f94853def0ac6fa6cd7e781342c98acb62fe11e9abcb6d5c76b94df3fb9622fc594c605d79afaeb51759710f23d711c735324603fd4f67d0ef798e6a19a9
 AUX llpp.desktop 556 BLAKE2B 44ef90b27f7d4efc02e7a4f420bade296d9704ba1dda803d4ffe897fef1393a2147827971bfe58ad0d896b0af619c6b4796c1bb08beba0728d66c2ec15e2cc56 SHA512 a0c6a256f8d08829f70cf8c1b2a2b93fd9cb60ff2e5d886a09a4afffe42fc95e5f9ac86fbcb9e4af805d40f309a65b7958f5f60dc3637aab9ad4248a56a9fb97
 DIST llpp-33.tar.gz 172410 BLAKE2B 6f45d262520bb9e09a08088b9d6b6a1c272ca32d44b507537e7887c76f17ec782d805f4fb94e528d7bca5a9eb87c35ff64b883bd0fdab5609f2807bc8043b1d5 SHA512 f14669eab8934ddc0ac530a67055199a73c7f0c2906dc4a80a729326340691ad53433afce2e638848471852901c88fcc99ae1d66b1abf179e4f5892976b585e8
-EBUILD llpp-33.ebuild 1312 BLAKE2B 2754cc2cffaa99ac9213e3b1a80629697664bc45318329cb135179168b73f1bdd35854a2b50716d9972d74627b258a0b9fe6c681955a92a49804607bca5a6484 SHA512 5a47ece59fdd4eef4ec453e73ac0d9e320c90b2c37bbea16fe04b48717d581e1a1f2ecc76d3331abda60e49eb0ff978513205155d175f1874c76b89de65ea5eb
+EBUILD llpp-33.ebuild 1334 BLAKE2B bbf34216eabb65421ea7fa59c1afec29a0ecc86d4b4aad7cb92d69a2ddcb61e03099abec461b6a467fb62435005ae38e9be1def9a8035547df05242234a89f49 SHA512 4a2b1ce04fecbfa620b186cd4ed2682713116941005d5ede0b800cb0960c3b058d188a732aa2c8626888cd02dee16b3fc08b0a62a201fa61f765af190c15aa0e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/llpp/files/Makefile b/app-text/llpp/files/Makefile
index 0bd94cab00f2..66a3fe4c4fd8 100644
--- a/app-text/llpp/files/Makefile
+++ b/app-text/llpp/files/Makefile
@@ -10,8 +10,8 @@ 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))
+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
diff --git a/app-text/llpp/files/llpp-33-makefile b/app-text/llpp/files/llpp-33-makefile
index 3a5c3122e251..6e4eabf8bf5c 100644
--- a/app-text/llpp/files/llpp-33-makefile
+++ b/app-text/llpp/files/llpp-33-makefile
@@ -10,8 +10,8 @@ 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))
+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
diff --git a/app-text/llpp/llpp-33.ebuild b/app-text/llpp/llpp-33.ebuild
index d8c83ada0750..f4c105ef4d10 100644
--- a/app-text/llpp/llpp-33.ebuild
+++ b/app-text/llpp/llpp-33.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -51,6 +51,7 @@ src_prepare() {
 }
 
 src_compile() {
+	tc-export PKG_CONFIG
 	emake -j1 VERSION=${PV} CC="$(tc-getCC)" LIBDIR="/usr/$(get_libdir)"
 }
 
diff --git a/app-text/lowdown/Manifest b/app-text/lowdown/Manifest
new file mode 100644
index 000000000000..b45e25b10bc7
--- /dev/null
+++ b/app-text/lowdown/Manifest
@@ -0,0 +1,4 @@
+AUX lowdown-0.8.4-configure.patch 770 BLAKE2B c91c27b9d7a33435515214ab8701ee0c5c2ea79b074e4ba8f96d57d0ced14ca77a918258cdbcb60b6ad9522e14f298b707b69aa70aae3e89b9b061c91905da72 SHA512 b768fade94fc2369e75d4c59b13cc2a053c3edf8502e246abd0a90123a9483f2160ab470c2c162cdf439dfacf4fd184751a069d6b008775f6ffa8bf4eba85463
+DIST lowdown-0.8.4.tar.gz 520735 BLAKE2B dc66b92f285b186ca83b9fad1cccfef9b395233ef56756e9ea9071b5502cd81dc6ce2d67d7ef265dab8953010af0907cd76125cd4442cfbfc2bcf8c63e097809 SHA512 cd46ead69ed038bf3ccf848b784327d66c78dd8adbc9ae4bfee660b9b1e52844ac8c7ad0377f8f38a3fee0d2e523f979a22d6b547c7964304accef0951cfca34
+EBUILD lowdown-0.8.4.ebuild 794 BLAKE2B 48cdff865b1b252a43e4b3ecf06a2b3c391ecfac6d6fe3f47ece4ed9f14ab7f20f789a7ca3a0ee058ff0c8d3ea1014417b790e247fa12a1c9b0e4b9d9609aad2 SHA512 826fa1095d39259f218bbb82ea62caaa052f6b5cb8ea43f3ffba3fc85db7cab794c6b6258c733ff9060801d28b5e52f468caf909caa1058771adf84d6ec5aee8
+MISC metadata.xml 249 BLAKE2B 9e4529cdac0a55f14c36fde3fa54e30645a61a73d58e83ce460edf84d729bb3cd4cdc3e52d588690945508bc7d253b1edfb7734ebee94a88b75fee249a043c84 SHA512 ecad16da7f98e9b1cb1882147e6d8b7d541e4839d92fc26f3db1bea69ed633637da9259947b2b78d204a11d0edd3daa84f173613b6dc19110b5406c6fddfa7f0
diff --git a/app-text/lowdown/files/lowdown-0.8.4-configure.patch b/app-text/lowdown/files/lowdown-0.8.4-configure.patch
new file mode 100644
index 000000000000..ad7bcb69d631
--- /dev/null
+++ b/app-text/lowdown/files/lowdown-0.8.4-configure.patch
@@ -0,0 +1,31 @@
+diff --git a/Makefile b/Makefile
+index c2e2715..4fe977f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -143,7 +143,6 @@ install: all
+ 	$(INSTALL_DATA) lowdown.pc $(DESTDIR)$(LIBDIR)/pkgconfig
+ 	$(INSTALL_PROGRAM) lowdown $(DESTDIR)$(BINDIR)
+ 	$(INSTALL_PROGRAM) lowdown-diff $(DESTDIR)$(BINDIR)
+-	$(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
+ 	$(INSTALL_DATA) lowdown.h $(DESTDIR)$(INCLUDEDIR)
+ 	for f in $(MANS) ; do \
+ 		name=`basename $$f .html` ; \
+diff --git a/configure b/configure
+index d1c16ab..941f185 100755
+--- a/configure
++++ b/configure
+@@ -92,12 +92,12 @@ LDADD_STATIC=
+ CPPFLAGS=
+ LDFLAGS=
+ DESTDIR=
+-PREFIX="/usr/local"
++PREFIX="/usr"
+ BINDIR=
+ SBINDIR=
+ INCLUDEDIR=
+ LIBDIR=
+-MANDIR=
++MANDIR="/usr/share/man"
+ SHAREDIR=
+ INSTALL="install"
+ INSTALL_PROGRAM=
diff --git a/app-text/lowdown/lowdown-0.8.4.ebuild b/app-text/lowdown/lowdown-0.8.4.ebuild
new file mode 100644
index 000000000000..dd0f98fee37c
--- /dev/null
+++ b/app-text/lowdown/lowdown-0.8.4.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+MY_PV="VERSION_${PV//./_}"
+DESCRIPTION="Markdown translator producing HTML5, roff documents in the ms and man formats"
+HOMEPAGE="https://kristaps.bsd.lv/lowdown/"
+SRC_URI="https://github.com/kristapsdz/lowdown/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	virtual/libcrypt
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/lowdown-0.8.4-configure.patch"
+)
+
+src_configure() {
+	CC="$(tc-getCC)" ./configure || die "./configure failed"
+}
+
+src_compile() {
+	emake LDFLAGS="${LDFLAGS}" AR="$(tc-getAR)" $(usex elibc_musl UTF8_LOCALE=C.UTF-8 '')
+}
+
+src_test() {
+	emake regress
+}
diff --git a/app-text/lowdown/metadata.xml b/app-text/lowdown/metadata.xml
new file mode 100644
index 000000000000..cee379b15409
--- /dev/null
+++ b/app-text/lowdown/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>chutzpah@gentoo.org</email>
+		<name>Patrick McLean</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-text/manpager/Manifest b/app-text/manpager/Manifest
index 84fcf57f79b9..50fa677fb0ab 100644
--- a/app-text/manpager/Manifest
+++ b/app-text/manpager/Manifest
@@ -1,3 +1,3 @@
 AUX manpager.c 1809 BLAKE2B 3f17501b90ca4af07e2bdebdc02b0dfd9aafe4dafe878852deeba30219593b1dc4310bd4a152ebf8bc4a58df61cf40fd3fe341cf0fd69e9cccfa43568a7ec67e SHA512 4f827429dc46993010d0096cb352920dfdcaf2cc97bf10e2155dfea3fda601c011467be65ca3f2e3f5c44cb26de0fd9eb58f7d875f75fd5f1db4b2c6cdabdca2
-EBUILD manpager-1.ebuild 707 BLAKE2B 5d0d6a974416bcb29226f26aa3dc45609f8ed7b17e42068b1f2fe0473b0eab3742968b572c257b3eb3d23e1c876a5e99324f185968cf4ce2ea97bfef9ad886f6 SHA512 04ea79f9bfbc444aa3958b46c28a94ce5e2f00d017fd2ccf80556e9c10641374a58ff27400628d9a07d8c66401ae4f88fbd140a359266e250d1ef5399f6a9d6d
+EBUILD manpager-1.ebuild 708 BLAKE2B 7bd7c743b76ec0c754681bf4d3d9a0cbb9680426c9b44a18733fad82f2b4313f8cbae47961dfb42a18589b011996f9d48f52e042846e179230e914818e008a49 SHA512 e437b65353f4b25d2481682015d676664fbdea54df2c032657b8e43b6ccc403d263cd6fcb653fe85eda049a50616cbb749893e23d56457de356ab3ab2b7cebbe
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index 7a79443f990d..49301d4d54ef 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 S=${WORKDIR}
 
diff --git a/app-text/master-pdf-editor/Manifest b/app-text/master-pdf-editor/Manifest
index e4ab7c9a973e..2f31fa20a77b 100644
--- a/app-text/master-pdf-editor/Manifest
+++ b/app-text/master-pdf-editor/Manifest
@@ -1,3 +1,3 @@
-DIST master-pdf-editor-5.7.20-qt5.x86_64.tar.gz 15905883 BLAKE2B 7e698a477552f9d115f2024f57f9acc76963955c9e904d376eda5296256907973e56f96c7ae8f7a93d6357339bba83ba80b8901125def3987548a3cfb415f235 SHA512 53426c3bde96a8c1e43723db6b5a67e99b030b83e42f02f79eb8a36ecd888e2a08c20c02a9d81c0c34e0dd294b3611aab540f611c6f5dc03b983914aaf05b878
-EBUILD master-pdf-editor-5.7.20.ebuild 1092 BLAKE2B 0d43d8511a262454d533e3961fc1f313de5e17638cab6178cc4357edfa750a80dde9e0e32c32a05c522dfb699738054ad2953fd489e754158558780c6fc697cf SHA512 8870aba2272c522a995fa2cda76530e0847e3ba06102599595e8dcc2d1209b0a2b6588876fd3292e938e9c69c8a5fa3561922a788149cccdea7ccece18901e56
+DIST master-pdf-editor-5.7.40-qt5.x86_64.tar.gz 15880536 BLAKE2B 0e0c59ca74dfd8532513cbc6cbe96b9ca73cc9d838d9d4c55dc44fdd838d5c7ddb14c6725ef86d6da95c211355a716bee328a5147cce2833b10994b313848d97 SHA512 10962402f26a12eec625e2d366e99490995c5ab5011e05364af72f67504487cd913200a809db83d9b81df18f89318a719167efcb0e8cfa8ee1796698fc79303f
+EBUILD master-pdf-editor-5.7.40.ebuild 1092 BLAKE2B 0d43d8511a262454d533e3961fc1f313de5e17638cab6178cc4357edfa750a80dde9e0e32c32a05c522dfb699738054ad2953fd489e754158558780c6fc697cf SHA512 8870aba2272c522a995fa2cda76530e0847e3ba06102599595e8dcc2d1209b0a2b6588876fd3292e938e9c69c8a5fa3561922a788149cccdea7ccece18901e56
 MISC metadata.xml 397 BLAKE2B 452d8c61c1042ca4152ef78d105ee9e50453e477628b5bc265fe7069b2ef60f351b31151811becab19615aac793c71a456ecacd0b44d8db767a16698a1c7f6a5 SHA512 319a7177adb83e54195daf3ba392d68540c94c98a57681e4bfc20fd3df76632eee4b2e9c994a387df9878b9d596a1bb74dbbf5f003d1755c6df1fc3f2fc0dc32
diff --git a/app-text/master-pdf-editor/master-pdf-editor-5.7.20.ebuild b/app-text/master-pdf-editor/master-pdf-editor-5.7.40.ebuild
index 1300656eb4a5..1300656eb4a5 100644
--- a/app-text/master-pdf-editor/master-pdf-editor-5.7.20.ebuild
+++ b/app-text/master-pdf-editor/master-pdf-editor-5.7.40.ebuild
diff --git a/app-text/mecab/Manifest b/app-text/mecab/Manifest
index 120f58a0e491..a918458fb898 100644
--- a/app-text/mecab/Manifest
+++ b/app-text/mecab/Manifest
@@ -1,4 +1,4 @@
 AUX mecab-0.98-iconv.patch 302 BLAKE2B 3644a66b1bdf9099ff0258a057c930c1b2e065836b0e6332211e4d04efbbf39da1de2788d90143826a1c9d887fcb63042e533864e746b7c385baea485cb93490 SHA512 c0dcaa8637f1c16a33bd4dd4007225a4f1ed3f0eebcda28dc7d92ec0a66ea16b5bdd956fb3a904af8070ce0ac2d6c9090b602b4705e73fac1100a845b3a756ce
 DIST mecab-0.996.tar.gz 1398663 BLAKE2B 97ea18a00c6f2284c994681631b84a572d244b741c8e30b5fdf5404b2bf80fdd4c724c803999955e36ee252e59e6644716dbdca55a6ffb2e4de52193d7f777bd SHA512 aca6d16f411b9ba9b6687242246aeb28ede6d6c6a9122d4a32da9d8e76e79b5f4af2c8e3b13ad9462b34e9d2994cbd9bbbedebac45609684db9b703da999577f
-EBUILD mecab-0.996-r1.ebuild 1164 BLAKE2B c3045299add00011361a95e32d4ec032328c87dda3e4a4147c8704d5d027efd29138d4890fce1a33ee50824dde6715cf25fac38f9f75c8f16630a30c81bb8b75 SHA512 1f3fcae4a5cba1d853edea239a50648c01e0b238ecce6743e83f6ed13e8ccd895ec3f7cc71bee2730be6eea909aca6901eb94bdc2c21ca159a85f2e4b9a4fafb
+EBUILD mecab-0.996-r1.ebuild 1158 BLAKE2B 8239923e2cd764ba3ea77543f070fdf19d2f210c70f36f469d3931d97908e9f977e9a6a875381a78c1e13231236cce8718580a0977a5e5c08b09a97a2a4964bd SHA512 d25196718cd63a1f4349375e735e5e8bdbdb8f7a4c3fa1297e750df584c3134e70e2e6fec0f59865d75a015c3036977543d95f31f262f23c9e67a1666f846878
 MISC metadata.xml 412 BLAKE2B ca6440887d39a7ded3f9d000ec965344164f69dfdf0e98bd070cdc531804d7c94d74fe9a6a3ead7876fd9bf39eacbe5649b3e5357b1083f30d78ac51fd0a7afa SHA512 78feb6a8557ee197f02071540a3c6836cebec69cffc3d32a22f8563008614da66a6b26fafa0dae24b0c21cb7492e203c096f67c5482d1ffe617098b0db0670e0
diff --git a/app-text/mecab/mecab-0.996-r1.ebuild b/app-text/mecab/mecab-0.996-r1.ebuild
index 31bcbdce7259..6db5fa57b549 100644
--- a/app-text/mecab/mecab-0.996-r1.ebuild
+++ b/app-text/mecab/mecab-0.996-r1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Yet Another Part-of-Speech and Morphological Analyzer"
 HOMEPAGE="https://taku910.github.io/mecab/"
 SRC_URI="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/${PN}/${P}.tar.gz"
 
 LICENSE="|| ( BSD LGPL-2.1 GPL-2 )"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86"
+KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86"
 SLOT="0"
 IUSE="static-libs unicode"
 
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index 0023287af477..96e8a1aaaa03 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -1,11 +1,12 @@
 AUX mupdf-1.10a-add-desktop-pc-xpm-files.patch 13387 BLAKE2B e0100380b328cfd8ce6099c35886a6f2e9508f6d08c678dbc1386e88998d01bdacd160020dc6ceefffbe09f4cf2b64d08acfb76f8535ffcc0dc93c65a3a2da78 SHA512 1d6ccfccf785cca01b1a607e94f90a5e31c748154e9fa7664b9863c7b26951f17a584ffc7cd23dd83d1e547498e22c902067e9695006824017e69d33dbf25a5b
 AUX mupdf-1.15-CFLAGS.patch 376 BLAKE2B ace255a4110df9200d627ac68f5950218eeaa993bbd37fa7fe2d676572cad02d50a632750e6a9bdf6269cd97501f709d075a79d7db8b9832909b59b33251b594 SHA512 c00cd5cb30d33a9cbc55557cab3c4e2be1ae86121c5b1b28b6e35f97f93751aa2e96e106f13b7f365a56ebcce8e1c5e4163a440e8c85a48130803f5a7aec63ed
-AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7eed3abfad4d3db15819d5e101ba03e376fc0faea9c4939b7167b276fffe022975bae2e99238d5b4bee92edfb924fd5 SHA512 028930d5e6c86a9052de6e1e0f3e937d89a3f22e10b7fb71f1dba998c480c9914520e4248c21d68291c6fd7684c627b5068c1bb2e027ff6a518d1ca5533eb677
+AUX mupdf-1.15-openssl-x11.patch 668 BLAKE2B 40810d21718e0f30e47e3d61fc3c10442568565e519d2713f952fb11355fc532717ef2df40a074c0c79ed725d34e639e9fbde02694b5ae7a76ae9a9ef9a36acb SHA512 89cd9bbef7c7e920aacf1de4a513fb98199ff2f033818b617203a4517a2aeb7ad5ed4a3720ceb6dec370560d85759c973a7c15d9a47924d0c3d51cd3a9c6ad5b
 AUX mupdf-1.18-Makefile.patch 1246 BLAKE2B e0054c441b067ef4aec069cb0fd4342f16919af51ac53096f20a2dbc87a81e2bece8478441df493d6825eedca53f4c9634cfe8724980da119d0ac20035a4d423 SHA512 def7524e0468ca15220b2d9c718ef61da4ce007c43f591ae3ad80afe55f86549985b1c5ec3d3d266045a0a6ca399580f8f4e001893d4feaabb7785a8a4df278e
 AUX mupdf-1.18.0-CVE-2021-3407.patch 1597 BLAKE2B acd956c6b2c50f1699af32c264c38bc2bd7c6d07de2b3d52b28aa44d63766f6a3f5d95400b0d364c4baf3949022bba6e7be33ae7c33831308c2e006fe8d061f6 SHA512 c63da7cd1c245e7b10a6823998a42398981c16ec87d059779d14d44f2c5d87adcd58b0d7b758e6aa22c04f7cc68f3989b882456122ca1cc9d6cd0a5ae79ca21e
 AUX mupdf-1.18.0-cross-fixes.patch 5830 BLAKE2B e91e41b4889f2716d20b112b18924799db5d21274feb3699f2bca04fd3d93528d86e2ef05ccf25d1a0800e81a333d0703f837d45fef926746aeec1ece60c6ced SHA512 0e7a91474c3f31a5d5f7ddc461d74f1bc0cc8de7eb7bedbaa0f6335a6038327f5c7261d16baade5dba567b3d1ad49adf7a65ea40b226fca5f1eb58cc7bc0b07a
+AUX mupdf-1.18.0-darwin.patch 1001 BLAKE2B 1d6f8452cda38dfca3b0e62069a560ed6119d02b391eb29740d093883a7eedb776df7d7a561fb116eee3315bd497a64658927d299af8315d0dc8215e300e192a SHA512 6ed41a5b61859cc6fdac2b5c93fbb6e6e16dfd9540d0950e702935c28e3793006d72dd178a95d6ccb06d1b76b5df7dd439006bbe5d98210c2985ee91c263d755
 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.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
-EBUILD mupdf-1.18.0-r3.ebuild 4204 BLAKE2B 830de2bc9308efbe316af379c226f011c48318130094e7e3766ffb883b86b522712d7f094948cce82b7a18e4e25a8e66ba532a1146b7d28d0b30a6d15a02df4b SHA512 ab4f14683ef92059f40ac96dc44cbe198c5e09ecef4c15b3a1c714d7fb3086c2965de578bea18917fd8cfe03a5b71b3edbe668629b18dfe80487410836c14070
+EBUILD mupdf-1.18.0-r4.ebuild 4259 BLAKE2B c95febaeb6be6ccef3c48ee358e3f1f32e37af133bf3885dbc381efbf0fa9a85d81f50efbebd7da36d70c339ca465b3670db1daec0061c876ff9ee52a765a65d SHA512 827ae51bdf6613893eddee22708c8fb5ae6322752afc76cf1eae0386f3f610f5e26697e0c68729a65fec0bfcf6ba3d8eeee82544ad9d4d4c7bf5c440ae79b044
 MISC metadata.xml 345 BLAKE2B 6adf08490e4a701eeb6ab07c2e5619cff42ff02bf75ec38fd94f215f000972f0b3d88c8b0fab827728dd12d7906dd580b7650f11da1d77964eb5fddd773ee4a9 SHA512 32902c1fac57a44927a53dbb52fb22cb04317bcdf3dd2ae8e9863bef557178e33565bb122e128908c61ade9a5e2d1f067c530ff05e7ed0242eccf193e6fa2026
diff --git a/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch b/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch
index 22829279e147..3f3aac4c933a 100644
--- a/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch
+++ b/app-text/mupdf/files/mupdf-1.15-openssl-x11.patch
@@ -1,5 +1,3 @@
-diff --git a/Makerules b/Makerules
-index 298b5737..b2079435 100644
 --- a/Makerules
 +++ b/Makerules
 @@ -119,13 +119,13 @@ else ifeq ($(OS),Linux)
diff --git a/app-text/mupdf/files/mupdf-1.18.0-darwin.patch b/app-text/mupdf/files/mupdf-1.18.0-darwin.patch
new file mode 100644
index 000000000000..cdd8ccf0f40d
--- /dev/null
+++ b/app-text/mupdf/files/mupdf-1.18.0-darwin.patch
@@ -0,0 +1,41 @@
+--- a/Makerules
++++ b/Makerules
+@@ -117,11 +117,11 @@ ifeq ($(OS),MINGW)
+ else ifeq ($(OS),MACOS)
+   HAVE_GLUT := yes
+   SYS_GLUT_CFLAGS := -Wno-deprecated-declarations
+-  SYS_GLUT_LIBS := -framework GLUT -framework OpenGL
+-  CC = xcrun cc
+-  AR = xcrun ar
+-  LD = xcrun ld
+-  RANLIB = xcrun ranlib
++  SYS_GLUT_LIBS ?= -framework GLUT -framework OpenGL
++  CC ?= xcrun cc
++  AR ?= xcrun ar
++  LD ?= xcrun ld
++  RANLIB ?= xcrun ranlib
+ 
+ else ifeq ($(OS),Linux)
+   HAVE_OBJCOPY := yes
+--- a/Makerules
++++ b/Makerules
+@@ -122,9 +122,7 @@ else ifeq ($(OS),MACOS)
+   AR ?= xcrun ar
+   LD ?= xcrun ld
+   RANLIB ?= xcrun ranlib
+-
+-else ifeq ($(OS),Linux)
+-  HAVE_OBJCOPY := yes
++endif
+ 
+   ifeq ($(shell $(PKG_CONFIG) --exists freetype2 && echo yes),yes)
+ 	SYS_FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
+@@ -197,8 +195,6 @@ else ifeq ($(OS),Linux)
+ 	PTHREAD_LIBS := -lpthread
+   endif
+ 
+-endif
+-
+ # The following section has various cross compilation configurations.
+ #
+ # Invoke these as:
diff --git a/app-text/mupdf/mupdf-1.18.0-r3.ebuild b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
index 21ae5eb3fcf4..db2b4ba6fd92 100644
--- a/app-text/mupdf/mupdf-1.18.0-r3.ebuild
+++ b/app-text/mupdf/mupdf-1.18.0-r4.ebuild
@@ -8,18 +8,17 @@ inherit desktop flag-o-matic toolchain-funcs xdg
 DESCRIPTION="A lightweight PDF viewer and toolkit written in portable C"
 HOMEPAGE="https://mupdf.com/ https://git.ghostscript.com/?p=mupdf.git"
 SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
-S="${WORKDIR}/${P}-source"
+S="${WORKDIR}"/${P}-source
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 x86"
-IUSE="+javascript libressl opengl ssl X"
+IUSE="+javascript opengl ssl X"
 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="
 	dev-libs/gumbo
 	media-libs/freetype:2=
@@ -30,21 +29,20 @@ RDEPEND="
 	virtual/jpeg
 	javascript? ( >=dev-lang/mujs-1.0.7:= )
 	opengl? ( >=media-libs/freeglut-3.0.0 )
-	ssl? (
-		libressl? ( >=dev-libs/libressl-3.1.4:0= )
-		!libressl? ( >=dev-libs/openssl-1.1:0= )
-	)
+	ssl? ( >=dev-libs/openssl-1.1:0= )
 	X? (
 		x11-libs/libX11
 		x11-libs/libXext
 	)
 "
 DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.15-CFLAGS.patch
 	"${FILESDIR}"/${PN}-1.18-Makefile.patch
 	"${FILESDIR}"/${PN}-1.10a-add-desktop-pc-xpm-files.patch
+	"${FILESDIR}"/${PN}-1.18.0-darwin.patch
 	# See bugs #662352
 	"${FILESDIR}"/${PN}-1.15-openssl-x11.patch
 	# General cross fixes from Debian (refreshed)
@@ -69,14 +67,12 @@ src_prepare() {
 		-e "1iAR = $(tc-getAR)" \
 		-e "1iverbose = yes" \
 		-e "1ibuild = debug" \
-		-e "1iprefix = ${ED}/usr" \
-		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
-		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
 		-i Makerules || die
 }
 
 _emake() {
 	# When HAVE_OBJCOPY is yes, we end up with a lot of QA warnings.
+	#
 	# Bundled libs
 	# * General
 	# Note that USE_SYSTEM_LIBS=yes is a metaoption which will set to upstream's
@@ -100,19 +96,24 @@ _emake() {
 	#
 	# [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=$(usex javascript) \
-		USE_SYSTEM_GLUT=no \
-		HAVE_OBJCOPY=no \
+	local myemakeargs=(
+		GENTOO_PV=${PV}
+		HAVE_GLUT=$(usex opengl)
+		HAVE_LIBCRYPTO=$(usex ssl)
+		HAVE_X11=$(usex X)
+		USE_SYSTEM_LIBS=yes
+		USE_SYSTEM_MUJS=$(usex javascript)
+		USE_SYSTEM_GLUT=no
+		HAVE_OBJCOPY=no
 		"$@"
+	)
+
+	emake "${myemakeargs[@]}"
 }
 
 src_compile() {
+	tc-export PKG_CONFIG
+
 	_emake XCFLAGS="-fPIC"
 }
 
@@ -124,6 +125,12 @@ src_install() {
 		rm docs/man/${PN}.1 || die
 	fi
 
+	sed -i \
+		-e "1iprefix = ${ED}/usr" \
+		-e "1ilibdir = ${ED}/usr/$(get_libdir)" \
+		-e "1idocdir = ${ED}/usr/share/doc/${PF}" \
+		-i Makerules || die
+
 	_emake install
 
 	dosym libmupdf.so.${PV} /usr/$(get_libdir)/lib${PN}.so
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index 276880d741e6..2c82322e7b54 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -11,5 +11,5 @@ AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4
 AUX openjade-1.3.2-wchar_t-uint.patch 496 BLAKE2B 0576cdd89a5d9c187eba41f740662d2d5e9ba5414ab931583f1e791ceae948e381e558f8337399e6b853573388041288d0f42d7c45e1f34befb8d65bfa8b03b7 SHA512 e483c08b6ea63e78dfc6351670f7bb6a55927f458c6e922c542981b25389168f32eb79e16554a41c102b19b7fa12489c0303beb35b839dfc9767b5ab9e5e1027
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
-EBUILD openjade-1.3.2-r9.ebuild 4375 BLAKE2B 78353a8803b959ca267c6fea1743a2c30a8692b99d1b46d93473dcbafcc555de39bba9537f46bc16a4f2c625fab04c7b12dd2654295bd496003d19159bd4b6a4 SHA512 c36552c1ed71751f5dd220fc5177e3086aedd37bdb5ba6d8609e28c64d97fa8c1123648885e4a9fd2cf24cba38d7c5730b285ec9d77182555c186dfa8f4317d2
+EBUILD openjade-1.3.2-r9.ebuild 4376 BLAKE2B 373c15c8fbe59e1a5c4024285f163fb92c6164911920eb24f84785668d4623a916f71d08e57af3211affb9ddb3ecd43d30df035bbf3c1629dd00a7b2a7d1a563 SHA512 c7acb761cd576935dd42ef109a88858664fd619e76b3a25f1613d63cc42e1fa26ae30d3a48f9adeefdcab5bfd2e1501a902d44722cee8439bbd96d42d1e7e262
 MISC metadata.xml 325 BLAKE2B 3cecdaaecd44faf19571367fbe80cb75e687e6231c26c696cc9e7412aae427b95a4967cad7415b9df5e499bdb74c6b6fed54edc52470ff207cbba43e423ae223 SHA512 4e1e28e8c1722c9bcbbc2a8487ad373eff6679f51a5213850e11ce2d7d569afbaa093d215965e4fc010a9fa3e80121949a3db9fb98bfaf8ab70eafead9e14657
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index 407f7b7a435b..caab0f225c9e 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index 3a7b441f568a..feb2d4479baf 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -2,6 +2,6 @@ AUX opensp-1.5-gcc34.patch 263 BLAKE2B f881932f2d35c87a13b28608efe853c54e3dd4608
 AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d96bf5b2f645d2d6706e82ae1767a99fed8f6ca4bd4f1abbc24bf80c4fa00d848f03056b01ac98f5b8a74d3a78c4467 SHA512 dea5fe17ea2662150b201ab6011bb01ba0f0c07689d267ec4086a914cefef3e91967f8db4be0258bac87d3cd73a9b05eb1f879415860552d9853e66e98e16e11
 AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
 DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
-EBUILD opensp-1.5.2-r3.ebuild 1996 BLAKE2B bca31a777164cf72923d05914b2529b11b3b9dd44a2f484b7bfd57c6c5eacafc609aafceefb573e5a6240866c2dd33980c6c9b220e8c868145924088a6bd386c SHA512 b77c93d4e06f1437c0e8ed331b5ea7f8e6c6cbd6b22bd43859752ebf7212882edc2bd53e8097cb246281353066fcf334e5f0aa84e69f848c41f3542b9c4114fe
-EBUILD opensp-1.5.2-r6.ebuild 2089 BLAKE2B 2de671b2e690a7058d9955181ce2229e230bb1f2af2dceec8f56eb227be6eefea6a56baa44fe06985fc0357cac0013ad6722172a37b3ba379f34adf271f29195 SHA512 e68b5888f0351cf4921187dbb8b7247785ba040f3096afebd03f2a12b7d9253fc30915dd4ee08fd183518883259862ac49baadb3c78b03c789f2cf217e9fa19b
+EBUILD opensp-1.5.2-r3.ebuild 1997 BLAKE2B fb86230e25fcfb1da28cb366330c7e002ccf63f7c09ba29521733277f92e1d6b2883e6ddacffa75a319f81971db674568c389e5ebc419ba8b5cf5b80364a7fbf SHA512 a02ce69196eaa5f517baebce96ae0e4156d806611122e78571c1eeb01eac7312b8ae19d31652ca81b4130faa3853e6d5e86a4c651e54fbd779813c1d8a99def9
+EBUILD opensp-1.5.2-r6.ebuild 2089 BLAKE2B a13a6fa5c43f2f4837c3b719be27f646eed911d3b4e61eb2a2620a34b16b0b24d9ffc09847997fa516e70e0b589beffc451cf5f7b5c048bca1271a96a1dcde0f SHA512 b8147e133e54c00b1fbe68572597e1c8e483b431411768614928fd1223c80d1fa81d0347fc0e7a947da6602a085c4f7e7eb9b59519f0ce6e3d037d9967d9c260
 MISC metadata.xml 320 BLAKE2B b93835e4e002171464888c0ad80df13fa041436cd16525da0bac6087af3013b8c43bbcc2a12e6924894ea65ef141c6e739ca38f914af7e83910b85a4f6700547 SHA512 8614ddb85153854eee8f3a61e308a4590b17bd457f1dcc813fdad1f69265a06f4f74295a608538fcee757e147af9b269adf3d0dafc0e613a936e5e605bedacf4
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
index 1fb1a96f4000..79b03eac29a5 100644
--- a/app-text/opensp/opensp-1.5.2-r3.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils flag-o-matic ltprune
+inherit epatch flag-o-matic ltprune
 
 MY_P=${P/opensp/OpenSP}
 
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
index a3c57f7e1b2c..ea411e191909 100644
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r6.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-inherit eutils flag-o-matic autotools ltprune
+inherit epatch flag-o-matic autotools ltprune
 
 MY_P=${P/opensp/OpenSP}
 
diff --git a/app-text/pandoc/Manifest b/app-text/pandoc/Manifest
index a0280f082d9f..7b2f1e69d1bb 100644
--- a/app-text/pandoc/Manifest
+++ b/app-text/pandoc/Manifest
@@ -1,5 +1,7 @@
 DIST pandoc-2.11.3.1.tar.gz 12924767 BLAKE2B e8e99e3993363730d7e048926754f29b0f8a3e61278efeadd549c45d7434ff627f701bbe5d54203a6592bc12fe0086b107d82e552c3b5e60f5f20afd65ecdae6 SHA512 a1e4b0a598c56b892e95d0c129717b0c56071fe6614583171bf7b661a8c02221cff8927f1a1a6b375236b563cc9585684de1d4eeb2514e81722866c29260fb5e
+DIST pandoc-2.13.tar.gz 12959060 BLAKE2B 78079d6805d8e1d84f73fd67c3802c2f202523b8e672204b69c6c9aa95e8c003588dbe158db506921bd6444c35aa4b0a8417bb317661fa889c8516cdae96197b SHA512 c894f59e7ff57603fd6a60d11880b9fd6d6e206247346f77070b176fed6f359b3d5a5ba984803717ac4a4e5c038ad0912513da091d4b8672df63af17d21627a8
 DIST pandoc-2.9.2.1.tar.gz 12586844 BLAKE2B 298cafc88c33f461e6724cb60f4462398ab6a484eb4fcd598a488f4d599abc09f5e85faf16cc4da5c7cfc2274fb2ed1acf5cf9450bcc83c2ec810badfb7d6380 SHA512 35ac491a7e0a2f6d8fe0f2c2ffe265748b13920904e974f88c92b3f82edb2f1c03e28ebef1bc344ead13d566117a5e50707a68edc49f95159157f974210b23b2
 EBUILD pandoc-2.11.3.1.ebuild 6170 BLAKE2B 097a59b21710bb75bb17f3d93cca07918a041eecc9517d0e8476c44af174f5f6b227d9bc9065d705b552841a12d3068c40e0ac9a64bb36c9c0ee2a0988df3fb5 SHA512 5a2a9266d3285952688af54ed71f7d34eeb0612cf2c1b0d147597132e3393411edc73393759f5389496378d66b27d2e3e5241dcf920121bde8f750486ae9a21c
+EBUILD pandoc-2.13.ebuild 6269 BLAKE2B 27c7f4940615776bc0d14a50abf29d0c8bd216c45719ac3e9421394a078713f88c26a15bf9396dbeb2ae6679b20fd8e7a8672258d3145f809fca9a4349008712 SHA512 fe3008919f24d5a93019d7fec07082a58ed7a7fcd9a0333e3536199d4a45311fcb24803e3ccc5692ad8c466ec80fc8d28b776d9f6c313dec5f4388a8d6e86879
 EBUILD pandoc-2.9.2.1.ebuild 6088 BLAKE2B 156eb7fda9f1824886d8d484db802dd645601abe0514fadc21e359ee0f8bb02f4b0ad7ba1c1d77d7e662f9fdda45de16b91ab9f756d383c5e95b2f48811132c5 SHA512 a600bad2ecb5b8b497cc1041685a1b4c98d20cfe9347cec12e5679d197dbcb5b70aa70a42e03f4cd48252713b3a669475bc0d82d076afe3454b9f2e00c5e5e59
 MISC metadata.xml 941 BLAKE2B 04e284ba78b78c6a88999705ce10650fbe854fd5154bc197b938de1e7b12689382c0c19b04c522366fb51c50f7f0b03d7cdb875ee6840816613bfc96f7d1d7c6 SHA512 2cb5cdae868ec8345655e18303a9fe1bae9c4eef4ee2b2da3f302b2e520af70095f06f78cbf0de1cbed524ddccb43742a73a5ce0e3710876ce83d25f4f19f77f
diff --git a/app-text/pandoc/pandoc-2.13.ebuild b/app-text/pandoc/pandoc-2.13.ebuild
new file mode 100644
index 000000000000..72c73a65465f
--- /dev/null
+++ b/app-text/pandoc/pandoc-2.13.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.7.9999
+#hackport: flags: -static
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Conversion between markup formats"
+HOMEPAGE="https://pandoc.org"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="embed-data-files optimize trypandoc"
+
+# test failure: error while loading shared libraries:
+# libHSpandoc-2.9.2.1-FD5JyeIDy0ZA6c46md2bYO-ghc8.8.3.so:
+# cannot open shared object file: No such file or directory
+RESTRICT=test
+
+RDEPEND=">=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.6:=[profile?]
+	>=dev-haskell/aeson-pretty-0.8.5:=[profile?] <dev-haskell/aeson-pretty-0.9:=[profile?]
+	>=dev-haskell/attoparsec-0.12:=[profile?] <dev-haskell/attoparsec-0.14:=[profile?]
+	>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.3:=[profile?]
+	>=dev-haskell/blaze-html-0.9:=[profile?] <dev-haskell/blaze-html-0.10:=[profile?]
+	>=dev-haskell/blaze-markup-0.8:=[profile?] <dev-haskell/blaze-markup-0.9:=[profile?]
+	>=dev-haskell/case-insensitive-1.2:=[profile?] <dev-haskell/case-insensitive-1.3:=[profile?]
+	>=dev-haskell/citeproc-0.3.0.9:=[profile?] <dev-haskell/citeproc-0.3.1:=[profile?]
+	>=dev-haskell/commonmark-0.1.1.3:=[profile?] <dev-haskell/commonmark-0.2:=[profile?]
+	>=dev-haskell/commonmark-extensions-0.2.0.4:=[profile?] <dev-haskell/commonmark-extensions-0.3:=[profile?]
+	>=dev-haskell/commonmark-pandoc-0.2:=[profile?] <dev-haskell/commonmark-pandoc-0.3:=[profile?]
+	>=dev-haskell/connection-0.3.1:=[profile?]
+	>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.8:=[profile?]
+	>=dev-haskell/doclayout-0.3.0.1:=[profile?] <dev-haskell/doclayout-0.4:=[profile?]
+	>=dev-haskell/doctemplates-0.9:=[profile?] <dev-haskell/doctemplates-0.10:=[profile?]
+	>=dev-haskell/emojis-0.1:=[profile?] <dev-haskell/emojis-0.2:=[profile?]
+	>=dev-haskell/exceptions-0.8:=[profile?] <dev-haskell/exceptions-0.11:=[profile?]
+	>=dev-haskell/file-embed-0.0:=[profile?] <dev-haskell/file-embed-0.1:=[profile?]
+	>=dev-haskell/glob-0.7:=[profile?] <dev-haskell/glob-0.11:=[profile?]
+	>=dev-haskell/haddock-library-1.8:=[profile?] <dev-haskell/haddock-library-1.10:=[profile?]
+	>=dev-haskell/hslua-1.1:=[profile?] <dev-haskell/hslua-1.4:=[profile?]
+	>=dev-haskell/hslua-module-path-0.1.0:=[profile?] <dev-haskell/hslua-module-path-0.2.0:=[profile?]
+	>=dev-haskell/hslua-module-system-0.2:=[profile?] <dev-haskell/hslua-module-system-0.3:=[profile?]
+	>=dev-haskell/hslua-module-text-0.2.1:=[profile?] <dev-haskell/hslua-module-text-0.4:=[profile?]
+	>=dev-haskell/hsyaml-0.2:=[profile?] <dev-haskell/hsyaml-0.3:=[profile?]
+	>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.4:=[profile?]
+	>=dev-haskell/http-client-0.4.30:=[profile?] <dev-haskell/http-client-0.8:=[profile?]
+	>=dev-haskell/http-client-tls-0.2.4:=[profile?] <dev-haskell/http-client-tls-0.4:=[profile?]
+	>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.13:=[profile?]
+	>=dev-haskell/ipynb-0.1:=[profile?] <dev-haskell/ipynb-0.2:=[profile?]
+	>=dev-haskell/jira-wiki-markup-1.3.4:=[profile?] <dev-haskell/jira-wiki-markup-1.4:=[profile?]
+	>=dev-haskell/juicypixels-3.1.6.1:=[profile?] <dev-haskell/juicypixels-3.4:=[profile?]
+	>=dev-haskell/mtl-2.2:=[profile?] <dev-haskell/mtl-2.3:=[profile?]
+	>=dev-haskell/network-2.6:=[profile?]
+	>=dev-haskell/network-uri-2.6:=[profile?] <dev-haskell/network-uri-2.7:=[profile?]
+	>=dev-haskell/pandoc-types-1.22:=[profile?] <dev-haskell/pandoc-types-1.23:=[profile?]
+	>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
+	>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.3:=[profile?]
+	>=dev-haskell/safe-0.3.18:=[profile?] <dev-haskell/safe-0.4:=[profile?]
+	>=dev-haskell/scientific-0.3:=[profile?] <dev-haskell/scientific-0.4:=[profile?]
+	>=dev-haskell/sha-1.6:=[profile?] <dev-haskell/sha-1.7:=[profile?]
+	>=dev-haskell/skylighting-0.10.5:=[profile?] <dev-haskell/skylighting-0.10.6:=[profile?]
+	>=dev-haskell/skylighting-core-0.10.5:=[profile?] <dev-haskell/skylighting-core-0.10.6:=[profile?]
+	>=dev-haskell/split-0.2:=[profile?] <dev-haskell/split-0.3:=[profile?]
+	>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.8:=[profile?]
+	>=dev-haskell/tagsoup-0.14.6:=[profile?] <dev-haskell/tagsoup-0.15:=[profile?]
+	>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.4:=[profile?]
+	>=dev-haskell/texmath-0.12.2:=[profile?] <dev-haskell/texmath-0.12.3:=[profile?]
+	>=dev-haskell/text-1.1.1.0:=[profile?] <dev-haskell/text-1.3:=[profile?]
+	>=dev-haskell/text-conversions-0.3:=[profile?] <dev-haskell/text-conversions-0.4:=[profile?]
+	>=dev-haskell/unicode-transforms-0.3:=[profile?] <dev-haskell/unicode-transforms-0.4:=[profile?]
+	>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
+	>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
+	>=dev-haskell/xml-conduit-1.7:=[profile?] <dev-haskell/xml-conduit-1.10:=[profile?]
+	>=dev-haskell/zip-archive-0.2.3.4:=[profile?] <dev-haskell/zip-archive-0.5:=[profile?]
+	>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.7:=[profile?]
+	>=dev-lang/ghc-8.4.3:=
+	trypandoc? ( >=dev-haskell/wai-0.3:=[profile?]
+			>=dev-haskell/wai-extra-3.0.24:=[profile?] )
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-2.2.0.1
+	test? ( >=dev-haskell/diff-0.2 <dev-haskell/diff-0.5
+		>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.15
+		>=dev-haskell/tasty-0.11 <dev-haskell/tasty-1.5
+		>=dev-haskell/tasty-golden-2.3 <dev-haskell/tasty-golden-2.4
+		>=dev-haskell/tasty-hunit-0.9 <dev-haskell/tasty-hunit-0.11
+		>=dev-haskell/tasty-lua-0.2 <dev-haskell/tasty-lua-0.3
+		>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.11 )
+"
+
+src_prepare() {
+	default
+	# optimisations require ~16GB of memory on ghc-8.8.3
+	use optimize || HCFLAGS+=' -O0'
+}
+
+src_configure() {
+	haskell-cabal_src_configure \
+		$(cabal_flag embed-data-files embed_data_files) \
+		--flag=-static \
+		$(cabal_flag trypandoc trypandoc)
+}
+
+src_install() {
+	haskell-cabal_src_install
+
+	doman "${S}/man/${PN}.1"
+}
diff --git a/app-text/paps/Manifest b/app-text/paps/Manifest
index f51f77ac5630..1db9d88fc223 100644
--- a/app-text/paps/Manifest
+++ b/app-text/paps/Manifest
@@ -1,7 +1,7 @@
-AUX paps-0.6.8-fix-as-needed-build.patch 1051 BLAKE2B 5e610295f72421e1a0c31388a5f49897c74abd0dcf9ab1345579b37b085543ab09c7fa88b2240d78c8a3d7db77fa170c24899dce5c2f30385458b00cf6bb265d SHA512 943a2e2d267cf339cc3958ae5622fb4f8c3cd25fca63fa6c91c5b37c34e833dbdaf3a11e038d00b23a44fc590a268729941fee790f9f513f0532f9c339141695
-AUX paps-0.6.8-fix-doxygen-acinclude.patch 699 BLAKE2B c0aa64dfd7eec7e909debd8444c8ad2490d606e3922fc1be141d3b30d314310236f886f79032a987a7cc149c50c558471c61480f33b0ed2787474eb740930267 SHA512 b3c0949e7b6579cd3c3f82692ca2e0e9479bf435cc99b8c9c71e1842e32bccd9a79c2c199541ced21812ebf5cfc0887304511aa7cd1d4eba4bb2d476c4710b7b
-AUX paps-0.6.8-fix-empty-file.patch 558 BLAKE2B 10b0726c8f788ec6e21172ec7529b2aa9e7b4412166b4b9f4b4ded5b1833045f9753c3606a4348cd529ec4317cdf6bb702429e6e0cf7a5a98f87aa7cc2cb7711 SHA512 19d28f75664a7a626564176c223df77445710d7a941d145046dfdc5697dbacab25b60329e3ddda4f7ef6dcb5c1b4f14ad5641d190d83b8a17ddfa76bfb934a01
-AUX paps-0.6.8-fix-freetype-include.patch 323 BLAKE2B 75d4030616e2efee60d1928404bb67fa9cb6ff42d9183d3c6785d1ce18c110000195962a1f5514c0d7678855a5ac179cd7d505888ae5bcfc637aa9faf3919c45 SHA512 1ace4c661972853390feaf3f4a123416a6847b5d969017884df75561255a487c0c1e0adf37a1904f17c6855996a2edb0a5e388c996d31224f713bdba9425b287
+AUX paps-0.6.8-fix-as-needed-build.patch 1015 BLAKE2B 0ec2c1e0594316ceb94bb8772c62f864d0349a660cb940f494fef1e0d48bb1b2bb5aef43aa8a2ba014d9228a461279c94f24c91378aa8f6932c1a0c5164cf0da SHA512 0cd096ad6cc4ef38ef780a1f71f65876a8e05cc21a5e5c0a6a6dc73f2ec44ae7a2a183c5bdaa1b11162a0420282729bf4e797e47bad99f274e5d25b798d9a867
+AUX paps-0.6.8-fix-doxygen-acinclude.patch 681 BLAKE2B 4ce6ef7d0dbd216b226befd4debe37e452e813a87e37442f7f790735864f1bd2f08375e6ee041064638b08eadc250d12566b2c8b197e9c80c26043375310bf7c SHA512 6f494a671ff279cbc2e799b5bb5ce0a4c0228f7c6fe290aec71120ed9c67fcaeb6a24910d8fb9eb79d6f5f99a14ffeba4e5977a3f7586067d4a86221ab54acdf
+AUX paps-0.6.8-fix-empty-file.patch 540 BLAKE2B e27efd1b2e0d5131662f601babedf9343a052679feb1a6b0b52e40127f99ca2612a0f851b1be33a698c0f76a6739e3dce63c16457a3df227e1ad3fbe039f3784 SHA512 b99e4562a53d753d130d73dd70716df47244529e1875260b417030934f9d88f9b99fd0e2c4b231f72a372d80cc7e64ff8ad1b91a6a71475e8557f3eb6ecf2609
+AUX paps-0.6.8-fix-freetype-include.patch 305 BLAKE2B eb2c989ffe9c245baac91916c0887cfe91124748e58b0e9c7c74b46c171897fee493e05ec6a789fda42d04ad2f7bed11462cb611a59bb94c0653a3693eefdb3d SHA512 9436c5b426f0f97158b3c4ac63d193f19d169b4179080c6ff483335d5d68df2fbf89dc968a9f1d51c75b1aa70efcdbcd0a9758ca84c25e9e787587323564bdc6
 DIST paps-0.6.8.tar.gz 460062 BLAKE2B 8ca34cd217a5ed26de80a1e35f5cb05d75c291a966923ddcf73fb8a6db1a3823075c480c876cff932757feb3a4767057d269bac0863236df0b513e246726b01b SHA512 db657d90179e11fe42bbcdbebe09a84f1927c99d0b539c9e29b66b3cb8ffcf33ff500c9d81835ae5a0880382bf8f24801f04742517b76b8e005b125a139d8bba
-EBUILD paps-0.6.8-r2.ebuild 777 BLAKE2B 9f025ffddc995a851fb48ca6ec2e3f72845df836cb6757f2074ad35ef7d03129b9088c1618c372331894595e1eadd72c8dbab7f719aeaba573dcfec2e6edc74d SHA512 bfccabf0ecdea578b095022acd26280ff4d2ed9cdcc342787169dbc6d6040dc13221ee4d6c36ccc756645de785b75b48307437db5aab2d28f7445d6fba0f754c
+EBUILD paps-0.6.8-r2.ebuild 770 BLAKE2B f7ae236fb6335efb674f188c8e52536a618eb9eff3361c197eaed6b1f65dfd24574d1834f76d724354b7cd16b1485df00b52a5fc3422bbb27b89a8629d89c9d1 SHA512 51d3c392d91ef2b30723ca0e461c314121aba15b574ba479610f2d4aca9b05435b3474bcafc3681dfe7146032a56b4fb22c4f9ccfb2cc81e23eeb12c4e96a777
 MISC metadata.xml 241 BLAKE2B d711ad02c7fdc064fbef09dafb39412c4af3ddc374f88bc1ed8ba1812a9d07c1a948592632a58bd059f8d476c1ad86ce575587c0045c94a9c5134432021ab1f6 SHA512 8eb60a6869898218688205e0915f7aef34bd3639d6ed8e3303c19ade6ead67bc15ae781bd5856214d8ee0d69bbd80682013b68750bfd73f125c45a5ea0fdc9cb
diff --git a/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch b/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch
index ec4ba8b2b180..d4bb69e39730 100644
--- a/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch
+++ b/app-text/paps/files/paps-0.6.8-fix-as-needed-build.patch
@@ -1,5 +1,5 @@
---- paps-0.6.8/configure.in
-+++ paps-0.6.8/configure.in
+--- a/configure.in
++++ b/configure.in
 @@ -18,4 +18,6 @@
  
  DX_INIT_DOXYGEN(libpaps, doxygen.cfg, doxygen-doc)
@@ -7,8 +7,8 @@
 +PKG_CHECK_MODULES([PANGO], [pangoft2])
 +
  AC_OUTPUT(Makefile src/Makefile)
---- paps-0.6.8/src/Makefile.am
-+++ paps-0.6.8/src/Makefile.am
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -7,21 +7,19 @@
  bin_PROGRAMS = paps
  paps_CFLAGS  = -Wall 
diff --git a/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch b/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch
index baba74b4b8bb..449e776f5e6b 100644
--- a/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch
+++ b/app-text/paps/files/paps-0.6.8-fix-doxygen-acinclude.patch
@@ -1,5 +1,5 @@
---- paps-0.6.8/acinclude.m4
-+++ paps-0.6.8/acinclude.m4
+--- a/acinclude.m4
++++ b/acinclude.m4
 @@ -78,7 +78,7 @@
  AC_PATH_TOOL([$1], [$2])
  if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then
diff --git a/app-text/paps/files/paps-0.6.8-fix-empty-file.patch b/app-text/paps/files/paps-0.6.8-fix-empty-file.patch
index ae334d1d28c0..2c83abf8d576 100644
--- a/app-text/paps/files/paps-0.6.8-fix-empty-file.patch
+++ b/app-text/paps/files/paps-0.6.8-fix-empty-file.patch
@@ -1,7 +1,7 @@
 https://bugs.gentoo.org/show_bug.cgi?id=566050#c2
 
---- paps-0.6.8/src/paps.c
-+++ paps-0.6.8/src/paps.c
+--- a/src/paps.c
++++ b/src/paps.c
 @@ -569,11 +569,14 @@
  
    fclose (file);
diff --git a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
index ab97d22a2957..7504b66f6693 100644
--- a/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
+++ b/app-text/paps/files/paps-0.6.8-fix-freetype-include.patch
@@ -1,5 +1,5 @@
---- paps-0.6.8/src/libpaps.c
-+++ paps-0.6.8/src/libpaps.c
+--- a/src/libpaps.c
++++ b/src/libpaps.c
 @@ -25,8 +25,9 @@
  
  #include <pango/pango.h>
diff --git a/app-text/paps/paps-0.6.8-r2.ebuild b/app-text/paps/paps-0.6.8-r2.ebuild
index 3b8795277278..bf4df11e9b57 100644
--- a/app-text/paps/paps-0.6.8-r2.ebuild
+++ b/app-text/paps/paps-0.6.8-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
 DESCRIPTION="Unicode-aware text to PostScript converter"
 HOMEPAGE="http://paps.sourceforge.net/"
@@ -12,18 +12,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 RDEPEND="x11-libs/pango"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-as-needed-build.patch
+	"${FILESDIR}"/${P}-fix-doxygen-acinclude.patch
+	"${FILESDIR}"/${P}-fix-freetype-include.patch
+	"${FILESDIR}"/${P}-fix-empty-file.patch
+)
 
 src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-fix-as-needed-build.patch \
-		"${FILESDIR}"/${P}-fix-doxygen-acinclude.patch \
-		"${FILESDIR}"/${P}-fix-freetype-include.patch \
-		"${FILESDIR}"/${P}-fix-empty-file.patch
+	default
 
 	mv configure.in configure.ac || die
 
diff --git a/app-text/pdfarranger/Manifest b/app-text/pdfarranger/Manifest
index e5ea0adf32f2..f740e17807f8 100644
--- a/app-text/pdfarranger/Manifest
+++ b/app-text/pdfarranger/Manifest
@@ -1,5 +1,7 @@
 DIST pdfarranger-1.6.2.tar.gz 197726 BLAKE2B aee8ee7d32603f20bc01d9f5f77290390e8a038bf79e3c4f689a71ec1c3e454784b2225b43d33bdfd7897785827141cfe1770dcf41d233c4ec1f3865d6f1e3c0 SHA512 610c4dfaa141cfb8caebfc72b524cda05455ed4a5c1e336772655bd02ceac25fafedb439dbe83e87c88da189147eaf91149e9af92ec745a52f8a24fcee5fd390
 DIST pdfarranger-1.7.0.tar.gz 236125 BLAKE2B f16eb23fb597a22a48f075ee6435c74d51a4c45d35e03ec02b2b2353c29ad327f36f6af9ef028ddc53777ecae069e62437728308cda2a6296bd520c2a54e1220 SHA512 8f3c804119d5e4aa78cdae1964757be3404977a68dacccddea0e3e598c531a0ae163567709358ccd60764bebf3a55b5ed1bfbd2e0392c97569ffd9a18f549552
-EBUILD pdfarranger-1.6.2.ebuild 1210 BLAKE2B add4dbd20ef2ab4ae3adb5a897caf7518f1386d39f40e269091d1458e75c9dcb9e0fe7368930d93ab73d8addb83cca9cd35ecd3e0adbf3632b6c481df100a9ab SHA512 c339eee94ffd0f148929aadc8b8fe9cb8992de7d6fd63e5613357231bcae2f1b5b332ae07e0f6653e5392d9d2977a45c508c69422ea7adb88500cb1c57ce65c3
-EBUILD pdfarranger-1.7.0.ebuild 1257 BLAKE2B 8e856a971701383e1b87659ca4d58536d5cf784e026bdb650da55fb5779dd9d986fb2d26dbaeb4576cfcc1fc377c96a6b7f46f12973d7bb83a519f2ed32746b2 SHA512 dfa96ffa5b413423fcdbd5870358dd1d4abe8002a2c8f3e5b6063ee2b1e00c560f3bae2d7b7fc19e239ed0967d9a85b75a7666d488ae54e61582c6ebb3092486
+DIST pdfarranger-1.7.1.tar.gz 236699 BLAKE2B b82a1f2309cc326bfba33458aaccee5396597a5c937c67baba767632cadddfae4f7ad21e0c86300c889f8e6d5f7dba9c6483b11bc97c83077e5ab01596b76617 SHA512 1adb5700b6497db95c3f727d1c18fc7b98ecc382cf15bc58bb7ce784d094e0d8cd45a26241e06a593eeb7601aa9f32ebba7d7f0f3a816e9384be09102eb0b4db
+EBUILD pdfarranger-1.6.2.ebuild 1181 BLAKE2B 2f3f1827d02af9eed5587c43fa5b7d258e133b6a9327af7946802aaa7534ce39f0736e6bd8d8888c130aebc0bf202c9e4b010f37c99a072c0b33884f931f3984 SHA512 94df39c54df6bd282bec95eab6387920dbe9369523e41201a3cf429e6f4752b5d81de314792e2d6ef02eb42a89d04d9cec33c523a2dc08bf436ce3d836422c50
+EBUILD pdfarranger-1.7.0.ebuild 1228 BLAKE2B 524cc35596c197b90edfd09a056f9b2a02c0cc0df0e5670aa5e7d9f6c7631bcf0055bc28ed5116b6772ffee1520869e76239148f253700880dd76dcbd3878282 SHA512 f96dbb70bd6179b45ea2370c0fb9f760c9bcc7a27fe4c9374cebc54c4f63c08484d22aec03f383bc9d037c0551fd2ba7ce89bfbbf5e657c45f709f542bea3a60
+EBUILD pdfarranger-1.7.1.ebuild 1228 BLAKE2B 524cc35596c197b90edfd09a056f9b2a02c0cc0df0e5670aa5e7d9f6c7631bcf0055bc28ed5116b6772ffee1520869e76239148f253700880dd76dcbd3878282 SHA512 f96dbb70bd6179b45ea2370c0fb9f760c9bcc7a27fe4c9374cebc54c4f63c08484d22aec03f383bc9d037c0551fd2ba7ce89bfbbf5e657c45f709f542bea3a60
 MISC metadata.xml 622 BLAKE2B 5a11cb38ad122bd2408a114cfdd40e3a0ebd3cc897ede128cc7c5fd55df8c566d0cd342573bac3352f501fa935c293b890b71736d0ecaf7e5e5c2e25fac74418 SHA512 15cfc342f5df485547c0691362e3dcb5e4820158db143452b5439969325fe798dbad02f5ec50379bedae732a42163086e26c5b7472aab804af2c99df25611912
diff --git a/app-text/pdfarranger/pdfarranger-1.6.2.ebuild b/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
index 0e0d68ad79c3..628b8bc4e6f5 100644
--- a/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
+++ b/app-text/pdfarranger/pdfarranger-1.6.2.ebuild
@@ -36,7 +36,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Optional dependency:"
 	optfeature "image file import" media-gfx/img2pdf
 
 	xdg_desktop_database_update
diff --git a/app-text/pdfarranger/pdfarranger-1.7.0.ebuild b/app-text/pdfarranger/pdfarranger-1.7.0.ebuild
index 5c9c23369e9e..7fe6453a815f 100644
--- a/app-text/pdfarranger/pdfarranger-1.7.0.ebuild
+++ b/app-text/pdfarranger/pdfarranger-1.7.0.ebuild
@@ -37,7 +37,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "Optional dependency:"
 	optfeature "image file import" media-gfx/img2pdf
 
 	xdg_desktop_database_update
diff --git a/app-text/pdfarranger/pdfarranger-1.7.1.ebuild b/app-text/pdfarranger/pdfarranger-1.7.1.ebuild
new file mode 100644
index 000000000000..7fe6453a815f
--- /dev/null
+++ b/app-text/pdfarranger/pdfarranger-1.7.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 optfeature xdg-utils desktop
+
+DESCRIPTION="Merge or split pdfs; rearrange, rotate, crop pages."
+HOMEPAGE="https://github.com/jeromerobert/pdfarranger"
+SRC_URI="https://github.com/jeromerobert/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND="
+	app-text/poppler[introspection,cairo]
+	dev-python/pikepdf[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP},cairo]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]
+	x11-libs/pango[introspection]
+"
+DEPEND="${RDEPEND}
+	dev-python/python-distutils-extra[${PYTHON_USEDEP}]
+"
+
+src_install() {
+	distutils-r1_src_install
+	for x in 16 32 48 256 scalable
+	do doicon -s ${x} data/icons/hicolor/${x}*/*
+	done
+}
+
+pkg_postinst() {
+	optfeature "image file import" media-gfx/img2pdf
+
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_icon_cache_update
+	xdg_mimeinfo_database_update
+}
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
index 2c5b3f3caff4..88b9c763baa0 100644
--- a/app-text/pdfjam/Manifest
+++ b/app-text/pdfjam/Manifest
@@ -1,3 +1,3 @@
 DIST pdfjam_208.tgz 180725 BLAKE2B 903ce4f0874c9fc9ad23f3db37b882596589d6470dfe9289f65a72fb66ff843bbd49b52086d7b2d2cbbfb1b6406cbbda64d46b933a853d5d681ef88d4033372c SHA512 728c8d304c6d2af773980d20ef4a4be6e0a5dad286ad8cd00be9b1687f5024e00032a750c10c74dcd24431f081368d02b76f03cc5bb1c8725a060cd70be0fd8c
-EBUILD pdfjam-2.08-r1.ebuild 572 BLAKE2B 5704a26e0b2bb394b590fd20a4c41b1f27d74341eee9fd71c44cb4bef2459228dfa0c1af1969f9216328cdc978356bd9869abfea4df685044063132926b8495b SHA512 cb888787ef8024c46d627e9f391ebbbd249e1fe3f62950ccae1f80238808fc2ccb7d651da98a976ce14500639ac236ff16f820a21c8a8fa5f9496244618cd5b2
+EBUILD pdfjam-2.08-r1.ebuild 573 BLAKE2B cb7918265c468ed11535d0bf8e13b67410cdb8c1cbae98fd00e63e23b4a0e85342b34d7b1418d058a3d0cc27a85848d7cab39d73cba5e6500b69fb1b162c653b SHA512 8448f3d416835ce8c0c74f9806e2d53b32142f0f599b9407da3d9e5c38e66098411528aeae9e8fd3b5c9ef7c814a681b9f17c7ef548af5b3a85f97b43fa19638
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/pdfjam/pdfjam-2.08-r1.ebuild b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
index 692950ac5474..69826d88b34c 100644
--- a/app-text/pdfjam/pdfjam-2.08-r1.ebuild
+++ b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.warwick.ac.uk/go/pdfjam/${PN}_${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 S="${WORKDIR}"/${PN}
 
diff --git a/app-text/pep/Manifest b/app-text/pep/Manifest
index 218fd22f5246..1cf63850cdcd 100644
--- a/app-text/pep/Manifest
+++ b/app-text/pep/Manifest
@@ -1,5 +1,5 @@
 AUX pep-2.8-gentoo.patch 521 BLAKE2B f5dd34e1e46c40986b74e0707ce88fc2d98b6ffb8361af44c50f025696ee28fd60883faf0016b92b7f9dfab0eae0870a62a6e611ec1f727578944fee0241eba6 SHA512 f25ee35964b158dfaa22721f28f01ebcd90bca963a8564926c6050014c4104f9aaea5cf6594028d7700d8a13c95c336dbd95ea05fff9ba05245937a725d09ccc
 AUX pep-2.8-include.patch 239 BLAKE2B fd411d4e3753314ae93634bd24093524f364b1603671149722d31fb42e70977e3c97a76a2902a891aebd4e0f69632c5cd6da7996732195cf4a2d5005f5996fd4 SHA512 980ac8e710b2c0213c9ab6cb298274ca3eef21fdf9cd980e62530b98e913784cb5346fc13613b9723eaa6352383d31079d74749e21ac322edde86863344eff80
 DIST pep-2.8.zip 84665 BLAKE2B 529ce27e819e1f4aa683516b71e1b391169647dc477980db5e6f334559f265f6427d20043edf42047286c46724cba578a961a305bfecd24cd72692ebca061e6a SHA512 553efb3f6ca113d96313cfaa7efc7142e3f87d1eb746478aa5f112bb09d6e5d863cd8fa2a34d866777d6724b525d9b94a0978842afc6198fa70fe59c2a8d1169
-EBUILD pep-2.8-r2.ebuild 1056 BLAKE2B 55a4841927fb134f6875b02d4c022475225128b0ea8a8ae79d422c7cd27f1678c0e2fc871b94be00311c1d063679f188a4e9fa8f873323397680a5b3127bfaca SHA512 327fd2c41d1d63f2fd336955be8a4abfa84319ef2bea1161d57ce7c6c74b6edc5e9777f3ff9c4e95ae407d2451b0349972d64e9ad823756876ad9d2777f4106b
+EBUILD pep-2.8-r2.ebuild 1057 BLAKE2B 4b0b52565f875e31df68f775b223ecf6a5574140117be445e27c8dbf472f602c042bfea498e7b9673a86b44371b0bf1bbcdaa39108d2236d1786b3cb0f48c4a0 SHA512 97f82534ea09531b3d4e545fe75b09db35bd30151a3ca3d8d86cdb76b6e99429c220057f7267e7b1eaca9445174c6eea0d0d65a15f77b94bf9ca49182bc05f46
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/pep/pep-2.8-r2.ebuild b/app-text/pep/pep-2.8-r2.ebuild
index f1864940b8b8..e38782d4b5f2 100644
--- a/app-text/pep/pep-2.8-r2.ebuild
+++ b/app-text/pep/pep-2.8-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~mips ppc x86 ~x86-linux ~ppc-macos"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 S=${WORKDIR}
 
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 0c7e3d60535b..603fbb8b0377 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -3,7 +3,7 @@ AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
 DIST po4a-0.62.tar.gz 3980028 BLAKE2B 4336c09254728b6a8d9c1220628612735e10d1531e3473eb7606900b9f20db3cfec1bb1c1c57f5c40bf8fce84fe823d25c743e2d50b3c56558239526f12bf09a SHA512 a91a31d9d80bb48ee071f39148572a4ec2b65f472a26696aa517c9d52ad56accf9fbdf971dcf15dd1c492cca7efab328ebffe1f20e98f7fe2532d4bf490a9997
 DIST po4a-0.63.tar.gz 4067940 BLAKE2B 4cfa4163c21f5f8b783a5bdc29595f10cd172f7813de5617ed67a25bef547697084511a6f3897c47acb9158f15b3fcd97600bec7e23ba560cffe7cc646ce4c39 SHA512 556859b73728249795df22676a3cde1cbf575c608ad20f267fe7a6ee224d0262db2db19df8b7369ebf1ab568c017548ff118ae035608cca7a4d0963db8acd633
-EBUILD po4a-0.57.ebuild 1285 BLAKE2B bcf6b815289c5ee26d89fa62cdc838214c55c96c389fd3c702b8805250154662f857035f830254ee845e940e247ee5233703045b08746cef04d935643f93021a SHA512 0708efd6af416b9041c046a4d4ef6ac3548f31c971a818813e72b2eba1e19a68ca1b898557f1c9984f514efd8855bc0c807a8528fef90bcbf627cfa8580b956f
+EBUILD po4a-0.57.ebuild 1286 BLAKE2B 67a9d53b3bcf14dd981ab2c378e15f051fa4e3c9b625594c2e2e48c786c78e710077baec05e0ad800e0a35c2be4242a1b08f11c45b7bf9a80c4e6e688fb1c4d3 SHA512 4978a61ad0f888df59048a2cf67d7dae160e9dfb9cca774742a19b3c522d5bba0a393697659fd14091a08b94e73a101fd4faa20759658c824f156817b0288363
 EBUILD po4a-0.62.ebuild 1383 BLAKE2B 2d2f86a2cc71b5f7bd679c846c4c984492662e67a35a609de6527e453bf474e29706cf745fa868be1f10852a5a8b9b1c32d99eb033af82d848eb54b23163e52a SHA512 20b8cc64181a81b51946a3544d690b68360ede8a31632c53fe668a2a0118f2027ff01291da1dac8e90df466894cb67c575f876fdb9e6b784a324b16df2408ec6
 EBUILD po4a-0.63.ebuild 1383 BLAKE2B 2d2f86a2cc71b5f7bd679c846c4c984492662e67a35a609de6527e453bf474e29706cf745fa868be1f10852a5a8b9b1c32d99eb033af82d848eb54b23163e52a SHA512 20b8cc64181a81b51946a3544d690b68360ede8a31632c53fe668a2a0118f2027ff01291da1dac8e90df466894cb67c575f876fdb9e6b784a324b16df2408ec6
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.57.ebuild b/app-text/po4a/po4a-0.57.ebuild
index 7444d4ee569f..6dd16a0287b3 100644
--- a/app-text/po4a/po4a-0.57.ebuild
+++ b/app-text/po4a/po4a-0.57.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index cbd96e4210ec..347e69a7aa42 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,3 +1,3 @@
 DIST poppler-data-0.4.10.tar.gz 4497684 BLAKE2B 2c262223a971fe49b7f9848e424ba78a6d96e193d18b0bbad4eb343deea7808a6d9e234ebbb252c5becd40840221ba86d2b87ad36595fe982546b32ea6201f0b SHA512 4bebad0791b55b5e2805cf864393d1f777a7996c962398fc178211d2abbf110f75ef2fa6699e275b126aca0540eabb89542a672e0587248db9414e357a32bfd3
-EBUILD poppler-data-0.4.10.ebuild 745 BLAKE2B f2658bc21a7dc72357adf4ccc85887a66c347de4739a0f404cc462d4f52ddbad2fdbeef5446c1e0c415c6cc9f3e061c11284250f83fcfb7b64f16986d35a176e SHA512 1a0018be9d43d25fd1c3b840a0e62b16794a1820ad34372f4ae101dbd1941d7e18c9bcd47b16aa9f5174d9eb9b9e8a66b9a95d986b278b46970ea069553c7aed
+EBUILD poppler-data-0.4.10.ebuild 746 BLAKE2B 1d2428e3dd1f7c1e1e1dac88b44a42b3a2f13528300db22b29677e10d628fdfdf537f4f274e9e02429a20da2d9d9a5a432dc618bd3a60df6112aa00c541f0a4e SHA512 dd910001f1d884c6d78d4a0fe865d8e68c462ad26ec32e9e09294f9a36cc1261443f41f78deea135cbe7c980c2a9e2851b3cfc60b96ce4bf96409012314c7bd4
 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
index 852c9a5491b4..09992c6a315c 100644
--- a/app-text/poppler-data/poppler-data-0.4.10.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.10.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://poppler.freedesktop.org/"
 SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="BSD GPL-2 MIT"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 22bb8dc4e474..5a4eac92a8f7 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -1,15 +1,11 @@
-AUX poppler-0.28.1-fix-multilib-configuration.patch 813 BLAKE2B 74133e82a1969d80d4839f61beb22ba8ede9d594d4978c1311219268c3c97f8f9b6e939e2d0870acf6406a01ceafcbd982dcf93ee738a6451b86f7f48d270ec9 SHA512 fc12ae5a484bd231a10bd31860f07d773899ba034cb43f55bc53da7701dc8a3d8ce86885330cdad1a4d32fd8ce712105d3c8b984855857fabd4d4e92bb54dfed
 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-20.11.0-respect-cflags.patch 2797 BLAKE2B 8c37ed086fa823eac8d04e47c04f79afc76c0e6caa6d921b21bb5d99928be9c9bc683126e42e249aa8ccd96470d7ecf9eb1b0d8e749bd85bf4a455bb5d513e01 SHA512 421760c08f351449b7c899e4a04c3d93a26cf914326c58427031d4398f7cd4d2ed68d5ab42f930d663aa4f918fa11534e310ae6a9c005bdb3c9a191a497e6386
-AUX poppler-20.12.0-respect-cflags.patch 5494 BLAKE2B 8107bd3cb374694aea1dbd66cb95258ec568bea0bd00ff02ce9cd074e23dd8f399543d2055578654cdf7db09b46bd051346a596538305af883f9eb45c0916e47 SHA512 700233376a3254e3e5667719f95d00f828850476e3156856068c8b7faeff8c438c494606aa39f5551e998e02dd58aaca63eaaa5faff606f75d9a272631bdbc8a
 AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
-DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335
+AUX poppler-21.04.0-respect-cflags.patch 5738 BLAKE2B d09ed8ca5211b89a06b56d8e7f3564ca6b388f36469d174444a5b974ef0403e55061900b79049ad9192a0a5e2baa0bee295904c3ea27a74dfba7eb8813501600 SHA512 f9f915f3343f42f504080320fb1e35164f489abfa55bd7bc0889dffe05db56f49c8a528bc253e315e5616e6baccb413710a562021538ad4fa7f081b673bc688b
 DIST poppler-21.02.0.tar.xz 1684496 BLAKE2B f62399a70baa0af36abd9bf7f5bc69003fcdc9b668a64475a6373dbdd9885092a8beb42f887eafdafac5ee17e9aac5b610bad1c9a64af8112e72c82f47e6a304 SHA512 3964990749f38f4468b244c579ff1f2dab7357dfddecb3035d14d3aaeac6ee4be42e76b4a1cc1a8cf53715518def9e92cc59d08c1e22592ced00a9c948989035
 DIST poppler-21.03.0.tar.xz 1690848 BLAKE2B 60aef92bdfdc603b38dfb2a1aebd59c9085e6d51a2e22864edb3b0fd535421f47fb8041241e321d44cd8539538b61c6e19fe2d99a8a2d21fd85c3757ccadb5d2 SHA512 0eea1b5f32d79c3a497351a6491b5f617b089bef0a9a446723e87185acadba535e3146c0c141f4c2165ced1aa6fa853b54760a322d0932cfe3049c0ad94d64fa
-EBUILD poppler-20.11.0.ebuild 3364 BLAKE2B 0bed70002e75a2ef80c1504057f77c6fc89b0729d219352d534f6cec73a117d718364773520ed5fddc6e9f339e275a9ac2278e1755b01d6099fa8bd27fdb8d0d SHA512 674e487dee7bd6cb117de9c4eac0e0c7602e397b0c20224a90edd848ba373364d6d270f51fbbd49ada7528b26675e41179ed03cc6e608abc070e4aaeaa9252b1
-EBUILD poppler-21.02.0.ebuild 3248 BLAKE2B c586ed066559ded8afac18d7d85cb24d34164b42503f8c87a5c6c791f4faee990237abed528432b02a5f66bf6feac598807177b498a1c1ca53e740481ad6d183 SHA512 c0514348aa20d7f80b13a3f7343548b7c0dd0f3e1f4f4f777f8df1779c30df70bfe642d14293e31af07ca80e7590f5ad32a890692ddab80dc9dc40d7416c41e2
-EBUILD poppler-21.03.0.ebuild 3256 BLAKE2B 785cf6a6d91167077ab0a8b441e4f879b8cc82b6c789d4632d2270438099c006589dbbc6d5137540cd38c3397ae728efbc3e69eaa67def9b3d1302713f3fbe3e SHA512 34244bb699446c2ebd406e12fafe59ab8dddc0578b2437515732bf7d2c7d0043c6c3d0eab8a7a7d667439b36532cb5198e941f384cd11d72c2fbea3466b7dda2
-EBUILD poppler-9999.ebuild 3256 BLAKE2B 785cf6a6d91167077ab0a8b441e4f879b8cc82b6c789d4632d2270438099c006589dbbc6d5137540cd38c3397ae728efbc3e69eaa67def9b3d1302713f3fbe3e SHA512 34244bb699446c2ebd406e12fafe59ab8dddc0578b2437515732bf7d2c7d0043c6c3d0eab8a7a7d667439b36532cb5198e941f384cd11d72c2fbea3466b7dda2
+DIST poppler-21.04.0.tar.xz 1694132 BLAKE2B 759a22b175ca8b64fa666d61e394cb7b6baa34a3dbc9c6cceb24c7ad4b0892ee34faea90278d9889d72d7b9558fc9abf52ab74fd739dc12e7314c3a755661350 SHA512 c3391787456e8a4a3bd6e57f96faa25051bb5e15ae7eeb7072ad6fbc25e3f8a34818945cc49d90a0e6ebc3d38dd4e70d3c60ba0a5cb42c4000bd8c15c947e5bc
+EBUILD poppler-21.02.0.ebuild 3248 BLAKE2B 6eea98c0df7d157fedf39f8ed52f1305542f888b19c8a5adf741bd85df6fc7d5724c8ec03ad88ee9bec30bda82aa30e3fca370d407a6234a4f97aa5d4b3f76ce SHA512 2657dd6d87197953c09ab1ed4852f07e33475e1ceeadea0dcd0627f771500f13057eee927b8341286ba25820c4f2ce6b3f8d6b00d0b75510b27b3b9740585375
+EBUILD poppler-21.03.0.ebuild 3256 BLAKE2B 392e3cb27b1e618b9eb23bc7bbc6702e3be28bb3ead308a0b086791d737b991a8a4dfb63aecee92ff6151a45a28e0e839f6cf4fe6105b2ce0ab158c6ecdc0c82 SHA512 c379804521b46abd8bb0d2185e7a6b34f1e278e8d40f9474b8474ede37c5b1000d0d0e566a9266b088fef098dd6b7af0e1d6802a06621c29195e05cb43895d30
+EBUILD poppler-21.04.0.ebuild 3256 BLAKE2B 46cf4d6288aee53437e58c698110a58da3a395cc4ee078dd7c2d5c2e3b06a56c69e773f8ba7c33280efb67fd61000c943c10715bf46661835efad7c970270dc0 SHA512 c090442121d2c2275b1c82c67ad2ce24358d0b55f0cb9e3a509aeb60191423a984a126c6233332477a92d1d09f8d266e4d94c135b40e3c6f699108ba613e4068
+EBUILD poppler-9999.ebuild 3256 BLAKE2B 46cf4d6288aee53437e58c698110a58da3a395cc4ee078dd7c2d5c2e3b06a56c69e773f8ba7c33280efb67fd61000c943c10715bf46661835efad7c970270dc0 SHA512 c090442121d2c2275b1c82c67ad2ce24358d0b55f0cb9e3a509aeb60191423a984a126c6233332477a92d1d09f8d266e4d94c135b40e3c6f699108ba613e4068
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch b/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch
deleted file mode 100644
index f0a8d3c7eb4a..000000000000
--- a/app-text/poppler/files/poppler-0.28.1-fix-multilib-configuration.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7178d25..934f38f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -119,6 +119,18 @@ else(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSIO
-   message("-- CMake >= 2.8.8 is needed to enable Qt5")
- endif(${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION} VERSION_GREATER 2.8.7)
- 
-+#
-+# Ugly workaround: Manually patch library paths for Qt4 and Qt5:
-+#
-+IF( "${CMAKE_CXX_FLAGS}" MATCHES "-m32")
-+  GET_CMAKE_PROPERTY(_res VARIABLES)
-+  FOREACH(_var ${_res})
-+    IF(_var MATCHES "^QT" AND ${_var} MATCHES "lib64")
-+      STRING(REPLACE "lib64" "lib32" ${_var} "${${_var}}")
-+    ENDIF()
-+  ENDFOREACH()
-+ENDIF()
-+
- macro_optional_find_package(Cairo ${CAIRO_VERSION})
- if(CAIRO_FOUND)
-   set(HAVE_CAIRO ${CAIRO_FOUND})
diff --git a/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch b/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch
deleted file mode 100644
index 259be15c6631..000000000000
--- a/app-text/poppler/files/poppler-0.60.1-qt5-dependencies.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From af70882d85999b1912f9909f506ee7d22cc58ca7 Mon Sep 17 00:00:00 2001
-From: Johannes Huber <johu@gentoo.org>
-Date: Fri, 6 Oct 2017 08:52:10 +0200
-Subject: [PATCH] [Qt5] Drop unused dependencies
-
----
- CMakeLists.txt | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7485b2ad..04327568 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -147,10 +147,8 @@ if (ENABLE_QT5)
-   find_package(Qt5Core)
-   find_package(Qt5Gui)
-   find_package(Qt5Xml)
--  find_package(Qt5Widgets)
--  find_package(Qt5Test)
--  if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND AND Qt5Widgets_FOUND AND Qt5Test_FOUND))
--    message("-- Package Qt5Core or Qt5Gui or Qt5Xml or Qt5Widgets or Qt5Test not found")
-+  if (NOT (Qt5Core_FOUND AND Qt5Gui_FOUND AND Qt5Xml_FOUND))
-+    message("-- Package Qt5Core or Qt5Gui or Qt5Xml not found")
-     set(ENABLE_QT5 OFF)
-   endif()
- endif()
--- 
-2.14.2
-
diff --git a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch b/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
deleted file mode 100644
index a75b84b482f5..000000000000
--- a/app-text/poppler/files/poppler-0.61.0-respect-cflags.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- poppler-0.61.0/cmake/modules/PopplerMacros.cmake
-+++ poppler-0.61.0/cmake/modules/PopplerMacros.cmake
-@@ -98,8 +98,6 @@
-   set(CMAKE_BUILD_TYPE RelWithDebInfo)
- endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
- 
--if(CMAKE_COMPILER_IS_GNUCXX)
--  # set the default compile warnings
-   set(_warn "-Wall -Wextra -Wpedantic")
-   set(_warn "${_warn} -Wno-unused-parameter -Wno-missing-field-initializers")
-   set(_warn "${_warn} -Wcast-align")
-@@ -124,39 +122,6 @@
-   set(DEFAULT_COMPILE_WARNINGS "${_warn}")
-   set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
- 
--  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
--  set(_save_cflags "${CMAKE_C_FLAGS}")
--  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
--  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUG            "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
--  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
--
--  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
--  if(GCC_HAS_AS_NEEDED)
--    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
--    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
--    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
--  endif(GCC_HAS_AS_NEEDED)
--endif (CMAKE_COMPILER_IS_GNUCXX)
--
--if(CMAKE_C_COMPILER MATCHES "icc")
--  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUG          "-O2 -g -0b0 -noalign ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g -Ob0 -noalign ${_save_cxxflags}")
--  set(_save_cflags "${CMAKE_C_FLAGS}")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
--  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUG            "-O2 -g -Ob0 -noalign ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUGFULL        "-g -Ob0 -noalign ${_save_cflags}")
--endif(CMAKE_C_COMPILER MATCHES "icc")
--
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-+ 
-\ Kein Zeilenumbruch am Dateiende.
diff --git a/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch b/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch
deleted file mode 100644
index 9845c0970174..000000000000
--- a/app-text/poppler/files/poppler-20.11.0-respect-cflags.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-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)
- 
--if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
--# set the default compile warnings
--  set(_warn "-Wall -Wextra -Wpedantic")
--  set(_warn "${_warn} -Wno-unused-parameter")
--  set(_warn "${_warn} -Wcast-align")
--  set(_warn "${_warn} -Wformat-security")
--  set(_warn "${_warn} -Wframe-larger-than=65536")
--  set(_warn "${_warn} -Wmissing-format-attribute")
--  set(_warn "${_warn} -Wnon-virtual-dtor")
--  set(_warn "${_warn} -Woverloaded-virtual")
--  set(_warn "${_warn} -Wmissing-declarations")
--  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")
--
--  set(DEFAULT_COMPILE_WARNINGS "${_warn}")
--  set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
--
--  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
--  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -D_DEFAULT_SOURCE")
--  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_RELEASE        "-O2 -DNDEBUG ${_save_cxxflags}")
--  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
--  set(CMAKE_CXX_FLAGS_DEBUG          "-g ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline ${_save_cxxflags}")
--  set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cxxflags}")
--  set(_save_cflags "${CMAKE_C_FLAGS}")
--  set(CMAKE_C_FLAGS                  "-std=c99 -D_DEFAULT_SOURCE")
--  set(CMAKE_C_FLAGS_RELWITHDEBINFO   "-O2 -g ${_save_cflags}")
--  set(CMAKE_C_FLAGS_RELEASE          "-O2 -DNDEBUG ${_save_cflags}")
--  # clang does not support -fno-reorder-blocks -fno-schedule-insns, so do not use -O2
--  set(CMAKE_C_FLAGS_DEBUG            "-g ${_save_cflags}")
--  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
--  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
--
--endif()
--
- 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/files/poppler-20.12.0-respect-cflags.patch b/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
index 4b389faa7d61..8781bbec5bbc 100644
--- a/app-text/poppler/files/poppler-20.12.0-respect-cflags.patch
+++ b/app-text/poppler/files/poppler-21.04.0-respect-cflags.patch
@@ -1,17 +1,18 @@
-From 37f8326557eeb291d78a866d5ff78d79b32f6f8b Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Wed, 2 Dec 2020 09:29:33 +0100
+From a9f54d7c37b2b738767d757517466768a9f5a8fe Mon Sep 17 00:00:00 2001
+From: Theo Anderson <telans@posteo.de>
+Date: Wed, 14 Apr 2021 10:16:11 +1200
 Subject: [PATCH] build: respect cflags
 
+Signed-off-by: Theo Anderson <telans@posteo.de>
 ---
- cmake/modules/PopplerMacros.cmake | 81 +------------------------------
- 1 file changed, 2 insertions(+), 79 deletions(-)
+ cmake/modules/PopplerMacros.cmake | 77 ++-----------------------------
+ 1 file changed, 4 insertions(+), 73 deletions(-)
 
 diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
-index 707e7497..882cf11b 100644
+index fe1182da..b77eaa3e 100644
 --- a/cmake/modules/PopplerMacros.cmake
 +++ b/cmake/modules/PopplerMacros.cmake
-@@ -79,8 +79,6 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+@@ -79,14 +79,11 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
    set(CMAKE_BUILD_TYPE RelWithDebInfo)
  endif(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
  
@@ -20,10 +21,17 @@ index 707e7497..882cf11b 100644
    set(_warn "-Wall -Wextra -Wpedantic")
    set(_warn "${_warn} -Wno-unused-parameter")
    set(_warn "${_warn} -Wcast-align")
-@@ -105,80 +103,5 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   set(_warn "${_warn} -Wformat-security")
+   set(_warn "${_warn} -Wframe-larger-than=65536")
+-  set(_warn "${_warn} -Wlogical-op")
+   set(_warn "${_warn} -Wmissing-format-attribute")
+   set(_warn "${_warn} -Wnon-virtual-dtor")
+   set(_warn "${_warn} -Woverloaded-virtual")
+@@ -102,22 +99,8 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+ 
    set(DEFAULT_COMPILE_WARNINGS "${_warn}")
    set(DEFAULT_COMPILE_WARNINGS_EXTRA "${_warn} ${_warnx}")
- 
+-
 -  set(_save_cxxflags "${CMAKE_CXX_FLAGS}")
 -  set(CMAKE_CXX_FLAGS                "-fno-exceptions -fno-check-new -fno-common -fno-operator-names -D_DEFAULT_SOURCE")
 -  set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g ${_save_cxxflags}")
@@ -39,14 +47,15 @@ index 707e7497..882cf11b 100644
 -  set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline ${_save_cflags}")
 -  set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs ${_save_cflags}")
 -
--  poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
--  if(GCC_HAS_AS_NEEDED)
--    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
--    set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--as-needed")
--    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--as-needed")
--  endif(GCC_HAS_AS_NEEDED)
--endif (CMAKE_COMPILER_IS_GNUCXX)
--
++  
++if(CMAKE_COMPILER_IS_GNUCXX)
+   poppler_check_link_flag("-Wl,--as-needed" GCC_HAS_AS_NEEDED)
+   if(GCC_HAS_AS_NEEDED)
+     set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+@@ -126,57 +109,5 @@ if(CMAKE_COMPILER_IS_GNUCXX)
+   endif(GCC_HAS_AS_NEEDED)
+ endif (CMAKE_COMPILER_IS_GNUCXX)
+ 
 -if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
 -# set the default compile warnings
 -  set(_warn "-Wall -Wextra -Wpedantic")
@@ -104,5 +113,5 @@ index 707e7497..882cf11b 100644
 +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Woverloaded-virtual")
 +set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
 -- 
-2.29.2
+2.31.1
 
diff --git a/app-text/poppler/poppler-21.02.0.ebuild b/app-text/poppler/poppler-21.02.0.ebuild
index d24ddd8550fb..05b6d08ed7b3 100644
--- a/app-text/poppler/poppler-21.02.0.ebuild
+++ b/app-text/poppler/poppler-21.02.0.ebuild
@@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
 
diff --git a/app-text/poppler/poppler-21.03.0.ebuild b/app-text/poppler/poppler-21.03.0.ebuild
index 8c97e95774bf..a412059ff2a5 100644
--- a/app-text/poppler/poppler-21.03.0.ebuild
+++ b/app-text/poppler/poppler-21.03.0.ebuild
@@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
 
diff --git a/app-text/poppler/poppler-20.11.0.ebuild b/app-text/poppler/poppler-21.04.0.ebuild
index 975d1342c8b4..e3bf1e313d86 100644
--- a/app-text/poppler/poppler-20.11.0.ebuild
+++ b/app-text/poppler/poppler-21.04.0.ebuild
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/104"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/109"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -57,10 +57,8 @@ RDEPEND="${DEPEND}
 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}-20.11.0-respect-cflags.patch"
-	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-21.04.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 8c97e95774bf..e3bf1e313d86 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/108"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/109"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -58,7 +58,7 @@ DOCS=( AUTHORS NEWS README.md README-XPDF )
 
 PATCHES=(
 	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
-	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-21.04.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
 
diff --git a/app-text/ps2eps/Manifest b/app-text/ps2eps/Manifest
index b66cfb718315..7286aa4da88b 100644
--- a/app-text/ps2eps/Manifest
+++ b/app-text/ps2eps/Manifest
@@ -1,3 +1,3 @@
 DIST ps2eps-1.68.tar.gz 97304 BLAKE2B 594b894b2d81f64c8c6a7461d1df96d7b6e3ce3ef8f7eaf58161eb6a05ebca7b2d304a531be954898f1a9ad53cccd84536b64127b080afbc3902265d2e4e1108 SHA512 7fc84da5da00d5b1169d6e337b1db232adf80d9d957e48bfdd9272946151adca3e44f712587387ef557488cd15f44210b3fbd8c545488ec0071641d9d25a9c2b
-EBUILD ps2eps-1.68.ebuild 902 BLAKE2B d5b37cb938cdca3ceaea3168cbc4bfcf9dd93d095bce924b6bc5813b1fadbf7d39f86fd41c5b0be84d53159803fcaeed9ccea6378436a8b781fefb6a03de01f2 SHA512 2d8411ba7fbbe7b2d47df75ec7df2f9e7afbfa97ee8a4162576865b5a111d1cb01876ca3266e6eff2014add512cfd58038bfaaa7cce497cde995255b0c0e9f21
+EBUILD ps2eps-1.68.ebuild 903 BLAKE2B a18dd688b0a97758574595975ff8073d0b00dfda74ca439d3916467062e558d51c7866f999b51ce794dd214f0ac5895c44c45f2b3ff9cd80ead89281b65a43fb SHA512 b0134a6d331fa6603b585ec8230575d07664e14d2dfbe43d40e9e5437b48397d6e0a641913f3d86e3436fdea4983bf53407e0ec48fc5f714ecb51f8cacbe3513
 MISC metadata.xml 369 BLAKE2B d97022c8448637ff25c9032eb1e9dd31c39876108057d719c8ba34201ba3946493e6b158c43de55c639863d86a1a076456f5ea885f56298a91bd34ac9a0abf2b SHA512 126af017800386430af8e1ae11c6e20b0fd9ac2656e8cd947235ee37faf9e28fd8634e01ada0598915496eb323b24275b268109d7e1a39e7a10832de55b9d1e4
diff --git a/app-text/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild
index 30bdbe08d154..bbb3620563bf 100644
--- a/app-text/ps2eps/ps2eps-1.68.ebuild
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tm.uka.de/~bless/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-text/ghostscript-gpl
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index 9f35e11de65a..ac1366f3047c 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -1,3 +1,5 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
-EBUILD ps2pkm-1.8_p20200406.ebuild 785 BLAKE2B 240d50eff5af66779936c1ab5ed933194740078e4fbb9d01da32ea6b3ac70fba1a357a747f13fae1f6479f555787e979bff1e2989ecbeebd92c156656dfe9f60 SHA512 2f9211df86f43b057714836f7862de01f80d435db3f9460ff220f93a0e125fad701041de29903f87c4159a8307fadf261494f9290d09e86d018e78d6126091eb
+DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
+EBUILD ps2pkm-1.8_p20200406.ebuild 786 BLAKE2B b96b70a4cb0cc2371c5889cbb82b510812f29c13a8150f2b68a081be2da7330d45780bc1d0182631060ee0d3028528db23a142b1cb52e1d3baf735df43761d1d SHA512 20c73be65f099ad8f5df79e96b3b87f3f450a9a7a0911a9a736ca0d0d0460539139d0463e02ae6d7e41363ea20ba31dcdc146424463e8ac733b37211e62763a9
+EBUILD ps2pkm-1.8_p20210325.ebuild 786 BLAKE2B f0ddca8b71acbd704b493ca821984dd5d2fe74db72c738a58cb5a8994bddf314c78e403620136bd1e325f0c4b58ae1e377455fd7606c4d4d8ba8d37bdee66865 SHA512 0cffbcd2687c66c8d2b7f29659c6cd5a448d9807d6708368420dd9bae3dd9b672db78240b0e2d0918b767d67674bb934e5d788d54b273dcc99a96de67ec0ec60
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
index 272bb9fe883e..9b76ee5ec683 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild
new file mode 100644
index 000000000000..56c4150a4946
--- /dev/null
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20210325.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Tool that converts a PostScript type1 font into a corresponding TeX PK font"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-source.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+DEPEND=">=dev-libs/kpathsea-6.2.1"
+RDEPEND="${DEPEND}"
+
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/ps2pk
+DOCS=( "ChangeLog" "CHANGES.type1" "README" "README.14m" "README.type1" )
+
+src_configure() {
+	econf --with-system-kpathsea
+}
diff --git a/app-text/pstotext/Manifest b/app-text/pstotext/Manifest
index 7c6d4bea19cc..f39c6585c1ed 100644
--- a/app-text/pstotext/Manifest
+++ b/app-text/pstotext/Manifest
@@ -1,5 +1,5 @@
 AUX 1.9-flags.patch 775 BLAKE2B 32634da1338504c985a71dd58a6c5a09e03f07063c4540647e155a3d9f4b17fdc2a2d2a6db39f698c9bb7442b525ba876e7a951ad95e908e6a457699847f583f SHA512 4933522482e76eb9a220da6baf74722318e1b3c818515560f58a2d448b66a5236450c96171e89c8fa899c4e4904fcbde8457e87accbde0b6275c7154e1e9e462
 AUX pstotext-1.9-quote-chars-fix.patch 3491 BLAKE2B 81f284386683222fb8c95f0b2677d05134e578486932b09511ba9fd685ade1b02db1a6c1e60dd90502e558f5ff5bc3a8eefa577c8cc620a89f5a97215e9aaea2 SHA512 c6ffabaf5b5f7261e79e43d0083543b0428cde0d62c1b9e9513905d03dd5174a1ee1a537dfa8d906b7422cc6c9e5606fc7dc6f177d11441fd028355e99c2c4a6
 DIST pstotext-1.9.tar.gz 37461 BLAKE2B ff0c816ff0f57882e6fb36df9a2ba02049526cc0d5a0996e47c32f98a3d3208ca35f59c84605e75c787b80b3a0d8db498afbd4d28e2095be8abd979ecaa6bc22 SHA512 a8148e94d635544a7dfa8c96ff6071717388e4dc6c3db36f2c50939dce96c1f824ee423b1622af9111fffc60cb298215a6ee85d956c81873d71ceac804ee48ca
-EBUILD pstotext-1.9-r4.ebuild 656 BLAKE2B 2e48e57ebd2fbf1f455501cfde78ebdc978b8a16485956d1e76a336db61ea61bc2d427ff422d7d9e36a1d8379449ad03c31783231fb7165e8a82b0d40366d85e SHA512 2a335e6b5d561cf9b1e8943f934accf1d68a31f31829cc77da073d1594488f90c145594d1bb3e99d0aff9fd8ccaee291ebf1b0dd57d5be4276ba397f9fc78b50
+EBUILD pstotext-1.9-r4.ebuild 649 BLAKE2B 857637ef462dd25108116f18df4ca58cf878fb5d69d1788e1496ef4818ae18931d2ed44c1cf79c2a3503957013502f74b40aef0342eca0e17ac70d6aa681cb9a SHA512 c90da73edd04548ba93897366a41719863af24b0d2a0f90d6d91a6a409f03b2030c9701e5a409956bf56fb7706170b290e0c90af3cdbcb7add1dc247ccfd564c
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/pstotext/pstotext-1.9-r4.ebuild b/app-text/pstotext/pstotext-1.9-r4.ebuild
index c4a59e291385..fbbb6af016ad 100644
--- a/app-text/pstotext/pstotext-1.9-r4.ebuild
+++ b/app-text/pstotext/pstotext-1.9-r4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Extract ASCII text from a PostScript or PDF file"
 HOMEPAGE="http://www.cs.wisc.edu/~ghost/doc/pstotext.htm"
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index d97594302f47..a5f8c5179960 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,7 +1,7 @@
 DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
 DIST qpdf-10.1.0.tar.gz 18528427 BLAKE2B e62b1c8ca8d301b082cde292cb8430d6ae26433c77a30a6a21379f00cbfb3df09117d042f532f77d372d091a89a3f6581ef7d7734c67a4a1b29c1708129078f3 SHA512 f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106
 DIST qpdf-10.3.1.tar.gz 18956768 BLAKE2B 1581799b7bd08e28829fd26571ddaa06fc8460fd4f6935a4f69374e49c445cfcbe824175de7137817a26278c2f58d7524f6440181945064fc853f4dd30b2d528 SHA512 def94fe09770e67fe13bd3fc946667fc2935e7c448eb43602e15218e5b50f452e4f4152411f818115620e67934890c37203663537ac77ed1fcd4317e01a6d623
-EBUILD qpdf-10.0.4.ebuild 1304 BLAKE2B f646282ac712a633e11ccbac8843da606371c91285e6f92df82febaf1161b90f0a19a62afcc00d3396e09078a3272cb666d3fb5f766be0260d8c4ee4ddd4b320 SHA512 e692d7326d710d7508e29348966323e43c802d5e9d9abe7062553f565b43bf565fa5069952420eb0b509570bb4b2106d34c65011767f3385abc8e8f0869192ed
-EBUILD qpdf-10.1.0.ebuild 1307 BLAKE2B 155b1d9ffc578aa92f657759cb181a5a62001241e318c866ff6a08b37c0e7bd4606e80f9e351c4b647affe6ba5cf21f4afe80e844ee555dc01a6599d831ab69b SHA512 d9465dc9e98a26db87e9efc11d68502b73942204ba87a89a9b10a2cc928698ee9976439c7de4e0f7a0d2ffba016bc7183809362ce580d2096fc37a59981a62b0
-EBUILD qpdf-10.3.1.ebuild 1313 BLAKE2B 7575b134b18c0eb1417c715679248f5f8dcc83f57a6b5fdec88379cec30a40876de1fe628967a746f8d4d6383dfbc8906ecfcbb54f412c36cf637c7680902a66 SHA512 216a2b8f8ddd7d5f830df667d156011fb31ade13a8ea62d4197ba159eb5dfcbd4f7cbd20ecdd3b9f5024915a999b9e0f3422b95f3e4266dd25aa3c03ed6a27b8
+EBUILD qpdf-10.0.4.ebuild 1305 BLAKE2B e038fd3c2cdc1674028bc5957ce45d38cff6a706afd5184e55bf2d4aadf2261a9ae0f9cec78913ba74d50140c8f98046f441dfd5c038a8ea7110663503b3f042 SHA512 431bbe1fae4e1f0521b306e62a0e73620e97646678f5a164b25bbe668d092b9428028b32afd26fea1cd7a0d97098561496162293ce8780fdd7d8a81d8530c3c9
+EBUILD qpdf-10.1.0.ebuild 1305 BLAKE2B e038fd3c2cdc1674028bc5957ce45d38cff6a706afd5184e55bf2d4aadf2261a9ae0f9cec78913ba74d50140c8f98046f441dfd5c038a8ea7110663503b3f042 SHA512 431bbe1fae4e1f0521b306e62a0e73620e97646678f5a164b25bbe668d092b9428028b32afd26fea1cd7a0d97098561496162293ce8780fdd7d8a81d8530c3c9
+EBUILD qpdf-10.3.1.ebuild 1311 BLAKE2B ac435cf51da6b724772275ebbe5a3e0421db00b51c9a59741cecdfe40fee0417f10c3b97b55f4fc69a014a68456c5e37cf2eba7e7bfb83ada8b2643f176ca13d SHA512 a3468bda0dac4a01c1c5cef2efad79c4101fc4160022c8cc1a5c14dd5af6c144719369251ef2b38ddb9d9535989996c435ebaebfba1b204b92522f529b67186f
 MISC metadata.xml 443 BLAKE2B 4522681371216196a58ef46575aad835e548c7f4e18a7137d6c780b1a5b8596f121e223fbfa6face7e33d5fe487b20219f0a40c68c5b0cb4d7eae1dfe7e8dc92 SHA512 1fcc6699cc87a906f341f9ebf45158a18870df921c573bba5f348375cd1ef0a204270abc9c6337e81d48082bf970ba16b09d940c4dea94b92d1d4efbeac5fbde
diff --git a/app-text/qpdf/qpdf-10.0.4.ebuild b/app-text/qpdf/qpdf-10.0.4.ebuild
index b39294df3f29..da30b1934de3 100644
--- a/app-text/qpdf/qpdf-10.0.4.ebuild
+++ b/app-text/qpdf/qpdf-10.0.4.ebuild
@@ -10,7 +10,7 @@ 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 ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/qpdf/qpdf-10.1.0.ebuild b/app-text/qpdf/qpdf-10.1.0.ebuild
index 5fef6854272d..da30b1934de3 100644
--- a/app-text/qpdf/qpdf-10.1.0.ebuild
+++ b/app-text/qpdf/qpdf-10.1.0.ebuild
@@ -10,7 +10,7 @@ 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 ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/qpdf/qpdf-10.3.1.ebuild b/app-text/qpdf/qpdf-10.3.1.ebuild
index fa194fe13674..e00fc9a0d07f 100644
--- a/app-text/qpdf/qpdf-10.3.1.ebuild
+++ b/app-text/qpdf/qpdf-10.3.1.ebuild
@@ -10,7 +10,7 @@ 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 ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index 743589a5107d..8be08bd49545 100644
--- a/app-text/rarian/Manifest
+++ b/app-text/rarian/Manifest
@@ -1,4 +1,4 @@
 DIST rarian-0.8.1-r3-patches.tar.xz 33508 BLAKE2B 772f2e2ff45b707e45da16103da665c54655dae0b904db5240964a25591f5871fb28c37e42a99cb98c760a214e6b039af12015bffb9b51ccb50e6bb054d3effa SHA512 a6a258803ce165854047aacd1ffef32d8d5c271cad3e6b74fb3c694ca6a0de9a8f253c89f9ff53279e7228ae401fad06721f10a6374a03a51bad76b2ef969000
 DIST rarian-0.8.1.tar.gz 459461 BLAKE2B 7589633a3abc188a7e83adede964b4d293984ad9c896e5c8116775905dfc3acc3b0cfbbee574b26d1c3966501f8b42e61df9910c840c58bfcd0b41d065a30c26 SHA512 ddc640e1ac210e9dc3fcdde6bbff6e21dabe97b160b531cac68d47d1b831dec71b7c4aced9819cfafd8f89f290920c4e33550b8e29d9872a1c1a202d6fe8e3eb
-EBUILD rarian-0.8.1-r3.ebuild 1808 BLAKE2B b2407fa7e6237a6fb99fbb7914608a7c9b9a77324659675eee4aa5e1b88ef1e3e808f4398b384faa529382e556d5445c17cf0588179df1642e666429af0b25aa SHA512 d4768d827cb5de4bad49668d7e4ef5a6b65a3bb6f793d0e8d8aa87818b03824b1bc6bed1774dbdb6488d395a8c43ca672e564a64c56116483d77771e6c5d8cfb
+EBUILD rarian-0.8.1-r3.ebuild 1809 BLAKE2B 356931ab454edbf4b6dabafc92a8d6721538bc1166272debaa834c68f832bd12cbcdaee44483823f216e419d9f5383a4f41fbfd7f59a29c8f17b973ad3f9ecf1 SHA512 7fe69353e71b7c10079ed36f19711b5606761ff203133a257abd79b5d9917da05b43e01549db27cf7834263a9cd5bd7b11586f1fe59f0e3950d67471e3e99ef6
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/rarian/rarian-0.8.1-r3.ebuild b/app-text/rarian/rarian-0.8.1-r3.ebuild
index cec1db78048f..9247ad3e910c 100644
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.freedesktop.org/Releases/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-text/refbase/Manifest b/app-text/refbase/Manifest
index 2ccc3398d222..ecb0413252f4 100644
--- a/app-text/refbase/Manifest
+++ b/app-text/refbase/Manifest
@@ -1,4 +1,4 @@
 AUX postinstall-en.txt 837 BLAKE2B 306f387521e1a4004434e5eba01b1254d6c893515ab0164f96f1bf26c07dbb9d8216d0a2a59173096637f9279d23128d123ae21fe1c8c86c07d7f3dd8d069a30 SHA512 fab28207a5d3bff1c8cb499ced404d5ecf2dfcd27493c0ba8b4cedd14518a0d2fdee16e61c28c6d14daa486de80ef33725cc66b48f4fe1ec9e150e5b037f9f3b
 DIST refbase-0.9.6_p20180223.zip 1725517 BLAKE2B bc92ba3bd7e317100e9390157e7b9cef5450aafa4fa78925cd7ac11f8933bca24a978fa44719e4a62e4e914c6949cc57a663a3ceca44ba0f07a7dae96b82d594 SHA512 65960052b99037653d0cf6f0c02f133f47e359ed67da095b03e10519ba48ecaa3cedf29eb1f2d56115b21cd479dcea77a26bf1f90baa8f4037876ca9c61a4aa3
-EBUILD refbase-0.9.6_p20180223.ebuild 960 BLAKE2B 2691af2ceade102c0ddfa464e7d5fcef295d69eab8d57631b0fdf32d194b3f91ac9c1e10d9734992ca5dd5e67ecc6f7ae9ce7c584508b7823828a5ddb02da829 SHA512 7e8f90e92b32e430e1bc9e76714d3ae6f650c19d7aaa7430e7b2d78b4d85c382845f8d472699c1ddbed459220870386b8521c7865b5537530b6455429cb905f9
+EBUILD refbase-0.9.6_p20180223.ebuild 955 BLAKE2B bfcec38440282b60debb74306ba4895c25fecee31be571300a8a9aac218ba4adfc70b2ce8a2959de8317cd88a66137f7478641adc697294767aa5a578909ec6b SHA512 2b120972a04a8966579fd1a82339dfcca4aeeb968c4fca61a99987d052a2f2e0502720460648992bf59088f7fff2179d6ebbc164a2c0554218ea02de220e161a
 MISC metadata.xml 330 BLAKE2B 9e35fe6ced389ecb38ec836735c1d1482efcc1c606f438f433a34543a726d317d903beb94e3fc4c24b6297f4e209e7f8a02bbf046d34fbf3b4fa2813b4c12e89 SHA512 0fbcf620763f7e60e102335842267a1b934695c96b50055e5d338b5504592990c8817afe416cc3b48f9da72aa3365b83ec448165d07446c20fcd4bdd6e5ddb77
diff --git a/app-text/refbase/refbase-0.9.6_p20180223.ebuild b/app-text/refbase/refbase-0.9.6_p20180223.ebuild
index a36d4ed7ff86..6962ac419d28 100644
--- a/app-text/refbase/refbase-0.9.6_p20180223.ebuild
+++ b/app-text/refbase/refbase-0.9.6_p20180223.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,14 +7,15 @@ inherit webapp
 DESCRIPTION="Web-based solution for managing scientific literature, references and citations"
 HOMEPAGE="http://www.refbase.net/"
 SRC_URI="https://sourceforge.net/code-snapshots/svn/r/re/refbase/code/refbase-code-r1422-branches-bleeding-edge.zip -> ${P}.zip"
+
 LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 RDEPEND=">=dev-lang/php-5.3[mysql,mysqli(+),session]
 	virtual/httpd-php
 	app-admin/webapp-config
 	app-text/bibutils"
-DEPEND="app-arch/unzip"
+
+BDEPEND="app-arch/unzip"
 
 S="${WORKDIR}/${PN}-code-r1422-branches-bleeding-edge"
 
diff --git a/app-text/rman/Manifest b/app-text/rman/Manifest
index b641fea20374..9a50313e2084 100644
--- a/app-text/rman/Manifest
+++ b/app-text/rman/Manifest
@@ -2,5 +2,5 @@ AUX rman-3.2-format-security.patch 336 BLAKE2B 04ec15b8d7e20293d3b5da4c85107b209
 AUX rman-3.2-gentoo.patch 418 BLAKE2B bb7385f95e443a175e86c7c8c19871cfd8682b037487b6a73f3010e50d1e177929ef89e02041b70dc575a55aa5144cec99b2c13942f87ddf9f31c1c327ad8b36 SHA512 267896a7db4dc559e3162c66996bde552c655f8dd32ee3f1a23520d1df8728fad83e783fa898159e0aa96730b03092be516f711091f58a4f1b9228d24a4bc87c
 AUX rman-3.2-ldflags.patch 339 BLAKE2B fa4e72627e79841e2650025d9772953834907a41f06e3a18d8a0bcae83cf104724cf29023d128ec272656d4ba9696b05243466372299f20b796ee8d3cd495fdd SHA512 ed9350878621a90aea9467afcf0fe1110c9b876c236c314e0d7566ee6c5674663c47457f8acac76517b0409f3eccff91dd3e869de1c3d1002a671610fb1e38af
 DIST rman-3.2.tar.gz 79397 BLAKE2B 2be1c60f77c3b2c4fa73a59c5a8965da1c8b1f3b569e7e4d5716a372228bacb81c5421f4bbf330781aa231835393c915ed14057c717cb1e8ed57101f7febb37d SHA512 a70aea0af1510088fd88a736e63a6dab9200040be5eb89912ede4f50e3de97d423574841bbb66e90fb12934f3834dac0acefe78ff1c73a78a79c95c3dd6fa5ae
-EBUILD rman-3.2-r1.ebuild 752 BLAKE2B 1e79722a78df026cf73a36c4b77c2c6b0618b34cbb7eab05be4914fbf12d4b12fb768a5608549d7edd42f94c201f96893df0a395a2c654ba2ba64cfaae027ac3 SHA512 22f89ad35b2c88ba500f89033992d287a92c43ff56cccba24847c47d3c748ecb7c59083fdf4f213ea4b8597662d9d0d76c510adede802db2a0725b28714f3385
+EBUILD rman-3.2-r1.ebuild 753 BLAKE2B 9a6b8334842c915983692f92c87ec807578d2cf727aec36ff7a79492c7017e9443e01353825ed1fcbfe84d68595dc0247c4b5848762ff24071341244fc38aaf5 SHA512 b71b70d19eb104c497ded5897af7bd145d46bd26edea3ecda954ac5a7b1f0bb3d79a0c4584a7245315e6a6ea35f82299d2e571320c155b08b4b30128388af998
 MISC metadata.xml 334 BLAKE2B f3759592bab3b3f8426acb5a0fff5d5d7efb5618c951e2c0a26dcc119f609702f45327dcc47de6132befee7064536413006e77a09ab67415c041b0697129df6c SHA512 29d5b70060964469ce308fed8bc01e09bb74b3d2ac0605760d88f7dbd19a1cdd6517cdbab76f4269188454112837e0d27b32bbf3c5b9ecd5bb4d3ea4f862188c
diff --git a/app-text/rman/rman-3.2-r1.ebuild b/app-text/rman/rman-3.2-r1.ebuild
index 4527f2dbaadb..82199ea901d9 100644
--- a/app-text/rman/rman-3.2-r1.ebuild
+++ b/app-text/rman/rman-3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RESTRICT="test"
 
diff --git a/app-text/scrollkeeper-dtd/Manifest b/app-text/scrollkeeper-dtd/Manifest
index 63382b6523c8..067efaa18720 100644
--- a/app-text/scrollkeeper-dtd/Manifest
+++ b/app-text/scrollkeeper-dtd/Manifest
@@ -1,3 +1,3 @@
 DIST scrollkeeper-omf.dtd 11031 BLAKE2B 47a52f587447f30c1c93ebdb4d1339d714260c7bcf16711591edb0b0f8a41d6694a1f64f0306d0c296c032869176b884adb50762eaa445f50684820effcb9399 SHA512 edb38d85352d0ed4a4fd1eea108cd88696d2f0759bc4402d4b7f85aa56b5647ca5a518de14deb3a429344ede474d42a64b90100e5d3c772ae6e5e47a47d86ff0
-EBUILD scrollkeeper-dtd-1.0-r1.ebuild 1503 BLAKE2B b81551530c6b3fd09acc867cc502bcc36f57a2a30b161c228b61b31d703e83c815ab00f77acc15fbca404aaf551e000546a5b970ed2d24a35e03212bcd49b68d SHA512 bc9823d02a474e9776fb7ccb07086cd931664d6582211929a3a0dd5dd948f5a1ab772584310a8c3ab93c59011e647c2677391dd5b80ea59e0b8667a249cb6192
+EBUILD scrollkeeper-dtd-1.0-r1.ebuild 1504 BLAKE2B 61fead51a5786879caba3239ab844f78f9cc6a4ff0ccc7631fd5172f2f7d85956a88cedca9df1e76996bbaac526b67c75db7a00dc333176931691543f8cf1cbd SHA512 09b1e639cdaecfff1d2c031029067e4cb082d9eae1560bb310fce5f78d6cf28d12bbabc8b68bc89c39e5b2028a2c4c0b35ce54df359acea285cd88355025d2d5
 MISC metadata.xml 335 BLAKE2B 5557a7230bee25bc8e1340443746da2d41568635c68904549b2ac2f6227a70444cf2753e6656de56c290c1a96e18dbe882401bcba68e271259cafaa44402a1f1 SHA512 c0180e1504b25daba0b5f2a6556793cf721eca12a4c488a57e7960b9b096129e5f535a24e1da1ffa6b1d9e8b646325edcebd00e5f7e908ace3d81d818e49f8e3
diff --git a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
index a3d62ec869e6..e36c055a77dd 100644
--- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FIL
 
 LICENSE="FDL-1.1"
 SLOT="1.0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.4.19"
diff --git a/app-text/sdcv/Manifest b/app-text/sdcv/Manifest
index b2e2e9a40a3c..73deea7c2b54 100644
--- a/app-text/sdcv/Manifest
+++ b/app-text/sdcv/Manifest
@@ -1,5 +1,9 @@
+AUX sdcv-0.5.3-t_list.patch 592 BLAKE2B 7f1618750a8d9c452f8db257a2b4791b803f45f10334789dd6f6d13f46335d9daf4a1a070ad03a38d40e6937d5e70371502ba26361c4d62486031888645843c3 SHA512 1aad632517f04423fd0a985256d760a06e5e38c3c9335f814f6997559ed3e3fb33fe1dba25e49b8298eda6570526323c2fdef18be83ab3363caa074cd59db107
+AUX sdcv-synonyms-bin-search.patch 3409 BLAKE2B e40f32a2e0e401ae5b996992fa227ef70a439f928d762285094237871b7dded242928bab8206a146acf1abf716cdbcaa8a8d0ed5a430ec4dff5cae3a3a014b34 SHA512 bf4cf297abed05f4052cbff8decac2069a52657b3cfc21435e72731536ab9605ddde9053fa8b39d9a2f1dc67416126b1b10a1c31cabca37a6fb31d2272ba5e13
 AUX sdcv-t_interactive.patch 324 BLAKE2B ecdb0d89c4a26050927272f244e43b28e945e3ef5cb93167eaea7c09912e504af2061ec34c2b5f5a32665c784093e2d35ed92e10a00824b619da71e53049e5dc SHA512 9067330c6fa95910b5dd67716c9bc378d29a9ccc5d60c1eb0c1aca12e58478ea381b91c5122c1951bd2f4c9e8b629243ea885bdbbc87a2f88174340919f5cf8d
 AUX sdcv-t_list.patch 588 BLAKE2B ea7106246204d2c18eaecdb05e4bf7a9c1d12d0ef6e1509591ad5afcf529746a6ef3f4a5051add8923c399863f8b56c3144c9d758b7fa2215b6b593eb1e2b305 SHA512 7a2f8fc105988ce6847ce533051ed65ec49b2ac1ffa4ec076a78be59d219d8c18aee7170d965dd429b95b193bf5a4608d20002e9fa58b6abfa5b972bb6879f94
 DIST sdcv-0.5.2.tar.gz 61541 BLAKE2B 3b86b69c1e781c311ebbd427d09f8e1c8f97a9fc7b72e22f812ec4619fb4f3cd673ea5548cfdd89554e1613877d20676b8830fd5921082d7a13facb761001c00 SHA512 8752a225aebcc28cd8911591333410a0da94db9a7718cee744f8fbc6ceeae14bbf13c6d5a02a05652ff032276765537573e216acd49980f80c06319dac7075fb
+DIST sdcv-0.5.3.tar.gz 62105 BLAKE2B 1424510cff2fa355d17884a31f8136f4c8a7bde071f387dd8a69b1d2d6b9c8e52869cd602b27b9966725370cf128fb62b8628e735f1faa92b78f75215462804f SHA512 73a305baad74d0584912e115d3de7395c8e88745fb69b4e5f1a345061629b0d4e05898bd589e96ce07948d52ba7c508ec4ab77862c8fadca5a2f19c5244e1442
 EBUILD sdcv-0.5.2.ebuild 1609 BLAKE2B 9f3eabd561d63a5d2255cf2efb30d9dbdfe792a65a0c1c6e69be45330e4b5cfc2157bd3d0ea1ea92265b3fbc288c0bad6ba5b9130eecae88531e6bea991ff118 SHA512 6cf930c6fad804bbd6890265183a6c1d2db122ac953f52726cd42f3b223f11a2ba921b81d0935a4a984e03af7a15bc37d700c48571dde050232a255d8f1cd9e4
+EBUILD sdcv-0.5.3.ebuild 1598 BLAKE2B 1ca31bdbf7d04f0b73ab7c815bcdbbee4e3640712f1d51a004a4b5750072337898366b64eabfa054637db6b40f9432eec279d35c8cc3e6454d2706da313912af SHA512 a45d912c38018364f4c210e42cb3d99687639ee5ee709fc773a528e5b0923cd5cacff5cfb60b3be439d0e8c2ce0c9f22ad9fb0d65cc1e05e74d625d5dafc156d
 MISC metadata.xml 448 BLAKE2B fd8196b4fb4caf645780c9b9c3170aa2f6148d17c359d2ea5579eff73f91b7eed8507ad8ed99a93c02ea7bae327bf6641dd1b6863539be379f45b4258aee1342 SHA512 f265fa0f3215a1effc00060394e942f10b7f5247bf6c1c55f9cbeb28ae26bc7398bf97acdc877d545a1e90a83b8ce41eb9780beab1267c99061f2b391a59acbb
diff --git a/app-text/sdcv/files/sdcv-0.5.3-t_list.patch b/app-text/sdcv/files/sdcv-0.5.3-t_list.patch
new file mode 100644
index 000000000000..c26a93522bd1
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-0.5.3-t_list.patch
@@ -0,0 +1,19 @@
+diff --git a/tests/t_list b/tests/t_list
+index a8c92c4..c410cf2 100755
+--- a/tests/t_list
++++ b/tests/t_list
+@@ -1,11 +1,10 @@
+ #!/bin/sh
+ 
+ PATH_TO_SDCV="$1"
+-ndicts=`"$PATH_TO_SDCV" -l | wc -l`
++TEST_DIR="$2"
++ndicts=`"$PATH_TO_SDCV" --data-dir "${TEST_DIR}" -l | wc -l`
+ ndicts=$(($ndicts-1))
+-ncom=`find /usr/share/stardict/dic -name "*.ifo" | wc -l`
+-nspe=`find "${XDG_DATA_HOME:-$HOME/.local/share}"/stardict/dic -name "*.ifo" | wc -l`
+-nmy=$(($ncom+$nspe))
++nmy=`find "${TEST_DIR}" -name "*.ifo" | wc -l`
+ 
+ if [ $nmy -ne $ndicts ]; then
+ 	echo "should be: $nmy, we have: $ndicts" >&2
diff --git a/app-text/sdcv/files/sdcv-synonyms-bin-search.patch b/app-text/sdcv/files/sdcv-synonyms-bin-search.patch
new file mode 100644
index 000000000000..e3583b1a5fb6
--- /dev/null
+++ b/app-text/sdcv/files/sdcv-synonyms-bin-search.patch
@@ -0,0 +1,112 @@
+ommit 4ae420734990ab9f5ccc038262368256b9323f4a
+Merge: b66799f 994c1c7
+Author: Evgeniy Dushistov <dushistov@mail.ru>
+Date:   Wed Dec 23 04:30:13 2020 +0300
+
+    Merge pull request #67 from doozan/master
+
+    Use binary search for synonyms, fixes #31
+
+diff --git a/src/stardict_lib.cpp b/src/stardict_lib.cpp
+index 0af4304..6b1f92b 100644
+--- a/src/stardict_lib.cpp
++++ b/src/stardict_lib.cpp
+@@ -833,21 +833,23 @@ bool SynFile::load(const std::string &url, gulong wc)
+ {
+     struct stat stat_buf;
+     if (!stat(url.c_str(), &stat_buf)) {
+-        MapFile syn;
+-        if (!syn.open(url.c_str(), stat_buf.st_size))
++
++        if (!synfile.open(url.c_str(), stat_buf.st_size))
+             return false;
+-        const gchar *current = syn.begin();
++
++        synlist.resize(wc + 1);
++        gchar *p1 = synfile.begin();
++
+         for (unsigned long i = 0; i < wc; i++) {
+             // each entry in a syn-file is:
+             // - 0-terminated string
+             // 4-byte index into .dict file in network byte order
+-            glib::CharStr lower_string{ g_utf8_casefold(current, -1) };
+-            std::string synonym{ get_impl(lower_string) };
+-            current += synonym.length() + 1;
+-            const guint32 idx = g_ntohl(get_uint32(current));
+-            current += sizeof(idx);
+-            synonyms[synonym] = idx;
++
++            synlist[i] = p1;
++            p1 += strlen(p1) + 1 + 4;
+         }
++        synlist[wc] = p1;
++
+         return true;
+     } else {
+         return false;
+@@ -856,13 +858,38 @@ bool SynFile::load(const std::string &url, gulong wc)
+ 
+ bool SynFile::lookup(const char *str, glong &idx)
+ {
+-    glib::CharStr lower_string{ g_utf8_casefold(str, -1) };
+-    auto it = synonyms.find(get_impl(lower_string));
+-    if (it != synonyms.end()) {
+-        idx = it->second;
+-        return true;
++    bool bFound = false;
++    glong iTo = synlist.size() - 2;
++    if (iTo <0) return false;
++
++    if (stardict_strcmp(str, get_key(0)) < 0) {
++        idx = 0;
++    } else if (stardict_strcmp(str, get_key(iTo)) > 0) {
++        idx = INVALID_INDEX;
++    } else {
++        glong iThisIndex = 0;
++        glong iFrom = 0;
++        gint cmpint;
++        while (iFrom <= iTo) {
++            iThisIndex = (iFrom + iTo) / 2;
++            cmpint = stardict_strcmp(str, get_key(iThisIndex));
++            if (cmpint > 0)
++                iFrom = iThisIndex + 1;
++            else if (cmpint < 0)
++                iTo = iThisIndex - 1;
++            else {
++                bFound = true;
++                break;
++            }
++        }
++        if (!bFound)
++            idx = iFrom; //next
++        else {
++            const gchar *key = get_key(iThisIndex);
++            idx = g_ntohl(get_uint32(key+strlen(key)+1));
++        }
+     }
+-    return false;
++    return bFound;
+ }
+ 
+ bool Dict::Lookup(const char *str, glong &idx)
+diff --git a/src/stardict_lib.hpp b/src/stardict_lib.hpp
+index a629cbe..38f76f4 100644
+--- a/src/stardict_lib.hpp
++++ b/src/stardict_lib.hpp
+@@ -102,11 +102,15 @@ public:
+ class SynFile
+ {
+ public:
++    SynFile() {}
++    ~SynFile() {}
+     bool load(const std::string &url, gulong wc);
+     bool lookup(const char *str, glong &idx);
++    const gchar *get_key(glong idx) { return synlist[idx]; }
+ 
+ private:
+-    std::map<std::string, gulong> synonyms;
++    MapFile synfile;
++    std::vector<gchar *> synlist;
+ };
+ 
+ class Dict : public DictBase
diff --git a/app-text/sdcv/sdcv-0.5.3.ebuild b/app-text/sdcv/sdcv-0.5.3.ebuild
new file mode 100644
index 000000000000..8b7225b3c9d1
--- /dev/null
+++ b/app-text/sdcv/sdcv-0.5.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs fr ru sk uk zh_CN zh_TW"
+inherit cmake l10n
+
+DESCRIPTION="Console version of Stardict program"
+HOMEPAGE="https://dushistov.github.io/sdcv/"
+SRC_URI="https://github.com/Dushistov/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="darkterm nls readline test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/glib-2.36
+	sys-libs/zlib
+	readline? ( sys-libs/readline:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( >=sys-devel/gettext-0.14.1 )
+	test? ( app-misc/jq )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.5.3-t_list.patch"
+	"${FILESDIR}/${PN}-t_interactive.patch"
+	"${FILESDIR}/${PN}-synonyms-bin-search.patch"
+)
+
+src_prepare() {
+	if use darkterm; then
+		sed -i 's/;34m/;36m/' src/libwrapper.cpp || die
+	fi
+
+	rm_loc() {
+		rm "po/${1}.po" || die
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+
+	# do not install locale-specific man pages unless asked to
+	if ! has uk ${LINGUAS-uk}; then
+		sed -ni '/share\/man\/uk/!p' CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_NLS="$(usex nls)"
+		-DWITH_READLINE="$(usex readline)"
+		-DBUILD_TESTS="$(usex test ON OFF)"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	use nls && cmake_src_compile lang
+}
+
+src_install() {
+	# with USE=nls, but empty intersection of LINGUAS and list of
+	# supported translations, this directory is required, see bug 583386
+	mkdir -p "${BUILD_DIR}/locale"
+	cmake_src_install
+	dodoc doc/DICTFILE_FORMAT
+}
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index c4e4ca6f9de2..4ef0beed4523 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,5 +1,5 @@
 AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898a2331b649a35269bd3389e6c71c9f161b5b02b857230a6c7f4807cb975ff4c7d6a99a5576d2bb79190e5914c9faf9488e1d11a SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9
 AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef
 DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce
-EBUILD sgml-common-0.6.3-r7.ebuild 2537 BLAKE2B 85dc28211d840e643ea698e0e0b0ac344fca4b651ea875e71a387c5c6f16e93081f90f4beef01c356ddd1cbc9fc64033e2161a1a217b9b8b0fe982566223417f SHA512 840e89a2078451d1fa2da8eee5c8f336ef66e6d1d9522dfab730c5f595bedea20d5d5d889d6e07d1e8d5245471e987c298e4cd01128083d5d9f0cc7355c8aba5
+EBUILD sgml-common-0.6.3-r7.ebuild 2538 BLAKE2B c7cd5d54769217e6769dfa5d3ff19ab6b425acb4a5d9d72f507671726816a896c3cfc0f2d5e6314aaa7826e9fa29246c6447ca761a8339bc58a20a558259a411 SHA512 225a99ad7bf1b9ea4246240e487dace6ccb3edfb9bd40513ef91aab1ca4e13cda308d0cdd16dd686a5b16e8783a08187c0bc760b91937ebd4b97132724af13df
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
index fce56eecf964..d8abdc835b6a 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
 # install-catalog is GPL
 LICENSE="FDL-1.1+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index f3003a8de7bd..d6d437846b80 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,5 +1,5 @@
-DIST sigil-1.3.0.tar.gz 21697294 BLAKE2B 0ded5f2fa4a85a583113d268a0c287727faa9548a95ca3b564efac5db3528e0bf52b0df12f88cda46ae02851b0b85967c23c07cd3cd55073a87bcffbae8dec87 SHA512 fe1cbc2591dbfb54a2c561a3c53684447a4e90d944714bb182ee6ef160df74cc886c4d178d88d24a217643099ff9f409048ea2e5bb8ac88746fd280e48daa1b8
 DIST sigil-1.4.3.tar.gz 24118565 BLAKE2B 4da0829cc82efe48c71c2a5d0be8477fd85291acd9578c14bd26f4521d2fd2322bec4c30002235254b9e731730a56b79787723059ba63884b75b33614cd94f39 SHA512 2f1e13a78a361df9b9031d5c04831d7e3ff09d16ed9cbd198b7735a4700f86e367f607554e805eb50db1a4562cbca33a8fb9cdf8167a95a43cbc2668ceb5550c
-EBUILD sigil-1.3.0.ebuild 2010 BLAKE2B 7e11b1e820ab88865810dfc37c859794864a48240a5663dd4d3167dc5c5d1867c9b0eb359812432af1a65fd32c0ef6069fe6ca67281f888dd2a6a7966cfb7130 SHA512 e85ba0ebb346f6b94127ca8d4c8e4c5dd3c0de2bf58ad3f7c2776881081c7d22c8847ffee376240f377899d34a6e8d47e8bc8c0b9a5d2355ccc08ff31ca0c629
+DIST sigil-1.5.1.tar.gz 20020962 BLAKE2B ac70c117d69c4062d66151372fc8cbede48be6f38ceae7d1dd1bd49fd8a0a4a352c885a120e00ba729e64ebfa928103d07f7bb85d69cbb3385f640f4fcf42985 SHA512 281c8327f7a05b9c9f805b02ef4c21f50d340a2f9e09dcae74be30aad107b0f2605801f0239e9a503db70afa2b37b7931dfec0efa5662dde906ce6c014da8849
 EBUILD sigil-1.4.3.ebuild 2012 BLAKE2B cc0ff455a7cea95499872c82fe675f30ea360b5a6a2777bc448dd913dc0b896cf43c168d372dd4a61bce59e00aaf101643613217ea44bbe45aefa596b3608a1e SHA512 39ca3e0970b166450afe0c955725d99e89b2ba67f30e0d3d348fd87c6b1caef97201dc61286fec258dbc0e1de8c0f3542e2964b8f8217051855d0261256050be
+EBUILD sigil-1.5.1.ebuild 2014 BLAKE2B de211456476fa5da00418f2c43f558516774feb759084d3b71d349ef1b5df775049627ec771927daa668c95fb14ad43f7229809db92062a016353cd0948a5cf1 SHA512 0ec8060479bf0470bc0c8d7237f436fe7fba0a7e345c1399d753f4f6690bb30a267e5425e288d7973b7f2a8d3c216334883881ac2d8ca63313b7f9e5d33b3107
 MISC metadata.xml 962 BLAKE2B 1f90625c7778f97227f27708f6ca94cc002fc587dab80ed64c0c8c1a809a759da20174ccc4ada91411ae1c9ed761600129caba3fdf81cae97ab544db46bf3258 SHA512 67046450741a9553bbb826b4ae1db7b99e9b09d53a7036fe13fd3c2a99ef41ed02efb6a3a2a2e72e845cf8c28395e87c949de0efc160910be2a6c02ed8b60aa5
diff --git a/app-text/sigil/sigil-1.3.0.ebuild b/app-text/sigil/sigil-1.5.1.ebuild
index 240deca764e0..950ec134b837 100644
--- a/app-text/sigil/sigil-1.3.0.ebuild
+++ b/app-text/sigil/sigil-1.5.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 PYTHON_REQ_USE="tk"
 
 inherit cmake python-single-r1 xdg-utils
@@ -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/simple-fb2-reader/Manifest b/app-text/simple-fb2-reader/Manifest
index 382d4796a7dc..4e529dab4543 100644
--- a/app-text/simple-fb2-reader/Manifest
+++ b/app-text/simple-fb2-reader/Manifest
@@ -1,3 +1,3 @@
 DIST simple-fb2-reader-1.1.3.tar.gz 94550 BLAKE2B 857f3b472d6dc2e7c4b1935b8123a1ae269df436457ad061cd8bb2d051b77fe2f318e37f1e2adc93add132870879a0fe53bf36eaaf9998bdfaf6993dd34d32c2 SHA512 6c683ca1cd29e09a2c3ceef2057f61cba8a7711d7c6508a3ebb40ccf3440e90ec87c34ff9832d11f2f9215f8bccd4d365cd725ec5d4004562763e1bdbae3cc7a
-EBUILD simple-fb2-reader-1.1.3.ebuild 571 BLAKE2B b4ae5ad5f708d6c04fe9019d2d16a25e5c41188650da73da3e7a65041f8ea60c91f2be63a11b2ed29bca0ee67bc0244c16f29facb6e1a546970b6a65fdeebd6f SHA512 8c92c67bb3767df08af35b0283493864a8ec8529d3db3ac7c4d5a1f3d1bd639b3d7aaf482a324cefd90bc4a05ab4c89b553a376ed0305d5ca9aa60e57e4e5e66
+EBUILD simple-fb2-reader-1.1.3.ebuild 559 BLAKE2B 08766cf549004dfde3cf2f6795e7919532c858b4888eb5fcf60c78eef4ccc20cd4aad59344cc965dcc1ce8f9bc78060b256cb5f49b3436b171ae0d53a45e1650 SHA512 b39f66a495a8d931ef8b44f810c9604a064f3880d98810dc511b9fca3aba878e4e13fcc24a46d725326ec0989af30d911fee40adf0849f5d0995ce550adf39bb
 MISC metadata.xml 317 BLAKE2B 42a730980929eff799e8de69cd94c2f15a2da6ba77cc3c98dabd4a323a6fcaae293a437b6509d0b9b32fe1bebc7c0d7e94f948f16c42a1eea552da45d40c7fc5 SHA512 09ce0420bdd7879b4f7578ea792cd27421abb6155d121c18bb0728c4e63b31577f7f6b8aa5dd1d647dd87e8f73c1a668148e0fc76efa7b3fcede097015fcb70a
diff --git a/app-text/simple-fb2-reader/simple-fb2-reader-1.1.3.ebuild b/app-text/simple-fb2-reader/simple-fb2-reader-1.1.3.ebuild
index 3568a4f9df7e..d52a38df90b5 100644
--- a/app-text/simple-fb2-reader/simple-fb2-reader-1.1.3.ebuild
+++ b/app-text/simple-fb2-reader/simple-fb2-reader-1.1.3.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit cmake-utils xdg
+inherit cmake xdg
 DESCRIPTION="A simple gtk3 reader for fb2 ebooks"
 HOMEPAGE="https://github.com/Cactus64k/simple-fb2-reader"
 SRC_URI="https://github.com/Cactus64k/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
@@ -20,5 +20,5 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	xdg_src_prepare
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
diff --git a/app-text/spellutils/Manifest b/app-text/spellutils/Manifest
index df9256472eec..bbd6e7c5a606 100644
--- a/app-text/spellutils/Manifest
+++ b/app-text/spellutils/Manifest
@@ -1,4 +1,4 @@
-AUX spellutils-0.7-nls.patch 506 BLAKE2B 686d2f97567d9e3521738307adf4622be83fb726f1a64057eef76d01b2ffafe5a2fdb3cc4d43d05a54ecaa5119c906dc18c1455db434b1ead644d97dccc80a05 SHA512 1d329b8cb27f6f50c3b0c7572352ca57420da12553143269c691f4998d62d6b7f730c42f2cbae324debddbda1729be3ea775c90ee3894d75e64d5f685f764723
+AUX spellutils-0.7-nls.patch 433 BLAKE2B aa85963ace2272facd52b6e8478c1522d363ca81011f53d8971802b74835065cddae904fb3bf873886ae90f9efee3d4362fba13141cf28e1a2d27422c1f5d44b SHA512 94ab6bba55800559ad2621001df828ff67d40df045a63737a112545d558a5436a85cd3220993daf91c23591cc6b94ef692dad9811e08ca0066d602ece07b5b8e
 DIST spellutils-0.7.tar.bz2 110421 BLAKE2B b415a8be96962b88c4ba64270b43e90e42a3ebe23d765ef970cf55a22ada842f269878c4b3a72e6284864d1d1c3e4ade1e84aaf28d4fa39f86f0280db4f27e4d SHA512 030b06038c587e668fcbef95afc64e28db48a25f2b247b829155c1a5b66d3b3012650cb4c13e5de41a70a1665b05fbfb44a4cd0b1295868e611a21d855f02f9e
-EBUILD spellutils-0.7.ebuild 688 BLAKE2B ea6198a4979672b5b8d2c42abbc38a1fc9721afe5d368646839e1b8c824ed9e62152625715c0d0ecaaa56f11dd4f159616fedfbd8c9a4843ddd28bd209b608dd SHA512 7b812939c6203ca937c31d71e50dc6ccbb250abdbaa7cc6c578d22eff4b908d572963e6306cdd3b45f870a69c0c56f7084d9d574eaa4b43eecad7dda3eb95ad3
+EBUILD spellutils-0.7.ebuild 684 BLAKE2B 8756b375935826882174d604cfd15078048cd1acc5fe54f967109a96e410590371df840d77bdbf462a8e097c17b73cedf69671c44237232289e5e657ca269727 SHA512 5009c6e89fef86e8030664026d88a58000bc015e38c0225d85f360e8dec5860f93d4078c6782a491be775a65cd5794e74bfd01fec4c43fbae6eac3df427acd60
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/spellutils/files/spellutils-0.7-nls.patch b/app-text/spellutils/files/spellutils-0.7-nls.patch
index ff36f67a9823..eed9d8dd9d5a 100644
--- a/app-text/spellutils/files/spellutils-0.7-nls.patch
+++ b/app-text/spellutils/files/spellutils-0.7-nls.patch
@@ -1,5 +1,5 @@
---- po/Makefile.in.in.orig	2000-04-16 12:04:50.000000000 +0200
-+++ po/Makefile.in.in	2013-07-24 04:14:20.698869858 +0200
+--- a/po/Makefile.in.in
++++ b/po/Makefile.in.in
 @@ -119,8 +119,8 @@
  	for cat in $$catalogs; do \
  	  cat=`basename $$cat`; \
diff --git a/app-text/spellutils/spellutils-0.7.ebuild b/app-text/spellutils/spellutils-0.7.ebuild
index da3435590537..36331975124e 100644
--- a/app-text/spellutils/spellutils-0.7.ebuild
+++ b/app-text/spellutils/spellutils-0.7.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs
 
 DESCRIPTION="spellutils includes 'newsbody' (useful for spellchecking in mails, etc.)"
 HOMEPAGE="http://home.worldonline.dk/byrial/spellutils/"
@@ -13,18 +14,15 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
 IUSE="nls"
 
-DEPEND="
-	nls? ( sys-devel/gettext )
-"
-DEPEND="
-	nls? ( virtual/libintl )
-"
+DEPEND="nls? ( virtual/libintl )"
+RDEPEND="${DEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
 
 DOCS=( NEWS README )
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-nls.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-nls.patch
+)
 
 src_configure() {
 	econf $(use_enable nls)
diff --git a/app-text/sword-modules/Manifest b/app-text/sword-modules/Manifest
index 38f205997405..630dfe65ac04 100644
--- a/app-text/sword-modules/Manifest
+++ b/app-text/sword-modules/Manifest
@@ -1,2 +1,2 @@
-EBUILD sword-modules-2.2.ebuild 11993 BLAKE2B fb7977dafa649085c49b66681a47a73ff34e7e3f00f9102d5411a2ccaf864efbb95f2907672a15d90ff43e2d5e81ca187021b51e215092ae2c68514b828fe755 SHA512 5165164dd8c1859c4432f52159d16560c6b0b9c1e69f687be55165f1420ced9bc0cbe8fb60bc0a7b1d1ce5e0ae39617428f3226f6d4e77cac26940347b5b99e8
+EBUILD sword-modules-2.3.ebuild 12270 BLAKE2B f05f08d66084896780448a04fee6acedbdafe34ee3ef97bd173f0d9c12f6ce148c5494be50e1659c97aca98ae300338a74ec325b21a411ebc26ae60f2432d704 SHA512 f14d750a5594735afdfe1ee1e49adcd12b3ea50e49cc523ece34cdf9fd3334c08b4b918e0e1d7da7e1f8b0e7cd965de8c2ea4ea225e2ba4cfe5fccd9d7f6d274
 MISC metadata.xml 385 BLAKE2B 58e3a018c64e0068b39c728415f94cf05afe3c63e4ecb340ef47e6ecad5a3c8aa0776b6390acfa6eef8775e5065d5a65c3ea8ebc07219a0a990be36e3bf305f3 SHA512 a305a1265342a3674f5bc0f2b5adb788732ccc78c5e05cbdb116fb4a556ae099d8394c10572e5e01e3dae70bf9b4eb982079bf130b4567f4aadb55d3e76bbc1a
diff --git a/app-text/sword-modules/sword-modules-2.2.ebuild b/app-text/sword-modules/sword-modules-2.3.ebuild
index 3c794d642151..c69774346873 100644
--- a/app-text/sword-modules/sword-modules-2.2.ebuild
+++ b/app-text/sword-modules/sword-modules-2.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -85,18 +85,23 @@ RDEPEND="
 	l10n_de? (
 		app-dicts/sword-GerAlbrecht
 		app-dicts/sword-GerAugustinus
+		app-dicts/sword-GerBoLut
 		app-dicts/sword-GerElb1871
 		app-dicts/sword-GerElb1905
 		app-dicts/sword-GerGruenewald
+		app-dicts/sword-GerKingComm
 		app-dicts/sword-GerLeoNA28
 		app-dicts/sword-GerLeoRP18
 		app-dicts/sword-GerLut1545
 		app-dicts/sword-GerLutherpredigten
+		app-dicts/sword-GerMenge
 		app-dicts/sword-GerNeUe
+		app-dicts/sword-GerOffBiSt
 		app-dicts/sword-GerReinhardt
 		app-dicts/sword-GerSch
 		app-dicts/sword-GerTafel
 		app-dicts/sword-GerTextbibel
+		app-dicts/sword-GerZurcher
 		app-dicts/sword-MAK
 		app-dicts/sword-Rieger
 	)
@@ -240,6 +245,7 @@ RDEPEND="
 		app-dicts/sword-Esperanto
 	)
 	l10n_es? (
+		app-dicts/sword-SpaPlatense
 		app-dicts/sword-SpaRV
 		app-dicts/sword-SpaRV1865
 		app-dicts/sword-SpaRV1909
@@ -344,6 +350,8 @@ RDEPEND="
 		app-dicts/sword-Haitian
 	)
 	l10n_hu? (
+		app-dicts/sword-HunIMIT
+		app-dicts/sword-HunKNB
 		app-dicts/sword-HunKar
 		app-dicts/sword-HunUj
 	)
@@ -428,7 +436,9 @@ RDEPEND="
 	)
 	l10n_nl? (
 		app-dicts/sword-DutKant
+		app-dicts/sword-DutKingComm
 		app-dicts/sword-DutSVV
+		app-dicts/sword-DutSVVA
 		app-dicts/sword-NlCanisius1939
 	)
 	l10n_nn? (
@@ -479,7 +489,6 @@ RDEPEND="
 	)
 	l10n_sl? (
 		app-dicts/sword-SloKJV
-		app-dicts/sword-SloKJVA
 		app-dicts/sword-SloOjacano
 		app-dicts/sword-SloStritar
 	)
@@ -558,6 +567,7 @@ RDEPEND="
 	l10n_zh? (
 		app-dicts/sword-ChiNCVs
 		app-dicts/sword-ChiNCVt
+		app-dicts/sword-ChiSB
 		app-dicts/sword-ChiUn
 		app-dicts/sword-ChiUnL
 		app-dicts/sword-ChiUns
diff --git a/app-text/talkfilters/Manifest b/app-text/talkfilters/Manifest
index abc52b2dcc89..2dd35af20166 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
+AUX talkfilters-2.3.8-format-security.patch 732 BLAKE2B 84cd1350e015bd366448f4721b233c45d1f55259ddfaeab86e83f8af2973438ecfb6919cb83349e937ae2fd7e701f87cdf4a9ce5147e40c8bf1dcd11dce37168 SHA512 a0d1fe6aba72d1783ef151bf4a0b2e4ecaf0b3db7abe4278e6f92d49dc385516f36b71fcf348a4f0e0bab3c3496830f9aed6b8cfee14e4cc03369319ce39df37
 DIST talkfilters-2.3.8.tar.gz 821338 BLAKE2B 1ed5904829380858e5599458d54d3e7a339c10f057a94ce17f38b330d89ad5aba972cf234c10aa2ed7ffbf67c8b4c01a9bba0ebe73b4ba2bf32230e9e36eda3d SHA512 3fb317c572e95756fea9dcbaeac01e9576b05f5b0710e64513ecd05ec219f8050dec3bc5bc5d0d5f00c642487925765843da03525cfcb23925cab3c321272b28
-EBUILD talkfilters-2.3.8-r1.ebuild 649 BLAKE2B b9f0150bd0398bbda3ab3521b06fe2507835bd354bccc0c1ccb65890c216f238030ffe62a1c8773f52005ec5717d27db2d2a4d642a9e23258a5a5ee90bf22534 SHA512 60446283924f32a51ba87027d0ad8fc0ddcb1992a906d6399ad2a969c286d65b279d21bb2c7de20860d2a99d0b03a464b2023ab569697dc94685ee727583ba07
+EBUILD talkfilters-2.3.8-r1.ebuild 589 BLAKE2B 24be9cb420a1537aab23710360c003dfd3b7957af10090511bf933da71b2ca9a0dbe695f0dcdf2c8bc9d0da55563e28114aab5c5d9cc71fd3b8223156a0a3f59 SHA512 84452aa30269414d4d2316ffd10bc36445052a466e57c30a59b4bf9f64ef96c612a0072d47000c778333871e9b97604c77556ca7bb271e7a30fd09cba0d9de0e
 MISC metadata.xml 957 BLAKE2B 2f66b167131788d1df1195fd9f4d372cfe2ada94c10ad6ce6d0a1bcd28582f3249344ef5733e39838453dca5b54456066ae93e976437e239a4a556982b436426 SHA512 d1b664bff6db93a8289a01b6ef00df35a06207722360ca753853fde6cd667abd739acbbadc9eacb16d46536326c61d6b1673ab50940f778c7ed7c228a082b52e
diff --git a/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch b/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch
index cf59574694a6..6d8df6565843 100644
--- a/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch
+++ b/app-text/talkfilters/files/talkfilters-2.3.8-format-security.patch
@@ -1,8 +1,3 @@
- wrap.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/wrap.c b/wrap.c
-index 7c89dc8..745d1ec 100644
 --- a/wrap.c
 +++ b/wrap.c
 @@ -105,7 +105,7 @@ int main(int argc, char **argv)
diff --git a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
index d8b9123d8f39..df98a4f5428d 100644
--- a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
+++ b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
@@ -1,9 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Convert ordinary English text into text that mimics a stereotyped dialect"
 HOMEPAGE="http://www.hyperrealm.com/talkfilters/talkfilters.html"
@@ -15,11 +13,7 @@ KEYWORDS="amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-format-security.patch
-	)
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-}
+)
 
 src_configure() {
 	econf --disable-static
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
index c69fced592e0..c76fde99ae28 100644
--- a/app-text/teckit/Manifest
+++ b/app-text/teckit/Manifest
@@ -1,3 +1,3 @@
 DIST teckit-2.5.10.tar.gz 2112617 BLAKE2B fe38bbecfeec61f2c926fc033230a753ce1435fdf77bebe3c6d6c427a46bd5019d23605ee3d73f733d6345301a26ad3b1fd207daa46fdf66a7728be4569758aa SHA512 c2d3bcf1245723bb3bbe9c147fc3024e667ab4d1280aa0f8b5394b2dd9bb75e3f2bf42f057744fa86ed551ebf3e0f13300072a0325888cb8f9501d874c356f34
-EBUILD teckit-2.5.10.ebuild 1033 BLAKE2B fedcde1bae2c0729b5956f353e4486e1f2d597008e919205e06e6a4982ef5295fe9178bd124cb4cf73799598008a8bd0090ee3c43770cec3af33f92b3afcf2bf SHA512 a06f6ab03640c477f0aea5358f018f91640f9591877f61de75e49c3a9e02e3997cd1b0d5bbe120890fc7e595f2d6574837c0a45a8146ea114200a26a33e1b25b
+EBUILD teckit-2.5.10.ebuild 1034 BLAKE2B 9ab25bb85b8ee439b888ab4360cd8f02bc6b7b0c7bfd73136fea8701e6e775fff9d12a973b2130362b820f3f050d84f5c590cf82b492ac217790e3a2203f336f SHA512 42778273986caec141fb41f3def549f123a3cd119b69ebd2b8f27a4899bca2e57aaa650af9b6127ddf508e1f0447441a0c32fff9031daaa63519b12d5e86a480
 MISC metadata.xml 328 BLAKE2B 62957bc5c7f41162d3376974ee6812a6ec71eeb48e4740b710308c58bab8aef4155961db7171ba742d9da7d025840d7ec390575c3dfc47429e839e27b21a3d0b SHA512 ba8d102f0a114796f53adaeb95566a469d891a534bd5a13a43699b9438dcc2c78ffcfdaf851035e1e484463eaac34b925914f532e78c048ad096dafff144985a
diff --git a/app-text/teckit/teckit-2.5.10.ebuild b/app-text/teckit/teckit-2.5.10.ebuild
index dce514539bd8..84fc007894c0 100644
--- a/app-text/teckit/teckit-2.5.10.ebuild
+++ b/app-text/teckit/teckit-2.5.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/silnrsi/teckit/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-libs/expat
diff --git a/app-text/teseq/Manifest b/app-text/teseq/Manifest
index 2f39cf9ac61c..f914179aec32 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
+EBUILD teseq-1.1.1.ebuild 332 BLAKE2B 735e94cce3d1cc3f7796ff0fa2048cb95b8226f9cbfcbf206f53704655def1878d707d89cf57e494b72bdd8861dab16263e5295f37d8703ff892d130726d3e15 SHA512 c80124baaf706f11c002e6b35051a973ecea6334c0fad72efe71df98f455d92f7a7ca4fedcfc6a5230e51804baef16911491ba1042b6682c7b87d8463251ebe1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/teseq/teseq-1.1.1.ebuild b/app-text/teseq/teseq-1.1.1.ebuild
index 360d7d34a80d..c27cb9da07be 100644
--- a/app-text/teseq/teseq-1.1.1.ebuild
+++ b/app-text/teseq/teseq-1.1.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="A tool for analyzing files that contain control characters and sequences"
 HOMEPAGE="https://www.gnu.org/software/teseq/"
diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest
index b1f29879d8fd..be66de561d7e 100644
--- a/app-text/texi2html/Manifest
+++ b/app-text/texi2html/Manifest
@@ -1,3 +1,3 @@
 DIST texi2html-5.0.tar.bz2 15397249 BLAKE2B 3e502d9424c2936a922488aab7a66140c0a8369253a5500beeebcea0942ffa7b97fb7021b23212264e110d4bdab4850f263269aacf61de23ac6e052dfcf10d67 SHA512 50afc2f1f8875d3e62a51cc0339bd4c4f058041f42a9fda9cd5b02960f0d5c72838e4f010702ba716dbd256946f64520ce1e5b86539b6f7b8b7ce24a43c98e9d
-EBUILD texi2html-5.0-r1.ebuild 1339 BLAKE2B 5503cdc3b0caf6605e8248cd3ed54b3b94d6e101092500d35ce350fd0db65c369f075b0aa20e595d7abc798c15d22d0ea1c82be83974e922d2cb7cc0e259e37e SHA512 af0b57af9f1b0f0911e031664013139b3f991fec4d6135e0586e7350d0365049c66267e1f9e4bfdf4b8c55e79b11106fcfd31fddb2d205225f0dea93fc4b000f
+EBUILD texi2html-5.0-r1.ebuild 1340 BLAKE2B c4f8fbe45e947b6b8277b5ba821447ed4fd8ed30e76ce4fa60109a68d05ef1c5cc73dc90850dd7d13c35a6884a4fc8c3d5e478b74e882d07d54cd1cf2a59bbdb SHA512 281d8dc8135f468e6e6be876974e3b4c7ba54a2950e4a280e3b4268eb061f02b1a61de73f66c393ec480a6d5af1b4d8bd67d93222a2b0ba8b7d9c003b29559e1
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild
index 5ea9b5a78ad0..5643b6089563 100644
--- a/app-text/texi2html/texi2html-5.0-r1.ebuild
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="unicode"
 RESTRICT="test" #411523
 
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 582de29ff45b..a05425fae35c 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -1,188 +1,382 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
+DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
 DIST texlive-core-patches-2020-5.tar.xz 13132 BLAKE2B 2117b0b44078cc4af26337c6407441ee660848e29bc190340b36be80fe2d52998da2d8799f0f7943670c29f33968c06464d92c2bce6fb238170be72d6acb2337 SHA512 65063f212732c801926bc97d639a9b71389f30b247b0299decb3d1d8a4c9770d314f348c50b9dde1d455f2531e1b8a8513eaf5fc0c35455d5dd87f3b3374d5e3
+DIST texlive-core-patches-2021-1.tar.xz 4820 BLAKE2B 1316cdc65c8f0a7164169fc6a795c50f7fccc99cea7a80290c18189f931b002e47b081de593c47d8da9650498a279f7d0473f115f02b37993859fcd475dbebed SHA512 4267934427265995c2a0c00d837399ec9670ba5c7df5c4599a486a2098de9a05640ff77f29bd7390070f3c973e5cc067356cfdd6b2c9415b7a56b96de789fb82
 DIST texlive-tlpdb-2020.tar.xz 1261796 BLAKE2B b070f09024a8a12ffc73f8ef6e82026b0d1cc963e50fb0b4c1226043f642db90cf18cd888b3bd4a1b559080b4a55b78b29b44d3456f39b7b9ce09e8edc29a166 SHA512 587433bada2333df2462b4adc012278f4f5f01cf85243fb0c2e46bfffa46e1ec7b34abfb8a0415eb071acd87f4abaa509b1f1c7b2500f3cdb6e127b89a1a58ab
+DIST texlive-tlpdb-2021.tar.xz 1335040 BLAKE2B a5608b329666ad55032fb9dbf7fc6da9b8b2c94c03aed838cf8575742a23294f3319ad8e45fd6b4f65cc59f673c78b9d96b4f24e2ad07a8a08aa313822eea137 SHA512 ca9d5f2231246984ec489b4dfffb93c8b9540b8479a521aa91658fba3ce452c814e9e24e28d9ab6a0124d8eaf4cf7c14fefb379e84b3495752a9a2b8a2add3db
 DIST tl-a2ping-2020.tar.xz 30652 BLAKE2B 63e857ba7142751828669bc00d9689f000effddecc221a03943f508e69a28bdc675707527b47a5444ac9881268b1d9abe372d0bbcde78007aaf81c69b15421dd SHA512 4008c18f93a7d378c8da20bad7c1fdf19c3e6befccdcc804326168854fcd35bb89fe414b30a26dbddeaf81a11c0d404bf5b5459bd3d8adce49dc30279e3bd420
+DIST tl-a2ping-2021.tar.xz 30652 BLAKE2B 63e857ba7142751828669bc00d9689f000effddecc221a03943f508e69a28bdc675707527b47a5444ac9881268b1d9abe372d0bbcde78007aaf81c69b15421dd SHA512 4008c18f93a7d378c8da20bad7c1fdf19c3e6befccdcc804326168854fcd35bb89fe414b30a26dbddeaf81a11c0d404bf5b5459bd3d8adce49dc30279e3bd420
 DIST tl-a2ping.doc-2020.tar.xz 39744 BLAKE2B 4de3d1df0a1af62c203c1398faec9918ec38ee306105cc31f9534117b5dc58f0b14442005a7b0fdd239eb2e40b8d6a84b7dfa7e7e93ded4b83fe636e6c6cf3df SHA512 7a7b6474819b2715c131485472963b463163378d4ae4ac586f17a130b3327c6dda1f4132f4f2379388a8a493fb2374abfff6b7ad87513cbe9d04993572692aeb
+DIST tl-a2ping.doc-2021.tar.xz 39744 BLAKE2B 4de3d1df0a1af62c203c1398faec9918ec38ee306105cc31f9534117b5dc58f0b14442005a7b0fdd239eb2e40b8d6a84b7dfa7e7e93ded4b83fe636e6c6cf3df SHA512 7a7b6474819b2715c131485472963b463163378d4ae4ac586f17a130b3327c6dda1f4132f4f2379388a8a493fb2374abfff6b7ad87513cbe9d04993572692aeb
 DIST tl-adhocfilelist-2020.tar.xz 3600 BLAKE2B cf6e37b1b3ce64ee7033f43677416c3de6abf2859bb2d985795608f8ccbfc09f842cd3d2664840ff64a7352f179abe4e5fec096b25326a47bd074cbd26bce78d SHA512 57436dae1489c0f614c4b002f83d34a711398a762ac532b44b1d91a51d068462aaedb5b034923629f7630f039988452eb833d1e98af389c788091517bbee8954
+DIST tl-adhocfilelist-2021.tar.xz 3600 BLAKE2B cf6e37b1b3ce64ee7033f43677416c3de6abf2859bb2d985795608f8ccbfc09f842cd3d2664840ff64a7352f179abe4e5fec096b25326a47bd074cbd26bce78d SHA512 57436dae1489c0f614c4b002f83d34a711398a762ac532b44b1d91a51d068462aaedb5b034923629f7630f039988452eb833d1e98af389c788091517bbee8954
 DIST tl-adhocfilelist.doc-2020.tar.xz 9876 BLAKE2B 6f0a079b7aa05335f4cde30cc93bdc0781f6fa9fee39e7e7cb0cee7e66fb27dcd73b64afc51e02b66bd2ae6caed641eec402ee7350505daecec05b4a4dc684c5 SHA512 14bde143bf3ffa3f2b972f93544089e4c0314c7696e1d711719549b7e831278c66fee0676665fe6eaaac744689d613dce159e4eee2e3f9c24dbbe602794fc62e
+DIST tl-adhocfilelist.doc-2021.tar.xz 9876 BLAKE2B 6f0a079b7aa05335f4cde30cc93bdc0781f6fa9fee39e7e7cb0cee7e66fb27dcd73b64afc51e02b66bd2ae6caed641eec402ee7350505daecec05b4a4dc684c5 SHA512 14bde143bf3ffa3f2b972f93544089e4c0314c7696e1d711719549b7e831278c66fee0676665fe6eaaac744689d613dce159e4eee2e3f9c24dbbe602794fc62e
 DIST tl-adhocfilelist.source-2020.tar.xz 16408 BLAKE2B cb3c8401e40f4b2d922be8ae6fb5381894df8b1a0634f8aaf21d2d4dcc861de0818904ff0342ce9684d1ac956afcc71b6d9e1c1bfcd0523b405444359e8de063 SHA512 15e7f652408c5975ba47131109e0d18bcb1d270e0ea630a9a3ff385e499cf3607a366e708a5ec9559d7ccc2a5e0b2d3d0f5f615142978a918b0bd1bd0218a30d
+DIST tl-adhocfilelist.source-2021.tar.xz 16408 BLAKE2B cb3c8401e40f4b2d922be8ae6fb5381894df8b1a0634f8aaf21d2d4dcc861de0818904ff0342ce9684d1ac956afcc71b6d9e1c1bfcd0523b405444359e8de063 SHA512 15e7f652408c5975ba47131109e0d18bcb1d270e0ea630a9a3ff385e499cf3607a366e708a5ec9559d7ccc2a5e0b2d3d0f5f615142978a918b0bd1bd0218a30d
 DIST tl-arara-2020.tar.xz 4536576 BLAKE2B 64dba77829da991db8830bb907e015ef39a64f5d0bdfe81cf6f5e96d611f9949f7d6fed5ea0aea07c68605105649e64d8bab8e51c221e2ba8b69c10deb19fb8c SHA512 5ac4fbc1a03882b15611af6268453bcb2c1a476524a2913f16d78cb04414c3eb4cd9ab7426db813d95afb1e51828a6eff1683fc03fd785ffae5763d5fca89b24
+DIST tl-arara-2021.tar.xz 14338300 BLAKE2B bcc9e7e36672e1f949842a006fb571159daf6278ff58e2e6b62314b3a489cdb4bf3b23024879034b48402d75b7b58e59c4b16851448683849de688552823de72 SHA512 f30f3a4fec925275d6256f6d2c47581d879924d297baf99224b2fecfd1e54b693379d9d68283062a426fdee0a30a4d93ecf2f1431d3fadff01261cb7d385e6a5
 DIST tl-arara.doc-2020.tar.xz 1689968 BLAKE2B 1d19454d90fc959eafc9bf767ad3dd2d860e7858f28833237ace8f980960061bffff54f7333673a1e0f42f8b98e791b9539ae94b37db98a129fd30b6212c8fbe SHA512 4f2f7312a15e572dcf4f9a2fbeef07e9c6d940401c28730afbe9cda3e3247c835771d278e1562d55c33728ab4ca92cbe26a945d96c5e50f6ad54d424ba2af47f
+DIST tl-arara.doc-2021.tar.xz 1722400 BLAKE2B 1177c7bf2dd94b0a8f5ce004e7b58f7bd57a111f5e35576f398b24ac9b7692ce22e59bf6aa24079a80b5333e1d67d972b878ddf5b69e89b84c8e7bbb9c32f741 SHA512 60e85e9f0ace415de61fffcc537157a62435ee032dd8ebdb0eba19217c0722addd692075e2616ff665f9f350d0fe3466616aac3064673e14f3991d9df5011367
 DIST tl-arara.source-2020.tar.xz 60072 BLAKE2B 8e1184e1f1a761b1e6dd16aad414346128cf7b23b01809375d78f4293dcc90ab564395844b33fccc392cc7a10bdc51ca042b4bed91b9681c86f7042c1a28b614 SHA512 9ffe2f80a8214b9bd52be4aacb86140938af86f5e9fffce21c625dd50e8832f2078e616d1980eb15f39d5b34d83198fa83c75a1d368ce1e3626ef51416c8655c
+DIST tl-arara.source-2021.tar.xz 102984 BLAKE2B d9c17bf2dae1544bd0092f69a12dc55acf9c765b2e61086e3a6c398ad17c5756efcba9ad323e9fcdae8db06724db35871db6d52d95ade9adac124b08be4b83b9 SHA512 1f673c141eecbd542c5156911e3b1a0a474070edef82598d9413fea66e39396ced6f4d7c01f7deaf244ff721ad8a62f5229185667feb42417084646d8aec6fa2
 DIST tl-asymptote-2020.tar.xz 312964 BLAKE2B 1c1ced6f3af846bd6c9512efabb784dea34d3a6fea7ecbdac89e893ca08b8a90c85112073a8afc75c43a5544fda59bdf5e1a53df96033dbc6457f3be477a015f SHA512 e314e473c14c2fd8980d3d0256c6cf6fc7c757a5b4b4dcf90c93cbd15fa70a5e7a0ce453c8382df3f9cfa4aba9c9047b3ee44084e398d9c767bb88ccf3bb47ad
+DIST tl-asymptote-2021.tar.xz 359668 BLAKE2B 6a5c1de0d850baffd580f6e0ba210fc60f14cb470f1d672442545dd41eff931fc660d9e086c01c9ad1eb6edbf2bce7210ffef9e3875e191f85ca99b1f0f97f59 SHA512 324739a8f85243c55a284e87cdf81b9e27c70ef38b7cc0e836357251232c610afcafeaf4a635db9e7df20666650018cbec1b9e6a7084d61348e25ce47e9824e8
 DIST tl-asymptote.doc-2020.tar.xz 2386940 BLAKE2B 42677bf06126056bfd0929b4399150d841a82660f8ef520e0409cbe1ab7352a45e219f4c5376711c309d717d52df8909727079c8237742c5b13ea87db76dbc84 SHA512 d8d5f63808fb74522e2a4f28cd84630897ad57b67451301522b8a9d60e44cab4561a7f67ebebcb2b1a822ee20404a8654a2cb3e1204b75ed52b4d65d8340e5a0
+DIST tl-asymptote.doc-2021.tar.xz 2386944 BLAKE2B 2934699a28307125faba255eea713931252da0deb71f62b6dbb090bfc15e402a45ede09df235cb26d2ab621e2e5d10a3d90bfc4ebe5344bd07dc806823a13061 SHA512 fa71033d9e4c19e06180f1b1e6825c48672a9b17294c6d8d7228d7c0fdb09dc790d57ebc488138047cb57a66b89400fb1a31a4b515c6312b9cf052e93cdfe9c3
 DIST tl-bundledoc-2020.tar.xz 12804 BLAKE2B 4b9f407a207748dd6491c0e7c6072ec2fbea1341cf418eeae86d883710393c70604c2c847a2ab3182e59e94ec104f32f137c1b8ff09837faa95a31f8181c5cfe SHA512 5b3b4e343e8ce0103a7f0cc736331995fde330b473c21d97df761bffab8e0b82f00238187801978611e32b2190b0a0d51c87c4249135228c8bd53ae8fcb6bfc8
+DIST tl-bundledoc-2021.tar.xz 12784 BLAKE2B 6b4d04821568f482cc6b05e0924f1a7833dbfac018e2f3b1402e2e1dc96b41c5cf024ae3615c652ba8095c525ef8cc2cb31f2cf50db0117ba237eaf178fec40d SHA512 07aa1f9dd3cf8bb16fad2a39783a5bd05168e0956840853b6f9a16de753726b0393b8863c6cad985b8bcf7431570137d6fac82588524efc5d7c0032e2dd555c8
 DIST tl-bundledoc.doc-2020.tar.xz 79028 BLAKE2B 4f55cb6519e89d172e52101b799e46470106c19c35456d2aa940757188f1db8f097995f312498b10c056a06e8d99a5b956914424e25eed79c606ebde91a054a6 SHA512 acd848c58261520c2ea9038d0229b75e7c12e72c087ea1aacc3bd0dc4f8f99d50cf243d282abe44d72c99a75618cf284de400e342a9128f9f1ff87b54ebcdd9a
+DIST tl-bundledoc.doc-2021.tar.xz 79028 BLAKE2B 39d872c6e19866c1e075c12bbd2a77065278d6fe0a71526906601183302b872031ee993a44b6a9f70a391ff455122b06920fbb5cf42a6462ce7ea871476be81e SHA512 bbd78c948c90f6b4470c792c9e0b99fb5bd8ae73b7eb78343739909c13ed0e0d763dd0b6a4b8d05a77280054afe15f2979c985121916fb8a34dff231b810106b
 DIST tl-checklistings-2020.tar.xz 6496 BLAKE2B 7ea3bd63da0c718dcc1406507c1c800a62f09ab2c0dee1d043ea73573c0a4e645a01ffb2d2ca2008c230bd14c1ae858638d050d4a24b831b898a98bdd4bdda00 SHA512 599ed476321a825bea61fbdd468670cadcdb11249a4a9324fc88339a9445ceeced3680459dc2d27c2e6263cd207ffc0ce3b60b325d31072922bf4644478cf544
+DIST tl-checklistings-2021.tar.xz 6496 BLAKE2B 7ea3bd63da0c718dcc1406507c1c800a62f09ab2c0dee1d043ea73573c0a4e645a01ffb2d2ca2008c230bd14c1ae858638d050d4a24b831b898a98bdd4bdda00 SHA512 599ed476321a825bea61fbdd468670cadcdb11249a4a9324fc88339a9445ceeced3680459dc2d27c2e6263cd207ffc0ce3b60b325d31072922bf4644478cf544
 DIST tl-checklistings.doc-2020.tar.xz 364456 BLAKE2B f742b41e3b18c1248fb9a8f4cda9a1ff5fff26b4c6eeccd0dc658a95ee690f0dfef9d8384265f0bd6ee5d42d38e3a2d45f3e74536bbda364b4150b494515052e SHA512 3f8d6eb67f305fa5e03bb625a4034ffe616a6c0223774688463884df99c337c1e5bdd76bbfa3b9428ec4812ec72388979c4252ba7407ae8b79e3de7cfacbeb01
+DIST tl-checklistings.doc-2021.tar.xz 364456 BLAKE2B f742b41e3b18c1248fb9a8f4cda9a1ff5fff26b4c6eeccd0dc658a95ee690f0dfef9d8384265f0bd6ee5d42d38e3a2d45f3e74536bbda364b4150b494515052e SHA512 3f8d6eb67f305fa5e03bb625a4034ffe616a6c0223774688463884df99c337c1e5bdd76bbfa3b9428ec4812ec72388979c4252ba7407ae8b79e3de7cfacbeb01
 DIST tl-checklistings.source-2020.tar.xz 10948 BLAKE2B 08881ceb308803c8e2a6476d72e4446e63ceb714db4893c6fdeb773c46f8ffa39b4cd4a2642e3d90e88c0adc145e421007d5e0614a862cd4ede6af224f0db4d4 SHA512 a7435841305ce368f1bedac9cb531d8f0fce3fac27484547821a2e82998e977968e578601382f4cddf6c089b42e8e175c56d2e466faa5c4c0e5b49edaf6baf1d
+DIST tl-checklistings.source-2021.tar.xz 10948 BLAKE2B 08881ceb308803c8e2a6476d72e4446e63ceb714db4893c6fdeb773c46f8ffa39b4cd4a2642e3d90e88c0adc145e421007d5e0614a862cd4ede6af224f0db4d4 SHA512 a7435841305ce368f1bedac9cb531d8f0fce3fac27484547821a2e82998e977968e578601382f4cddf6c089b42e8e175c56d2e466faa5c4c0e5b49edaf6baf1d
 DIST tl-chklref-2020.tar.xz 5084 BLAKE2B 9a40d8fef12b938e6b18c8b8b8eef285364bfedbd4fd75f36533e17e0bc56831c461a625f1b7c3993e11b20d78e4e4a546bff566a671566c95a5898a92c864e4 SHA512 12f5e950ae439d0efd3f625572e8b81d993485a1efd71dc04c078cb1dc9b76650de3c424d7a6c60ebc5ccb5d29f37ed04c477ea1306acf4c5f4fccbd95e18985
+DIST tl-chklref-2021.tar.xz 5084 BLAKE2B 9a40d8fef12b938e6b18c8b8b8eef285364bfedbd4fd75f36533e17e0bc56831c461a625f1b7c3993e11b20d78e4e4a546bff566a671566c95a5898a92c864e4 SHA512 12f5e950ae439d0efd3f625572e8b81d993485a1efd71dc04c078cb1dc9b76650de3c424d7a6c60ebc5ccb5d29f37ed04c477ea1306acf4c5f4fccbd95e18985
 DIST tl-chklref.doc-2020.tar.xz 320916 BLAKE2B 7477fb601375093ab78771ea406badda580be1599d16b370fd37466867f8bff9d24dd26ec030a86a2f8030753e25ad00942a8722f87f606d8a08382e5f7fb765 SHA512 5aeb13824c1781feefe94215f3efce15c212e0d38f9e0d5fb393e96c2159ba43f165c600cd64ee9d8c42c0a4f0db6c2e462ee85a93993965bad0420b6b662ef6
+DIST tl-chklref.doc-2021.tar.xz 320916 BLAKE2B 7477fb601375093ab78771ea406badda580be1599d16b370fd37466867f8bff9d24dd26ec030a86a2f8030753e25ad00942a8722f87f606d8a08382e5f7fb765 SHA512 5aeb13824c1781feefe94215f3efce15c212e0d38f9e0d5fb393e96c2159ba43f165c600cd64ee9d8c42c0a4f0db6c2e462ee85a93993965bad0420b6b662ef6
 DIST tl-clojure-pamphlet-2020.tar.xz 3660 BLAKE2B 9c80bc3722d92fa68a56a44481935ca7c61f43849d9d5d072efa58679f6e9d26ee77a77d67783af064c3ac44d35289496f8e886ec083d3d6e970402c29f6a46b SHA512 a420e5548af550ef91103a82c5bf8e43345abfce69bb438d488ed9a3a62db1e6763ea1c17b246ef307cc62d28b5c575b5da07d5857241e21ce7d789e9a2a055d
+DIST tl-clojure-pamphlet-2021.tar.xz 3660 BLAKE2B 9c80bc3722d92fa68a56a44481935ca7c61f43849d9d5d072efa58679f6e9d26ee77a77d67783af064c3ac44d35289496f8e886ec083d3d6e970402c29f6a46b SHA512 a420e5548af550ef91103a82c5bf8e43345abfce69bb438d488ed9a3a62db1e6763ea1c17b246ef307cc62d28b5c575b5da07d5857241e21ce7d789e9a2a055d
 DIST tl-clojure-pamphlet.doc-2020.tar.xz 193228 BLAKE2B c94cd5420df5ab4d43058f89486cdba0f7c3658c82f81fbd01cdcb53a44e03c0e342aa748f55cd341e403bf84e023cb256bf4b41187e47c66829a1b7a949aa63 SHA512 23f6cd97dc5d521689555ec95a695db0f9cae8873d28e2bac2969f07e9e8d2f7ca9a6c8105ca127da202d811717b3c1f4219fe15f9af01036800a083f065cd09
+DIST tl-clojure-pamphlet.doc-2021.tar.xz 193228 BLAKE2B c94cd5420df5ab4d43058f89486cdba0f7c3658c82f81fbd01cdcb53a44e03c0e342aa748f55cd341e403bf84e023cb256bf4b41187e47c66829a1b7a949aa63 SHA512 23f6cd97dc5d521689555ec95a695db0f9cae8873d28e2bac2969f07e9e8d2f7ca9a6c8105ca127da202d811717b3c1f4219fe15f9af01036800a083f065cd09
 DIST tl-clojure-pamphlet.source-2020.tar.xz 4976 BLAKE2B 1e7a57fd0e9a704a0834a65e5285bcaa77e78e14b27ce5df3d844e6136ef8600414f0a6817f1583521105214f2ecfb7a5c0424634bdd49aa0bb92c7746ec8851 SHA512 32f90dabd0e73206930f589a97e8630c25ce2f95f1657d08ce71cd36241bafd6c2a79c483805f7574ccab29deb478d1ef8837fdf2e922592e6d8f18f43121a14
+DIST tl-clojure-pamphlet.source-2021.tar.xz 4976 BLAKE2B 1e7a57fd0e9a704a0834a65e5285bcaa77e78e14b27ce5df3d844e6136ef8600414f0a6817f1583521105214f2ecfb7a5c0424634bdd49aa0bb92c7746ec8851 SHA512 32f90dabd0e73206930f589a97e8630c25ce2f95f1657d08ce71cd36241bafd6c2a79c483805f7574ccab29deb478d1ef8837fdf2e922592e6d8f18f43121a14
 DIST tl-cluttex-2020.tar.xz 21376 BLAKE2B 4d12e878d21c2c8b74b53ea01b2345de468bba29ef514016e49252babbfdbceaee6c51b6336a020d6a757549e10e3b36d0cb898099fcadbe51a0132e6a784258 SHA512 e211cd6fc89751628b0ebf0bd599ddffd18e39e24292fa896bd2394bbc1fe60c35d5230662a53fa685f051963db3966f27dd752cc63877585880a62483f6f93d
+DIST tl-cluttex-2021.tar.xz 21376 BLAKE2B 4d12e878d21c2c8b74b53ea01b2345de468bba29ef514016e49252babbfdbceaee6c51b6336a020d6a757549e10e3b36d0cb898099fcadbe51a0132e6a784258 SHA512 e211cd6fc89751628b0ebf0bd599ddffd18e39e24292fa896bd2394bbc1fe60c35d5230662a53fa685f051963db3966f27dd752cc63877585880a62483f6f93d
 DIST tl-cluttex.doc-2020.tar.xz 676332 BLAKE2B 88d37ee1c88684679f74a10dae4fd9b17a8eb3945f97d6b2ac36d8a3cb69d7c20a38bfda175ab78d97f44d9afa4b4c4a9fcbcc36f3e87bebaea2294b846a5bcf SHA512 d26a6fe183999987b2a1d375d1061fadd78d23a1bddb0582d8f70561c5d1bd745d33e0c41e8256adb00e2dc5b9f4904e7de4f2c03a00a6688b6c4a433f1d359c
+DIST tl-cluttex.doc-2021.tar.xz 676332 BLAKE2B 88d37ee1c88684679f74a10dae4fd9b17a8eb3945f97d6b2ac36d8a3cb69d7c20a38bfda175ab78d97f44d9afa4b4c4a9fcbcc36f3e87bebaea2294b846a5bcf SHA512 d26a6fe183999987b2a1d375d1061fadd78d23a1bddb0582d8f70561c5d1bd745d33e0c41e8256adb00e2dc5b9f4904e7de4f2c03a00a6688b6c4a433f1d359c
 DIST tl-collection-binextra-2020.tar.xz 924 BLAKE2B b6af250819c480f491a855372b536c4628628ceca2a285aca632c5117b9c10d1fc992b8e6b2a0ba5dd9147f60f6ca3ba4e8cc9c2dc77df0cd1a97890c9cf483f SHA512 306dac78fb385fca7c2de33deded8f13fe1dc7999cc58b5019cb0eafd0ac74f629db627b05a49b1ca7cae431d5aff5bb514329b167ee2c2bb16bba81d8f6dd54
+DIST tl-collection-binextra-2021.tar.xz 944 BLAKE2B e8b4801e020bb8b4e9e4a58be215cd8a2b1ec1477b703c040eb70c55a19e3188d4dc94609733921a43c18d7e7d09c96eff3a88c963d5344ae138b1417ea9c812 SHA512 6c6b6344f7d294bf74f3601850f036543ae6f8dc78bf01e32867d46d7c20089a388f779c445173c5d54e874278e718b697691eb94a5a2029ef64acdb914461ae
 DIST tl-ctan-o-mat-2020.tar.xz 5968 BLAKE2B aa33d64cb4c3bed1bc1a738a206f4226f333af9f45707d0c4e3385e1952f21c6cb728e3c511b0fbc3507c9eb853306460686f5eae48eddd200f94127d3a01cdb SHA512 a995dfc6d79ba77fe673aa501f28eaf9f057c34501fa032423569317e5a4eed048c3375d806eafacedefec02e91bcb587fa6bfb8c0ff980395bb877b2ce88c4c
+DIST tl-ctan-o-mat-2021.tar.xz 5968 BLAKE2B aa33d64cb4c3bed1bc1a738a206f4226f333af9f45707d0c4e3385e1952f21c6cb728e3c511b0fbc3507c9eb853306460686f5eae48eddd200f94127d3a01cdb SHA512 a995dfc6d79ba77fe673aa501f28eaf9f057c34501fa032423569317e5a4eed048c3375d806eafacedefec02e91bcb587fa6bfb8c0ff980395bb877b2ce88c4c
 DIST tl-ctan-o-mat.doc-2020.tar.xz 54812 BLAKE2B 5cfff18f58ca2f13b012a49952ffc922412a2d05f5518fb864aab9d6a155efca2c8730bef8959a31340a86b07d9dc5e485428bd2ca08e435279a063d0000e78b SHA512 423efc3f2f850c5a9bcbe787edb8155ef76e56ce5e3a1ba3332bb465b8239616bd1fcff2e8a58db6f5ce9d5191ae3209a5451f746250a3b081fe9b35d024eebd
+DIST tl-ctan-o-mat.doc-2021.tar.xz 54812 BLAKE2B 5cfff18f58ca2f13b012a49952ffc922412a2d05f5518fb864aab9d6a155efca2c8730bef8959a31340a86b07d9dc5e485428bd2ca08e435279a063d0000e78b SHA512 423efc3f2f850c5a9bcbe787edb8155ef76e56ce5e3a1ba3332bb465b8239616bd1fcff2e8a58db6f5ce9d5191ae3209a5451f746250a3b081fe9b35d024eebd
 DIST tl-ctan_chk-2020.tar.xz 512 BLAKE2B 80525a48521023cf7ab0cf3ab19d9fc3fb72dbe3fb3c638803076a0775794f6f30935cef8ec77936574a61d8676e123f4ef7c84beeacc72812fcbb86a4dd0588 SHA512 6eabd7281d79ff0ad19080350dfcca8ee3a33ddfa6d17827a7851cc53f09f627729c8d715a1dfe50e0c079add44331a07d543cb8b6a57000efa6d73c30f2ffe0
+DIST tl-ctan_chk-2021.tar.xz 512 BLAKE2B 80525a48521023cf7ab0cf3ab19d9fc3fb72dbe3fb3c638803076a0775794f6f30935cef8ec77936574a61d8676e123f4ef7c84beeacc72812fcbb86a4dd0588 SHA512 6eabd7281d79ff0ad19080350dfcca8ee3a33ddfa6d17827a7851cc53f09f627729c8d715a1dfe50e0c079add44331a07d543cb8b6a57000efa6d73c30f2ffe0
 DIST tl-ctan_chk.doc-2020.tar.xz 221996 BLAKE2B 43def8aec1f47ab26750a3678d68eb846f5a4383c681e1cee66529d877bb636b8867b5ce4a6b330a6b4239f5ad9db9125799c12b6ca5453f872fdfffdcb3fb75 SHA512 c61bc0d70cadcc4382dae55cdc1af076882801321a2de16f164223267732e476e41f949f566808c928f446d69aa22bd9965adb155c97905e32b93808810c76c0
+DIST tl-ctan_chk.doc-2021.tar.xz 221996 BLAKE2B 43def8aec1f47ab26750a3678d68eb846f5a4383c681e1cee66529d877bb636b8867b5ce4a6b330a6b4239f5ad9db9125799c12b6ca5453f872fdfffdcb3fb75 SHA512 c61bc0d70cadcc4382dae55cdc1af076882801321a2de16f164223267732e476e41f949f566808c928f446d69aa22bd9965adb155c97905e32b93808810c76c0
 DIST tl-ctanbib-2020.tar.xz 2588 BLAKE2B 2b335433ea829157b4938acb732c9e0bb886f5dae468136faf2474d5362d9adef0b00d7169343d100e7f5c5d9647bc2dbd12a63ffa79e9d6632bb96a9618e466 SHA512 af03e3079304d24b7cf996158ce7344a15aa2f17efc46378132bedc5e9bb4488f89210c24a8a5ef0c21a293600589aef78b7a8c7a7673ad09ceab2077b0a351d
+DIST tl-ctanbib-2021.tar.xz 2588 BLAKE2B 2b335433ea829157b4938acb732c9e0bb886f5dae468136faf2474d5362d9adef0b00d7169343d100e7f5c5d9647bc2dbd12a63ffa79e9d6632bb96a9618e466 SHA512 af03e3079304d24b7cf996158ce7344a15aa2f17efc46378132bedc5e9bb4488f89210c24a8a5ef0c21a293600589aef78b7a8c7a7673ad09ceab2077b0a351d
 DIST tl-ctanbib.doc-2020.tar.xz 52852 BLAKE2B e5cf6c3ec91fd0d2bd8465ff4abc532b61e25947b1b40221f84b642587495ae4dbd80900ecde86e004d997fabcc050412c00dc2f81fdd891747deb1be5a6dd78 SHA512 1a971e49827476b5ae419189f7acff4c17ab41159d60c5627663d435368b28aa7dc4aeeb5fcc2c4a9f34f648ac9f2de229b250660333ca2f32bfd0808f24e732
+DIST tl-ctanbib.doc-2021.tar.xz 52852 BLAKE2B e5cf6c3ec91fd0d2bd8465ff4abc532b61e25947b1b40221f84b642587495ae4dbd80900ecde86e004d997fabcc050412c00dc2f81fdd891747deb1be5a6dd78 SHA512 1a971e49827476b5ae419189f7acff4c17ab41159d60c5627663d435368b28aa7dc4aeeb5fcc2c4a9f34f648ac9f2de229b250660333ca2f32bfd0808f24e732
 DIST tl-ctanify-2020.tar.xz 8236 BLAKE2B d8b56d748f70530caab43039a73b2263e3ad7178e3fc1e2fb0e8280ca2304e2bad34ce73b4ffdbc6ab4a96bccd36c51e3d30aa5a2bf37f6e16fc653944d19f59 SHA512 6774b151bb0fb052d41d8447c7e8d378d7f31b0a5aea5f2f00b93669b8c2f629f479ae21d40480fd62f468d866cbe0c6f0dedd8a0248f8d83cd1039131849439
+DIST tl-ctanify-2021.tar.xz 8236 BLAKE2B d8b56d748f70530caab43039a73b2263e3ad7178e3fc1e2fb0e8280ca2304e2bad34ce73b4ffdbc6ab4a96bccd36c51e3d30aa5a2bf37f6e16fc653944d19f59 SHA512 6774b151bb0fb052d41d8447c7e8d378d7f31b0a5aea5f2f00b93669b8c2f629f479ae21d40480fd62f468d866cbe0c6f0dedd8a0248f8d83cd1039131849439
 DIST tl-ctanify.doc-2020.tar.xz 57960 BLAKE2B 87879b04d622f78564ddc1edeb6dfbc8e7da4796f45fe6b441c0c27b5090c2e03226ee4436d7be07e59ed64be7c1a151a76a26b54549e18930049a6a65ee1f8d SHA512 f9b636cb41b126809d808c167410a37052b1c6c385fe4eb8df3b819c0cf2cac2c7c1c74d7ea15d2916c1cbc563e078845e451000e3a08cd9a8e0696a342b22ac
+DIST tl-ctanify.doc-2021.tar.xz 57960 BLAKE2B 87879b04d622f78564ddc1edeb6dfbc8e7da4796f45fe6b441c0c27b5090c2e03226ee4436d7be07e59ed64be7c1a151a76a26b54549e18930049a6a65ee1f8d SHA512 f9b636cb41b126809d808c167410a37052b1c6c385fe4eb8df3b819c0cf2cac2c7c1c74d7ea15d2916c1cbc563e078845e451000e3a08cd9a8e0696a342b22ac
 DIST tl-ctanupload-2020.tar.xz 5104 BLAKE2B 77ad6a6c1d493f9b3d7f7f39d016b391dc4d8d82fab32c1c91838e16ad86a268fde2ee750063315853c2a1825a4331a8e32de7c217df440f53e72c43882f19c4 SHA512 4464bdfbf72318b24abcd88e1c25dae5925a96e867c694f3f02a594ed7b8b24cffdcdb345f0054e200a6af63f88b591ff84058af0adfb4a1b3feff2a057d9d72
+DIST tl-ctanupload-2021.tar.xz 5104 BLAKE2B 77ad6a6c1d493f9b3d7f7f39d016b391dc4d8d82fab32c1c91838e16ad86a268fde2ee750063315853c2a1825a4331a8e32de7c217df440f53e72c43882f19c4 SHA512 4464bdfbf72318b24abcd88e1c25dae5925a96e867c694f3f02a594ed7b8b24cffdcdb345f0054e200a6af63f88b591ff84058af0adfb4a1b3feff2a057d9d72
 DIST tl-ctanupload.doc-2020.tar.xz 174964 BLAKE2B 804ae2c963ec668924d105454416faee356832baee3f452aafcd8489bda55627b6a60d307f58932e2487a4c2e6ab4a533f10369053a7245896da37df3cc5a40c SHA512 9e027f7ce08041be7668a7a404fad6b6c7cfc71e581ad1216956d0b53c379d204bd84d2d55d186c74f784df8911770b96f934775f44f7141a5f1b9b5e773cb7a
+DIST tl-ctanupload.doc-2021.tar.xz 174964 BLAKE2B 804ae2c963ec668924d105454416faee356832baee3f452aafcd8489bda55627b6a60d307f58932e2487a4c2e6ab4a533f10369053a7245896da37df3cc5a40c SHA512 9e027f7ce08041be7668a7a404fad6b6c7cfc71e581ad1216956d0b53c379d204bd84d2d55d186c74f784df8911770b96f934775f44f7141a5f1b9b5e773cb7a
 DIST tl-ctie-2020.tar.xz 408 BLAKE2B 752ee2564532f95c89533d7348235e238f62da84048351c0dc94ced6a1c362de08c1d1eccca7295c0b2481671472c08bfa9613783593b784390a6a256ecf784c SHA512 05fd794d4437c662b77b0662dd0c9169aef35a10140abad2519702577c087177d0a02ee5b6163873fe5b3c83c3f77c342c4774af168ebca2ed875717c7d0c5b0
+DIST tl-ctie-2021.tar.xz 384 BLAKE2B cbc54f5aac9e7edfc39607f77b0992c25026ea3287701733fa0e9d8396faf22ee88d5e1563113129da1752df4b185b530a536e43d570f7094a57636cae30c7a9 SHA512 9792cf1c49fd5bb2f8c78c5621330c69031d41da769fc5adf7b3922be5d23e8ef0453b67d6e80617d3af46ba3e7eb84c99031f72b28563d274f6887802b2756c
 DIST tl-ctie.doc-2020.tar.xz 16456 BLAKE2B ef2aa98bbf2e3c270308f4ded3d18b55aac99b9059d4543abcfdc383b2a4f761a4d24a5f01beb94cd0e1bb1842c9dc6be641e964dd2117258193dfdf56421513 SHA512 83bb53248ce262bc8310faa8c0e057dac72c7c682e295fb9888acff237249a66a69d66b99d79033f5a1d8611ef582dd2121f8c28be9800ebcce775bf3adecf63
+DIST tl-ctie.doc-2021.tar.xz 16332 BLAKE2B 70139538efd322cc5d3a368d345ddd9e18e8da5e75a5f745b7bf12fa4e0973e298ef7dc72316bf6c0ed3937a2fb2a504264beb3c51a3efd6e6bed56151557fd8 SHA512 4ab2d29709b509dd129c585d03dfe2f3aae1b3b6e4890a2b82bdf7a0b4b3a81fcd8a9960e6da7c9663ab8b572c29e85637fad93954e79f89846aa17aaba217a0
 DIST tl-cweb-2020.tar.xz 13776 BLAKE2B 97406c5d789ac0ef34e93c56a52dc826381f8be74c243a2f2f299270555e2b3808747b5c55b5ab2e9058ac656fe7539d98c1ddce2fc14b07ada638f43cdfcb9d SHA512 3fa0a2d9d5e4647fee550b0da0449619e22198866e6ecf47956a99c5d8d8081a09c63f1644f4b37788aa91c411df567776589aa61244fb6e0da3ac72314d2b3f
+DIST tl-cweb-2021.tar.xz 23444 BLAKE2B 5c16d40a9cb20c272b2f46201087d7fe77181ae8a256a319d95846783cbf2bff271ced3b997dbfcdd65ffa401ad0f4236ff0bb11c4fcc07d66ade5a802f8c71e SHA512 c47511355ceba742c1b037b49506a8a4bbdba224892ebce6e4418081866b0a9e3105a7639b061a173cc3efd7aa4cfc6e7a92388ed16ae1587cc3a06ee6385cde
 DIST tl-cweb.doc-2020.tar.xz 428876 BLAKE2B 435b54c60e15a45471f7e17b6e52742af47e12c9f87cd38f982ad86c9e3b5eddb015aba4a3e3c406090a4bdf85cf0df4e5b8e632d6dae862b061e94433273f75 SHA512 8b5c1da835ca951c93cb13db581e94d06920d3e7f5a4163275cc06b497ecdb3f5ba7be0c4d53423c72bd4052c71b92a0f5bc4ebec85e67eb7b7fab4632600ced
+DIST tl-cweb.doc-2021.tar.xz 428876 BLAKE2B 67d84b83dde91180611f993a21464e6c39a5b5e1b8b46146f87e53e1913c0c1dd7c760acba9739f11075fe8c373b073dcb7e774da6900cbd5f4754707a64602f SHA512 277ab201738c17b0e273ed0c16826a0eb104fe218e88b0ecd23117e03c991984537c563f9cb7ca7e6c59c41a6cce51b5c2e085c5c1d58854c224427ef9b1e2a3
 DIST tl-de-macro-2020.tar.xz 7848 BLAKE2B fb911180e375163a6339c4d884942f3d20dea41a81a203845c6e87ef8c8712b8460da928995385ece0961bd8e773f589ee59be5384ddacb11f3a19a6cbd1901a SHA512 5ce9beff85d65654173557af668ff15af6989d9fa6d341fe9c26149d0715ed7cf57bf5b2a59b6cf99e8ec14e4ebb6816e9972268516a0b2a78ee13c6423b3599
+DIST tl-de-macro-2021.tar.xz 7920 BLAKE2B 26962e8971869c69e9ec6732e1798afefc485d348b918f3d3a55e18f11fc3207089e5732d29d485763e6598c032e16ff1b5dff644c58ae55739bd5be8adb36b0 SHA512 558a55b14822cda4cfaa05511bbd6030049145916669b699795827181462e628d0a84baf087b8d56e3dccb353d17f581af9bc1662506878124e5cfaddbd97b9a
 DIST tl-de-macro.doc-2020.tar.xz 49764 BLAKE2B c3f60cba4b9a6df10de15e7ca3b5bfb7c16a6e0f82e230ea0b78fe59efeb27fd83e2717262fe36bd6983d62eb5724dc4b6b2bdc3a15d6448b986df4f8625a490 SHA512 05793930357ad58a57e221696d836895f02dec82cc93b9aa7ea302978bee24410d4b382ff72407faa67f4133c75a84fb2454957de446beca05606776c6581ade
+DIST tl-de-macro.doc-2021.tar.xz 57104 BLAKE2B 840585f45ff498be16061abeea6da6aab5f84ea466f981e89a4d6aa1a77e9db2bd0b7ba109ccce28cc1db80ef6a034d84e8b38361d0118dcba3536262df1e154 SHA512 af0a7a463c7a9623050a3fe73782076965eefb58dec17752c80e35a647b5a7a6b354a1dea89ba03b503eef0faffbd2f134a6e5666f4c68665d322bf3b77922d6
 DIST tl-dtl-2020.tar.xz 580 BLAKE2B 04d741b3c0d7a20e8855f7e4bb19cf5d1e718ebc461ff4a4d150f0636487f972fd5e7ae8b7d320fbb02df322a94a930ae0d283596d96e3d345d86c641207b046 SHA512 866039bb0f76bc6b2f4dbb86133a48869d90ce7dae716df42e35f4d3ac2808fab52a79f77b047267d206ec416bba7dd6282468767b1b1f4fbb1146a1140eb78a
+DIST tl-dtl-2021.tar.xz 580 BLAKE2B 04d741b3c0d7a20e8855f7e4bb19cf5d1e718ebc461ff4a4d150f0636487f972fd5e7ae8b7d320fbb02df322a94a930ae0d283596d96e3d345d86c641207b046 SHA512 866039bb0f76bc6b2f4dbb86133a48869d90ce7dae716df42e35f4d3ac2808fab52a79f77b047267d206ec416bba7dd6282468767b1b1f4fbb1146a1140eb78a
 DIST tl-dtl.doc-2020.tar.xz 52488 BLAKE2B af05536ace1a6ae318fa51fcb0c78167a876d6757c46f6de68be64d2184d596eb84462cd83097a74d57010c591062648ffb3b90e507dc4db33e677b1d7050ff4 SHA512 d624505c9bbcf7140fc264811631f55f8a26fb1e9c4d3b1fbb1be93460aca2d6dbd88192f057e1b17fe807af0b4ddbbef6e2a3ba919e6aed073a903045609d7f
+DIST tl-dtl.doc-2021.tar.xz 52488 BLAKE2B af05536ace1a6ae318fa51fcb0c78167a876d6757c46f6de68be64d2184d596eb84462cd83097a74d57010c591062648ffb3b90e507dc4db33e677b1d7050ff4 SHA512 d624505c9bbcf7140fc264811631f55f8a26fb1e9c4d3b1fbb1be93460aca2d6dbd88192f057e1b17fe807af0b4ddbbef6e2a3ba919e6aed073a903045609d7f
 DIST tl-dtxgen-2020.tar.xz 5768 BLAKE2B 24fe4e6f53b046a075e922a6431f49a471e3c78dfb96604de42b8dc24d39168d1ad8f0c394a357164365de00181db131e94a1e1405cfde28c1bf37bf097a99ba SHA512 b197684c1e941a64b606b472fb9e0f1ed4f5d0b0db2df59202712c0e3f3b3993106b8d493d707c4875e90dacd9dc7d12bba784ef7c8d04984a38708073b1b92d
+DIST tl-dtxgen-2021.tar.xz 5768 BLAKE2B 24fe4e6f53b046a075e922a6431f49a471e3c78dfb96604de42b8dc24d39168d1ad8f0c394a357164365de00181db131e94a1e1405cfde28c1bf37bf097a99ba SHA512 b197684c1e941a64b606b472fb9e0f1ed4f5d0b0db2df59202712c0e3f3b3993106b8d493d707c4875e90dacd9dc7d12bba784ef7c8d04984a38708073b1b92d
 DIST tl-dtxgen.doc-2020.tar.xz 56416 BLAKE2B 150a2b1354b70a221c0ce3299910aa4a087bb4b19f6ea94c96dae2cd78eb719bb1e3617ca0fe7109750ea8606a851a048558b35d95b95c7cee6534d34e7bac7e SHA512 f666a2b5d3cb32d43a23cc3edcd92bfb727d500a8c439b4b78bae89ac73c317adac9786e4702e78b5b4861b76489ff7af5cfd115a80b96cd6298c65412d56a50
+DIST tl-dtxgen.doc-2021.tar.xz 56416 BLAKE2B 150a2b1354b70a221c0ce3299910aa4a087bb4b19f6ea94c96dae2cd78eb719bb1e3617ca0fe7109750ea8606a851a048558b35d95b95c7cee6534d34e7bac7e SHA512 f666a2b5d3cb32d43a23cc3edcd92bfb727d500a8c439b4b78bae89ac73c317adac9786e4702e78b5b4861b76489ff7af5cfd115a80b96cd6298c65412d56a50
 DIST tl-dvi2tty-2020.tar.xz 504 BLAKE2B 84b83f11200e2364fb12ccd82a0bbb170e61e247ae53a6ae11f38d392854390e145fda5a897dbde33fce339c0b7b3dac96435282cae7261e10d2dd13338676f5 SHA512 303289e5bef9fcc097c1e3ce3eff923c303f50f71c72f2c3929c55f006149171eeb4b69ff38f8a46b8a5d19ac79ebf6ca28ad1df5f9525a8f1dc6587bfa42d72
+DIST tl-dvi2tty-2021.tar.xz 504 BLAKE2B 84b83f11200e2364fb12ccd82a0bbb170e61e247ae53a6ae11f38d392854390e145fda5a897dbde33fce339c0b7b3dac96435282cae7261e10d2dd13338676f5 SHA512 303289e5bef9fcc097c1e3ce3eff923c303f50f71c72f2c3929c55f006149171eeb4b69ff38f8a46b8a5d19ac79ebf6ca28ad1df5f9525a8f1dc6587bfa42d72
 DIST tl-dvi2tty.doc-2020.tar.xz 35876 BLAKE2B 8faa528e611c4e28f9f731433129253af71b8da37f4a0387716b810cd124a1ae17b37e5c70b1f171d65c27b1b6cd8baa898b79d5ef5c0106b502e7ff1ec65aff SHA512 fd8c456f223c78128b5a7c50bdd93068d00f92ffbb096ed2cecf23180b765eba0ba0dcea374f585754ecb28276e668788979e0be131465fbb56967b4ecdad900
+DIST tl-dvi2tty.doc-2021.tar.xz 35876 BLAKE2B 8faa528e611c4e28f9f731433129253af71b8da37f4a0387716b810cd124a1ae17b37e5c70b1f171d65c27b1b6cd8baa898b79d5ef5c0106b502e7ff1ec65aff SHA512 fd8c456f223c78128b5a7c50bdd93068d00f92ffbb096ed2cecf23180b765eba0ba0dcea374f585754ecb28276e668788979e0be131465fbb56967b4ecdad900
 DIST tl-dviasm-2020.tar.xz 10000 BLAKE2B ff995567466808565e2c94f79809f1528df387726201346b75d0ea39a059f71421e561ba19579876afa8fe93fd9ba20233b96bb001ab7e766c514255393eacef SHA512 4407c22869b64e8ced5e48c41d56495404bf665cf5b9d4d252b71cc4a868696ad2f3339c4c92aca354d5fea4ebef294509e282fbc87136b12565e6c3c2de43c4
+DIST tl-dviasm-2021.tar.xz 10136 BLAKE2B 249651458d30ad1cddb582e3728a8d4ec09c3b13396c207f139e6ad4e4f1c0135aaf0b85d87fcf827ca97783b1e60c833d13669da1b1971ef89e2aab07eaede8 SHA512 9f726816ddf7a52b797cfde03ffb863fa8a1b98068bc75da1ea86f57774bab248b4d4225f936b4cf3388dbb776e775527e4125ff5d49d76088e4f5be7125f4e6
 DIST tl-dviasm.doc-2020.tar.xz 668 BLAKE2B 728b0189945be0eaf4e7b50dc8ed7f48c44bf6523200920724c01e2416ea4d99f0ca4186303328efb328c91f981b741e05fa390da7f26dabcc89ede9c94fb671 SHA512 a11c7b5e891958f10adf03812ff0a6123e8bff09410c4f9002e23d488956835019e5f54a5f130133f214831060992f2dcd7dc76b4497647b7005c704a7fa2d2b
+DIST tl-dviasm.doc-2021.tar.xz 24352 BLAKE2B 9f67340850d530a4e1176e48c744c00ac371f951678f7c772a5a4c01243672065c099fd9552b377b51f7632a11c98ac4ea99acefa1f1c1e25afb208d0cbacb28 SHA512 b2eecfcb0e665059843872426611e4a5c8092a2dfe51a82593803cb84b18147cd28fc18fe2d9575d24fac1b04501f1e90a2f9f3c4094d452bc51b3a4db603f9d
 DIST tl-dvicopy-2020.tar.xz 608 BLAKE2B f0e20ab50bc3a9f9eb90f94369b011538e10b813246fc7e4683f1088507facf86d061a48f1b6fd4513e9076060cb4f8cd2d3b144ef668cdb1906aa9a6e7d94d4 SHA512 34e16ff93daa924658b433affc70fdab01bd8d6c1d537cf1787389b8de34e7348aaa91a39ba3f3671d25d216420421a5ca73cff5de254fbf25a8433e20fda322
+DIST tl-dvicopy-2021.tar.xz 592 BLAKE2B 4238a64953517f7b8d966db33fb3b8ca92e2b2de478ebbdd7433bb825664e6f8acc5f7eb6a4582302876b6bd864207b0971c50e95ad520af6200878141fdc2ee SHA512 97fb63d376d839a924a54e83015d5bb6c15cad05cb1a29b7dacce0779106e7c3f60e2ba057cb339a35f091e56ad7b7443001e04434928f2f9be87371de45847b
 DIST tl-dvicopy.doc-2020.tar.xz 18264 BLAKE2B bfdfef70d6c7dcd1ea68ccf1306b8bad580dc54638b0feff058cf72ab6f784d1c2e86a4320e4a86e3668190a0915da7a4626ec40b054e84d02917f82fef9a2e6 SHA512 a85e3cf8ee5e500264ffaffddf8ebe6642373f29fcca42c346654f304f34b9389f2e190014eacd215ca0d78debe44859e05696789b9f703fd6eaefc9bebd4ff7
+DIST tl-dvicopy.doc-2021.tar.xz 18256 BLAKE2B 5f33eeacf4ffa40a7cb348bf9bad2d07b793385513b792a46b13e0efb7238eb7b976448d0cc20334548479e54df86ac2c6429e41fb19cfd2dff2ce895b686e6e SHA512 d5b24737bcc8f035180525bc1b950caf0f7af9b8d4156047142777c830f719798eec3e33291c0d813a581c03fd5421df0a38ddf730b80b1664c34d1313e9c762
 DIST tl-dvidvi-2020.tar.xz 468 BLAKE2B 550031143b72bf70f15a1dd2b85e0315774054d73a7a846b8a91ea470b4fcd95c577dc504ceb0d719587ba0a525c8e0359e30eff80224a53930f7aa0ef720193 SHA512 d4589c7c034308547b4970104f6396ef24a15be22e034ac2f4f04a1004915c8d477e64e2c4b61927f43313b90b063602a4bcd45afb1bc33ee395e0b7caef202b
+DIST tl-dvidvi-2021.tar.xz 468 BLAKE2B 550031143b72bf70f15a1dd2b85e0315774054d73a7a846b8a91ea470b4fcd95c577dc504ceb0d719587ba0a525c8e0359e30eff80224a53930f7aa0ef720193 SHA512 d4589c7c034308547b4970104f6396ef24a15be22e034ac2f4f04a1004915c8d477e64e2c4b61927f43313b90b063602a4bcd45afb1bc33ee395e0b7caef202b
 DIST tl-dvidvi.doc-2020.tar.xz 19324 BLAKE2B 43f24847b7ae494fbb0180e8abfb8e21f5241c8458ec0bd86ba7f9affafec628224a75b599aefdfbf6ac3b76584f47fa51ebcb12acf9849f35ec624de2287744 SHA512 865f4e96bc8ff13005350800014ede4c95671db1c45f35e37b153637c23834d34054e3aac1b6033c6a219f9f123563b1d0cc3093c901f67dba7e33e65ba81646
+DIST tl-dvidvi.doc-2021.tar.xz 19324 BLAKE2B 43f24847b7ae494fbb0180e8abfb8e21f5241c8458ec0bd86ba7f9affafec628224a75b599aefdfbf6ac3b76584f47fa51ebcb12acf9849f35ec624de2287744 SHA512 865f4e96bc8ff13005350800014ede4c95671db1c45f35e37b153637c23834d34054e3aac1b6033c6a219f9f123563b1d0cc3093c901f67dba7e33e65ba81646
 DIST tl-dviinfox-2020.tar.xz 3540 BLAKE2B 9ee9e186a15021fadfd400e46efb798c0cf47be0bcda4402311d7a4d4fa0b41b2f12a539f6d80609f91c6db1e6fb6db1d56cdcac3800bd8fa62e9b73785a3bf4 SHA512 33b37192832362c170575d1770b0e8da105ab0f9197ee52ff86a9dedfdac718fd7f3ca87d6f3f2075803fcffbc2f3739b806b1088bd7e2a21beca53292d918f0
+DIST tl-dviinfox-2021.tar.xz 3540 BLAKE2B 9ee9e186a15021fadfd400e46efb798c0cf47be0bcda4402311d7a4d4fa0b41b2f12a539f6d80609f91c6db1e6fb6db1d56cdcac3800bd8fa62e9b73785a3bf4 SHA512 33b37192832362c170575d1770b0e8da105ab0f9197ee52ff86a9dedfdac718fd7f3ca87d6f3f2075803fcffbc2f3739b806b1088bd7e2a21beca53292d918f0
 DIST tl-dviinfox.doc-2020.tar.xz 2168 BLAKE2B 373330f7d3cc529680bdfc38ae8bc8f1bdb0676dd06eeeb98a5ac86044a3fe52853d9b05709284294a77de92368904509e22eccc68ea039efa8e326235ec6d9d SHA512 f5f84a2df36ee93ccc0a8acb687fa4fdc6441ee6b0c76fe4330cb28ff2e5106014df5f367d5f2821c10864ff16988837099114ce331afe8a303e0f9102d92193
+DIST tl-dviinfox.doc-2021.tar.xz 2168 BLAKE2B 373330f7d3cc529680bdfc38ae8bc8f1bdb0676dd06eeeb98a5ac86044a3fe52853d9b05709284294a77de92368904509e22eccc68ea039efa8e326235ec6d9d SHA512 f5f84a2df36ee93ccc0a8acb687fa4fdc6441ee6b0c76fe4330cb28ff2e5106014df5f367d5f2821c10864ff16988837099114ce331afe8a303e0f9102d92193
 DIST tl-dviljk-2020.tar.xz 532 BLAKE2B 81377c745730f1a344e8a5d7715a3bfc8a266a8b21f7f4da80b40f98a253ffefcb6a3b3e103aab28a53c28b0f337cf95905de1109a1e37053458f6e04b234ea3 SHA512 7f0fff6f850f22788981370dfe9759f8d1ac803f75e6355c582eca83ca3940f64e3c32c32881234e25d8bda59e47a4f236751c9464dc41f93c67c16cc55082ef
+DIST tl-dviljk-2021.tar.xz 532 BLAKE2B 81377c745730f1a344e8a5d7715a3bfc8a266a8b21f7f4da80b40f98a253ffefcb6a3b3e103aab28a53c28b0f337cf95905de1109a1e37053458f6e04b234ea3 SHA512 7f0fff6f850f22788981370dfe9759f8d1ac803f75e6355c582eca83ca3940f64e3c32c32881234e25d8bda59e47a4f236751c9464dc41f93c67c16cc55082ef
 DIST tl-dviljk.doc-2020.tar.xz 74976 BLAKE2B fa5c5fc3877e31f13510b5609c53d671a5ee90d53039e958a5a896d66de9ff904059535d4e71ad50cdb87fff806160024fe51e441000245968aa10fd9590b3d7 SHA512 82d28f1adfc368582a5b1d05e2e73ba99bd05d51f9daa972f5ca753905341ee1d61b9e15d402b3017bfdd78bd64c7c222794bbf76073517f96ea1b9d7a58cea6
+DIST tl-dviljk.doc-2021.tar.xz 74976 BLAKE2B fa5c5fc3877e31f13510b5609c53d671a5ee90d53039e958a5a896d66de9ff904059535d4e71ad50cdb87fff806160024fe51e441000245968aa10fd9590b3d7 SHA512 82d28f1adfc368582a5b1d05e2e73ba99bd05d51f9daa972f5ca753905341ee1d61b9e15d402b3017bfdd78bd64c7c222794bbf76073517f96ea1b9d7a58cea6
 DIST tl-dviout-util-2020.tar.xz 248 BLAKE2B 7a8bb04c8fa82ef8a7532170f3bd475ae547e54a6e578f5c38adf49aaabe6de744b6532f9dda66562758992dde8de0b253e960a0f49f875d10aa70b9644e8d31 SHA512 a9445602ac5a3663920f8c7d428e833b0451c3e80203be57cc6fbdda5db5f7c89da75cf58e74d56c4ab9cd817fc9f080a056ebd045828a0d5b034108cda61bc5
+DIST tl-dviout-util-2021.tar.xz 248 BLAKE2B 7a8bb04c8fa82ef8a7532170f3bd475ae547e54a6e578f5c38adf49aaabe6de744b6532f9dda66562758992dde8de0b253e960a0f49f875d10aa70b9644e8d31 SHA512 a9445602ac5a3663920f8c7d428e833b0451c3e80203be57cc6fbdda5db5f7c89da75cf58e74d56c4ab9cd817fc9f080a056ebd045828a0d5b034108cda61bc5
 DIST tl-dviout-util.doc-2020.tar.xz 38880 BLAKE2B c5b4c2c2b89a2e26121f7ec388da0b191e3eacbc5b6d633fbb7c6f914d7ae38d83a6ab87b6a04468a465d2fe7e68b0cffb4d948c3418c90d9b5c84df18b4fcf2 SHA512 61f86a23314334d7faa4f1ae0760aea6c5e5f77754a6a9b1d5952f09e3e15d3dead73a9f72ccfe9b9d7a022654f8d2e1e6e3051dc12bff574b6f053cdbc9b598
+DIST tl-dviout-util.doc-2021.tar.xz 38880 BLAKE2B c5b4c2c2b89a2e26121f7ec388da0b191e3eacbc5b6d633fbb7c6f914d7ae38d83a6ab87b6a04468a465d2fe7e68b0cffb4d948c3418c90d9b5c84df18b4fcf2 SHA512 61f86a23314334d7faa4f1ae0760aea6c5e5f77754a6a9b1d5952f09e3e15d3dead73a9f72ccfe9b9d7a022654f8d2e1e6e3051dc12bff574b6f053cdbc9b598
 DIST tl-dvipos-2020.tar.xz 296 BLAKE2B 876f97c0dc0eb97ebcf7735392d73b2bd33fc52af56afbf36b675f7fcafbd8fc0976dafb1a226cf1ee41d699e8a12fde1b90f2aeef03c54e463866d513302232 SHA512 152cc45942bb1d241008ea0924f1e96e2329d6fd4228be42dc6dcb9eb28081bcb3d80e407e9fdf0560e93d095fd07351cf073f14d4a4c25eb984613fd9189826
+DIST tl-dvipos-2021.tar.xz 296 BLAKE2B 876f97c0dc0eb97ebcf7735392d73b2bd33fc52af56afbf36b675f7fcafbd8fc0976dafb1a226cf1ee41d699e8a12fde1b90f2aeef03c54e463866d513302232 SHA512 152cc45942bb1d241008ea0924f1e96e2329d6fd4228be42dc6dcb9eb28081bcb3d80e407e9fdf0560e93d095fd07351cf073f14d4a4c25eb984613fd9189826
 DIST tl-dvipos.doc-2020.tar.xz 28512 BLAKE2B 3ba49d5e3e757bb34830a741f5529835230f0b70ed4b8801f0b855cdebba27621110355025ad517243c48e21e9af111d9495b74fc18d9548671bc67998c2e9fa SHA512 2bf3fd5bbd7b6e1fb8a263dd0e3deef358bead727df5de280342376225fd7366ff470b9c2fca8f763890d1047fe2c7a5b138ade1b5fcab383c8113e10f245199
+DIST tl-dvipos.doc-2021.tar.xz 28512 BLAKE2B 3ba49d5e3e757bb34830a741f5529835230f0b70ed4b8801f0b855cdebba27621110355025ad517243c48e21e9af111d9495b74fc18d9548671bc67998c2e9fa SHA512 2bf3fd5bbd7b6e1fb8a263dd0e3deef358bead727df5de280342376225fd7366ff470b9c2fca8f763890d1047fe2c7a5b138ade1b5fcab383c8113e10f245199
 DIST tl-findhyph-2020.tar.xz 3904 BLAKE2B ed688ba5b589ecfda3c1de90f7977fb76952576534b4614ba01643335d25a7a7b2593d954515f96e65e6fffb5544aae6237b5ad1dd7b011691a0666cf516ba86 SHA512 aea6305dc0d9b31367638078a7958933468e761ef4cf47a1c44d9fd5ab2e25f7af22273c4631946a90edc9b51947c2e56b3d4b74c8c59f0a79250c2edf5bc137
+DIST tl-findhyph-2021.tar.xz 3904 BLAKE2B ed688ba5b589ecfda3c1de90f7977fb76952576534b4614ba01643335d25a7a7b2593d954515f96e65e6fffb5544aae6237b5ad1dd7b011691a0666cf516ba86 SHA512 aea6305dc0d9b31367638078a7958933468e761ef4cf47a1c44d9fd5ab2e25f7af22273c4631946a90edc9b51947c2e56b3d4b74c8c59f0a79250c2edf5bc137
 DIST tl-findhyph.doc-2020.tar.xz 35040 BLAKE2B c8c7bd2eec414c4289b441c047c36870726826d2e22cdfe852117117831f63f92457fc25ad27714ab7eb110832e3c052ff197f503ae969c941bafb6d5d48d24c SHA512 97f3fa22fe490d21bc9e5ce5ea0b23ff25ab9afd9c5dbf6e8d78b24fd306ddc132c5ba7ca7ea7e3d7aaeb48993c7968b0c02ae0b765416a939d84b53171f4179
+DIST tl-findhyph.doc-2021.tar.xz 35040 BLAKE2B c8c7bd2eec414c4289b441c047c36870726826d2e22cdfe852117117831f63f92457fc25ad27714ab7eb110832e3c052ff197f503ae969c941bafb6d5d48d24c SHA512 97f3fa22fe490d21bc9e5ce5ea0b23ff25ab9afd9c5dbf6e8d78b24fd306ddc132c5ba7ca7ea7e3d7aaeb48993c7968b0c02ae0b765416a939d84b53171f4179
 DIST tl-fragmaster-2020.tar.xz 6872 BLAKE2B 85cb9e3b240f22274f25bf1ff002b86ad20389d20840c197653242e8983795e4f61358b9546b302be786eeebe7359f51ae60a7b82fc06d2a5aec561d50fc7cfc SHA512 dc5d80aa4bab7a0a66258face6cf8222d03b12ea492f7cf568ef815a6d5950a8a2b36c7403ab466141f49cb8faedfbb33146820b88da17d8b8fa18a2b16235e4
+DIST tl-fragmaster-2021.tar.xz 6872 BLAKE2B 85cb9e3b240f22274f25bf1ff002b86ad20389d20840c197653242e8983795e4f61358b9546b302be786eeebe7359f51ae60a7b82fc06d2a5aec561d50fc7cfc SHA512 dc5d80aa4bab7a0a66258face6cf8222d03b12ea492f7cf568ef815a6d5950a8a2b36c7403ab466141f49cb8faedfbb33146820b88da17d8b8fa18a2b16235e4
 DIST tl-fragmaster.doc-2020.tar.xz 80316 BLAKE2B 5fe2d1f1b5b38dbf579e0ab8819103a04e885c9b43ed7e76afc4836da78f230a0a56840a0c188a6f40e06d17084108f0f7cccb8e45f5a9c32c2856d8c681a55e SHA512 61f0bd7dab46bfb91b634006217f01648007cbce3c9187b0811a5cc1755ec19654da94b47866ad9873fd57629f1561d1cc46bf3a4d62db618502aa0e67500637
+DIST tl-fragmaster.doc-2021.tar.xz 80316 BLAKE2B 5fe2d1f1b5b38dbf579e0ab8819103a04e885c9b43ed7e76afc4836da78f230a0a56840a0c188a6f40e06d17084108f0f7cccb8e45f5a9c32c2856d8c681a55e SHA512 61f0bd7dab46bfb91b634006217f01648007cbce3c9187b0811a5cc1755ec19654da94b47866ad9873fd57629f1561d1cc46bf3a4d62db618502aa0e67500637
 DIST tl-gsftopk-2020.tar.xz 3548 BLAKE2B 65e455587ba7b014be3f7668225fd0f5b4816406896209929001cab5b61dd6b748120970dca79207117b6a5b07ff7c00f96aab6e540397405d075425f8a79a2b SHA512 cb9aebd7428d10b627d80ea40d297f3e6de006859c7dd713478ff193458494f90017ecd0737376ac1f47638b059e02e8a46ea53a7c56b8561af75f770e214413
+DIST tl-gsftopk-2021.tar.xz 3548 BLAKE2B 65e455587ba7b014be3f7668225fd0f5b4816406896209929001cab5b61dd6b748120970dca79207117b6a5b07ff7c00f96aab6e540397405d075425f8a79a2b SHA512 cb9aebd7428d10b627d80ea40d297f3e6de006859c7dd713478ff193458494f90017ecd0737376ac1f47638b059e02e8a46ea53a7c56b8561af75f770e214413
 DIST tl-gsftopk.doc-2020.tar.xz 27540 BLAKE2B c6f3e6f01bf63616a66318fc652ae0e7cf08ac0e94eb9d31ec98058da77215fc8c84be7e885960eea70ff82d72533c5011a96136758f0159b7c17430aa835fc6 SHA512 0a597e2908438fc00fc2bafa7ec635a82b70aad9d7f7e86851a654c0b72b719b8c550be0c20ecf6c8d96627863a48e6a387156ad2c7e71d1e296dd4937d60805
+DIST tl-gsftopk.doc-2021.tar.xz 27540 BLAKE2B c6f3e6f01bf63616a66318fc652ae0e7cf08ac0e94eb9d31ec98058da77215fc8c84be7e885960eea70ff82d72533c5011a96136758f0159b7c17430aa835fc6 SHA512 0a597e2908438fc00fc2bafa7ec635a82b70aad9d7f7e86851a654c0b72b719b8c550be0c20ecf6c8d96627863a48e6a387156ad2c7e71d1e296dd4937d60805
 DIST tl-hook-pre-commit-pkg-2020.tar.xz 808 BLAKE2B 99741f4b4ae417b9e1975fbcaf412416702730bc4c0aea51be2e8324ad539abc2687b690c5541e89ce085d07584b63b24946c7d5beb538476855053ebfaaacfe SHA512 6fb3009d4bb4016f0d6e92571d52aaf7e3780d39a6b2ec73ffb37112b3f153ed71ecbcd985b81dd841f296a39da83e9004a2d6e6e85e9a49765e1682563cfde3
+DIST tl-hook-pre-commit-pkg-2021.tar.xz 808 BLAKE2B 99741f4b4ae417b9e1975fbcaf412416702730bc4c0aea51be2e8324ad539abc2687b690c5541e89ce085d07584b63b24946c7d5beb538476855053ebfaaacfe SHA512 6fb3009d4bb4016f0d6e92571d52aaf7e3780d39a6b2ec73ffb37112b3f153ed71ecbcd985b81dd841f296a39da83e9004a2d6e6e85e9a49765e1682563cfde3
 DIST tl-hook-pre-commit-pkg.doc-2020.tar.xz 2788 BLAKE2B e87de5b35b848539f0bb55e82e60e147ada03120a55f3098b1d0b1bdf7926c57882c5c4296dcaaf4da89f2ef46989593642908db22e75a37802aa2b71c905ac2 SHA512 3873c4714a8a6d221f860a5d0606113c64482b363727067e0017d27e99d73f31cfdac88a799fb1412225baffaecd7bb03dbdc66b607a075b1e4539ffc0df2a9d
+DIST tl-hook-pre-commit-pkg.doc-2021.tar.xz 2788 BLAKE2B e87de5b35b848539f0bb55e82e60e147ada03120a55f3098b1d0b1bdf7926c57882c5c4296dcaaf4da89f2ef46989593642908db22e75a37802aa2b71c905ac2 SHA512 3873c4714a8a6d221f860a5d0606113c64482b363727067e0017d27e99d73f31cfdac88a799fb1412225baffaecd7bb03dbdc66b607a075b1e4539ffc0df2a9d
 DIST tl-hyphen-base-2020.tar.xz 22432 BLAKE2B a5760e60af2160e9e421422647d29b1f374efeb7d5b72834c73550f9db4f9037bf7afe13dea9c01990a91804b04e64f2e52babe92a43766635757cf705001882 SHA512 f7084afba6bb1e38629f551d3334fa6d66d0fe0a9450980911adf7f3869e46ab486fde0c2fb3ee1dd6358a4d9cc4aa545302e552f1a7b07a0329e6f556c465d1
+DIST tl-hyphen-base-2021.tar.xz 22428 BLAKE2B d607e789758222031aa365defa0383eecb2d18b24f8c0027dc7ffa93f15a46f330956da6ad25c7615630d2866d426b177b443968c44be8f7f380ee580e00d3a7 SHA512 d5d606630e052a49bf6f4f9e0ea25863aa7ba358fee932044f588afe97d8325a8ac18e5dbb5f11cc9092f1dde8382398049c4852245f373e75b0da1f3f4174a4
 DIST tl-installfont-2020.tar.xz 4840 BLAKE2B f5fdcc51fde58473041db0aebb682b431ceb02476fda93fc7cc59016982d613f0ceebc2a662a6260d51ebd8a96e03ecffa717cd098fa2fcf2d614e3458777624 SHA512 cd5133b93c5daabaa0ea13649f3d34c28f9af9f92db54917e64cafca5f5e7fe5169d87e36783036850ccde0002d34860eceaea528ad06e21f08141106e6599ae
+DIST tl-installfont-2021.tar.xz 4840 BLAKE2B f5fdcc51fde58473041db0aebb682b431ceb02476fda93fc7cc59016982d613f0ceebc2a662a6260d51ebd8a96e03ecffa717cd098fa2fcf2d614e3458777624 SHA512 cd5133b93c5daabaa0ea13649f3d34c28f9af9f92db54917e64cafca5f5e7fe5169d87e36783036850ccde0002d34860eceaea528ad06e21f08141106e6599ae
 DIST tl-installfont.doc-2020.tar.xz 56040 BLAKE2B e1b66c235779773678580a4a2730734460c3efa433de30303bdf8731c4d303e3b0b41784bb5643f379d64e53b768941e9ccec124847dcadd8b928bda9a0975d7 SHA512 2b61c4b229e0c4ec89c591075e52bcf8c150f5f9584bff94f81ec1f229940dafef11d6b6f84dd086692cbd99e6616685533d4313ef5bc48c56a7494fef3583b7
+DIST tl-installfont.doc-2021.tar.xz 56040 BLAKE2B e1b66c235779773678580a4a2730734460c3efa433de30303bdf8731c4d303e3b0b41784bb5643f379d64e53b768941e9ccec124847dcadd8b928bda9a0975d7 SHA512 2b61c4b229e0c4ec89c591075e52bcf8c150f5f9584bff94f81ec1f229940dafef11d6b6f84dd086692cbd99e6616685533d4313ef5bc48c56a7494fef3583b7
 DIST tl-ketcindy-2020.tar.xz 2528844 BLAKE2B 44aaab5acd9de633b67a52eb2d11dae414ad44c6e108565622cc6da6595ec0969a0f72369df68ae49fb7e064afcc9b87cd7838312ffde611c250eaf027f41df7 SHA512 a65dd1d1ea906ecb1ee232029230005c781066bca2d7192893b5230a06059feed4416b78d4670df104cd7b3f5afb6c3463868340c7991f770026da2294009c18
+DIST tl-ketcindy-2021.tar.xz 2528844 BLAKE2B 8e761edc72ab39a782c68d59299e6c96ab6547bbdc7c7e5ec32972ef09800e1b342d2115215ec3be36d1a9e311c7cf55fa7b68ae77785020bc73009d22db828d SHA512 5096e7b197298532714fc1850d30e93fbef779f3d014b101f6b1bfd519c82a748ac6e340a5d9f53d94a5818f7c07278d7ca0eade97bd0c4567d293dab7d018f3
 DIST tl-ketcindy.doc-2020.tar.xz 14292908 BLAKE2B 92ed291c48708b12ecefb35502a97d3011d89bab09d02a8bd1d967707da211717d37020364fe0086d3125512f7426619a550caf743bc00ef41bcf44c0fb85d25 SHA512 e0afd2ac3cfa351cd3eb5e1c49a7a8cfd87a52ba1a8e8f614578bf6894529e51bc096d5b9ec8b910bdf9d6c30323d31ae5a9b38e167523784c75d334a56386e5
+DIST tl-ketcindy.doc-2021.tar.xz 14292908 BLAKE2B 92ed291c48708b12ecefb35502a97d3011d89bab09d02a8bd1d967707da211717d37020364fe0086d3125512f7426619a550caf743bc00ef41bcf44c0fb85d25 SHA512 e0afd2ac3cfa351cd3eb5e1c49a7a8cfd87a52ba1a8e8f614578bf6894529e51bc096d5b9ec8b910bdf9d6c30323d31ae5a9b38e167523784c75d334a56386e5
 DIST tl-lacheck-2020.tar.xz 464 BLAKE2B 306cfae738b04113bebe25cb6e57598af61078f587f91503408bff5190362927bfc5d2456b4396fc524eab495ab70c48f70f20afe24b966acf753f4a86d1a435 SHA512 7b8c4c7d15618b7e0d860afce675124372d31bc11b5e89ba169c355401714929c2c192912e7d666a3ca98c805e2f4942bd6173763a5a9265d1f19467a29223d2
+DIST tl-lacheck-2021.tar.xz 436 BLAKE2B 7801a64fe9789df0c4409e8fc29cad868bebcb0721d1c7dd8e717cc3c1deb241d356c8d706c744a5019fc94fbf799917e3ca8a9627fe4c9bfe5ddde435423d41 SHA512 30241d13ac35054017c6240ad066ae84b11c26757fa895ffdc1444b0825e50a2a89864ca85d710882be4105127c4df203ad4a403504a6c309b796c9b9ee5b589
 DIST tl-lacheck.doc-2020.tar.xz 20964 BLAKE2B 4a70a5c0df0151e5559116ead2e5aa2b8b25700cce5041b90e241916f60c79f7e2a9478c48c1b4df04b21935746cf3ca736592e292d2225aa3701ac9ae4f545c SHA512 a1ef923bfe1c3496651052b4a8b6978665b75f43b7dbeb254fb61657050427aedc8415218f988a7e727849dd0001b67ed023ecd252bac2445b0965a58800187c
+DIST tl-lacheck.doc-2021.tar.xz 20964 BLAKE2B 4a70a5c0df0151e5559116ead2e5aa2b8b25700cce5041b90e241916f60c79f7e2a9478c48c1b4df04b21935746cf3ca736592e292d2225aa3701ac9ae4f545c SHA512 a1ef923bfe1c3496651052b4a8b6978665b75f43b7dbeb254fb61657050427aedc8415218f988a7e727849dd0001b67ed023ecd252bac2445b0965a58800187c
 DIST tl-latex-git-log-2020.tar.xz 4880 BLAKE2B cb0493a41fe78afc8177d67d8d02c608df2f88b4ae9196e9306f54e14ef8f1c387d0432d6ee1ca78310c70c78bb9c2840670a397b4fcb21a97f21a60a1104cf2 SHA512 c320354a35d98a3e32c835c2a797100dc2a4417dd3e72169c35baf1dc2022b7aadb3f8ce124ab6ea6f7d6b99728aa438cf4d15f7f6635bf3850e271679b07603
+DIST tl-latex-git-log-2021.tar.xz 4880 BLAKE2B 02f82d7b00a8740745272160d1fce1440ab8d50f95e2174a404d8bf2ff189a5c593ea7d63a83b5a4c0769e4cb863b736cdb57dc438a81539244a2c311ee5fc99 SHA512 15994c6eb9ba1b194df270c68a3d74ab3db11974875ce192559182b2dbfa9b308d598056a3145f2cc2f6718865a5b140ccb95dea22a9e23edee527e5b86362ff
 DIST tl-latex-git-log.doc-2020.tar.xz 110280 BLAKE2B e398d22eb09514b4328b5013aeeb90c086d7e075d6dcf93ceeaf34fed694b172f7ea7deddbc2654db830477a54b50d4db585d164127dca2ba858d522f8c47114 SHA512 52bc94324c64caac9a5b25b49c9ea01b8560433d640646ee70830d27637482cf50da95bbb86db93006f2be4ab9f5f79fa144e4b631d62c05f0a11ab45e639cbf
+DIST tl-latex-git-log.doc-2021.tar.xz 110280 BLAKE2B e398d22eb09514b4328b5013aeeb90c086d7e075d6dcf93ceeaf34fed694b172f7ea7deddbc2654db830477a54b50d4db585d164127dca2ba858d522f8c47114 SHA512 52bc94324c64caac9a5b25b49c9ea01b8560433d640646ee70830d27637482cf50da95bbb86db93006f2be4ab9f5f79fa144e4b631d62c05f0a11ab45e639cbf
 DIST tl-latex-papersize-2020.tar.xz 4696 BLAKE2B 19972019c74f98abaae8942fd7278a7ee4c1935c9e4bff0d6fef3aaf4160448e87954ef532400a808ddf555417956884b290486ec444b5acd45ef7a894e13b51 SHA512 00010f764235c6d9e4d6667c8c8b9f0ec6ae4b65afb53109f8179e0429d4b3787bd6b0985cd511f770cd74512483d1077e0f42136fe7ce1871984b372f2f2e54
+DIST tl-latex-papersize-2021.tar.xz 4696 BLAKE2B 19972019c74f98abaae8942fd7278a7ee4c1935c9e4bff0d6fef3aaf4160448e87954ef532400a808ddf555417956884b290486ec444b5acd45ef7a894e13b51 SHA512 00010f764235c6d9e4d6667c8c8b9f0ec6ae4b65afb53109f8179e0429d4b3787bd6b0985cd511f770cd74512483d1077e0f42136fe7ce1871984b372f2f2e54
 DIST tl-latex-papersize.doc-2020.tar.xz 596 BLAKE2B a35b17015da1a6cb8527cd3c565a5fe51e29c69e7989eea5f32ee710f4a347ae389d70278bee21c86155ea31afced6652dc49495957211071f719b732984ba33 SHA512 8ebddd884e3e533d06332f2d6f8657ed54c9c376b3de68c7e7652f3b2835ec6601f5326ea70dc830b645440f0bd9ba2281e4f71a847946bb595771c6a950c0a6
+DIST tl-latex-papersize.doc-2021.tar.xz 596 BLAKE2B a35b17015da1a6cb8527cd3c565a5fe51e29c69e7989eea5f32ee710f4a347ae389d70278bee21c86155ea31afced6652dc49495957211071f719b732984ba33 SHA512 8ebddd884e3e533d06332f2d6f8657ed54c9c376b3de68c7e7652f3b2835ec6601f5326ea70dc830b645440f0bd9ba2281e4f71a847946bb595771c6a950c0a6
 DIST tl-latex2man-2020.tar.xz 14088 BLAKE2B e791e164f7d8faf12c30719817cb887eff7706b3b3db97cc0cce773b4c722e62564935a5061804e531a3dbc862a919b3606c9c57796679029b5208473bf7faea SHA512 9ce1870958d7de7625fe73dfb735488d2512b048c8c06fed3f87255db0914080675017d24c88a97ec71ddb9cfe6f5769ea378f099d8787e447837a1ff5167436
+DIST tl-latex2man-2021.tar.xz 14088 BLAKE2B e791e164f7d8faf12c30719817cb887eff7706b3b3db97cc0cce773b4c722e62564935a5061804e531a3dbc862a919b3606c9c57796679029b5208473bf7faea SHA512 9ce1870958d7de7625fe73dfb735488d2512b048c8c06fed3f87255db0914080675017d24c88a97ec71ddb9cfe6f5769ea378f099d8787e447837a1ff5167436
 DIST tl-latex2man.doc-2020.tar.xz 369336 BLAKE2B 897023bf06fb5ed6f172251fc21cbb3bef908742ec86e3fe998a080a890b74e029d52332ce7b9c47334bae40648812ea5fc9888e18a9b28ee53f059ceb9be4c3 SHA512 214685e6982c7a9c694d74a73d37c58f3947d7304637d2ed44fc616cece6026e5d02763f26e280ab21212d18a962c31b4ac5315fa840f10bf1efcfb782f4dd2a
+DIST tl-latex2man.doc-2021.tar.xz 369336 BLAKE2B 897023bf06fb5ed6f172251fc21cbb3bef908742ec86e3fe998a080a890b74e029d52332ce7b9c47334bae40648812ea5fc9888e18a9b28ee53f059ceb9be4c3 SHA512 214685e6982c7a9c694d74a73d37c58f3947d7304637d2ed44fc616cece6026e5d02763f26e280ab21212d18a962c31b4ac5315fa840f10bf1efcfb782f4dd2a
 DIST tl-latex2nemeth-2020.tar.xz 7113440 BLAKE2B 3220792f23086f9c8dfaaf146f83f72c3329b0ce0d2e891ca9c461fe6540f837798b649887df890caae09afd5d90bc151afa9315e455df012817274c0accc02a SHA512 ee82b11dfd3ede3b926a034ce8a7f46ae2bdd065f648fc0375a62392a8be605e391c64726eea03efc439b7a01fcd3cecfd70106335c72927e45c70ef0c8aa48f
+DIST tl-latex2nemeth-2021.tar.xz 7125616 BLAKE2B 927e1617890c682c042ffa513dfcbc622ca83ea1efff6ef30e78dfe3b90cc8aa412640f3aa66e7b68226ad11770c07caf1a55770560082d6aa860636839cefd8 SHA512 37065f9916e6755c1a97f2b8a1f1cfd838008b5da2d2131938626ae4eb6872af30e5b4b767ff3204e271a86b7245b54d9146d9fdd8c807f882ca28e1663d2d14
 DIST tl-latex2nemeth.doc-2020.tar.xz 26836 BLAKE2B 52c8698d50809bd54ab7e0802a76b314ad7b2553b72adb2d0a485a7888566c9d6e2465f6929a89196f4dd9ccbc442b93719ccf0b44ff304eadf670dc3c3c42b2 SHA512 e2ea8084bec4d41a4b694c3b46788e3170043ba1f7ce4096bf029a4de61b76cb504b532d7e0c454943980d44d1c145a78a9e4a7f20a6654aa9cca63d388bdb5a
+DIST tl-latex2nemeth.doc-2021.tar.xz 26836 BLAKE2B 52c8698d50809bd54ab7e0802a76b314ad7b2553b72adb2d0a485a7888566c9d6e2465f6929a89196f4dd9ccbc442b93719ccf0b44ff304eadf670dc3c3c42b2 SHA512 e2ea8084bec4d41a4b694c3b46788e3170043ba1f7ce4096bf029a4de61b76cb504b532d7e0c454943980d44d1c145a78a9e4a7f20a6654aa9cca63d388bdb5a
 DIST tl-latexfileversion-2020.tar.xz 1652 BLAKE2B 57a97adc83f9e367c3681f6943bb38ca238e6057ecf9873611751da624013e891f5dc184a46daac80a2464fe32ee7002e53f63343e6d8bc3bf313e5b347c5e50 SHA512 3a017b8a367864358370f0063957c301014df2aa039566ef33ae78dcf428235ccc2a88e19c917c940e186371e2c0b747887cb04e7cb78b9a04ac1720dbd94cf9
+DIST tl-latexfileversion-2021.tar.xz 1652 BLAKE2B 57a97adc83f9e367c3681f6943bb38ca238e6057ecf9873611751da624013e891f5dc184a46daac80a2464fe32ee7002e53f63343e6d8bc3bf313e5b347c5e50 SHA512 3a017b8a367864358370f0063957c301014df2aa039566ef33ae78dcf428235ccc2a88e19c917c940e186371e2c0b747887cb04e7cb78b9a04ac1720dbd94cf9
 DIST tl-latexfileversion.doc-2020.tar.xz 928 BLAKE2B 3a72c41b0da50e9793ef2ca44653aec32780da76201a43a57e0ee77ffd4ef6225d789f1614b166e2c1b324b97a1515867f4af13d68a5225fafbd444c7ecaf11f SHA512 b1df01f8bc7daed937cd20d1ab7cce443a3d1fbb58e04cb18f0c0b30ef0795c988cf51bf49ace2f960c173f6a95fe982ee9d29d7650dcde21784c788165094c1
+DIST tl-latexfileversion.doc-2021.tar.xz 928 BLAKE2B 3a72c41b0da50e9793ef2ca44653aec32780da76201a43a57e0ee77ffd4ef6225d789f1614b166e2c1b324b97a1515867f4af13d68a5225fafbd444c7ecaf11f SHA512 b1df01f8bc7daed937cd20d1ab7cce443a3d1fbb58e04cb18f0c0b30ef0795c988cf51bf49ace2f960c173f6a95fe982ee9d29d7650dcde21784c788165094c1
 DIST tl-latexindent-2020.tar.xz 55128 BLAKE2B 09d8bf2bc155969d391e140f1397adb80f2a7aa03a80fc048d8e098ac15d2c31ed84fd8715024e71d62143b23aae1b6804f67e9de87b92f31c87258262b64953 SHA512 0aa45877dfacb861ff325c13518abe9fb15b6a07a2c6ba93fa7d8edf982be40c26d46c439875488fa468490e5a74e87cb214dba05346a8946addaddddb44a3a2
+DIST tl-latexindent-2021.tar.xz 60080 BLAKE2B 4c775db4ccf1bf481a73e0c28a8e708b6d0a68dd08a8cce75ac65e497c429fc61267286fe4a8fd95e7bc54ffd27261f602cc50e474d0ff23fab1332eda9d20ff SHA512 2bcb1ed95f7e001d9229f3cc8748ad492578fd62a37013956a322641f27a672f3970d07648944e7edfed962381afc83653c2d792b5c9ee357cda0bc5c451db69
 DIST tl-latexindent.doc-2020.tar.xz 907188 BLAKE2B 391015883be6cb1eb835b9e0e4f689cd1fd17727a291b06f4ba7f6bd3a201386f5a430e21945c88358679d819033221182a9cd11b1c5d37192dbc48cec026aba SHA512 eeb9eda0713ed33982cd2d261d6bd20896579a9788a90056594d40c9c30db1b915de3e4a0f5cd43ba422e7b0f90120b1b705843424899380a35dc17b0eab6a4e
+DIST tl-latexindent.doc-2021.tar.xz 981092 BLAKE2B 93075a6c52f2d2977fb8e75ed1db0a90024b7a43ea1cb0266658e6278b8e3758e9f2dc9dbfe65ed05222b375f72c3ca2b51a203bf64faff85c14501a0030c66f SHA512 99d64a9d84703f362f7587e5cfc2aed0d6a7be2b272f8d435af4ad79ba90f555529fe34ff02a844dbbcbcdf98417c123f55f4e4a073bb8079dca2e7f3cbb9ecd
 DIST tl-latexpand-2020.tar.xz 6692 BLAKE2B 72146f6b82314812184a0e7802f6d675bf15e2a80ef1e74604da2e2ec1b32bbea7089c30ccc239f5eafe809d07d08ecbb0016929ccd3de19f8c45cf28e2ce92a SHA512 ff362aea91f703759157dc810067d39d0d8fbdfd031e993c1a6c019a55d50a3e11745ab72c8abc7bd615f79cbe589cb0bd7bf82c147d12d18d3483ef95dcf4ba
+DIST tl-latexpand-2021.tar.xz 6692 BLAKE2B 72146f6b82314812184a0e7802f6d675bf15e2a80ef1e74604da2e2ec1b32bbea7089c30ccc239f5eafe809d07d08ecbb0016929ccd3de19f8c45cf28e2ce92a SHA512 ff362aea91f703759157dc810067d39d0d8fbdfd031e993c1a6c019a55d50a3e11745ab72c8abc7bd615f79cbe589cb0bd7bf82c147d12d18d3483ef95dcf4ba
 DIST tl-latexpand.doc-2020.tar.xz 3132 BLAKE2B 41d28cd8288c2db9c186558d5ee143d072b4d11cc6822b166ba8e5a421285cb3c5a2fb474c3d5f4b891f0ea0df78a6cc53e7e3328289b409c675e0c7c7d2cedd SHA512 63181837edaf48a5bcd842039579e3efad999cf2db1cc3da8184b59f359db0ed7f50a9c706a44f32fd0642438020256283434b95a29d64b184ddd5ca27895282
+DIST tl-latexpand.doc-2021.tar.xz 3132 BLAKE2B 41d28cd8288c2db9c186558d5ee143d072b4d11cc6822b166ba8e5a421285cb3c5a2fb474c3d5f4b891f0ea0df78a6cc53e7e3328289b409c675e0c7c7d2cedd SHA512 63181837edaf48a5bcd842039579e3efad999cf2db1cc3da8184b59f359db0ed7f50a9c706a44f32fd0642438020256283434b95a29d64b184ddd5ca27895282
 DIST tl-listings-ext-2020.tar.xz 4856 BLAKE2B 0317ca2bd6c6cd1ebdebccb4b924c57bc9b9409d97e9e967a78a16282541655f454dd4c20e6e8cf1613a05755cdf5d88c1c7aee6f030a80d8364807aa8434a2e SHA512 c68752d0e7a1ffb7d08f153bf337849164d0287f20ff8f092635ad7083b2e5a6c487bcd9dff913dd029f4ea92750768d23583eed53a0c2d3bf012e4db059708c
+DIST tl-listings-ext-2021.tar.xz 4856 BLAKE2B 0317ca2bd6c6cd1ebdebccb4b924c57bc9b9409d97e9e967a78a16282541655f454dd4c20e6e8cf1613a05755cdf5d88c1c7aee6f030a80d8364807aa8434a2e SHA512 c68752d0e7a1ffb7d08f153bf337849164d0287f20ff8f092635ad7083b2e5a6c487bcd9dff913dd029f4ea92750768d23583eed53a0c2d3bf012e4db059708c
 DIST tl-listings-ext.doc-2020.tar.xz 103704 BLAKE2B a7367a78ebd5d466b0b4adde5926264d4b5325a635f4db25483a491ddcafe3436d2f97e64d50d4825e5def63439c50543dc893e08504501fab56b3ef7d84e6d3 SHA512 82491f81dfc89950d085f7cc41dabdf7b895b23c8a69f80c1b4f4c420fe8f036ac181b56e3ab60496910d0f1165ce19b2f94c5e268dc1d59e352ab6747e3bee5
+DIST tl-listings-ext.doc-2021.tar.xz 103704 BLAKE2B a7367a78ebd5d466b0b4adde5926264d4b5325a635f4db25483a491ddcafe3436d2f97e64d50d4825e5def63439c50543dc893e08504501fab56b3ef7d84e6d3 SHA512 82491f81dfc89950d085f7cc41dabdf7b895b23c8a69f80c1b4f4c420fe8f036ac181b56e3ab60496910d0f1165ce19b2f94c5e268dc1d59e352ab6747e3bee5
 DIST tl-listings-ext.source-2020.tar.xz 22652 BLAKE2B 15f7ecd55bbdd3e34de77c72e710ad7aa5b7be6d31da0e550171f8477627e0cbcc9cac8bb852c2771b639d66992b846a9cd37952f8b6ffe16a7ea9a7fb3e43a1 SHA512 fab34f07d6384a5474f3ac30e2e00a75398418668134ac1041cabded6209c9521244e1637e4037e7346bc70b3247ebcd90526d5e34fc3c4e388fa978382bf228
+DIST tl-listings-ext.source-2021.tar.xz 22652 BLAKE2B 15f7ecd55bbdd3e34de77c72e710ad7aa5b7be6d31da0e550171f8477627e0cbcc9cac8bb852c2771b639d66992b846a9cd37952f8b6ffe16a7ea9a7fb3e43a1 SHA512 fab34f07d6384a5474f3ac30e2e00a75398418668134ac1041cabded6209c9521244e1637e4037e7346bc70b3247ebcd90526d5e34fc3c4e388fa978382bf228
 DIST tl-ltxfileinfo-2020.tar.xz 5168 BLAKE2B 65e798fa705b8420a03db389c5990784d9c1f208d23f9e07c615a47c2abe9a560ecd55d0eb589151ae39450738a98b8eb48c949d4a4fe285d6defcbbb81927ee SHA512 ca078af6b822747e9b337eb5694c1b019444e55f5f9f9dbdf59fa1a65c9445b19a62b0d610514c9231365017d3ea95ad9288a37b62b400c12df74c0c7f774a44
+DIST tl-ltxfileinfo-2021.tar.xz 5168 BLAKE2B 65e798fa705b8420a03db389c5990784d9c1f208d23f9e07c615a47c2abe9a560ecd55d0eb589151ae39450738a98b8eb48c949d4a4fe285d6defcbbb81927ee SHA512 ca078af6b822747e9b337eb5694c1b019444e55f5f9f9dbdf59fa1a65c9445b19a62b0d610514c9231365017d3ea95ad9288a37b62b400c12df74c0c7f774a44
 DIST tl-ltxfileinfo.doc-2020.tar.xz 37612 BLAKE2B b8021ed8cd1d977b18b92ca463046ebb67fae757794d881d8bf65b81dffb41ebdbc9aab960d06bfd7514d55d36c2d780fbe890a76e5fa3b415b53f174ff9e363 SHA512 0020ffc5874e0545c7ae4d1f6f9c0d5d598786444f4e98369e0c5fc872c5d63f235222594a9b0f5d2def5c3dcafc5ad660a4fd5a9e4551dd7717bc6ac06189d5
+DIST tl-ltxfileinfo.doc-2021.tar.xz 37612 BLAKE2B b8021ed8cd1d977b18b92ca463046ebb67fae757794d881d8bf65b81dffb41ebdbc9aab960d06bfd7514d55d36c2d780fbe890a76e5fa3b415b53f174ff9e363 SHA512 0020ffc5874e0545c7ae4d1f6f9c0d5d598786444f4e98369e0c5fc872c5d63f235222594a9b0f5d2def5c3dcafc5ad660a4fd5a9e4551dd7717bc6ac06189d5
 DIST tl-ltximg-2020.tar.xz 16336 BLAKE2B 1ac6d4ba988d8298226d430bea32b988735f54dc4530712b765d84dbb541881a619e58aab02e955703ed9e2b7a6c87aa881dfcb64bb6ac81e0b9a74fc265f600 SHA512 28486dc83e37120eb5c8e0218541f17f6d9f631087b56890cb0bb9a10e3599d4afb31e997f736ce99476491ffae01ed9ae3b4194205e366dd0a2ea09dc2dd565
+DIST tl-ltximg-2021.tar.xz 26344 BLAKE2B bc8833846aba2a6e72d919ac5a3c9c395f1df30bb408536068cb490cb16b09e612d04bd8f3216386a7a1eea7bac2a9b622e4aa3e7f6fa24775c2bf71698b8a60 SHA512 9aa5aacc687d31bc76fd81a2c26cef98fb9328b90c1d97c439f323fe7962184eab2b571431fe208823a6e42fea6c036128414474ca815517421989916a94eeee
 DIST tl-ltximg.doc-2020.tar.xz 137184 BLAKE2B ec21e3bfe7ea8cc0f0b5dc94eba971c71dbb95e43bd00480ca952ebdd9ff9a2549138a415399df70ad6f3b5f267cb23eb292a43e0cc6cb789483b4f0f0cc3b8c SHA512 c8d688e451537c6b08556f3d021cd552ba491f0b031c253e0f914945604b492c4d2cb2b7423ad2f95cdd4ed180c8b0bee1501e28f7fc0b20a551b735a47a2094
+DIST tl-ltximg.doc-2021.tar.xz 242252 BLAKE2B 50ada9868e920984db14fda9adb86135d46497289ccf52cabbfc744cf4fa9927a86c617c81010722e04320661bc9478a2b0089ae4442ea0a6316f599764c48e4 SHA512 5fbf8faf7bfd95b4f35e755ec1507f155647376be9311b97dd7c2924c9958fb0c42351eb43728018bc95e12cdec1b2b8ef89a7a2245e532dc8a49b4c583f54b9
 DIST tl-make4ht-2020.tar.xz 43192 BLAKE2B 19ffd8389236806d3a2b4118d1312ac7f9d3c8d4692a529bf8ac6f22a7eed8ff778955f19ce3ff058fe87a8dfc0cae66c516d38e6291a0d7e6c8960400436761 SHA512 86578903b820e3011042dfbb6d18a436cea35a780691d3aa82f468518f7666fad343d6c91c91dea0bac47a06b6a812ca5dc95e474f5913f305c22adc2636d422
+DIST tl-make4ht-2021.tar.xz 46600 BLAKE2B a6b7a9cf414bd52ea829688762e559e79e862676910e33f7118e854819be16cb17de2a6997ec386a0f26e3ad8ed1c073ca151003a1b8fe7f7b3db04fd297f26e SHA512 4c41fae770844af8280c4883772290e5cf5d42af439ac0dfde777e49d6303b0e0d211c4d3d0b843d4ece36f794f0dc8bbc8e6573031d81d4eb47d9180c3d05d5
 DIST tl-make4ht.doc-2020.tar.xz 150344 BLAKE2B edf7e1082e01f698e941c7812dc62eda3a54a7d87949b744f71140f4f8cf046c73ad5b096498e2dd051e8879ac77fc6015df21ea4d139b1d2fdd6acaea13dfe2 SHA512 ca138ad89fd6b350dbb3fa6b22649c3b0ff2bb802e5273f772765b6b7fdea4211eb41ef3a679af2d9d853578a9256f84d492be7699f4b5d33660ad0d59219bba
+DIST tl-make4ht.doc-2021.tar.xz 158612 BLAKE2B 482f5d4f4abbb0ccd5775a4ced1f134a236ffa668ee428944a94af854147e968736686347f78d6d379e023a45504879eef4b711bea5e12d7df94923218f09796 SHA512 8c347be5e9e0d85850dd3c3974d965e6a9039096a13f22e45e574e9cc0e8c270d013c2b04b44348eea663debc37503b9d696f5e8aa8da594c923713316b2d5a8
 DIST tl-match_parens-2020.tar.xz 3328 BLAKE2B 3fd79342cb4a1d3de5a60e7364730af1fef0e7de20e45c78c2e7c6aea1457259a7cd53daf6875f9a35f1f5425fb34a67426ceceeab7868a1f781a67a82ab3594 SHA512 1e03e279e977af436a8f5d5c3d30f046f46f1a31a0fd3de6d8ab458a64f0634b5f3ef8a338954971a898a1c68128f60c6eabd7ca231df9f3ca8ed12e55967dad
+DIST tl-match_parens-2021.tar.xz 3328 BLAKE2B 3fd79342cb4a1d3de5a60e7364730af1fef0e7de20e45c78c2e7c6aea1457259a7cd53daf6875f9a35f1f5425fb34a67426ceceeab7868a1f781a67a82ab3594 SHA512 1e03e279e977af436a8f5d5c3d30f046f46f1a31a0fd3de6d8ab458a64f0634b5f3ef8a338954971a898a1c68128f60c6eabd7ca231df9f3ca8ed12e55967dad
 DIST tl-match_parens.doc-2020.tar.xz 57268 BLAKE2B 3540abdc804c0b062e5a06c570ff9be7aa87514004a780b96d159dc90bc9fdd98847fdb1a5559d944da15908bd6cb8b6a03bb56e8de4f40a13e13557c3e4d3e5 SHA512 60428bc16f65fe820e267852c9d85a5f862c6800ac9c2aae0915a48819da381b2a311fdd3d08096d4aab7311ef86c1c89fabff3d88caf419dacbef515f4dd39a
+DIST tl-match_parens.doc-2021.tar.xz 57268 BLAKE2B 3540abdc804c0b062e5a06c570ff9be7aa87514004a780b96d159dc90bc9fdd98847fdb1a5559d944da15908bd6cb8b6a03bb56e8de4f40a13e13557c3e4d3e5 SHA512 60428bc16f65fe820e267852c9d85a5f862c6800ac9c2aae0915a48819da381b2a311fdd3d08096d4aab7311ef86c1c89fabff3d88caf419dacbef515f4dd39a
 DIST tl-mflua-2020.tar.xz 31672 BLAKE2B bba0fe1b80a069c60a4746499c8a163747381d1e04c07285cfd8647113e4a633654a2f31e0d96e889748da75bce78d7d9105090fad489f3bf1d3ade4204fe8b7 SHA512 d7e7707c9c44f0e744326afcb58e3cb5f71451530503c0b09940db3d5d29d6d0d6e0b3b258dfc6a85d8698afd85a61c196c0f9d47ed804b7b2b12c94a1e229b4
+DIST tl-mflua-2021.tar.xz 31672 BLAKE2B 7bb1c83dc227f9d5c40e4166a1077f430bb024ff682d7e819a4fc1d5b75b2fc5647b382bf70f0bcfc4a7c9d5f89ee51b77bd4f837efeeb1eb8a038b125488b86 SHA512 ec89212e9a1518f5502f93114377f07e88af787f15c64fc61f40f22a679384f8825384c694dd365d5a74bc5d9417dcf3932c634279550603374bb43df1a7a0e6
 DIST tl-mkjobtexmf-2020.tar.xz 7444 BLAKE2B 624ff2a3059854ad4aec624e43e8bf03286b477c2210ba4d993affe076fa12bf932a9b6376862aa98d06b4f848ab8b49257215658a8c55196f8e59594d64d4aa SHA512 c0dffdb276141b78bd2c47e6d2bfddcd13c1800d3a0806a05ca1fba72a91621364b827801430bc757601e07f2a5130366ade49d7ac1df27901fbec29827739c3
+DIST tl-mkjobtexmf-2021.tar.xz 7444 BLAKE2B 624ff2a3059854ad4aec624e43e8bf03286b477c2210ba4d993affe076fa12bf932a9b6376862aa98d06b4f848ab8b49257215658a8c55196f8e59594d64d4aa SHA512 c0dffdb276141b78bd2c47e6d2bfddcd13c1800d3a0806a05ca1fba72a91621364b827801430bc757601e07f2a5130366ade49d7ac1df27901fbec29827739c3
 DIST tl-mkjobtexmf.doc-2020.tar.xz 80276 BLAKE2B ee2373e795425a3c40e1a46af3d1fb7a800aec9db9d808b6a6b32e64de6f449f4421320e429f635eb8b04c03e7768a4ada3f37e8c044d89c903d13ae32ed0f87 SHA512 3ef5c333cedd5104b63c1457fff2eee40aea7d1f1b187d34ce4cfccd5b6bd38809b7686dc7b41a147fbee2ae0e951470f3ae574bd3c10a5f9b6fb76b686ce4f5
+DIST tl-mkjobtexmf.doc-2021.tar.xz 80276 BLAKE2B ee2373e795425a3c40e1a46af3d1fb7a800aec9db9d808b6a6b32e64de6f449f4421320e429f635eb8b04c03e7768a4ada3f37e8c044d89c903d13ae32ed0f87 SHA512 3ef5c333cedd5104b63c1457fff2eee40aea7d1f1b187d34ce4cfccd5b6bd38809b7686dc7b41a147fbee2ae0e951470f3ae574bd3c10a5f9b6fb76b686ce4f5
 DIST tl-mkjobtexmf.source-2020.tar.xz 19828 BLAKE2B 31b3a262ea9c1202d17c542a5a707ca36df035338844ba5973fddcdc6fb96805185bdcbe0de69dddb7f7f3b4a898de540caeb66088fa57abb0d3501c699f6677 SHA512 7f9de9bafb890d12ef2f07d3b8596dc31c4bb97079f826c9efd4f318383f64d8250099a937d8d692fecf703e626b42f942962f4d906e705cf4b0155e354bff0f
+DIST tl-mkjobtexmf.source-2021.tar.xz 19828 BLAKE2B 31b3a262ea9c1202d17c542a5a707ca36df035338844ba5973fddcdc6fb96805185bdcbe0de69dddb7f7f3b4a898de540caeb66088fa57abb0d3501c699f6677 SHA512 7f9de9bafb890d12ef2f07d3b8596dc31c4bb97079f826c9efd4f318383f64d8250099a937d8d692fecf703e626b42f942962f4d906e705cf4b0155e354bff0f
 DIST tl-patgen-2020.tar.xz 648 BLAKE2B 3bc7cd6eddb45607f2a6858b31dfcb65d2a8252115293ee8a2cac24747d00ba0024b4ff8c60c54b67ad46e50012749ccffcf1dafb5f885b1d5b920d2079cd949 SHA512 524ea5aa09feba7ef5efd47e35d8d94703be4e191bb081d0b13007e853e88729c6029451e58a7237ad5ddf524c4d0798421316c38d1d9374ed7cd05f2744f761
+DIST tl-patgen-2021.tar.xz 780 BLAKE2B 65976437fd91e34de023f5d6c57c71a316cfa1757c4014e0704dd63b3dfcba01be6523fad995f5d1c13fa9187ca60743339489d3f78321b645d04da21cc167e9 SHA512 38b99382d97e8c3315d2d5ae713c41445e43c9300a4829dc7a00b8db098a4bad592a18535f1f281aa6fab893247f703f203ae3e3ba8f2f22a56b52163abe80b3
 DIST tl-patgen.doc-2020.tar.xz 28660 BLAKE2B 9400442b8aefb755148c6fa6b13e2f25b148fff1d4b8022bf3ff61385b22d1a06ca71e3b1d41e5c127e89e7d9b44b83f17f4f7706ca7897e9735b4b11011fcb5 SHA512 6a0f025467c08e56f2b761978cfa6a47e3bb7f786f9c76677e99063eea5674d339d7caf7912a6fb7ec209eb4c6d7f32de93f081f905801995e981d151fa7588e
+DIST tl-patgen.doc-2021.tar.xz 28660 BLAKE2B 7f19bd514f0c78bde0b20d304eaea950ee0e8e0b0ae5b35023bdee8ddfaed5b63f9fdf3d31a6c0f89e3e1cf370b9764b04acecfb586241f769ed4648e36ba762 SHA512 41d020627edd29ec233517cd7af725171eb0d679b3b17d3ec2b6425540b9069414b97766a34bf69d92436d6af464fc624f15d903c18a56340e326ebc9de5f91f
 DIST tl-pdfbook2-2020.tar.xz 3548 BLAKE2B 17abb45be8204279f9fc23a0803030c38ecdf6725fcb11561e559c418fbac96aa33a6c74d4535343ffbea4e05dd6a23e619d7022bc9e712fedcb282bc322cd18 SHA512 dd87268e3856eb26b37f025ac62f24cd5e680e92e727588d36878de9df799f49254ef2259c29de15db11d5888ada83110a39aaa3116aa6f6aa290d3e64f1231f
+DIST tl-pdfbook2-2021.tar.xz 3548 BLAKE2B 17abb45be8204279f9fc23a0803030c38ecdf6725fcb11561e559c418fbac96aa33a6c74d4535343ffbea4e05dd6a23e619d7022bc9e712fedcb282bc322cd18 SHA512 dd87268e3856eb26b37f025ac62f24cd5e680e92e727588d36878de9df799f49254ef2259c29de15db11d5888ada83110a39aaa3116aa6f6aa290d3e64f1231f
 DIST tl-pdfbook2.doc-2020.tar.xz 21548 BLAKE2B 97a85c875c8d8f7f3e967b26a80e3c9378626d3434a3ccf9b755dd5c6ce441b6d9b26182bd701a6d8a21a3fe73fbc6700f2d52d1b67e4fb5d8c04021d2d8ebbf SHA512 3048de4be891e270e8efe9f9d85524aff948c9483da25f491669a7181967dc281f42b984c9ee46464bc563c42a4f171589066f67818a291a136e1f49d40912ef
+DIST tl-pdfbook2.doc-2021.tar.xz 21548 BLAKE2B 97a85c875c8d8f7f3e967b26a80e3c9378626d3434a3ccf9b755dd5c6ce441b6d9b26182bd701a6d8a21a3fe73fbc6700f2d52d1b67e4fb5d8c04021d2d8ebbf SHA512 3048de4be891e270e8efe9f9d85524aff948c9483da25f491669a7181967dc281f42b984c9ee46464bc563c42a4f171589066f67818a291a136e1f49d40912ef
 DIST tl-pdfcrop-2020.tar.xz 10732 BLAKE2B 29c12f811d7e0bd7a5475d35eab2b35549d404e90df4b0c70aa299ebf938b1abdb3eac9eb1ea868d98c297b5cd22e1fab629d2013a475c36157761f4a901b68e SHA512 eba7fd5c529e1b3a29d00ee679c24748050f1a6005391de4bdb6e6fd537cd447b01e6569e0eaa87251d49e14f548dfc80d5e33f037862a4e978905af37e9e186
+DIST tl-pdfcrop-2021.tar.xz 10888 BLAKE2B 32b31c747879abce2c2030963a60b7b45524ac733db5af51099a74bd6defb65b5d0325c62238173d9cb6735e87e64dca182756f2eeddf418fb8eb64f583e01ab SHA512 ba611ee2a516fb031a7f3c93f563b2aaa2e50d4ef95433a5d83ee46191c2a6001fdd4ef25f33166c0e3f9791e85c200e452684974d54d34e8d651a7254f6652c
 DIST tl-pdfcrop.doc-2020.tar.xz 4300 BLAKE2B 67bddc633e05ab07d56b78be20da628f44beb511b636cbdc8b9b74883e2778ed917a0a96d16bd17355124feee5544c9e5392057362b508273f08e7340c602f36 SHA512 5deb207030892f9e351d511bba20e65e957b5db17df6af60022c3f069cba127be6e9bdc1e94600b6f36af8f35697b041ac5aa529ef7997f57264b1dcbf76ce2e
+DIST tl-pdfcrop.doc-2021.tar.xz 10228 BLAKE2B 4c246471c755b62adc86d4ad8b3c889bf21d4db25b3148a80701b9c978778eca390ea0989ce4d9b79c1a26c12bf701dffc02dfb1d5bc91a78fba5125901cec76 SHA512 786fe00793f62e09f225ca0decdd53ad3b2ce03a133a2ae4ba20db9d40352863dc6a8728e005aecfcaec06072e8a0ef454d1f7fbe90bfc5997cfc65c6ab97170
+DIST tl-pdfjam-2021.tar.xz 12120 BLAKE2B fbda90897fe9c7c3b4003d77a3cafe1680bd9fb476398a26a4faa42fd09976b28c5932dfa819f011ed221b0d7df2a01e82bc24787c7944b9722797d2577369a7 SHA512 1b1084859a811861e60e27186d67d267d3740152331f50fdbe67ce7226a76b4db24d79b674e6511d2f3de9a711da3369c565d781614f5d0c1a8021bc1ac18827
+DIST tl-pdfjam.doc-2021.tar.xz 110188 BLAKE2B 39b3eb28ed79c503c41e06f0b765dee817e8a02e040d41b4e44067f27f2f042c541ee07984a778e22f31640c4d76ba0b65f4e8fc105dcf6d52e1e5b3fd6a3db0 SHA512 a29c09a2e843188135265aaec690e09cd08fe29076a0378b308ec0e48aa7936ba0edfa7d6ad3ac808ec334bb5c2793a32d8ef625f4ad9b3fea40d4db567cae56
 DIST tl-pdflatexpicscale-2020.tar.xz 3124 BLAKE2B 491b0d733a769aa494ce026add50ae710a2257ddfa2737cddd83465d33c564f553edc735f61f3dd09b41c3e92cee095d38d777e52bfd57d77ce5f04e21868cb1 SHA512 d36dcc4d70156d52bcaf668d620c8eee5db8914473f943412ea5ad5c8bde673a6715fd5a69d13e502a5d4fe0b1e0e55099432c4e0e5e02bd5f6155ca5804c3f3
+DIST tl-pdflatexpicscale-2021.tar.xz 3124 BLAKE2B 491b0d733a769aa494ce026add50ae710a2257ddfa2737cddd83465d33c564f553edc735f61f3dd09b41c3e92cee095d38d777e52bfd57d77ce5f04e21868cb1 SHA512 d36dcc4d70156d52bcaf668d620c8eee5db8914473f943412ea5ad5c8bde673a6715fd5a69d13e502a5d4fe0b1e0e55099432c4e0e5e02bd5f6155ca5804c3f3
 DIST tl-pdflatexpicscale.doc-2020.tar.xz 86376 BLAKE2B 53f8b82efd4f7c4f27edbba3a6ac5a790d40dd9fbb652bcc798973182604166ac8a748dfb4ac3147d206fef6072d178ef5c7ff7a334cc009f3bac0c06b48d7e8 SHA512 64440f794e88c08bfeeac75d6d4174eccb800125c8d57e3b0be3ac6883c04790d422cb05cbed6be7335ab2e4d2e6bb2c8c0137c04160db126674960ddb7603e1
+DIST tl-pdflatexpicscale.doc-2021.tar.xz 86376 BLAKE2B 53f8b82efd4f7c4f27edbba3a6ac5a790d40dd9fbb652bcc798973182604166ac8a748dfb4ac3147d206fef6072d178ef5c7ff7a334cc009f3bac0c06b48d7e8 SHA512 64440f794e88c08bfeeac75d6d4174eccb800125c8d57e3b0be3ac6883c04790d422cb05cbed6be7335ab2e4d2e6bb2c8c0137c04160db126674960ddb7603e1
 DIST tl-pdftex-quiet-2020.tar.xz 2516 BLAKE2B 0f91e71a04cab4ac27b42f7a514029167cba2260eac5b2643175b27c856a22dfdd7117ffe94233f786d4ad2c562f5141be67af4cc46ea1f0afcffe4462640a60 SHA512 7b33e37a4b33060abee48ccf825cacecdee552d641da48dae47e3615fa0ab91ea9912b52fbd5c5ba6cdaa9c0d2cc7baa7c48a80bebb6d1887e5c633dacb4d104
+DIST tl-pdftex-quiet-2021.tar.xz 2516 BLAKE2B 0f91e71a04cab4ac27b42f7a514029167cba2260eac5b2643175b27c856a22dfdd7117ffe94233f786d4ad2c562f5141be67af4cc46ea1f0afcffe4462640a60 SHA512 7b33e37a4b33060abee48ccf825cacecdee552d641da48dae47e3615fa0ab91ea9912b52fbd5c5ba6cdaa9c0d2cc7baa7c48a80bebb6d1887e5c633dacb4d104
 DIST tl-pdftex-quiet.doc-2020.tar.xz 12516 BLAKE2B bbb2d47bcf8cf6acc13f086d7249f368e0a06cf2219c931465c7bdf02ec71210f321eb5342cbd2128538ecbf7236ffcc1e68284a5240ff31a5353be0076ebb92 SHA512 e13392cfefaed2c154c086ffcf85e21725e4230ce78d10e07dcb0a1c8b3685bef2572c5f5e249c56120320f2b0167cd5055ade50625a296446a197c0ba4b85cc
+DIST tl-pdftex-quiet.doc-2021.tar.xz 12516 BLAKE2B bbb2d47bcf8cf6acc13f086d7249f368e0a06cf2219c931465c7bdf02ec71210f321eb5342cbd2128538ecbf7236ffcc1e68284a5240ff31a5353be0076ebb92 SHA512 e13392cfefaed2c154c086ffcf85e21725e4230ce78d10e07dcb0a1c8b3685bef2572c5f5e249c56120320f2b0167cd5055ade50625a296446a197c0ba4b85cc
 DIST tl-pdftosrc-2020.tar.xz 384 BLAKE2B a8a7636c11dfb1b4a18f5b14e55200e528a6225da737da3a9dc43389148939dd04b225feb968755c50e0c41a89182ac9c6b9dc74c1e33bc0c3aae513b9ddaca8 SHA512 6b6fe771e5dd9523fd8d35456865068d980dbaaa8a8c3228ac4578b1b218c48e2fa851a7bfc89a77ecd9ee6c2eb743fd9da8351ef379a149e5318cdd3dbb41e4
+DIST tl-pdftosrc-2021.tar.xz 384 BLAKE2B e01308b273d17fc6ec6f71acb48b80d9afab2add35aa8b589d9d3a42b2c598e6c15a18d2f04497275b3035b4272aad04677082cf95a45e3e65d3785a94ee8343 SHA512 da79e91e793576cfb8ade78669422f9bb2caa2262ca607e1d174f976827d93dcb6d2042d8bf7276e7ae1129cd48198ff2edf2837f029d4d743a9868172af5612
 DIST tl-pdftosrc.doc-2020.tar.xz 23884 BLAKE2B f1e8a6c85489f02cfc848047ae298e46cf57015932326a9b4dfc35a698c819f5d0d5a12086551b7c7a479a571bf3367b9ba2aaf00580159aa2fd31e34d5ce4e6 SHA512 8f201c523d76bc6a706ec8af4cb8578e4e490c192715ce7b76395c955ba4e075dcc2366982f3151f34d73fbf93beea3515e5b91ea1a2f1829dab427ae5bb6856
+DIST tl-pdftosrc.doc-2021.tar.xz 23884 BLAKE2B f1e8a6c85489f02cfc848047ae298e46cf57015932326a9b4dfc35a698c819f5d0d5a12086551b7c7a479a571bf3367b9ba2aaf00580159aa2fd31e34d5ce4e6 SHA512 8f201c523d76bc6a706ec8af4cb8578e4e490c192715ce7b76395c955ba4e075dcc2366982f3151f34d73fbf93beea3515e5b91ea1a2f1829dab427ae5bb6856
 DIST tl-pdfxup-2020.tar.xz 10192 BLAKE2B 9e16aedd5f939bd1eb77d71adc7ad0af16469efe6e17302c8ed6377d990af415a1aa1155ef1fae8308e74bd0e6e954c04d6afa237a6563059ae62a6420c6934c SHA512 db2713a1f00dc2bb641094b4f1b84ca233ee3a28ac9bb70f41703937f51aece3d4f7b8803fe158cd4a470a859a81fdb68131a95ca32aca50eb9e83fe76b26f11
+DIST tl-pdfxup-2021.tar.xz 13960 BLAKE2B 225fe2bafec30e0a00a139f267226a7dd104a05cf262adfff0ddb303569e7aad6f49cf8df695eec28e29304cb615928d3035f228e1a5447797b52f693dd9dc4f SHA512 c000299a0f21b6fbc60e23ac163c55414e939f5542006a1508e8f5e143fb64cd40b8b57e986c07d99e4bec8e9f1d0d325955b4d34af08ba73a58f77c1a0d442a
 DIST tl-pdfxup.doc-2020.tar.xz 110748 BLAKE2B 5032fcf1e5bbad38c654fa59d53e037aa882117049c0722610960f186f9cc301aa19a0e362d3f89f63747ae1bcace96fd7ba0ae3ee9cfe1171e4426c2cdc7291 SHA512 8d37a4bd8592ab172e59b9722712b4019d47cf6e732e6eead889119bdc396b4620b6aeb33d27def1b3f641e326cdefdf80191259386cb2a18292890ffaee9b14
+DIST tl-pdfxup.doc-2021.tar.xz 115296 BLAKE2B 34bf2382fd3d04296cbf658f179932d6bdff9d7924a18b075062093b61c0a222d3b4c42a57e35e40657a3a10e648f31c265956bed6c2ee0893386f306dca8985 SHA512 9ffaa67a311531694f67a88cf41266858ba1d92a6d390fec2885a30a734922a48f4afe390eb6b3ea980c7ac79ff67f0d393927f7bdf3ad0bd3d30e64fd098d96
 DIST tl-pfarrei-2020.tar.xz 4632 BLAKE2B 658455eb955f1525dc9f5e00a748ef19d89bf2d65f8168121d1a0539b298fd32a9494d58724706857885364c86f6d46d42c8045e8124716b93726f8aea8aa3e8 SHA512 f6046dc96672b60ed272dd6fe23a4a51032f039d3aeaff3f8b5e2407c99fe1f43c568a03564a7c20212a97bbfa4ecbd0dcb7f5f44593e1485c8e5d9197467a6c
+DIST tl-pfarrei-2021.tar.xz 4632 BLAKE2B 658455eb955f1525dc9f5e00a748ef19d89bf2d65f8168121d1a0539b298fd32a9494d58724706857885364c86f6d46d42c8045e8124716b93726f8aea8aa3e8 SHA512 f6046dc96672b60ed272dd6fe23a4a51032f039d3aeaff3f8b5e2407c99fe1f43c568a03564a7c20212a97bbfa4ecbd0dcb7f5f44593e1485c8e5d9197467a6c
 DIST tl-pfarrei.doc-2020.tar.xz 499400 BLAKE2B ea640be4e5f113f9c2cf07b7b2dfe6da8889f79eb5a9c6bdf8758b2b587b1f3e4fd5337051b374e330380a6efa941cf10be47d643f2555af99b8847a6904cd1c SHA512 d50ff4603d51eb72d1d12e7f5b1440fa3d7abb1ab74fdf441d7e4a474df91247a1ccad504a14438bc0c3c6354c8f8674f180b5d9d826ff09a8749db3cf0d08c4
+DIST tl-pfarrei.doc-2021.tar.xz 499400 BLAKE2B ea640be4e5f113f9c2cf07b7b2dfe6da8889f79eb5a9c6bdf8758b2b587b1f3e4fd5337051b374e330380a6efa941cf10be47d643f2555af99b8847a6904cd1c SHA512 d50ff4603d51eb72d1d12e7f5b1440fa3d7abb1ab74fdf441d7e4a474df91247a1ccad504a14438bc0c3c6354c8f8674f180b5d9d826ff09a8749db3cf0d08c4
 DIST tl-pfarrei.source-2020.tar.xz 13448 BLAKE2B d30c95a4970d5674f7b44915d8129d13c7c8ccb43725a8a12129ebf64eb63aa9c17a9e39d6478d57584ffa818aa9542cebf865220de3ba286b18318386bc25da SHA512 1e4008782161066066fc4cb1b029a36f6a18eb0d5d52f11a2a70d04d4778de6ed1a80ea1fef5d8cc86c2e13b8cbcb1cf8ce43e58ff4431b16ca23c3fdafb9884
+DIST tl-pfarrei.source-2021.tar.xz 13448 BLAKE2B d30c95a4970d5674f7b44915d8129d13c7c8ccb43725a8a12129ebf64eb63aa9c17a9e39d6478d57584ffa818aa9542cebf865220de3ba286b18318386bc25da SHA512 1e4008782161066066fc4cb1b029a36f6a18eb0d5d52f11a2a70d04d4778de6ed1a80ea1fef5d8cc86c2e13b8cbcb1cf8ce43e58ff4431b16ca23c3fdafb9884
 DIST tl-pkfix-2020.tar.xz 7572 BLAKE2B 3b655dba7deda0576d7c9f84d8d6d136709b516df18cae7f15a010ef3ab3ec8997032c02b1b0ff027fa611d638648e1e713894c31defe16c0cc671fcd7ae060e SHA512 b4d374e5b771e131075ec59ef6713c6433cc3cefb6331a933e791c3774a9d54d6c8427d70a4aadb2c6326c3733abdb562ca103f0b6a9dbcafd87856d20b18a24
+DIST tl-pkfix-2021.tar.xz 7572 BLAKE2B 3b655dba7deda0576d7c9f84d8d6d136709b516df18cae7f15a010ef3ab3ec8997032c02b1b0ff027fa611d638648e1e713894c31defe16c0cc671fcd7ae060e SHA512 b4d374e5b771e131075ec59ef6713c6433cc3cefb6331a933e791c3774a9d54d6c8427d70a4aadb2c6326c3733abdb562ca103f0b6a9dbcafd87856d20b18a24
 DIST tl-pkfix-helper-2020.tar.xz 16716 BLAKE2B 4c178cbeaab6845ac2e7bcd8d8f81d2dd541be4c265413403f8e749290f6efb80ebaf7cc0cd134c8dd0cf1bd29a348ba82416c62d0903a0e43549ec8da63899f SHA512 4828927668f21f465ab672b92e6e3934e81e60bd9b3bc1f28a65b2c4dd26d2ce244258ac1b7d8846c0bfbb653a2fe009875ddfcc0383b34249e775f675497478
+DIST tl-pkfix-helper-2021.tar.xz 20208 BLAKE2B 9049bf09d9a5053139eee892c6e2c48daac318ebd7ee1d78cbf5fd26ef6fa0f4eeec9ad4954e9bb4cee848ee363d19459b6d88ddd027dabbf38fdfb09be87d01 SHA512 e5151d85d2db65f41b69320ad92611adcc8d211719aa06f39488ba75972f6bd4eda3a9ebd9f13e8889eb84451a640bbdbfd8862c95620304917cca3dcff4a194
 DIST tl-pkfix-helper.doc-2020.tar.xz 640356 BLAKE2B b2514d1862eeebcc883f5799e46bb5d856f2b100adb6bf83e2f04dc0226c71107270c7a006a3c3f248127dc726e5d50a4e799c9ffd87c97838e6e1f1d60fdf01 SHA512 146bc49beeb779c4815737cffe1bad30c28e7e44409a3e7036ab82c58f6f1b7e0ea3498f1a19cfd312390bcbc31c72d9f61a92501d87690a61cdc7c66c2fd2ae
+DIST tl-pkfix-helper.doc-2021.tar.xz 393612 BLAKE2B d92e801a109b0d07169aa53607b62554238cf9ec4902c97249eb86f6a2e203485b93fbf20c01a8facab76726e4c464c0ce9347d9adfddc702be7a225503f86b1 SHA512 50103799bbfc18a728b6510f9cd3d9aa4cbafaebb1e68f2f3280b3a57efbdbf75ff68f36e72b4442e49bbb04801795250fb3e2d0728968e30c1e70fc5b7d15d0
 DIST tl-pkfix.doc-2020.tar.xz 4376 BLAKE2B 7cc25ca096dfcaacce04fb4241dade290ce51fc6bd2791ddf4961d059080d449ecf68ad972e7c6f4cc2564e3faa982e86e128e1227ca3beae02055c160075644 SHA512 c6819c63aa4cf7df5879a796e08299f2fa132e1244648d17a7fb0b3c28204b0641e56fe4661887c257ca4f5998786c31b1cae2aa64e3163340f08d02fda4c8d4
+DIST tl-pkfix.doc-2021.tar.xz 4376 BLAKE2B 7cc25ca096dfcaacce04fb4241dade290ce51fc6bd2791ddf4961d059080d449ecf68ad972e7c6f4cc2564e3faa982e86e128e1227ca3beae02055c160075644 SHA512 c6819c63aa4cf7df5879a796e08299f2fa132e1244648d17a7fb0b3c28204b0641e56fe4661887c257ca4f5998786c31b1cae2aa64e3163340f08d02fda4c8d4
 DIST tl-purifyeps-2020.tar.xz 6212 BLAKE2B 648b7a323d2a1f9e48e5eba4ec9c43e796a50c166af2ce880514679cc5ff04d429fc48e1381e8797bce848e3b4fd5f0428d6825dc3facb6369df3fe1a2d25712 SHA512 79d99ef7ebc462c7c65d03f23cc85b9f136df2b0c9d647fc0672584fa57bfb7447f6db0e6d6b11bfc738cfe8c8658f45fe0b4059ff00f355e4b21d44f0d4102a
+DIST tl-purifyeps-2021.tar.xz 6212 BLAKE2B 648b7a323d2a1f9e48e5eba4ec9c43e796a50c166af2ce880514679cc5ff04d429fc48e1381e8797bce848e3b4fd5f0428d6825dc3facb6369df3fe1a2d25712 SHA512 79d99ef7ebc462c7c65d03f23cc85b9f136df2b0c9d647fc0672584fa57bfb7447f6db0e6d6b11bfc738cfe8c8658f45fe0b4059ff00f355e4b21d44f0d4102a
 DIST tl-purifyeps.doc-2020.tar.xz 15056 BLAKE2B 7d6e071fcceabecaef60b58f0f69119e8b0950820075b97adc07651de19f9db92e33a6cab8d860b23c6fe5ed89ffbdcb11cd792f3dd2198d81fcf61c77a91c3c SHA512 3f9fadfb35596835b250cab98b0d1e3c6d537cfac5878e0b9788aeb5cc7ef455ce3d44f7d0f03e9002796a162d374f6aa8f9bce5bd4c3f0e8937040de0b82a8d
+DIST tl-purifyeps.doc-2021.tar.xz 15056 BLAKE2B 7d6e071fcceabecaef60b58f0f69119e8b0950820075b97adc07651de19f9db92e33a6cab8d860b23c6fe5ed89ffbdcb11cd792f3dd2198d81fcf61c77a91c3c SHA512 3f9fadfb35596835b250cab98b0d1e3c6d537cfac5878e0b9788aeb5cc7ef455ce3d44f7d0f03e9002796a162d374f6aa8f9bce5bd4c3f0e8937040de0b82a8d
 DIST tl-pythontex.doc-2020.tar.xz 1550244 BLAKE2B 4c23ebfd93c6ff63d64734c2a80959d234d30d8d88befef534659d0d0d656edb394b054b986e20ec5f0865365ed5f958091e7dc2714fa0454ac23177c328eb73 SHA512 cdc5046cef480514417874ef5343a39f9e1c377d0e1f00e9df4ca8746670f2b222636afd58a06ef63086c3479b4d516f9d14074aabc1fa7876b2fb4f6599bef4
+DIST tl-pythontex.doc-2021.tar.xz 1550244 BLAKE2B 4c23ebfd93c6ff63d64734c2a80959d234d30d8d88befef534659d0d0d656edb394b054b986e20ec5f0865365ed5f958091e7dc2714fa0454ac23177c328eb73 SHA512 cdc5046cef480514417874ef5343a39f9e1c377d0e1f00e9df4ca8746670f2b222636afd58a06ef63086c3479b4d516f9d14074aabc1fa7876b2fb4f6599bef4
 DIST tl-pythontex.source-2020.tar.xz 83716 BLAKE2B 4469fe4dd9a2d66032e03fba3878784bb11dccac593be1c81227a2f9f09abe0645fb8fc7c42866fe17e91d61225a3dcb2bb1529106f4614ac39b2c0348049bbb SHA512 9acadbf5a18d56d24bd1300ff4b713325c43f163d2ac27e190461fbb74bbe023e31b2a3cb0bf3c6ead42c1275bfcbcbc8cc87914f623537e05773e9e641b7b03
+DIST tl-pythontex.source-2021.tar.xz 83716 BLAKE2B 4469fe4dd9a2d66032e03fba3878784bb11dccac593be1c81227a2f9f09abe0645fb8fc7c42866fe17e91d61225a3dcb2bb1529106f4614ac39b2c0348049bbb SHA512 9acadbf5a18d56d24bd1300ff4b713325c43f163d2ac27e190461fbb74bbe023e31b2a3cb0bf3c6ead42c1275bfcbcbc8cc87914f623537e05773e9e641b7b03
 DIST tl-seetexk-2020.tar.xz 644 BLAKE2B 349afae94fbf7c7267fa08c3100da0499a007c37a9080417ea18d71ebd3220430643af79bc152422b809a41f7fdb43e8438cbff622ac26f4c43df15ce32d5293 SHA512 8da27529da3e020f1853b02ce17f9481cfd3c32eeec9fb123d544a9d63a978831869036a1251e6b73bd007e0a5f947c1a7f5e2ae8004866631f1895a51cd14e9
+DIST tl-seetexk-2021.tar.xz 644 BLAKE2B 349afae94fbf7c7267fa08c3100da0499a007c37a9080417ea18d71ebd3220430643af79bc152422b809a41f7fdb43e8438cbff622ac26f4c43df15ce32d5293 SHA512 8da27529da3e020f1853b02ce17f9481cfd3c32eeec9fb123d544a9d63a978831869036a1251e6b73bd007e0a5f947c1a7f5e2ae8004866631f1895a51cd14e9
 DIST tl-seetexk.doc-2020.tar.xz 68840 BLAKE2B f7068e88a958049c3ed6d278992f96afd0a5dadfc70fd65a98c28f3b8972b09ba9eee7671a8fe9577b533d65857dd7dbacaaa0e85da35bdeadc1d9983b0896cc SHA512 e450694c39ac2f161cb60b6e8e0d95db29fb6271633dbf3cbd48beb6ebd01946d504cc3282a207738994d42eeefcbad5620aa74edf057a965e4952bbfe914259
+DIST tl-seetexk.doc-2021.tar.xz 68840 BLAKE2B f7068e88a958049c3ed6d278992f96afd0a5dadfc70fd65a98c28f3b8972b09ba9eee7671a8fe9577b533d65857dd7dbacaaa0e85da35bdeadc1d9983b0896cc SHA512 e450694c39ac2f161cb60b6e8e0d95db29fb6271633dbf3cbd48beb6ebd01946d504cc3282a207738994d42eeefcbad5620aa74edf057a965e4952bbfe914259
+DIST tl-spix-2021.tar.xz 2276 BLAKE2B e600a87436ba83c3ef9598dc8b9edb4e68be774cc30d6e0d74073b03d8de0eddb047decd12d3f6848ab27e730bc657062e5cf5f52103efa37baaf9bc66a02a04 SHA512 c8128bbee3f0dfbc009e74e46427c394a2c354eea63fc1abe6efd426aee8d0c091fefceb14de8ad97556686be702552a3ef5a10d540a57c1e8bcdaae9be8f22b
+DIST tl-spix.doc-2021.tar.xz 1551716 BLAKE2B f075e5b473cca95acc48e761df4e94577dcc8db7efe57fb298223b89f9a123daf79a21f906495b92a59e2aa07ad1afdbb44e22e2fa8766034b235a0bd0ac56c1 SHA512 3a1fc0f7186c0662271a5add51f08f0173c9d0f80cac632a484a30c8774fb3c4385edea2ecf184b2898d20431b7944c0a2e863bc4242ee4270b67eb4d8f3573d
 DIST tl-srcredact-2020.tar.xz 4240 BLAKE2B 553cde0085a142f679d327b1b3edd4a16a7a74a1d0b5871346964298ad796d9c3c3cfc5a01851f620e9748f47e0e23b7e18bbccfd9d5037d042618a4e0acc11a SHA512 9e11ed88fbbfc0130f43fdecd8fb0b3eecbdf50eb33bdca57bd34c860cdfe84dcd560371efba4cb261e65aaf4577306f478d1c43ed89152e7e21fd627eb7328d
+DIST tl-srcredact-2021.tar.xz 4240 BLAKE2B 553cde0085a142f679d327b1b3edd4a16a7a74a1d0b5871346964298ad796d9c3c3cfc5a01851f620e9748f47e0e23b7e18bbccfd9d5037d042618a4e0acc11a SHA512 9e11ed88fbbfc0130f43fdecd8fb0b3eecbdf50eb33bdca57bd34c860cdfe84dcd560371efba4cb261e65aaf4577306f478d1c43ed89152e7e21fd627eb7328d
 DIST tl-srcredact.doc-2020.tar.xz 384380 BLAKE2B 8ddc8328384950b5feb4b59e29a4af4b69fed9d0072905dea0e2619a3a48490bd6c30e22cd38a16d7413f947339626a57aae11765e982b2ae9632b01ce93f602 SHA512 dba9916acf75e800af1e581b4276e82bfe4c421a500a400773354766b37849568c1f19752a75983374ca41f793903f9776423888215f00376db1e0f5f3b3dbbc
+DIST tl-srcredact.doc-2021.tar.xz 384380 BLAKE2B 8ddc8328384950b5feb4b59e29a4af4b69fed9d0072905dea0e2619a3a48490bd6c30e22cd38a16d7413f947339626a57aae11765e982b2ae9632b01ce93f602 SHA512 dba9916acf75e800af1e581b4276e82bfe4c421a500a400773354766b37849568c1f19752a75983374ca41f793903f9776423888215f00376db1e0f5f3b3dbbc
 DIST tl-sty2dtx-2020.tar.xz 8676 BLAKE2B d3f185f31dfbcf3ac4019480546a7b67422a1650795f4b9beb619374cf69305bfd718dde52f4a55395932abb18f07bcfc3f3c98309e0b90b929d557ee64b2318 SHA512 05e17abf8322e70f275308e983a244e178883aa36571640d513962e813a2bfeb88264c0ae9ccab956f9bd016923d1727c14a7a26bb58b257c7d05600a540da1c
+DIST tl-sty2dtx-2021.tar.xz 8720 BLAKE2B 975f40c9218b723bb9d62407a7be10db1c5583d9386f6a619ac34ffc09f832117aac199b1be0e3f1a227ebaf558cfceb1dc75531978e1c43fe87526a4f86b9d5 SHA512 a7e42340744a348c88bb3cde7e23d428259f4fe7c644093e4bdabf8c49bc7f9c929a2271cd14daed9be233a04f62b60602a9fa778d05b11dba716d886286e8e1
 DIST tl-sty2dtx.doc-2020.tar.xz 151548 BLAKE2B 0e3b78110e1ba71fe8fc9828ffdf389ff9645e40e14555209b4f1e72a471275ef883d773b778865537e7dd2e50003f5be18abb17204bb9ffc7e69e5373837229 SHA512 1abba13831a0cd4b93f9665f242b96d32e764c39ccdb917f655922fe2a4b00385d6a78c77c151e212082eace3b9c9447705681416b5cb2eed9f794d7eb30c905
+DIST tl-sty2dtx.doc-2021.tar.xz 151548 BLAKE2B 97d566bc12ff0992ff6ebbd760e31bb9cacfd8d5e37003bf961199b3e22450967b7331c3aa4e522c9257b29ef5e08d975d930cdf1db97b4b3b6beb0864213d1c SHA512 2fb33ea4fcc9b5e940b46cb1b53cb56692528d8926d9bf22d3615958946763a63be101a5cf146a14ade43e2dce11b8fc25866d563d844570863dce54f48472b5
 DIST tl-synctex-2020.tar.xz 464 BLAKE2B 7a2b2f7546d7ef175bdc840ce28dc64565ec147088320ed17a1b03156122f6b20945984846177951fbacb4c9bf33a5ab4704edc7ba42cef2f21c343cf467fda4 SHA512 43905f27307922763a00f259c538ea6c63aef31d7e1a9a451b929cd76b8402182360ab47a9090506cc3868c6ab56f040e16c5c45ccaaf9431eda31e5ae238ee0
+DIST tl-synctex-2021.tar.xz 464 BLAKE2B c02df55f471eea5af3fd939c07567eb3dcf2a6ab80ba78ce5cf321c6f3a1cf341e5880c4f9e292a15f00d8dbe5ab4dd2809a2e012d83765bc38cb92470df6655 SHA512 1cc1900df90ceebc6865ce7c4a4befc86d1aa5aeb0f19808526a6cb369d7bd2ecf3c4789817da937e84fdf1fa3c921660e64e3e8a8e215d4f6dd97b2371743c5
 DIST tl-synctex.doc-2020.tar.xz 41740 BLAKE2B 73b7e272a8f79147bb5ba043edfa0a58f882d783b81062ef5b36e3cb9eada6013a6c6b318ac89b01457147765606db5732fc2073412b5b010bceaeed8982f7fc SHA512 37b7f0e3b86494715763c0d230a076aeec1f41ad658432099871d26b933cd8d0e8e831064cbe462a31a30260004c6dfe9b6b4d555d281d909615910470a2b1ef
+DIST tl-synctex.doc-2021.tar.xz 41740 BLAKE2B 73b7e272a8f79147bb5ba043edfa0a58f882d783b81062ef5b36e3cb9eada6013a6c6b318ac89b01457147765606db5732fc2073412b5b010bceaeed8982f7fc SHA512 37b7f0e3b86494715763c0d230a076aeec1f41ad658432099871d26b933cd8d0e8e831064cbe462a31a30260004c6dfe9b6b4d555d281d909615910470a2b1ef
 DIST tl-tex4ebook-2020.tar.xz 15600 BLAKE2B 13e12456238d5972c6db322d8aed7f70ff1570852769b6b1aa8ca522c37e694f6123b6527ef74c57ec81a155cc3d6f51b89a603180806f721c6ff0c43657528b SHA512 76600392b612abe233a98195c866bf291e4bc372f0cace58fed0855246b3bc8ee8687c1e8baac3026030e7eb60dd1f4a4ed3698521b37126127b33d1bd080661
+DIST tl-tex4ebook-2021.tar.xz 16960 BLAKE2B 5c972ee6a759e599f500038ed248aaa0d485434a4875fe16f871e612443d6777f5198c73913725ebf0c05d9f6cb488a84ee1ae1c413a35e2cf4dcda9687fc19d SHA512 9ef3a2b820f1f7015b61b8cff017affbf8cdc07fb1d4c39f629e46e2457a08875dd83252526e75465ec75a42d6580b7ec75b085455e5ba62dd14dd13a898a8f2
 DIST tl-tex4ebook.doc-2020.tar.xz 86804 BLAKE2B 437d0848154bc1a7c217328cfd72610e6adabd96f6d2be346ba702f3cbffcfd43a6c9ce10553f9e4ee427f7932cc00bf7df2bd011d035e5f0f4aac1654180fba SHA512 b00548efbb3b263f9cdaa7348186ae7e96ef3a224904ccd04d4622b85a94cd5a591532265281ed76c6135273a9abddb8af4ff3f6e1fea484d534dacec1903b70
+DIST tl-tex4ebook.doc-2021.tar.xz 88140 BLAKE2B e2b6e70792754522125c830dd6ebd6d2a3df6ed580fd91e63e60fbbeb2a23470bb8c3d0354dfe35bdbb3089717d7fb08cab9b5b1eccebcdd10ad492de777920c SHA512 0a01620564aa41d076a998910eff5a1fc45b7a0f2a3b2f606191e1442c49ed6685c8ac51a099834da2765de030d2f099a79fd03d6aebe08f78837f18638bc9d2
 DIST tl-texcount-2020.tar.xz 35908 BLAKE2B 7c84cc1f4f07d9d9cc3aba2cc2526274b42484ba4fbfd0b4f985bb5d7ddbe8d259cec8f5033f029db2bb30abe15c8941eb2f19fe9b37c5b4679839ef8c19508d SHA512 82f51346d9474270af6374cc1619ca005206b1bd729ce1559b8b66e361b184a192c7fbe085216a3a64e656197756593f7d76e52437ac562fd33bf09504b0f58f
+DIST tl-texcount-2021.tar.xz 35908 BLAKE2B 7c84cc1f4f07d9d9cc3aba2cc2526274b42484ba4fbfd0b4f985bb5d7ddbe8d259cec8f5033f029db2bb30abe15c8941eb2f19fe9b37c5b4679839ef8c19508d SHA512 82f51346d9474270af6374cc1619ca005206b1bd729ce1559b8b66e361b184a192c7fbe085216a3a64e656197756593f7d76e52437ac562fd33bf09504b0f58f
 DIST tl-texcount.doc-2020.tar.xz 559548 BLAKE2B 9c5acb7caaadd303532206e5ff2aec75be3dab53b6a1fdd1f726e7b2ae54819198b33033ee60d267d59b5a9b3f0efb66489cae55ff69c18ba7e1ddeb2597abfe SHA512 5141bdf4378cf87a19933945d6742427f4467dc73d92f4a470e34474232dbb2f60c4d8db065f812481520f1aa2f8a90d7e97dfc83f0f089d10386847f64f4d94
+DIST tl-texcount.doc-2021.tar.xz 559548 BLAKE2B 9c5acb7caaadd303532206e5ff2aec75be3dab53b6a1fdd1f726e7b2ae54819198b33033ee60d267d59b5a9b3f0efb66489cae55ff69c18ba7e1ddeb2597abfe SHA512 5141bdf4378cf87a19933945d6742427f4467dc73d92f4a470e34474232dbb2f60c4d8db065f812481520f1aa2f8a90d7e97dfc83f0f089d10386847f64f4d94
 DIST tl-texdef-2020.tar.xz 9408 BLAKE2B 9383a0bebbd66a49babd66da47b4220d71c3afc799d00d523f2d40da287c82275ac3bb6fd53269791561f5c65186c92f228d0fb00b0e9ffc7e9a6dcc390933b2 SHA512 7c5defeb9cf9d5fbe92f8433265543e6d7024e9f7fdc768582ec51a5880745c54cf8576f1b7455e32d51429e2faf122c0775ead117be97510f4b2d8123b04d71
+DIST tl-texdef-2021.tar.xz 9468 BLAKE2B ce8bc71563f0dd56060b52c15b9e065f5bfa6c6de9e6a0686b888e22a4724393c8b0d189cddb252ef491a43b8d915d8bad1805e3cfaf1bdb5a2d993b51d5437d SHA512 cc85ae5298a72c337c1c4571f2af698b62b182521cc65d0ffa459b89121e9eeae7d6f033456278ec6f61f91cbc2a6feed18005786e5b9943a8b0893111e61017
 DIST tl-texdef.doc-2020.tar.xz 155444 BLAKE2B 00a24992c6a1bc2a607bb6f6b7348b0331d46b50594972d56f253a0a9f01ef1bf78d6b7bfa4cbda96a0498880ab2ea7c94bdc8e5a455889f91b73a2289639c6d SHA512 a4727d57bb5b56106a9baf4aabbabd16cc8a8ac08358c28263abe9c40b76a6d692d0e819c23c7b8e946e97fd3f7574a498a6f43207c04e7544a0383b3681f54e
+DIST tl-texdef.doc-2021.tar.xz 156088 BLAKE2B 8fd34f3809b4ad5da9ea0bb6eec6419584db4ec34af589d70a781d2857d7bcc98170450c7cdc442d75615ed8d85ca9c094947cb382275a9637a0c3e66e7c52dd SHA512 dbb3516132d0779f657a051b0140491d8baf1bd6ddbeef92d94414a791894696d9ce39d49b3cd689dfcea2d387a221e1b27cb486764b011c7068d7a1d352f679
 DIST tl-texdef.source-2020.tar.xz 4764 BLAKE2B 01537ec90b734610e5e7bed83dd4ee6d07d53cd88bf68b23fac06738c4d919416e376a5361035e07d6027096c1c6efd5c301f4ac5714b467d63ea92ec5f116c2 SHA512 4b57478b06d4cd67ae6b8d2afb059eb52e03e31c4c4066108d471134865a64f3eb3dc99f8bc4330625eaa8e7c660f445365c6bbe510f36d5770b406df99d6c8c
+DIST tl-texdef.source-2021.tar.xz 4884 BLAKE2B 1db15054d97e70e696a01e05f218baa2b87d35bcfef69b85c64e801cacea7a131ef565f0e443d32b19060a36c76703ad5228f43fbe16b96e3502990352322ffd SHA512 ebf0284c4c8fdc35c8b6895f054d5055568a5e4b8edb061c91da4627b017dc7cb033943c11390f3d05923761a617354ea56ef95d3bf1a02cde66e55ecd734e1d
 DIST tl-texdiff-2020.tar.xz 7172 BLAKE2B b68d85c65018983ca389a365efa425e1f30b015b376bc64449ad155b2a93ffbcadb1d005155c63f32404eb4b72de786896779a2deb922438f01a3692324b1c0c SHA512 26fa84b3090d641efb186947ce4d1d89c30a2c224cfc8fa759da3ba7ec9cc113c0ed4afc1c3d0fa5f9d0a88af4f9b3001d57651df6b5be6e0234fb78ec4f252a
+DIST tl-texdiff-2021.tar.xz 7172 BLAKE2B b68d85c65018983ca389a365efa425e1f30b015b376bc64449ad155b2a93ffbcadb1d005155c63f32404eb4b72de786896779a2deb922438f01a3692324b1c0c SHA512 26fa84b3090d641efb186947ce4d1d89c30a2c224cfc8fa759da3ba7ec9cc113c0ed4afc1c3d0fa5f9d0a88af4f9b3001d57651df6b5be6e0234fb78ec4f252a
 DIST tl-texdiff.doc-2020.tar.xz 10296 BLAKE2B e9bf5a7721ad75a86f406efe948df02c7db85a69317a0d12c601d491bf80c62a8fb5d944441d683a0e5125b7c74e7f48ff97298a7e1b5d34f484c19de39e4afe SHA512 d458fa8db6433b4c7fbd23a16f9be53c2c822e396e7f50844cfa6acdd2a08acf8efdd0bd946c8fdc09ca8aa28d1eb25708d3719184634abced92ea5c94d9a948
+DIST tl-texdiff.doc-2021.tar.xz 10296 BLAKE2B e9bf5a7721ad75a86f406efe948df02c7db85a69317a0d12c601d491bf80c62a8fb5d944441d683a0e5125b7c74e7f48ff97298a7e1b5d34f484c19de39e4afe SHA512 d458fa8db6433b4c7fbd23a16f9be53c2c822e396e7f50844cfa6acdd2a08acf8efdd0bd946c8fdc09ca8aa28d1eb25708d3719184634abced92ea5c94d9a948
 DIST tl-texdirflatten-2020.tar.xz 4848 BLAKE2B 0e98680a98837b46ca20066382215ce6c9ab396b0fd234331c369e6010f64fffc7750bd4830945df32ec59c348f2cfd5327d3e085e33aa501f999858464798bd SHA512 e4f03e9a434e1ab8ea1b69ca0ed2dffe1f8cdb2c853a733e275bee74ed4b17b84b72cd8cc7d1820f595e1c2282a38b9bfc7f7b7a9e003fdace6488390a1b97ba
+DIST tl-texdirflatten-2021.tar.xz 4836 BLAKE2B b3f57b0921471a8c41564129f39c0eb6d4d6f898e9279c96de90d22fc52c5d5d34ad37c0abe14e30dc264e0e6396e4dec0f62e74d45c147cd1eabe0f647c7f4a SHA512 3cd6cf4d9ff3a1a3daef0bd5a998417696f6645cb54679e99e5424ebbe3926c45acad7b999ee4371392a7ba13fe3f2899438ce66efca7829c7aa1eaef84aa6e5
 DIST tl-texdirflatten.doc-2020.tar.xz 11016 BLAKE2B a5525f16389a978b0aecfef7de04d5cb302fafb894b5d681c3f0fb3fd9676055c0befee94326dec2b819d7b34d75233f4750e6ea047e2fb13edc0a346c343158 SHA512 972fc69b705b2f6289358199cedc91ec386da9212048f7f7a84e43eeadc943f7f42ade8d7faa9f58d1685d2bb10408e274b2461032927042371feb86b4ef6b43
+DIST tl-texdirflatten.doc-2021.tar.xz 11016 BLAKE2B e48d4b9da81e21a574c203ac8cc215e2ec5448150d65ce1a0291bc05135fd1192761318cff45d9ee7b89642836ad3e3ad688a42323206d7b01c0cecb11cd216f SHA512 1114dce13ac47c4352e968f42e89582b62b2702bc25ce3a9a4fd766b3bd63607e11eab52d19bc9f809b2b67cd92153c4f591632cfc72dcaf1c0a1b1cfb416b11
 DIST tl-texdoc-2020.tar.xz 26728 BLAKE2B 6b1cf61432606927b321a6214179a12669a7840c3b4a0dbb91a9e265d24efd59f3f9b5ff97ff2942071ee84fa7fc37a219131a826886730a18a8da641fb119e0 SHA512 ff55c658b4baf265bf9ca2ba6e5a161eecc1c75bd112e6400c9df4708ae3f355dcff277cb60ff0178bd41940d090e3dd28a7ce06421f509b352489d7a8d98b2c
+DIST tl-texdoc-2021.tar.xz 26744 BLAKE2B 9b4080193dfb5b4d2bf8131d1f5a60ecab961433b47f701d49139b032f04896aeeb34de7ee8cba4c4a64d84c4456a7097c98c0f0ba31e6f127970e755a921430 SHA512 dcca9f32cf1e8e7e36520fdad754c4b49655aa14b0edcbe209ac4144e331c95d404869ea18f0ba30fcd39cc2d29a48bbf4ab61473f816f8fa46c5201553b83d7
 DIST tl-texdoc.doc-2020.tar.xz 132412 BLAKE2B 8551aae0cafbfbb85ba9fc69df85a5408fcac201823b274b179203ff0004521a12b73f5e25d3391915ecd3c316ac8a5683b1cea0baeffc4206cf149319980528 SHA512 54931eb9882415f2182fed56b4905c723bb0df1444b1e2af939e2b6093ed9acceba6af7d46d6aceeac853686a57e366c13ab76da05f18469da61c36588ce66c1
+DIST tl-texdoc.doc-2021.tar.xz 134128 BLAKE2B c17f7ef2e6360937a6198fed48aa5a8167ef7109ae351f29848b4ce6657aec6264e90a890090ae20e06fc2489f27337d0ffbfa05e6d27e4fe97eb20af32f6512 SHA512 4bd778ff587d845f802c96ec99e41266c957b94ef04f1e63cccea081ef70d5b448f4234bba07b835882a193ce36b9571ec7e5d3cd2422143237c1d8ef3c6c357
 DIST tl-texfot-2020.tar.xz 6224 BLAKE2B 8c656a08069d1c0bee6a64eb29585b42ee0269ed58674b8070027779e3cb39814baa7cca122f8809ce792f783d7730954f7b87de3b3cb51e371ca9cff2dab43a SHA512 0b9376db4c9006121907650bac3a13f8e81ca7bfe48cbab132cf635c72003de9aacf39f77e7e96abc3f7aa781f91cd9876a0fbcbe933d01e807597a581efaccf
+DIST tl-texfot-2021.tar.xz 6244 BLAKE2B 6d3474ba15ef0daa57612d432bc9004f20c31fea1b2b0b33ebe12c7fd6b6cfc452dab1e4ffa10c440398d0488e0d1c90cac975a9935728319bc6159b24862bdc SHA512 9565c8106738793c9c14c8f42c750857bc64c324c190344267f99ee3e383f8052ff5df100298f4d7963ff44953c3af01a58ff8cfeee5237e0f07035ee6066be1
 DIST tl-texfot.doc-2020.tar.xz 30972 BLAKE2B 1f4c9a82351c55e4d3d4b85e96a583d8d192fa2b3e3fad1db1746a65a67c9eab561382c1c54e8be93b002bcaa7c48950df095d9f7d5202c302273ca1f0c0ee45 SHA512 1779cc8d4a6dd35acc591f959500e155b5ce155b75383c7b7478e934d00c508aa84f8acf13b07a2e67f529bcd125c7868d3a30d851f293ea149cf5a56d3cfcb6
+DIST tl-texfot.doc-2021.tar.xz 30972 BLAKE2B 1f4c9a82351c55e4d3d4b85e96a583d8d192fa2b3e3fad1db1746a65a67c9eab561382c1c54e8be93b002bcaa7c48950df095d9f7d5202c302273ca1f0c0ee45 SHA512 1779cc8d4a6dd35acc591f959500e155b5ce155b75383c7b7478e934d00c508aa84f8acf13b07a2e67f529bcd125c7868d3a30d851f293ea149cf5a56d3cfcb6
 DIST tl-texlive-scripts-2020.tar.xz 131984 BLAKE2B f9ec979ef36496115e0c992db6f23bb151b9ab77e840895beddfcaa6fd78e5decdf74de2b8432aeb2811c79cb81e80804e341110c46945d6189fde41cefb7a20 SHA512 7e10b1796d11a58ccbedbf5f89bed570207306f2ee196680ed7c5f784aa8c1607e7ea26086812212e5fee8885fa48ae6e1856c3a147333f60224f2da53469014
+DIST tl-texlive-scripts-2021.tar.xz 132292 BLAKE2B f20e14f742d2e09836d3463c843623f6874eaca47f900890b2b7216878a2892d1b4ae44049bdba09b7b7f5e85752b1bb7a582d23310148ed789edc581b4f0304 SHA512 40b6ca05bc9fff62f4dbf9f2d327a6c6f2e54a276cd659ef0d54f4dd7a98ef1a8540a84e7c35a2a864fd5d3262644987ebc67e69ebcaab5138a0b3d0d192a576
 DIST tl-texlive-scripts-extra-2020.tar.xz 23540 BLAKE2B 4296a6143b65ce0898f940bfe7fad16a26a7074593a95f835d1fc52c8d65ee5110ad83a39fd2a35573db0af47afb6ca1464dd57e271652a865417a7d42593c32 SHA512 a2f8e7888873d4f129cd83060ed0a9e65824c76870b238ebaa9b630aa00a51fdd479e182fdd4f9bfbeaf1113db5bb06d08baa2133544acaa368fbb690cec900a
+DIST tl-texlive-scripts-extra-2021.tar.xz 23540 BLAKE2B 3790f45b6e59147f1c4db42d466a488c32e172c8693db6932d8a37db11ebc0d512f4ba32876f4f7588091ed633bff23da2cacc6f9caa72d0fb5041406e4a0098 SHA512 e46691aa10b961d2359359fdf00ebc86a1b881b3d1126c52f3863343d21eba00110cd9500fb03a4a9544a3d8fb443bbdc90aa2f6216b8e62a3edb0acc58e4c75
 DIST tl-texlive-scripts-extra.doc-2020.tar.xz 195488 BLAKE2B 0b1952e69f4242ba4e1031f8a1d5247abe0f44b85df2a0556e39bc4212942178cea0c0e3b7d8f64cc2b0c772b34c3383f2933bc9c740f2635364043812c5d190 SHA512 1714dd417b30290a677dfbe91b152b18e012573e242c8ebed0058b96ad48056a3fe84fce2c9fd3321de2963e647c5fe8c85fe6ae4eec640506b6836035ed390d
+DIST tl-texlive-scripts-extra.doc-2021.tar.xz 195144 BLAKE2B 3ae5bc4aeb251fa9bf8e710877d3c1514f0d244b4bd5740ac1d184f0ec8a0a5d2813419a3a71e9fdf3e0b473e8cf3b85b11d3eb0cdeaa1fb3dd0f2a95af7ff2b SHA512 56f9be73e3318ea684c536b90645b572caf437b16339104bcedfb7517c94745a514a8e185033c2338aeccae868a123a5a137b9b07b20d661fa473bde2c28797b
 DIST tl-texlive-scripts.doc-2020.tar.xz 207788 BLAKE2B e560048cc8d0abf4ac5627d06c794d57e833bfc9cfb41b06477c90d371a2bd7cb7a7f1a138ecdc81993b2c9816db0d51b56b1aa9c59dc79e09320234f980e1dd SHA512 bf95f1b8895f9c7bd53c09072bd8ff77af7d357d52fb4d9bf7e9a1390c647cafa57c3c0c6694e8fa8a7e03d9ad301df7f52a07be4d79a00592b020919b76be12
+DIST tl-texlive-scripts.doc-2021.tar.xz 218848 BLAKE2B 3fb4ab6e2c2d6fdd8da3c092f4d66094e9fbd9dd3ad07d22369468c10c631f0675fdf69c3e0ab2aaf50c1a06048e1f555ddecc78afea044472aaf6f3d1a621cb SHA512 2e90a3100c2b1205400bd160bab227914e36df33f6d235bcd2c7ee2ebd82e3210ce7437c44aa23abbde4eb953dfd17012759429eea5edbd89411f451c0a3daa9
 DIST tl-texlive.infra-2020.tar.xz 224328 BLAKE2B 1e289cbc626647989cbc56cdb208295e43a09a09adf0bb6882ca7f9ce4083f58bdab5d8d36c13d9bec9c24881c0d209d525629c3a962973fd7602057e839831e SHA512 0668e9680f5caf6de70480de258eba9366b808c73f87aa5fddab050bd6bd47050046ae81fe3ade85d2d25169139e810eb735f1d0ba678c937c8b74bd70d3886c
+DIST tl-texlive.infra-2021.tar.xz 227904 BLAKE2B d5efc82092d0b56ac2aa2272429e142c22e58e8f8b78691e43230f3890ebf9104fa2279dbaa14a502a29afc88d0619ba05fb1176490a52c28df20472fa15683d SHA512 11cbf324450407dfdcc932e6ffe6c9e31ada5ef151d76b76d16e73de1053236d5da145f58d56892ded8c5ecc5bc89b63bc2a7a9ddd55d3fcc87198c8d859bc05
 DIST tl-texlive.infra.doc-2020.tar.xz 203768 BLAKE2B f3d85c3a2b225ee3e2b0da57f12bbff4ffb0fa80e1be685c300c0154af1f198749b338e21a9b992b307b9aa3f022774dc7ab81c8ebf58df3320b3fe869a08009 SHA512 d0f387986cdc8c89388e0b2aa6bd5ab4c6fbd94d57e0969b425856c3538ff18c6e17924eca5ace59272d6a875aa3b63fbf97d3d2d31f6a9a69c21e6d0f199801
+DIST tl-texlive.infra.doc-2021.tar.xz 205324 BLAKE2B 7c00cc17fcf15f177372951a0bd25216ceec6ad589b0bcedd70e6cfe139e2ecc23ad0632e17ca02beebb20454f90700ebcfefa3d7b3f736c3fd727ee00459fed SHA512 0b2477f485c7615b131c7dd5f04eec8b454915832d2f9f0453b4a152520672d3691ce2ee11de2e38b8010d785353be022e8404b32f43b787c16b87182f7714b7
 DIST tl-texliveonfly-2020.tar.xz 6148 BLAKE2B 5e5bcf0ec5f61718852b2e0d29dd0d868f733051fe9db1fe3b970aa8ebb88eff61fdaeeed454c9508067f26baccc89c854220ff26b5e7daf46f59943d1c340b7 SHA512 e02a1214775f209c0698e62fb7f0ae91c9ad14024c076dd6a5ca73fad4c92ebbf9bbb0f281869cb0c073538c66edae2af23245f1bd0e1f939c80841269625af6
+DIST tl-texliveonfly-2021.tar.xz 6132 BLAKE2B 065f77fac4cb7c52a6f8510fdb1307fc4bbd1c0267bc8ec636495cf1fabae0d75b4f2e21644b55d120b3c8ac3d58705a2b13ee26d46e679ec46fde9267101c16 SHA512 63353a768b700ea11982e9552046dfd1dc3d844883f03099833cabe2af5ccddecebd7ef737fbcd256c90304174165a4d283d4912f8311508e61c723d751619a7
 DIST tl-texliveonfly.doc-2020.tar.xz 700 BLAKE2B 7c2f1f682e9b1780176cfed3f141b621234f402eac6fcfd0926dc54db243ac334880684842674a6b3dd42ba38305def0fdfa815c75f2b051635a90ab146ff7d6 SHA512 f89f82a59f726b226101275b1aeaec00b99ea1302ee5ff8c021e4696b4abad39d1a95b544a4bc45483440591e1266cfba4d5c3c3bbc769f193671a46aa7458b2
+DIST tl-texliveonfly.doc-2021.tar.xz 700 BLAKE2B 7cd2a7e87773157ebee19a01792735176c50e7b965ddc7bdacdd1c740bf7bb10308b956e0f833e9f05f8c7b3eeb28313efc3c7cb926346dbefa2c343a8b5472a SHA512 46d57a6ebd68a56d55ccddc68006693fcbad8ed8f809243a3ffac7adb82da58cbc28239b57556d5d8d6388ea034b6571557588ff9365d4891145d5cc3fabfaea
 DIST tl-texloganalyser-2020.tar.xz 3844 BLAKE2B 85c9ae09f242f54cee0d77910ff12a7e0005c2e1785eb923e978858307e5474de4853cdc330c328fc96ab46bdce3e05008146dc50a5e1e5ebd72e5dd7c584979 SHA512 cbc18031b9b9ecfb6088b82b99eb72ad70fce92e4b103230a06ffeda0a50871715405a0aad18a7495ba1b80f16913cbadc4b8d1a7d2ebaa77d5cbd00e1682c93
+DIST tl-texloganalyser-2021.tar.xz 4180 BLAKE2B 8fd8e2becd2a26eeeecf75674581bb16651055ad54856348fc9bc58bb7ebc2d3e254eeb191bc04fd6746ab04714b22bb99c503b1114256c8f4f2f5dcc40c9fb3 SHA512 85f491af4a3867283d56bc2d98ebcf491e622008b3a70bb2cae03b9deb38170e1c73088d109445fac11fcce6e10aac57f42f03066580a79c978dd19af1f74caa
 DIST tl-texloganalyser.doc-2020.tar.xz 512 BLAKE2B 5743ee9faafe9308ae7eb897cb8e4b94f0331ad14be4b3075728f77e2b22ceed0a9ff27928ffd8ef0af9b8ec16a7ccbcf16cc4ace4c0c6d13bc22d1bd633a846 SHA512 1cccf82314d9afc841044aabbb5f06933f6bbdfcdb46c22909ce18c2736d40c532944405232633f61893f0f56de24233d520edd64d4cc89baeca5c01ffd0f9ea
+DIST tl-texloganalyser.doc-2021.tar.xz 760 BLAKE2B 5a039ff79917899f2987e5956a88a8c9f0d07226511689b25547128588526eb27f563e60d67148a9104eec82433751c22c2e1894014a00b401beec08478827f6 SHA512 8eb890f880dc56d37e29e2f0bb3228e36031d45010677097136d40959ba7ec0cdd10b5056169325f481318f137a9de2f180438f1716bfa12705fcf0db315e3cb
 DIST tl-texosquery-2020.tar.xz 170304 BLAKE2B 624e1aec8c907d7e3533983f46757ce1b711b84327874889d0a335240e6889b11604002c2dd9dd0368ba1e6637b1c02c15dfbde736f2cd0e96ba23212994c1f2 SHA512 d454a95139920c24404a501ad3bbde4ae8e809e0f0b6b7c32053d375e0cac31d81087a53d65ab067c9c6dfd988ae90429adbc5d7cd2e1b23f41f46dbf6a25056
+DIST tl-texosquery-2021.tar.xz 170304 BLAKE2B 624e1aec8c907d7e3533983f46757ce1b711b84327874889d0a335240e6889b11604002c2dd9dd0368ba1e6637b1c02c15dfbde736f2cd0e96ba23212994c1f2 SHA512 d454a95139920c24404a501ad3bbde4ae8e809e0f0b6b7c32053d375e0cac31d81087a53d65ab067c9c6dfd988ae90429adbc5d7cd2e1b23f41f46dbf6a25056
 DIST tl-texosquery.doc-2020.tar.xz 503224 BLAKE2B a4e373b5887b9b2eb2a3dc177e58f37f6915aa136103424aa94a58bde0d968837b425216faebdc1838c35e52e286def4a32b648dc495c0d22fe9aeee588e6f79 SHA512 51bc4e5a9f62b4526198b380fa69dd2d79ff69ccf0915aef4269d890fed057c4130ccca65e0c279e58ebfb72347d627b186534138f9c4bc8d395677c73a2a0fc
+DIST tl-texosquery.doc-2021.tar.xz 503224 BLAKE2B a4e373b5887b9b2eb2a3dc177e58f37f6915aa136103424aa94a58bde0d968837b425216faebdc1838c35e52e286def4a32b648dc495c0d22fe9aeee588e6f79 SHA512 51bc4e5a9f62b4526198b380fa69dd2d79ff69ccf0915aef4269d890fed057c4130ccca65e0c279e58ebfb72347d627b186534138f9c4bc8d395677c73a2a0fc
 DIST tl-texosquery.source-2020.tar.xz 71404 BLAKE2B fe400563e70c2015961e695a115b651e3d21fe82207b34238ad2af84a28fe156c59a6876742bbf0695bac716c86998cd5df1fa54e2d9b4b5b72403c75c98accc SHA512 5ed0dddadb7e8f406635d7a2cc309a030826607a76b4520b1f47a07affb603d96577118ba1fb5b9797322aa49a68616acbbcdde39bc8538c54c5d2fa1aebe510
+DIST tl-texosquery.source-2021.tar.xz 71404 BLAKE2B fe400563e70c2015961e695a115b651e3d21fe82207b34238ad2af84a28fe156c59a6876742bbf0695bac716c86998cd5df1fa54e2d9b4b5b72403c75c98accc SHA512 5ed0dddadb7e8f406635d7a2cc309a030826607a76b4520b1f47a07affb603d96577118ba1fb5b9797322aa49a68616acbbcdde39bc8538c54c5d2fa1aebe510
 DIST tl-texplate-2020.tar.xz 2905600 BLAKE2B 32ddd94ecb7c9d7db661c001958c500f86fa3d750944c44380b0464bf5515b3c8d7fd61aa9fb5b8f0615c59b8ca63874bff7653246514692bf5c12110fd8e978 SHA512 8c9ff524bbc1c4a9a89d4da0329c560cb4a2916e87fb5dad8ffb8a288bce1c0e0eb4321834a34e4aafd68c3b8a8fc0ba44018b80fcc054e965869cad120bde4a
+DIST tl-texplate-2021.tar.xz 3031472 BLAKE2B 56e70972534507b4201b8a3df1dd6f3a2c517deaec881e897d0da34da78e25bcfb3849baea02479b555cb4c7a2e8c58fc3b962b41ba2be796f355b9b0c126de6 SHA512 dc7f998438ad699af41d1a83214ba5b62399c5390ad1672b40ecaf9bc48fd04ca91bf4ceb1bf75c89351d612d8c9f0acd3bd145b5560673bb864fdb4c18375f2
 DIST tl-texplate.doc-2020.tar.xz 114704 BLAKE2B 1da2743c3073258eef4403185b5ddb4a92945707b03e7ede0670283604d5356c697bc33d91b6ee00bdf3482d12d5a16eeed55e9fbfb6ec4de171753d790a4127 SHA512 0bce839225eb4d2bf8b763510ee89ca3133fef4a4d1ed7ca4a8257d00c64d1b188c3093a0d11c319450a219c220d44edc93ab66a4cca739477c42bd526c54ae8
+DIST tl-texplate.doc-2021.tar.xz 110368 BLAKE2B 675d579633e1f5afb1f43e1d9f5485eb7da8e3bcf0fcb5fd1d4ae7c7dfd9807800cd7a63b78b89400d3e256a1515fe070098535a5478b3636cb259e7daf43def SHA512 620f820e08f000032608280ad4e93d5aabbcf6e42008c1f74d2b876d5fd67724ca1d6ce22d6046184cd4e0ec205f4aad767a24db79d11e6c40269df32b5644b6
 DIST tl-texplate.source-2020.tar.xz 8144 BLAKE2B a89ed46da639ed9001c0d9d71d8a7ca67925ddc5b3eaaa49f081c888260008d49e9e1067e5dc707b8508e49f13d1e8eb09940d60e53ca29d2bda7305c04a6fcd SHA512 599a199747dab1cf39f7e9c2141b38136085009b04578e65a5ce332ee3ecdfeac0999b721fca5f9d7335fc6fdee0a09bf1e078f140dcd4cd74f4a69fdebedf57
+DIST tl-texplate.source-2021.tar.xz 8428 BLAKE2B 2b685cce0cc352e9c279b2a7ac70bc771f2d7946d9633e490c243f7447e79c27a1a076e83e5b7ccfcc9fd73eba82a1dd68a4b270f4911792f3e412402e6ba588 SHA512 e87854021487832cecab1cb8a5585d44c25a80c52ed4d020cebaae9b7c1c938c3ffd43ed51a1910442440131e4d8f6acf2af095b58d2a119ea279e3de78736b6
 DIST tl-texware-2020.tar.xz 668 BLAKE2B 6324a93d098bca2e6038f13cff1ff9dd302a6494a8ef0dd0b9594e249eab957a81336991df171cb804aee580c651a1d9257f4fda3f3b7d6a90f3baa8d49c9c63 SHA512 cc66e87d459fb04070b0c43c16f3412ea22e3cf8a2748efb8a87fb0417bf0b9caa32a38147a9dd068d7ad0d25e320dc78ac54d9004cf5adef337ed0a90e52923
+DIST tl-texware-2021.tar.xz 636 BLAKE2B 8451f8a9e76728dbbc9cbe5e63b598a07a43175529d0bcdff73d4b1199d023143ff1cf1990ecd0b536181388a9c8d0ea0451c6e8c5e8ef716ad105a7f42d670e SHA512 9dbd7b278d471138f0326d274e127e79ba472063316e24937c203f65eb343892b34d04ca37622984cb0847ff98f143d5bd01853f801d0569b9378a0de8b185b0
 DIST tl-texware.doc-2020.tar.xz 34600 BLAKE2B b6949f864ff00cfdd8f620479ea38ef8eefd739dbaccb6e0e249cadd9bd6b2eb504947c29d78b0df0bc6f2e80829153db9d79cbdc69373b4ce6570b22ae30266 SHA512 a8ef6e6a062140ca6ab3311b7e57f452bbbb0eddebe36d02cd8122141320814508438d764a97d351febf9f65a5539b03774f611e9bfdcb5abdc5fa989fc5a848
+DIST tl-texware.doc-2021.tar.xz 34396 BLAKE2B 06a3fd3f420f22d3ab0ebbec3642c4a521329de4e0acd0f74e01b585a0fedd5b477f3d1b02520ea32c0885f023b1d3c4677a51647a50a5bb757ca9981036d06b SHA512 fefb274a0f1980e70219d1fa625167688e086b40f5cfb4eb2bb81725425524f27832b4ccb2200747fd1a7e1357de9320401295740b65c81920494d71a9ef0290
 DIST tl-tie-2020.tar.xz 500 BLAKE2B 6d4c87a35b8bf59f2dbb9ac2437f91dbcf47c7396b4b150dad65229a9d08d86a04ea4c9ac6e8ffa45929040bfdfe7d31eb36c8e64d718a1571327ccf3944901e SHA512 970a855d2d025b3ac30a4e1631986568459bae84727b661ffc8e0982656bc66eb940b59e2b9c3ee6430e3abd5f7d8b0ce4ff828127bd2f9420e0139f1860527b
+DIST tl-tie-2021.tar.xz 476 BLAKE2B 0cae03ad8fd1dbdf268a8c25a7a65e2b72fd695bc61e35a4be7819e9a1b654276c9fb8fba9c36e482dcd287b414ee01d8273a89c70627fd4cc863937614b9aa8 SHA512 1403e6e2e2e7121ac374a337323d1a8ec4f2ccc8c1d1a7b769a0a771afc61266999979f8a2613d00edb8355b13c794ec32a316bd2dd9f37339a8c826764e25ad
 DIST tl-tie.doc-2020.tar.xz 14820 BLAKE2B 863ec74e04beb6a20dbafb455dee77d6c04f2ba38cc3333c9a5a81d0bbdfc4e3c102accb5553a619d8a8176b10aaa65ad9ea6fe593fe761c995c6f3d8cda2a32 SHA512 8210c9c6252a383b7a4c1cbdcbf3ae7fd051d0506f2862249fa595097d25876ce6f0553ff8770507786412f94b50abd069d3f6fcda5e3275b9267100bd37805c
+DIST tl-tie.doc-2021.tar.xz 14820 BLAKE2B 863ec74e04beb6a20dbafb455dee77d6c04f2ba38cc3333c9a5a81d0bbdfc4e3c102accb5553a619d8a8176b10aaa65ad9ea6fe593fe761c995c6f3d8cda2a32 SHA512 8210c9c6252a383b7a4c1cbdcbf3ae7fd051d0506f2862249fa595097d25876ce6f0553ff8770507786412f94b50abd069d3f6fcda5e3275b9267100bd37805c
+DIST tl-tlcockpit-2021.tar.xz 71652184 BLAKE2B d329ee73338b4aa10df74cbce575b8bdf0d7a7539e53651d33c67da1bc600f7dae1419eba1161ae0b4e11be98fe82f3d5de7fd84bb0ba4082c4459dea85e2cc7 SHA512 50817d4c68d4e302cf0f4075ff9321bde2fd26336923efd2fb39bf097090b617a2a67ce75d1a14d562939514acb17b2a356bc388f72049dbe52a868ff3d63ffd
+DIST tl-tlcockpit.doc-2021.tar.xz 1023876 BLAKE2B 691c980b923aad8bbf179a562acb0c8389850c5717581fbbc485609b9dd1675ce508599ca769ce9988140cdd3c75a078ee4683ba720a75c7bb28cfd75ca0d2c4 SHA512 d40cec8456db0d9fdd55b76c84b40565a8b16d7639084eaa5dbc61c3bd2ebd73fdde6f40b11007835be242a9103cdc5ecbbecb6082ad650663968db18cc1b04d
+DIST tl-tlcockpit.source-2021.tar.xz 97896 BLAKE2B 7063cb0f1fd294bbaa0b3f4490f92d25417a5c267d3d82ef419a0abb2e1569d8c4a89d517350ab8ac99b262907f65f63c94ed99e7291afad62bd60d4330eb8af SHA512 01a9038bab5226f57922215e6dac5acf69ba2bae866f72df1d2d4a3a6252fef78e18d1e7b2a8baf327bd4b89262abe6750b0dd1166f47868e797e50b205322a2
 DIST tl-tpic2pdftex-2020.tar.xz 444 BLAKE2B 37bb1d8799068bc09fca6fffc5d43ab314f44b564221faa9ca23aecb84b3686b9e279b1aa3ee4664537fd943d944158034943ea4d1f8fcaedd4cdb2acc5dbfaf SHA512 fa8689bd257b6336badb8e5a742d5c5f12d9088b33b43bdc41474feda62358c754db05735fa471baa307907bcd61f68e8d061e66c400198d6a1dc165f39d2226
+DIST tl-tpic2pdftex-2021.tar.xz 444 BLAKE2B 37bb1d8799068bc09fca6fffc5d43ab314f44b564221faa9ca23aecb84b3686b9e279b1aa3ee4664537fd943d944158034943ea4d1f8fcaedd4cdb2acc5dbfaf SHA512 fa8689bd257b6336badb8e5a742d5c5f12d9088b33b43bdc41474feda62358c754db05735fa471baa307907bcd61f68e8d061e66c400198d6a1dc165f39d2226
 DIST tl-tpic2pdftex.doc-2020.tar.xz 54400 BLAKE2B 66f8087a6f8a1337a55bb3b29a9d407a54a5b79dc48eb50144eb0b505d3735ccc3d192669a95ea9e62ffc20927f48f03933c353557f7c49df5edc27c4573a6f1 SHA512 f24f8508279ded0689bb9dda8c653cfbd903c46782744fcb8d004f50a771ca74b86549c86abc765a408f2be67334048390e407be9446faa476a02ce9c27d5547
+DIST tl-tpic2pdftex.doc-2021.tar.xz 54400 BLAKE2B 66f8087a6f8a1337a55bb3b29a9d407a54a5b79dc48eb50144eb0b505d3735ccc3d192669a95ea9e62ffc20927f48f03933c353557f7c49df5edc27c4573a6f1 SHA512 f24f8508279ded0689bb9dda8c653cfbd903c46782744fcb8d004f50a771ca74b86549c86abc765a408f2be67334048390e407be9446faa476a02ce9c27d5547
 DIST tl-typeoutfileinfo-2020.tar.xz 1628 BLAKE2B f934ffec09993f9ccc2958330442c594f45710de2d1f7565f978ab5bed2069a67b06ed289840f190935e16fe25c49b849d4cb12261a429cb6747c175bef59970 SHA512 b30d2618c8cdbf69fcb8a5444922185a52b934448b5d28ba143948cf80ed17cb402d73d1162194df3d2992a52ca9e6faca79000644eef968c4eba892c415b6bd
+DIST tl-typeoutfileinfo-2021.tar.xz 1628 BLAKE2B f934ffec09993f9ccc2958330442c594f45710de2d1f7565f978ab5bed2069a67b06ed289840f190935e16fe25c49b849d4cb12261a429cb6747c175bef59970 SHA512 b30d2618c8cdbf69fcb8a5444922185a52b934448b5d28ba143948cf80ed17cb402d73d1162194df3d2992a52ca9e6faca79000644eef968c4eba892c415b6bd
 DIST tl-typeoutfileinfo.doc-2020.tar.xz 756 BLAKE2B 00d7c631ba6815997b46ec9adf1eed4f765a583de7fc5925349ebef150f633d34325ce7831e89fdffdf0c3f64147b0da5b883d9000c6555ea04e16880645abc3 SHA512 143c4ad9cb3890b6350069d5d045f74c0bb0cfbe50e7d051c50c82011b56e651d483c1422d7d553a8d1d1784ae726a1ca1aead023fc3ccb1da4f0d59d47f7920
+DIST tl-typeoutfileinfo.doc-2021.tar.xz 756 BLAKE2B 00d7c631ba6815997b46ec9adf1eed4f765a583de7fc5925349ebef150f633d34325ce7831e89fdffdf0c3f64147b0da5b883d9000c6555ea04e16880645abc3 SHA512 143c4ad9cb3890b6350069d5d045f74c0bb0cfbe50e7d051c50c82011b56e651d483c1422d7d553a8d1d1784ae726a1ca1aead023fc3ccb1da4f0d59d47f7920
 DIST tl-web-2020.tar.xz 524 BLAKE2B ec134eb2d40143e1f45a076e05eafa25f991568c53cef0d812be7415f8979e4da38ed14ab9c6d97f3b2aaaf62720816822939d4e79fb7a18ef77f0025317035f SHA512 0d2d771e8452d67278adec061e1df8cfc06f3af729ea5ae7849acd5fe1b628167b18d86b1037484dbb6b20d5f703bba7ba9fb255788becc53ce22fd87f39ca7b
+DIST tl-web-2021.tar.xz 496 BLAKE2B b4dcaa7fc84b4cb0f9696fab2fd0f8d39268af55fd57650404ad427e6a235c988b3a738400ae5b1d1bc1b2f3ec240775e3993904a2e3535c4baf5a7d9c0170cb SHA512 a916d755f7eadc4b24aab224fe0544ee567accaa650ef697002e6c2cee20802081ed227a066b231d9cd6309271c6b10ef124b86e38d729f2793aa48c6000f5cd
 DIST tl-web.doc-2020.tar.xz 41492 BLAKE2B c158458c2664449df869ac086ddd8c6b1a80973af15ed5bf58cb2b2ef521af05beb6af4dacef212665f118117673729aaff01c94dd15fb22a3da7cf035fc3409 SHA512 8f82d31082c40bacac61e0bade53a610c232452aba7a3bad3dd62b26f2e50929ed76e929d57ef1c26969769b3aaa003a82d6bf2bf836c6a3a7d44b5a2440e9e9
+DIST tl-web.doc-2021.tar.xz 41492 BLAKE2B c158458c2664449df869ac086ddd8c6b1a80973af15ed5bf58cb2b2ef521af05beb6af4dacef212665f118117673729aaff01c94dd15fb22a3da7cf035fc3409 SHA512 8f82d31082c40bacac61e0bade53a610c232452aba7a3bad3dd62b26f2e50929ed76e929d57ef1c26969769b3aaa003a82d6bf2bf836c6a3a7d44b5a2440e9e9
 DIST tl-xindex-2020.tar.xz 29976 BLAKE2B fb106d5d6fe75192b64977d8c632907c378d53015c653a90607a82cac2986a27718ab902d235a5d2f887bb59557e3d7150f3b1fd5d1b8fa0ddc2c91daa756f6d SHA512 fe62e02612bcd19a90bca6b94380c6c0b50acc381d47f60c81e142afbd6173adec8dda97e2f16c28a8ad101d8f080644d456768987ca5f8a7b30e03b3e30ee59
+DIST tl-xindex-2021.tar.xz 31564 BLAKE2B 89d1a5a35379cf124d3f3b791553a7e7994b7c5ea1b9a30af992f08506553fe401d6ed5e1c22d60617176705a585383b3d8265ae3d6f890bd6edbf6f7002494d SHA512 e8a858e3fe056519eed3f85dc21291881fdbf057ece76d503fd863f66c51331d689fabbb7a1ba3728c3010c45a9f0663fb75db2b609716ee5dd515067bea07a5
 DIST tl-xindex.doc-2020.tar.xz 446444 BLAKE2B 19e4c05b6f0117285652de264ac0609a926273b93a548b826f76228c0493a1c1e8a1da2e12f6ed296f3b2b63c4f7f3e2d6e5c15a7aa8000db0b5dff5ae6bf74f SHA512 07b1cc0ad37d8893bd50aceff18052642af52eb46f4e72320bdf093dcdcc7282019f3fccfc1e6df13a8bcd0f6d0a4cf41eb47d6f84a1ee3c6d1b0a8a1e150df0
+DIST tl-xindex.doc-2021.tar.xz 472592 BLAKE2B 3b322c4358fc719268b01fba1c447999035b9b0c5828a157bf4c3df9788340c772881cf79f1ff68b3d264d5bc6398d8f6c89ff49761bfef19af236757232fc7e SHA512 f755500e75fa45d14110da45bd43d10f4cf170cc907af7743673a38e1c823612fce9131eb16a03e59a1a821b1e4b3580e6a2e6a68e759f53f9daea4f88e4f09e
 DIST tl-xindy-2020.tar.xz 141192 BLAKE2B 47a053cf02e7ead9a86801731e211663c5ead7f0df38cc6db52262ce88bb0f6d8e65462e9eb267f66825a6939f70a541bae44c468beb04cbdd370a1829047fcc SHA512 b9127f03d8917543f0b1caaa24344aef0356818d7414e390ad45d5de3420271a81509ded3636c3475b577d6781be6e24c94f3d444f6190bed9039dd720274787
+DIST tl-xindy-2021.tar.xz 140664 BLAKE2B e433084708433d1a40216a63a31fe64ae0afa0b6d430e849d85f2a81f03c2723cb80c0688e44a2af3d19d783613cdce27a61de0ee333d15bea7a5fd875b2448e SHA512 8a2db7333ee39936892ad83eed0d31de25cdc48533dbbcb297e3a8714fefa6d7973b9e9eb7767a50f11be89afa7eb944bb56064a14b71d23bf8161f7fddf8d7c
 DIST tl-xindy.doc-2020.tar.xz 406620 BLAKE2B 143e9810da19aa0bd9080801ceb42923bd5c8ceb6a1055e6916489a306b40bfd6977a7b17b3434ee04c88ee975a5313c3beffb536b1e867ce6e7eeab1df3b1b5 SHA512 9e6c10388a7a707695e2965c3e3b851f939a68997cf880560a4a05ca3a167febeee9f1a7803cff1927bf7aecf0d6baac65bc4827c367f9c2d086d17d5947d64c
+DIST tl-xindy.doc-2021.tar.xz 461176 BLAKE2B 602862a30d0c2fed12df2b2c9e1f12014a7f64f87c82525ca275f82abc2edf4b0e5a77b789d68bd7f56916c16932174c973df7721464b25e9d2ec82962dd5a90 SHA512 4404d43c524b2d13a431ca5691031bd06ffee316025a6521d08f8ecc18d7e6703aed8a714fc498e7dfe8bb7f1971562adea96c637530e612b486ca015c3b1e23
 DIST tl-xpdfopen-2020.tar.xz 580 BLAKE2B dd5bba56ad86e209daf6030f5aabf59c41a0474142e81a840b647ae2abf744d0a53ff76ba1581bf2f7de0db4432bcd607553fc3a2e5bb739e483357f02ed454b SHA512 4bc35a5699e39b12f6f38b48ed7e136e9c5c54cbcad71119d7ffcb0688df9739187b4e0042782a2678233b289902b24c6537ba10303ff26846bfe73b98c9f54e
+DIST tl-xpdfopen-2021.tar.xz 560 BLAKE2B a17eaa3fe349aef2d5a192040196e1fce3b729308616e749447aacfad4b63254b7c4bbbde79a053c20caaf4abc4636f8276c8e60f5320fd3e5305444d0f5d197 SHA512 fe873bb22b94a26720e37671e283e0085619c2129a4568399544ac0df1e5c443a9476590ca7ef76a21409589eb2416a14165b8a48a6182f3773a3009cb7c1a47
 DIST tl-xpdfopen.doc-2020.tar.xz 28176 BLAKE2B ba0a9f1621999a8d98dd96f72fb93cd7a380e1f6285d2d59dac812e68ac91c08e815756553e10ff8cf1042dcbfa71bb994abab000910cdb1e6ddf113eefc481a SHA512 8dae12489e11fdc9e5e2aec22a4c70e8f8d15708b907404dde849b915515fe1f3d0771762f3a18112c8e2760e30bd1605d208b4315753ab37f738646e90c6f32
+DIST tl-xpdfopen.doc-2021.tar.xz 28180 BLAKE2B 2b247fea8d1901ad91cf19a197c17b5c0f4cf1ce817e07ac6dd3bda1e28019b7c296e07e567a55d530da4a898a6ccadc2e637f85aad401a99dc1f02f8020048a SHA512 bb4be8fe1b4590e74a7573baa1d699895fb62f6b30b05c9c81655001c75ffb43a6d7f92deca337072690ce3297d4ab06f1aca389524c5d5d500a9fce4abd8404
 EBUILD texlive-core-2020-r12.ebuild 11941 BLAKE2B 06ee8afe2cd8345b6a6f7f50767b36661db7bef5d0cbdb7679490bdd72a48e7d013682cd7a8d2ec0ca1896d10de2127b665f23acab62460a055e1b0895496a11 SHA512 47938416987dccdf293554654287e306f2e3e122711818f7439f61beac493ec9eb9c80d6967038f4c12fc01a9bb18a9a4f49f2ea853170beac7bce6fc099b557
+EBUILD texlive-core-2021.ebuild 11774 BLAKE2B 1d793d51154a63ff3e35ee15d4a75ab133962786e23d7764a9f68e93247088be361a88059260bf1d4f294e26ef2d1c8f083762dff064e2ef1e2ccbe245e83a23 SHA512 baf0e4ff92c0cb39ba7e4b94bf0af3ab3fc0302d030cc2aaa3b45c7514f46599d801e7a5d7e58979a2e0ea995a183d01776646bbe4b04d658d742bef95d68880
 MISC metadata.xml 674 BLAKE2B 4bab73d192039ab8cb3952877ced5e1b7b329f47d2a5b96e72ec82428dbc2236629abb7e2de1af1997bf577fc81cc91ada9f173eadcd2a2e726acbd79b9607bc SHA512 6faf1b433b9236aaca1fc07aa5679752b2d0214b5bb5f7aea03aa6c21e8a1880a103dea2b9a4c87ea84e85d91d259a2c01f5906190c96c7467f8b0a4863d85c1
diff --git a/app-text/texlive-core/texlive-core-2021.ebuild b/app-text/texlive-core/texlive-core-2021.ebuild
new file mode 100644
index 000000000000..6e386ac22154
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2021.ebuild
@@ -0,0 +1,358 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+TL_SOURCE_VERSION=20210325
+
+inherit flag-o-matic toolchain-funcs libtool texlive-common
+
+MY_P=${PN%-core}-${TL_SOURCE_VERSION}-source
+
+PATCHLEVEL=1
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="https://tug.org/texlive/"
+SLOT="0"
+LICENSE="GPL-2 LPPL-1.3c TeX"
+
+SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/${MY_P}.tar.xz
+	https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-tlpdb-${PV}.tar.xz
+	https://dev.gentoo.org/~zlogene/distfiles/texlive/${PN}-patches-${PV}-${PATCHLEVEL}.tar.xz"
+
+# We ship binextra collection alongside
+TL_CORE_BINEXTRA_MODULES="
+	a2ping adhocfilelist arara asymptote bundledoc checklistings chklref ctan_chk
+	clojure-pamphlet cluttex ctanify ctan-o-mat ctanbib ctanupload ctie cweb de-macro
+	dtl dtxgen dvi2tty dviasm dvicopy dvidvi dviinfox dviout-util dviljk dvipos findhyph
+	fragmaster hook-pre-commit-pkg installfont ketcindy lacheck latex-git-log latex-papersize
+	latex2man latex2nemeth latexfileversion latexpand latexindent ltxfileinfo ltximg
+	listings-ext make4ht match_parens mflua mkjobtexmf patgen pdfbook2 pdfcrop pdfjam
+	pdflatexpicscale pdftex-quiet pdfxup pdftosrc pfarrei pkfix pkfix-helper purifyeps
+	seetexk spix srcredact sty2dtx synctex tex4ebook texcount texdef texdiff texdirflatten
+	texdoc texfot texliveonfly texlive-scripts-extra texloganalyser texosquery texplate
+	texware tie tlcockpit tpic2pdftex typeoutfileinfo web xindy xindex xpdfopen collection-binextra
+	"
+TL_CORE_BINEXTRA_DOC_MODULES="
+	a2ping.doc adhocfilelist.doc arara.doc asymptote.doc bundledoc.doc
+	checklistings.doc chklref.doc ctan_chk.doc clojure-pamphlet.doc cluttex.doc
+	ctanify.doc ctan-o-mat.doc ctanbib.doc ctanupload.doc ctie.doc cweb.doc de-macro.doc
+	dtl.doc dtxgen.doc dvi2tty.doc dviasm.doc dvicopy.doc dvidvi.doc dviinfox.doc dviljk.doc
+	dvipos.doc dviout-util.doc findhyph.doc fragmaster.doc hook-pre-commit-pkg.doc installfont.doc
+	ketcindy.doc lacheck.doc latex-git-log.doc latex-papersize.doc latex2man.doc latex2nemeth.doc
+	latexfileversion.doc latexpand.doc latexindent.doc ltxfileinfo.doc ltximg.doc listings-ext.doc
+	make4ht.doc match_parens.doc mkjobtexmf.doc patgen.doc pdfbook2.doc pdfcrop.doc pdfjam.doc
+	pdflatexpicscale.doc pdftex-quiet.doc pdfxup.doc pdftosrc.doc pfarrei.doc pkfix.doc
+	pkfix-helper.doc purifyeps.doc pythontex.doc seetexk.doc spix.doc srcredact.doc
+	sty2dtx.doc synctex.doc tex4ebook.doc texcount.doc texdef.doc texdiff.doc
+	texdirflatten.doc texdoc.doc texfot.doc texliveonfly.doc texlive-scripts-extra.doc
+	texloganalyser.doc texosquery.doc texware.doc tie.doc tlcockpit.doc tpic2pdftex.doc
+	typeoutfileinfo.doc texplate.doc web.doc xindy.doc xindex.doc xpdfopen.doc
+"
+TL_CORE_BINEXTRA_SRC_MODULES="
+	adhocfilelist.source arara.source checklistings.source clojure-pamphlet.source
+	listings-ext.source mkjobtexmf.source pfarrei.source pythontex.source
+	texdef.source texosquery.source texplate.source tlcockpit.source
+"
+# Macros that are not a part of texlive-sources or collection-binextra but still needed
+# for other packages during installation
+TL_CORE_EXTRA_MODULES="hyphen-base gsftopk texlive.infra texlive-scripts ${TL_CORE_BINEXTRA_MODULES}"
+TL_CORE_EXTRA_DOC_MODULES="gsftopk.doc texlive.infra.doc texlive-scripts.doc ${TL_CORE_BINEXTRA_DOC_MODULES}"
+TL_CORE_EXTRA_SRC_MODULES="${TL_CORE_BINEXTRA_SRC_MODULES}"
+
+for i in ${TL_CORE_EXTRA_MODULES}; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+
+SRC_URI="${SRC_URI} doc? ( "
+for i in ${TL_CORE_EXTRA_DOC_MODULES}; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+SRC_URI="${SRC_URI} source? ( "
+for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
+	SRC_URI="${SRC_URI} https://dev.gentoo.org/~zlogene/distfiles/texlive/tl-${i}-${PV}.tar.xz"
+done
+SRC_URI="${SRC_URI} )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
+IUSE="cjk X doc source tk +luajittex xetex xindy"
+
+TEXMF_PATH=/usr/share/texmf-dist
+
+MODULAR_X_DEPEND="X? (
+				x11-libs/libX11
+				x11-libs/libXmu
+	)"
+
+COMMON_DEPEND="${MODULAR_X_DEPEND}
+	!app-text/epspdf
+	!app-text/pdfjam
+	sys-libs/zlib
+	>=media-libs/harfbuzz-1.4.5[icu,graphite]
+	>=media-libs/libpng-1.2.43-r2:0=
+	media-libs/gd[png]
+	media-gfx/graphite2
+	>=x11-libs/cairo-1.12
+	>=x11-libs/pixman-0.18
+	dev-libs/zziplib:=
+	app-text/libpaper
+	dev-libs/gmp:0
+	dev-libs/mpfr:0=
+	>=dev-libs/ptexenc-1.3.8
+	xetex? (
+		>=app-text/teckit-2.5.3
+		media-libs/fontconfig
+	)
+	xindy? ( dev-lisp/clisp:= )
+	media-libs/freetype:2
+	>=dev-libs/icu-50:=
+	>=dev-libs/kpathsea-6.3.2"
+
+BDEPEND="sys-apps/ed
+	sys-devel/flex
+	virtual/pkgconfig"
+
+DEPEND="${COMMON_DEPEND}"
+
+RDEPEND="${COMMON_DEPEND}
+	>=app-text/ps2pkm-1.8_p20170524
+	>=app-text/dvipsk-5.997
+	>=dev-tex/bibtexu-3.71_p20170524
+	virtual/perl-Getopt-Long
+	dev-perl/File-HomeDir
+	dev-perl/Log-Dispatch
+	dev-perl/Unicode-LineBreak
+	dev-perl/YAML-Tiny
+	tk? (
+	dev-lang/tk
+	dev-perl/Tk
+	)"
+
+S="${WORKDIR}/${P}_build"
+B="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	mkdir -p "${S}" || die "failed to create build dir"
+}
+
+RELOC_TARGET=texmf-dist
+
+src_prepare() {
+	cd "${WORKDIR}" || die
+
+	mv texlive.tlpdb tlpkg/ || die "failed to move texlive.tlpdb"
+
+	# From texlive-module.eclass.
+	sed -n -e 's:\s*RELOC/::p' tlpkg/tlpobj/* > "${T}/reloclist" || die
+	sed -e 's/\/[^/]*$//' -e "s:^:${RELOC_TARGET}/:" "${T}/reloclist" |
+		sort -u |
+		xargs mkdir -p || die
+	local i
+	while read i; do
+		mv "${i}" "${RELOC_TARGET}/${i%/*}" || die
+	done < "${T}/reloclist"
+
+	mv "${WORKDIR}"/texmf* "${B}" || die "failed to move texmf files"
+
+	cd "${B}" || die
+
+	sed -i \
+		-e "s,/usr/include /usr/local/include.*echo \$KPATHSEA_INCLUDES.*,${EPREFIX}/usr/include\"," \
+		texk/web2c/configure || die
+
+	eapply "${WORKDIR}"/patches
+
+	default
+
+	elibtoolize
+}
+
+src_configure() {
+	# It fails on alpha without this
+	use alpha && append-ldflags "-Wl,--no-relax"
+
+	# Too many regexps use A-Z a-z constructs, what causes problems with locales
+	# that don't have the same alphabetical order than ascii. Bug #242430
+	# So we set LC_ALL to C in order to avoid problems.
+	export LC_ALL=C
+
+	# Disable freetype-config as this is considered obsolete.
+	# Also only pkg-config works for prefix as described in bug #690094
+	export ac_cv_prog_ac_ct_FT2_CONFIG=no
+
+	tc-export CC CXX AR RANLIB
+	ECONF_SOURCE="${B}" \
+		econf -C \
+		--bindir="${EPREFIX}"/usr/bin \
+		--datadir="${S}" \
+		--with-system-freetype2 \
+		--with-system-zlib \
+		--with-system-libpng \
+		--with-system-teckit \
+		--with-teckit-includes="${EPREFIX}"/usr/include/teckit \
+		--with-system-kpathsea \
+		--with-kpathsea-includes="${EPREFIX}"/usr/include \
+		--with-system-icu \
+		--with-system-ptexenc \
+		--with-system-harfbuzz \
+		--with-system-icu \
+		--with-system-graphite2 \
+		--with-system-cairo \
+		--with-system-pixman \
+		--with-system-zziplib \
+		--with-system-libpaper \
+		--with-system-gmp \
+		--with-system-gd \
+		--with-system-mpfr \
+		--without-texinfo \
+		--disable-dialog \
+		--disable-multiplatform \
+		--enable-chktex \
+		--enable-epsfwin \
+		--enable-detex \
+		--enable-dvi2tty \
+		--enable-mftalkwin \
+		--enable-regiswin \
+		--enable-shared \
+		--enable-tektronixwin \
+		--enable-unitermwin \
+		--enable-vlna \
+		--with-ps=gs \
+		--disable-psutils \
+		--disable-t1utils \
+		--enable-ipc \
+		--disable-biber \
+		--disable-bibtex-x \
+		--disable-dvipng \
+		--disable-dvipsk \
+		--disable-lcdf-typetools \
+		--disable-ps2pk \
+		--disable-ttf2pk2 \
+		--disable-tex4htk \
+		--disable-cjkutils \
+		--disable-xdvik \
+		--enable-luatex \
+		--disable-dvisvgm \
+		--disable-ps2eps \
+		--disable-static \
+		--disable-native-texlive-build \
+		--disable-largefile \
+		--disable-build-in-source-tree \
+		--disable-xindy-docs \
+		--disable-xindy-rules \
+		--with-banner-add=" Gentoo Linux" \
+		$(use_enable luajittex) \
+		$(use_enable luajittex luajithbtex) \
+		$(use_enable luajittex mfluajit) \
+		$(use_enable xetex) \
+		$(use_enable cjk dviout-util) \
+		$(use_enable cjk ptex) \
+		$(use_enable cjk eptex) \
+		$(use_enable cjk uptex) \
+		$(use_enable cjk euptex) \
+		$(use_enable cjk mendexk) \
+		$(use_enable cjk makejvf) \
+		$(use_enable cjk pmp) \
+		$(use_enable cjk upmp) \
+		$(use_enable tk texdoctk) \
+		$(use_with X x) \
+		$(use_enable xindy)
+}
+
+src_compile() {
+	tc-export CC CXX AR RANLIB
+	emake AR="$(tc-getAR)" SHELL="${EPREFIX}"/bin/sh texmf="${EPREFIX}"${TEXMF_PATH:-/usr/share/texmf-dist}
+
+	cd "${B}" || die
+	# Mimic updmap --syncwithtrees to enable only fonts installed
+	# Code copied from updmap script
+	for i in `egrep '^(Mixed|Kanji)?Map' "texmf-dist/web2c/updmap.cfg" | sed 's@.* @@'`; do
+		texlive-common_is_file_present_in_texmf "${i}" || echo "${i}"
+	done > "${T}/updmap_update"
+	{
+		sed 's@/@\\/@g; s@^@/^MixedMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^Map[  ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+		sed 's@/@\\/@g; s@^@/^KanjiMap[     ]*@; s@$@$/s/^/#! /@' <"${T}/updmap_update"
+	} > "${T}/updmap_update2"
+	sed -f "${T}/updmap_update2" "texmf-dist/web2c/updmap.cfg" >	"${T}/updmap_update3"\
+		&& cat "${T}/updmap_update3" > "texmf-dist/web2c/updmap.cfg"
+}
+
+src_install() {
+	dodir ${TEXMF_PATH:-/usr/share/texmf-dist}/web2c
+	emake DESTDIR="${D}" texmf="${ED}${TEXMF_PATH:-/usr/share/texmf-dist}" run_texlinks="true" run_mktexlsr="true" install
+
+	cd "${B}" || die
+	dodir /usr/share # just in case
+	cp -pR texmf-dist "${ED}/usr/share/" || die "failed to install texmf trees"
+	cp -pR "${WORKDIR}"/tlpkg "${ED}/usr/share/" || die "failed to install tlpkg files"
+
+	# When X is disabled mf-nowin doesn't exist but some scripts expect it to
+	# exist. Instead, it is called mf, so we symlink it to please everything.
+	use X || dosym mf /usr/bin/mf-nowin
+
+	docinto texk
+	cd "${B}/texk" || die
+	dodoc ChangeLog README
+
+	docinto dviljk
+	cd "${B}/texk/dviljk" || die
+	dodoc ChangeLog README NEWS
+
+	docinto makeindexk
+	cd "${B}/texk/makeindexk" || die
+	dodoc ChangeLog NOTES README
+
+	docinto web2c
+	cd "${B}/texk/web2c" || die
+	dodoc ChangeLog NEWS PROJECTS README
+
+	use doc || rm -rf "${ED}/usr/share/texmf-dist/doc"
+
+	dodir /etc/env.d
+	echo 'CONFIG_PROTECT_MASK="/etc/texmf/web2c /etc/texmf/language.dat.d /etc/texmf/language.def.d /etc/texmf/updmap.d"' > "${ED}/etc/env.d/98texlive"
+	# populate /etc/texmf
+	keepdir /etc/texmf/web2c
+
+	# take care of updmap.cfg and language.d files
+	keepdir /etc/texmf/{updmap.d,language.dat.d,language.def.d,language.dat.lua.d}
+
+	mv "${ED}${TEXMF_PATH}/web2c/updmap.cfg" "${ED}/etc/texmf/updmap.d/00updmap.cfg" || die "moving updmap.cfg failed"
+
+	# Remove fmtutil.cnf, it will be regenerated from /etc/texmf/fmtutil.d files
+	# by texmf-update
+	rm -f "${ED}${TEXMF_PATH}/web2c/fmtutil.cnf" || die
+	# Remove bundled and invalid updmap.cfg
+	rm -f "${ED}/usr/share/texmf-dist/web2c/updmap.cfg" || die
+
+	texlive-common_handle_config_files
+
+	keepdir /usr/share/texmf-site
+
+	# the virtex symlink is not installed
+	# The links has to be relative, since the targets
+	# is not present at this stage and MacOS doesn't
+	# like non-existing targets
+	dosym tex /usr/bin/virtex
+	dosym pdftex /usr/bin/pdfvirtex
+
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	etexmf-update
+
+	einfo "Regenerating TeX formats"
+	fmtutil-sys --all &> /dev/null
+
+	elog
+	elog "If you have configuration files in ${EPREFIX}/etc/texmf to merge,"
+	elog "please update them and run ${EPREFIX}/usr/sbin/texmf-update."
+	elog
+	ewarn "If you are migrating from an older TeX distribution"
+	ewarn "Please make sure you have read:"
+	ewarn "https://wiki.gentoo.org/wiki/Project:TeX/Tex_Live_Migration_Guide"
+	ewarn "in order to avoid possible problems"
+}
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 8d753252a72f..ae06161488e7 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,2 +1,3 @@
-EBUILD texlive-2020-r9.ebuild 6757 BLAKE2B 8866925633c7d7696a38cfd400f8e04b0754351c9627913d592d9a6bc73246d50384466ad65a99990e7ad93b3e433f932b679bf2302979e698a9fb906e9dd020 SHA512 429f1f57a69f0511f5b61b9d0923aa6beef92a467f40b281d32d69406319bff081cc1ccbd97f1707920ab0b8bf95c084b7097b9b58a636f23e59788f97fd541f
+EBUILD texlive-2020-r9.ebuild 6758 BLAKE2B 026890baf4d477e7140005a243eb890a7ffbc8163860a6d15dd95398c95bedabada111f86e10823e8c35b3b4a9415e118552634229c6d8558b4b1da55cb0df44 SHA512 f3e496d5438643e000b06025205c0c99b1912535fd69e98f5e213d24328320db560ad845edfbd599a76756b22b3bc0f4b2b008270d2df92c7da2c5d57e846bd7
+EBUILD texlive-2021.ebuild 6694 BLAKE2B 82ac251256335dbadc451e45c0861dbe865f17083ff53e9b5e7fcfee1a442d10e8482a2c932f846fbf54730503b2dbc9012979769b54437a3cdf497a00da6829 SHA512 1fb0d61df75eb4f304c84af7c03a5b66d5aa4f54dc36b3de7ed2ba7553d3adae0408ae5f980f3bc474437ea61b487307e41195bf48b84f21d158918dccc2c81b
 MISC metadata.xml 1932 BLAKE2B f69f70507b754ea964ffc2c7a1d5f693d782e87b4b40fb715b2be25d044a628cb9177c3b7695ef4093afd72b54e15f43564978b104f8246d3b307e288b06585d SHA512 3f9f2defe49de21e0eb8c6398f607d0138bd789071766e0c3a737dfd5692b41423ba29107e817a760a410080fe55e42cba33f84c08f70258ffe5b7337d34f2d4
diff --git a/app-text/texlive/texlive-2020-r9.ebuild b/app-text/texlive/texlive-2020-r9.ebuild
index 724092f9c785..ed2ef41dd1ed 100644
--- a/app-text/texlive/texlive-2020-r9.ebuild
+++ b/app-text/texlive/texlive-2020-r9.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://tug.org/texlive/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context extra epspdf games graphics
 humanities luatex metapost music pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xml X"
diff --git a/app-text/texlive/texlive-2021.ebuild b/app-text/texlive/texlive-2021.ebuild
new file mode 100644
index 000000000000..f88937a1333b
--- /dev/null
+++ b/app-text/texlive/texlive-2021.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+DESCRIPTION="A complete TeX distribution"
+HOMEPAGE="http://tug.org/texlive/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="cjk context extra games graphics humanities luatex metapost music pdfannotextractor png pstricks publishers science tex4ht texi2html truetype xetex xml X"
+
+LANGS="af ar as bg bn br ca cs cy da de el en eo es et eu fa fi fr ga gl gu he
+	hi hr hsb hu hy ia id is it ja ko kn la lo lt lv ml mn mr nb nl nn no or pa
+	pl pt rm ro ru sa sco sk sl sq sr sv ta te th tk tr uk vi zh"
+
+for X in ${LANGS}; do
+	IUSE="${IUSE} l10n_${X}"
+done
+
+TEXLIVE_CAT="dev-texlive"
+
+DEPEND=">=app-text/texlive-core-${PV}"
+RDEPEND="${DEPEND}
+	app-text/psutils
+	>=${TEXLIVE_CAT}/texlive-fontutils-${PV}
+	media-gfx/sam2p
+	texi2html? ( app-text/texi2html )
+	sys-apps/texinfo
+	app-text/t1utils
+	>=app-text/lcdf-typetools-2.92[kpathsea]
+	truetype? ( >=app-text/ttf2pk2-2.0_p20150521 )
+	app-text/ps2eps
+	png? ( app-text/dvipng )
+	X? ( >=app-text/xdvik-22.87 )
+	>=${TEXLIVE_CAT}/texlive-basic-${PV}
+	>=${TEXLIVE_CAT}/texlive-fontsrecommended-${PV}
+	>=${TEXLIVE_CAT}/texlive-latex-${PV}
+	luatex? ( >=${TEXLIVE_CAT}/texlive-luatex-${PV} )
+	>=${TEXLIVE_CAT}/texlive-latexrecommended-${PV}
+	>=dev-tex/latex-beamer-3.36
+	metapost? ( >=${TEXLIVE_CAT}/texlive-metapost-${PV} )
+	>=${TEXLIVE_CAT}/texlive-plaingeneric-${PV}
+	pdfannotextractor? ( dev-tex/pdfannotextractor )
+	extra? (
+		app-text/dvisvgm
+		dev-tex/latexdiff
+		>=dev-tex/latexmk-418
+		>=${TEXLIVE_CAT}/texlive-bibtexextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-fontsextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-formatsextra-${PV}
+		>=${TEXLIVE_CAT}/texlive-latexextra-${PV}
+		>=dev-tex/glossaries-2.07
+	)
+	xetex? ( >=${TEXLIVE_CAT}/texlive-xetex-${PV} )
+	graphics? ( >=${TEXLIVE_CAT}/texlive-pictures-${PV} )
+	science? ( >=${TEXLIVE_CAT}/texlive-mathscience-${PV} )
+	publishers? ( >=${TEXLIVE_CAT}/texlive-publishers-${PV} )
+	music? ( >=${TEXLIVE_CAT}/texlive-music-${PV} )
+	pstricks? ( >=${TEXLIVE_CAT}/texlive-pstricks-${PV} )
+	context? ( >=${TEXLIVE_CAT}/texlive-context-${PV} )
+	games? ( >=${TEXLIVE_CAT}/texlive-games-${PV} )
+	humanities? ( >=${TEXLIVE_CAT}/texlive-humanities-${PV} )
+	tex4ht? ( >=dev-tex/tex4ht-20090611_p1038-r3 )
+	xml? ( >=${TEXLIVE_CAT}/texlive-formatsextra-${PV} )
+	l10n_af?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ar?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_fa?    ( >=${TEXLIVE_CAT}/texlive-langarabic-${PV} )
+	l10n_hy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	cjk? ( >=${TEXLIVE_CAT}/texlive-langcjk-${PV} )
+	l10n_hr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_bg?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_br?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ru?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_uk?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_cs?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+	l10n_sk?    ( >=${TEXLIVE_CAT}/texlive-langczechslovak-${PV} )
+	l10n_da?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_en?    ( >=${TEXLIVE_CAT}/texlive-langenglish-${PV} )
+	l10n_fi?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eu?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_fr?    ( >=${TEXLIVE_CAT}/texlive-langfrench-${PV} )
+	l10n_de?    ( >=${TEXLIVE_CAT}/texlive-langgerman-${PV} )
+	l10n_el?    ( >=${TEXLIVE_CAT}/texlive-langgreek-${PV} )
+	l10n_he?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hu?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_as?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_bn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_gu?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_hi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_kn?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ml?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_mr?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_or?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_pa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_sa?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ta?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_te?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_it?    ( >=${TEXLIVE_CAT}/texlive-langitalian-${PV} )
+	l10n_ja?    ( >=${TEXLIVE_CAT}/texlive-langjapanese-${PV} )
+	l10n_ko?    ( >=${TEXLIVE_CAT}/texlive-langkorean-${PV} )
+	l10n_la?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lt?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_mn?    ( >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_nb?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_nn?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_no?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_cy?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_eo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_et?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_ga?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_rm?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_hsb?   ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ia?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_id?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_is?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_lo?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_ro?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sq?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV}
+				  >=${TEXLIVE_CAT}/texlive-langcyrillic-${PV} )
+	l10n_sl?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tr?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_pl?    ( >=${TEXLIVE_CAT}/texlive-langpolish-${PV} )
+	l10n_pt?    ( >=${TEXLIVE_CAT}/texlive-langportuguese-${PV} )
+	l10n_ca?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_gl?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_es?    ( >=${TEXLIVE_CAT}/texlive-langspanish-${PV} )
+	l10n_sco?   ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_sv?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_tk?    ( >=${TEXLIVE_CAT}/texlive-langeuropean-${PV} )
+	l10n_vi?    ( >=${TEXLIVE_CAT}/texlive-langother-${PV} )
+	l10n_zh?    ( >=${TEXLIVE_CAT}/texlive-langchinese-${PV} )
+"
diff --git a/app-text/tkman/Manifest b/app-text/tkman/Manifest
index 05502062101f..9a2063f8f79d 100644
--- a/app-text/tkman/Manifest
+++ b/app-text/tkman/Manifest
@@ -2,5 +2,5 @@ AUX tkman-2.2-gentoo.diff 2321 BLAKE2B 5ea163cd50fbf1f2b30aa9e009a350d3c6df4fc0a
 AUX tkman-CVE-2008-5137.diff 11645 BLAKE2B 4d628679de1bfad459badbe4fa610c316871b801e01438f52e6c1c3906e325b752dc3de8f5556fb6f9cab7ed83908aee7bc341ccf6700d29f81fdf334be31012 SHA512 60c65badeaa93d5e032117152905bd3c06985d7694fdec8c9ef9d0816446a865c45a1a4e7ac2dffc8eaf76163514de30663b2185fe6ba8e27a2cf9276aa09f4f
 AUX tkman.desktop 149 BLAKE2B 20e07ce0d89b6887329c47cf1d134466855118a24e6fe2f800ec678a0823824ab9a9f55c4d13d349d7f178654de8449463cc641b243e1ac56536b9b03f92b1e8 SHA512 d73c6ca978f0538c1b02f321cc4f45eec496c3e978229fc7eb373190d447c4d0c7639d0eaf8a3b7cc22d569e6a9088dd8371799874b41b13bb758c75369e572b
 DIST tkman-2.2.tar.gz 229273 BLAKE2B 3015ce0ecb224f1c01e1513cff1a55d3a95362753436a981630f7133c56a8b8f03030d5d368cb4a5a631ecfb2f0f9afbdec37a2d5b0e9fe74add82142172ca06 SHA512 31adaa4017282a6e6fba18a5f72c07c7d7d3bc63ef043b214bf68ec4837c73d4e0679d8b7513b0bae3984e1737e797ca886e15150b2e1a9cd288bbd7491a8777
-EBUILD tkman-2.2-r1.ebuild 754 BLAKE2B 466249d3920b969b1f20ef39d47dcd97e611f448428c60804a68ceb630a5b95e69bc544f8450092f1bcf59230456780b188af9fbcb613c6a3295dac983c2ef38 SHA512 71702d9f1da8d8261da90ca67f42bd21acb1844b21c331fb5d3decc923f0a66c8b70811782b40a1768fdc9e2b0a6b38c81bc5f0392f583cdeb93e949a1ce604f
+EBUILD tkman-2.2-r1.ebuild 759 BLAKE2B 1b969319ff642d668864571368d5cd3298340d049882fcf66fc6166cbfc1caf8acbce4430a43edb14d043bd288d33e407d9a2498ede4d3fb8b4bc8abad341675 SHA512 e3a906ed3b41a1d20c045ee3104735443aec235555ded446ead4239cdf30b863d9a4b9d3b5edb4d358b695da83cc7135cf57c983a6e4f8411c5c36ff5583bc45
 MISC metadata.xml 242 BLAKE2B a92759fbcee1ad71d9ab4b2a414f3e08bfa0427599bbe7d3d7216293a01417d2d972fbf295d8ba257b23d6ba7c5f107e9e07108027db6718675577faaac74ac6 SHA512 5fb21614caacb9cac921de0acb6fb5dffbc5c3f9666cea2f1a357234e88c4f990d4a55eafd60f0ccfb29060576b955a4710bf75890a7ea4343131d28696dd4ed
diff --git a/app-text/tkman/tkman-2.2-r1.ebuild b/app-text/tkman/tkman-2.2-r1.ebuild
index 4e21e88ebb46..818ec72240da 100644
--- a/app-text/tkman/tkman-2.2-r1.ebuild
+++ b/app-text/tkman/tkman-2.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils
+inherit desktop epatch
 
 DESCRIPTION="TkMan man and info page browser"
 HOMEPAGE="http://tkman.sourceforge.net/"
diff --git a/app-text/tokyodystopia/Manifest b/app-text/tokyodystopia/Manifest
index aa8295177bf2..b33da73071c8 100644
--- a/app-text/tokyodystopia/Manifest
+++ b/app-text/tokyodystopia/Manifest
@@ -1,6 +1,6 @@
-AUX fix_ldconfig.patch 439 BLAKE2B fa9c4b1cf06b2ea8e0a2ff6546e09040e92718558e824adeae14f21af67d905c9ff391d1561788e5eac364efee3728a457d3ed226490f394c4fdff2a4fa895c4 SHA512 1b7c2c1bf8331069cdc74ad60c0ea346050118755c1502a3b1ee0786518d578a322ab1b8eda77d9699a6a4bd2eb9396a32407c5dc64238c1f28f3873957fc0cd
-AUX fix_rpath.patch 2631 BLAKE2B abc4903f98c2399f9514322cc93e9ead3452f09fd5fc88f8ac096613ed676eec517f9eb3fd3412f438a047e9c0305535589bb8ef263f55721dc02c503cfeb87f SHA512 cc4a357c5dbdc95e0b557e2a9578b5e4c6595b19c9b8c061b9882f77f25a5f2b710c1fc83aed1bb1ec8df6ca22ab20b822f1d134743c7ccdd94f68a30bc199b1
-AUX remove_docinst.patch 456 BLAKE2B 768890c4f85a391eac2e436db6b457042a8bf6b28c1c370d19be67a85c194b5a4be06b1f5f1541ad0552228145c7e44587c9c39fa553a5866d8886220e8d2847 SHA512 cb052f09c37e0b84e9e236cf7722974b29e0a2d537bd1268cbb8de0db9ba35292836c82b1d21b35f04b753d58c908f32bb42ceeaba03ae086888aeb278dd6a29
+AUX fix_ldconfig.patch 370 BLAKE2B 17aff364e0db7613cb848a8b836ce3df20dde3aa6a29d1b92edd558bbfa4e1aa5d35dedf8070d27012aa56c4573bb1c4931adb4748147a893f49aad842e11f76 SHA512 5dac3e50393a435b0b3866132c1e9bf0984e38c39e393d324836c22fc8c21261e0986c11a3522086b0c28a87d5fbb60d15856d2a08d22bc7641fa258bcfd6227
+AUX fix_rpath.patch 2034 BLAKE2B daa9e4a15db349a0a3621e52c428dc9efce6c4fd6fe28c5eb15ab721248a5ee282e3eb946cb0f720484aa12fa87767bea01d93f66874123408b5c732544bb8aa SHA512 60a3fd9739dbd73d858716788bb5cb9674e65ffd034f5d34c83234e930f46ea7312ddb7b86c0449aaec298eea530e9411b282a0063f2400226dfd70d637f21e0
+AUX remove_docinst.patch 387 BLAKE2B 4fe13f614cec55c91e03097e8bf1d6256f31a49347a62f8816e0b6e5d9579e2d77dd32798a54698fbfd47dacaf88de07b6b51ec502ef171f23ba1a34ae99caaf SHA512 8aaa887238e069a02667dc086ddc4cf96286a3243b129521fc08dab3063d5b228b77faeab55c182630f2599551fb7e69b5c98dd99b051814c4a2fc7d5a25e938
 DIST tokyodystopia-0.9.15.tar.gz 158522 BLAKE2B 624efe5ab587b8fcb63c6365862851ec8f3e596a9d75b48a273e008fadc0919004c6163ca54600b741289ed9f16f9e6d003766a4562f3df6214d48e3ff647ada SHA512 14e956ea6d84c3e00f1af5b8fd7e7ded8e886d585d80f492119521594826e21dd556b875b9552203c9d2f9e2830b15078d635a62975162436a7c2a13387086dd
-EBUILD tokyodystopia-0.9.15.ebuild 740 BLAKE2B 989306adb013c2a7a5abaec93ce37196ff3c67b98a368624275ce102aef9cce4cb37a126b626f522e09f64887f3b40f3414e95084ab4d3676e6cf10b8517eec8 SHA512 75bfd5229d27289a343159a16658c560a26f3d13d9bddbffaa8bd3108dd31e888da8ca77ba6b06365fdaf0de646211666dc8bba3c84fda22f320ad77fde034c4
+EBUILD tokyodystopia-0.9.15.ebuild 723 BLAKE2B a185c583e93de0cb1afbe85a854749cea580716318d7ec8551b096c113b4745a8c95ba77c322cbb7824ed069b3f55f5767ed83868520cfd6f23d8a5f1c0e7437 SHA512 457342a0b9c85a59c54a9286d3c7ebec7fd8b594ff6f6cb69ed2264e0e4ffaa7dde8dc6974046ab14e9d2b4635666848975b60faf6c666a9af5ef5a7fe9a098e
 MISC metadata.xml 247 BLAKE2B 5a20af3c9732ef7dba68131a08988652f5c93a6d186a82c4deb1bb9c06dc3ae73152a0d241cc346637f7b11caf4676da43301ba596c67b66669535e71db0b03e SHA512 29cf52c16b0cce69899d9c2da8acd9144b7d760442aa323b854dceadb42459e009545193b1df7911ac2241b59f4819b4a6bb1d206d6f57953f770031433bb6b7
diff --git a/app-text/tokyodystopia/files/fix_ldconfig.patch b/app-text/tokyodystopia/files/fix_ldconfig.patch
index a75da590ee38..e9c28b96bc9d 100644
--- a/app-text/tokyodystopia/files/fix_ldconfig.patch
+++ b/app-text/tokyodystopia/files/fix_ldconfig.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 60b1036..12f02b0 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -125,7 +125,6 @@ install :
diff --git a/app-text/tokyodystopia/files/fix_rpath.patch b/app-text/tokyodystopia/files/fix_rpath.patch
index 68c0b6e03510..12c95a5778c3 100644
--- a/app-text/tokyodystopia/files/fix_rpath.patch
+++ b/app-text/tokyodystopia/files/fix_rpath.patch
@@ -1,6 +1,5 @@
-diff -ur tokyodystopia-0.9.13/Makefile.in tokyodystopia-0.9.13-new/Makefile.in
---- tokyodystopia-0.9.13/Makefile.in	2009-07-05 04:06:06.000000000 +0200
-+++ tokyodystopia-0.9.13-new/Makefile.in	2009-10-20 22:39:18.000000000 +0200
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -55,8 +55,8 @@
  LDFLAGS = @MYLDFLAGS@
  CMDLDFLAGS = @MYCMDLDFLAGS@
@@ -12,9 +11,8 @@ diff -ur tokyodystopia-0.9.13/Makefile.in tokyodystopia-0.9.13-new/Makefile.in
  POSTCMD = @MYPOSTCMD@
  
  
-diff -ur tokyodystopia-0.9.13/configure.in tokyodystopia-0.9.13-new/configure.in
---- tokyodystopia-0.9.13/configure.in	2009-06-14 05:44:54.000000000 +0200
-+++ tokyodystopia-0.9.13-new/configure.in	2009-10-20 22:40:00.000000000 +0200
+--- a/configure.in
++++ b/configure.in
 @@ -26,31 +26,14 @@
  MYPCFILES="tokyodystopia.pc"
  
@@ -49,9 +47,8 @@ diff -ur tokyodystopia-0.9.13/configure.in tokyodystopia-0.9.13-new/configure.in
  
  #================================================================
  # Options
-diff -ur tokyodystopia-0.9.13/tokyodystopia.pc.in tokyodystopia-0.9.13-new/tokyodystopia.pc.in
---- tokyodystopia-0.9.13/tokyodystopia.pc.in	2008-02-21 10:45:01.000000000 +0100
-+++ tokyodystopia-0.9.13-new/tokyodystopia.pc.in	2009-10-20 22:40:17.000000000 +0200
+--- a/tokyodystopia.pc.in
++++ b/tokyodystopia.pc.in
 @@ -10,5 +10,5 @@
  Name: Tokyo Dystopia
  Description: a full-text search system
diff --git a/app-text/tokyodystopia/files/remove_docinst.patch b/app-text/tokyodystopia/files/remove_docinst.patch
index d513f54b753c..5b8fe1e8acd7 100644
--- a/app-text/tokyodystopia/files/remove_docinst.patch
+++ b/app-text/tokyodystopia/files/remove_docinst.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 8846c38..29ac11e 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -117,8 +117,6 @@ install :
diff --git a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
index 6bb8c6f44679..a384bbf797c7 100644
--- a/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
+++ b/app-text/tokyodystopia/tokyodystopia-0.9.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,26 +16,26 @@ DEPEND="dev-db/tokyocabinet"
 RDEPEND="${DEPEND}"
 
 PATCHES=(
-	"${FILESDIR}/fix_rpath.patch"
-	"${FILESDIR}/fix_ldconfig.patch"
-	"${FILESDIR}/remove_docinst.patch"
+	"${FILESDIR}"/fix_rpath.patch
+	"${FILESDIR}"/fix_ldconfig.patch
+	"${FILESDIR}"/remove_docinst.patch
 )
 
 src_configure() {
 	econf --libexecdir="${EPREFIX}"/usr/libexec/${PN}
 }
 
+src_test() {
+	emake -j1 check
+}
+
 src_install() {
 	HTML_DOCS=( doc/. )
 
 	default
 
 	if use examples; then
-		insinto /usr/share/${PF}/example
-		doins example/.
+		docinto example
+		dodoc example/.
 	fi
 }
-
-src_test() {
-	emake -j1 check
-}
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index a00c41ce896f..035bb006c780 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1,4 +1,4 @@
 AUX tree.bashcomp 847 BLAKE2B de05dacd7b54426e89e4afbbb6fba74376212a8f02995ff9babec369244bdb57fcb46989a437a100bf1415f7ecb8b0e142d729bae27f7fef6319de9e4cb06d54 SHA512 8df777721a7974015b5e717d89a4ff8701a2598e227d6cf71077fe498a5bb2a578c96c4667ab80e34b1064e109d38665fb6a4de8f52bb6401445088d5cdca922
 DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
-EBUILD tree-1.8.0.ebuild 1030 BLAKE2B 9ee7a68db1a1a61461d1af44288ed5a31714eec2bc9f95454f67e79fffa55417bc7f8abaeaee7821d704695bc20398df15280b2613b8d68a7b894343416924c7 SHA512 b9da69194a4a787e035a396e32fb26b6bf916dbeb0a33513bb9db0a038f2e2b46be890676013b21f6bd63e1dafaf4f36eb8239b622e3f39b679b40df800ce999
+EBUILD tree-1.8.0.ebuild 1031 BLAKE2B 01d710af8fb33ec7fc0e2aea9f61d208a599e78b4118369099ee67c84b928fca79aab705e4db7495529460a7d377ef2252dfffa12924dca0ba6d4a6321080620 SHA512 9179a866399e5b8bbc2cda9ae209d607e7f11065def5d044be86baebcf01eefd26f860e4115a331a5f099cac9ad8c11f40364344ceeb91f60869e38ba3865deb
 MISC metadata.xml 581 BLAKE2B c8ec671fdf6834012120004fc69b9957364d6c43d6b6dcdd78d1c0a850976d669c4044109c6c08d818a4167be2582cf6b0d20fd634843924a86e031d5d0a8f2c SHA512 ca6717181a7ad2535be2384b4abb986c4daf7d4defc2b4e7d7487fe62b5209c31e81f86843168681debda99dabb6d2c0165b0ca0b154464f5eada572bdc1fe42
diff --git a/app-text/tree/tree-1.8.0.ebuild b/app-text/tree/tree-1.8.0.ebuild
index dde5bef051ef..bcac09b3ccdf 100644
--- a/app-text/tree/tree-1.8.0.ebuild
+++ b/app-text/tree/tree-1.8.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index a4633665a610..7a2d50dbf326 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -1,3 +1,5 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
-EBUILD ttf2pk2-2.0_p20200406.ebuild 1100 BLAKE2B 4ed88e2d099091286e3f5e820a0f5015b32333f342c6b6a59d4bd7bdd5cbb855eeceeac56d824616e8ef82d161b52c737e266ae9512a734962fa4014ebf8deff SHA512 6c9d9b819ae17f1d1c4081f5e192cb690141e6d28b481bf0535c8e4a944d02848ba18fa598735890bae634ab0cefe0cafd05ba60d32d94f8201893075fa18ecd
+DIST texlive-20210325-source.tar.xz 54837368 BLAKE2B 66bd4bdd43ff53513004b9b9b90ababa0ab5efcf183a27864a3d39cde9cf90721456bda90c49ad6014f4b12d2e6293feaf9a8b152b85a89ffaa96bf5056347df SHA512 afd6eb24efaeac7c58d43ff24162aece919079a9ae02934509f068c7a3828223c33c14d9db11ff7fea3560b08a06f352446ba7f845eefb4a56a87b96f088f213
+EBUILD ttf2pk2-2.0_p20200406.ebuild 1101 BLAKE2B 1c0d69f29874d00338abec7380780aa1958c009374a37eb28288af031ac1f2a449207e87ed4e44d790a99b92762b8b04607713511790f02b479d61df3c08e1bb SHA512 33026725c2140d795dea8f0330da93f059ada8ef764d2e85a30e3238022f0d62d86d947bdab6b85c4a8d79d9c2a0dbc0350a4f794c282aa938517183a01e1f13
+EBUILD ttf2pk2-2.0_p20210325.ebuild 1108 BLAKE2B 75679e56225c6c9877d637d32dd9f73842a5d1ba440efa1b1a5d43af3698ccc8b66e0c3f6f44d322447c134c6d935919185c140f5fd87361b0f12cadb4f63d4e SHA512 112f6b98f929a7ea21e5a17bf82625b7b969fcc66437478dcc9f5ed8f9b861a9453c9076aa3e2c07dafb3a80e1cdb28af9b414f4368ec06b9694be71f78ae64e
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
index 293df0af0ba9..e211ff725b7d 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/texlive/texlive-${PV#*_p}-source.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
new file mode 100644
index 000000000000..01907bf57002
--- /dev/null
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20210325.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Freetype 2 based TrueType font to TeX's PK format converter"
+HOMEPAGE="http://tug.org/texlive/"
+SRC_URI="https://dev.gentoo.org/~zlogene/texlive/texlive-${PV#*_p}-source.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+# Note about blockers: it is a freetype2 based replacement for ttf2pk and
+# ttf2tfm from freetype1, so block freetype1.
+# It installs some data that collides with
+# dev-texlive/texlive-langcjk-2011[source]. Hope it'd be fixed with 2012,
+# meanwhile we can start dropping freetype1.
+RDEPEND=">=dev-libs/kpathsea-6.2.1
+	media-libs/freetype:2
+	sys-libs/zlib
+	!media-libs/freetype:1"
+
+BDEPEND="virtual/pkgconfig"
+
+S=${WORKDIR}/texlive-${PV#*_p}-source/texk/${PN}
+
+src_configure() {
+	econf --with-system-kpathsea \
+		--with-system-freetype2 \
+		--with-system-zlib
+}
diff --git a/app-text/ttf2pt1/Manifest b/app-text/ttf2pt1/Manifest
index e8d08ed13ade..7a9221ec5ae4 100644
--- a/app-text/ttf2pt1/Manifest
+++ b/app-text/ttf2pt1/Manifest
@@ -1,7 +1,7 @@
-AUX ttf2pt1-3.4.0-man-pages.diff 1441 BLAKE2B 20257cf4dc9499641378ed32494577eb0a09dfe485acd7ff92d6e1f620651f07b5ad6fc928158a1bd9935fbae470f673b0acefb1ced83f29911982ddd32109e2 SHA512 af4d6a11db15fc7113bcd3872682899400de01cc97169d0027fe4457c8c9abf02c8b7f93c0ae5783ab05964c4816087118686f3e8195a0ff4d6b5eae41df3b0f
-AUX ttf2pt1-3.4.4-LDFLAGS.patch 933 BLAKE2B 278e8baf471727bb191b4cea97691982f454e978dc1d8533ba35d10cb979c107bba8665f21123a3cd8ab75db0e7efd76032ce60045dc05abcc4219569608d0d5 SHA512 b0d292828a71a3f4668e7ce3d177b45030fd7739b9a10fc37ab6788f2a34e4bfdcb2730086592ca5b17071c34b1b3e448642e6fcdc721e5f6e8c0b67511859bf
-AUX ttf2pt1-3.4.4-Makefile.patch 2911 BLAKE2B f155d19c1a60a524c18f33b09a0c1c73b2cf7b0d2ded90eaa8b23cbc861cb7eb888f77ee6a1217ae2f6043835ebb3bdaab7bc67238d5d6504e6c412738340891 SHA512 a1bb5f9f2b7517d09bf093b12ac99bfcc517546568fce395aad430de06128b3f3d62e153bdcef249738392676bc21a3e26cbdd1a42203093c56ce8ee035757eb
-AUX ttf2pt1-3.4.4-freetype.patch 378 BLAKE2B 03adca507ae8b2556c20dd32c73a302bcb7d5793cb040c706a1e6d86de9f3eb55e8df85a578a2a9fa4cbb3216d50129d33548a7b3472bd7df5417e6a0f6b9b8c SHA512 93cdd2cb660a9416d30189e0ef1e14c97ca686efa2902d8617aec585040ff74b7bea6354296a99600096d1c73acda085217264d5d07e716f2d90a457ea4e9669
+AUX ttf2pt1-3.4.0-man-pages.diff 926 BLAKE2B 9fd3872f9c28d03ba2412fe27ed65277dfd34b3923d1e6fb2af9cac3c990446048e64ea5583386d8c34184d7c61507e2c0341c0a6f3bda56455204e9b51d4ccd SHA512 629b307fc210fff774e4675f6a819fff2f8336c6cf3f6ce1ee6c32e05503c86f80d03e978bbeabd862091b6bbcec80207c2e149d1b2a2b34a9b54c30a338240c
+AUX ttf2pt1-3.4.4-LDFLAGS.patch 870 BLAKE2B 74ab6326c92b2f9639765e6d1849f253357a15ad25d4234cc516021fc78168b5fb12a76e68c48b4755723a12300bc2f1d5031318e02bfc3c2057397699b67c5d SHA512 63e16aa71f2ae1fb1de0d97e1d76e7f075a8035cb77dbac8a55affc3784d52de350ec764113b0967e7792a45bfa9f338112022223ab50eedaef793f7b8add4dc
+AUX ttf2pt1-3.4.4-Makefile.patch 2748 BLAKE2B 131e2bfb4898bce7d98dda58255627b804d1386799af5aefd33efee9475a959954533cbae5374b34d945b8f3da6e3918463f4c1b4a9a9f083accb53344b95e91 SHA512 97d14aee0dc7196659aa2db9ece18fe8ebb6e5fc75e4c064dd1942702325ecad70b9ea66bd241932a0479cd97435953f5c5380de17177916e2d15389830a706e
+AUX ttf2pt1-3.4.4-freetype.patch 223 BLAKE2B 4f2e5a1a505329d505c705fce85d2a3729737d7c90cdf24ed318cc745edcf3279b204be0f395eadb3e95a66a89316c9d84a850510b95abc33bb50451a54b0a62 SHA512 4f5368c52fb4139995fad7cf881c2f3f722269818d045dac132856fc765e7c6e0dd21d6a74ffdbb93bdfe66924824f3bd8ef3779a020b1f22edec9e4d90b5a17
 DIST ttf2pt1-3.4.4.tgz 230547 BLAKE2B 58904765afad396692263d9f50017d299828ae847a254bf6a580a0a259dcd03da3d9a97fe370a53a936e70188dab3c96cf0f0ab9069474eef92b9fd31862e455 SHA512 ff2b41b0d54c2feb8565c4bcf9fbc2ce799aa6228815c2787e26127f6c0ca380114b3ab7a12fa50a52279a3452bcb91dbad5c661e83078f25036f69a4d1cf014
-EBUILD ttf2pt1-3.4.4-r1.ebuild 1062 BLAKE2B 77f768d23a2b22649425a746d2b993a28951090569566a298fbd0b37bfaa0a1ea18c7ca2b540c0636f40fab385db85b8babb334ddedaae4521801643c38c640d SHA512 b57372e8fde2440219d85eae0898775c2f73115788a7f0e168dc4907b5aa97b45e10a88d80d1c1c883fff989b071fbe90b506d078d9546b9874ddb046ff77088
+EBUILD ttf2pt1-3.4.4-r1.ebuild 1297 BLAKE2B 509af7610cb0ad513623af2dad822a318016b72a38b0d55a7412d21a2ba68da71a02c6518373992892c94038e462583ac7494bacf8ee2747583e62d5d28dfb37 SHA512 edeaeef8c6907c773fa9fb0b2d994203327323c73fe814a5a2031320eb71ad50425b0aece193c79272cf1b140438ddd0a666499d720721157cf7b1a0aa07757c
 MISC metadata.xml 315 BLAKE2B e2eecb62a8d7f8a509b9b09a251e32bf3129a9c5205ea5574271fb6660226d14f4a1870481b053690d9794cef6e239051a05075586ec7e38ff6bd5219e9d537b SHA512 2061dd88c2b81b9ac8c6f55bf10f39908f457741f14b4e949563b9195a3e5a09724ed585569acd5426bf0f95d740abdd1a4a61301f970814c7cf6e45f960a9e3
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff b/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff
index 2d301244272c..cd8fc2c69b39 100644
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.0-man-pages.diff
@@ -1,6 +1,5 @@
-diff -ur ttf2pt1-3.4.0.orig/ttf2pt1.1 ttf2pt1-3.4.0/ttf2pt1.1
---- ttf2pt1-3.4.0.orig/ttf2pt1.1	2001-11-25 00:58:11.000000000 +0000
-+++ ttf2pt1-3.4.0/ttf2pt1.1	2006-08-15 19:15:37.129672839 +0000
+--- a/ttf2pt1.1
++++ b/ttf2pt1.1
 @@ -109,7 +109,8 @@
  ..
  .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
@@ -11,9 +10,8 @@ diff -ur ttf2pt1-3.4.0.orig/ttf2pt1.1 ttf2pt1-3.4.0/ttf2pt1.1
  .	\" fudge factors for nroff and troff
  .if n \{\
  .	ds #H 0
-diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_convert.1 ttf2pt1-3.4.0/ttf2pt1_convert.1
---- ttf2pt1-3.4.0.orig/ttf2pt1_convert.1	2001-11-25 00:58:13.000000000 +0000
-+++ ttf2pt1-3.4.0/ttf2pt1_convert.1	2006-08-15 19:16:14.369517359 +0000
+--- a/ttf2pt1_convert.1
++++ b/ttf2pt1_convert.1
 @@ -109,7 +109,8 @@
  ..
  .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
@@ -24,9 +22,8 @@ diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_convert.1 ttf2pt1-3.4.0/ttf2pt1_convert.1
  .	\" fudge factors for nroff and troff
  .if n \{\
  .	ds #H 0
-diff -ur ttf2pt1-3.4.0.orig/ttf2pt1_x2gs.1 ttf2pt1-3.4.0/ttf2pt1_x2gs.1
---- ttf2pt1-3.4.0.orig/ttf2pt1_x2gs.1	2001-11-25 00:58:13.000000000 +0000
-+++ ttf2pt1-3.4.0/ttf2pt1_x2gs.1	2006-08-15 19:16:30.770568473 +0000
+--- a/ttf2pt1_x2gs.1
++++ b/ttf2pt1_x2gs.1
 @@ -109,7 +109,8 @@
  ..
  .\" @(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch
index 3d03e03e14ca..0bb7b570595b 100644
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-LDFLAGS.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile b/Makefile
-index 2616d46..cf72cba 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -179,7 +179,7 @@ app/RPM/ttf2pt1.spec: app/RPM/ttf2pt1.spec.src version.h
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch
index 6c760f43dd21..8224c168c1a3 100644
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-Makefile.patch
@@ -1,6 +1,5 @@
-diff -Naur ttf2pt1-3.4.4-orig/Makefile ttf2pt1-3.4.4/Makefile
---- ttf2pt1-3.4.4-orig/Makefile	2007-07-15 20:06:50.000000000 -0600
-+++ ttf2pt1-3.4.4/Makefile	2007-07-15 20:12:40.000000000 -0600
+--- a/Makefile
++++ b/Makefile
 @@ -9,7 +9,7 @@
  #
  # Use GNU C even if it's not the default compiler
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch
index 8257742ebe59..a4c4e7b98716 100644
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch
+++ b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype.patch
@@ -1,6 +1,5 @@
-diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c
---- ttf2pt1-3.4.4-orig/ft.c	2007-07-15 20:23:43.000000000 -0600
-+++ ttf2pt1-3.4.4/ft.c	2007-07-15 20:24:02.000000000 -0600
+--- a/ft.c
++++ b/ft.c
 @@ -12,6 +12,7 @@
  #include <stdlib.h>
  #include <ctype.h>
diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
index ed543c6808a4..fcc8361c32a0 100644
--- a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
+++ b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="True Type Font to Postscript Type 1 Converter"
 HOMEPAGE="http://ttf2pt1.sourceforge.net/"
@@ -12,28 +12,40 @@ SRC_URI="mirror://sourceforge/ttf2pt1/${P}.tgz"
 LICENSE="ttf2pt1"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 
 DEPEND=">=media-libs/freetype-2.5.1:2"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-LDFLAGS.patch
+	"${FILESDIR}"/${PN}-3.4.0-man-pages.diff
+	"${FILESDIR}"/${P}-freetype.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-Makefile.patch
-	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
-	epatch "${FILESDIR}"/${PN}-3.4.0-man-pages.diff
-	epatch "${FILESDIR}"/${P}-freetype.patch
-
-	sed -i -e "/^CC=/ { s:gcc:$(tc-getCC): }" Makefile
-	sed -i -e "/^CFLAGS_SYS=/ { s:-O.*$:${CFLAGS}: }" Makefile
-	sed -i -e "/^LIBS_FT=/ { s:-L/usr/lib:-L/usr/$(get_libdir): }" Makefile
-	sed -i -e "/^LIBXDIR =/ { s:libexec:$(get_libdir): }" Makefile
+	default
+
+	sed -i \
+		-e "/^CC=/ { s:gcc:$(tc-getCC): }" \
+		-e "/^CFLAGS_SYS=/ { s:-O.*$:${CFLAGS}: }" \
+		-e "/^LIBS_FT=/ { s:-L/usr/lib:-L${ESYSROOT}/usr/$(get_libdir): }" \
+		-e "s:-I/usr/include/freetype2 -I/usr/include:$($(tc-getPKG_CONFIG) --cflags freetype2):" \
+		-e "s:-L/usr/lib -lfreetype:$($(tc-getPKG_CONFIG) --libs freetype2):" \
+		-e "/^LIBXDIR =/ { s:libexec:$(get_libdir): }" \
+		-e "/chown/d" \
+		-e "/chgrp/d" \
+		-e "/chmod/d" \
+		Makefile || die
 }
 
 src_install() {
-	emake INSTDIR="${D}"/usr install
+	emake INSTDIR="${ED}"/usr install
 	dodir /usr/share/doc/${PF}
-	pushd "${D}"/usr/share/ttf2pt1 > /dev/null
-	rm -r app other
-	mv [A-Z]* ../doc/${PF}
-	popd > /dev/null
+
+	pushd "${ED}"/usr/share/ttf2pt1 > /dev/null || die
+	rm -r app other || die
+	mv [A-Z]* ../doc/${PF} || die
+	popd > /dev/null || die
 }
diff --git a/app-text/txt2pdbdoc/Manifest b/app-text/txt2pdbdoc/Manifest
index 64ca7fc82dbd..fb36565b638c 100644
--- a/app-text/txt2pdbdoc/Manifest
+++ b/app-text/txt2pdbdoc/Manifest
@@ -1,3 +1,4 @@
+AUX txt2pdbdoc-1.4.4-implicit-decl-getopt.patch 173 BLAKE2B bdfa910e3337541a91cd25d982ac50dff9347c6aaa7fa6925aa50511ba8b8239414525fa94a69407100a76a2dbc08bf6f3ac08b0228ac6d03f78c60b2237f132 SHA512 389a031cea7921afc7bcee4b8678b5c3bc32e33114b0a0e764a9eefe80d061f7bea5ad49ceee98a704484dccc94cc743ba6bf531614a2d2f5c236427934fb144
 DIST txt2pdbdoc-1.4.4.tar.gz 77486 BLAKE2B 4c626352863113958815b5d7d2e4ddf25806510bc12a295acaf7064c14c0a33caab2448df349cc177b5073accb7097e88ebfcded8110ab8a7b560ea1ea91d65e SHA512 db3f89b30a99afff79ad54ee600ff661ea750ffd39f0b2dfdb94dade42df930f5890839cd157fc77666887604ce5abc866d127176d2a9a36b4305cf0a30c6c93
-EBUILD txt2pdbdoc-1.4.4.ebuild 546 BLAKE2B e64d9c2aa34fbcf53f1fc7f231551a1eaf67a98d90ccf58ab42752e1127de7e8377eb9227f52a3803ceb0d4347ad9c9119196254fdccaec5fd75056e5ca6a721 SHA512 83c271c644e9c57ecd9bcf983d55b505dee38f3c9fe1c0fdf644c0236140727210ff74665c319060d32d4638a739f732e8db1b5a407d8733f71baaa6387ceb37
+EBUILD txt2pdbdoc-1.4.4.ebuild 649 BLAKE2B 24b34379a2cfa3f6599cb2d461f665d1f8c5135f7bebb56ef59427165deb574faa82bb6a2ad083bf845a441fbc42cc2dd9d0fb8799bd4943b2c0b35342cb9f4b SHA512 8574908dce235d69f8104491713bd4656503c845137de316732208507f010c6236c1b742f3e826c8185f3228837851f5d5ff0e7c425f109fc2b9c91e6eca2774
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/txt2pdbdoc/files/txt2pdbdoc-1.4.4-implicit-decl-getopt.patch b/app-text/txt2pdbdoc/files/txt2pdbdoc-1.4.4-implicit-decl-getopt.patch
new file mode 100644
index 000000000000..777d0e0e130e
--- /dev/null
+++ b/app-text/txt2pdbdoc/files/txt2pdbdoc-1.4.4-implicit-decl-getopt.patch
@@ -0,0 +1,10 @@
+--- a/txt2pdbdoc.c
++++ b/txt2pdbdoc.c
+@@ -25,6 +25,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ 
+ /* local */
+ #include "palm.h"
diff --git a/app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild b/app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild
index 5b2215cf8c73..a40e3f9e28c1 100644
--- a/app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild
+++ b/app-text/txt2pdbdoc/txt2pdbdoc-1.4.4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 inherit autotools
 
@@ -12,14 +12,21 @@ SRC_URI="http://homepage.mac.com/pauljlucas/software/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}"
 
 DOCS=( AUTHORS README ChangeLog )
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.4-implicit-decl-getopt.patch
+)
+
 src_prepare() {
-	sed -i -e "/^CFLAGS/d" configure.in
+	default
+
+	sed -i -e "/^CFLAGS/d" configure.in || die
+	mv configure.{in,ac} || die
+
 	eautoreconf
 }
diff --git a/app-text/vgrep/Manifest b/app-text/vgrep/Manifest
index d7e0e0706141..9ea83af2d99a 100644
--- a/app-text/vgrep/Manifest
+++ b/app-text/vgrep/Manifest
@@ -1,12 +1,3 @@
-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
+EBUILD vgrep-2.5.1.ebuild 645 BLAKE2B 00198ae16ad677349172aa644376ec3057d6e813575c28558ece7aa39ffde63a383bfe69111ce9cf25465cb66f0dfd4b12b4ab1cf1c3bc0cec17626db3b52367 SHA512 42caca3b8423f3189005c74d6bb52aae5f86d62e4b98293887fc5bfce5af4e50c0e6764064006a8ba46ff61977f06b070dc414cebe2a1515a2269e49fb0e5d5e
 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
deleted file mode 100644
index 25764d199b45..000000000000
--- a/app-text/vgrep/files/vgrep-2.5.0-remove-sudo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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.3.1.ebuild b/app-text/vgrep/vgrep-2.3.1.ebuild
deleted file mode 100644
index f50049ccd32f..000000000000
--- a/app-text/vgrep/vgrep-2.3.1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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"
-
-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/vgrep/vgrep-2.3.3.ebuild b/app-text/vgrep/vgrep-2.3.3.ebuild
deleted file mode 100644
index f50049ccd32f..000000000000
--- a/app-text/vgrep/vgrep-2.3.3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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"
-
-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/vgrep/vgrep-2.4.0.ebuild b/app-text/vgrep/vgrep-2.4.0.ebuild
deleted file mode 100644
index f50049ccd32f..000000000000
--- a/app-text/vgrep/vgrep-2.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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"
-
-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/vgrep/vgrep-2.5.0.ebuild b/app-text/vgrep/vgrep-2.5.0.ebuild
deleted file mode 100644
index 3875d5478206..000000000000
--- a/app-text/vgrep/vgrep-2.5.0.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"
-
-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
index 6b7efaf86cf6..bc38ee195178 100644
--- a/app-text/vgrep/vgrep-2.5.1.ebuild
+++ b/app-text/vgrep/vgrep-2.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -11,25 +11,20 @@ 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"
+KEYWORDS="amd64"
 
-# Uses golangci-lint
-RESTRICT="test"
+# golangci-lint is required to run tests which is not yet packaged
+RESTRICT="strip 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
+	emake PREFIX="${D}/usr" install
+	einstalldocs
 }
diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index f0aec7561ede..b94ef19a73c4 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -2,18 +2,13 @@ AUX vilistextum-2.6.9-blockquote.patch 4541 BLAKE2B 231ea3348a4519c5f24160bd1755
 AUX vilistextum-2.6.9-darwin11.patch 615 BLAKE2B 0bfefb47961cf1752c8251a484d04b20c55196d2c64c2e98bc50caf6842b02960257ff22d7d6f7b04c4a7e97e5c66a6a2f122db24faaae4c7fe326833e57c7c6 SHA512 35aeec20cb7e6ba1668d97f041bbd5b98712589eaaf0ab70a59d3a7df74e0d2e67abbab3a27c7c5ee5f6fe9d61f11610686df3459f0cb401cca03f3f671309ac
 AUX vilistextum-2.6.9-gentoo.diff 763 BLAKE2B bb145aa629084c370281fdb2bd31e763d0c0106bb8aa5c7fc1ee030e837cc0062b9f46ad9d626b88a199c12e6163acc2ab28978eb5cb236c3a212b341a7ad9b9 SHA512 b4c49ff27598cedeb06058d3237ea8ebc59a4df9031818f98b5fb22225733d94b820b892541dbddc38c28c08a62ff6f52ef8278c016522b1db95352653178b21
 AUX vilistextum-2.6.9-prefix.patch 837 BLAKE2B 65aec718915942919f371453af12cbfa74437f999d7c25a49186ed5c02e975c4c10ebf629bc54a8a6fb69b9acc9723a32d4d82b0ee09c039afdc5f0fa8d9370c SHA512 6f913d283542bfea02d062f872dc2471e7ea2bc4c29ddb8893aecb9abeb36e6cc821c393217a92421e6888f7c25aa072bfc16c56a69a40593ed504245d8cd187
-AUX vilistextum-2.8.0-blockquote.patch 4479 BLAKE2B 45b63c30064bceb80cd37fa6fc8cf86685ee2017ed53a40ac76508e830b85c5b14d449ef0b5088245fbe87f056a28b83fba95f3795f5b8a05c35d2221696ff14 SHA512 88d5c696f4e20825e032258c85a154c65b9404bb2fc31854f88d8a6b2939cddaf6e6c99b9fa74bffb19a4fb4a75d200afd15a362fbcbcdcee075754866c9fa06
-AUX vilistextum-2.8.0-gentoo.patch 278 BLAKE2B 6fc580c02c38bd65855ff5866555360c6f0d13e1d558f19298418556b5b4124aad280bf0a46505db242ec25f869e8abfbd47dcd6eb030641eadb30878887c6d6 SHA512 3a1d701067ea291756e29d0a23dc6c21ae83a80239d2cfbf576513a667e0ef1222746aff7d1d1ec7bf0af0ceaa48ad44ea37b7b56b499eb214b103d682880d1f
-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
 AUX vilistextum-2.8.0.20200411-static.patch 429 BLAKE2B e5a86f226bd0f272a21ccb1b787d2579ca3ebabfac5e3c35420c9f4db2e3426d87ab554e52a14f3352cbc62fa2d7a97c57eaf726283e1024018aa896d547d808 SHA512 b15a4d067faaaeedde484c1e944f73cb14bf205bb33436e46b3348d278ba3ba199a023ae8f95c2aca5a9fb5752ef3dbdd993108d31ea7268d5c88ece8c2749e8
 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 1795 BLAKE2B 3a9b4d9462338f2524f649aedb4945012c093f7275f3a9ee1f5852f049318ac06634c74362f6eddae65cca4e339aff8d87801b18628785f3c72b6eba794b983c SHA512 ce2733938218ede9fc6577567887cc9d6d6668ee04a1c077ad125ddc4f3db263cf96d863ff9402a3200370d10552bbf5a21433aa72746c034fda5e337c545697
-EBUILD vilistextum-2.8.0.20191023-r1.ebuild 2042 BLAKE2B 43f180fa1d9526d2b86d33512195ca3601808bd82cbbf9ec4f6bcf19c1b00edd30cf05a148070fdbe455dd851da0ebe84b27b6715e0f702518eed32364803bf9 SHA512 b68a906d38a98ea2a69d1d1eead9588f181a118c83ea84a6ae05d768b54d29718af2b8549e6ed98b45064b1e0ea6b45bf8b7258d61e6baf7a5314b4523b2fa56
-EBUILD vilistextum-2.8.0.20200411.ebuild 2070 BLAKE2B d379fafb8e698a88aaa526d05ced264f3e0299c37e7255c96c951da3dd0e45fcadffb07b4503f2944dfcb5c0e0aba051bb2283a3c64b8371d224b815e68434b2 SHA512 097d99abbd9d5344143d5177d4bbb4ae0d19f51f29ab4fd08344d986fcca09506769c975a6a3babc9a50fb1455d8c1f65eb3065ae2baaacc49aadc4f6f6b168b
+EBUILD vilistextum-2.6.9-r1.ebuild 1795 BLAKE2B 49f0673b3c30271e2686da6598c94455d57df7dad4dceed7e039c459d30d3cacf6407234d8d459f13f992be9990e660f00198d2017e829ae4252e58a476e6dcd SHA512 9a58610ef3a53b1179d57c837b9fef01c2a6dd1a0f520582846dd88bbb3124a4935f55e048c2f320aee0042c2acbf987fb0b1bb6b2d6d5a2b201703a9acbc7a4
+EBUILD vilistextum-2.8.0.20200411.ebuild 2057 BLAKE2B 82a354948640b4c655941f3f897100c1175c81c266ec81b888fe52c386b84627d637189ecaf6176f9db3f57054bd0a2a2343ecc63f9b1f632402539658c4456b SHA512 0eb8b8128357d314d89c5a708e6fef7f45f9e845d944b03ac1bf2f6273b1243a838575fc10af9f0fdc2d5d8e5db9027d1a0caefed686bc51df21ea04969fb267
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch b/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch
deleted file mode 100644
index 74d44309669b..000000000000
--- a/app-text/vilistextum/files/vilistextum-2.8.0-blockquote.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-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 @@
- 
- int tab;
- int spaces;
-+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-gentoo.patch b/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch
deleted file mode 100644
index a26ae7178184..000000000000
--- a/app-text/vilistextum/files/vilistextum-2.8.0-gentoo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -6,7 +6,7 @@
- 											main.c main.h util.c util.h \
- 											multibyte.h unicode_entities.c unicode_entities.h
- 
--AM_CFLAGS = -Wall -O2 -ansi
-+AM_CFLAGS = -Wall -ansi
- AM_LDFLAGS = $(STATIC)
- 
- EXTRA_DIST = kilistextum.kaptn
diff --git a/app-text/vilistextum/files/vilistextum-2.8.0-list-alignment.patch b/app-text/vilistextum/files/vilistextum-2.8.0-list-alignment.patch
deleted file mode 100644
index c308cfe1615f..000000000000
--- a/app-text/vilistextum/files/vilistextum-2.8.0-list-alignment.patch
+++ /dev/null
@@ -1,43 +0,0 @@
---- 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 @@
- int tab;
- int spaces;
- int quote;
-+int orderedlist;
- 
- void print_zeile();
- int is_zeile_empty();
diff --git a/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild b/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
index 37ed62c44954..378b7e597fb2 100644
--- a/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
+++ b/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=5
 
-inherit eutils autotools
+inherit epatch autotools
 
 DESCRIPTION="HTML to ASCII converter programmed to handle incorrect html"
 HOMEPAGE="https://bhaak.net/vilistextum/"
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20191023-r1.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20191023-r1.ebuild
deleted file mode 100644
index d36c583c8dda..000000000000
--- a/app-text/vilistextum/vilistextum-2.8.0.20191023-r1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-GITID="f299bb5e5f661c345c4b85a3e8de9ad8615ad17a"
-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 ~x64-solaris ~x86-solaris"
-IUSE="unicode"
-
-DEPEND="virtual/libiconv"
-RDEPEND=""
-
-src_prepare() {
-	eapply "${FILESDIR}/${PN}-2.8.0-gentoo.patch"
-	eapply "${FILESDIR}/${PN}-2.8.0-prefix.patch"
-	eapply "${FILESDIR}/${PN}-2.8.0-blockquote.patch"
-	eapply "${FILESDIR}/${PN}-2.8.0-towlower.patch"
-	eapply "${FILESDIR}/${PN}-2.8.0-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/vilistextum/vilistextum-2.8.0.20200411.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
index 6a712147389b..f388ee3dd47b 100644
--- a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
+++ b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools flag-o-matic
+inherit autotools
 
 GITID="06cc8a637efd9097af4f138b1b7c755120ffaa88"
 DESCRIPTION="HTML to ASCII converter programmed to handle incorrect html"
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index e0a7d7c1fdab..6e39cfa19f20 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,4 +1,4 @@
 AUX wv-1.2.9-format-security.patch 336 BLAKE2B 18641a15c75a32250012771bd8ca8b0739f503ef8d1d2eebe23f2d378996aa3f6e2f0cfa72f8077add3db33f8ece86c57e80cc5b868719472b45ba1bed10a7d0 SHA512 99fef3bec0f129ae2d138c50d1e3e9288d5309db87a72d9b1970d1d230e20be3469b423f0b74c5083a0a5cdca8fed0b2ca32ec1fefdca22f213e4a02a6bbd405
 DIST wv-1.2.9.tar.gz 616256 BLAKE2B 6a6aa6b5f87a934c703c8a74d85af3d7aa84dcd2bc613a3af7fb8d69a9339e71ba2618ae8f725b90c3fe0b0199f4b224bdb32a50c2b6b6614f84b6a14437633f SHA512 ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5
-EBUILD wv-1.2.9-r2.ebuild 1451 BLAKE2B a6691c959683dfc5cf386881596cbe48e42aafdf06af8a5356721f9bda3c058c702d459e697e65a0ef6b00a2426039d16a30fc1b8deb8bbbac50f40f5ff4025d SHA512 ea8ca4695bc9481fd7ac67d447682f9ecb00bbf961a1edb8705c14c06ef37197a14d1a740bff3bc6bbe945848956c0a3f57d563e533ed6c7a1f2bfcea58054af
+EBUILD wv-1.2.9-r2.ebuild 1444 BLAKE2B 5466759bd60b4b14a9c68aea9d1ae7d8a0770cb5535107abe49a00e7ebc7c4320408428135e42e866141bd2a1d52c86e4e32c7ea224de4881f9815c16551a7cd SHA512 6fa5b35949ab12ddef96f2eef5486840b0e9ed0020049f249926aa7a48871413f2ba557cef220a81d6f16eb25b004c48e01545741573b0ac716a20b57b01552f
 MISC metadata.xml 448 BLAKE2B 2ad03c8351da9b74d3420841cbb63aa4a5f8723bdd698ded80bfbc91f0d7bda75b0f2d671a74882e32f7f7e1b1e3d6bc4f1ff491132af931e5914b853b3ff854 SHA512 f6ed1d52b212ac06af826dea4218cdc3017d2d7e417f943bd14f2f223221da1d8a4401852e4fd8375195a77f4f10465d93b8ce62e3981c41570220b5699e4a55
diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r2.ebuild
index b75a8fa43bfc..6f316088f9d9 100644
--- a/app-text/wv/wv-1.2.9-r2.ebuild
+++ b/app-text/wv/wv-1.2.9-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils autotools ltprune
+inherit autotools ltprune
 
 DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable"
 SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 27c3e1e5d1d1..3e8d12b86ad3 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -3,6 +3,6 @@ AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab2
 DIST xchm-1.31.tar.gz 981450 BLAKE2B c0c1908332f4d76f2c4dcf64ed713ae500d1b2022dedb5cb0df294fcdd1ce87d5144ca7347d6bc70b43af29f047ee270ffe05f1ee8da2dae5a5e0586c342900a SHA512 b5e1e979948d202163265f99357b361bb78371a2cc7cdedcc2d2c78207466c3f8291f720c92405913c7c5b9f607d3951a8bb3be3ece3ba1f408ceeb79199e9b5
 DIST xchm-1.32.tar.gz 986604 BLAKE2B f2a1d27ee747bb2d599452f1fa91864afbd2d604e9c27322d70c0925c9c313d4c80ab647ed5bb7ae3672687decfaafb2be23f7b9ed09fb95ae7490b0a65d7cab SHA512 e8250660ff28c80ddda62b886b296d98fb60e8d482ad6791c775a51a860ca78e310222bd0f5baa40c941a3f345c0bb07edb932c0417835ab0b090d14b7b4c0f6
 EBUILD xchm-1.31.ebuild 946 BLAKE2B 3a79a20c9adc1a6263549c3449fa1c1f36ed7c99808b08007b34d15006de214c0bd34e1b134ef3c77350ab84c890bebfac4a9b78e43f251353b0315f507042c3 SHA512 03e41fdc435f95c64017bd39177997b2e6c40c17f4de4fd9fa295ac050203f9c156913fb8e333b267279d151276a718e070a2f24d76dbda1846c408b9ef307a5
-EBUILD xchm-1.32.ebuild 949 BLAKE2B 8137ecb8e880ad711b8aa559b97cc98b05ec028cda5343f65521d7ea2d2ea1a74d0ae1aed4292eac6e93919767372cb1bb7a71b6f7268d6795ac7364945c0843 SHA512 cc2c09cc3dffc9c43c76673218a0cfcf106d5d1590a80d15a8ef5a83c1254032cfbc8376e3b31f4e691fdf7ae1f83e5caae75168968d2acbb1d29164dc1c57fe
+EBUILD xchm-1.32.ebuild 947 BLAKE2B b9eeb5ecc18cfbe23cc9f14460b6895e21a47ddea1149ae901d9ecd10ee0818d15fe53554a3f73cf735ff47492eb3c3660d416a09628f2c3b036df7a853ab4d9 SHA512 23f93add37df0b38297157eb5be71a25b85c51de25ebb0889b0fae4f911d9a9a5061ef836a610e9afc79790f3b8aa9517375ffd85b1013b090fbfbc9e0c6bd92
 EBUILD xchm-9999.ebuild 1107 BLAKE2B 735bd0f230d0ea1a8cf34805dccbe600b29dd11fca03ac34dc9c96f96064214667f772a2fb2a67c58cf9a7184688282dab944955df83560426e0954510935e25 SHA512 82a8f548dbae62af0df893eed30cb3b332c1bba1ca1ec3af3a82a1f272fec3b57f159e9bdadfb916f422e822aeb0f55be0563d022b9300fe75642a55d4ea5e6b
 MISC metadata.xml 321 BLAKE2B 65dacec7a8a5eb1d29ea9ed172e9d5d50077d3e39669a1250197b4f179f33112402be8e9c31b7070ba64bde942487a569cc521e920aa9dff612e3b74081096ff SHA512 9af4d9876f239fa7d85a360814bc0f188c30b117aec2aec3847df1974d94e304979f700301605abdbf868906d364060712d5035992a52e20b69ff88f35716727
diff --git a/app-text/xchm/xchm-1.32.ebuild b/app-text/xchm/xchm-1.32.ebuild
index acd284a2aea4..30f2bda9aa20 100644
--- a/app-text/xchm/xchm-1.32.ebuild
+++ b/app-text/xchm/xchm-1.32.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rzvncj/xCHM/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls"
 
 RDEPEND=">=dev-libs/chmlib-0.36
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 4924011fa392..be65d64cd8be 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,4 +1,5 @@
 AUX xiphos-4.2.1-appdata_metainfo.patch 312 BLAKE2B 9d08588d0cce33f56b45a882246528afcf36fd9b24bbf7fadeec270a24d230bec5a0ef2436b7a70358aff9946e19ed3bd60304bb786f4920f389ce2389bb146f SHA512 59d9ea167ccdbdbc7b90eedbe58e12fe9b11043b48442143d6bff67f2853d717597e7023c7898936a63e6e9def599b6309330e31a394dfb4c807ae95fdc63d52
+AUX xiphos-4.2.1-glib_version_min_required.patch 223 BLAKE2B f31b00632ce8dcb1df5e91c3e878318690cb159a7ab83dca134d3e536edb3e9c5462f25bcdebbd25a617b0811e6175ad9bb62583ca588907f14d4b89304eeca7 SHA512 6641739c9f3fa195321f16a1d5d7ed844a0a99c6d65ceba5367270d82c0701a6c906de7c1e430ca010fcd8c35a247bb11f3fccbbfdf80c1ee28b21af2a7a2bd3
 DIST xiphos-4.2.1.tar.gz 28373966 BLAKE2B 33f4cb8884add292047d4c9a594ee467f6a294c0732af54802ffa556c5d97978f398fc1b5da52d5620413305d4efe9ea1a3e680dc4db1dde962d5c9028c360cf SHA512 4ce92b86e1915fa4d0ffa867a3542ff697195dd176dff1c5d00193a9556ecfc60623049bf45837a2f60317c392b3c4365742a7490ac8304a6f1b9491e3318077
-EBUILD xiphos-4.2.1.ebuild 1334 BLAKE2B b69913a9017a167adac3c5012a7d3965ebfa9055a32fbb4ab9cbe9110bc694ce5ccb8f1b1fe7917d7b290e8e467299f571564743855168ef3cb401c58628c6a2 SHA512 e0c4a9c7d94f3c796aea434b1811c3c4ac5eb1ee1592a47a4955ec7b82c5c151769593540f2d6e605306f41203097e6f2806935e196041cdf3525d5533487690
+EBUILD xiphos-4.2.1.ebuild 1393 BLAKE2B 3b4acee83eb323f63102ea72e2bf8fe8ea1dba2fc7a6258d6d418e1e763d83e86c7be44550d862c7d81ae07724f3b6485638fe5cc67e069cd46859f34b4f3fb0 SHA512 c9617378382cfde3427c09f95bd1bc251b9d683f4fe0a0d0d3ed59f5f16846b159ab649f2214829d856ad8170699ed38df9f83541184b0e8b50553b0cb532f5e
 MISC metadata.xml 325 BLAKE2B 1fcf098a010153588db7bd29c726c965e4d0505841c47be0b7a75f07b4e785d7c42a3321d67079a66782ab5edf4f39611a9f4ac2578d552f93462632c872bfeb SHA512 0b9f3bfac06d3847983a5117be9d101d01ddb02511b5fc832451de6cec703ac46f5a18d10e330af1d79147338b077b957d4d1263b8113dc3e0bded92267714a6
diff --git a/app-text/xiphos/files/xiphos-4.2.1-glib_version_min_required.patch b/app-text/xiphos/files/xiphos-4.2.1-glib_version_min_required.patch
new file mode 100644
index 000000000000..10bca560fb03
--- /dev/null
+++ b/app-text/xiphos/files/xiphos-4.2.1-glib_version_min_required.patch
@@ -0,0 +1,10 @@
+--- a/cmake/config.h.cmake.in
++++ b/cmake/config.h.cmake.in
+@@ -63,5 +63,7 @@
+ // strcasestr
+ #cmakedefine HAVE_STRCASESTR 1
+ 
++// glib-2.68.0+ compatibility
++#define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_2_26)
+ 
+ #endif
diff --git a/app-text/xiphos/xiphos-4.2.1.ebuild b/app-text/xiphos/xiphos-4.2.1.ebuild
index a79db9af7296..6dab6793c988 100644
--- a/app-text/xiphos/xiphos-4.2.1.ebuild
+++ b/app-text/xiphos/xiphos-4.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -39,6 +39,7 @@ BDEPEND="${COMMON}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.2.1-appdata_metainfo.patch
+	"${FILESDIR}"/${PN}-4.2.1-glib_version_min_required.patch
 )
 
 src_configure() {
diff --git a/app-text/xlhtml/Manifest b/app-text/xlhtml/Manifest
index bc0dd923b737..7a71b3eb0f1a 100644
--- a/app-text/xlhtml/Manifest
+++ b/app-text/xlhtml/Manifest
@@ -1,4 +1,5 @@
+AUX xlhtml-0.5.1_p6-respect-AR.patch 169 BLAKE2B 906062c54397d53ecf1d6ef749d1a0d1b9cd457bfb9a3c8b75f37f277505442eb348fc4b5a9b880d70120e3d419a893a2afe83788e03c6d725315c48745289dd SHA512 2ac889d1e636e905e699efd5a2103d52709d86dd872ca9195d0bea61e05899d2d106fd23b0dad7e37d105e054720abdb51cfd9d10058551602b836a8fb1f8364
 DIST xlhtml_0.5.1-6.diff.gz 119282 BLAKE2B 032ba3c27a8d1d8b3b0bc40b30d137ff03f6b3d2d6dd0cec00203d705fd70fbf926e737536829e3aeeb3592a157402ce49c0754e5b232df3d28aee046141b5ad SHA512 f1f4bba58858e6033f164e689333904887b7cd60bf082e2247e7fe0c54f3737e72aff6590deefd1d8a04d4b25d27631664594c50c9cc4bbdc8c9b20c6ccce7bd
 DIST xlhtml_0.5.1.orig.tar.gz 263933 BLAKE2B 88d08e4e3dd573136f8a7ef27038b80bf8dde14f648e200f1673e1a83ebcd4ba085f3073d51f0473e5ca45e731414bad5bf00381dd7c56b369311cb6473342c7 SHA512 9ac1cafd4496293cbc5ca9109a8d467fab6dd24c1daa91754b7f49502e2607272292b8bb9ed876b21fe1b287ef3293a0f6c5882c18a18fd715137c27d63f9f01
-EBUILD xlhtml-0.5.1_p6.ebuild 977 BLAKE2B e30624dd2b815848a85b9474971a1d0e99aa8077fcbeaba8e54ccab6843686dd0a14fc71130ca68a627b7335153948e45f2d20f6632c199933ece5fc4af014c1 SHA512 3bf888ac97075be2f5924457d68255e95ed51a386ad4bf1a3bcb46d098c167d66d93695f77a54327871e4fb8416d0625bd668c2310bac026120efe0dbf384369
+EBUILD xlhtml-0.5.1_p6.ebuild 1026 BLAKE2B 99c2ac64feb5f80698bbda327ae7113e06aa0ed7a869d412d6e65162aa757d285524345f3423db2f7912486ff8d8b7b487a8af593b4593794c4c86351d63c895 SHA512 06bf1b0b17af277b4faeb7940e333f2def64207471206d3b66288ddcfbda9db7f31fda05fb1476be6d202a166fc520a236453a0d6e0179f3874151f204a65cc8
 MISC metadata.xml 249 BLAKE2B 31251b3297cc7eb5625140690803a9f0f7471c492eb02f10594f5031c5ca133bd409f65d9285644c6c3fadd1af1155a4946d0935feba73a3c90c4d95f60889fa SHA512 f6d4ee96a09d5be353d8965ce7944db541bfd6fbe75e2a80dd660993e36250fe146c30ca914667c0d09ae3916274295661f2a6b0b1bc1c2fcc0123a7cde2b3a6
diff --git a/app-text/xlhtml/files/xlhtml-0.5.1_p6-respect-AR.patch b/app-text/xlhtml/files/xlhtml-0.5.1_p6-respect-AR.patch
new file mode 100644
index 000000000000..6e286e89961b
--- /dev/null
+++ b/app-text/xlhtml/files/xlhtml-0.5.1_p6-respect-AR.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -18,6 +18,7 @@ AM_CONFIG_HEADER(config.h)
+ 
+ AC_PROG_CC
+ AC_PROG_RANLIB
++AM_PROG_AR
+ AC_ISC_POSIX
+ 
+ AC_CHECK_HEADERS(malloc.h)
diff --git a/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild b/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
index e7b9c2b72180..329c139ce265 100644
--- a/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
+++ b/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils vcs-clean
+inherit autotools vcs-clean
 
 MY_PV=${PV/_p*/}
 DEB_PR=${PV/*_p/}
@@ -13,17 +13,21 @@ HOMEPAGE="http://chicago.sourceforge.net/xlhtml/ http://packages.debian.org/etch
 SRC_URI="
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
 	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}-${DEB_PR}.diff.gz"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
 
-S=${WORKDIR}/${PN}
+PATCHES=(
+	"${WORKDIR}"/${PN}_${MY_PV}-${DEB_PR}.diff
+	"${FILESDIR}"/${PN}-0.5.1_p6-respect-AR.patch
+)
 
 src_prepare() {
+	default
+
 	ecvs_clean
-	epatch "${WORKDIR}"/${PN}_${MY_PV}-${DEB_PR}.diff
 
 	mv configure.{in,ac} || die
 
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 359a1d8737b5..37aaf1744eae 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,5 +1,3 @@
-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 634 BLAKE2B 0a8b7df2c86fe4b6a1446284dd82957c15a4172eb8972c57a52060e9f8ec8ae75b5ebf87ab8cfc352373b4ab820ec729894b49c28f73831b7dc0010a62329d00 SHA512 201f5ebb12312e61900cbc7dbc664723a02d345bfecfbf48ecbd9f4151c7d41ad934e9b0177620b472981a152e6e0b0dc7bbef5e6f4d811ebaee88e25b6c84e2
 EBUILD xmldiff-2.4.ebuild 638 BLAKE2B 1d359e9782b14a28ad024906e3fd49bcbf76ce7d3e3bdc91be8d4c29b93cc668e4d5ecbb331f0b54a09392e3e50bebe16e61a1485f012a1ccb0eb7d7b8c5d3de SHA512 9d6ebc21102bb07aceaf5c84c9b5fd42e9e9091b066f0d7f8e48ab0b547e9e8d8cd07e68e41979ad0ead1d58fd33e38db52545ec0a34cdcb8a412d1301dc33b5
 MISC metadata.xml 571 BLAKE2B 683529e9b239a0cb78efd35dd49ec77b50d251bd8f3468fcd368aef74bde57072438d1f39f0641a51a34c961aea74469e8c52061fbbdcff564a24c220d28c0f3 SHA512 3cada00af2e714f7c33e1c79de4276d107d4162a5f1d6d468724e128988560f1fc27ae2733f3db7f962c9ea08cef40f4333c624e957ca73d2153ee9941f28f62
diff --git a/app-text/xmldiff/xmldiff-2.3.ebuild b/app-text/xmldiff/xmldiff-2.3.ebuild
deleted file mode 100644
index 1fcb27e9c91f..000000000000
--- a/app-text/xmldiff/xmldiff-2.3.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
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-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/${PN}/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/xmlto/Manifest b/app-text/xmlto/Manifest
index 9781aa7a7fd1..08e63be8b69e 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,5 +1,6 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
+AUX xmlto-0.0.28-allow-links.patch 535 BLAKE2B 71412bff616c9499ed6cf045a5d7ea1e6c697db791c58c1a56a1fea3bd7c1619814e20cf58e3549609fc104b0223f80c9a84ef4f4b203da90d5a8dc3b6c943b8 SHA512 cc3ccd209872a54cd3d91a1e261348ce412efab3d9d6d0d9199bd40396fa9c8de5e1ba6a5fef2e5d23d2819ae74bc19e2705b54792296eb7a3b8dc82b8637f22
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
-EBUILD xmlto-0.0.28-r3.ebuild 1420 BLAKE2B fb16508bb472a89a2312c7fba3d61694f59fbbf28f6a011fcb000439146ac40f7175a85fe416958bb0cc491d8388b02ddfa9782a3ee90f898f1c56b57dc37b51 SHA512 5d40affae036b2dc9e1d44136c00b3cd68327a06d7946cebb219c597acadabd0b64f006481e439693e28ba28373c44c7c89e5f5ef9ce758274791edc82642ad5
-EBUILD xmlto-0.0.28-r4.ebuild 1356 BLAKE2B 38104dfcdd90a36e4dfffcc1022e7666fa8da4f74cfa00321bc685b5ccc59a640e04655edde22f5e906584c0afddbe7b8fc63839b3104087d578274261830c85 SHA512 2a57acfed31b948c578d923d04d676d1ff4c3f116ba226cf1cf322e85dfd3aec34ca4ef6c881f44399dd574f55899dce5ae52184a688889b812c2ae014980bd2
-MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
+EBUILD xmlto-0.0.28-r3.ebuild 1422 BLAKE2B 82f75b7468184f59b6b7edbecf2b9a9a06daf91c61f163f0c6501ea5ebb1cec4922d309f4bfb5962ec7192035dc9daa887aa967a1f46e88f390f478ea5565091 SHA512 88c76795131133792a8de0591b183682418e7c670b347276eab3bfc7f1c966d980d9d48de407bc0de746aa7ac5e0371bea5bb149c9a302984de042ed79a674f6
+EBUILD xmlto-0.0.28-r6.ebuild 1442 BLAKE2B a5993d04bc74818acd4c4fb2213067f6ded07baa625e602ebf028a6b59188b340bbbc9b2e00cbdf04023eccd20477a0103ade366b489ed1dba409edefe7a32f7 SHA512 bcbe983428e3a8abb22bfc1fea7bc200a77ede274432c903887053dd5da1a90b4ef9b5c632007466d2050de64fe9463de693309dd6000f04a7d05f2ad53c7a20
+MISC metadata.xml 323 BLAKE2B fc92312d7c96a25a1d35384dd78942a7d6bfdeb0d1c36a7ffddc687d42a83261766e7042dc109b2544da11d72274761a98c62cc8e0ac872e8478e5e027cc69bf SHA512 33789a6e807d048100b32969bfbce0beea9c3b25fe279fe5d318d59b970b4562ec8edd222bf5817a62e46d23961160ccb11384be06e605fb115b3fc7c72299c5
diff --git a/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch b/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch
new file mode 100644
index 000000000000..b35b492d9120
--- /dev/null
+++ b/app-text/xmlto/files/xmlto-0.0.28-allow-links.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/679626
+Thanks-to: dolphinling
+--- a/configure.in
++++ b/configure.in
+@@ -100,8 +100,8 @@ dnl
+ AC_ARG_VAR([LYNX], [Name and path of the `lynx' browser.])
+ AC_PATH_PROG([LYNX], [lynx], [lynx])
+ 
+-AC_ARG_VAR([LINKS], [Name and path of the `elinks' browser.])
+-AC_PATH_PROG([LINKS], [elinks], [elinks])
++AC_ARG_VAR([LINKS], [Name and path of the `links/elinks' browser.])
++AC_PATH_PROGS([LINKS], [links elinks], [links])
+ 
+ AC_ARG_VAR([W3M], [Name and path of the `w3m' browser.])
+ AC_PATH_PROG([W3M], [w3m], [w3m])
diff --git a/app-text/xmlto/metadata.xml b/app-text/xmlto/metadata.xml
index a6f3fe89fa47..d52af1c934ce 100644
--- a/app-text/xmlto/metadata.xml
+++ b/app-text/xmlto/metadata.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
-<use>
-	<flag name="text">Support conversion from XML to plain text</flag>
-</use>
+	<maintainer type="person">
+		<email>sam@gentoo.org</email>
+		<name>Sam James</name>
+	</maintainer>
+	<use>
+		<flag name="text">Support conversion from XML to plain text</flag>
+	</use>
 </pkgmetadata>
diff --git a/app-text/xmlto/xmlto-0.0.28-r3.ebuild b/app-text/xmlto/xmlto-0.0.28-r3.ebuild
index 21e100a54846..6b8268c5f689 100644
--- a/app-text/xmlto/xmlto-0.0.28-r3.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r3.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils
+EAPI=7
 
 DESCRIPTION="script for converting XML and DocBook documents to a variety of output formats"
 HOMEPAGE="https://pagure.io/xmlto"
@@ -10,7 +9,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="latex text"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
@@ -28,8 +27,12 @@ DEPEND="${RDEPEND}"
 
 DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+	default
 
 	# fix symbol clash on Solaris
 	if [[ ${CHOST} == *-solaris* ]] ; then
@@ -41,5 +44,6 @@ src_configure() {
 	# We don't want the script to detect /bin/sh if it is bash.
 	export ac_cv_path_BASH=${BASH}
 	has_version sys-apps/util-linux || export GETOPT=getopt-long
+
 	econf
 }
diff --git a/app-text/xmlto/xmlto-0.0.28-r4.ebuild b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
index 0659a3d55d97..d56b7a4beafe 100644
--- a/app-text/xmlto/xmlto-0.0.28-r4.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r6.ebuild
@@ -3,21 +3,25 @@
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="Script for converting XML and DocBook documents to a variety of output formats"
 HOMEPAGE="https://pagure.io/xmlto"
 SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="latex text"
 
-RDEPEND="app-text/docbook-xsl-stylesheets
+RDEPEND="
+	app-text/docbook-xsl-stylesheets
 	app-text/docbook-xml-dtd:4.2
 	dev-libs/libxslt
 	|| ( sys-apps/util-linux app-misc/getopt )
 	text? ( || ( virtual/w3m www-client/elinks www-client/links www-client/lynx ) )
-	latex? ( dev-texlive/texlive-formatsextra )"
+	latex? ( dev-texlive/texlive-formatsextra )
+"
 # We only depend on flex when we patch the input lexer.
 DEPEND="${RDEPEND}"
 
@@ -25,6 +29,7 @@ DOCS=( AUTHORS ChangeLog FAQ NEWS README THANKS )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
+	"${FILESDIR}"/${PN}-0.0.28-allow-links.patch
 )
 
 src_prepare() {
@@ -34,6 +39,8 @@ src_prepare() {
 	if [[ ${CHOST} == *-solaris* ]] ; then
 		sed -i -e 's/\(attrib\|val\)/XMLTO\1/g' xmlif/xmlif.l || die
 	fi
+
+	eautoreconf
 }
 
 src_configure() {
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index fac6915ebac4..c60448ec5c3c 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,5 +1,5 @@
-DIST yelp-tools-3.32.2.tar.xz 211668 BLAKE2B b45aef4d03f1954ac33bb05a9c788af40a74d76b54c2a0bcc466098e18435e02eb40004465dda399eb74e986caf404e51a393974d37ef1abeff6d76289840ecc SHA512 c9383426b854ae46ff4587bef07955541de3026f845025f9e99ba095cce11ff307e23d00d07a2da8763bcb6f9f061fc610351170e2abd99b5669912463729a85
 DIST yelp-tools-3.38.0.tar.xz 213692 BLAKE2B 87da439f864df8be78f8c2ae3fae387e9d70a5dca7f4ad6b584602fd4a6beec49cf0403dd7a53045d38cfd1ac6945802032689092f2624ba8b421ab5d4d43fd1 SHA512 2042e37f8efbe9974f5a507910393b837a0b9154beb918a5e8d145205fb519c8244bb405cf328ff5014287086be5b6d33ad631951bd0e950c2ad9efc60065d59
-EBUILD yelp-tools-3.32.2.ebuild 630 BLAKE2B faa9e31442ff615884c3ca248a90a6796bbbdf8147672f8ce454272b01732d5f99641f187cb9663eb99007b23a8c7f0988b035a30feeebfd207ad7aaed8564c5 SHA512 97d6b8a3375edf5b61040840fc634728a331216aa1c13663eac5faa78fc4910769093182ae75f1872517e3613470414b04eb9ff32e72c6672a705b0f2fd42abf
-EBUILD yelp-tools-3.38.0.ebuild 649 BLAKE2B e1329d0a99b59a162ee131951fca364ae8c0d06d268e679345ca5aa4ebf64db72bda30ac9ef602501df6a260811d94ae829740b7e0c9aff8dd40d5806434599c SHA512 5ac6c7ba744b579a995378c9cbafc8875eebdc84c77645bc594d53f698c8232c027e2669cf9dd1c9901d09fedaf9915744317f880ef639e35c6e91c7657b345d
+DIST yelp-tools-40.0.tar.xz 38708 BLAKE2B d9533fefc6a9416ed6f887971db62a7db6baed4f65aaf1e03d20c98fa23efb3af9f10189af0284bde3837f58f662f4ca4be8275d597a7c799a14585c87e6ec10 SHA512 b89e514cdc2c6ff96097af0cab5694e9f1dfd2a125e08f99a69c0e7dd51e1e1a859c2e6eec656ecea6103bfc65733e1256a77ef992454db4a554567b46fa2628
+EBUILD yelp-tools-3.38.0.ebuild 642 BLAKE2B a513dd1e389863f653724f48fcccd262e54de3b81bfb01eb80d3a94c3a0ee286e1ca259b6917c13adf47f78a05dac2c841582ad6a8f62af1ef36b965add177d6 SHA512 549c5a7942fee9c90764fb94a6f4de995cd83832947eb666688b9d38577f6290743f20c7e5eff5423a039bf75f90e84ea83a9bfa3a488dbab64c14df38066dee
+EBUILD yelp-tools-40.0.ebuild 937 BLAKE2B 3ff5912b3c2af461227851864e2d5921144cf72a123e32b05f5568ecb04051eaf5a702b73149e16f77653aa434ddbb399801c826c3c65127c6fa03b52b17e8f0 SHA512 ececf944929eff36735b464369a6d5c2d0befdd7d85792dc143c4956ec6cdbb7cac53de28079aa4ea2b240d9361e2142697325d0f038b0849b8a5e9dd038195a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
deleted file mode 100644
index 97eac351891b..000000000000
--- a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Collection of tools for building and converting documentation"
-HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
-
-LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="
-	>=dev-libs/libxml2-2.6.12
-	>=dev-libs/libxslt-1.1.8
-	dev-util/itstool
-	>=gnome-extra/yelp-xsl-3.17.3
-	virtual/awk
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/app-text/yelp-tools/yelp-tools-3.38.0.ebuild b/app-text/yelp-tools/yelp-tools-3.38.0.ebuild
index 9a58cc782f4c..cc554efa4982 100644
--- a/app-text/yelp-tools/yelp-tools-3.38.0.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.38.0.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/yelp-tools/yelp-tools-40.0.ebuild b/app-text/yelp-tools/yelp-tools-40.0.ebuild
new file mode 100644
index 000000000000..89f69c203b36
--- /dev/null
+++ b/app-text/yelp-tools/yelp-tools-40.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..9} )
+inherit gnome2 meson python-single-r1
+
+DESCRIPTION="Collection of tools for building and converting documentation"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
+
+LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
+	>=dev-libs/libxml2-2.6.12
+	>=dev-libs/libxslt-1.1.8
+	dev-util/itstool
+	>=gnome-extra/yelp-xsl-3.38
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_install() {
+	meson_src_install
+	python_fix_shebang "${ED}"/usr/bin/yelp-{build,check,new}
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /app-text
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)