gentoo christmass resync : 25.12.2020

54 files changed, 282 insertions, 403 deletions

diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 7d6ed9374e26..71364db1e341 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/an/Manifest b/app-text/an/Manifest
index 1456edd88eb4..47f6e94f2d49 100644
--- a/app-text/an/Manifest
+++ b/app-text/an/Manifest
@@ -1,6 +1,4 @@
 DIST an_1.2-6.debian.tar.xz 4432 BLAKE2B efec93daf46b30369aa5d6a6bc57b9e79db7aabea5d8cb7ec9305775bf05c693c3b2ea428c09b99b2350f8a168e2b7e810538d78c321b11a64e6ca804f56feb8 SHA512 33cd93ddf1dea5f1a8d94695dbf6fcfbdf58830c11be1d6c83e516f6dc6d11adbe0cb196c98ec094887021575adc68aaa667222d3b10ed40e87e55a5422deaf2
 DIST an_1.2.orig.tar.xz 13196 BLAKE2B bbb19eb16e558f8fc3d331e5ad308611b13a7a88a65fb310b678bd21d46c39761747fb6f60a7eba99a1c2e756a8c9467543d26e97bbf7f9c93d17f66a4d7698c SHA512 919c525aa1215e3c1b2200c6820a357c6406c19b7447147cc4243d339c554b9892bea11797769df0bf96dd72c89f61bf3d977769faf9bc7f9edf609a7daeac3d
-EBUILD an-1.2-r1.ebuild 770 BLAKE2B f6ac00e6faf8e128ed85f7256fba39e6582cb976640cdc460ed4dee8fb0038b543a3d29e48d6c926cb6c85136626c0adf19970bdef3b642e4c67b88f75462df5 SHA512 618ae33718d53a0702798933fe3ee2c14856f76aee53682ea60c2baddc7c28f4800753cdc1f61a21cc9097824716d1d2237291d306d6642fbdabd4755299b226
-EBUILD an-1.2.ebuild 719 BLAKE2B 89ea6d80bdb55f99dab24ed234bc86ada3ab44202285b5d382c737bc42db8529ee19da1fb5c4f4aa120b95d0829f7bf5d384a5ecb21ff2600d19a358c11c75be SHA512 774b56f85bc3d9812e5824551f83aebca3d08e34e0857030cca8b378f57ab5032d6a6f5f1f0bc6b766df0c2b825b0cf91e30d259e4f6fb772ad374cc4b447d1b
-EBUILD an-1.2_p6.ebuild 896 BLAKE2B 736c8b5f6c55d53ec9f0fdf6ec64811c4675c93c589a16f893316652601ce8a55d7d8a3ebd4758a3284802fe87c998c457f8dc49173b6f8a49f1bb73b81d7bbd SHA512 d8ad5c1efe19fdfd62af91cec771305e30da5babe1ce8f7a69914ec8a77c579ae66e71428d4057596e5bbd76d851f1b4b982d37e609ad63b454052ac00d1190f
+EBUILD an-1.2_p6.ebuild 895 BLAKE2B a41c2defb718dec2a9eb010fb44666ab0155f583ad440d8d972b6b1d74bb1853e79ff78009c5b3d4a8b5f8425470be1252f2f388a5424fa109a88cd2a0ab96aa SHA512 0c162481f05fff1ca7b3fb6814ca71b6d862e2bbf5162099ce1127cfbf3b7f6252e523d30af2a56cedbe091f3d1b2eb3a176f77594e6b945a3fd83bdd7743b57
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/an/an-1.2-r1.ebuild b/app-text/an/an-1.2-r1.ebuild
deleted file mode 100644
index d9c01423a53c..000000000000
--- a/app-text/an/an-1.2-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very fast anagram generator with dictionary lookup"
-HOMEPAGE="http://packages.debian.org/unstable/games/an"
-
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
-
-DEPEND="
-	dev-libs/icu:=
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/miscfiles[-minimal]
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CC/s|:=|?=|' \
-		-e 's|$(CC) $(CFLAGS)|& $(LDFLAGS)|g' \
-		-e '/^CPPFLAGS/s|-D_BSD_SOURCE=1 -D_GNU_SOURCE=1|-D_DEFAULT_SOURCE=1|g' \
-		Makefile || die
-	tc-export CC
-}
-
-src_install() {
-	dobin ${PN}
-	newman ${PN}.6 ${PN}.1
-	dodoc ALGORITHM
-}
diff --git a/app-text/an/an-1.2.ebuild b/app-text/an/an-1.2.ebuild
deleted file mode 100644
index ee3b460ecd60..000000000000
--- a/app-text/an/an-1.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Very fast anagram generator with dictionary lookup"
-HOMEPAGE="http://packages.debian.org/unstable/games/an"
-
-SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
-IUSE=""
-
-CDEPEND="
-	dev-libs/icu:=
-"
-DEPEND="
-	app-arch/xz-utils
-"
-RDEPEND="
-	${CDEPEND}
-	sys-apps/miscfiles[-minimal]
-"
-
-src_prepare() {
-	sed -i \
-		-e '/^CC/s|:=|?=|' \
-		-e 's|$(CC) $(CFLAGS)|& $(LDFLAGS)|g' \
-		Makefile || die
-	tc-export CC
-}
-
-src_install() {
-	dobin ${PN}
-	newman ${PN}.6 ${PN}.1
-	dodoc ALGORITHM
-}
diff --git a/app-text/an/an-1.2_p6.ebuild b/app-text/an/an-1.2_p6.ebuild
index ec08966bef24..3f1f44b3d2bd 100644
--- a/app-text/an/an-1.2_p6.ebuild
+++ b/app-text/an/an-1.2_p6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 hppa ppc ppc64 x86"
 
 RDEPEND="
 	dev-libs/icu:=
diff --git a/app-text/blogc/Manifest b/app-text/blogc/Manifest
index 6afbe666b7c3..a7ea0f7d5098 100644
--- a/app-text/blogc/Manifest
+++ b/app-text/blogc/Manifest
@@ -1,4 +1,4 @@
 DIST blogc-0.20.0.tar.xz 347924 BLAKE2B faabb51237ff4ba3b431b84394cb8ca6f977770f9ed8c1ffbcc841773dc707b9a51694d7a5f3dbe5c573bdd7a16971004551b8ae2c0347273d8c246ae329bd82 SHA512 3738eb23341deb755dbfb0d2e98a73fe53f0e38b929606ebb0a3210d0564a626375d5c20ebff220e63be1f61299492da9061db5366d9d53a28f7ff18cff678a5
 EBUILD blogc-0.20.0.ebuild 1081 BLAKE2B 8ab3d7d1170f6c9119463ac8297be1dbb40d03326a3dd326014358a07f3b1b5f46618b8266f0b2488e171d37c23b2093552e9fddcc72afd8b53ace29a255eedf SHA512 f36cbbdb143b6a536f136ef84ce2b137afda8131e6b77addbe431fbef4af229325030d95a4ce54e9ff4523d41300f1487737e81f8af46fb12c6b254f98393c2e
 EBUILD blogc-9999.ebuild 1081 BLAKE2B 8ab3d7d1170f6c9119463ac8297be1dbb40d03326a3dd326014358a07f3b1b5f46618b8266f0b2488e171d37c23b2093552e9fddcc72afd8b53ace29a255eedf SHA512 f36cbbdb143b6a536f136ef84ce2b137afda8131e6b77addbe431fbef4af229325030d95a4ce54e9ff4523d41300f1487737e81f8af46fb12c6b254f98393c2e
-MISC metadata.xml 635 BLAKE2B c6eea4d41dea75444a7a88ea7f8e9ec716465dfcd2db1f83c22b0a0b0ac85812e5211cda0480b6209270f78d1ce8a89584eaf75a9c620c5ccedb55b342993041 SHA512 8c60992b0d0d12556da80de2cf855bf74e44eecdf56f535a4b881305761c94902be189e7fe829f6ba940605f36d669f07030ca39360afe887348e31a8d08e828
+MISC metadata.xml 545 BLAKE2B bf387301e509f40e7c88c80a5037a7d565b36877ad8c477fc7282d51a80ad47e67406fd924c5d0de92c9b6748f4ee93e8e1a83b93c3e9fe68b868337c415e370 SHA512 9b3f2c1ce7eeedef493399cc554eccc51cbe18a81cd87a359fceeecd15c89825a91c09f79ac63d7692fce7c4a319d6c6e5b39f5ecfca2cb2332f756a9fe2ca38
diff --git a/app-text/blogc/metadata.xml b/app-text/blogc/metadata.xml
index 410777d2e89b..a650b4e025bd 100644
--- a/app-text/blogc/metadata.xml
+++ b/app-text/blogc/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<maintainer status="active">
 			<email>rafael@rafaelmartins.eng.br</email>
diff --git a/app-text/crf++/Manifest b/app-text/crf++/Manifest
index 8245488c42bc..23af21699868 100644
--- a/app-text/crf++/Manifest
+++ b/app-text/crf++/Manifest
@@ -1,4 +1,4 @@
 AUX crf++-automake-1.13.patch 216 BLAKE2B 129027abc820acf499b9fd49ea152f0d404c458af0584c0f7acc3dde6a02c46f1f14f96321b0ea7e2d00e9345276e8bdefb2206cc475772e5c23890143c78d0d SHA512 5bd02a0d3f67e37d544255984341beda8c958e5f76ce51521fd2157eb7dc70dfb1d43d30913e4d02e7dfe21526f04520f6539e28a58beed6e577a31b5d4a16ca
 DIST CRF++-0.58.tar.gz 790570 BLAKE2B 8fdd3fea3e30f4196560e2e265519c961739aabbad75e9805040a8f7da0f501620d6bb2c4f589c6d0c8bb79af5c8f46bbe27b610a4ec6a0db632fef219ea5b46 SHA512 676b3e9ed89b5fb2f246175b58c384f10cab09fff8329c07311fed3832f55dbad26a25d2946c9efaa75cd8026517cb9e1742bb70ca26187367747852073e4eb9
-EBUILD crf++-0.58.ebuild 1132 BLAKE2B 492069839647de056b2e97944b65124a404eb85ff8bba2c6031c3442b31d3ad6f706205f885cf475084780d1324dc76b89113fbe7be40ca79a5c27a04e878200 SHA512 e73081e26b8da54d90c4d8f587c85ec618f640ac7b2bcbb425f55fc9316968d1d62b8a30ca832950ce49799d9e3f5d840011087a7eb62e31ad195720dfd18ee3
+EBUILD crf++-0.58.ebuild 1129 BLAKE2B 03f4411757b8e2bdac0c7b0589babe60d0ec61a51b9af072be4cb6339ebcd4c7ebf7b8c6fbcc957ea8065a1ae65865ca94db2fff489ba1c7f67e00799eb0edef SHA512 0c867ebdd6e85e31e02b0f3d145226b9804f33e7eb3128c9902ba5dc43d29a0ec5937ac759e9c6d51234329c701a38a93ac75e34435d2b8735ae50612077515f
 MISC metadata.xml 669 BLAKE2B 12280d15998c56ac4c2e3bd3e80fd2a22eb150b979836d8600df3d5a36008807f0cc7fd91b84cd3717c379c9ca603ce110a88c3f86b48e29be983f99faa1b6a0 SHA512 d479bf4332884e2dfdd57b6c496b585f7e55adad2200dd22684a9fe6f1cc1c69049fec20d3ee0683543119c4f4935c83cda7d6a501b44e51e612249283fda7f3
diff --git a/app-text/crf++/crf++-0.58.ebuild b/app-text/crf++/crf++-0.58.ebuild
index 6cd0e8e99953..006c97d4b825 100644
--- a/app-text/crf++/crf++-0.58.ebuild
+++ b/app-text/crf++/crf++-0.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
diff --git a/app-text/dbacl/Manifest b/app-text/dbacl/Manifest
index 52eaf21ba80f..d777932b3fad 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 694 BLAKE2B 6830add723a5c24766782410ad044cb9dca45103e6c3d66bee56e0a40b6bb00e687c77b4359769dc73c66ab4ef062baa4bd41c4ea3b1c71fbb85a18e2a1e6782 SHA512 972e3f250a90661ca951c9dd866d8447af1d4aeebb4b8bf9a0bd60b43773205d2f6f1b1fab93ed561e5328233be12505178f73484275e86dad72e7cb18d2475c
+EBUILD dbacl-1.14.ebuild 691 BLAKE2B 76eade783235f2e18be637389418723f932e7c8ac3f6c5487fe8ef1b4071e505f6b20c342ede3a47393f6c2d766126f772a72c020f766fb87beca21aa2c75c4c SHA512 f1e641efd5c91738768db14ce7609ae25dc9ac686b25f772f6b97215a654a379d9952bd034111dabdda8e4053b6445ceda8855ff585edce7b70b3f753e108079
 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 68d1cda31eb4..ff1c35d70389 100644
--- a/app-text/dbacl/dbacl-1.14.ebuild
+++ b/app-text/dbacl/dbacl-1.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/app-text/diction/Manifest b/app-text/diction/Manifest
index c4816dbd3ff2..55e1669cd3b4 100644
--- a/app-text/diction/Manifest
+++ b/app-text/diction/Manifest
@@ -2,5 +2,5 @@ AUX diction-1.13-make.patch 367 BLAKE2B 1b29ff3455dc455210dd1277281b175292ead12e
 DIST diction-1.13.tar.gz 145971 BLAKE2B a70a198f356d9c92813d2b60b02e703a61dbefd5968314058a2538e77929f1fcdfb72d95a827ceb539770fdaf0f6d7a0f67e4318524463e24ae3eeeb31edf475 SHA512 f410f9992adcc362bc60f3e39e85cc07df5763623729c6d599538707aff0831e8cde59d80bcd384975d75229d6ce1cae9bebdf6eb3d4a7203b22d2a1773df039
 DIST diction-1.14.tar.gz 147268 BLAKE2B 12e4a56aa6429bb155dd08a0ba01438f79b69ab9d2a990a3d9c2d12e1eccd15ff7c09d634d399f82d09c97b24586e4586bd6521153ae071b3192dc7a3ea10102 SHA512 db704f3c01883b24ce01c5aaaae9a615418e2cfbf851b7f11a4357c853299caf666483e309d84217413732b7abd1abc44f0bcb3dc960b64adfdfa19121607ce3
 EBUILD diction-1.13.ebuild 560 BLAKE2B de58eee9a39d247850564a0699969c8ca6500338f2d047925d182dfb4b85f15c285f2782d3c0e1e497af333a3c314f707e0ef6a74c67d1df0d25b726d2f132e4 SHA512 62214b2d75940fd215871d7d3eefc0adc3198a178e1eb4e0376999f8dc484f5f9d3094495eb128140e3f7b333a5e39820ce665402f19fa25f4d9e884caf45f24
-EBUILD diction-1.14.ebuild 534 BLAKE2B 856fc77f1a7522509164b97e65fe1787265298f2fa52738cf4389f54936a44baba57b00062028d5de7792d6c8ecd5b9623880ef4000489ee9c653e69cab5a6d8 SHA512 d2209492c2a6ee191504bae3d2c98f4b1a2d3c8727eb9984e92e7361940d7c588538b06af7a0a3bf5a2380f9043f828c0ad04da2caf874a6025f9c1b251992e4
+EBUILD diction-1.14.ebuild 533 BLAKE2B be737206ad5f63b272c1cbb63c2c5a16c302425579fe99af07370c74334c6f657f0c404a977dd662430778724127556735dcf7ff68976edb86afacf0d5189e73 SHA512 5fa2258799fc31ccd0efb0a1ff7a19b5ea494985404ea85a0c1aa44f36c8f4430ea75cca0ec16d8548eceb37b395ca7ac4c38f0d0f655b324d706ce4af99c483
 MISC metadata.xml 901 BLAKE2B 5643435f17fdfe599f47305f23c4ccc9b6430a5b5dd8fb9344fed92b760e9715c3aa30adf4a99c02543dc173e07b8e6ba233f4a0389c5d006b3d22d955e6bf34 SHA512 7c48abbc5a289f52d53ea115427794db393fadf18d875edc2419efa2d1426e425adcb955ba3f19790928e21c071cd55327fbfe006f2f5bb571bfd5be12b79b57
diff --git a/app-text/diction/diction-1.14.ebuild b/app-text/diction/diction-1.14.ebuild
index 9f39fa67f731..10e5903d6fa5 100644
--- a/app-text/diction/diction-1.14.ebuild
+++ b/app-text/diction/diction-1.14.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.moria.de/~michael/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 hppa ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
 DEPEND="
 	sys-devel/gettext
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index dabf4d762691..fa9913a29041 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -21,5 +21,5 @@ EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1242 BLAKE2B 17b909bc422758d17dacf948f31f6
 EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1253 BLAKE2B 48e913aabf0307702a1c1cca1be62f0e1fa35ea2902e9f06c584201cc69547cda776177bdd325041562e693e80a4ec94fd4310d0d1cf6a06a216607622776a67 SHA512 ff8d5fa3ba1a5497d29613af4fb905ab6c41fac7f6a6c8f23aa453bddd765899ce436c8c5e1c0b96c09295f456b00728d639d896fbf8f3b54cf165a07bce2377
 EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1238 BLAKE2B 9ef6216a5c8c038ede683f04caefee257a2b0504612d01da8183dcbd6559eabff7070365cd226c0f0624b33df543c7e6b272fa3371b50ef93426d87e519676b5 SHA512 d51d3d59c9dea06007e960b72e98b59648ea37f6186d87edeecba737c7a6f1adc8a8abe71b72d46d263c257cf774eacfd9dd052d50013d546ca9abd22eeedf4c
 EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1238 BLAKE2B e702894a034794674ead6467c9a4850f4b1dbbf532847dd4906e4c88ef5b7167d7858b9696cc59b82fd1c346b5640dcc713ee846d7618f5e076b02640ceb62b7 SHA512 572ef029ea213c84ffadbccfad022b457b2f5abf5f4cd70ee4f238f8a128e0e311bf02add6bd9f254a7a22dc5ed7b4bc596a93c652211a8db37ae9ccffd3d6df
-EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1234 BLAKE2B 1841bf91d8f12d2c1d8828b6e32661f5901013374af3ed6abb07ec910487be68aa7260c7667b49a05b2ba3b518c3c436d8760bdd8c9634019b9e8b44c4e8dfd0 SHA512 9b4c2d6c08f6e7a0e96af0641c965862d80dfb63553687e7ca90c7732cd978dde8ea1bdbe0d98b0fbf442942b0205ac36c8c55d03a062ff674496cd8da7ad3b9
+EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1241 BLAKE2B 63d92adcd75408b9f919cb45126d7a571a8b05c01b34624d26a94462282ac9bdf761dcf2114439689f28b69fcd77b82d90ef570055c6acc77fd61a39484ed1f9 SHA512 9bcd091519ac14f7e2e95b83c9fa2632ef6a1ba7d078f388156a9052e2825d4a9551f5006c3a484e3b05ec20eb6b8acc9558f772096ecf7e8f80f922d2c072f8
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
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 f67b00a8c3e4..ba58a5e516b1 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 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index dd605010c312..068ee8457932 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -2,5 +2,5 @@ AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2db
 DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
 DIST dvipng-1.17.tar.gz 171049 BLAKE2B 7165135d818aa399d051977908bf7865774803127312fec515284bd72c4f9e88ffd7f1f7c3c8f1b5adf324fdbb9ac8d039582ede2398123db6ee7655500ac32a SHA512 b56faa6f2b24572233e1f0d9b74122b3bb7fed22cf47c9c05f5530691854dffc9a1953b51803f7d539f9a9de364160d557560c68c369820212837bdbacfb80c7
 EBUILD dvipng-1.15-r1.ebuild 1296 BLAKE2B 50bb4592f8ee749252bda8785b52834bdbd28d9c25e4455a919472310e57c4e3617d7f8b5a7db8df21dcde2a86b9452dfbadf38c165d482ad6020eed2af8547c SHA512 9e89d5e1773cb593936064fdb02b59edd917c74b54f9941a7d9ac3d698d35d27690dd6cd6956b07fafff27d6cdc18b88da4808c4517b811b2c7304d4ca466189
-EBUILD dvipng-1.17.ebuild 1121 BLAKE2B 12ffa5ba1f817099538fb278900def950b94d371c7ae058bc15d8bfc55852cbbec536901897ccdf9732da0c2190d932e45aad14febfebbe91c83a5f69e6a73be SHA512 5e01cb8cc0bfbff5a7cf08671ef72ce40731a136de7263c5428b5856e63c756cf36b9cd625fdb48cad9cbc744fe7a8c784c49e20190b6032938eb7fbbeaa5ae3
+EBUILD dvipng-1.17.ebuild 1114 BLAKE2B 319764d1578b4d31c78e9bc30a35e671a1c0c41a019997bc928b48b9749c66084dcad82175daa4fe904792d6d20e7bb8d1a1c746b42f40222727382a1ae87ccc SHA512 72980cb4001b3d3b4ea72f2eda4e3b661f73577d15b9795de606848055d90d7746357cb25c4d8945972f99d519a4f4351e7a9c48015e7540696e1f8ca219990b
 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 8143ed496cef..8a5a35b55006 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 ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="truetype test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index bb5940c525c1..e38b2afee139 100644
--- a/app-text/epspdf/Manifest
+++ b/app-text/epspdf/Manifest
@@ -1,5 +1,5 @@
 DIST epspdf.0.6.0.tgz 352989 BLAKE2B 633e2ed29d8ec28f679b00095d335cea4bd1996cf6fdf3950b97084a73044eca9371ac6964ad48e98ea8ddba38d91acad2137ee8d3122ea03df3ce25f08196ce SHA512 44a7015fa0b7298429567e998068864419fd396f6b0781bf7877c6599d3bb2f254b7a0f976500655851a95d727880d106d9e1df9086306eef74db0b109a63506
 DIST epspdf.0.6.3.tgz 335975 BLAKE2B aacd6e222bfe74636dba796fd6e878fa9970f469d096eb77acf4a336a0ab5620629de7ba1c763afa62b181887724db55be57d1929a041a945c7d74ea3028d6de SHA512 ddb0d8c17b6b0bbb934312e6253a2b689d2545c892af989efac9782022c501109f2ff57bb2ea7c26d63d7747e2a510c18bd22a6076bb7137fe0252c38b2125ea
 EBUILD epspdf-0.6.0-r1.ebuild 1258 BLAKE2B cb0329c1fa96eb8ea1c66a58fb6c0941abaf76a8f724ad86ad5813f98fa616591e4398ac36820fa8f83d8b11c13a161ae4289d7a5d192745edd78312208b7437 SHA512 cb07774f9cf78f5b3d81770b8bf26cbcdbe08d170d12700c2d28f7022d150bcd0d2a88d4cdc4089eb981a68fcfb4e4bad54763aa248e700a4e74ca9cb21cf52b
-EBUILD epspdf-0.6.3-r1.ebuild 1358 BLAKE2B d6594258630b816ee6959987d4d067a5a98080ee23a14e8a35f7ba43b39b5a2a8ee18b7cf8d30982078ad17613ce862657a3ded7081a0a2e57ec0ac45cdbd0a6 SHA512 e47231590a72a057dcf14c2f12545a3a8f2db04dcd1667a04e982c95d48dea29c23376520c3594d48efc1fe7f13045f7dba02bffc6e7d7a8da0947b6baac9e71
+EBUILD epspdf-0.6.3-r1.ebuild 1354 BLAKE2B b7b83c09148edd7f4ed57af4b02ff86366bc2d93e5fdff9f2c52ffc0373100c8de664a77de0dc7d80a44ff3938a6426a64b59f9ab16d298213799a1e2da926b8 SHA512 f0b75a6cb7af7848eacc57dd2624b348d657f3166d82732b2fc1c11e1a73ebf939ca1606d521bc702e037c9a91794b0abcc41953697f990d74c1fcfe3abbc435
 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 c241216ae0b7..3343af326070 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 ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc tk"
 
 DEPEND="sys-apps/texinfo"
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index a657f7d42503..4ecf9594e19e 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -5,5 +5,5 @@ DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3
 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
-EBUILD ghostscript-gpl-9.53.3-r4.ebuild 5242 BLAKE2B fc423d68ca4014e41939c1552dd02aaac2f59c81bc183711b08f631358d32853c9516775eba795d9f25475bd93a9473fd7219f82c8af4e2865d59ed7825d8883 SHA512 0785cb794d33caaf17eaba3bea43b41c2838903e0398961aa8bd4d59dfcc0c24d841cc217aef80df56573dc395140477d5bdc243d541e8a042abe39176b7da22
+EBUILD ghostscript-gpl-9.53.3-r4.ebuild 5237 BLAKE2B 68d98e9801e88d18bd549f57aacb26af3d34834e1d12c0158f8811d7eb977b60389581f523d6f3a756a5be5653172419abbb610d5f9910099b5701b8fffc6467 SHA512 f242179908dcc4d7f10902e60ec4e35f52ed0726790c53928165f3e4d3f928c38dfa76d1471bb89f7fc6daf4925c553e393a358f54aca31e30f16c8c46feb5e3
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
index 48026e1b987b..7551704f99d4 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 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 ~x86-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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cups dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 8bf00b5ac5cd..a5def6d0c799 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,5 +1,5 @@
-DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
 DIST gspell-1.8.3.tar.xz 421468 BLAKE2B 70a8c0649a9f1f0d5e1bbc170734c6ce7aeb4875ed1cca52c4c582688c56553ad2363b9fed732c504f3ff6bc33d994fc4ba12cd3754e4f3b602be2a2015144df SHA512 4116231fdfb416e70ee34c73e0ecf81f0071e81ad477135e3c1e270534dfe4be20c7f45e316e13d33c79944d282ed3223251122983a0f3199ea57c3431a24c1d
-EBUILD gspell-1.6.1.ebuild 1028 BLAKE2B 25d57e53d1d585b6ff94537ce7d65c079a66360fe11c5162c36d667ae1d59c03dbbb263b7a78a284a273513b43b6dadc90bbe8afa6dc47fafe9f1456a5d74b15 SHA512 25c33395a415b0b0207d6ed944729f424449ec45fbbf0eeda804778d3221bec6197e3f4d90181e46ac10ede0b3e5817d6cbf5134d60e8796c16b91a6fea5d2ce
+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 1480 BLAKE2B 1033489ba41997af757377589f1922c7384c5b69048b52e0239cc2a3845b6bdcdc6f1b499cfe379346473d0399db810f3df47c7af6b5eaae6b1330ef5a40e8a0 SHA512 e29f3b1325a57bb9732adfde8fec6101f7e0a5ae4cfcbef710cbd2d7d41eca56a5831bdb732a5397ecfb5f6f62ff326b54a8fb6f3953019c19fc5c0ebd913d5b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.6.1.ebuild b/app-text/gspell/gspell-1.8.4.ebuild
index 108a5813d325..70eb544cba3a 100644
--- a/app-text/gspell/gspell-1.6.1.ebuild
+++ b/app-text/gspell/gspell-1.8.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,15 +10,15 @@ DESCRIPTION="Spell check library for GTK+ applications"
 HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="LGPL-2.1+"
-SLOT="0/1" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~sparc x86"
+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-1.6.0:0/0
+	>=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:= )
@@ -27,10 +27,16 @@ DEPEND="${RDEPEND}
 	dev-libs/libxml2:2
 	dev-util/glib-utils
 	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.4
+	>=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
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index d55f1f0f70da..bf7393831171 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,4 +1,5 @@
+AUX highlight-3.57-qt_libs_lua.patch 334 BLAKE2B 6cd387009986ef29f309dc52668f08c404ca7f744c8d1c6d1bb8ed47a392834f4ce9c8474397c4294fc40633501d52754caa0938ea84d9b050800a33db46e5cc SHA512 db298ed4a12e90c8745d7307fd916dd73f3fc62bd306fec279d9c38973e3556425ca7b90759b03e645983c35de298b3d28e80bdcde5ece94b480ee32d7742a18
 DIST highlight-3.57.tar.bz2 1412857 BLAKE2B c0ee8189294feac3b5e8c6d356634d8074a8960f2010918de52f23515ad4a13626971e9106ecc6d2adbdb45e0ebb66ff60eb3cbe86d2449666e3424f1c0dc3a6 SHA512 a086f6b8c4a4fc0b6651d456b178350a6c59a32cd613451d81b53fe3294eb0f80d673cb64fb615ef91d6c4d4bbc8a57413aec2490d2a5ad67e695ec6e92b3d99
-EBUILD highlight-3.57-r1.ebuild 2800 BLAKE2B 0a31b7d18381d608fe24f9e7ee999aabe95398f7e75a6760ed4cf3f9fe1ae5b40b67ac32346223dbe45ec09e3f22ed24a54df518d04402f90f302c4f7147c2f1 SHA512 67c74eda4c2868cafe4e21a974ec75d8eb88f464f3f6b3d3e87ecb534bcfdbcb3df665e54ac9ff74d6ad1e6ff333445f43d1c064617ab23f4d5c1d099caa3ff6
-EBUILD highlight-3.57.ebuild 2179 BLAKE2B 361a74f80a3b8d9ffca9528b15a644911712ea3da02acb6afaf354a2900302aa25d7c5484e75c8e9327d61df2a239e630cdb526ebd1a9f45a8a022852ac4ee7f SHA512 b5c3296235114c356d3abcd187a12ef00cc3ffb0f374a009da088a085b9af9e27b08b4eaa68692e37e8e34156901ba7a953cf693cf5c2a58c13ebdbead80810e
+EBUILD highlight-3.57-r1.ebuild 2796 BLAKE2B 5f381d9e9fe5b6268e61c54e9abb5b67bf83d58caab1261f2c904d65ddda3455a5e0b453bb2c3a7a46461e28b2dc656c71c293064af1a15368d4205edc44faa4 SHA512 69646dd692daa9c7b458c489d77b8d372e7603b5a2809e3cdf49a55e5eb512e3f274054512da668f0dfdcb1c908dbc9a9da376f827259854dfb0d27f5b9ac7ee
+EBUILD highlight-3.57-r100.ebuild 2411 BLAKE2B 1c2e1bf90ec8614e7f15dc05ea0fbd8ce469ecb15f57d480ccf3c082a5b3213784a35adf95147de16b5993ad30f66cc2e4b7cb256626943f7a257974b3f887b4 SHA512 1516ac86f493d0fffd0e7d8de90d3ab044b7439bf68ec0cb7c1ccba19d255e1eb440b42a8505cf385973155badafa2fb1fc0bdebc76b018a544f52c145a80fac
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/files/highlight-3.57-qt_libs_lua.patch b/app-text/highlight/files/highlight-3.57-qt_libs_lua.patch
new file mode 100644
index 000000000000..02009164f4e9
--- /dev/null
+++ b/app-text/highlight/files/highlight-3.57-qt_libs_lua.patch
@@ -0,0 +1,13 @@
+Unnecessary (the linker gets the right library from pkgconfig anyway)
+and breaks slotted Lua. See Bug #761511 for details.
+
+--- a/src/gui-qt/highlight.pro
++++ b/src/gui-qt/highlight.pro
+@@ -39,7 +39,6 @@
+ unix {
+     DESTDIR = ../
+     LIBS += -L.. -lhighlight
+-    LIBS += -llua
+     CONFIG += link_pkgconfig
+     PKGCONFIG += lua
+ 
diff --git a/app-text/highlight/highlight-3.57-r1.ebuild b/app-text/highlight/highlight-3.57-r1.ebuild
index 515f2314f4fc..971c9675c1b5 100644
--- a/app-text/highlight/highlight-3.57-r1.ebuild
+++ b/app-text/highlight/highlight-3.57-r1.ebuild
@@ -11,7 +11,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"
 
 RDEPEND="
diff --git a/app-text/highlight/highlight-3.57.ebuild b/app-text/highlight/highlight-3.57-r100.ebuild
index f1f062f7d23e..4755abe9c040 100644
--- a/app-text/highlight/highlight-3.57.ebuild
+++ b/app-text/highlight/highlight-3.57-r100.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=7
 
-inherit qmake-utils toolchain-funcs
+LUA_COMPAT=( lua5-{1..3} )
+
+inherit lua-single qmake-utils toolchain-funcs
 
 DESCRIPTION="Converts source code to formatted text (HTML, LaTeX, etc.) with syntax highlight"
 HOMEPAGE="http://www.andre-simon.de/"
@@ -11,11 +13,13 @@ 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}"
+
 RDEPEND="
-	dev-lang/lua:0=
+	${LUA_DEPS}
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
@@ -30,6 +34,10 @@ BDEPEND="
 	qt5? ( dev-qt/linguist-tools:5 )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.57-qt_libs_lua.patch
+)
+
 myhlopts=(
 	"CXX=$(tc-getCXX)"
 	"AR=$(tc-getAR)"
@@ -52,9 +60,11 @@ src_prepare() {
 	sed -e "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
 		-i src/core/datadir.cpp || die
 
-	if has_version "<dev-lang/lua-5.2"; then
-		sed -e "s/-DUSE_LUA52//" -i src/makefile || die
-	fi
+	sed -r -i \
+		-e "/^LUA_.*pkg-config/s,\<lua\>,${ELUA},g" \
+		"${S}"/extras/tcl/makefile \
+		"${S}"/extras/swig/makefile \
+		|| die "Failed to set Lua implementation"
 
 	# We set it via eqmake5, otherwise it forces clang...
 	sed -e "s/QMAKE_CC/#QMAKE_CC/g" \
@@ -72,7 +82,7 @@ src_configure() {
 }
 
 src_compile() {
-	emake -f makefile "${myhlopts[@]}"
+	emake -f makefile LUA_PKG_NAME="${ELUA}" "${myhlopts[@]}"
 	if use qt5 ; then
 		pushd src/gui-qt > /dev/null || die
 		emake
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index a55effec85b2..5d413b536796 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -1,6 +1,6 @@
 AUX mandoc-1.14.5-r1-www-install.patch 637 BLAKE2B 2550351e29db19b43de500f039f0563af8a720ef3bf7efa60ac715ca956d7dd0d13d0e092ae2749e3a76fc456eacf0260ca6fc03d324e08bf287bd8d4ac56dbf SHA512 5ed589e1322a2bbd261eb56aee8376526b80cf72eb5eafbc6e2772018c924913db0fb27eb7a50ec2509640e03e41d11e88401f76293d1d4230e777e39056c9fe
 AUX mandoc.cron-r0 87 BLAKE2B 2fb4946dd2a9025f5bee78e61c11d77d6c6b9b32f9d17c11ea4f0d890e54b42817981e1cd4c568229927fd04bd0592e53ce18192f8359dded28be8c8690904f6 SHA512 74bdb16bc498d741128f1b6966afec8e21eb6899e26d20cf57cb0408ae6bdc63d75538dd355a21ae55593c359fbe707a56bbcdf6e78d557d4b53570db56fd6b3
 DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52
-EBUILD mandoc-1.14.5-r1.ebuild 2785 BLAKE2B 5a18292e498215ecd218eab33b390055320d325ca26a0a661a2b8c30efed2bc611b774595f16565d9e312d08e1c3f96e347843bfdd87fcb960383f723ff16fbc SHA512 99635990cf6f06768b4345e462779c8606c5ac0f4bbd28d3c172f7bb2b8dc2bc873b8a4b62766d2b752d1777b73f65bb392c7b0b18252d4d59707381ba301731
+EBUILD mandoc-1.14.5-r1.ebuild 2792 BLAKE2B ef7c7d491b369dd2071f8dcb0a532d2968182db8f21911c63d45e4a39b39a52cb573770ebee587ea376f171ea2419db110034aaab032f510656db59bff79f38d SHA512 9972596dd9afb8910c6d5bf9ff87f8ee61761cbda119270d1f148a5c0ea126e69e9a500a6aba223638d1949efe1a2e273b66d0bf618b509c65abd85266dae917
 EBUILD mandoc-1.14.5.ebuild 1727 BLAKE2B fbdad7247703bcea768dd034b2169f5183cf7ca644dad09335428356d83935d3ab4db2449d18e9c44d23b76c2d5fcfbdda4f6c09ec4bb5b81e8ca2732fdc65f6 SHA512 92be1ad119597580062788095aafb9fc951f8c55d1c368cc412b7afcff32476b01aa103f6f067c326d8a459b97e6071c8c79af8ef51482d5205fa27a743b1f42
 MISC metadata.xml 375 BLAKE2B 6b3565c3419b306f33ce9ad867319cee386b20c92743fe1a6565a348aca03d13133906d07f5aa10ec145d84645fa11894ad8abd73a6f65d5d0680ce03ef339d5 SHA512 1814f8bf92ec3500aba2e6a194a8a1b0e7adf53de5ac5408ef22fa42845b9c7270a27eea0061d77b5b53ea7cf77e9bfc75c865dc1d6fb661a5bb8412fb9cda3e
diff --git a/app-text/mandoc/mandoc-1.14.5-r1.ebuild b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
index e775602af4b0..c6058c164364 100644
--- a/app-text/mandoc/mandoc-1.14.5-r1.ebuild
+++ b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="cgi system-man"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/mythes/Manifest b/app-text/mythes/Manifest
index 6f98adfe2a54..b1052df13245 100644
--- a/app-text/mythes/Manifest
+++ b/app-text/mythes/Manifest
@@ -1,3 +1,4 @@
 DIST mythes-1.2.4.tar.gz 4910303 BLAKE2B aa091344aebd117618d90aa574ec5e68594782511e1aa85a2d46740ecc4ff2cdf1d9f9f6de9dfd454cc0056076bdb9a21ad14d2935e39e4fdbd7753930fda605 SHA512 a04da39812bcfb1391a2cba7de73e955eafe141679ec03ed6657d03bebf360b432480d0037dff9ed72a1dfda5a70d77d44ac2bb14cdb109fd8e2a38376feee21
+EBUILD mythes-1.2.4-r1.ebuild 565 BLAKE2B 450ef2c95319d20c6a30196a000898775ca29f9bcf16ed9a80f70e63e23fc105157baf2f7303513d6b3a671f3c54df7081d248d4f4a0f389d56c770c71131c0d SHA512 51d1c5df52f56a5f23ed7fba6883a158ee0e7c5499b8fd3a144dd07167f40147bce6a9098f0daca38fbe6aed51f782a7525bb499f0456f5ae643835ed215ce68
 EBUILD mythes-1.2.4.ebuild 593 BLAKE2B 9067dab7567cd6c816fe3abdb6ab6f1662a532c367dd4dd66a4905d00d9bb9d9d7be5d1706ecf492b8ee6a9ad917b0bdf5836ded5d324217b4942bc09a1b79ef SHA512 7991350823617b0a79698672629e475c740d959d9993d0adc942c40d6d4b05dc9a9194695c20de2044673655fec3d5920b7ca3ba927cd37444fb153a17f6f84d
 MISC metadata.xml 333 BLAKE2B 989788782df7e4531d2ad8a12b49eb19f8651468467ef9c2894163c9089679622ed1bc597336afb881ca85bf0523e7e8077c8060d46b6237e4ff5dfe16bc1c1a SHA512 1c2849146c40fcf9b1c352d57e9580ea7d9c2fbdc71c5cf601343e3beb9580876b6dc1d42d41abe01163d92c0eb7837fedf85fc3e7408801f0d966ccc8e78ba2
diff --git a/app-text/mythes/mythes-1.2.4-r1.ebuild b/app-text/mythes/mythes-1.2.4-r1.ebuild
new file mode 100644
index 000000000000..6b67564f63ae
--- /dev/null
+++ b/app-text/mythes/mythes-1.2.4-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A simple thesaurus for Libreoffice"
+HOMEPAGE="http://hunspell.sourceforge.net/"
+SRC_URI="mirror://sourceforge/hunspell/MyThes/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="app-text/hunspell"
+DEPEND="${DEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-text/peg-markdown/Manifest b/app-text/peg-markdown/Manifest
index 054f3125d361..221a0c31a3c4 100644
--- a/app-text/peg-markdown/Manifest
+++ b/app-text/peg-markdown/Manifest
@@ -1,3 +1,3 @@
 DIST peg-markdown-0.4.14.tar.gz 85692 BLAKE2B a52b894a03921595850d460ced20257096b5a4afb00fca5849c64f7506fd2f39946f2ad13bec50f5032610669bdb14d4f789ceb509b533040a90f228fc443879 SHA512 38e43b548b2cedf04fae87baf91c9e0767914bdb617ee4b6a3cbe950f8cbb0717c457cafabcff606501e889ac196a0aef94317f3bf85f5b88a2285f686b6dd5e
 EBUILD peg-markdown-0.4.14.ebuild 946 BLAKE2B 769b8c31dc317274d3a6bf0dda8671896ca16ff3b6d3961ef9c19a114ceedb8a99123f0f8e05396b6933361052fed42fad62071f0a2fea5211644f25787bdd91 SHA512 73ae050e4802e26b89e1ffea93b361f472cd2f4a438b76438328e571beab421337e632d29d3baa35e776ccb371df2d507604c93fd8637e4fc0568fa38183d04d
-MISC metadata.xml 338 BLAKE2B 2287ec19d83b0cfe1bb293855f47a6107fd7c1a0f076f2e405f6b07ca1c1ca42ef31f1047bc159e20996cdbbf682a46a3684b2a1fb0e63875638fe77d38bc02e SHA512 d95bbb5ca89e46c57e21d2bbebedbdbf9a103db6ee3f5ba01155d69c4d4e091a918fc9cd6dc6787918ad11075cb0160a9490a551475fe0100be57a08c8aea838
+MISC metadata.xml 248 BLAKE2B 7ddf3697339e74ac175d16fb1ccf731dc8ff6c0db6d848f0b8d51904bbfb025d6e98efa8f7805f2814d6007417521fae18599808ac35e4f97911168d17c9cae7 SHA512 6d524d79b42983177d572f1628dcaa6ca09a5e0530c4a80b8bda70ea0d893413d99ccd23dfc4aada2454a5e231c0791364ba4fc5403740a816ee40bcb6a95ec1
diff --git a/app-text/peg-markdown/metadata.xml b/app-text/peg-markdown/metadata.xml
index e8f120ba5018..e22fa2dfac69 100644
--- a/app-text/peg-markdown/metadata.xml
+++ b/app-text/peg-markdown/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>rafaelmartins@gentoo.org</email>
-		<name>Rafael G. Martins</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">jgm/peg-markdown</remote-id>
 	</upstream>
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index be47612bad78..2f40aafb77fc 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,3 +1,5 @@
+AUX podofo-0.9.6_p20190928-cmake_lua_version.patch 522 BLAKE2B b911b2ab2b35f5eccb58b32e575a775fe43cac1576831bb4e47d10c666a1e7040d8c01c865ee63ef1c3ff3c1a1feb2059dc25c71924b61995302dad21c32c868 SHA512 953f41b44468918aa96af42ecf3de8e3dd0d7721ed7c6283d8a6d44941caf70d9ef63d7d59ee1d94081fdc91a915ba8770bc335f8af5d60b24cd1f6c04698f6f
 DIST podofo-0.9.6_p20190928.tar.xz 747532 BLAKE2B 39d051e6adca85bf0f124e5d48e1ff88dc951d7c1b38bc76dc7e3640ea9c3f8a59c6ba9a9105a263234e94932e450bec12dde455850dbf96cd7eec3e69a1a28d SHA512 b9d46fb02eeba61190a0efd17b507bba62d7246af6fff3c3514c9970e99e085f9aad92baa05cc6cf0a8c3c2843554099c904bff10be54dbb4d4cb7de460fc3cc
+EBUILD podofo-0.9.6_p20190928-r100.ebuild 4846 BLAKE2B b61750e756ecb2bc82bac3d5efdfbd04f1086956de60c982f9c75b4ad02eecd11de12c13bd791a03c345adc48a187eb8b4c9739317b506a55ae4121f51fe10d3 SHA512 d6f532ddf3f86d1ae9658b3b7468fc10022edf905ec8431c3e4f5c7bcac0f34cb9387b94e542b3f0dd303cb6fb7536f0138604bc05433a799488fba2eaa36c4d
 EBUILD podofo-0.9.6_p20190928.ebuild 4666 BLAKE2B 6af9d14f8e2ad0d3c55d6f3add49d9f70322a189d25960e46b0ba3cb56105bf864b4a76b32a47febf74072a8a95c491997ba2ed3ed3c2e6bc2383efde706e241 SHA512 380a8ae526de4d43ad6bc4e7e6d444010855c2853239248daed8105a65bd9f97fd8e30f57219952a9a6fcc0b752fc575f9bcdf0766c04a3887a2c93877326e18
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/files/podofo-0.9.6_p20190928-cmake_lua_version.patch b/app-text/podofo/files/podofo-0.9.6_p20190928-cmake_lua_version.patch
new file mode 100644
index 000000000000..f178ae2a6c0c
--- /dev/null
+++ b/app-text/podofo/files/podofo-0.9.6_p20190928-cmake_lua_version.patch
@@ -0,0 +1,15 @@
+Switch from the non-standard upstream CMake Lua module to the one bundled
+with CMake, use only the Lua version requested by the ebuild, and do not
+semi-quietly ignore the absence of Lua.
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -433,7 +433,7 @@
+ ENDIF(WANT_FONTCONFIG)
+ 
+ IF(NOT PODOFO_BUILD_LIB_ONLY)
+-FIND_PACKAGE(LUA)
++FIND_PACKAGE(Lua ${LUA_VERSION} EXACT REQUIRED)
+ IF(LUA_FOUND)
+ 	# If we have lua, we can build podofoimpose.
+ 	MESSAGE("Lua found - PoDoFoImpose and PoDoFoColor will be built with Lua support")
diff --git a/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild b/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
new file mode 100644
index 000000000000..cf6bcc0de02b
--- /dev/null
+++ b/app-text/podofo/podofo-0.9.6_p20190928-r100.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+LUA_COMPAT=( lua5-{1..4} )
+
+inherit cmake flag-o-matic lua-single toolchain-funcs
+
+DESCRIPTION="PoDoFo is a C++ library to work with the PDF file format"
+HOMEPAGE="https://sourceforge.net/projects/podofo/"
+SRC_URI="https://dev.gentoo.org/~zmedico/dist/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0/${PV%_*}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+boost idn libressl debug test +tools"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	test? ( tools )"
+
+RDEPEND="${LUA_DEPS}
+	idn? ( net-dns/libidn:= )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	media-libs/fontconfig:=
+	media-libs/freetype:2=
+	virtual/jpeg:0=
+	media-libs/libpng:0=
+	media-libs/tiff:0=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	boost? ( dev-util/boost-build )
+	test? ( dev-util/cppunit )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.6_p20190928-cmake_lua_version.patch
+)
+
+DOCS="AUTHORS ChangeLog TODO"
+
+src_prepare() {
+	cmake_src_prepare
+	local x sed_args
+
+	if use libressl; then
+		sed -e 's:^#ifdef PODOFO_HAVE_OPENSSL_1_1$:#ifndef PODOFO_HAVE_OPENSSL_1_1:' \
+			 -i tools/podofosign/podofosign.cpp || die #663602
+	fi
+
+	# bug 620934 - Disable linking with cppunit when possible, since it
+	# triggers errors with some older compilers.
+	use test || sed -e 's:^FIND_PACKAGE(CppUnit):#\0:' -i CMakeLists.txt || die
+
+	# bug 556962
+	sed -i -e 's|Decrypt( pEncryptedBuffer, nOutputLen, pDecryptedBuffer, m_lLen );|Decrypt( pEncryptedBuffer, (pdf_long)nOutputLen, pDecryptedBuffer, (pdf_long\&)m_lLen );|' \
+		test/unit/EncryptTest.cpp || die
+
+	sed -i \
+		-e "s:LIBDIRNAME \"lib\":LIBDIRNAME \"$(get_libdir)\":" \
+		-e "s:LIBIDN_FOUND:HAVE_LIBIDN:g" \
+		CMakeLists.txt || die
+
+	# Use pkg-config to find headers for bug #459404.
+	sed_args=
+	for x in $($(tc-getPKG_CONFIG) --cflags freetype2) ; do
+		[[ ${x} == -I* ]] || continue
+		x=${x#-I}
+		if [[ -f ${x}/ft2build.h ]] ; then
+			sed_args+=" -e s:/usr/include/\\r\$:${x}:"
+		elif [[ -f ${x}/freetype/config/ftheader.h ]] ; then
+			sed_args+=" -e s:/usr/include/freetype2\\r\$:${x}:"
+		fi
+	done
+	[[ -n ${sed_args} ]] && \
+		{ sed -i ${sed_args} cmake/modules/FindFREETYPE.cmake || die; }
+
+	# Bug #439784: Add missing unistd include for close() and unlink().
+	sed -i 's:^#include <stdio.h>$:#include <unistd.h>\n\0:' -i \
+		test/unit/TestUtils.cpp || die
+
+	# TODO: fix these test cases
+	# ColorTest.cpp:62:Assertion
+	# Test name: ColorTest::testDefaultConstructor
+	# expected exception not thrown
+	# - Expected: PdfError
+	sed -e 's:CPPUNIT_TEST( testDefaultConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testGreyConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testRGBConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testCMYKConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationAllConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationNoneConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorSeparationConstructor ://\0:' \
+		-e 's:CPPUNIT_TEST( testColorCieLabConstructor ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# ColorTest.cpp:42:Assertion
+	# Test name: ColorTest::testHexNames
+	# assertion failed
+	# - Expression: static_cast<int>(rgb.GetGreen() * 255.0) == 0x0A
+	sed -e 's:CPPUNIT_TEST( testHexNames ://\0:' \
+		-i test/unit/ColorTest.h || die
+
+	# Bug #352125: test failure, depending on installed fonts
+	# ##Failure Location unknown## : Error
+	# Test name: FontTest::testFonts
+	# uncaught exception of type PoDoFo::PdfError
+	# - ePdfError_UnsupportedFontFormat
+	sed -e 's:CPPUNIT_TEST( testFonts ://\0:' \
+		-i test/unit/FontTest.h || die
+
+	# Test name: EncodingTest::testDifferencesEncoding
+	# equality assertion failed
+	# - Expected: 1
+	# - Actual  : 0
+	sed -e 's:CPPUNIT_TEST( testDifferencesEncoding ://\0:' \
+		-i test/unit/EncodingTest.h || die
+
+	# Bug #407015: fix to compile with Lua 5.2+
+	case "${ELUA}" in
+		lua5-1|luajit)
+			;;
+		*)
+			sed -e 's: lua_open(: luaL_newstate(:' \
+				-e 's: luaL_getn(: lua_rawlen(:' -i \
+				tools/podofocolor/luaconverter.cpp \
+				tools/podofoimpose/planreader_lua.cpp || die
+			;;
+	esac
+}
+
+src_configure() {
+
+	# Bug #381359: undefined reference to `PoDoFo::PdfVariant::DelayedLoadImpl()'
+	filter-flags -fvisibility-inlines-hidden
+
+	mycmakeargs+=(
+		"-DPODOFO_BUILD_SHARED=1"
+		"-DPODOFO_HAVE_JPEG_LIB=1"
+		"-DPODOFO_HAVE_PNG_LIB=1"
+		"-DPODOFO_HAVE_TIFF_LIB=1"
+		"-DWANT_FONTCONFIG=1"
+		"-DUSE_STLPORT=0"
+		-DLUA_VERSION="$(lua_get_version)"
+		-DWANT_BOOST=$(usex boost ON OFF)
+		-DHAVE_LIBIDN=$(usex idn ON OFF)
+		-DPODOFO_HAVE_CPPUNIT=$(usex test ON OFF)
+		-DPODOFO_BUILD_LIB_ONLY=$(usex tools OFF ON)
+		)
+
+	cmake_src_configure
+	mkdir -p "${S}/test/TokenizerTest/objects" || die
+}
+
+src_test() {
+	cd "${BUILD_DIR}"/test/unit || die
+	./podofo-test --selftest || die "self test failed"
+}
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index a0271ade2180..721e62116878 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -1,7 +1,4 @@
 AUX tree.bashcomp 847 BLAKE2B de05dacd7b54426e89e4afbbb6fba74376212a8f02995ff9babec369244bdb57fcb46989a437a100bf1415f7ecb8b0e142d729bae27f7fef6319de9e4cb06d54 SHA512 8df777721a7974015b5e717d89a4ff8701a2598e227d6cf71077fe498a5bb2a578c96c4667ab80e34b1064e109d38665fb6a4de8f52bb6401445088d5cdca922
-DIST tree-1.7.0.tgz 47082 BLAKE2B 07449f50a44f857733679ae92a54a9dd61fe19b282f9244534393527d5f344835864e2acff3b2c43ed406d65657568b21440044af21fed2c4ab623e88d2e396c SHA512 b234fb1428ba75da72d7e4aeb24bf961e123332342593e441b29a0baa2270d12bb187d889c179d6463c940c8dce9fe9dffeb4ad3f06cf11f057b83234d7b4b4a
 DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
-EBUILD tree-1.7.0-r1.ebuild 1073 BLAKE2B e3560608b4163160461ad68b090f2c572f5cdc261064ce8316d9dcde7f26dcd54dad5ec9e49a7adb30cd76320e970c28c8cfc1da86a28fc544f34c0218f9e94f SHA512 0aa47789f61b067dc8191b3193dc402019df557693565bca63e6c3bc774d85c203ddf2a1ba430c7e23ed7164bf44a647261f9912df9b2596fa492f475d067067
-EBUILD tree-1.7.0.ebuild 1057 BLAKE2B c95e3fa8698e8630923688de312f104dbcee472ce6acd4b6c4f055e44d8c4942fbd43510b48d06e54db65ce550eb936bd2e61f3f3ae44e06df8716cb47acbb08 SHA512 7109d3b42d21f02b99bae7ad5cb5970907152a6b8a768a3a3016fed1f392d19b721c3b0ff3e54d8d877834543818ca1a139d21f4a34607b77c42c5f6e735f293
-EBUILD tree-1.8.0.ebuild 1041 BLAKE2B ece993680e9263a6c1e93c0ffcdd7a508c2a05ad3e3e7f407930efc84557f34f238c94c6ec64bb76b4180a889b507cd7ee7ac0e91481d9282bf851b739d71ce3 SHA512 491aa6dfd716f70796e18b8a01c1b63b69fee860c6aa6a005a9ec283603b7d848d68e76b34a1e51c6eabab968ca4218fdae5b6ac868e8a937eafd6fc21146154
+EBUILD tree-1.8.0.ebuild 1040 BLAKE2B d2ac723a3dbd635d82e8325c692f9de7855917cd1b09710a2d3477566e901eebdf54576bf90f5cf2d6b3a83ea6dfdb9abadbae0f57045bcae5acdaed4591217b SHA512 af03f5cb029977e47490976044e71b9866b2192682f0176557e2df0983672c922ab4cd674bdbf6bf1ccc1364e2e859767ce9e7f41f68d5333ee070d85f60ca05
 MISC metadata.xml 581 BLAKE2B c8ec671fdf6834012120004fc69b9957364d6c43d6b6dcdd78d1c0a850976d669c4044109c6c08d818a4167be2582cf6b0d20fd634843924a86e031d5d0a8f2c SHA512 ca6717181a7ad2535be2384b4abb986c4daf7d4defc2b4e7d7487fe62b5209c31e81f86843168681debda99dabb6d2c0165b0ca0b154464f5eada572bdc1fe42
diff --git a/app-text/tree/tree-1.7.0-r1.ebuild b/app-text/tree/tree-1.7.0-r1.ebuild
deleted file mode 100644
index b76daa598d94..000000000000
--- a/app-text/tree/tree-1.7.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit toolchain-funcs flag-o-matic bash-completion-r1
-
-DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
-HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
-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 ~x86-macos"
-IUSE=""
-
-RDEPEND="!=sci-biology/meme-4.8.1"
-DEPEND=""
-
-src_prepare() {
-	sed -i -e 's:LINUX:__linux__:' tree.c || die
-	mv doc/tree.1.fr doc/tree.fr.1
-	if use !elibc_glibc ; then
-		# 433972, also previously done only for elibc_uclibc
-		sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
-	fi
-	default
-}
-
-src_compile() {
-	append-lfs-flags
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin tree
-	doman doc/tree*.1
-	einstalldocs
-	newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
-}
diff --git a/app-text/tree/tree-1.7.0.ebuild b/app-text/tree/tree-1.7.0.ebuild
deleted file mode 100644
index e9a968908ce9..000000000000
--- a/app-text/tree/tree-1.7.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs flag-o-matic bash-completion-r1
-
-DESCRIPTION="Lists directories recursively, and produces an indented listing of files"
-HOMEPAGE="http://mama.indstate.edu/users/ice/tree/"
-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 s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE=""
-
-RDEPEND="!=sci-biology/meme-4.8.1"
-DEPEND=""
-
-src_prepare() {
-	sed -i -e 's:LINUX:__linux__:' tree.c || die
-	mv doc/tree.1.fr doc/tree.fr.1
-	if use !elibc_glibc ; then
-		# 433972, also previously done only for elibc_uclibc
-		sed -i -e '/^OBJS=/s/$/ strverscmp.o/' Makefile || die
-	fi
-}
-
-src_compile() {
-	append-lfs-flags
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	dobin tree
-	doman doc/tree*.1
-	dodoc CHANGES README*
-	newbashcomp "${FILESDIR}"/${PN}.bashcomp ${PN}
-}
diff --git a/app-text/tree/tree-1.8.0.ebuild b/app-text/tree/tree-1.8.0.ebuild
index b862f8493c38..42842fb57b01 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 ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
index 269e2e213f5d..8e504c3343b3 100644
--- a/app-text/txt2man/Manifest
+++ b/app-text/txt2man/Manifest
@@ -3,5 +3,5 @@ DIST txt2man-1.7.0.tar.gz 17142 BLAKE2B 56dd6e09ed52cac0b203f68b6fe56550b13f4d2e
 DIST txt2man-1.7.1.tar.gz 15976 BLAKE2B 6d9d3947b3ed76e62c1295431f22a1eb00e9e9068623cae7a3ac853aa6fc4b5bda1db8969fbf2798b84daf84a46ad29e9bf9945cf62b51b90592300e255a3e2b SHA512 550b1d30a4435f35d03920d89f5f2adc2a937de7575c4ddc51ee9f4fe370975b45e51f5aec0eb865ead4b16d88ad31f3150cd3235362b1fc7e6d7b3c6233852a
 EBUILD txt2man-1.6.0.ebuild 609 BLAKE2B 5791269461f773391ba2080795d7689a9347d36bde85bd2152e62f7215368c47df1e82f2b31d7827c6bb2765976871e31dee9cd06efb3b4811cc657d72332f60 SHA512 312045664e536ae8147e641fda6a3726ad629682f1fe3ef1696a8cd8163fd115ee6082747612157e003cdc62269e108afff65d75c68d505d4865092923bf794f
 EBUILD txt2man-1.7.0.ebuild 615 BLAKE2B b48cb60e8d392a7b2fb1f17aa04a83da7cff32574027cd5fe02551225cf0c43c3405a470157cfd3ec6abb96a14d64e894354f2a4d0c032b90d5e1476b8a95baa SHA512 e619cb6677bf3da4f88993c8b0dbe0efa74ae3a986c9888297d09c741a0d313cef7c4133d8609a04eafd09dd23058b98d7bb498b4952f15d39b782a17c2d9380
-EBUILD txt2man-1.7.1.ebuild 599 BLAKE2B 39eac741ced9ca129204401471d98920c6663061977c35c1a83762a6162bde514eb350a368047bc52d8eeecba0fe587d234b4de54987646b89583aa8927da56c SHA512 44e44671d75b9c4b3acf37a3772d5fee2e0707296472cca68167bb8cf04b4ed132a5ef265f6e6bbf2f4c75c4322b7f670d957eb0a713408f7c82e588ef4a26ae
+EBUILD txt2man-1.7.1.ebuild 597 BLAKE2B f67ac10cd49997f1e147d3e8392f7b704c214ed1e05964096a1b00460bbb7bdaa6edc5efc72c75d720a403837452e9d548588c1fa520d0c6edbf689c847f63be SHA512 b43ee581c855f367f507d26091da6746abf925869f6e5c9dd26d62b42ffc7fc78ba237ee888fb98b7620cd7656a8202e86e9601190fc6d740226cf089e8383e2
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/txt2man/txt2man-1.7.1.ebuild b/app-text/txt2man/txt2man-1.7.1.ebuild
index e0becc35c0c2..f06ad0f6aa3c 100644
--- a/app-text/txt2man/txt2man-1.7.1.ebuild
+++ b/app-text/txt2man/txt2man-1.7.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="app-shells/bash
diff --git a/app-text/txt2tags/Manifest b/app-text/txt2tags/Manifest
index 6f0393f2871e..d1d7972fda96 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -1,5 +1,3 @@
-DIST txt2tags-3.3.tar.gz 261417 BLAKE2B 6070c23faafc9283e48efdab165c9a0050703d5d04a5ce557afc693161af5e1105435ddb9c991c0e8ef5dbd1e6d25f77c915e8be3f349b790636c904df7553f3 SHA512 a52de3f5226d85af006304a9063b5dd01df2627a45670a91b954f758cb920648f86699acab5cd7822c0183e93eed110ddc7dd8d156b0eccbe1541e7fbc2bdb22
 DIST txt2tags-3.7.tar.gz 248392 BLAKE2B cad49f9815f2e8e466a0fa83715eee27c16cc67fac4c0c55324a3ebc22707857a4bb59176b62fbc1a922c465f60dbc6a057b326789f82a9a9b4babb7b8041486 SHA512 70f6b72b9555b881149e29581a200bf5195d740ca134fffb9faab3a8a04909173f40fe7758659bde44efa9aa50e9816e7164d8164f84b2046de500a49906072b
-EBUILD txt2tags-3.3.ebuild 542 BLAKE2B 2c4d3d8baf02068f7e616cff10f714cf9075620f876a3801db2f767cb2bc9a10565847607482e19cc19e918c3bdbd942004ba914f80e36356498fd808a4bb4d2 SHA512 4b5c17e1d3ca3ca848e7f87c28984c322f747291d5762aa865559c7b5be594a1b053d75fdb6999b7216b9f51330bd76f5a4cb67c41308daa0ce42279c0876a21
-EBUILD txt2tags-3.7.ebuild 540 BLAKE2B 2d2e8e2ed987320f473acf5e977f700bcd4cdd368b57425a868c0f9c285aa29c5792f1ada985c03aa3c327b623491dedace49fb45cd774517e24af72ef6f9c26 SHA512 e6f6cde7f386780363dacafcb4cee4b111d7edd873a52b4c337cbc76435a781e654708fdb402fd0bf56328b8c0a30d671180f32b9d1f88cd71fa6b4856617146
+EBUILD txt2tags-3.7.ebuild 538 BLAKE2B a9cea8e12a121aaf8e659826fa6221bf1ffc9146f71809a6e1481c8687862cce06dbaeb817f6a31817047b76852a1c8bbd7745335d898874fdf0bd1f48139355 SHA512 7a57e84b34121dc1169e6c34390111aac11348c904f04839eddf2e19c6dd6d6f0466098c706ed6d667a9527a0412cc2d7c627e59d3145e8040ec6360b49a5f1f
 MISC metadata.xml 245 BLAKE2B e2a831e97b1c75aa3e161109943ede73b2d686a83fbb11b84d3f201c8214b997d759c93298c2d7f14a6a8486443cc52ea9369fc12476747528509d9d8807b1c9 SHA512 4fa0282e97338eef99cd0be8c2cda4a5eb6d6c1393a41782a45ad172c9b99690d572598f3de81f5828ab568fe32d4b28890c22908f86c73ac8e399837f28fddb
diff --git a/app-text/txt2tags/txt2tags-3.3.ebuild b/app-text/txt2tags/txt2tags-3.3.ebuild
deleted file mode 100644
index 83374fa38499..000000000000
--- a/app-text/txt2tags/txt2tags-3.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=rdepend
-
-inherit distutils-r1
-
-DESCRIPTION="Generate marked up documents (HTML, etc.)from a plain text file with markup"
-HOMEPAGE="https://txt2tags.org"
-SRC_URI="https://github.com/jendrikseipp/txt2tags/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
diff --git a/app-text/txt2tags/txt2tags-3.7.ebuild b/app-text/txt2tags/txt2tags-3.7.ebuild
index 0ef8f7c72887..b29495dda13b 100644
--- a/app-text/txt2tags/txt2tags-3.7.ebuild
+++ b/app-text/txt2tags/txt2tags-3.7.ebuild
@@ -14,4 +14,4 @@ SRC_URI="https://codeload.github.com/txt2tags/txt2tags/tar.gz/${PV} -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index ef3e646a52b7..aa36a4ccdac6 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,4 +1,3 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-EBUILD wdiff-1.2.2-r1.ebuild 880 BLAKE2B 4c386057db6fa83679b42c0314abe6336dda9bfcdfc2c5887037595f210b8eaa81509ecacf991ee77b90597ae5fe21c19d3cbb27b73854468840977bb2c391fd SHA512 ad0383422e8aa931adeeb787d47d2fc2c189fa2b65bf6f7cb70657b6846de9bd71a1a1541d3423434689c75ee133cb8af3f80603408c0933e2e95eb5485bcb5b
-EBUILD wdiff-1.2.2.ebuild 851 BLAKE2B 20168eee855349d4e7a5058b1b8e93ee39bc94231856598a6729db90b41e034c69f1b92ddce2f88d32b57d2da0e1068084ee82352d9924e68a4901901bf6f04b SHA512 2fe11c3f47e3a20ac3b265738182d607cbbbee88629257d288a2a77d97c9249abf5f3523fa19cb2a3799c290854c69f069d7e2efe9e6f99408fb00be3e8d9d57
+EBUILD wdiff-1.2.2-r1.ebuild 879 BLAKE2B 0c93fc63215b814bfeb75a3274f3338ce4e7c38fc35797a7ad29167703fb0e24074ef7a290bb18a84abf43503b78b3058f5999c92cb28637521076fc45e786ac SHA512 4148216f54eda9939d84ac8d6839121ae0b79d53704dc8762e90df4d0f27f8747cd70b8d14a085b639c4a8fa6309286e2bde92c7bfe86f6ff64c310b560f4bbf
 MISC metadata.xml 377 BLAKE2B ddada9afaa9d6031b4493ad27870959d71c7ad7852399b36468f41c0c11dbd591e0809101927d82a4f80520562b1fb8b65d577086218cc922a7b0e03b761005a SHA512 675191d217533506137aa85c390cbcf2c9683157b451c862701b5ab59d3ca437266243af0cb458f7ee5150fadb444a7eda648091eaa8b4f7e211e0bd98d92c7a
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
index f8235bcf109d..e16047fa8605 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="experimental test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/wdiff/wdiff-1.2.2.ebuild b/app-text/wdiff/wdiff-1.2.2.ebuild
deleted file mode 100644
index 04b92d04f62d..000000000000
--- a/app-text/wdiff/wdiff-1.2.2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="Create a diff disregarding formatting"
-HOMEPAGE="https://www.gnu.org/software/wdiff/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
-IUSE="experimental test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-apps/diffutils
-	sys-apps/less
-	sys-libs/ncurses"
-DEPEND="${RDEPEND}
-	test? ( app-misc/screen )"
-
-src_configure() {
-	econf \
-		$(use_enable experimental)
-}
-
-src_test() {
-	# The test suite hangs in the '3: use pager' test
-	# when an incompatible screenrc is found
-	touch tests/screenrc || die
-	export SYSSCREENRC=tests/screenrc SCREENRC=tests/screenrc
-	default
-}
diff --git a/app-text/xchm/Manifest b/app-text/xchm/Manifest
index 3ac0fce18f33..4cdcdeb1c4c5 100644
--- a/app-text/xchm/Manifest
+++ b/app-text/xchm/Manifest
@@ -1,9 +1,6 @@
-AUX xchm-1.23-wx3.0-compat.patch 929 BLAKE2B 87f22da40033007e071ff3c1ca49724702731decff28cbe46ee6722da86ce03e5e569419cb077fdbc00132d19288c5794e09a2a43a6748da58a9fb899d85128d SHA512 7813bb885d9a62dd9da8484875cac5436b68cf1fbcc0212089c9cc10b104ffb05ea7af768a3a182c72f660c1be49a1f990700532416a7b7c028b282ecd83fca4
 AUX xchm.desktop 251 BLAKE2B 69b8a13fbf6129aedb89f558541728bdce055a585387d1cec49c08f86b6a5d972287b63fe2ba719b83bcab9270e07c1c0d50ccaeff36bc8cd291fa7602a67863 SHA512 c17e6e3957d4c0720e43dd64b169daf221e26652fd6487d2838a4c4aa86cd9640e651d55e6bc28dd4c4cc7b37624baf83df55061583f65eeecc592bd2c9a5e54
 AUX xchm.xml 257 BLAKE2B 0b32e654afe5af057c219830f61989e2266d55c726b90cc73795ab260034e162d16af2ecce463d74feb136b5b7bfd6e8544a56d883c349bf3158f750aba05212 SHA512 c2dc02da01dce9be31c92d95c28d8ada8c9532499d4f5d8875b41a42bd1f070f6f938e7f4cafdb8d42b13298d81eb03c3347e19c70b395f872888fac5a658533
-DIST xchm-1.23.tar.gz 474274 BLAKE2B de73c04e68b876edefb1d45d9e982bcce6fd3afa06f8704d05fa5cae710d9724ed20ca50be9022570832da9954ba2af141a66e5b3ab02554441c84bac1d6ffed SHA512 c0df4362ff6db8136b20f62a76e7e93185375f6ef9eeeb1001e27ead9806d486332573ba8c3ca1863a70ce6b1d3bcc6d3af48d42add719312774dccfd7d18c90
 DIST xchm-1.31.tar.gz 981450 BLAKE2B c0c1908332f4d76f2c4dcf64ed713ae500d1b2022dedb5cb0df294fcdd1ce87d5144ca7347d6bc70b43af29f047ee270ffe05f1ee8da2dae5a5e0586c342900a SHA512 b5e1e979948d202163265f99357b361bb78371a2cc7cdedcc2d2c78207466c3f8291f720c92405913c7c5b9f607d3951a8bb3be3ece3ba1f408ceeb79199e9b5
-EBUILD xchm-1.23-r1.ebuild 1089 BLAKE2B 58c42b1eb68d2f84a421e511504b476eaf20e4033c54c032c438ec91a01ea3dc5afdc401ee0b15d650c8df1fcedd07a0a146c172f1d5cffcd4d8074575c561be SHA512 1e2ea33bb90588ba970930ccd7ab8f4fc696e03e1088dec1f65da5be8f139627cac104d9b53a6131a2c0ad2efca0747e0d17d77a684762967a688fba98016ace
 EBUILD xchm-1.31.ebuild 946 BLAKE2B 3a79a20c9adc1a6263549c3449fa1c1f36ed7c99808b08007b34d15006de214c0bd34e1b134ef3c77350ab84c890bebfac4a9b78e43f251353b0315f507042c3 SHA512 03e41fdc435f95c64017bd39177997b2e6c40c17f4de4fd9fa295ac050203f9c156913fb8e333b267279d151276a718e070a2f24d76dbda1846c408b9ef307a5
 EBUILD xchm-9999.ebuild 1107 BLAKE2B 735bd0f230d0ea1a8cf34805dccbe600b29dd11fca03ac34dc9c96f96064214667f772a2fb2a67c58cf9a7184688282dab944955df83560426e0954510935e25 SHA512 82a8f548dbae62af0df893eed30cb3b332c1bba1ca1ec3af3a82a1f272fec3b57f159e9bdadfb916f422e822aeb0f55be0563d022b9300fe75642a55d4ea5e6b
 MISC metadata.xml 370 BLAKE2B b7a2c5ee6e02f758f53ae1f67a982d8e3c0ceffed66524c9072801bc3cb803419824ce0a30b59f9dd16cae6381ae3b1a28a9b084c6dd71ab8d68a3a9be36e5a9 SHA512 f926ec5a7690046f0c1e73da64d5ab9eb662491cdb2ad24d44455ee5a4e94693188a3c8c17f777a0da120a44d57ca00f5713f5472c75f44215213ce41aceef2d
diff --git a/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch b/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch
deleted file mode 100644
index a9545cf5b568..000000000000
--- a/app-text/xchm/files/xchm-1.23-wx3.0-compat.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Description: Fix code to compile with wxwidgets 3.0
- Drops support for wx < 2.7, which is just not relevant now.  And in fact
- configure.ac checks for at least 2.8.0.
-Author: Olly Betts <olly@survex.com>
-Last-Update: 2014-03-07
-
---- xchm-1.23.orig/src/chmframe.cpp
-+++ xchm-1.23/src/chmframe.cpp
-@@ -265,11 +265,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
- 		enu.EnumerateFacenames();
- 		_normalFonts = new wxArrayString;
- 
--#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
- 		*_normalFonts = enu.GetFacenames();
--#else
--		*_normalFonts = *enu.GetFacenames();
--#endif
- 		_normalFonts->Sort();
- 	}
- 
-@@ -278,11 +274,7 @@ void CHMFrame::OnChangeFonts(wxCommandEv
- 		enu.EnumerateFacenames(wxFONTENCODING_SYSTEM, TRUE);
- 		_fixedFonts = new wxArrayString;
- 
--#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION >= 7
- 		*_fixedFonts = enu.GetFacenames();
--#else
--		*_fixedFonts = *enu.GetFacenames();
--#endif
- 		_fixedFonts->Sort();
- 	}
- 
diff --git a/app-text/xchm/xchm-1.23-r1.ebuild b/app-text/xchm/xchm-1.23-r1.ebuild
deleted file mode 100644
index 26b4e3e15f86..000000000000
--- a/app-text/xchm/xchm-1.23-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-WX_GTK_VER="3.0"
-
-inherit eutils flag-o-matic wxwidgets xdg-utils
-
-DESCRIPTION="Utility for viewing Compiled HTML Help (CHM) files"
-HOMEPAGE="http://xchm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE=""
-DEPEND=">=dev-libs/chmlib-0.36
-	x11-libs/wxGTK:${WX_GTK_VER}[X]"
-RDEPEND=${DEPEND}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-wx3.0-compat.patch
-
-	append-flags -Wno-unused-local-typedefs
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc AUTHORS README ChangeLog
-
-	cp "${D}"/usr/share/pixmaps/xchm-32.xpm "${D}"/usr/share/pixmaps/xchm.xpm
-	rm -f "${D}"/usr/share/pixmaps/xchm-*.xpm
-	rm -f "${D}"/usr/share/pixmaps/xchmdoc*.xpm
-
-	domenu "${FILESDIR}"/xchm.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/xchm.xml
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-}
diff --git a/app-text/zathura-djvu/Manifest b/app-text/zathura-djvu/Manifest
index bf6eff8917c0..b071e5cfdb22 100644
--- a/app-text/zathura-djvu/Manifest
+++ b/app-text/zathura-djvu/Manifest
@@ -1,6 +1,4 @@
-DIST zathura-djvu-0.2.8.tar.xz 8860 BLAKE2B ea6eb70d7350ea388043c9ceb8ef8602030d17e4dabc353ac7346ba11c2d8f105bd235eee90823818fc1d4d5a9ca16755bb56a1e1b8aa633a79802ca2c3e92f2 SHA512 ec51d339a01e7f2d063d21ab0e32624770398a21727fe6714b8fa8f9a1ef46909d58fa26c4a50430234f04377cce076312ebefb8a6cbdc28ba5de1c205d944a9
 DIST zathura-djvu-0.2.9.tar.xz 8976 BLAKE2B f0a798e9473ad2d09bdf171f4689231d73fa1e1bbaa0faa750feb82db2e2b029a86bf759e642f92c0ba438ee88b9178969e5d2aec4f30d9cb049bd3bcd69639e SHA512 3c2815e7f1cdfb9fc594dc6ad65359245f322e5fa27f018fb9431747e4d474734f5efd134aaeb9dabde09b01de603b1d1dc7aede883b1ef81266e067b0490726
-EBUILD zathura-djvu-0.2.8.ebuild 790 BLAKE2B e1d46cea20f9449006092e2ff44263b0d9bb9e8a269801a850dc7182e014c17c12f1fa23dddab820b05a158e03e322a8e9fe3d99e82e6c2ca5ae8b8e3a0bc72e SHA512 4c9809b8a22db671ab492204a30493daa74aed5f86d2b3b7642057a73114c8fc9e556e8f22717e8b82f52a92c4d660c1e2831016dbecd810083d5f129a6d286e
-EBUILD zathura-djvu-0.2.9.ebuild 793 BLAKE2B ad18e511919ab77afc1e5c2de562171156aeef6bed4b3f5e1532138ce046f2454adabd620b3bc44fe787006bdc66875715c33a603e6d0969eef9fe1a384f1458 SHA512 05cb70dee85ed810bf50c968ba2b1e979f13861e34dece0506e3cffccbcf3d69c5f2c1225afee64664ea843e2ddd74731b63d7fea1581e7e2863e15b5c218ab7
+EBUILD zathura-djvu-0.2.9.ebuild 790 BLAKE2B 186206077ba1e1686d869ec7ee0f7c696db689ea580690ff349ca7209845fd2d875c3f7d89c6c9bfbc8826bf3f2af5f5de40cf2b72301c8d164c8ace286ca3f2 SHA512 0cb49628a301366421a53175837eabd9283d1d21f4c1a682ecf0b88bfa2ea6d49f26f1d544826e45fe2128eb4e8cad0d4241605b2bb627bc3a3326ee44d5e606
 EBUILD zathura-djvu-9999.ebuild 793 BLAKE2B ad18e511919ab77afc1e5c2de562171156aeef6bed4b3f5e1532138ce046f2454adabd620b3bc44fe787006bdc66875715c33a603e6d0969eef9fe1a384f1458 SHA512 05cb70dee85ed810bf50c968ba2b1e979f13861e34dece0506e3cffccbcf3d69c5f2c1225afee64664ea843e2ddd74731b63d7fea1581e7e2863e15b5c218ab7
 MISC metadata.xml 582 BLAKE2B ed94d37e43b59abd8bf8fbc1da8a6839aceddd5aae31109bf5d35f3996992d96dec619daba1d2c67a7d5c6182a06a413dc5e425ae786c3fe2cdbb68bb25796fb SHA512 88a39e758edddb852dd554a88035a74b0043d37009f97fb2ba45fe94169e17eef02b41ba8666d9f712469ae3af3258f14f7958b4dc70fc8eaea790d31b092fb8
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
deleted file mode 100644
index 2a891acd222b..000000000000
--- a/app-text/zathura-djvu/zathura-djvu-0.2.8.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2-utils meson xdg-utils
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
-	EGIT_BRANCH="develop"
-else
-	KEYWORDS="amd64 arm x86"
-	SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
-fi
-
-DESCRIPTION="DjVu plug-in for zathura"
-HOMEPAGE="https://pwmt.org/projects/zathura-djvu/"
-
-LICENSE="ZLIB"
-SLOT="0"
-
-RDEPEND="app-text/djvu
-	>=app-text/zathura-0.3.9
-	dev-libs/girara
-	dev-libs/glib:2
-	x11-libs/cairo"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
index 7262f7ee1caf..b5a67f6e3010 100644
--- a/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
+++ b/app-text/zathura-djvu/zathura-djvu-0.2.9.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://git.pwmt.org/pwmt/zathura-djvu.git"
 	EGIT_BRANCH="develop"
 else
-	KEYWORDS="~amd64 ~arm ~x86"
+	KEYWORDS="amd64 arm x86"
 	SRC_URI="https://pwmt.org/projects/zathura-djvu/download/${P}.tar.xz"
 fi