gentoo new year resync : 01.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-01 21:06:00 +0000
commit: 129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree: 53bf797418ac5e9b99c41ca0382c87b82421e5de /app-text
parent: 441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)
181 files changed, 511 insertions, 785 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 71364db1e341..dae91fa0dbe9 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
index a78adfa31ba5..36926c28bd0b 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -2,5 +2,5 @@ AUX aiksaurus-1.2.1-format-security.patch 822 BLAKE2B f8891b9772367ce4aef4b68e3a
 AUX aiksaurus-1.2.1-gcc43.patch 734 BLAKE2B 9c8b5c401bc116d9daa52ee100bd42127639330449b44d0012494fd8536d46dd99079ee606df794b515ae002d5834f379706af7ecb41785593be150842baaa53 SHA512 6f821ac66f0dd4601f84a6fe8f71b14712854e293f4ebc755a80d34032725cee61b919da1547b514e3d8b6a07edd29016ae53283a28f1792119ae99850016241
 DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
 EBUILD aiksaurus-1.2.1-r1.ebuild 918 BLAKE2B aa9a0cc3f79ccf981488e1e08b6336adfbfb6e9d209235fe209c85cc9849ce94f9b6068f031e67cf8c7e0471720af7355f9a0dc33cdf5b9c029fcb2a80ab01ac SHA512 cf47fe2edca5be36e676301eb84f9553c5d3a248068c23303ba099eaa64489330050787c296d2b184767573beeb8f5e9b9b5930f50c72214aa9b2c6e61595dad
-EBUILD aiksaurus-1.2.1.ebuild 792 BLAKE2B dbea7c8127b13263e87dac48c1acf606e91eeb0455a4ca9151da2c5ae74098c0a4282db99f36a1ab46f764afa65810e5ca7726b919d44edf679cf1e27e25a5f2 SHA512 54e4f2addec2514af7f3c734aa99354713b7db43175cc18a0da8179afc001f6b89a266306160dc97d556aad3614cf556100c5df5cdf14c1d71f010b43f1ecb7e
+EBUILD aiksaurus-1.2.1.ebuild 793 BLAKE2B bb46c201ab41502c8a3b24a2ac2d97f62244131a95efb3a9d8968f397dac06b3d86ef0b43dc5d56499c5770d95e786fb64dbf1427cd08dc026e9bb740a7381ab SHA512 fd0ff4456cd07621f294830397f7221cfc0026e2062dcde149d1595cb2922b5858a0b38317ac6ecc4ba78488798d0d9273e26561d9f36980bd3d1d503fe04867
 MISC metadata.xml 245 BLAKE2B 163eaf1f9854d0f7906920339f1ddf8321c4658b23e14d44bdc7e07ea3eba22d7cedb1cc63285aff307a1287555463807160d380836d63032637eacd5ce97f1d SHA512 34945e0950bf668d24db2565287fdd8484cccb8968df2efbcc665905ee583f45222fe0ff848c267cf9a25f58d3aae9e870656d88b1f813b7812a185782564e08
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
index fee561edee06..b0454f1c5135 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2 )"
diff --git a/app-text/an/Manifest b/app-text/an/Manifest
index 47f6e94f2d49..6738e8132d6b 100644
--- a/app-text/an/Manifest
+++ b/app-text/an/Manifest
@@ -1,4 +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_p6.ebuild 895 BLAKE2B a41c2defb718dec2a9eb010fb44666ab0155f583ad440d8d972b6b1d74bb1853e79ff78009c5b3d4a8b5f8425470be1252f2f388a5424fa109a88cd2a0ab96aa SHA512 0c162481f05fff1ca7b3fb6814ca71b6d862e2bbf5162099ce1127cfbf3b7f6252e523d30af2a56cedbe091f3d1b2eb3a176f77594e6b945a3fd83bdd7743b57
+EBUILD an-1.2_p6.ebuild 896 BLAKE2B 736c8b5f6c55d53ec9f0fdf6ec64811c4675c93c589a16f893316652601ce8a55d7d8a3ebd4758a3284802fe87c998c457f8dc49173b6f8a49f1bb73b81d7bbd SHA512 d8ad5c1efe19fdfd62af91cec771305e30da5babe1ce8f7a69914ec8a77c579ae66e71428d4057596e5bbd76d851f1b4b982d37e609ad63b454052ac00d1190f
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/an/an-1.2_p6.ebuild b/app-text/an/an-1.2_p6.ebuild
index 3f1f44b3d2bd..ec08966bef24 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/ansifilter/Manifest b/app-text/ansifilter/Manifest
index 4bfc92e4df22..39642cc3f578 100644
--- a/app-text/ansifilter/Manifest
+++ b/app-text/ansifilter/Manifest
@@ -1,3 +1,3 @@
 DIST ansifilter-2.17.tar.bz2 436116 BLAKE2B 94a1788cffa66343643f48a18748d5359b090803cde723a02bc38f908c262631f1cd2eb150b6a743d66caa04983ea444ba150cf34ce07bdb456979e19631582f SHA512 ab9d590189482f2a27affd62b456c96b947b04d8c8b1214f1ea967971c8ed7df8a7c15d1079f957164d01916d144dcd5dc4b0ac05b452f9f4b8095273d3d3162
-EBUILD ansifilter-2.17.ebuild 1108 BLAKE2B c5afc96a41f9b2bf6474f02c61d11763b77bf930c277d5a21c054b3f405115e7c57a52c869e40ed8042ec312e7d17afe7de2471a1460b845f7badc24bf3b2e0c SHA512 125d486d6d5f7e86c894a862f03dd4b0760776dda3b6047c14f28112f34d11ee72601e74ddc3a64c09953eeba7e5de30e3d6725a5df2519fe061251678b84de6
+EBUILD ansifilter-2.17.ebuild 1126 BLAKE2B 18f2588012469516c0f65158f57bb6659ba36c13b062764cc7d905cf23cf7f3ed1b0c4bec064b80aa2a2b3d1a0917571897057c8a46171c103f27cd4bd002ec7 SHA512 e144c52557f2af3c7d0f3a8c7ebed27682667204bdceeb4b7d6482f1c94c94cae4603ac87e5af69c570e5d9bc67d48db84233fa81a38e33545bf37e27197d51f
 MISC metadata.xml 221 BLAKE2B 6d597a7a853603bd878e86c6552cb68211e81f627cdb673ae99dc6c6133f50f617101e43f4b4631b45b5969ee6ec42849b156a62594f939d00c112ce51d769e1 SHA512 e50d6cad26239ebf4260f0cf4bdf4e29ef2038e999039adf94f49b184b5993f02bb0d4cdb3de6c7b5cda99890db42dcd2b65c5342256be50dc19e6aab2406353
diff --git a/app-text/ansifilter/ansifilter-2.17.ebuild b/app-text/ansifilter/ansifilter-2.17.ebuild
index f9b8816867fb..3233e9d2bbd7 100644
--- a/app-text/ansifilter/ansifilter-2.17.ebuild
+++ b/app-text/ansifilter/ansifilter-2.17.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 x86 ~x64-macos"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~s390 ~sparc x86 ~x64-macos"
 IUSE="qt5"
 
 RDEPEND="
diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest
index bc741a315e28..033d8d5b5b91 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 1379 BLAKE2B 0cc04c43152cb0c359055d5b324326617e898cbec41f2c596d50b094b6fc66ef17b56989f7bb3dd41ddffada9d6393948da6515c4a04f4a3665fad442fc10f53 SHA512 504324ef9c1a707438dd2fb5941ef0dfed37d7b7f16ecad8101a1899d8203af1a1c1764b202034f0977027edaac0ecdc815d20a47d9c59a0e463066205e61c9a
+EBUILD antiword-0.37-r1.ebuild 1370 BLAKE2B 5ad4f68420372d2955d4110aac2722abcd24cb8fbc240bdd6e7ba74f7e3c4c9d1cbf04af5e3f7274752c51480cea88365161a2ee9b2badb9004595d960f28ff1 SHA512 e4fc13d72c455fbc49d6e3427d33bfa9a1e0213cf8bf89172160bd021ffc5117299f097945781e6b3e2a8a81cfb60e21a962b89d7f4280a7e676cc5d56237eaa
 MISC metadata.xml 343 BLAKE2B a255d4f9a7079612cf94d69b3136bf3dc5d1ac638629e02430c96512b039fbaa0d1d05a216f7181c7269a1701c096292e47251769581d1f4dc5bb1559c76501a SHA512 6a09982bb72f873e6fcfc90d8dcb8db7b06c11b43633793303f511b5bdc86f83a2b2ab560f6ce1e4b62e334c16cce96fd9b0ad983caee6381612a4b4102ccc09
diff --git a/app-text/antiword/antiword-0.37-r1.ebuild b/app-text/antiword/antiword-0.37-r1.ebuild
index a49497ad02fe..5f81fbace13b 100644
--- a/app-text/antiword/antiword-0.37-r1.ebuild
+++ b/app-text/antiword/antiword-0.37-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 src_prepare() {
 	# Makefile is a symlink to Makefile.Linux, avoid that we patch it by
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index f00e7fa2743d..9ebab21a3e8d 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -4,5 +4,5 @@ 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.ebuild 2754 BLAKE2B b587a95d9ef90e811869823f15c18e0341009c806e53caf838e9b3d7db5f9ad412f006d0f270bc37c3e9c28bd73e17bb39484a0d0b3992d78cc0cf0380fa15cb SHA512 0fb04b734cef8b90d1c45df727c561edb0ffcac44417a30e34ce1a782f1e7e3443bbaf3a5b62eef67fa1a834813ed3953ab564b17c002b13ac8fef050c8eb984
+EBUILD aspell-0.60.8.ebuild 2755 BLAKE2B a021ba281fafb50eb65e870c823638b307f38059451d0c90200e5ef20e1d50ce98abb524e40dae2c6b6f236ecb3874680649dc108441b3759d25e53a576808d7 SHA512 af3b18e5a27b33aa7bdfdc4d63c577b5f6f6e9a7f573d60ed14aa29800517f0ff0a58bd6fa2e2ea083f6c4752822ad8b7dfc7a51a4d1b8bb80a6d4d55b240cd2
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/aspell/aspell-0.60.8.ebuild b/app-text/aspell/aspell-0.60.8.ebuild
index 8cff278583d0..e60d5bfbe108 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 ~x86-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 ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/barcode/Manifest b/app-text/barcode/Manifest
index c221cf4febec..73448d25d6d9 100644
--- a/app-text/barcode/Manifest
+++ b/app-text/barcode/Manifest
@@ -1,4 +1,4 @@
-AUX 0.98-info.patch 441 BLAKE2B 2e334be2e36e00a0528d220244affcd000da4ca7b4576501c34b210134ad9e5ff8af99c467d3be3ee34173b651690f8f0ec9a5584ceec60337b4abd1d7a4f825 SHA512 694c4ccd03baa7a17c0512b55b9a39fb2de34afef61194833fe5a481ba13c22f1d21217f53908ca8ad4cea536fbd9a6453486ba2778349e6b1651d2c67513ad7
+AUX barcode-0.99-fno-common.patch 650 BLAKE2B 27fce20565dfa526b4240c5817ab45735bba98a7445160ba5f7ff368f0befa2332e423f31732ea27a104b3f5f7db0fa8a954d465116a38fd445cd1ebc1209242 SHA512 1cacd446234f9b0d841803f3627a7b0775da22cc74fcf09ee45ee95317ed6816bc545e61555707f7c7a5cee743b33b241088182b01d6cdcd49e047f050d29c68
 DIST barcode-0.99.tar.gz 890730 BLAKE2B 4695a9baaa2d95c898f0078fc7d49e642fdd5b21e3b0c92d1f275252c78b94e5bdfc78084e6dd8d28231748bf6c567678cf996e309fc1e4a1db53bb2ceb0eb5a SHA512 f500dbe7eaa657ed6879316835557533e0972c8740a8bb61bea46efdd4120827a3c412ca24fec6e1833395191521425dae272f10d8553a252896b363290118b1
-EBUILD barcode-0.99.ebuild 669 BLAKE2B cc82321c88a8244c01cffc963dcdc1467993d8120a6045bb68a3a74ebb76d8edd7efdcfe3288fe835d33c83d79ffe6d8b27b6e67049ab3d8dc5ca40c632d376d SHA512 6bb90e786b10fc142ee1ce0a4dc732b1b80c864bf44d47e0fc08cb4b98ffd28f6d7a419e6a9ea3fbb0a9feb3c974de0682a29fcbf523680caf1385ce5a9b248a
+EBUILD barcode-0.99.ebuild 629 BLAKE2B a3795836c93717f841a18ffb16e362b3a7d9b97f312476c70684c525e7f482b580fb357a76ed9291341730a36ffac9687abbed2fbc67406c0e27f51a4fc6355e SHA512 9833f89fa9197e0f4031979000a9c9993e41e322c8e8642d6452ee3b8858050b48db02d3b64f7d5cdcb944046a42133e27fe54ebc78cfd997bf330cfc213d87c
 MISC metadata.xml 243 BLAKE2B c7e8ffa98061b37b0107cea12e59f7779ed014b1b83b008c1f8baa888fca120d4ba508078f2182c27c1bff0e8c2dea07bf3b33a3b086fdfbd7421cbf57b2494c SHA512 dbdb824584151c0ccb600c9fa433898cb613604bc97c7305b7a0809d22574007bc9ee3037b3922ee5256471519fd27510c3168b24ca3f75ab63e5c3051502d3f
diff --git a/app-text/barcode/barcode-0.99.ebuild b/app-text/barcode/barcode-0.99.ebuild
index ce0692e849f4..bd58bc146e16 100644
--- a/app-text/barcode/barcode-0.99.ebuild
+++ b/app-text/barcode/barcode-0.99.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit eutils multilib
+EAPI=7
 
 DESCRIPTION="barcode generator"
 HOMEPAGE="https://www.gnu.org/software/barcode/"
@@ -12,10 +10,12 @@ SRC_URI="mirror://gnu/barcode/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE=""
+
 RDEPEND="app-text/libpaper"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 src_prepare() {
 	sed -i -e '/^LDFLAGS =/s:=:+=:' \
 		-e "/^aLIBDIR/s:lib:$(get_libdir):" \
@@ -25,8 +25,3 @@ src_prepare() {
 
 	default
 }
-
-src_install() {
-	default
-	dodoc ChangeLog README TODO
-}
diff --git a/app-text/barcode/files/0.98-info.patch b/app-text/barcode/files/0.98-info.patch
deleted file mode 100644
index 740458f88ed4..000000000000
--- a/app-text/barcode/files/0.98-info.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- doc/barcode.info.old	2003-10-26 19:08:39.000000000 -0800
-+++ doc/barcode.info	2003-10-26 19:58:42.179447512 -0800
-@@ -1,6 +1,11 @@
- This is barcode.info, produced by makeinfo version 4.0 from
- barcode.texinfo.
- 
-+INFO-DIR-SECTION Miscellaneous
-+START-INFO-DIR-ENTRY
-+* Barcode: (barcode).                     Barcode generation library.
-+END-INFO-DIR-ENTRY
-+
-    This file is the User's Manual for the barcode library (version
- 0.98).
- 
diff --git a/app-text/barcode/files/barcode-0.99-fno-common.patch b/app-text/barcode/files/barcode-0.99-fno-common.patch
new file mode 100644
index 000000000000..5abb8a26824f
--- /dev/null
+++ b/app-text/barcode/files/barcode-0.99-fno-common.patch
@@ -0,0 +1,25 @@
+Taken from: https://sources.debian.org/patches/barcode/0.99-4/0006-Fix-FTBFS-with-gcc-10.patch/
+Author: https://sources.debian.org/patches/barcode/0.99-4/0006-Fix-FTBFS-with-gcc-10.patch/
+--- a/barcode.h
++++ b/barcode.h
+@@ -123,6 +123,6 @@ extern int Barcode_Version(char *versionname);
+ }
+ #endif
+ 
+-int streaming;
++extern int streaming;
+ 
+ #endif /* _BARCODE_H_ */
+diff --git a/library.c b/library.c
+index 30946ff..5390a2b 100644
+--- a/library.c
++++ b/library.c
+@@ -30,6 +30,8 @@
+ #endif
+ #include <errno.h>
+ 
++int streaming;
++
+ /*
+  * This function allocates a barcode structure and strdup()s the
+  * text string. It returns NULL in case of error
diff --git a/app-text/bogosort/Manifest b/app-text/bogosort/Manifest
index 61e20911caa3..0201c0572d8d 100644
--- a/app-text/bogosort/Manifest
+++ b/app-text/bogosort/Manifest
@@ -1,5 +1,5 @@
 AUX bogosort-0.4.2-glibc-2.10.patch 1479 BLAKE2B 6d5a6e9ff7f43a5275e8db8d1478a06ab69863105ffdfb3ed821bdbb7b901f2b0ed9b9158ee0795ca4e1dc01b01c5a3fdaedf5bd4996d3d9bc5ec4a89492e6eb SHA512 742b473df18b8eee876857fc3fa14bacc95bce4e14d083deb066d4451385437cd040cf40b6c572762c047b1aaa3e2ee973f2d880c5915993bf6a4ba130a776e4
 AUX xmalloc.patch 395 BLAKE2B 0ec83824e8ac740512c3c241cf2df352ca5b5d05a38507288fe5f96512eebb94d5532af0cfb6e05fcfcac9c10c96091584b917966629268e9921d964e8adb0c5 SHA512 c1479f342d71e1c53a2b038bc7bf858292c6585b8360b41c6006a4ef0efbafc3260cf8523efedee945c084247851186dda3450ab0533465c33176b038a8c0243
 DIST bogosort-0.4.2.tar.gz 161628 BLAKE2B 92abbb809747e3fdfd2a6e33f7f753f1ddccd4ecd9883f0a02fc843f8f680e0a5e6e6b65c3943708ed074a944e5187bb889297365ae0dd34292215b056bd46fc SHA512 2d2f7be36ec08aa78323cbdc5f1030297706c364d6fc82554065cf737295d11c90dd6061323f2732b63c70401d710b2018075bff6d1e6ab0078069b405ea62e9
-EBUILD bogosort-0.4.2-r1.ebuild 688 BLAKE2B a46cc0d2432200d146aab46355166d8b27cd13978af6c8116d6a2b200b7d3a4538d871abed9a26143d15c4a5c0d0ce5a562b04b7a164fc509549ae056d1fe4bf SHA512 292acbf36b12e79a76bdf53624b39f45667998c4dfa06f767b17b46ca965145ecc8fb3d3dc40bfb64ceeedb74aac8699ae7d5c78f407ae971940d0e6050970a7
+EBUILD bogosort-0.4.2-r1.ebuild 689 BLAKE2B 2d8ccfe27f2dad5b91e6efb908e232f7b2aa08570442c1fffecbfe74669cbaf2bb0bf9bd7a9020a0507b6bec506bb327e958020a4e58f2e29e1e099b8e43fb50 SHA512 3e62d6ad521595f78f41d99561668e87f9bbeac80363c7472fca13353b9106ef70c7246d62081ae8f99606c7eda547f28ee454c4e373e41ce38216a3f7e504d7
 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 f62f8e4978fa..c8b07c12cae0 100644
--- a/app-text/bogosort/bogosort-0.4.2-r1.ebuild
+++ b/app-text/bogosort/bogosort-0.4.2-r1.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="amd64 ~hppa ~mips ppc sparc x86 ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 6ca37534103a..2c38a35492eb 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 1071 BLAKE2B 47b57c4cfc78a9e71d7a48b8de4254bc2a63ba44fcb5f7a1d475dc3fc03c2ad19f34d788f8a71cf699532491d0a468d79c1fc5229c5e12a9ec88c8621dfcda5a SHA512 fec4147e5600c71722c6dd3ab74d53b4be80fc0c4d16578cc6db8f66afc2b56d7b38f0badf7185f9cadd56ff4a8f075e9c9ed847c6df1decfcf74ee5ce8bb5be
+EBUILD build-docbook-catalog-1.21.ebuild 1051 BLAKE2B 2b132298766daf96b2e4faa7ea6b382ecdb0ecaec985ea36cd024ebb360f6a3502ea90f045b87083e1e1a6e4cdc25cfd7a1f14c5661c9ce626e41b5d6feb2c32 SHA512 5e5840072debede38b6f46075a7b822c9e0d3d69b90eb7b33400b2b0826b00109f96fd5efb2d3b0400d7c1e7b257c26783aa4112dbd524829a8a7c7a444c8e5f
 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 f88c7c9565c7..b788c34138ef 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
diff --git a/app-text/code2html/Manifest b/app-text/code2html/Manifest
index 2a17dd47fbc6..f37518e06c4a 100644
--- a/app-text/code2html/Manifest
+++ b/app-text/code2html/Manifest
@@ -2,5 +2,5 @@ AUX code2html-0.9.1-prefix.patch 1393 BLAKE2B 84fc0e9c60772dab33ddee16fe62e96c36
 AUX code2html-0.9.1-scalar.patch 1435 BLAKE2B aff200017e0cb68ce17a9d8f7ee7eee6576cec4002b04ff4022f37232267169130fe1ab438258daf8f5a32283d99d4911e1203baa02b71486c9da3aef6c35632 SHA512 5e7124876b2888b24792d351d958efc09daee90422cf457a2a820920d6185df0d53dbd68f79acb084e4b4fed45fece8dcfc642ae94f0def78567e4f8366022b6
 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 1024 BLAKE2B bdd4d69c61559aa2ae33573810cb7472ac10a8ee6acaf3e8d8aa0014415909ab559495548bd535a76c901f60d7cee403a5dc19e3d3705f31f0f1b00338583fc5 SHA512 17b5612546ef90b77cbaa14f3da9820dda7c7a11da5b7cf1d760b829aaafb14cd2b89bd8f5d3d8b5c3c1a0b34e3c72e12d380ad047decf3bacdd1a1831765a35
+EBUILD code2html-0.9.1-r2.ebuild 1025 BLAKE2B 63d8658b18d577abaf642bc6d0ce868a703294c77217806848799f8bb695215ecdc499db739ac189bd8a38d3306e8250011193dc6c715beda1093902789d94e2 SHA512 c321ed2fe69c976e24911434c1b2ddc8613ba4e4f36ebb99390297090c1aa9ab5f1c34741e7e5834e247c0c09d1ab7ec8986a9d57482154729451d84228cdd5a
 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 fbcb1710f60b..d56c83132575 100644
--- a/app-text/code2html/code2html-0.9.1-r2.ebuild
+++ b/app-text/code2html/code2html-0.9.1-r2.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/convertlit/Manifest b/app-text/convertlit/Manifest
index 79854f5d972a..ec71d9b836f6 100644
--- a/app-text/convertlit/Manifest
+++ b/app-text/convertlit/Manifest
@@ -2,5 +2,5 @@ AUX convertlit-1.8-respectflags-r1.patch 838 BLAKE2B 4ba437ea3a7eb23e08c262b6e6b
 AUX fix-Wformat-security-warnings.patch 936 BLAKE2B 636599eb3840f5ea084dd60fd96f462f6757a4ec04e41360469eacb03badb3b8271a595692f055d10162e591600994be7e4676800e0f8a8feadbbabccbaeb21a SHA512 6f8798a8b54951c15da4f28d4c8103811c4d77ba96eb12a4e19bc35876c148c1247d19ea5b3d60028b156d50d5dbd67ec5254e47a556d195ca8c084bbc571e4d
 AUX support-ar-variable.patch 408 BLAKE2B d3649dcc362cb54a67eba34b9b6bfc6a52a22cd0ed33de95aad3cd5dad75729c35c45b8817e9c64040b3ea4baee876b456121a7e55094f0ceb01aabf4d6a2a8b SHA512 8d807507cccc58979092becb1725d4871f62746f06b3d4ac8740a0704019d3900cd60098497a0d770fcb9bab68e9bf34dc50219afda0995209ea88a71b084ce6
 DIST clit18src.zip 135120 BLAKE2B b2c47c03df2cee8779f50eee1a19f46907fa966165629d17fb25c66e5bf7b68b6ada6efa1790d36deb6a10f69c17ec7ef2cc66551796cbba04a3f2f7e5e3294d SHA512 0d4b7d525f5164a73a47a00e1c4e93ff50e738a4e6c541ded283c4779e6a67138f601c23a41344517ca5d7f8c9141b25cc6edc7f3967fbf9042e99f647354f36
-EBUILD convertlit-1.8-r3.ebuild 935 BLAKE2B 9349947a2093758f4f85bdab5feee4c036b9bfbc0aa06a49deffadfedf20c7e2ceff9eeeae17129fd3f4427e3044846c490ac2d00baca5ecf98e5987cdb8456c SHA512 952506a21114e4e9ce60cde34da33c19488ab55bd4e82c7da1dcce2ae9616411d1b518d370232df6aaf432a0be03c92bd83b4434e288181fb59c3ff02d2a3656
+EBUILD convertlit-1.8-r3.ebuild 936 BLAKE2B 97a65b3223ca1aef2779f42b55f92437b0abdfee9a64cbf0f747ea53ad0555eb0187e651f072aa235cc3c95d5fd167930301760ae39fb6869003ea07fb3bba49 SHA512 12b20671751955b17d1b78131c9d349249336b20be62375d7998ffe93d01042a09025aa0fa641225113a0c47e9698c4019e1f7ad23bfac42f240cf660fc9aabb
 MISC metadata.xml 562 BLAKE2B 65f7b124b050f42c8c6f800e2e05d2e9404869c42a1217e0d280895d52d8f2588f37bbb4a696cffb58129f080580aee9cbca83740e888ccf9d272a8162a053ef SHA512 1264f1669bece35fbd465ebf7911c7d416d85d092aa6e1601b240728fc2a0cb521d913e3bae08962fc5e70c2b70ee17989191e0bc21f04c9c1ed30592ff4820e
diff --git a/app-text/convertlit/convertlit-1.8-r3.ebuild b/app-text/convertlit/convertlit-1.8-r3.ebuild
index 807569a1b130..e534ab320b30 100644
--- a/app-text/convertlit/convertlit-1.8-r3.ebuild
+++ b/app-text/convertlit/convertlit-1.8-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.convertlit.com/${MY_P}src.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=">=dev-libs/libtommath-0.36-r1"
diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest
index 342ce1fb4836..8ea26e4f503e 100644
--- a/app-text/convmv/Manifest
+++ b/app-text/convmv/Manifest
@@ -1,7 +1,7 @@
 AUX convmv-2.05-manpage_nocompress.patch 495 BLAKE2B e1f3b981d99cbd44aca2cac0d18165caf8be9771ba99acd3edb349225c05a7fa56e40707b234cdd1ffa0a82b5d05ed2191df00dcf7c12b45c19bcf0810fa8b4d SHA512 b57ede3b3b8982630d66ab5d21fce22b975e75941d9c2c5e4d33fd1c5ad8f9acfc893605d89bd7f11706d11f0afb3f6eb40d923fd5818a0bbbf8b93dcaccfc1a
 DIST convmv-2.04.tar.gz 30082 BLAKE2B 51521e5e44c635b72c406b6b732850e7f5e50b64d30bfd8770ca1ab49e3fd10d45447114f8adbf8b79fd381dfaf6b4782246d3e10aae471a49a52a20c8ce0405 SHA512 987411047af0b1e952cd11937c70ddd972b2e3534f4fcc6c659243dedef69af4aad90ceaa3789aec6bad6cba0999c38839451f90844b171773165b6e5899f6ac
 DIST convmv-2.05.tar.gz 30680 BLAKE2B b0d4bb14995e42e55fa34cbdaa8cb8881e48972abb296af44eebfdf76664e837b05398e0cc4e9208ddee41213bc1dd7f11c3f503e39f9a6791d08797864776a1 SHA512 7fb0d1e2b64c3105c48d8a2cbb59fa4ea23202f17abc7cbf63acfca785683f00955fdcb03517e9dd8fe01be0171458ab2583e1c52d62c6081684462b0fec4125
-EBUILD convmv-2.04.ebuild 696 BLAKE2B 4b4bcd977727970df9ad3f760e7612b4fb39f55ea60bfd30a973a21f65864ab2470ae7222ad015aaf8ac66b57b8520285e7b87d8b37be22309c7c822bc81dbba SHA512 f69f37a90cce7e27142523d2124d2708706387a0c034435972ecc4af2e8d1f80615c9b0855adb6907234a719205b61b7354fde5394cdd47438c71c7dd242ca74
+EBUILD convmv-2.04.ebuild 697 BLAKE2B 6c6c08b7b1bdf528c13ed5c2d540496f1ef75819741558773e50b42dc43397d8e2a4963e2a090be49e05a010c7395be21ad13a5ea80ee9a66a1f8f8fb00eceeb SHA512 473e677f1ec5af80737d13ff7cbb0d38356aabf3ca3305385de87840406453fc9aed83fae879d254c4740b7425c72d452ab70e66d77e0039a9ece2c3bcc4c23d
 EBUILD convmv-2.05-r1.ebuild 808 BLAKE2B f047ed37c8b98470f34b2960e0e0a9dd1fe45ef59920e5a4648ad41d49d947ce1be2eaec77fec003f9bdf12ceffd2c1894eb80effdd79b1fca908ce2ff4fbd85 SHA512 1f52846d6ff72002b7442c356f610ecf7c66f60620fe26e0f2627b81889a42423ce1c70c338f77ae556c32d4e563ad311dffd8bfb60b987c69f81029e5fa44d5
 EBUILD convmv-2.05.ebuild 712 BLAKE2B 0c338bcf39f82f15cb1e72fa53e7702a926f22890f548af0ae1aee2827ff1010dc5e809c012afab3e1a51dd4ddc4a0aed07fd0b1bb534d29c8f613b35f4a1f2c SHA512 fa5230e72fdf9e78df8c6b0e1d1c1170d96005660cedb3c829005312af4ab44ae7f9067adc8f6cdf30828b37e2cd6dbaa44731092f9540a53ab861705b57ffd5
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/app-text/convmv/convmv-2.04.ebuild b/app-text/convmv/convmv-2.04.ebuild
index efd8c049917d..2ab22aafa42a 100644
--- a/app-text/convmv/convmv-2.04.ebuild
+++ b/app-text/convmv/convmv-2.04.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/cook/Manifest b/app-text/cook/Manifest
deleted file mode 100644
index 8b5bd380e0ca..000000000000
--- a/app-text/cook/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST cook-1.0.2.tar.gz 139428 BLAKE2B c3f1a3e753a7de14fce4f357af64f99af5e0a515988bb2aef40b79a0cc70dcba4bb585c1fa31e0da1d235fc1c363e9693338756f2bd784898a7dc63944b9ed51 SHA512 6941d3541a6cccc18fcbf14128e0593556148d40f74715b0da943455a223099406d632466137fabef27a2083b582701df92666a1ad6e6a04f5d2d3dc0b62e1a1
-EBUILD cook-1.0.2-r1.ebuild 981 BLAKE2B 1e41fff4ff2bf035c2e272b327f23f0583f9dadac8a496db11cf8457563514f14d69cdf839bfc3de387701f367cf975ed913c955f2a17d3b614ab5f2348d9018 SHA512 879f999a2e88e019cfb5e1a1d0c613d43e3d34b066bf8570db2eee6827a04689cbe4ecfa9d9be123ea628b67f7f2d630aece6594c772abbad583441fe127eeaf
-MISC metadata.xml 241 BLAKE2B 6f92bb59126251d9e6b2cae4fa0a43926317c6c133dd882e845fe0b693238311241463d8de465e36ff2e90c7c25ea35309e3bc5b0c20a32153965ce0b626a1da SHA512 36edaae333e04297f6f6357cbcaaf6360580a83e20ec3af8b09c1010601e47c29c45b6eec5347cb90f8fc1fecdffeb1074d3ee55dda78c29026210ea58a7264c
diff --git a/app-text/cook/cook-1.0.2-r1.ebuild b/app-text/cook/cook-1.0.2-r1.ebuild
deleted file mode 100644
index 4c1343f0e2c4..000000000000
--- a/app-text/cook/cook-1.0.2-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit readme.gentoo-r1 toolchain-funcs
-
-DESCRIPTION="Embedded language which can be used as a macro preprocessor"
-HOMEPAGE="http://cook.sourceforge.net/"
-SRC_URI="mirror://sourceforge/cook/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86 ~x86-linux ~ppc-macos ~sparc-solaris"
-
-src_compile() {
-	emake \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	newbin src/cook cookproc
-
-	dodoc README doc/cook.txt doc/cook.html
-	docinto examples
-	dodoc test/pcb.dbdef test/pcb.dg test/pcbprol.ps test/tempsens.pcb
-	docompress -x /usr/share/doc/${PF}/examples
-
-	local DOC_CONTENTS="
-	NOTICE:
-	${EPREFIX}/usr/bin/cook has been renamed to ${EPREFIX}/usr/bin/cookproc in Gentoo
-	-- Karl Trygve Kalleberg <karltk@gentoo.org>"
-	readme.gentoo_create_doc
-	dodoc "${T}"/README.gentoo
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-text/cook/metadata.xml b/app-text/cook/metadata.xml
deleted file mode 100644
index 7e1c91980a55..000000000000
--- a/app-text/cook/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="sourceforge">cook</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index ba115d924131..0c76bcf9842d 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,11 +1,7 @@
 DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
-DIST coolreader-3.2.39.tar.gz 17679570 BLAKE2B e84fb7d8032ae62fec24a74a9cebab086664a2ed3827f0664e667a4ab3b8d76b722790958f71f5fcd79729238e897c6592059f9b45eb4069c9ad483883bc0600 SHA512 1b92b35750174a8ef4df4b7c4f33bb9fcc94b36008c08a7f9d1f8e85c6b642c5b037e0673a783cde1aa98296887bb286c4a2da186911b26f298f689605e1eb4b
-DIST coolreader-3.2.45.tar.gz 20290340 BLAKE2B a4e6218965618a1b0938606ca323534112a5d7b64a1d56e06f56ba8b2e5591d380d7fb2aeb9c37d007fb834963a42e684e2af939720272c3a7494e5afc65501e SHA512 d7dc9921b74d1da236aeb02edcb39d44dfcfb9da5d6d3b1bf428157f67415c19af218c2454a602828d12d0c6d8c80d1335e92101acda1af8abd6bd312900c33c
-DIST coolreader-3.2.49.tar.gz 21398327 BLAKE2B 9a63f34d661f7c12d55e08788edb0c348d33c67708890e89a857975ce3a6fc82d8788dc0a15ad18e025d68254293b1b34977b2ffe24ea19ab4865727d5afbdcb SHA512 06c8416c33ccf939c0292b573352c097c4b2a0b1390181428e5f1bf08e145f1fa1f8ebdcf658bb0f9e8846c1fd5a57a67fb075b8e7285e1e7602e26aba6790b0
 DIST coolreader-3.2.50.tar.gz 21252394 BLAKE2B 68550656c644d623e24a7da310baf77881c72621db03f481eeaaceddc0a3c77ecd4d2098c4afe0b56fc50a67f471a9a6a20c172590365bd888222894d27c1826 SHA512 01417c1daae5da6ebb4d92fd68693d3aff09013d1f5679a30138941e23f79db58bdf2b20721deb10ad3d0b9ab0530f8237aeaa2b6f1c1fabbff1c43f48d68ac3
+DIST coolreader-3.2.51.tar.gz 21575605 BLAKE2B dcd0b33706d675d0da46825b298b726c6c4ef041989b74619fb289ffefa3f62284d22d8ab0930f2866b1b01ae92f2acb8efe51fc8230d925454ed351b9c30242 SHA512 e7e4645c501c4999dd4a3069d3b11a634eca285da23c113bb9fe339ba9b519de994f972fcd65cf941ab6ec326a234af91ae7728689e3afe3f00ad2e93c08c279
 EBUILD coolreader-3.2.2.1-r2.ebuild 2475 BLAKE2B ef04a9149a2ca2b02b82de190fe071aeaa7f3880dfac03f39e4b20d1c408f55114048ec20479bcfc2ae92f396520a583a940f16afe09f3d53418b65ab25169dd SHA512 280a8eaddbb44e09ce50cc02c26f9a07f34ca986d30c79f3b2100c14a73fa63f0970cdf1436dc4f496191cbd423fa5bd8d7afd34e201f938caab0741ed9b54d2
-EBUILD coolreader-3.2.39.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
-EBUILD coolreader-3.2.45.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
-EBUILD coolreader-3.2.49.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
-EBUILD coolreader-3.2.50.ebuild 2451 BLAKE2B 8af1d70bd2b98b2220597219d8dbca27aea5c8dcc9bb47b485a156b05a5cbdc26769bfe244ccf09df2e9e7ab5e8a26053870045b936d9dfdee0fc6ac399f0ec4 SHA512 a0e0b386ec853cd5d6e8668bc59dfe3d260fbbe3b7d9d2699d9f4c3ad9524c4581a7fc146347fa6d59173a0e869a36ed9b08a1f16d1c888c079b1f1b43280339
+EBUILD coolreader-3.2.50.ebuild 2450 BLAKE2B 94b8e8cbfaee42fca275ba15fe910e0feb5962f3f1b5a5388e4e45281d7089300904dcda2e38085fb9510b1535320d4e260c63e9480eba5bf0f1e0b87747159c SHA512 2ce5d70774b33bf61efb62ce5546210b07521709e55da040d849fc4d84b225dae16148b6f30aa199c7d991675a33ce94627af77a128d37d4e2bf100821119d80
+EBUILD coolreader-3.2.51.ebuild 1756 BLAKE2B 249d73cd0c5754eed0083e3b33836620be1ec53aeda9cd83100ad119ef8093369190dfd6765cd0cd615c5fa27cc1d69d37cdf22effbc728232c4209135e33f00 SHA512 2ab5f9f9e6e4f9a440cb81d52208d4399879558d7bb41e4310ad35401dd850e99d8abf525370c960f4bc0b91258ab789f14c130488c7aa9eb136ee6517aa37f3
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.39.ebuild b/app-text/coolreader/coolreader-3.2.39.ebuild
deleted file mode 100644
index 0b26482993e9..000000000000
--- a/app-text/coolreader/coolreader-3.2.39.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-PLOCALES="bg cs de es hu pl ru uk"
-inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver
-
-CR_PV=$(ver_rs 3 '-')
-
-if [ "${PV}" != 9999 ]
-then
-	SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-cr${CR_PV}"
-else
-	inherit git-r3
-	# github mirror has some new commits to fix page margins settings
-	# sourceforge mirror saved as backup
-	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
-	EGIT_REPO_URI="https://github.com/buggins/${PN}.git"
-	SRC_URI=""
-fi
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://github.com/buggins/coolreader/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wxwidgets"
-
-CDEPEND="sys-libs/zlib
-	media-libs/libpng:0
-	virtual/jpeg:0
-	media-libs/freetype
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
-DEPEND="${CDEPEND}
-	!wxwidgets? ( dev-qt/linguist-tools:5 )"
-RDEPEND="${CDEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-for lang in ${PLOCALES}; do
-	IUSE="${IUSE} l10n_${lang}"
-done
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# locales
-	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
-	local lang langs
-	langs=""
-	for lang in ${PLOCALES}; do
-		if use l10n_${lang}; then
-			langs="${langs} ${lang}"
-		fi
-	done
-	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
-		-i "${S}"/cr3qt/CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	if use wxwidgets; then
-		setup-wxwidgets
-		local mycmakeargs=(-D GUI=WX)
-	else
-		local mycmakeargs=(-D GUI=QT5)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if ! use wxwidgets; then
-		mv "${D}"usr/share/doc/cr3/changelog.gz "${D}"usr/share/doc/${PF}/ || die "mv changelog.gz failed"
-		rmdir "${D}"usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
-		gunzip "${D}"usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
-		gunzip "${D}"usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-text/coolreader/coolreader-3.2.45.ebuild b/app-text/coolreader/coolreader-3.2.45.ebuild
deleted file mode 100644
index 0b26482993e9..000000000000
--- a/app-text/coolreader/coolreader-3.2.45.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-PLOCALES="bg cs de es hu pl ru uk"
-inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver
-
-CR_PV=$(ver_rs 3 '-')
-
-if [ "${PV}" != 9999 ]
-then
-	SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-cr${CR_PV}"
-else
-	inherit git-r3
-	# github mirror has some new commits to fix page margins settings
-	# sourceforge mirror saved as backup
-	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
-	EGIT_REPO_URI="https://github.com/buggins/${PN}.git"
-	SRC_URI=""
-fi
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://github.com/buggins/coolreader/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wxwidgets"
-
-CDEPEND="sys-libs/zlib
-	media-libs/libpng:0
-	virtual/jpeg:0
-	media-libs/freetype
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
-DEPEND="${CDEPEND}
-	!wxwidgets? ( dev-qt/linguist-tools:5 )"
-RDEPEND="${CDEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-for lang in ${PLOCALES}; do
-	IUSE="${IUSE} l10n_${lang}"
-done
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# locales
-	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
-	local lang langs
-	langs=""
-	for lang in ${PLOCALES}; do
-		if use l10n_${lang}; then
-			langs="${langs} ${lang}"
-		fi
-	done
-	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
-		-i "${S}"/cr3qt/CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	if use wxwidgets; then
-		setup-wxwidgets
-		local mycmakeargs=(-D GUI=WX)
-	else
-		local mycmakeargs=(-D GUI=QT5)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if ! use wxwidgets; then
-		mv "${D}"usr/share/doc/cr3/changelog.gz "${D}"usr/share/doc/${PF}/ || die "mv changelog.gz failed"
-		rmdir "${D}"usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
-		gunzip "${D}"usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
-		gunzip "${D}"usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-text/coolreader/coolreader-3.2.49.ebuild b/app-text/coolreader/coolreader-3.2.49.ebuild
deleted file mode 100644
index 0b26482993e9..000000000000
--- a/app-text/coolreader/coolreader-3.2.49.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER="3.0"
-PLOCALES="bg cs de es hu pl ru uk"
-inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver
-
-CR_PV=$(ver_rs 3 '-')
-
-if [ "${PV}" != 9999 ]
-then
-	SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-cr${CR_PV}"
-else
-	inherit git-r3
-	# github mirror has some new commits to fix page margins settings
-	# sourceforge mirror saved as backup
-	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
-	EGIT_REPO_URI="https://github.com/buggins/${PN}.git"
-	SRC_URI=""
-fi
-
-DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
-HOMEPAGE="https://github.com/buggins/coolreader/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="wxwidgets"
-
-CDEPEND="sys-libs/zlib
-	media-libs/libpng:0
-	virtual/jpeg:0
-	media-libs/freetype
-	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
-	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
-DEPEND="${CDEPEND}
-	!wxwidgets? ( dev-qt/linguist-tools:5 )"
-RDEPEND="${CDEPEND}
-	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
-
-for lang in ${PLOCALES}; do
-	IUSE="${IUSE} l10n_${lang}"
-done
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# locales
-	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
-	local lang langs
-	langs=""
-	for lang in ${PLOCALES}; do
-		if use l10n_${lang}; then
-			langs="${langs} ${lang}"
-		fi
-	done
-	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
-		-i "${S}"/cr3qt/CMakeLists.txt \
-		|| die "sed CMakeLists.txt failed"
-}
-
-src_configure() {
-	CMAKE_USE_DIR="${S}"
-	CMAKE_BUILD_TYPE="Release"
-	if use wxwidgets; then
-		setup-wxwidgets
-		local mycmakeargs=(-D GUI=WX)
-	else
-		local mycmakeargs=(-D GUI=QT5)
-	fi
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	if ! use wxwidgets; then
-		mv "${D}"usr/share/doc/cr3/changelog.gz "${D}"usr/share/doc/${PF}/ || die "mv changelog.gz failed"
-		rmdir "${D}"usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
-		gunzip "${D}"usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
-		gunzip "${D}"usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/app-text/coolreader/coolreader-3.2.50.ebuild b/app-text/coolreader/coolreader-3.2.50.ebuild
index 0b26482993e9..0f27ef3e2ac8 100644
--- a/app-text/coolreader/coolreader-3.2.50.ebuild
+++ b/app-text/coolreader/coolreader-3.2.50.ebuild
@@ -26,7 +26,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.51.ebuild b/app-text/coolreader/coolreader-3.2.51.ebuild
new file mode 100644
index 000000000000..6abcf90a4895
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.51.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake wxwidgets l10n xdg
+
+CR_PV=$(ver_rs 3 '-')
+SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-cr${CR_PV}"
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://github.com/buggins/coolreader/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+CDEPEND="sys-libs/zlib
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+BDEPEND="${CDEPEND}
+	!wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+src_prepare() {
+	cmake_src_prepare
+	xdg_src_prepare
+
+	# locales
+	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES $(l10n_get_locales))|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	if ! use wxwidgets; then
+		mv "${D}"/usr/share/doc/cr3/changelog.gz "${D}"/usr/share/doc/${PF}/ || die "mv changelog.gz failed"
+		rmdir "${D}"/usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
+		gunzip "${D}"/usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
+		gunzip "${D}"/usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
+	fi
+}
diff --git a/app-text/delta/Manifest b/app-text/delta/Manifest
index bf36883700d5..133dcbe9ae03 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 745 BLAKE2B 98f6228385beed30d1429ebef011ec09bb6742de3c859f2d5e4f0d550bded6f78ceb4a636b2315e755a449f513b8ba98c4c1ca614d8d991c1d645255a63609f3 SHA512 8e99acdbc99a0f9c7ae6a45207350f075f8b79c8b61da80a4ac07b5e435e6fa6ecf117de8aeeea7dacc1d2ee5ed0ca908008e5407363d519a91edcf8600b84ed
+EBUILD delta-20060803-r1.ebuild 746 BLAKE2B a8b8b4536f4eaecc6815cf8e2a3491ec2df173eac1ac6d3e7ca87dea5e220be931cfaf6989140d15062c2382ca45f1aca93de6e25f93fd22abb4881b96d3c4de SHA512 0d9430629839b65478e0bb37d7ca69919cdd878006b9e86822c2b4b3e2977ac2db2137b60e821fb1eea6a1bb83a74fbdc0dc228dc5918ce73ce3e1fc75b14146
 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 e0f4c7f04beb..3e9e37157091 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 ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/diction/Manifest b/app-text/diction/Manifest
index 55e1669cd3b4..d2cf83faa730 100644
--- a/app-text/diction/Manifest
+++ b/app-text/diction/Manifest
@@ -1,6 +1,6 @@
 AUX diction-1.13-make.patch 367 BLAKE2B 1b29ff3455dc455210dd1277281b175292ead12e3aebe3459d837597c2f4f37ab7608ee2819e284992f542f5a0bc5b699c671189e650810289adc25daa8393bd SHA512 ab317f3de37697a098dc9c50ef741417772ab66434a41b89381bf123b9e980263a1b6b488f7f1b1bfbe25a178b2d7acc793067e8eb26e34300e639765af818bc
 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 533 BLAKE2B be737206ad5f63b272c1cbb63c2c5a16c302425579fe99af07370c74334c6f657f0c404a977dd662430778724127556735dcf7ff68976edb86afacf0d5189e73 SHA512 5fa2258799fc31ccd0efb0a1ff7a19b5ea494985404ea85a0c1aa44f36c8f4430ea75cca0ec16d8548eceb37b395ca7ac4c38f0d0f655b324d706ce4af99c483
+EBUILD diction-1.13.ebuild 561 BLAKE2B 6fe02769be4aa1e27ccec9d7246a5fa77ad7bb3e31c26e95b9eaf29edbc79019c7b0ffcae8cbc092226543669a3c859280cb338855b9c0956ee68fe0c55b79f4 SHA512 2625e94dd8e2ad3ec9cd2ec272123517bd3dbf332285e3729cdc59ff909a2ff701e7a977e78ba98000bc81aa6dec4e899b73ee0d8175704853824456fbe15023
+EBUILD diction-1.14.ebuild 534 BLAKE2B 856fc77f1a7522509164b97e65fe1787265298f2fa52738cf4389f54936a44baba57b00062028d5de7792d6c8ecd5b9623880ef4000489ee9c653e69cab5a6d8 SHA512 d2209492c2a6ee191504bae3d2c98f4b1a2d3c8727eb9984e92e7361940d7c588538b06af7a0a3bf5a2380f9043f828c0ad04da2caf874a6025f9c1b251992e4
 MISC metadata.xml 901 BLAKE2B 5643435f17fdfe599f47305f23c4ccc9b6430a5b5dd8fb9344fed92b760e9715c3aa30adf4a99c02543dc173e07b8e6ba233f4a0389c5d006b3d22d955e6bf34 SHA512 7c48abbc5a289f52d53ea115427794db393fadf18d875edc2419efa2d1426e425adcb955ba3f19790928e21c071cd55327fbfe006f2f5bb571bfd5be12b79b57
diff --git a/app-text/diction/diction-1.13.ebuild b/app-text/diction/diction-1.13.ebuild
index dfe2b194b77d..2bd1c55453b6 100644
--- a/app-text/diction/diction-1.13.ebuild
+++ b/app-text/diction/diction-1.13.ebuild
@@ -10,7 +10,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/diction/diction-1.14.ebuild b/app-text/diction/diction-1.14.ebuild
index 10e5903d6fa5..9f39fa67f731 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/ding/Manifest b/app-text/ding/Manifest
index b51f06ad6ba3..ce88a092dd17 100644
--- a/app-text/ding/Manifest
+++ b/app-text/ding/Manifest
@@ -1,3 +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.9.ebuild 582 BLAKE2B 785753a604911eee32c78c1ffbd5a6901aabf236f4ae211e89bc6a567cb553faed1f7e054ac744d964cc604ca3a00a33c2219555fcc2e711b1d1ed8b6d675512 SHA512 f6c399012816652fd50389324746f59866b1c3d86a802ad28b3c02a80bb680c2d96e2a7fc93baac6c8d0b2f22f2b3f894e97d9d75b508249c4aa92be95a3c78e
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/app-text/ding/ding-1.9.ebuild b/app-text/ding/ding-1.9.ebuild
new file mode 100644
index 000000000000..fb609a2d281f
--- /dev/null
+++ b/app-text/ding/ding-1.9.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop xdg
+
+DESCRIPTION="Tk based dictionary (German-English) (incl. dictionary itself)"
+HOMEPAGE="https://www-user.tu-chemnitz.de/~fri/ding/"
+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"
+
+src_install() {
+	dobin ding
+	insinto /usr/share/dict
+	doins de-en.txt
+	doman ding.1
+	dodoc CHANGES README.md
+
+	doicon ding.png
+	domenu ding.desktop
+}
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 31c5ef5b986c..666e32442fb1 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,8 +1,4 @@
 AUX gethopt-undefined.patch 358 BLAKE2B ccc264eece330bc0c8979731410488b070c91e73381ed4f00ff95f04c5f023948f304dd70c0f8ec4ff67abf266d80ce8931fa46f53486e2e0e003f151fbda4b7 SHA512 a7504f3ab60ff49b72e475e558e128522757874d4328abf7e488313dff7c2fc3650fffc12a03109601a14348f24f21a83ed0e83f9d6fe1176207ac2692800dc1
-DIST discount-2.2.4.tar.bz2 99482 BLAKE2B b04c372cef27d0a4a09a588eb66376dc70494eefe5c8a9e7aedb8075f081a6f32eafbb9671c29deea7d89128f4f30c93d38c17268eccbb1c917db6c1b7d3e040 SHA512 0650e0ce3f6948e3a30fdaa1a810e895f64621c55df46c7a5ed8755e65c1b718b7a1d1a1bfe0a87a3a59fbb13fca8907718f1aa095125a4b6e152602b8e490cf
-DIST discount-2.2.6.tar.bz2 102303 BLAKE2B 6ffcb64ff8889d79832b28db9a824e5a30bd194a6746dd08e4782cb4b7e60cf47c44f244884fc10372fc2b052fff7d70e6c263e6f4175829d1aedbc8c2ea15c6 SHA512 b67395afed0899563e28fdd2ddd5016d4f382b6b7e46612d12853d701ba191b90771d40e1223e24e3fbf497cad01fdd2e1c67a6b2bf4f6cf082f3fbe981bd002
 DIST discount-2.2.7.tar.bz2 102277 BLAKE2B 58ec3bce2b8fc41a090d9b81b4326cbf54e36bf774f4f9ef63c2a2b1d34ba464e9f0a021f19b4fef165da426742af3045a631af005371d1a8a4cd81dc0be3367 SHA512 1b61eb7c625bb50da0dbe97350a0ccbb15930ccaef449c4b4659950907bce3c0564dabf20578379a7fdd0e375f5d4d5b61acd34db474a85e942b60373688bd08
-EBUILD discount-2.2.4.ebuild 1821 BLAKE2B f4a6861947e64cff3200ecddbc162543df545cc6b06fb87394c6f5a64d1637c11cafea16db2417352e33600ff6e946e5250bf0feb15c29c6cea130dee72eb663 SHA512 0a73f39f35c11fb0dc7f5321ee754516db1f24e4b1c9dbf831dd9cc3be248ede956093c1b04360b11edca04f5d33f5ee45c18537cefbe3f9ff9b5ac39cafc75f
-EBUILD discount-2.2.6.ebuild 1695 BLAKE2B cfbbb57f39a7da1c13a3aa259ad7cf104c5878eed9fe693e43abd0b755a218f203ed4feb25c8f226159d6ae2b3d3ff6a41a04c9c9570d81acd8a166bc278ef89 SHA512 1e15684ee950a536168ac56806138e49dc473d2f5e525dde90dd4bb7113340a6e9022f38a72690e24b852d5f1db80768f203e33b8f43410c5bf794a2878ccdcc
 EBUILD discount-2.2.7.ebuild 1689 BLAKE2B 651427216f362998b152643705915ac341e0fc94472f2de6a2e80463f69169e4695727f7eba414dbda4269f9fc7d32d8369b3a4d10b8ea0439cc92cc00349420 SHA512 e04aa1010ae1c117421c18dc89a0cddbe3db76481450829af53215591f63f1e263198b5abdfead28a4c1565fcbf2b17ad5e5a5fd1fed688cf24ed8f39d793e3c
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-text/discount/discount-2.2.4.ebuild b/app-text/discount/discount-2.2.4.ebuild
deleted file mode 100644
index d7b7fb5209f7..000000000000
--- a/app-text/discount/discount-2.2.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Markdown-to HTML translator written in C"
-HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
-SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 sparc x86"
-IUSE="minimal test"
-RESTRICT="!test? ( test )"
-
-src_prepare() {
-	default
-
-	# for QA, we remove the Makefile’s usage of install -s.
-	# Drop ldconfig invocation.
-	# Force “librarian.sh” to respect LDFLAGS ($FLAGS should have CFLAGS
-	# at that point).
-	sed -i \
-		-e '/INSTALL_PROGRAM/s,\$_strip ,,' \
-		-e 's/\(LDCONFIG=\).*/\1:/' \
-		-e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
-		configure.inc || die "sed configure.inc failed"
-
-	# Add LDFLAGS and CPPFLAGS hackily.
-	sed -i \
-		-e 's/^CC[ \t]*=.*/& $(CPPFLAGS)/' \
-		-e 's/^LFLAGS[ \t]*=.*/& $(LDFLAGS)/' \
-		Makefile.in || die "Cannot fix LDFLAGS and CPPFLAGS"
-}
-
-src_configure() {
-	local configure_call=(
-		./configure.sh
-		--libdir="${EPREFIX}"usr/"$(get_libdir)"
-		--prefix="${EPREFIX}"usr
-		--mandir="${EPREFIX}"usr/share/man
-		--shared
-		--pkg-config
-		$(usex minimal '' --enable-all-features)
-		# Enable deterministic HTML generation behavior. Otherwise, will
-		# actually call rand() as part of its serialization code...
-		--debian-glitch
-	)
-	einfo "Running ${configure_call[@]}"
-	CC="$(tc-getCC)" \
-	"${configure_call[@]}" || die
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(usex minimal install install.everything) \
-		SAMPLE_PFX="${PN}-"
-
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins libmarkdown.pc
-}
-
-pkg_postinst() {
-	if ! use minimal; then
-		elog 'Sample binaries with overly-generic names have been'
-		elog "prefixed with \"${PN}-\"."
-	fi
-}
diff --git a/app-text/discount/discount-2.2.6.ebuild b/app-text/discount/discount-2.2.6.ebuild
deleted file mode 100644
index 9cb5d5ea9f15..000000000000
--- a/app-text/discount/discount-2.2.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="A Markdown-to HTML translator written in C"
-HOMEPAGE="http://www.pell.portland.or.us/~orc/Code/discount/"
-SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="minimal test"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/gethopt-undefined.patch )
-
-src_prepare() {
-	default
-
-	# for QA, we remove the Makefile’s usage of install -s.
-	# Drop ldconfig invocation.
-	# Force “librarian.sh” to respect LDFLAGS ($FLAGS should have CFLAGS
-	# at that point).
-	sed -i \
-		-e '/INSTALL_PROGRAM/s,\$_strip ,,' \
-		-e 's/\(LDCONFIG=\).*/\1:/' \
-		-e 's/\(.\)\$FLAGS/& \1$LDFLAGS/' \
-		configure.inc || die "sed configure.inc failed"
-}
-
-src_configure() {
-	local configure_call=(
-		./configure.sh
-		--libdir="${EPREFIX}"usr/"$(get_libdir)"
-		--prefix="${EPREFIX}"usr
-		--mandir="${EPREFIX}"usr/share/man
-		--shared
-		--pkg-config
-		$(usex minimal '' --enable-all-features)
-		# Enable deterministic HTML generation behavior. Otherwise, will
-		# actually call rand() as part of its serialization code...
-		--debian-glitch
-	)
-	einfo "Running ${configure_call[@]}"
-	CC="$(tc-getCC)" AR="$(tc-getAR)" \
-	"${configure_call[@]}" || die
-}
-
-src_compile() {
-	emake libmarkdown
-	emake
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		$(usex minimal install install.everything) \
-		SAMPLE_PFX="${PN}-"
-}
-
-pkg_postinst() {
-	if ! use minimal; then
-		elog 'Sample binaries with overly-generic names have been'
-		elog "prefixed with \"${PN}-\"."
-	fi
-}
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index 3e57fe45c968..513787e6f9fb 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 1618 BLAKE2B f991420a159705cdd2c831bff582f7c976b03d3347570c82778a375f5f4f3fdc25099284feb38f4e574995e01d33861da5dd113ad52fe57b700793008aa608df SHA512 6c7e5de37a58fe483fa8f1d09f8fa4ed802e839b6f8dc38e9c6c002dc7724cc2844c62bb99b53b86f9c988f10b066aed4147c735d1007dfdb0be393bfc36af01
-EBUILD docbook-xml-dtd-4.2-r3.ebuild 1612 BLAKE2B b693bbaf79d9352eb114b8aa591156eb70d2021cc01e5ef05380f27a13f4feefb04ec511528c687f2316aed9b787a88dfb63edf4317f5858932a6a1bed7c78f4 SHA512 cb72164ade9652fb782daaf2838600f89dce24c7c90c674b6c8674a0d08db47d38a5a18d2cce81992dee2834bed48055269f110b8bea14db491df8d8b62d51e9
-EBUILD docbook-xml-dtd-4.3-r2.ebuild 1612 BLAKE2B b693bbaf79d9352eb114b8aa591156eb70d2021cc01e5ef05380f27a13f4feefb04ec511528c687f2316aed9b787a88dfb63edf4317f5858932a6a1bed7c78f4 SHA512 cb72164ade9652fb782daaf2838600f89dce24c7c90c674b6c8674a0d08db47d38a5a18d2cce81992dee2834bed48055269f110b8bea14db491df8d8b62d51e9
-EBUILD docbook-xml-dtd-4.4-r3.ebuild 1645 BLAKE2B 9c07c45c4939e7d8a1033f621a2f2be715d54b18c7e4ebdb4973a0a09816201fe6d936588578a7f844cf5c3ffd9a74b22dcabf31a79c530065202dcdaadbca09 SHA512 40ec25dd255a9dd5ed967911a36bea2545fed4c1f1595d4e445677c1adbd5d1e6c1da8fcfc7995aabf64fe8a83eed3746e2fdbdb33afe4429ba1673b5866bc75
-EBUILD docbook-xml-dtd-4.5-r2.ebuild 1645 BLAKE2B 9c07c45c4939e7d8a1033f621a2f2be715d54b18c7e4ebdb4973a0a09816201fe6d936588578a7f844cf5c3ffd9a74b22dcabf31a79c530065202dcdaadbca09 SHA512 40ec25dd255a9dd5ed967911a36bea2545fed4c1f1595d4e445677c1adbd5d1e6c1da8fcfc7995aabf64fe8a83eed3746e2fdbdb33afe4429ba1673b5866bc75
+EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1598 BLAKE2B 9532884bee3ca5df4fa64480907e9a6d8950a462058392f89735c336f711d434b381f25a8cf87dfc03f82e6df801e574641b9c7a3e21296af14d76b330aa80ca SHA512 fe2393868716024c8c66414bdc170ef30cc13c75b57f9cfc146720ee71b8bcc73a85cbb9c603549569fadbcef97a43ec610b0ea6dcf6f87866c15d2cb9e05b91
+EBUILD docbook-xml-dtd-4.2-r3.ebuild 1592 BLAKE2B 335066e9686dde795af611aa58e36cb1ed1085bf9a4c2eea0371d048c2369284f240ece80205e8e840352f1b142c3b72c6577f69b2bd5d4b499a11edfe1cb929 SHA512 be9963270c7e8b22ac036f19c1824fce5d55d10472eb99a9235fb27060e9aa2393a36ec0e8f50d833bb984b86214eef0e40a9846fb2d7f26519857691e50f23b
+EBUILD docbook-xml-dtd-4.3-r2.ebuild 1592 BLAKE2B 335066e9686dde795af611aa58e36cb1ed1085bf9a4c2eea0371d048c2369284f240ece80205e8e840352f1b142c3b72c6577f69b2bd5d4b499a11edfe1cb929 SHA512 be9963270c7e8b22ac036f19c1824fce5d55d10472eb99a9235fb27060e9aa2393a36ec0e8f50d833bb984b86214eef0e40a9846fb2d7f26519857691e50f23b
+EBUILD docbook-xml-dtd-4.4-r3.ebuild 1625 BLAKE2B 6f13a906dba3befd094c0a0176093864285344aa96d8ddb1a2ede4e500fc6b8b36e7091b8e53b18e479e0bf9100788a5857c67354223ab74983f2928a6fc2f35 SHA512 f2b6c7e2b190e3e960b4cc1a7a18896b77cb7c6e491d6fa8e6b13118893b6dec9854f5d39c573c86b2e9ee63b69c9843d501fb338670f2aad62c6eb5e4db88ce
+EBUILD docbook-xml-dtd-4.5-r2.ebuild 1625 BLAKE2B 6f13a906dba3befd094c0a0176093864285344aa96d8ddb1a2ede4e500fc6b8b36e7091b8e53b18e479e0bf9100788a5857c67354223ab74983f2928a6fc2f35 SHA512 f2b6c7e2b190e3e960b4cc1a7a18896b77cb7c6e491d6fa8e6b13118893b6dec9854f5d39c573c86b2e9ee63b69c9843d501fb338670f2aad62c6eb5e4db88ce
 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 24d96694ee94..6e67cf3e70ed 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-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 da721f3820e3..2293c3d4de53 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-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 da721f3820e3..2293c3d4de53 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-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 781c554196b0..cfa917192271 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-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 781c554196b0..cfa917192271 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xsl-ns-stylesheets/Manifest b/app-text/docbook-xsl-ns-stylesheets/Manifest
index d20a917d925e..66b7d2ad57d2 100644
--- a/app-text/docbook-xsl-ns-stylesheets/Manifest
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -1,5 +1,5 @@
 DIST docbook-xsl-ns-1.78.0.tar.bz2 4992293 BLAKE2B 3bc93ca1dc45756121a4a3838093539957bba4ddffbbd7d27c5df6c63422a8694ea7d805cc9585ab1ce2d9092e35b91cd3bde97ee2fabb91c8c870eefa8ded1d SHA512 f3b9b52a4ba5670c17086cdf64674080ef82a9226f085887c23c53d2d102611d690895c71d14186cd84a25c7735b05d6c55207f4b2b9084d65889aaac7993cf3
 DIST docbook-xsl-ns-1.79.1.tar.bz2 21962317 BLAKE2B a68cc31ea8cb98fc07e198fe55f242c6438284d6fa75d4920a9ca7b5038732f966cc6653e058d7fafb26c0ff49f2039025a48a0f8c0392ee892951723703bce3 SHA512 23fd06870bd5afe4efcd08c8ad679821c202a62442b50657c093cbe9cd71b585a3c56a5534a0d41119f58bf98b1f9014a53ff2e48ab59075ec1827e7363980e9
-EBUILD docbook-xsl-ns-stylesheets-1.78.0.ebuild 1640 BLAKE2B ccb3540ed6cf179b2904b883ab6d374e288f9d2d8d7bbbfdbbd288bf247db91c6da1dfb10438d88c584d45de4145efa73d5d228f547dd43e93039536fa7822a0 SHA512 07a1ee35519c2a2753b74e909da1597bfb21daf2b29428828b4d99dc8209a08e4bf6b0bfc5395ecedafa820a09e39703f100a266190242b3127e484aa7610722
+EBUILD docbook-xsl-ns-stylesheets-1.78.0.ebuild 1641 BLAKE2B 1826f1005d3f2f818997ad1f7b6a3c6beeb50cd74eb72fca1ea66f7eb2f4cef316d3729214946ab5394ef988c4ae2c81a61f8634fdd3404a01ad510a43a15403 SHA512 9b5488b87bab1b8deed5566ccd7675c40bb743aa85e03cc6aaa13a33f74803119e000c62a0070479af6250b095259aa39241c5ffdf7611d36e1ca6d4f109b9ec
 EBUILD docbook-xsl-ns-stylesheets-1.79.1.ebuild 1671 BLAKE2B c9a70e167f12858a3ae7331ba47ebf64ac6a7446909202e37cc5bf6420d885ecfa1d54286b270e191137db33a82d00a32c0b10adf88c06832c446b68690101db SHA512 e3dfa7ad205e9424b3af557f42017cd59ce35312cb6f731e2cfe4c46a8cf1e4765a60cc04c1d791f2b9bc4ce70f61e0044950e368b8c6fbd0b005cbf8705ba24
 MISC metadata.xml 411 BLAKE2B d10acaa19dc1518378813204f8afa18a97c88647b8cb6cdfa0e214935b999ee17aca34e6c3ecabfbaefabfa6ea229eaaa4c2a6ebf877888e32e6ef1351f5fad8 SHA512 55962cd28fad52f6dc931791e3e2288e22e183e3d49183e0f9ff890d23a38d6ad928eed4ce0b4e41b4f381234536ff67c219e4c8a75efd32cc0a14eefee6e299
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
index 00619ac44513..7c98fc5c085c 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.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 bbca304d51d1..8ff30a0a486e 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 2148 BLAKE2B 8f7d796e50163d868adcaeef7352b5460a2395c84deb119a997ab86133ea387e5326a785ad7a33c692983ef9dd0f16c90d07bf21746b6f674927f5c1f4a6a98f SHA512 849295da49fe9e165a568a68a2e380fd2e3726824c1d4b2631e32de736f22e61065b3939bbd780962cb04a69ce8e54461250bb1cf13afeb3462f24b1d9b3398c
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2128 BLAKE2B d5c40f639238ed54a009b44f089f37eca91b29c5d169f853f544de40130e0d079e1923a662fcbef6a55524e67a4db9a71858fc4916332d23688b48940ffb8768 SHA512 47318afbcdfaee0f367378002db49cbb2292797c63fd1f9a2498d928cbfee64e9bbcf0ae61c324cce7b8d04fec29efa730fa0ee3b82f13d716c9137818761f23
 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 cc082f08fe8c..87000ed1dfd0 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
 RDEPEND="
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 585464088200..feb859a5bb1d 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,7 +1,7 @@
 DIST dos2unix-7.3.5.tar.gz 662133 BLAKE2B e24f77d92fe0c5931f9ca762b79a1713b14cc39b7566f78d55c4fd58bb7d3c0de1f2a8add8ffd6c3fa26a6bae73c412572fc71701e26b7b52f15b51b0de0d294 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58
 DIST dos2unix-7.4.1.tar.gz 711570 BLAKE2B 3dbe33007aa3e2ef47ec3dc0c3165987986955fffd7ae1435725014d52ba716626e7891911afe11674beec11fa62a12983c8dfc28cff682ca0c3e798449a9b0f SHA512 81e7cff82d95b298fb218b073f54d17fa851a7507fbd54b3cd9af7c1efa6a7bd3cf59f7a84ffbaf395403bf458650763e1755944451b24f708878a9c62316dc4
 DIST dos2unix-7.4.2.tar.gz 727429 BLAKE2B 5ba8aecfe3a79dfe9f4d7d69453fdcdd573c8889b41240c6bce5fea1b7e9e8213454af98f768cb2d199c85684a7d48192ba4bf856a92b867594b52a2209d5e04 SHA512 3fb77561596bafd83f3f7807ce967e58d5a96e5235afe3a4074ae7112297445690b2586bf652eb0b5bd1984fd41a79478355f6df8244561b4167a8a09593110d
-EBUILD dos2unix-7.3.5.ebuild 2060 BLAKE2B 79addcc1d203a536003d9ac775c520f09a3f816898e1c888e5d3305500db1a18439d9503f365e91e2c5379456101c1e090926191d09f67d5eae00c6cd632f418 SHA512 c486b0abc3b9ca00bd4fc0909298ad4340d6b84e949ffe7f61ac2e0c05a9aa47b83a72616d1b53f867f2b51ec04dd44467f988311cd9a11e031ba2e4a4ed1936
+EBUILD dos2unix-7.3.5.ebuild 2061 BLAKE2B 099e35bee439364ca29b05cec0c2854e4c56934fc0ea7f6ef80e6519672cecf908c460a865654dedd84459b53112b6be1abffcd8e80447a6afeb169991ef689b SHA512 a2589e5eabec4efd11d8315c9666ff0cf904d14b41f8f47c92e5f53cd768cf42e91624c83acdc864bcda9fee47ebfe0943fd103a1ed4f18d5579eca61b501a3e
 EBUILD dos2unix-7.4.1.ebuild 2080 BLAKE2B 4ee1a14eabb90520cdfb6a163d2bc04f2c3aa7632914e47efc8d5c77e974d2590d422eab6e59cae6e4ce0ecd0723721a640797b8a5b6390a2041cec6f7919cf3 SHA512 71a45fdfd99e9e0ac65b12f81e7f7ff5d15608f82521f24a5bdc17bf439237aa6546e0bdfa8dc6a5e00b3c02344d14f43ea1ab5dbf219c8221b988e1e87f941b
-EBUILD dos2unix-7.4.2.ebuild 2154 BLAKE2B 3a270da858e1147072870740055ba8863e95396c083b9a6cb4b9be75df24fe232d033cdfbc84b25bf4514ca7870e4c5a4727ea8987c938959a3cb34d011fcebd SHA512 900eb5aa4b1d43ef2b204a3f657fea14ad6fff4f959d342230058156bbfc15732895dceb9d430562ad9f0b75db34b4633334ae4c8b982913ab7dbe1764722fc2
+EBUILD dos2unix-7.4.2.ebuild 2152 BLAKE2B cfbe03e21d8d1eff52084ffb099f1c1dfc92c94bbdd7c79fb63cea41125157f2ed9c0ccab0971048a7967bd8d69104b18293af0c503928c0f62a48fc58ab618d SHA512 480dc9b86ee00c6361484c7fffca46a5a87567d5ad416856ea30c2aa86080b9e77f09dfac1f99ad64f621fed93ae3e748198af18d002dafb28d6fb97cda6dac3
 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
index 4c44884af4dc..115772b6ad1a 100644
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 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 ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/dos2unix/dos2unix-7.4.2.ebuild b/app-text/dos2unix/dos2unix-7.4.2.ebuild
index 6edbea3b26fb..45a0999b5fc5 100644
--- a/app-text/dos2unix/dos2unix-7.4.2.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.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
@@ -16,7 +16,7 @@ SRC_URI="
 LICENSE="BSD-2"
 SLOT="0"
 [[ "${PV}" == *_beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index 068ee8457932..84e9f460cecb 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 1114 BLAKE2B 319764d1578b4d31c78e9bc30a35e671a1c0c41a019997bc928b48b9749c66084dcad82175daa4fe904792d6d20e7bb8d1a1c746b42f40222727382a1ae87ccc SHA512 72980cb4001b3d3b4ea72f2eda4e3b661f73577d15b9795de606848055d90d7746357cb25c4d8945972f99d519a4f4351e7a9c48015e7540696e1f8ca219990b
+EBUILD dvipng-1.17.ebuild 1113 BLAKE2B 791361e4820fc0e85b04f3544dc64745f8bc4f71f9c5d5834793a9eb1f6b8e8c940a78ff042bff831184913c82b6edcb60e01b0bf9008529bbd64c13fa6e62bd SHA512 ce800ecb8972247c4929358e7bd22a9ae18d911cbf44f918d18324205083f54a7826842cf1225d070ad3d2c1f320bd8eb94117633bfaa2fd80a519f45a6e442e
 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 8a5a35b55006..4b506d678ec3 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/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 45c59b6eeebe..4752a6d2f499 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -2,7 +2,7 @@ DIST dvisvgm-2.1.3.tar.gz 2802278 BLAKE2B 36e523d4b82a71f26ebc50428c56863a3729d1
 DIST dvisvgm-2.10.1.tar.gz 3110061 BLAKE2B 3f3bb50baa587c1d20061d235885b4c921efbd3400aa7e4d2df872e37e0ef57d57ae4713fedfd0587d7fcffe7e0286ca55e319e6e82b3b72b49c5df5fa08f633 SHA512 8faa68b13a0e351ba54b5c9acb1dbda6e081eddd167b2cc599208cc2e7967c116c3d105d29df224165daff88f81acb3135d936ec9b2da4dce2c82c197f6a4e78
 DIST dvisvgm-2.6.1.tar.gz 2911596 BLAKE2B 8dfe85140db4b462c1721a8bad322d52535a0fced4bb8c374c342bd4ca8fe5cf6dfa5751a8a8070b9ce622ab7bb7df14985802c596fdc387f90febc80151fbd6 SHA512 791183f92ec4733574614fd5b8b4247a7b766b62b1aa7b1444d508d0358178b1447b24fb51d09948d99552c2cb7ed3a0f9bce0416b66de8a4835f85476bbdb25
 DIST dvisvgm-2.7.tar.gz 3037242 BLAKE2B f93bcc4220adf4b2c0d7e06deb11416f22c623f07c96ca9aa9093054e18ec72f8da1d93aa4ee467f82f9478bb0c1b8acebbb56de020f47563056dd0dbea5936e SHA512 b706085015d1ab4c9b88997cf6c1c93f6c0ee60c9d1429d3fba7bed7b5acb3392958f64b4207ae27e6eb52abb19ff9640e2b7459e4b19ae21986b82d4b65b182
-EBUILD dvisvgm-2.1.3.ebuild 1108 BLAKE2B 0a391190895375304ad42e95472551a4a92ea583d92a9739befc775b8e9a411d637cafaf8dc84c91aa7314e026a736344162fd1f220d044e7059290af041a6c7 SHA512 58dcfd060f1ab8320ef14956a705adc4a225e35217399b6a8058621c03d46ccc382cb333e0596be7e811a128c5b1851cc35943caf057ec73c489d797178b6508
+EBUILD dvisvgm-2.1.3.ebuild 1109 BLAKE2B f16def74a84cd1801f26a9f7917e74e05440224436789bb690fa8606f5c320468e16accf97a8ec36407b99b1278b61bbcec6839b8d1230017019d743cabd7f39 SHA512 41f9cb0951abffdff732abac9920ce7a8712e0131a4eee9bc5bb6e7d0d2ac695f55f15497bd08a3f3776cb2d796570f5fcc90051a029ef1baab86597aa39a9dc
 EBUILD dvisvgm-2.10.1.ebuild 1166 BLAKE2B 939d7e0f9ac9d0b418d3d2224d0f57a22efd907a392cf804e34bb0616ca45a5ae7c0c2081f4d61902ad48f588fc66a908e7b1a6d3f3d2a62fa43307d6c50235c SHA512 841eeebcac812fbb9297bdce653954b5a39f44a51451ea9315687abf81277917fdbb57a68a6748cd91bf033ca13eb5fd14dbb40ccbbedb1b138e13f42c6416d1
 EBUILD dvisvgm-2.6.1.ebuild 1198 BLAKE2B 43104499f16347592d7b328e575cb528605c852154ee0c9fe7ad468b0cb988347c397d56700ab91ec8404b239a1002ebadb1ed6abbd8aef316892b755a63fb2a SHA512 5a0504d8953c91c552e5c688640400aa16fb11e9add8a6af9a178c44bbe87c7cbe9e0d966f02b47d5d282ec72d738b1617c1e77786f1bc92527762051ba5bd59
 EBUILD dvisvgm-2.7.ebuild 1198 BLAKE2B 7e60b8ea517403fd22f033ed0b3beb8e2adee9a88c575daea688de33088714b4066240e5b764922ccb558b20793bd6d853912325927436fb2afe1e28a0a977db SHA512 7fc67c1d09859469969977d9bcc092267a8970539bd9c6f1d991776de25962138cd74285c5add62f81b443c30fd0f12ff5fdf0ee320d885f5218e377fc0ce693
diff --git a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
index ac03a2ff199c..57d5723ca440 100644
--- a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest
index 8d56f49640db..84d57db2120c 100644
--- a/app-text/enscript/Manifest
+++ b/app-text/enscript/Manifest
@@ -1,8 +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 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 1116 BLAKE2B 48fdf41dc6c83d9016d93930a1f4c96eaa37249e2ab49d7abf0cf4e392548cef4f0b4a8534d651d7dcace41aec2c69cd10f9b2307932dee86d35bd3eefa26659 SHA512 5b2135bd7488af0b67f746e79ae9db05059304fc3b3068c5788a1074957ccc9ed3a88ca29eeed4495af98418266b310d4213e2f406b6195ff1ffc605101cfa1e
+EBUILD enscript-1.6.6.ebuild 1260 BLAKE2B 2dde173704d326fbca73dea97bc412d98db5f2c3b906e99ab5cada051018396b0fbd0595fc3ba8a27f30a74598dc2a5d8a45f28472f2afbd4dc802c9e83211bf SHA512 ae6e7ee1ee581730057f7805b20757e57fb80d4c4aa0428cda0b741fa4acd8c34b1d92d9317ca16562433acae1b23fceca9de64dce9c123e08c8f28d39bb64ca
 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 7c4cc7ab16e2..40d647506bc5 100644
--- a/app-text/enscript/enscript-1.6.6.ebuild
+++ b/app-text/enscript/enscript-1.6.6.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Powerful text-to-postscript converter"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/enscript/enscript.html"
 
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 SLOT="0"
 LICENSE="GPL-3"
 IUSE="nls ruby"
@@ -24,6 +24,7 @@ RDEPEND="nls? ( virtual/libintl )"
 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
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
new file mode 100644
index 000000000000..3ea4bf97efd0
--- /dev/null
+++ b/app-text/enscript/files/enscript-1.6.4-fsf-gcc-darwin.patch
@@ -0,0 +1,37 @@
+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
+@@ -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.)  */
+ 
+-#ifdef __APPLE__
+-__private_extern__
+-#endif
+ int
+ regcomp (preg, pattern, cflags)
+     regex_t *preg;
+@@ -5620,9 +5617,6 @@
+ 
+    We return 0 if we find a match and REG_NOMATCH if not.  */
+ 
+-#ifdef __APPLE__
+-__private_extern__
+-#endif
+ int
+ regexec (preg, string, nmatch, pmatch, eflags)
+     const regex_t *preg;
+@@ -5728,9 +5722,6 @@
+ 
+ /* Free dynamically allocated space used by PREG.  */
+ 
+-#ifdef __APPLE__
+-__private_extern__
+-#endif
+ void
+ regfree (preg)
+     regex_t *preg;
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index e38b2afee139..aafdcab74141 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 1354 BLAKE2B b7b83c09148edd7f4ed57af4b02ff86366bc2d93e5fdff9f2c52ffc0373100c8de664a77de0dc7d80a44ff3938a6426a64b59f9ab16d298213799a1e2da926b8 SHA512 f0b75a6cb7af7848eacc57dd2624b348d657f3166d82732b2fc1c11e1a73ebf939ca1606d521bc702e037c9a91794b0abcc41953697f990d74c1fcfe3abbc435
+EBUILD epspdf-0.6.0-r1.ebuild 1259 BLAKE2B 24f45b7d2d4d1dd54647f4caeaadec2e55abcb8dd67b182d5b33f160f44a9759d70dcca273255a88a2a24e4faa5c475d5cb398f5781dbce636b4be9c64f8857c SHA512 271c37c1d54710859a632b921ecdf386a31e1ac01fdc9a3677790cd73a9dc1c3fc89ee6ea868cc085cab08fb8acff0833332e7c426203f3a03f7fcf017063e48
+EBUILD epspdf-0.6.3-r1.ebuild 1355 BLAKE2B 5e963e2d124cfe173618c5be2b4225d48aec246e9fefc5e246fac4cc0ae1294527851ab6260b43cecb45f41df5516f03c10f627accb64767af14441e42c42b44 SHA512 b300c3f1d318cfb70c155d7a1fbcfa890de90733ac4e16582e9833d14799216ad72063b0325b68f3560fc63fef1fee649991681373d1961ef3b9949b390357e4
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/epspdf/epspdf-0.6.0-r1.ebuild b/app-text/epspdf/epspdf-0.6.0-r1.ebuild
index ba027bc14098..d7ce44288f0c 100644
--- a/app-text/epspdf/epspdf-0.6.0-r1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.0-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 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 ~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"
 
 RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
diff --git a/app-text/epspdf/epspdf-0.6.3-r1.ebuild b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
index 3343af326070..0ee97faf33fb 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/epstool/Manifest b/app-text/epstool/Manifest
index e5889e245e3a..b5c4e3acd6f1 100644
--- a/app-text/epstool/Manifest
+++ b/app-text/epstool/Manifest
@@ -3,6 +3,6 @@ AUX epstool-3.09-no-use-gnu.patch 951 BLAKE2B 22dd85e96cb2ceb4001c0713da541414ab
 AUX gcc43.patch 632 BLAKE2B 3f4537c7b4e20e50aafa3d8e07379eb8db2e68c1abbe6e096b2e5926b6a3ab539c6478dcff7d03f2c93888abf3dc8c64cd6531c855c9a145fe2c50c9a5a8c144 SHA512 a088a86e2c66469da955a4ba2309142cf54be9d88ca18c8c173d9a285a145c3432ec99d4c212f5f69caeeef17035a063f2ca55d57bf72325258555a0af8ca875
 DIST epstool-3.08.tar.gz 191567 BLAKE2B 6ef2912e10e65809f60444d09facc1ea3800e492e55e87a4f00c95f7dbabd45c4d48b447fd92879e97e9dc2fe9698c1ff7d4cb06bdf3724f16ed89f76a829a8d SHA512 d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1
 DIST epstool-3.09.tar.gz 191023 BLAKE2B becb264bf93bdb1244550e0707eb2d513d8c4b8d9eee09356bd2ddaf25bc8b97e0c5e73a02839a0f66f18bd1949cb549525967ec430104c33067d9ca57984a6f SHA512 cb9519be0879ff791f0e243a541538254e24949683aa792f673334d2d1dbd3e449ec36890ccbb3852563cf8da997a035a80df605b395a1b84cbced7522dce291
-EBUILD epstool-3.08-r1.ebuild 904 BLAKE2B 50b366747cd1c79275a6a7c82dfd937ed5d052f81be2ce1c48c0d1f10cf8c59c7dead1ac8e1026fbd8566709ee5aff180c947c26f2b650469128f05a7053b570 SHA512 34323645e925827275dfd63f016a7578eb3d6c0a7bcfa71597afb7b010081caf0bb6e65b8c529dbd7ebb144c6242e71186f6187e76cb3daccdaad3c613016400
-EBUILD epstool-3.09.ebuild 886 BLAKE2B cf67bedc4e49caa639a51cd322f6306e88304cad9182b6ab0845cb70c002758f791f479a14debdfa08b247531a52d0069270cce716b7d363ce77eff9423290e4 SHA512 1373af9421533ff9a01981cab253376da5d934161180a8a143ce9178ae7d9bb4fa520cafe704d33aa343ee90f9cafb63f96ce451512fc758a5024e467991f928
+EBUILD epstool-3.08-r1.ebuild 905 BLAKE2B cc1ed2eb64d9e6095c861d7a2309110e43eccd23d0d1fcc1f23451cee741b639b75b02df01b2dc3f7c012d44dcb952931fcd27075adf1d59d29a17a6af3386bf SHA512 a3514b43120e27c2512669358652dd6ba2e55645f7525b1024f33cc6ec7259e0145394265dce7da469e38667d06d2947abd73747f15d748004b20089ff4b9f90
+EBUILD epstool-3.09.ebuild 887 BLAKE2B 034788c62daa7083120f6a829c2ba160953a8959ee62553573bce1ac5e257f1ffd5b0fc626391741796fd131138026f31102b39ce302a3397cc3f5b98af58e02 SHA512 62ec1172e8ed6dfb4a3aff5277486b8fe4d0869d834d13677fb4a5d3b653e3c580da9714aede11e9b2509dbe0445ce70b01e49dc50cbfd5a419f290e75ce41b7
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/epstool/epstool-3.08-r1.ebuild b/app-text/epstool/epstool-3.08-r1.ebuild
index 8db4ff40e2e6..1c92a1aa6a05 100644
--- a/app-text/epstool/epstool-3.08-r1.ebuild
+++ b/app-text/epstool/epstool-3.08-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="app-text/ghostscript-gpl"
 RDEPEND="${DEPEND}"
diff --git a/app-text/epstool/epstool-3.09.ebuild b/app-text/epstool/epstool-3.09.ebuild
index 135a57a851c7..285d5ecb3f1f 100644
--- a/app-text/epstool/epstool-3.09.ebuild
+++ b/app-text/epstool/epstool-3.09.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ghostgum.com.au/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 DEPEND="app-text/ghostscript-gpl"
 RDEPEND="${DEPEND}"
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index e095a23157c1..8990822cbe98 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 1936 BLAKE2B f8381f9ce44e1ba2feafbc5bc4e64e70ff373f8800dbaad98710bd0e03d626c1bf5b9b1677feb1191367ea772fdb4edcd43c7385278f71edabb799272adb1a9f SHA512 0d7681ca97dc9bd94877de57efc8cd1f43eae0f06d0499264aa0b1f753e0b3fee7590c3bab838828aac8c83c16434a87bb68fbe73ef19e22193057aec63b9470
+EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1937 BLAKE2B acdf5285c83cbc02d6014a67b196cc507f8921e993832d7fbb30035a6eb62cc186020ac05743a97ad974aa423ec774df1d66883c561a6842ccc791a6dfe8a5c0 SHA512 c2a366757870e64140d7c7037c4bc628a0a4f67c728aa36683df4597d1bdd21d99ae81f747bea6b3ef77c5d5227ca91afaa484f537e9b71f3c32a71648d3a1e7
 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 616ebab3992b..30c9b310e829 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 ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/grip/Manifest b/app-text/grip/Manifest
index ffc4b1b0db4f..25a251baa77d 100644
--- a/app-text/grip/Manifest
+++ b/app-text/grip/Manifest
@@ -1,3 +1,4 @@
 DIST grip-4.5.2.tar.gz 145644 BLAKE2B a353a74d55d6496f3dad362b74e434ff22c8130368f6773ab2bfdf66e43c62e8dcba0e3a786157d37b81d7c7e49d0c83a60c847100169684ede9c09f4eb06c3f SHA512 a8937d8ba3633a2d47587eb5c1b0583df7e8a8cacebb87fd50dab3fd2deb91981b38a83a3ed182f4e5e7435c8e2c8d87829e45fa9d32d8823c821f6217c7ccc9
 EBUILD grip-4.5.2-r1.ebuild 690 BLAKE2B b5ba74597c21354fb0a52a7945497df8e942f1429d731b897b7792eb5e50033610ef7cc0353bd789a50c3035e56c10e536e8841a6fdef5653242670089d560de SHA512 f7f2dbf2a3c2e8edfd6c478d8e55691b931e5731b92a36e74430ad59756882ecb9c115e76694ba5cc515d28c38fcfbc1ad9dddfdc2a4836b5cc8aafa1b96003a
+EBUILD grip-4.5.2-r2.ebuild 798 BLAKE2B aff3c69e54c7ba0e12d1635fc7f19be3d77523880b80170e6bf48156bc22c13cdd481d047e2449ce974208fceb3409d3a89131b6960e00bddf5f2aea8f1ebaa7 SHA512 e9d167472601a29f352b5cfb9edb9057d7371fbc5611f70bfdcc9e73029069d634196551daaae9a2792cf4409b64af12cf8a26a73a60e3e0257485f41155a8a4
 MISC metadata.xml 364 BLAKE2B fca014c1c0ff71760e84e1d3d94b435ab030100461eb25c3c988f26aba9f76e205724a17c5bf5440216cd2f6d611c4ab984a843d5ed397f597823b8d66fed205 SHA512 aed97f9543ffa7ed2d52ddc0d47b594e93d390828ee61973c5d2ea7bf248d377bcc247930c3fcc2071c492bae75634012fe817b9dbc1ceb4ea4f7a5f0e7a48c7
diff --git a/app-text/grip/grip-4.5.2-r2.ebuild b/app-text/grip/grip-4.5.2-r2.ebuild
new file mode 100644
index 000000000000..12692b8ffacc
--- /dev/null
+++ b/app-text/grip/grip-4.5.2-r2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{7..9} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Preview GitHub Markdown files like Readme locally before committing them"
+HOMEPAGE="https://github.com/joeyespo/grip"
+LICENSE="MIT"
+
+SLOT="0"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+RDEPEND="
+	!media-sound/grip
+	>=dev-python/docopt-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/flask-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/markdown-2.5.1[${PYTHON_USEDEP}]
+	>=dev-python/path-and-address-2.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pygments-1.6[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.4.1[${PYTHON_USEDEP}]
+"
diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest
index fb5f554fa5fe..846857645774 100644
--- a/app-text/gv/Manifest
+++ b/app-text/gv/Manifest
@@ -1,4 +1,4 @@
 AUX gv_icon.xpm 2837 BLAKE2B d4e15bbf39e183b0093c7f9effa2725e558b6f0fad3d44fc3831c7c142081e668c727cc1688d0bd2b61e1702b50351f841f7390d1873cf27c21474549eed87d3 SHA512 6aae3a463fbf3484028f7ca8f50cb7a332f5566f3bb84dd5c17843b581e1b6013b4f99a1de8600e9d4a0ba5b9b7ce131ee37b0fd80b97e32ef018d272f756076
 DIST gv-3.7.3.90.tar.gz 757506 BLAKE2B f856d23d3b9b9164db414534dec4b9a1c441a88d644011a46429b29127364fe429fc72ed3ce76d4142106d10c6a5305b81ec22ed353716df1c1a824907f7b191 SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f411dc8c32ab8bbad05a1161e816c50
-EBUILD gv-3.7.3.90.ebuild 1056 BLAKE2B 2318d1afa0df742757fb86a43944c148285656a7f6493b957fb1c9caaf449e33b2009c1393d74e007df8cafbd9df7155e6eca53ddc4bd6c2bdc2b0b85437d59d SHA512 cdc47f90ba760203b9ab219012c2c8fde5be75c43883bfdaf59add81dd8ccd232cf0c2f851ccbf7530b070ae1098a7bc8a65186f0300faaeb17163248c85d487
+EBUILD gv-3.7.3.90.ebuild 1057 BLAKE2B 94710654a664038b21b2931c0faddd4eb5032a959b5f0c089bec1f256db8aea27b51b850d10f68a81ebb0b3564ed95c92d305c798f1612edd7ab5f4dafa53811 SHA512 d4f96f9e95c2b79ba39fc4ccc6370efb9366407cf375b7e7e90a63f0c2b30e411ba9837b8d616b2fc163347f1565081df085180cd88566cb36422fa843502d33
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/gv/gv-3.7.3.90.ebuild b/app-text/gv/gv-3.7.3.90.ebuild
index 1bb2e687a1e2..aa0f587b889f 100644
--- a/app-text/gv/gv-3.7.3.90.ebuild
+++ b/app-text/gv/gv-3.7.3.90.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu-alpha/gv/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/app-text/hd2u/Manifest b/app-text/hd2u/Manifest
index d32f8aeaf020..c89e998d28e9 100644
--- a/app-text/hd2u/Manifest
+++ b/app-text/hd2u/Manifest
@@ -1,4 +1,4 @@
 AUX hd2u-1.0.3-build.patch 666 BLAKE2B 14d1e7cbb7c7302ec0aa1354c4d0a493645f8bf4bf9e4c2e2fa2bd61b04e0e7e8f90477deb6a73a1777ff2f12ad13cdd97f604d889778759d7fe21222772eff6 SHA512 934fe3043aceeeee5df7ae5879198d385639f5b489581209c44e7ec91f5d05216424bf5652f557e154a1a442633848ebe1167b61af9c9e374cd30594744f4d7d
 DIST hd2u-1.0.3.tgz 60024 BLAKE2B 9dd57f2e15add3643aa92747836164b18c9c6554c435b718cea6b4e8d1455bbd775f9d4eda0f10a9bfe3ccb5dbd634a99b367ae849bce2145d9b1114400a2b1b SHA512 d354964f0ad5392315767b96438d843a5f1d6afe78da5b0c5ea65a3b0b2a61beabff3ecac89df81b9271a14ca443f23dfffeb51815e02b724ad287e42fc2d6cc
-EBUILD hd2u-1.0.3.ebuild 476 BLAKE2B de695ed3452a06f72f8abbb5982d35748673bfd383f3be7cb2cc8206fdda684b7e7d6aa31a46b3acae9bab89ee52fdf4b8a5a8fe606da9da402cd9bf1c76be58 SHA512 60a65f35eb1df432edd2c3537e361ca4a502c5825bb420f9a59d4b41a3501931c8430551416e304b53eaebf886428a0fe06ea3d32623044e52cbee49d6f46f83
+EBUILD hd2u-1.0.3.ebuild 477 BLAKE2B a6eef95d984aec7bc9fde22cff20a3a6bd1835d7a636656af7a0152daaef2d06853159989f8042e1b7944cc571366aab8ca23625b90b3017dffa2670d71b4dfa SHA512 c8ca0daefb18e380f1d143ab9d66dca39623f53f182c58787d721d55d05573fc6f53e1082e44cbb19d353da0cfb3dc6c4d4a77f83b3d925c36df77ef1f589908
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-text/hd2u/hd2u-1.0.3.ebuild b/app-text/hd2u/hd2u-1.0.3.ebuild
index 17f3c31a1fc5..7d24903aa838 100644
--- a/app-text/hd2u/hd2u-1.0.3.ebuild
+++ b/app-text/hd2u/hd2u-1.0.3.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Dos2Unix like text file converter"
 HOMEPAGE="http://www.megaloman.com/~hany/software/hd2u/"
 SRC_URI="http://www.megaloman.com/~hany/_data/hd2u/${P}.tgz"
 
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index c52db3aab518..dbf926bffc89 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -4,7 +4,7 @@ DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c32
 DIST html2text-2.0.0.tar.gz 162901 BLAKE2B 878ff3bfb55523f2bd2721f2320b55729ac84e250fe651c2347b8cfb0f6d524c18c4e820e255b474d59b5179c255b8acbfc51f7213539979b5d3977c42383ebd SHA512 94f2cf3f5085307cc2cf5e264b35621029e57142d6e4d832eee2c447860338c947687be5e8c81367696b0b04432a44537a1545a820991c621b4036393ad6f4e8
 DIST patch-amd64-html2text-1.3.2a.diff 2230 BLAKE2B 332adeeceed512a2c5bfc01985efbaa4db5ea64b3e4ef8be8b880754524771de2e11b3a2efc55bce154bedc9e598231a1b5bcfe10e915b833d6dbcbcd9e46dc9 SHA512 2a421a20aec8a547bbdf54b81e30a6a1d4cf093e7ad67b27158f0c7248ca0abadd8d96ce0a27adcdd375012db6fd21f61f42a8343bfd910cd8a9720c0a043be1
 DIST patch-utf8-html2text-1.3.2a.diff 29499 BLAKE2B ffc0ea8d89d9e9c9dfa89c2369016685a6af1403a6e71787df2724b72c74c8f774d8d92278a1aaeb90f47d34c8de4c889a7bf4edc02a00e3c97955ea624cfa71 SHA512 be31251471b221a38d291420d5f23e01d5017c20d953064c33ca3dd148543ae877ab584c16fcb01df1341abdb02494b05d08fdcf94bf70bad6b510ee8fac3376
-EBUILD html2text-1.3.2a-r2.ebuild 968 BLAKE2B 00c6c5b53923a5954ea71126a4bd47cbe437a1482f0da36a44bc8862cf92f03fc6ba69a328e8e80e0dd61ec0a41eb35e66375ec940bf57fd98c1c68e5eb228c4 SHA512 fa461dcf03442c9b9d3d4e19ebdc6005f4dce9749120fba622d9aac7dfa2fe60fb3b33d4d701e67207869deedf98bb64089d8a03f2b77e4eaf8a8b620bb23964
+EBUILD html2text-1.3.2a-r2.ebuild 969 BLAKE2B 730563c8e3399dfc5b4abf70f4c3a3de1f0c85bff8c7906006c7ccbad3202c54785465c06ad465a43026b0fedcaeb4c9edfd11de10473734d03b902f2a42d6f5 SHA512 2e6d6db754a710178353200ac04f679fee0b84253f1fc76b11748aa42a54454b8ef484c8c198c2a60e969d9753869ae9c429fa2b733c8bf8e4398200483d1ad8
 EBUILD html2text-2.0.0.ebuild 897 BLAKE2B 76d33a641400dd2f26fd569530ecdf6835e9713b031f24e66c547b4a6abb98af435599de1f8a93e1e01dc4ca72a00074ee0f3aaba637214d5371749208d8d859 SHA512 b5b8222d66777f437be3e8ab747a920aa702ed3e8fac45723ab0dbcf162205efb53394722880a4e3dc1729d8e94085e2e612dc189fa90ab65f5ff4a1348d7633
 EBUILD html2text-9999.ebuild 897 BLAKE2B 76d33a641400dd2f26fd569530ecdf6835e9713b031f24e66c547b4a6abb98af435599de1f8a93e1e01dc4ca72a00074ee0f3aaba637214d5371749208d8d859 SHA512 b5b8222d66777f437be3e8ab747a920aa702ed3e8fac45723ab0dbcf162205efb53394722880a4e3dc1729d8e94085e2e612dc189fa90ab65f5ff4a1348d7633
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-text/html2text/html2text-1.3.2a-r2.ebuild b/app-text/html2text/html2text-1.3.2a-r2.ebuild
index 38ed69968534..28aedbdcb328 100644
--- a/app-text/html2text/html2text-1.3.2a-r2.ebuild
+++ b/app-text/html2text/html2text-1.3.2a-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 PATCHES=(
 	"${FILESDIR}/${P}-compiler.patch"
diff --git a/app-text/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
index 8c3ba5a95923..6da868883013 100644
--- a/app-text/hyperestraier/Manifest
+++ b/app-text/hyperestraier/Manifest
@@ -2,5 +2,5 @@ AUX hyperestraier-configure.patch 12359 BLAKE2B 52fb2210ee4945c07fcd4e9812be052a
 AUX hyperestraier-perl.patch 844 BLAKE2B fd221a027e47ed7582e697a8104d1ef82d66b87919f20c82f185b9167ad03ae6b9f0b6996b47a99e58fb42443f1c1b1c9f53a6badab935361b26f8693b680694 SHA512 73c7bd659d80464baf1d28a0eed69c9fdb3052a62aa46dc0b56f2ba6f75d458531dc6023684bd92b22b7fc4b79869ccd82e835827096b163faee0f94b0615465
 AUX hyperestraier-ruby19.patch 5143 BLAKE2B c9ea3c9e045583dee3ca119ebea07946522c50b00aba4d94fc40f7172925b9aedb8cbdc88e087a87590422566b12269641511c2c1c0a484390b1c2fa8bd1fecc SHA512 fcae611f594eeb35b6aca6eb1139304538793afc6b794e8dee1a59243d5da216f364165c90e7cf7691ed9a7f38a610ba27f37c2eef2baa4042c4a993cbfefb2a
 DIST hyperestraier-1.4.13.tar.gz 1014600 BLAKE2B 02be7cd374c47094dedd239e967dbbe5045a77302125861541dbf4d5fc60d488968718fd6b9ca57b88aac96cf2cfe73397af6bbc3d53ff6e983063ed98748e70 SHA512 ec97f487bb0e085f74222106fc5fab227c8c02ee8d736c0b4adef57ec0e4310f829ac59fff5a1c92321786e89bbc2a059a0acff6ab0e5844b83627567bb265fc
-EBUILD hyperestraier-1.4.13.ebuild 3589 BLAKE2B 8fbd49741c321fcb758048adc62e32447aee6146ea91512ba7cefaddbbfc8489117e3f368970d98035575e6c984e27d4eb3e922ed95e73ed59fceae6505c82e4 SHA512 adf4bfceeb47beae2a7dafe52382b018d8e81d3314a61b491b3419b6add57b07e2312bc6b3aac4d21ddff46c20ec9679f3418b03963dfb82f9d632877efb531f
+EBUILD hyperestraier-1.4.13.ebuild 3590 BLAKE2B 35e242377f638faac4b8d8405d65a03fd4aecbf11a59c3101cee4c950adf5986c743e93fbfd3c3bed863134154392fcec6cd22e91b03043602d8b50488d2a3f9 SHA512 efb5fa77572f8bd61cb6f38ef94811bb7ad3ffb6da204f8946a11d2b9927e5c5717e3908ef334b13aeec5c94dcf75da8e4f940635728a1349798c3f8acaf39b6
 MISC metadata.xml 440 BLAKE2B 5c3edd49e5590ef45d48db13de2f18aa00f332fe955b03b58439a05d3cf8d4ab623b1df6fb39aad7a6f74bef0f8072cf3a097c30be66793957b3cfcc5c35ae9d SHA512 421891e359bfbdafa6759bbaed59a430cbb6bef6bacf0109bb523fe17a19a5804fbdba26ff6cfd00ba19b5fff3d6aca60bd56fd5facbd0e3831f8a34368f142a
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
index 9393122cd47e..dbacdc014acc 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://fallabs.com/hyperestraier/"
 SRC_URI="https://fallabs.com/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 IUSE="bzip2 debug java lzo mecab perl ruby static-libs +zlib"
 
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 63dfa0d3af5a..83fb6efe7b1e 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,5 @@
 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
-EBUILD iso-codes-4.4.ebuild 2634 BLAKE2B 1d37ce48dada03c8ada9017d5e89fceadd03fdc2e42e951c29af59a8247e9205b51bb19f0e12b2ce743124e9831e574c684c4136131945286f53a330d5d15309 SHA512 a53cf554db840820f34e561d0c298ff2b3663229fca80ce0ef3a7f6ccfa480774d0dc21b847995e3d03eac8e8391e47cbe8f99b501d344ba26fdde2af1b5a19e
+EBUILD iso-codes-4.4.ebuild 2635 BLAKE2B acf990830c852e3d3dfe4250aaa519d8bb967d28a1d1cfe0f2de41fdb826bf1d1e44e15373f892960a62be9dcb42838ba3358fab564296f6949cb4e03a71e46f SHA512 4482a80564c918a41ebf78c7a155e01b13543284b609af6e9cc4a8f15322e5182ecf25ead2e6ece6187bb66a38320b03c447cb7442d3b05fd3cdc5576ee61530
 EBUILD iso-codes-4.5.0.ebuild 2648 BLAKE2B 9bc6ffac0709af5b016d96bad98cf91b8418be861fbeec683a295f7aecb6d5c49811fdeac101ac7bfddcc1dc7d23b0cb7687b3d1d347b9bf14db7a15e2cf82c8 SHA512 e3259be91478ff1632ebb8863223dc68553f8691cdb6ba0903310300a83228d9103c2a022cbc6fd34f3f8ce76670e0be9829177eff9ab5196a16425698c93fe1
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-4.4.ebuild b/app-text/iso-codes/iso-codes-4.4.ebuild
index b231ef1ff858..2c7d6d871825 100644
--- a/app-text/iso-codes/iso-codes-4.4.ebuild
+++ b/app-text/iso-codes/iso-codes-4.4.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-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index 6337820a5611..ec9a7c73fe56 100644
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@@ -1,5 +1,5 @@
 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 863 BLAKE2B 7789c49b02c9c7f4be70c853d4a8c90537b4d77e7386c875a2b06e777eaf4bb4e056d2d4458308b2d30b4f52f5228813fe80d6e361a75af08823bfe779ed4a8c SHA512 50ca06f247bdc12a597989c94073085e3c0efbe30345c3b6eab63b6d0a34c92f2032ae4b9e968f7d7f0268472287c3f094eeb197f22fe45fc462e54544e1b046
+EBUILD lcdf-typetools-2.106.ebuild 864 BLAKE2B 8b8ea9ead6ba95887a8ef22b1af6fcbc8e78bd45dbc8ca28844e4c05728e273a8ccf8af3e88bc2eebae113768d1fdf46fa7eb49f95c9e9aad618dda4ae68ac45 SHA512 299a7a6027e551e690350ffca529ccd8c92c54128bdd9afe474a05c4c25559644e1e7db0313695e4060464ea9aee22d37c206f8525807db1062d30e6902bd520
 EBUILD lcdf-typetools-2.108.ebuild 870 BLAKE2B dc9521fe2510e84e01410a8e0f9b1ab67f6f2b991bb85eb28c822f7dc3cad20c00833c6ccc2385b9a2ab21bf6b9e7115116c9325cd35ced95ca2025c878114cf SHA512 012fd232f0a36178e410ff311b6fb75a522f2dcea6ae4d97a06123a944422c09945fd01722da51f22c271176554fd8616093fd22fdcac48666c668ab5007cfd1
 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
index 7ec4a8f6ff75..77899d23e7c4 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
@@ -8,7 +8,7 @@ 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 ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="+kpathsea"
diff --git a/app-text/lesspipe/Manifest b/app-text/lesspipe/Manifest
index 4b3a2a60b991..a690336d50bf 100644
--- a/app-text/lesspipe/Manifest
+++ b/app-text/lesspipe/Manifest
@@ -1,8 +1,8 @@
 DIST lesspipe-1.83.tar.gz 115129 BLAKE2B 24d9e4a226537a44c01c316528e085c6d2d7889b2ae5166d70b85e12c5f0b34e825e039a70071d7e75947e1c63d527decb21973631e910de42c75ec3ee17436c SHA512 c6418ac2bfc2dee9d32d56b0ea4a94954b1431db54fef8b67a9cf7d961cf4a23d87b2f41b2a4560d2333029c6d4ed5c6f399cb635f857bd43f1603993b5cb55d
 DIST lesspipe-1.84.tar.gz 119657 BLAKE2B 671b504022bdba82eea03d7a83960d5ed148d851d0420f179967f46d38a88ab90c9928a462e01744134aedfe710dba741430e78743451b1b65e603e5d89ae139 SHA512 f11ef23610f722d62ddf7e084b03967ed59d21af6ac207d4456f625c93c3c58c87ec5907cf6bca00ae5550dcddfc9b7f0be5de51f9ff81044fcff1f1cde81267
 DIST lesspipe-1.85.tar.gz 120568 BLAKE2B d2c00f4121dc1bbed6b82220dac038068bbff87c732385399542cb212d4664c74d018db07829f90c38e938cb8623a443888c74b0d003fff725d0ddf207d8109e SHA512 420d087b9fc9783b9404855e4656b88c10852502bd2f1931978b7dc7ff15eba1a375b217184480f9b341322c12e7336d0861ba9c2f673f2b2a7fb340a381f5b2
-EBUILD lesspipe-1.83-r1.ebuild 1094 BLAKE2B 3d3fff0a0f1b8f70b85b691b112766c7f6bd4196a629f87b95b4a84955876b3ee7de64909187277d34dd25c62c4aa0820eaa0a6110fd320749f286d23e6e0a23 SHA512 793e84d2a2014a0345d982972ef573842827c77c840fe04b4c9b7ce22c37dcd9b95db73efcb0dd427d287d297e4f3e1fda0079087ad641fa9e196a6ec7fdc4cc
-EBUILD lesspipe-1.83.ebuild 1107 BLAKE2B bc5a74041c57b9f4a3f811e281ebeebf9cdd77830821171c8a0f52746f61851882c8ce85b19934c92608b83eea9cc1365a7e496d66cc0131a14e43d4e79d04f6 SHA512 2a46c54733ec6c02a558d9c56d0327f285d8cca8db0e28bae5bd902d1c457a7d464e19de487468977297b14a7edf033d89e24d7f734c76f0a7647c28d6181199
-EBUILD lesspipe-1.84.ebuild 1103 BLAKE2B 825b41e49c49b1dd70a2892c41e7039d5bf70f65cfec0297e54f7abed327950d977e9a637fe17585b645e80e2c4f245aa5dd020759bfd8cf8d91e3bd46facac6 SHA512 a0e0f6813cfb27868641ca42e9a0327054efa92ed1c060b7c31fae406689616c873a3473e1e0127f78465286aa6185953a32a9131f083a38bc2c1291bf00ebfb
-EBUILD lesspipe-1.85.ebuild 1103 BLAKE2B 825b41e49c49b1dd70a2892c41e7039d5bf70f65cfec0297e54f7abed327950d977e9a637fe17585b645e80e2c4f245aa5dd020759bfd8cf8d91e3bd46facac6 SHA512 a0e0f6813cfb27868641ca42e9a0327054efa92ed1c060b7c31fae406689616c873a3473e1e0127f78465286aa6185953a32a9131f083a38bc2c1291bf00ebfb
+EBUILD lesspipe-1.83-r1.ebuild 1074 BLAKE2B 04446ecfa53ac6872b925372389bb866e06561ecda6c7b51f6a079f581715d9598d954667ab5ff09728bb5207bb966740f6d06c6af08bbeb585c67ec915d4ee0 SHA512 dd45d5029eebd6cf60fa47922dbe5a2ff9c71940e480339e2cca9a3bcf81bb5b8ede76971448d0f02d0c13f62ef94fce6e56758687e1891fa3b7aefb02f2679c
+EBUILD lesspipe-1.83.ebuild 1087 BLAKE2B 57a50eab9fedfc10f8df59d580efb80e3ebe7e53ea03f2a84dbfe3e9f94365acfe7612500d9c02ab7bae72aeb28362e1c4da6bda2e33bdc61bd8a97e4454af04 SHA512 a067d0dba049ba82ad4223473dedae41da26797c8c7f31c560f0577ab40f23e990254c2db9a0c5fd78f28162b43b4681daaacfaf82cd80b00a555eed93b5a53b
+EBUILD lesspipe-1.84.ebuild 1083 BLAKE2B ae45da79a6ccf76577cfebcd9267dd4166b3472370f0cc1b38911ba484c76fcde28d8a0cfe6253fb1571085abce27f16072524940a32017f68e2912a7a58df67 SHA512 d8b0c72adb6c73a38e5ae39e440e0e740a3fe7d712f591f266d1092c44f60c313982c52adc8e02be71b7f3a630c071cb58170fea429e5cb5602add4ad957a696
+EBUILD lesspipe-1.85.ebuild 1083 BLAKE2B ae45da79a6ccf76577cfebcd9267dd4166b3472370f0cc1b38911ba484c76fcde28d8a0cfe6253fb1571085abce27f16072524940a32017f68e2912a7a58df67 SHA512 d8b0c72adb6c73a38e5ae39e440e0e740a3fe7d712f591f266d1092c44f60c313982c52adc8e02be71b7f3a630c071cb58170fea429e5cb5602add4ad957a696
 MISC metadata.xml 303 BLAKE2B 57a0ab69188055eec0a29d4f2e331dd027d87b12623099013f889cd4954574772f3279c7fdce85c0fe627083db59a89a6d3daed8266c867b17bbdf84d1fef4a5 SHA512 efdd1963073db285de7f83ff804fdc98876846cb011fa0c8aa65f9b3c1dd6b7cdb039ca6a7a03018edfdff930f817208bb29601bb0c5571fc16d637615e0c7b7
diff --git a/app-text/lesspipe/lesspipe-1.83-r1.ebuild b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
index cd9ccf523afa..176bb5dc9d8c 100644
--- a/app-text/lesspipe/lesspipe-1.83-r1.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/lesspipe/lesspipe-1.83.ebuild b/app-text/lesspipe/lesspipe-1.83.ebuild
index 3e31b8755cbe..4165c991b5ec 100644
--- a/app-text/lesspipe/lesspipe-1.83.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www-zeuthen.desy.de/~friebel/unix/less/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/lesspipe/lesspipe-1.84.ebuild b/app-text/lesspipe/lesspipe-1.84.ebuild
index 6d1b0a34f4c1..e9496f63a8cc 100644
--- a/app-text/lesspipe/lesspipe-1.84.ebuild
+++ b/app-text/lesspipe/lesspipe-1.84.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/lesspipe/lesspipe-1.85.ebuild b/app-text/lesspipe/lesspipe-1.85.ebuild
index 6d1b0a34f4c1..e9496f63a8cc 100644
--- a/app-text/lesspipe/lesspipe-1.85.ebuild
+++ b/app-text/lesspipe/lesspipe-1.85.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/wofr06/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
index b5167b5bec1b..24e817d6d809 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 629 BLAKE2B a5a260363fe549b7dd122b4f5b5b8d8cd36fedd2e04c6bf5eb0d42bb56e2ba8a68344471bfef9dfb6ffd7239614aa1ce9ae48adae4d620ddfa2ef7ffe613adda SHA512 580ff1572a4a51218eac3ceafc4a038919c84a7d25d35d1055e7f7052311c9d12cad6ca2a3c3e210167b2fe941d94673cfa1ba2041339328308b41ec6d05dd43
+EBUILD libexttextcat-3.4.5.ebuild 630 BLAKE2B 5626c242dd01df6843f1021a394a5c881792dbc97d2b5b777067ca6b1bffc60431beabe09aef1ac2ef1a9ee4506dc199a048452558583cbad758081c917b0b5e SHA512 99a6c0809045d3537e0e211ce690b850918d68efc67e7714a58edba6f57bdd864af25189fef9d8113255683fe035f2bbfb8aa24bcc621c3d8058d34e28eddde3
 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 3d87351fa22c..c0e6600643fa 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
@@ -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/mecab/Manifest b/app-text/mecab/Manifest
index 80582c3677a7..120f58a0e491 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 1163 BLAKE2B a9367c9d3ab6426002c6af10b52685386ee29734c87c7b86b5b0b05524216c3bfc0c0057a6009a3d593a506a9464eb66633ce57b435f081cac4792ef360fa45b SHA512 52f9a2a2fa689e5bc2491ac68e1ad086fcdcd3b9b00c21a8266de968829e3790226e09dc56c1c235a5b648c21dd66888c3f21d0c2b0a735c7906d05f6fe1c25f
+EBUILD mecab-0.996-r1.ebuild 1164 BLAKE2B c3045299add00011361a95e32d4ec032328c87dda3e4a4147c8704d5d027efd29138d4890fce1a33ee50824dde6715cf25fac38f9f75c8f16630a30c81bb8b75 SHA512 1f3fcae4a5cba1d853edea239a50648c01e0b238ecce6743e83f6ed13e8ccd895ec3f7cc71bee2730be6eea909aca6901eb94bdc2c21ca159a85f2e4b9a4fafb
 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 1e07ac73834f..31bcbdce7259 100644
--- a/app-text/mecab/mecab-0.996-r1.ebuild
+++ b/app-text/mecab/mecab-0.996-r1.ebuild
@@ -10,7 +10,7 @@ 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/multitail/Manifest b/app-text/multitail/Manifest
index ba4b3318d85d..625b2ba506c8 100644
--- a/app-text/multitail/Manifest
+++ b/app-text/multitail/Manifest
@@ -1,4 +1,4 @@
 AUX multitail-6.4.1-gentoo.patch 1440 BLAKE2B 968afe0a5f78e328c16019df6330cef6abc03999d919e4f761c4cf97d1a465a9aa085452538f48f6f1f0357d1b9a7a69f48dfc47fa2c09703595f896dcc97fdb SHA512 eb53834c68dc46c22a2d900cf5e8835a98ff9c9b001ae15eb778bb6348bd48b17dea8a1605bfcc9ddad4324300a81013a0a3710e559c00e369ae42cdfb38b6a7
 DIST multitail-6.4.2.tgz 155757 BLAKE2B aba6fea993e0d91071bddcf6d06767773ad6ea6054436dbd8a7163553b1cdfc03040362b87e9b2d31f8fe2165f213c718904f9295d3ab2076707cabf423ae681 SHA512 668c453372ba1e4013aa5191c697bdcaad82c84732841c120a506bee063d2134941e93aed63f96e5aeeb6045829a13aba012f9514dbd9520ab4f1b9b75b42dbd
-EBUILD multitail-6.4.2.ebuild 1315 BLAKE2B 69c6437bcd25047d02850de483fc6533603fd73b94277f25f619770f603b6c1a5440353b8f8e0d46b05959865451325383c316d2aa1f15d1b07b46b4e2fcedf6 SHA512 6c6268804d965d733cd1fb9148012dc4f24693b7ae9d2067d4f3d6262e8826e781bc9a8010f1f4e745fc7b16cdd8f2c4038674051e615886a4cf5930f3af9e9c
+EBUILD multitail-6.4.2.ebuild 1316 BLAKE2B a791eddcdc501d050773c76a1ff83781546f7d0e5a563a2a7a7ce3bb8f09e6366151660d87ff1055e1e60b409abc1c2d7bd28bc628dd642f70ed52e937658047 SHA512 978ab556dcf9a7bb59875945d577600d68d8154f3a1d79eb90d2b2e9ef33178b97f3d56cf7ae86f1a98d22b24172f33521991ced2dee5cd7f5f7d8f3f2c2caf3
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-text/multitail/multitail-6.4.2.ebuild b/app-text/multitail/multitail-6.4.2.ebuild
index 86a013c1ea7f..57f9b4e9f0a3 100644
--- a/app-text/multitail/multitail-6.4.2.ebuild
+++ b/app-text/multitail/multitail-6.4.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.vanheusden.com/multitail/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~hppa ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug examples unicode"
 RESTRICT="test" # bug 492270
 
diff --git a/app-text/openpaperwork-core/Manifest b/app-text/openpaperwork-core/Manifest
new file mode 100644
index 000000000000..fb9526d4eeba
--- /dev/null
+++ b/app-text/openpaperwork-core/Manifest
@@ -0,0 +1,3 @@
+DIST openpaperwork-core-2.0.1.tar.gz 62459 BLAKE2B 8b513b7ff79f3e81018b306d69a3f71ab6a132b57495f19b013ef4f364c1c4782a5b9ce05b3410be588c1b859b413b13ef8e990094e217d300fd70b36b93974c SHA512 cf048afe1052a6a63eade9944330f9c1c20c89e9c94da58f31562f1eea9286fc96b74af8bc32a010a37369463cfffd1847a407940dfede4dee9b16504beb2d88
+EBUILD openpaperwork-core-2.0.1.ebuild 493 BLAKE2B 97d09b4ff1d947dadda6c58ef88592224c7fbd0e43621ba01c6b341ca9adf910181b50c567176d9a095f235c56654a6e3f12e41e14842aae36933c94f989b404 SHA512 aa3e1acebda6d1b1c195647441d3235f0e29eadd5f3d103c6503eb46b2280b64a75b652eaf1513beda09ff1b7d96cce6c15cfd14defda0685cbf5a7b58f402e5
+MISC metadata.xml 343 BLAKE2B 3b3ef7b9f3c0aff87d5f7f743a17d16a160ce7e03a21ad0f9e61127e591e0dce9a2a9b9483e04ad56779c7c848c5ffcf1f62ba06edd6780b9263fe066ecf6b65 SHA512 8c2967efd1bb4b024bc97b76fb4e3b92a01b08c82e12b5f86015eeadba7a22d5ceea1c9219d7517f79469308afd62e2cae20930931d918afb3b45dfc6400f8ef
diff --git a/app-text/openpaperwork-core/metadata.xml b/app-text/openpaperwork-core/metadata.xml
new file mode 100644
index 000000000000..273bb67f278d
--- /dev/null
+++ b/app-text/openpaperwork-core/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">openpaperwork-core</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.0.1.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.0.1.ebuild
new file mode 100644
index 000000000000..b22c979741e9
--- /dev/null
+++ b/app-text/openpaperwork-core/openpaperwork-core-2.0.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Core part of Paperwork (plugin management)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/distro[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/openpaperwork-gtk/Manifest b/app-text/openpaperwork-gtk/Manifest
new file mode 100644
index 000000000000..ea602d657f87
--- /dev/null
+++ b/app-text/openpaperwork-gtk/Manifest
@@ -0,0 +1,3 @@
+DIST openpaperwork-gtk-2.0.1.tar.gz 37716 BLAKE2B ab8e617148c57530d65952846c9bde4848a7b7019f49428dfce419dc3ac46555aeba79c5f6a4b7b8954ab7f5905b0ac4c2cfa5856970b640f53d4c768d737489 SHA512 1b342161f68680d298197bb3681203c251000e50039cc0935e674747ab5ce89950ff59d7afe3f6cad948450921d1b922d110a8607115f30cf53e264400e76f0a
+EBUILD openpaperwork-gtk-2.0.1.ebuild 580 BLAKE2B 7e6ac276db2c7b754709e2b7233118f82403d3f4a8e82d7d7ec4f92fbe6c25026201d67907b4dfe5553374e2630a94e23c491b95753a75950636fab17d3d894d SHA512 6168cfb527264b21a3ccd42d2c0339892b92f262550827a6a8bbaeb9ba825921384b196fdea079c6065d4ce29ec8422a337cd3693f15dae047bd223221ed1a9c
+MISC metadata.xml 342 BLAKE2B dba2557bfd27cb470cdb5a6c4cbdb2b444a02b3f9dd28186075075a31613f33c2f308657c6908060a20967c569a5c2c310fd99ef83d2a2762b4df01bffa4258d SHA512 25e1a179c9d45ca0a587fd60bcd77d05b66b20aa001ed0f45c2163b2f224b486ac337af7bcc3cc2aca4c3a236fe0f7984e02fc2089004062182df69ca33ecc07
diff --git a/app-text/openpaperwork-gtk/metadata.xml b/app-text/openpaperwork-gtk/metadata.xml
new file mode 100644
index 000000000000..ae90bd98b334
--- /dev/null
+++ b/app-text/openpaperwork-gtk/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>voyageur@gentoo.org</email>
+    <name>Bernard Cafarelli</name>
+  </maintainer>
+  <upstream>
+    <remote-id type="pypi">openpaperwork-gtk</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.1.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.1.ebuild
new file mode 100644
index 000000000000..360479c95a02
--- /dev/null
+++ b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Paperwork plugins"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	x11-libs/gtk+:3[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/ots/Manifest b/app-text/ots/Manifest
index b68c4556fa3b..cf20fb470e33 100644
--- a/app-text/ots/Manifest
+++ b/app-text/ots/Manifest
@@ -3,5 +3,5 @@ AUX ots-0.5.0-fix-installation.patch 514 BLAKE2B 932a241591dcc23b9a57070e23422f9
 AUX ots-0.5.0-fix-underlinking.patch 863 BLAKE2B a85d3c6d4c004a3105935e013705e10e26159500f7dd95c2edf6fcccf1af9bfd1a1f8854feba37ed7b8473e8c272d355367eb795486cc65b820c264a4dd32ed6 SHA512 34f189afbba9d1c8936142f27e5ab6ed4ab2eac8271a58e9295e46b993b0be7d48fa771cd62b3a8374da15b07deaa12eefcc01b0dd34643947cb43cd64f5d0a6
 AUX ots-0.5.0-math.patch 402 BLAKE2B 647dd793323f1eb6a470015053c066593a6fc4da95c3b36f3e0c7926e38ebd75997fd3482dffa3bda850f70fac5a8a65ad19cb6e725fd514d4e9d4b366d9fec1 SHA512 4ba250e3c51eb621bba6e8ee1d291719c86d04ecb2dc20cbd1bf7bae27ea22ffbe54376d690c24c84a0af0da9907dcf40d01c0aa53e9b610737930a442cf6918
 DIST ots-0.5.0.tar.gz 371126 BLAKE2B 05785a4d4ec5feba421762ba58a7dab649f3fadcf83a3f809a73b8027c6668263a29305766aba1bba4ce9447e115a89a59788026d567b5b82f9e1c1f7a934d97 SHA512 736a672e16b741f2948e6874b88d4ade8e0450941915e65285f2fe661194a6d384a6abb267b15c3254c638750c644b4b2cf4279d7bda163b02336fcd8da9cfbe
-EBUILD ots-0.5.0-r1.ebuild 1137 BLAKE2B 0d4814d998277afe205fb818e2065a3b3ab569194b2620552351e79bf48022a6609ab6b830b50f0a541d70dc7dad92184a225a708bd9c8fa7d6e9779d4940bc9 SHA512 658dcef19f850f9f41ff056428364dfa7e7efd4c498c84699c1fd54e2d68744ff84939d5ada19b57118334cd7122c223e7c6784b94423f8d8d61f6f91c360bdc
+EBUILD ots-0.5.0-r1.ebuild 1138 BLAKE2B 8eb53441c6d769f69da5432363c4702077808edb5b451e58ff4f3cb0d3591805eb2367cabd97220994c7888dad472cf3083bbc375d12f4a3fac85eba433d73a3 SHA512 5db848ddded743c7f6a4fbf79d3e0c6299f917d80d435ca624c32975bd5e557a6a88170f7d0a499a699bf8bd32b426f006d177c1763c1dfcbef3ed0a5c835512
 MISC metadata.xml 243 BLAKE2B aa2c4e92961faa40826e16a92582bb02cacbe1a10bd1e6e8d169560472923ce521ec642b1b0175ad5beac315e575d65c9a23466b08cc95eb9605ed2376af50d1 SHA512 354efb009da3999e18811a3e91f53628d4ce26aa103544be6b5d42caf9c5d9881097e81777665f96c7828a15a7e38f1e4a118579a865eb4c740e580527b42774
diff --git a/app-text/ots/ots-0.5.0-r1.ebuild b/app-text/ots/ots-0.5.0-r1.ebuild
index 07bff144b9a7..0dd8f38da851 100644
--- a/app-text/ots/ots-0.5.0-r1.ebuild
+++ b/app-text/ots/ots-0.5.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libots/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index e75f287dfc8d..3fa9e95a64d4 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,4 +1,6 @@
 DIST paperwork-backend-1.3.1.tar.gz 62343 BLAKE2B 2d391f63b0eaa010695b3c11b35a6c89df9df9f60d45401d8bad711743037379cdb856d8f6b0ba9f7837ac272c2d6fcbe6f58808d8b5047dccf210fbd9a3c98c SHA512 e845ddd4d01be0f4d89e7e4a0a728d06b90b87a551dca3a88426d1ce6487bc000676c997df73d13662ea8f93aced8e8dee8d44ed4fa588a4c8bd514135610c35
+DIST paperwork-backend-2.0.1.tar.gz 1283518 BLAKE2B 853e4733e16f1da503eb0a8de940c0d5a9379a3f82db50a96c6cdee82ff1b137c3b4ae4f128385217ab6cf43dfd0a3087fdd05bbde0da901c07053273b63f8e0 SHA512 14b072264436a300467ec9e45dc40c3ff9fab5c4ec383f6656b9cd89eabf37bf5e79118c02c67c65eece5e5d3809f3944049503a578e4616d440efbacfb46495
 EBUILD paperwork-backend-1.3.1-r1.ebuild 930 BLAKE2B 157568e2a86721c631f47b56eafc3edb0518f0546d532cad3fc447753eb87dda439292626e87aa87d9184e134701bbfe8d2e5473e08d0dd225d06a82d5972b7b SHA512 e46fe56f0268243697e073fa26b6f03218b698e468bf14adad662c4410539e57ad8c4ab0d6f58b81b40f94505697a7d266c817f5dde5d9c8fc28dacd4fed047a
 EBUILD paperwork-backend-1.3.1.ebuild 897 BLAKE2B 4591e27b0320fd1b6229ed7a728a64140aba43ac63f5d64a73ddc3ee6538c6b0bf01d15cd74a9aadffe9793ac1615b6314a7a3a1ccb003d203e3cda57fd0cf44 SHA512 94ae8e539bac5457b970c98a62b6fd2b8bddc428b3fbc352f68de6dc7d41957184fac61387a74025123475554fb6cf9bae4caf6db6cf2ce96ab5533d501a83b6
+EBUILD paperwork-backend-2.0.1.ebuild 932 BLAKE2B 70f9fbeae92f4e055d757404bb3c3c430c2073eebc8e8c37fe9475adf1fdedcc99443888a4cbe779aa663138752286afa1d73d210fe201a68beed478f44b6f87 SHA512 90fcec2a374cf540d5691655824d62d5bc55637ea0cc3a5b56c1f14e27479d70d624267a8fd9c6ce6b51de028f07e3239995f9bdd364483281f4a562c80a1dba
 MISC metadata.xml 342 BLAKE2B a73c59727e066a3ffa217b622c58343a42d34351791f6619aa94d1a659b9d43ccbdfc9682901fb074c876a3e66b19403c02657aac3956502f400a93bd73ba6b9 SHA512 5a3a63678f9d83107a83c1bc6e4181544627279e89b3b589fcd2b745221dddb0201779f7b8c3ec1d7b2812a92ec7ad8d290ba58c11860f46f3c5329840bf1730
diff --git a/app-text/paperwork-backend/paperwork-backend-2.0.1.ebuild b/app-text/paperwork-backend/paperwork-backend-2.0.1.ebuild
new file mode 100644
index 000000000000..b0dd1ae934b1
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-2.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+DISTUTILS_USE_SETUPTOOLS=bdepend
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend part of Paperwork (Python API, no UI)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="app-text/poppler[introspection]
+	dev-python/distro[${PYTHON_USEDEP}]
+	dev-python/natsort[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pycountry[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/python-levenshtein[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	dev-python/termcolor[${PYTHON_USEDEP}]
+	dev-python/whoosh[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/paperwork/Manifest b/app-text/paperwork/Manifest
index 9f8066900287..1210d6279ee1 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,3 +1,5 @@
 DIST paperwork-1.3.1.tar.gz 4631298 BLAKE2B 9b111c524da29c6d547141a64ff39a5c50f18375484ae60702a2c7ce57a7be51b62621cf114ffbfa9c2175f9978225525f321449a4a9cad2570cd26dd956e496 SHA512 a0e6a95ebd0b5bfc290b8981488967bb5f2198ac5ec768f824ed487648d0dea6abc3ab8b8cfd8107eac1223a5ecb351a5362d9cbd7d5efccf5cb8c9a318490bc
+DIST paperwork-2.0.1.tar.gz 6224111 BLAKE2B b643548caa306ed3a7ce049694518ee25e102c73968eab9a812d4b088213593d08d262f71510bae61b015f685f0ca38e578c4ec6db0df279f42ba068b450a813 SHA512 bda94421e48a76878c661f201f07cb3d10c932dab3da33cacf229214022ec0ebcfbfef675d12bf62865b11e05d9450057244d5ed6bf4d3073df99823dece6087
 EBUILD paperwork-1.3.1.ebuild 951 BLAKE2B 7fd9d8dca8ac034015f8f08d57c5cb59a69f6cb8d787c82286302b578b9da9638245582778d54cd309cbf841e919f2a3ed72b443eaf88103208b7f342106fbdb SHA512 2ac325e5b704ef244178dba5af6ba159b945279c9a1875854e218c6adab5cc13949ae103f73066579334991074de597320caf7f6507a283b401ee6753fa91451
+EBUILD paperwork-2.0.1.ebuild 1028 BLAKE2B 2775344dffc3da82966df3778814facd171e2feaa292a5636a8b0d59454198cc94f774f97f202df41ee2cc7ba598e12766d54d8836e842db6747920cf49e3eca SHA512 65eda3e0c1a5dc7359ac29c9acb2f6d1081bc7790be36efd7b484c2b98b493863d0d8a93791c7acd7b5b26b7033d4532cdba4d57f720144c2aae7f6c95bffb37
 MISC metadata.xml 719 BLAKE2B c97e258d05155df5380f08accfa9736ce44514ef9fa9b0fd0a4d5966a48df7ae940902ce929893ffb828f30883c4591c93a2bc5c8ca0c7a6f636e477e8f52eae SHA512 a36e28273a451c529451602b80ec70bca26d2db40a683e6fc7297db185c88696cc359c3f80951ff9580e81e7e221379913f7d1db3af3d00fb02128e1994e7f4d
diff --git a/app-text/paperwork/paperwork-2.0.1.ebuild b/app-text/paperwork/paperwork-2.0.1.ebuild
new file mode 100644
index 000000000000..1faa310cc1fa
--- /dev/null
+++ b/app-text/paperwork/paperwork-2.0.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8,9} )
+
+inherit distutils-r1
+
+DESCRIPTION="a personal document manager for scanned documents (and PDFs)"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="~app-text/openpaperwork-core-${PV}[${PYTHON_USEDEP}]
+	~app-text/openpaperwork-gtk-${PV}[${PYTHON_USEDEP}]
+	~app-text/paperwork-backend-${PV}[${PYTHON_USEDEP}]
+	dev-python/libpillowfight[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycairo[${PYTHON_USEDEP}]
+	dev-python/pyenchant[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	>=dev-python/pyocr-0.3.0[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	dev-python/simplebayes[${PYTHON_USEDEP}]
+	media-libs/libinsane
+	x11-libs/libnotify[introspection]"
+DEPEND="${RDEPEND}"
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
index ba6f2393d1a1..045ff70400eb 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 582 BLAKE2B 7b62f8256aa8c7703acb2738cba6b8355634e4228e6ef94b1ab75588ce600931796a8f2cc5a651e431bfd820c663450ef3b505093e397a1a008075e3e85d9c8c SHA512 17fd69151ede6550eec958af5ddff73addd883863070900dbf55cf22ad237e928f4d261c0cb3c038f19e0f92aa2cc4ccde3da79690036bd1c6ab1be5034adc90
+EBUILD pdfjam-2.08-r1.ebuild 583 BLAKE2B 76e44e86f459b5643e88b2e32dca0ae141bad2968b00899c6b174fbb97ca5b89159591db65fb42de6f1b5c03cab704849ce7daea7e396fdd92d17da38cfd0f82 SHA512 2a6ba575c5710e00c41078f65b705c37a9d2b98b23b7c9ac3e2c17efd2c07af5621abaaa7078236a43880f58c497cebda71d3b1b00f65327e1950027e27e909d
 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 c98be3eb9519..927fef83557a 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 ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 S="${WORKDIR}"/${PN}
 
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index a54e4c0a60a5..be2fbe591751 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -2,6 +2,6 @@ AUX pinfo-0.6.13-fno-common.patch 217 BLAKE2B 80bfe222627299bb078cc33005a6470278
 AUX pinfo-0.6.9-GROFF_NO_SGR.patch 259 BLAKE2B a49a7addbf822436bc5cb8cf2da9964eca3b354274de1fb5f64cf4d634164fbe55e634c99282f87b3cbda5ac9f334b25d9123237b4cc64e7e5286b57ddf2a057 SHA512 373eea0e8feca230c14bf658ca5e73698ea16d35b5ca790c46b5bf02a83aaf1d55628183f89666913dfea96ef0f3653789255f8dfd616fe5b3a19be195d46ce6
 AUX pinfo-0.6.9-lzma-xz.patch 614 BLAKE2B 0b84247de91a42f75d0664f4ccab23e3d57bc66f6af2444e8b9dee2c0e6edb5afad1d467725507c9618947463cdd2f221024c7feb387282ebafcb6bc62741c89 SHA512 8e3ec8a98347c061826cc913c09fd2177d0f8625947c319b527e85d5ae3dcbf7dafb34b5f4a5e2fc9639bcc4db45afdea7dda6db6a88001e1c6a3994b4847ae4
 DIST pinfo-0.6.13.tar.gz 157103 BLAKE2B 18af4a5ae1bbd2abccb174ce1a3a16e4d17207a10015042723c58f80695c2580ca0c1c60f4f6f4f08e67eb01316fe48cd848a887e65159a6cd4463eca14bdecd SHA512 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
-EBUILD pinfo-0.6.13.ebuild 1079 BLAKE2B a98ac680f4eadc81f710912a8c5f98696dd779318fcda5d23b2dbb99aad033abcc9c4bc385419d8e92b4b207a58be764f145864374e2dfa7110fe971a6e7e336 SHA512 001ba727cb2dea10f08f437d488847ee2e585dafc97d4786ce0140c6d8c7fa91970c015c55a300f1cd1f78aab8ed1334669c5e6f0692aba1ed039814b6b64bab
+EBUILD pinfo-0.6.13.ebuild 1080 BLAKE2B a30f5f1a90fa8cd988839ca7ab3e89aa84f70837dd7e8291f0be259b7fcb49b79cea9f069fe8167cbefd507d407df457ddcbda0ba0357a6008e56865692d9282 SHA512 4da1a32abb1417058e55697f44ae9b03b8d7a879a6e58ef2f25bd81cab387804c61c894759b00b657086453ced3b83ba937878472faeaf700d793a7a2c3b6f45
 EBUILD pinfo-99999.ebuild 965 BLAKE2B 70eea0fb86462f8cea446b270fcde21247bb2d497946ddf585bbf5f21651de0068746f82133cb0dbf8b3802be02af7ccbd8189118bc4da21e525b2cf456872eb SHA512 38490ae9c934f6a73e31b4e30df86d249f5c54199622ec6d9c9185f3d13cc83cc56a711b62c9fb639ffd80ae8448ccd9c8548121bcbb21356e272c3f44a7381f
 MISC metadata.xml 245 BLAKE2B 1564b4d8e674e807191dcc857c12585eaf336e3418e110853e311b2851b382ca8931b46a96230677251bf3784004879d8498cae2dae11c9289f4a8606dfa5d7f SHA512 bd2ae86e550344a79551fe0383e4625d28ca6fad675d84c66fc5b22ed7fe3afbfc2b4d6a7b1a5d02f6efbc56950b8295270a3dba8a1e7e51fde80a370d0c868a
diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index 15237faa9352..00dad93c8fc9 100644
--- a/app-text/pinfo/pinfo-0.6.13.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/baszoetekouw/pinfo/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="nls readline"
 
 RDEPEND="
diff --git a/app-text/podofo/Manifest b/app-text/podofo/Manifest
index 2f40aafb77fc..4afbed5ec466 100644
--- a/app-text/podofo/Manifest
+++ b/app-text/podofo/Manifest
@@ -1,5 +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
+EBUILD podofo-0.9.6_p20190928.ebuild 4667 BLAKE2B 307406fc1d69c45c58bfbb812a12a9cbf07719161076a9ac21c46c9555efbaafe81b32c13fa1c743cb5f349b68d90cf506c3afda9944eb59d7736a609ada0fae SHA512 e56d71764c1fe8e50c417febc9d0a1a8f741378586957c43d152847b61f101f1ccba3bc515b3410fba1b423785e792ce9e0dbfb786010762a594420bf70ffbe1
 MISC metadata.xml 509 BLAKE2B 5bcba752f845dba107a60068a4be60776e8fba516b42a2434bed1173786117054eb77e933b667604c96c10bbc5ced810b8590c77626d13a575857ec1ba253dbb SHA512 ad2bbc4598d80be1fcd4fdbfe0a08bec65795f23e768762dc02be766d82cf1549b6861bd8e96bd72b468674ab1e36ebbead3464dc647378b72a8679fcf422236
diff --git a/app-text/podofo/podofo-0.9.6_p20190928.ebuild b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
index 9ab734ae2d45..7d7ba64de6f6 100644
--- a/app-text/podofo/podofo-0.9.6_p20190928.ebuild
+++ b/app-text/podofo/podofo-0.9.6_p20190928.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
 IUSE="+boost idn libressl debug test +tools"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( tools )"
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index a234fcef44be..80e9999a885c 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 767 BLAKE2B 8b4e3a60dece697dbb534b04ff86bee3334e5c50a89bcecb4b41e31ae6d1774a8db3873798e03325899d1703d6e194a1a00d0ef64b8f72297bf9765567b4a64e SHA512 9a5ffebbb26b71a4a839a4710782630542797e42d1759f3046dd4d134646ccfd7cbbe29a3555a6a78ef835f847ba7d47e885dcc28961fcc5fe5fa3177fe8bb33
+EBUILD poppler-data-0.4.10.ebuild 756 BLAKE2B 10a80bb161f85612fc45a4588b6d606744985b098a38fa954e08e8e163b5a6701003d86eb4abd40003f46a3ef0b7f6b7b0ac6d57dbd802c31e46c58cc764de82 SHA512 d85293690f9cdb32d568ba8be2bff555ea82f2a424f2bac90b95433725c471a5fb9db1c8053c70d3e362f478de6e0df8962a8f5e26e01f4777a7e4fd4a67c004
 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 a59df9820992..d0da6f4ee55c 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 ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/app-text/ps2eps/Manifest b/app-text/ps2eps/Manifest
index a8d30d3698bf..7932703f36a7 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 912 BLAKE2B 09ca8b81ae0d8f675394b23d6cdaafcb987cbee8f107642c89527e34093df18612724a4cd0c0e467b4cfe3d31c7640fe802523e28b0f82f2ce0f3005ae417499 SHA512 23d92ef49746c7e0216222833c0660220c7fd78fd7d1843c2bf69b3b3a6f50290ce36b8fe5e35c9b1089b63465fb09710fcc1644fa12d80075553d4a34cebb76
+EBUILD ps2eps-1.68.ebuild 913 BLAKE2B 0f1acc4d9691816fa9cd4305beecd227de805eefcffdfb16be4de421c14cd3587caedafdbed620299545d7a2a879e7e17550fec59912fac3be8f01f6c6e05d68 SHA512 7e408def77bb2f01e31ea560d67755af047f1cc3b12a25a023e18e921b01779e257ffbda8d13a1c4334b74dfe871b7fc55e38dee8455fc65e97cffe4731442e1
 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 8e09d4cae158..0daa860881da 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 ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-text/ghostscript-gpl
diff --git a/app-text/pstotext/Manifest b/app-text/pstotext/Manifest
index e7d1d5bf463d..7c6d4bea19cc 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 655 BLAKE2B c947cffb60d9211e645e3a42b1b1a2d32bca1d20f70516c6aec48ca39e833634a2bdc69bf52b41fc0eb262425c6007b010c9b7e815a02c38ef5f439597125641 SHA512 7a53a08ab11421a7af8c7a23551dbfd23649f4c209cec592aa28854fef4e420c85e52db89d5204e5f9934f7251d41567f33eb57b9fd8976a82b0695f616f42d2
+EBUILD pstotext-1.9-r4.ebuild 656 BLAKE2B 2e48e57ebd2fbf1f455501cfde78ebdc978b8a16485956d1e76a336db61ea61bc2d427ff422d7d9e36a1d8379449ad03c31783231fb7165e8a82b0d40366d85e SHA512 2a335e6b5d561cf9b1e8943f934accf1d68a31f31829cc77da073d1594488f90c145594d1bb3e99d0aff9fd8ccaee291ebf1b0dd57d5be4276ba397f9fc78b50
 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 e514f3c9a379..c4a59e291385 100644
--- a/app-text/pstotext/pstotext-1.9-r4.ebuild
+++ b/app-text/pstotext/pstotext-1.9-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/contrib/${P}.tar.gz"
 
 LICENSE="PSTT"
 SLOT="0"
-KEYWORDS="amd64 hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~hppa ppc ppc64 x86"
 IUSE=""
 
 DEPEND="app-arch/ncompress"
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index da91e6a172ae..6caa4fcbbfe0 100644
--- a/app-text/psutils/Manifest
+++ b/app-text/psutils/Manifest
@@ -1,5 +1,5 @@
 AUX psutils-1.17-ldflags.patch 1417 BLAKE2B fa54e0f8cab31336dbe95db96313e345e9cd3a03f2c92855c5bc5fbc4054e89193ade6b346f52edf61f58f20330dacc8d7df32a5ec1769ed7ff62b4eacb36368 SHA512 179b1551516a8acc9f4f9859b4bbe06a6d6e2ba0ddfe20c147a143e6795d61d9cb4f55107866d7a891f0be0dbebaf11d836f4c129205da44ba561a133d69ab08
 AUX psutils-1.17-no-fixmacps.patch 1176 BLAKE2B fdf9653e881e05340445560ba5cb3303bc42e46a1605ee19d675023174aa7bf73d9b4cc37ba3bbafee9b3829974981ff58284acf7079f9b2a3fedbac9d28b2af SHA512 707ebb4594b341044e27cd3fb35402b4d3144eb52f9baffcc633dbde69b53717da148b6c03074411cb95dcf50b48ba87df4ad6c2ec3b24f37b0951c40012efdc
 DIST psutils_1.17.dfsg.orig.tar.gz 40296 BLAKE2B c74cde600e841e876892f3c0cfd20ab5d1ed87135e0bc952b19baf90315b95f89bf177b66deeeb91862fc2c620f688ba49972673bf9f4b4ff250590f0b2fc848 SHA512 a4ee49ecea9a948c0cfb8b51d10471409ec461a07bb94c1158c64e433f02ede4770fcb961d6ec79088bf247176db9757389d3e1cf5b64246b3b90b5584b59ff3
-EBUILD psutils-1.17-r3.ebuild 971 BLAKE2B 210fb8a3c31d61468b1d790068776cd14cf878487fbc7365767b6fa0c715e9995e8ec3c32e278b6b49559433c79fba09c906eabee5bcd9547ae155ff42a5ecf4 SHA512 a254c927556fe1385c5ee5dda5c2a37ca812ba7f580b10ada81b6a5ac6013f351168286472da5525f1971aeb32ca89af6eee95590ece463799c4580d62879b17
+EBUILD psutils-1.17-r3.ebuild 972 BLAKE2B 182741389910617848d19be6b2019d5a45d89abbd571b5c6124e6f1568e1cb94f4a0b85b385f640711787fbe16a3a6a233f11cef6d46ccac487a566de0082bb7 SHA512 beb50a8273935766b3f4ffb13b9ef22c8d14c5a3f2fa03a3fa82ff000f192464c0c1d00ccd9af70ef0887d63344a07d1951ce77112545950df1f25a82e272317
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/psutils/psutils-1.17-r3.ebuild b/app-text/psutils/psutils-1.17-r3.ebuild
index 901dece26585..0f1c2740cf9e 100644
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
 
 LICENSE="psutils"
 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 ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 532827129827..4305b2655a8b 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -2,8 +2,8 @@ DIST qpdf-10.0.1.tar.gz 18399985 BLAKE2B 5e113790e7c2b48987c18aa7f562ff18f0efb54
 DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
 DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
 DIST qpdf-9.1.1.tar.gz 18312457 BLAKE2B 0bbfaa782e46a911b20440bcf122d2745dde62de16423307cb02f7f3cd9a4976c79c7f6371322f793abfd8eaf9d5cc4f49b6854e58039595b5a488a2fec98d88 SHA512 008a11fef663a57ca173631f2053988023babea6c333cfe01db0ef955c8cd36d387ed9f2039f55bd5f9ca94c7a8e400461a09a15c5f89e03bc0817fdd0d3d585
-EBUILD qpdf-10.0.1-r2.ebuild 1347 BLAKE2B cf0992aa1050c973626473a84654f718c119ab6400d9c9b26e73909c47033ac6efa647c49c1d286d919cbfbf6ad4a989df0aa2e4a0a0e7bfa71e35c0b0400eb1 SHA512 5bed37858577a8c440ed8f0b5ca03a126c142e0af31b82184466705ac2275d8cd4c0393abd10b1c3a5b46db4abfc3137e08f76fa453b420ae5e4bf8153058b05
-EBUILD qpdf-10.0.4.ebuild 1316 BLAKE2B c5d3b304a70bfd1ce6c013a20fe66e0470c9949f10fb70e5fc3f53a8a880794881baffb5b74b0d02248299eef70cef879f4b3a49f97aca3c848f7e96797ae8ab SHA512 9561d6f9623334b0172d37cc933cdd8a0e9d9a10e006141b1e6801437ee9db2e24e952f6cddb7b7ada71e4b7004a4304f8f4e3cac727b7c5dd8d920a506fc79a
-EBUILD qpdf-9.0.2-r1.ebuild 1278 BLAKE2B a7ddc49812f5307f62c51df2175eea83baa3e029d7f77c049a0533426dc3b81f27bb5ae10d1d8ae19dab1ddc80819db986bf803b2d218355195c71dfeda65360 SHA512 1bcf863d03efb215fe98517fe099e04f464cc14dcd49bd23eede86dc55d38e0428c32b90e654b9412aa899695b7422f1a936ed49d4f8e1d6eb8d552bf9c9d12f
-EBUILD qpdf-9.1.1-r2.ebuild 1212 BLAKE2B 267f67e4b5115ef494996ad283d10f952bf78d405b860bb8c72cb39227236cccff3e122d8addeee35eeb1f285d564faf6cc90e014fa93ff20070b17a8fb5f7e9 SHA512 24c72250383f4bc98e1e7778f04dada81a26c0192166251f0e5a6cd76d7cf46440e62a4454dc3ed69add76d303f6fed21faf24f345edc939b6c30a803ffae7e7
+EBUILD qpdf-10.0.1-r2.ebuild 1336 BLAKE2B af9deec49e7152963e27e1eb9991459e5fc69894bfb3bfd46042a6dc4e96937adfc871d119155fa2bb53a037aa4450b1bd41f428dc537254063225fb3b501fb2 SHA512 a0e6b234899a8c812d6f5e913d4a67f4c3b859d1efa9d39c5bbe5a7ffb879326b6c9db1a732dcd5b1a4542f99747eb7d68953d3c25632ec0d146b0a680e1216e
+EBUILD qpdf-10.0.4.ebuild 1305 BLAKE2B 8b6e915d5587bee7966f7f0d223b73c5be4e5b5c0f59489af31acbb08cd64d36a37af81b0b668482bbc72592c522ba9991fdcd26daa569e502eabab2b1dc0de5 SHA512 6ab620a5b5e159d0abc1f524e73eb91448f32b19681a62e86fa05bd040706a268658c59e8d75bc1cfb12f1347d0e590b400118cf3904ef2fe63b0d54f4e41052
+EBUILD qpdf-9.0.2-r1.ebuild 1267 BLAKE2B 244e8677ebb6b50dc68c67cc2d873d30635276305a39bd6025d90c6309fdc8f225a14f1c35ac30ec76b10ed92d6e8a9635b86844ca360a5eaceb2643bdf3a71c SHA512 0f8dfc725276b465723fcf92a6901a8dd8f5dab868dcd08e81dc38697d5cf88add2bc5dc9c8a25ee28466ba31a6e8d661b703f4cc7b4be8b3fc04db425478b7a
+EBUILD qpdf-9.1.1-r2.ebuild 1201 BLAKE2B 958fdeaf58417998a807966981c86e3a9631fffb56f3147b63ef09b191fd1678b7e3aa32596b654b936b2cfe406172677c9388a3029ee1b4ed7284f35f456aba SHA512 061a807368bd0a0680fff293b8bbb2561a4563ae4b62dfc67b96514b6ffe261ba8dd45cd8098046df7af26c127143f45617680d699a8c67a37f1d2a194289f8c
 MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/qpdf-10.0.1-r2.ebuild b/app-text/qpdf/qpdf-10.0.1-r2.ebuild
index 21b1ec14df96..0fbefc46fb5a 100644
--- a/app-text/qpdf/qpdf-10.0.1-r2.ebuild
+++ b/app-text/qpdf/qpdf-10.0.1-r2.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples libressl ssl static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/qpdf/qpdf-10.0.4.ebuild b/app-text/qpdf/qpdf-10.0.4.ebuild
index b3c9fdf3a275..1b4a64c53423 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 ~m68k-mint ~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-9.0.2-r1.ebuild b/app-text/qpdf/qpdf-9.0.2-r1.ebuild
index 96a73f1968d7..81bb26e22d5c 100644
--- a/app-text/qpdf/qpdf-9.0.2-r1.ebuild
+++ b/app-text/qpdf/qpdf-9.0.2-r1.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/26"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/qpdf/qpdf-9.1.1-r2.ebuild b/app-text/qpdf/qpdf-9.1.1-r2.ebuild
index 58f00748384d..38db2a1d0318 100644
--- a/app-text/qpdf/qpdf-9.1.1-r2.ebuild
+++ b/app-text/qpdf/qpdf-9.1.1-r2.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/26"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index 49fdf8ecf67d..3ee2bb876554 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 1818 BLAKE2B aece9cfb977d0b336d703d41c0c20bf19c8bd0f57772e26fe7b23337c1c7c280569201c8ee9556b7fcce44cd8eaec32b78191c3cf1f774e838d8247ec62ea2af SHA512 355f507da5dda16adabc7608fa97d9b4dca321fb31f7ac469fe622cb5ea9a317b2ba5a04fd0231610b79177b7e2c175e59d5e389e399d4a8953360561fcb2f15
+EBUILD rarian-0.8.1-r3.ebuild 1819 BLAKE2B fba06c6eb72065802082183cf17c552c5440409f37ba4997c85c60c67337d5cf8174e953b45df2b4a2110f9c5dfcb2cbe5a8b2c463fef76601d56060a65331fa SHA512 85d7d483fa3b0bed71a7cad1dc6996af66dafd099ae7c951c4c993cf04d76ef0482df7fcc2f89a8097320c95ef455a53d6dfbbf971f752b41b8f00185f85e2f8
 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 60188d29a2a4..b6ebe6012c46 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 ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index c66ae4bad669..d4f55108e93b 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -4,6 +4,6 @@ AUX recode-3.6-recode.texi.patch 445 BLAKE2B d612b6b513908fdd7756cf3b0d8bf273007
 DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
 DIST recode-3.7.6.tar.gz 2210564 BLAKE2B 8c99b6d2eb93482785fe7e36063514e4c153516cc8059a9b98fc9f1b08704314b7933390a5fd7921525648ef58e9f995242182b8de23b7db33cbf94383e28f29 SHA512 ababefc445fcc47b6bf9ed640b767aed374bb8ce93cdccb641dd1ba5d298360583dd79070a0bb458f1190a8d6f1ddeb3b04eec34a61305b69def0963cec5843f
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
-EBUILD recode-3.6_p20-r1.ebuild 1683 BLAKE2B 41458adc86e9e77bf02c0ad8aa3405024efd4ea808f61cda13842ba82f5e4740af30a37432c0a9d332c4c64bfbe027cab73b4a5f7410fe6d40e0d63e9866254b SHA512 d96dfcb1094e9a7b8af27c1b8c42637b59aa3a1a0113787ba19fe0fae3f69b3ef6cf16ccee0e098752da4263e5c4b86b98223ada5741a1cfff65af1e04274050
-EBUILD recode-3.7.6-r1.ebuild 1016 BLAKE2B 2877c0ad077106ed1049befb217fa32524e9f8c8d8a625a6ffb9cf5df71ad37336dee61249e362109e04df32c25690612bd491b2ed4d704162eb620e9765510e SHA512 a4e71ea3e8652db14826451ced4b96644af086d185f1c7f438aac675925c4166e12f78712ef12dad4a5fdf813cdada7e532bad17f969e3ebbea47888c2822849
+EBUILD recode-3.6_p20-r1.ebuild 1684 BLAKE2B 5607ed151e42114c78f09d77cdeeed9fa04b56bdcc8e74d65a2b3986e361066c6aaa704e5b7c4ce9cdbaab65712027b1c34669a24ade472978c4e590e3831384 SHA512 5e85d3f6facd2815f5858034b0ab234724d486856f4f350c1cafd5b0a686d5edb6b1ca98dbaa061b1fa2a9040df642e1c455cf15327292673bec6787f9cc5449
+EBUILD recode-3.7.6-r1.ebuild 1017 BLAKE2B b106aec18581cdc1cdf6a03b77211df809bcb20da8eae9fb2e8feb46a4e40b2279d0af669ce8973450242f8c3f5b96e1d40b5a1d3c0390814574caef18c65c50 SHA512 462fe211c50ea91a9689952ea19aa8790a1b1330a8fe08d1ae51c542865eb3be09bf804e16b0519e365ef18406f622ed4499e787b39be04440b765815aff3500
 MISC metadata.xml 346 BLAKE2B 0a6af84d8b6ea322f62bf1f741e332892a60eee2704265685615240a178ddd965f524586179882867e609cef66ef021cfc56950581d1c0915f04a2a669dea9ba SHA512 6c5caba02d69998dc08954f52c9e126db6546eaa0d0f4abc166e96896fdfa8e73371f1206318fa00ebd0f266600c79105d43d5e300c07e7f7b0c3645f9537b2e
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
index 6157d48a39db..80002423b7e4 100644
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 DEPEND="
diff --git a/app-text/recode/recode-3.7.6-r1.ebuild b/app-text/recode/recode-3.7.6-r1.ebuild
index 6a353fdf17fe..493663fdbbe3 100644
--- a/app-text/recode/recode-3.7.6-r1.ebuild
+++ b/app-text/recode/recode-3.7.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/rrthomas/recode/releases/download/v${PV}/${P}.tar.gz
 LICENSE="GPL-2"
 # librecode soname version
 SLOT="0/3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~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 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 DEPEND="sys-devel/flex"
diff --git a/app-text/rman/Manifest b/app-text/rman/Manifest
index 004d5ab7f3b5..b70403c5f1c5 100644
--- a/app-text/rman/Manifest
+++ b/app-text/rman/Manifest
@@ -1,6 +1,6 @@
-AUX rman-3.2-format-security.patch 458 BLAKE2B 85807cbc0ffa292c56794f61f371333813283abce2eceee7485849ac60bed91c6c5e336c27a53049ec891bbaeb0cfc2253002fba487a79b713f91ec983519ceb SHA512 1994555d399656f9d22586464f1ee46f67d279c1d93184b69e551b87d9fb393ba24ad7dc6ea62dda1288fe605dedca1e4bdc20eb333acedc535f1063e2f62aab
-AUX rman-3.2-gentoo.diff 560 BLAKE2B 7f63625d37971f537c44667a05ec5b65c7c2216c05b5cc447fc802be3a35df365def1c8a95aebd5ed2f462eeced80cd1c106fb2708c231568a7666d1fa7335d4 SHA512 528b2e7385882620ecaa0374a65579e0fe56803aa6991277ea1279d18d65a4331ebbfc2374a711bda2f5722a5fcc236681f9c4dfb3c0abed1e931ff986cbf74e
-AUX rman-3.2-ldflags.patch 451 BLAKE2B ee44bfca1a15b8a52a42c703ca749722257f8ded019fa3119687f0808ad85ae696096bc29d5a7b04c4527382ad1f3f9d8d2d3e3bfb72005a167be3e95693a4b3 SHA512 936c9fb92e3f018ec0006370ea61f010b61469171a22a9f52a6773f32ef3ab01764b726573aa30548b1c9ea6db3893302a45d20c06bc19f7e272b5e531bec433
+AUX rman-3.2-format-security.patch 336 BLAKE2B 04ec15b8d7e20293d3b5da4c85107b20957661a5a249541ad7eefd8937fbfe64806afc386ee241deee1e53bf26c752107f66582682ae21c2c11f7e4e6a268179 SHA512 4f21e07f887b509b12dda37d30dbce6f599671cb6b300934a180f9dca8661a55734e7a116f39d2d877cab38d66d3a54ad12f842693b8abf0d7448700c96ba86c
+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 799 BLAKE2B c64d65ddb5a36cd4d5292fd02f9c61e766b0c110be3c833670ec85a01a317846df8da6ec6fc47313227d7bafa85edd75baabc051b0c57e97cb0d8c8662b7c58b SHA512 cbcdf6a685eee2981ebb533812f17df3f65c04c41d7df60a547a88ba77f690980838bbbcbcec43490a1ac5dfc53d8952216756b23945b99521682878b9afaecc
+EBUILD rman-3.2-r1.ebuild 763 BLAKE2B 1a5d86ef604cb2fc0ab91b3c3590dac92f008837e6012a6be2df1828f4339cf3775599a9d6dd06f1003eedddc4c98de1670b1393bf274fc5f3cd372f77966b2c SHA512 4ad491f64f73afa3be772e2c238f3625f21edc1c8af2d388ce4ee32894552efc7c000a1c2e5f37345e47298206726686b00dbea99fd43527e7fe6980009ef6eb
 MISC metadata.xml 334 BLAKE2B f3759592bab3b3f8426acb5a0fff5d5d7efb5618c951e2c0a26dcc119f609702f45327dcc47de6132befee7064536413006e77a09ab67415c041b0697129df6c SHA512 29d5b70060964469ce308fed8bc01e09bb74b3d2ac0605760d88f7dbd19a1cdd6517cdbab76f4269188454112837e0d27b32bbf3c5b9ecd5bb4d3ea4f862188c
diff --git a/app-text/rman/files/rman-3.2-format-security.patch b/app-text/rman/files/rman-3.2-format-security.patch
index 77070026bdb9..4ea7740a6822 100644
--- a/app-text/rman/files/rman-3.2-format-security.patch
+++ b/app-text/rman/files/rman-3.2-format-security.patch
@@ -1,8 +1,3 @@
- rman.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rman.c b/rman.c
-index d09e547..e5fc88d 100644
 --- a/rman.c
 +++ b/rman.c
 @@ -1372,7 +1372,7 @@ HTML(enum command cmd) {
diff --git a/app-text/rman/files/rman-3.2-gentoo.diff b/app-text/rman/files/rman-3.2-gentoo.patch
index ece1e3807e66..676d555ce375 100644
--- a/app-text/rman/files/rman-3.2-gentoo.diff
+++ b/app-text/rman/files/rman-3.2-gentoo.patch
@@ -1,6 +1,5 @@
-diff -urN rman-3.2.orig/Makefile rman-3.2/Makefile
---- rman-3.2.orig/Makefile	2003-07-26 12:15:00.000000000 -0700
-+++ rman-3.2/Makefile	2005-07-12 01:01:37.000000000 -0700
+--- a/Makefile
++++ b/Makefile
 @@ -15,13 +15,8 @@
  #    this must be a directory that's in your bin PATH.
  # MANDIR holds the man page.
diff --git a/app-text/rman/files/rman-3.2-ldflags.patch b/app-text/rman/files/rman-3.2-ldflags.patch
index 4a6f5f5d9eab..7f0745b2e0f2 100644
--- a/app-text/rman/files/rman-3.2-ldflags.patch
+++ b/app-text/rman/files/rman-3.2-ldflags.patch
@@ -1,7 +1,5 @@
-Index: rman-3.2/Makefile
-===================================================================
---- rman-3.2.orig/Makefile
-+++ rman-3.2/Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -102,7 +102,7 @@ all:  rman
  
  # everyone but me zaps assertions with the -DNDEBUG flag
diff --git a/app-text/rman/rman-3.2-r1.ebuild b/app-text/rman/rman-3.2-r1.ebuild
index d57e0cb0ab0d..486e973975b8 100644
--- a/app-text/rman/rman-3.2-r1.ebuild
+++ b/app-text/rman/rman-3.2-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 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="PolyGlotMan man page translator AKA RosettaMan"
 HOMEPAGE="https://sourceforge.net/projects/polyglotman/"
@@ -11,17 +11,15 @@ 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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
+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 ~x64-solaris ~x86-solaris"
 
 RESTRICT="test"
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-gentoo.diff \
-		"${FILESDIR}"/${P}-ldflags.patch \
-		"${FILESDIR}"/${P}-format-security.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${P}-ldflags.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
 
 src_compile() {
 	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest
index b39f9ffff298..0c7cb973ea66 100644
--- a/app-text/sablotron/Manifest
+++ b/app-text/sablotron/Manifest
@@ -1,6 +1,6 @@
 AUX 1.0.3-cxx11.patch 524 BLAKE2B 4b8c5f68e662b2d65e4acb50e2cc3584d2186f4ecc5c8e10be9cd7555a1d5e962b2b9dd0f3b8095921db68cbdbea00f2b926ca3da8b79f3f0bf165ab85bab1e7 SHA512 1e3d0200cf8193a61183065625cdb1394fc98a021a127170997a26dcdcab1671436c0d02a74d5eec9f5cfe81a9d030d0027ca5e4e133e08723504cf42a14b97f
 AUX 1.0.3-libsablot-expat.patch 195 BLAKE2B ec916a15bbcd86eff5c28c4f4ff2f5cc1f81bf43a4c8d5d26f2bc63fa14e509ae68e531e17051c09037932ea45043d4d94f9886aa5155610a52fa411c5b7a858 SHA512 3f769da06b06548bac82fb505d3f3aa9f2111c448e5b18ea3b553ecce9b627e3e0f02cdc6afb9491f9dab0b89946f6b056486395e0fd6a0822be0f549ccbf035
 DIST Sablot-1.0.3.tar.gz 607597 BLAKE2B 429df09361d233b290e1179d5a3fbe7b421b834c23ff32d72466f007fd4ce19e810d68483b1b0314e943f2ff0f3713a3f28a357a71c69722883f5c85499cb582 SHA512 836c1a9d09317194333619461b0e5ea312277cadb6df5ae5ed327bdfee4090970bd3056ec0b3bd6aa8a3e3289af1bc5c1461c9fe15b53a944f1042190c485031
-EBUILD sablotron-1.0.3-r1.ebuild 1038 BLAKE2B 951637f5880123c5326b3a8b05d9e756b7b74954582224daef203b8a285ab1c071267fe4c6ba77da435bfbe382cd8ecf626da766e5a6b2f58256669315afafd9 SHA512 997f719e6951465946496933ebf91498dc8b474d33f108cdcb58303356bc76982306d7d33b9a5c93564dbdd985b2a24e9df80185b1d6807be96c8dd5935e8881
+EBUILD sablotron-1.0.3-r1.ebuild 1039 BLAKE2B a8f3a9e0cfc0a4036949d66ab5d0094f8f0a0932b2a456facf415372aa3277b58a864a5014f70dfce7888cd54dba6f7c73c7fb3891541e92d3c5d64ebc8da437 SHA512 3ec6dcaf05dcbe7fa07332af1190dded1db1efaad4bec8b029cfd02f162823a2dde24d7d0daef3456b7d3eddf8e71a9742f6e32368af1d21daaca3d0ec245a83
 EBUILD sablotron-1.0.3-r2.ebuild 1145 BLAKE2B 762b95b9addbdccd631858b53ab44b4408ca4591cc2925e4a80ede9dbaa32cea71468deb0249c7cb2ea34e37937a20b546a7d20ac77fb6b1d506eacc805556f0 SHA512 284a6a7a79545c3c85dcb938ef5a44a71c419483702a316eb011be0c875e67265e67b9e932915ecfb32f536acbf03269657bd176931abdd4ae30e97e174d4141
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
index 5613dd70e35e..2ab9d95c096d 100644
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://download-1.gingerall.cz/download/sablot/${MY_P}.tar.gz"
 # Sablotron can optionally be built under GPL, using MPL for now
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="perl"
 
 RDEPEND=">=dev-libs/expat-1.95.6-r1"
diff --git a/app-text/scrollkeeper-dtd/Manifest b/app-text/scrollkeeper-dtd/Manifest
index f0b1c389beaa..2d5e48563c0f 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 1513 BLAKE2B 3837c941291c6509bda5283cb241a3d93e723cda4367713e40b3bbd581efe3a8e9dc6588be942a635481fc810f031bf3577af119cb2266038f3c64df4ea7c27a SHA512 bca5ff51b199b9a35aebdb7139746627a6da522da39f3ce3fad4b695afc682435708a71632df5a62b6214c2034f7194a43fb6cd47bb01e4f683b78bbde141207
+EBUILD scrollkeeper-dtd-1.0-r1.ebuild 1514 BLAKE2B 6d73a6b760dfa940be0974338b2aa6d99b7f5552a6f69c8cf8c0b1069ec2870954bec4ca3cf67e8fc209f1ad647945fe0678644ecc3432f5a0f6129fc5a3edfb SHA512 d0b86e86931725309790a924648518cca1833598c4da2ba8e5d3e2adf70ea7497042046d6ec2a3d480de484b32434532e1e9e5bee43c8d31872ad014f79d773e
 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 f9a8235ee26b..6e6ccd06e2a1 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 ~x86-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 ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.4.19"
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index c8d8a35748a0..d1a66265df0c 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 2568 BLAKE2B 3fbb18ef8a8a9c80897af4077eadd18e823b353d54cc8deafbfc37c17664f026050fcc9627e73d986fbda80da15da95bafdf21d213f0941573620d2c22b00125 SHA512 db65159d084b7b54f4e6f52c5c98589b2694cc681ff4b0f1063ad877e56cff7a2e1d3de0e4a162bdd4fa707caccc0bf31dcb2217b8048f68e0303fd44b79fe1b
+EBUILD sgml-common-0.6.3-r7.ebuild 2548 BLAKE2B ed389f04d2ce9453c1ba82b46bf03a5925a133c7e3ced626ca6394e65607086b8e5a804afa63e7744cff8fd0912f82c9c9ecb59f08431fe4f923e01faabf6faf SHA512 7e0a7cecbeb348449945085370117c749c967a35e138ef342d7c5d86459875d8869b33f7f228de6f9daf30bf90a9fc83b1c7243048429397e169c559e80f14a8
 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 2214c394ecd8..3f1c4a6fb357 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 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/sigil/Manifest b/app-text/sigil/Manifest
index ccb3b3a40a8c..3fcc4e0b4351 100644
--- a/app-text/sigil/Manifest
+++ b/app-text/sigil/Manifest
@@ -1,6 +1,5 @@
-AUX sigil-1.2.1-qt5.15-fix.patch 1228 BLAKE2B 61c4b8de1d7e6a65668f45b6aadebb7c93bad6c82ed415caad3900f009f88f253aa10ca678c76580ef5d3b344cead91390b001aa824e49ad963a45ff259971d3 SHA512 f4a42fa135b03a218c4fa1d2460563d727f90de1a20482ab35bba8ebe2af8484863424664930ad01f14c20772a60c0d60f6472e287ecb69302140df8af6b7b3d
-DIST sigil-1.2.1.tar.gz 21462439 BLAKE2B b615304d80ae1bc8b202398e4e00e25e6f13130ba5f27239d78cb847813fac6d13ddd868ed8daa496b5a5f2f37914603b3014b2c0ecb9f8ae2f0e5f6f2bdf84b SHA512 763648e5c77df9c34568790700f76a1793445f0ba061e2c8c2032c1de72bc5d5c0e0f671d87140df1b4404d571f6c1c73aa99c57208f7383aa2b0d50ed3c15a1
 DIST sigil-1.3.0.tar.gz 21697294 BLAKE2B 0ded5f2fa4a85a583113d268a0c287727faa9548a95ca3b564efac5db3528e0bf52b0df12f88cda46ae02851b0b85967c23c07cd3cd55073a87bcffbae8dec87 SHA512 fe1cbc2591dbfb54a2c561a3c53684447a4e90d944714bb182ee6ef160df74cc886c4d178d88d24a217643099ff9f409048ea2e5bb8ac88746fd280e48daa1b8
-EBUILD sigil-1.2.1-r1.ebuild 2062 BLAKE2B 246ab17ee83adb4f841c772e44402adc01239e6f3130536b6db2cc0546da219650401afca1bb044c611741e9fdcbf348e47acca07786c42bd341b08bf37672c4 SHA512 62da8924b149912b88d998b5c9431b6061e2290627c8d4d138b514132650d1b8c90894f330b5b1391886c919e5f4c0b4a1f8d063e555061152b313420bcb9589
+DIST sigil-1.4.3.tar.gz 24118565 BLAKE2B 4da0829cc82efe48c71c2a5d0be8477fd85291acd9578c14bd26f4521d2fd2322bec4c30002235254b9e731730a56b79787723059ba63884b75b33614cd94f39 SHA512 2f1e13a78a361df9b9031d5c04831d7e3ff09d16ed9cbd198b7735a4700f86e367f607554e805eb50db1a4562cbca33a8fb9cdf8167a95a43cbc2668ceb5550c
 EBUILD sigil-1.3.0.ebuild 2012 BLAKE2B 630aa4dce4218438f0b22179d33def2e62f6683e0c692970a3ac3c9a4dd8ca0d854576613c29231736fee4bf80bb9f73b44de940ad7e5b3c56e971780abc8565 SHA512 413cbfcff215f4d4bf19c8a8ea4bab4a8b86549e448aefa50e4391a289c0fc7e71410dfa342ea52cf9c4a5e72b7d3dbb9350a8f34a147238b8e9189b3dee4002
+EBUILD sigil-1.4.3.ebuild 2014 BLAKE2B 35b75074b7ade84ed5c8ea87642eda1795061ea54dfffc625e216fd7b37cfa9ae8e704d53fdd8e4bfe52934c8b0c3d2a98516faed11ca7f646c9e176df4ddea9 SHA512 924d52ce033fbb4417f6b606fcc740dfc1f0c77315a7b1897372fb91215db22c949054a96ded06ada00f717f0a82b71c9be0728270fc57e85f81e474d4ae2613
 MISC metadata.xml 932 BLAKE2B c7bf8b421a098f818c9a394cfe656f49fdf6349d762ca2bea588f24dbb0492ca426673f255dffe57dab54fde53408b6fe74bd2cd3b6bfbf31b9814c331de21ca SHA512 0e5c7366b3e0defbc8675c6a33313f6680bb51bc3b67963e79ff03d2f02aa201e5237af43645d1c0e6eb550fad17ca8f9ada9c85a9c4105ddb7a45ef487f726c
diff --git a/app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch b/app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch
deleted file mode 100644
index f15cfd4e9639..000000000000
--- a/app-text/sigil/files/sigil-1.2.1-qt5.15-fix.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 50280fae48717e76d56685bf0fda19783c8904e1 Mon Sep 17 00:00:00 2001
-From: Doug Massay <douglaslmassay@gmail.com>
-Date: Fri, 5 Jun 2020 20:25:41 -0400
-Subject: [PATCH] Fix Qt5.15.x behavior-change breakage
-
----
- src/MainUI/MainWindow.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/MainUI/MainWindow.cpp b/src/MainUI/MainWindow.cpp
-index 64202e113..de7e7f97f 100644
---- a/src/MainUI/MainWindow.cpp
-+++ b/src/MainUI/MainWindow.cpp
-@@ -4289,7 +4289,7 @@ void MainWindow::ReadSettings()
-     web_settings->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, false);
-     web_settings->setAttribute(QWebEngineSettings::JavascriptCanAccessClipboard, false);
-     web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessRemoteUrls, (settings.remoteOn() == 1));
--    web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, false);
-+    web_settings->setAttribute(QWebEngineSettings::LocalContentCanAccessFileUrls, true);
-     web_settings->setAttribute(QWebEngineSettings::PluginsEnabled, false);
-     web_settings->setAttribute(QWebEngineSettings::AutoLoadIconsForPage, false);
-     web_settings->setAttribute(QWebEngineSettings::FocusOnNavigationEnabled, true);
diff --git a/app-text/sigil/sigil-1.2.1-r1.ebuild b/app-text/sigil/sigil-1.4.3.ebuild
index 5f283ccaee82..79d3420abcc9 100644
--- a/app-text/sigil/sigil-1.2.1-r1.ebuild
+++ b/app-text/sigil/sigil-1.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,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}"
 
@@ -36,7 +36,7 @@ RDEPEND="
 	plugins? ( $(python_gen_cond_dep \
 		'dev-python/chardet[${PYTHON_USEDEP}]
 		dev-python/cssselect[${PYTHON_USEDEP}]
-		dev-python/cssutils[${PYTHON_USEDEP}]
+		dev-python/dulwich[${PYTHON_USEDEP}]
 		dev-python/html5lib[${PYTHON_USEDEP}]
 		dev-python/pillow[${PYTHON_USEDEP}]
 		dev-python/regex[${PYTHON_USEDEP}]') )
@@ -53,8 +53,6 @@ S="${WORKDIR}/Sigil-${PV}"
 
 DOCS=( ChangeLog.txt README.md )
 
-PATCHES=( "${FILESDIR}/${P}-qt5.15-fix.patch" )
-
 src_configure() {
 	local mycmakeargs=(
 		-DINSTALL_BUNDLED_DICTS=0
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index a1d9f7a34606..ae00392a036b 100644
--- a/app-text/t1utils/Manifest
+++ b/app-text/t1utils/Manifest
@@ -1,4 +1,4 @@
 AUX t1utils-1.41-memmem.patch 703 BLAKE2B 3d7801d11e9120701c3229bb495d5cbef8b538a1486bcbe40039b2915af9ed11c444f20914d8e678af4a8beb9db999052c53d7bb04ea912f0c665871ec7848fb SHA512 ab7a8f5273aaf478c4e2fd9aa201d5b081adfa431e147ccd429ca5eaefca1858008e09dbe62d7847ae3fe307d5b1f72a16093d026f7d73f665531abde5f5c60b
 DIST t1utils-1.41.tar.gz 176552 BLAKE2B 69ccc07a3b98de18355b09532129f80e4188d64817a1ad4e8439b3a0e37917a63b9e187a25fedfc5aba486b2e60279586a425992e9f25a111ba9c77ed3863f6e SHA512 b532d3af38a73903a512eb1297ba7510747dcbe8362acc4a0f20f2a3c786d82d8f5b22997ed3867114f33153a34cdd71c4c8e6a093db3cecc3825b6e4725a00b
-EBUILD t1utils-1.41-r2.ebuild 650 BLAKE2B 7df9dff83fb2cc2c85e3ef853a8fb75f03fe8f7e26798165246be29a85a8c886e72f590a7f90d87d488d90cda4fb4b944b2dc88d1ec0d42ab0da95ee83c7f649 SHA512 965c4264781241039711c5d9ca81b426750183960150583965b09558ea4213259ce3e261a792416db9985840939b9f5de8450261f4f2ba97172a8e1b36a6eb6e
+EBUILD t1utils-1.41-r2.ebuild 651 BLAKE2B d0202da20c7c23506c77d126891b05f9aa918f3ef7809f3d71aa4f916ccfa6d5870ef2382ffc5f08a7262262ae2e678d0d407ead2349528c8369fd4d6512330b SHA512 9519437c64df81e49175b71d95bce5aaf7ab3721066cd3148edfcaaf68f14e3aab473d6c6ce562f423ebd32eb1dcf05a2a9cd445fee48780a99c99ed5f906af2
 MISC metadata.xml 347 BLAKE2B 2f19fa13fe0a6a3f521653e00c787e1e5b61a0d53ef30e06efb6ef104d560e90417512d9e72bed79f51a81bd465494ac469f23246705876cfb91da82fe31cddb SHA512 6a4884011de9218a6c0417b64690cc76c9c5be7a525f4439fb04e70c3ed287080fdb5707004d611107dee69230bb1f892078260bd18dfe7aa824d88e23dffc16
diff --git a/app-text/t1utils/t1utils-1.41-r2.ebuild b/app-text/t1utils/t1utils-1.41-r2.ebuild
index 58f38fa7ae41..e8b67bc33c19 100644
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ b/app-text/t1utils/t1utils-1.41-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools
 DESCRIPTION="Type 1 Font utilities"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-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 ~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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="BSD"
 IUSE=""
diff --git a/app-text/talkfilters/Manifest b/app-text/talkfilters/Manifest
index 560814cd3eb5..abc52b2dcc89 100644
--- a/app-text/talkfilters/Manifest
+++ b/app-text/talkfilters/Manifest
@@ -1,4 +1,4 @@
 AUX talkfilters-2.3.8-format-security.patch 862 BLAKE2B f8050b5527c9777a2a500611989ee0eaa90fc1360ddb76a659ef334ec97cb3904f5051605bcf6b10dcad8b1b571d0a0001613358f1aa9c1b617a75ee893e6af6 SHA512 b210777c038878cdd06365a13591c723151356864c08bee700005e509b2f0f6aec4819730ca631d401e4cbb9d3dbd3a4a6551f0920819fa6097585ae43f6c8f4
 DIST talkfilters-2.3.8.tar.gz 821338 BLAKE2B 1ed5904829380858e5599458d54d3e7a339c10f057a94ce17f38b330d89ad5aba972cf234c10aa2ed7ffbf67c8b4c01a9bba0ebe73b4ba2bf32230e9e36eda3d SHA512 3fb317c572e95756fea9dcbaeac01e9576b05f5b0710e64513ecd05ec219f8050dec3bc5bc5d0d5f00c642487925765843da03525cfcb23925cab3c321272b28
-EBUILD talkfilters-2.3.8-r1.ebuild 648 BLAKE2B 49d1e118817d63c53777a74479ea316a085c255d81f8472251d376616a79e4e8f8bc71b326d351139b5747b0393dbf85111e6b104746822508b1dd864d0d70be SHA512 911738ff8e4511e7b9064e6721935b4addff3f74770088d1efffd04d804242a36ca960fac4af26ae5c41e4f54c2c27ab3e4bf89df9927f19873a0d18131fc4fb
+EBUILD talkfilters-2.3.8-r1.ebuild 649 BLAKE2B b9f0150bd0398bbda3ab3521b06fe2507835bd354bccc0c1ccb65890c216f238030ffe62a1c8773f52005ec5717d27db2d2a4d642a9e23258a5a5ee90bf22534 SHA512 60446283924f32a51ba87027d0ad8fc0ddcb1992a906d6399ad2a969c286d65b279d21bb2c7de20860d2a99d0b03a464b2023ab569697dc94685ee727583ba07
 MISC metadata.xml 957 BLAKE2B 2f66b167131788d1df1195fd9f4d372cfe2ada94c10ad6ce6d0a1bcd28582f3249344ef5733e39838453dca5b54456066ae93e976437e239a4a556982b436426 SHA512 d1b664bff6db93a8289a01b6ef00df35a06207722360ca753853fde6cd667abd739acbbadc9eacb16d46536326c61d6b1673ab50940f778c7ed7c228a082b52e
diff --git a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
index f9e61be4a138..d8b9123d8f39 100644
--- a/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
+++ b/app-text/talkfilters/talkfilters-2.3.8-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.hyperrealm.com/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ~hppa ~mips ppc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-format-security.patch
diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest
index d0ef874a8401..7977f226510c 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 1349 BLAKE2B 84e013c48206daf691e8cb6ae15d1a06e51e2da69af03b5b4e6753ef99c9172f9a5571d1c2e47473ad1aca2b6885aafc7d37ab2ce48a2f27b611edd97e3c8562 SHA512 96e9f654fbe3bf163aa0e287047fc1c727b4c8273f1f5c1dda7926d2219446a34e1682fd137108b704512bef839b5db616a1feabb93f9a1d30958a57847e4664
+EBUILD texi2html-5.0-r1.ebuild 1350 BLAKE2B b02b06a0c2e16c8699dc0fa7011b58dbda615e4537a36896bfd8d97261517281a93ef0e47b2c64cce9d249ad79b9616e5aac5a4aa97514f0aca5210fc70e5281 SHA512 b8cb493abe9de5adf01c3ab2ac0c7c6896398e9a02b670f948270161ca67b8e58965f9f33fe555e2f4779da2d03e0fab92aac204e609c10f521771d5033aa0af
 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 7caeeb4c3958..2c205ac29904 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 ~x86-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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="unicode"
 RESTRICT="test" #411523
 
diff --git a/app-text/tidy-html5/Manifest b/app-text/tidy-html5/Manifest
index b967843db09c..74b8fd57b710 100644
--- a/app-text/tidy-html5/Manifest
+++ b/app-text/tidy-html5/Manifest
@@ -1,3 +1,3 @@
 DIST tidy-html5-5.6.0.tar.gz 665438 BLAKE2B 3e362c8a22a5de827ec14110bad08985ff326c061043cd3cb0ffefd6b3af9a178197fca6a97bbb42b94760e530ec44646f13f6429736f7989effe52515580f21 SHA512 179088a6dbd29bb0e4f0219222f755b186145495f7414f6d0e178803ab67140391283d35352d946f9790c6b1b5b462ee6e24f1cc84f19391cb9b65e73979ffd1
-EBUILD tidy-html5-5.6.0.ebuild 632 BLAKE2B 9b39458cabdcf3a5752d949f882a57e93fa044e61249be899bb235c8b7ad5dec3736adc57688c4dc67ad014b97deea7a3334931e870b0cedd3970504a3deb5e8 SHA512 9913a78b0aeed41f9eea466333f1f156ab2a5ca64440ebe5b57aa506a0c78fab8ae02449e7a7ae2d5dff2ac18a0c700c56bec60557208b5440fe3214cc432733
+EBUILD tidy-html5-5.6.0.ebuild 633 BLAKE2B 504b5b60111a770abbd222898177da86cd719d72a2491725ce840304fea48f0b49ae91315e30eb73095ac77fdbe197625339037496a9493648d9bdce4ea17cd9 SHA512 c57bcd4043ece6ff8be58c8ed5e8a653f3d0f8ca15d2f934804cac2fe2aa634bca7df34df351f046676958216a6bf566490683fe14563eab6746f4d928c81d75
 MISC metadata.xml 333 BLAKE2B 92aabf92af24245465d0e5b1f99faabf41cdb71fffd31b7fb1e8268c5d91977b44d3998ede7789f280031c80d70deb726ed201b896007d63fd0710ffbf8b120e SHA512 aedfa31a9188be8d3ad9ea8b278acf1b3e90f9b0c91dd63b00c19a90c6a74d16ee57d80810f39392564fbc1b782b35b6231a9b453f91e765296e5ec45d5c087b
diff --git a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
index b028fa4e8e1c..a679ee9a15eb 100644
--- a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
+++ b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 
 RDEPEND="!app-text/htmltidy"
 
diff --git a/app-text/tkinfo/Manifest b/app-text/tkinfo/Manifest
index 3a3647afdfcc..665b285ac268 100644
--- a/app-text/tkinfo/Manifest
+++ b/app-text/tkinfo/Manifest
@@ -1,3 +1,3 @@
 DIST tkinfo-2.8.tar.gz 56234 BLAKE2B 6351a8c3ee46092a5c46db147006cb462882cc9abec11f49f07f4f4b50888be6537625a0756a8f05837c21d769345e39837f650ad3a6488713adc304880a3674 SHA512 dfce278a1b33eebcebe3f6f9b5885a8c247f3181d154bc35d8b6d894f1f33043e9e40dd4c8dc336fa100700883295e8a648bece6f04ee556d4fa2f69adaecb76
-EBUILD tkinfo-2.8-r1.ebuild 577 BLAKE2B a57c2355509720494b0cc0b47751f4108fe2e77c6ace003c39f3673e5b3735be7a109bb91a3abc7281acbeb5f5fab6ebd97c453147d1f3b2af1fdb7d4529bdc5 SHA512 a7f3850eaafca673044b54dc5389866d7436d61a853b095755c63f27e1daecce68fc426646c5ae2f4426cd9da56020949afdde62f185c822bcdeb1fe76f845eb
+EBUILD tkinfo-2.8-r1.ebuild 578 BLAKE2B db7209caefd9ec7f8607820e43879952cdd8cad2bfcf33c19f54bf1df9c70af14bed99dcf35fb5c1f5ed40de90b319833a7b6a3d0af40864e6e6c75bdd140f3e SHA512 524fd1182ec44b817048f349ef23981681c3d436ddf0a99a9cc5862c3ff389d13b4c6f913933556dac19aad5a55fba72d24a2e0e9b7796590b47b828d8079205
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/tkinfo/tkinfo-2.8-r1.ebuild b/app-text/tkinfo/tkinfo-2.8-r1.ebuild
index 0180c51ed4b6..25b60f40b1ef 100644
--- a/app-text/tkinfo/tkinfo-2.8-r1.ebuild
+++ b/app-text/tkinfo/tkinfo-2.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://math-www.uni-paderborn.de/~axel/${PN}/${P}.tar.gz"
 
 LICENSE="Old-MIT GPL-1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc sparc x86"
 
 RDEPEND="dev-lang/tk"
 DEPEND="sys-apps/sed"
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index 721e62116878..d20b66411d4f 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 1040 BLAKE2B d2ac723a3dbd635d82e8325c692f9de7855917cd1b09710a2d3477566e901eebdf54576bf90f5cf2d6b3a83ea6dfdb9abadbae0f57045bcae5acdaed4591217b SHA512 af03f5cb029977e47490976044e71b9866b2192682f0176557e2df0983672c922ab4cd674bdbf6bf1ccc1364e2e859767ce9e7f41f68d5333ee070d85f60ca05
+EBUILD tree-1.8.0.ebuild 1041 BLAKE2B ece993680e9263a6c1e93c0ffcdd7a508c2a05ad3e3e7f407930efc84557f34f238c94c6ec64bb76b4180a889b507cd7ee7ac0e91481d9282bf851b739d71ce3 SHA512 491aa6dfd716f70796e18b8a01c1b63b69fee860c6aa6a005a9ec283603b7d848d68e76b34a1e51c6eabab968ca4218fdae5b6ac868e8a937eafd6fc21146154
 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 42842fb57b01..b862f8493c38 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/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index aedfb6198eb9..cc03fa41e198 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -1,3 +1,3 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
-EBUILD ttf2pk2-2.0_p20200406.ebuild 1110 BLAKE2B 93e26def82492d2272d88231e17fbdc63e5d80bfa07f6ecd020d0e9c9d67af44f0f5b40ff2da79122d4c5dc005cc6d275aa905dfb1884b6f34982a6a9fb92b47 SHA512 0a0d83b76c946c597d3b55762734bf5eb5893eb9fb050e75d37823e0564e87a81bb2fb91f10c58c83aa0ab61d1f21bc8ac7566fea68ec9449177b2c0e2b90c5f
+EBUILD ttf2pk2-2.0_p20200406.ebuild 1111 BLAKE2B 4ef0cc7a325233798807a5e8e1fb10816fdc0847ea7ec8ae24b1ada1a5e38800720a701bbb3f47d183895efd58b1de31b0d01b69dca93b91bdf972a2bb88480b SHA512 915b9967322c53c846141166037b1277af5761298868dd9ce59668b44f11bc518f653a84085ba32b75c81ec9a02497ee054261dfc973221cf5806a51d73f2b6c
 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 4c8e295766ec..388b18b099ce 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 ~x86-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 ~x86-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/txt2man/Manifest b/app-text/txt2man/Manifest
index 8e504c3343b3..fb1b371e4ba6 100644
--- a/app-text/txt2man/Manifest
+++ b/app-text/txt2man/Manifest
@@ -1,7 +1,3 @@
-DIST txt2man-1.6.0.tar.gz 16941 BLAKE2B 4ca7d13bb61b0b65ff47a6a6f37c5035910804cff71f0c6d848105d7ee9b8285fd6433fe019fc075a5b28769df5044a462296ad63514d44a75abc1fa552b64ba SHA512 7ec2cc0bb685d890cf06504d4faacf7a02c5a321963effb71ff63b7310f64f092e666c055c1dbdb699958a62272fe4dc0f31f3947ca6895aa425753a11b75379
-DIST txt2man-1.7.0.tar.gz 17142 BLAKE2B 56dd6e09ed52cac0b203f68b6fe56550b13f4d2e6ca54cc816cc89e29e9ad65b5b9d36e94fb107139d4d4afd400f0b33c35eb824a0ca66dd7ec66b6b4eb25f7d SHA512 55cc51d32bbc47f3ec1b33aeb733fdbf4194d5cc8ed124a3f3f4afa90ed6f025a7684a8c1babdb5b5a65f716eb76ea2a6628261523b00110406b94f922ba825a
 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 597 BLAKE2B f67ac10cd49997f1e147d3e8392f7b704c214ed1e05964096a1b00460bbb7bdaa6edc5efc72c75d720a403837452e9d548588c1fa520d0c6edbf689c847f63be SHA512 b43ee581c855f367f507d26091da6746abf925869f6e5c9dd26d62b42ffc7fc78ba237ee888fb98b7620cd7656a8202e86e9601190fc6d740226cf089e8383e2
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/txt2man/txt2man-1.6.0.ebuild b/app-text/txt2man/txt2man-1.6.0.ebuild
deleted file mode 100644
index bb5a6e2796c2..000000000000
--- a/app-text/txt2man/txt2man-1.6.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Scripts to convert regular ASCII text to man pages"
-HOMEPAGE="https://github.com/mvertes/txt2man"
-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"
-IUSE=""
-
-RDEPEND="app-shells/bash
-	sys-apps/gawk"
-
-S=${WORKDIR}/${PN}-${P}
-
-src_compile() { :; }
-
-src_install() {
-	dobin bookman src2man txt2man
-	doman *.1
-	dodoc Changelog README
-}
diff --git a/app-text/txt2man/txt2man-1.7.0.ebuild b/app-text/txt2man/txt2man-1.7.0.ebuild
deleted file mode 100644
index 06d8cd383865..000000000000
--- a/app-text/txt2man/txt2man-1.7.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Scripts to convert regular ASCII text to man pages"
-HOMEPAGE="https://github.com/mvertes/txt2man"
-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"
-IUSE=""
-
-RDEPEND="app-shells/bash
-	sys-apps/gawk"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_compile() { :; }
-
-src_install() {
-	dobin bookman src2man txt2man
-	doman *.1
-	dodoc Changelog README
-}
diff --git a/app-text/unrtf/Manifest b/app-text/unrtf/Manifest
index dc7de37520f7..cee3cf96b663 100644
--- a/app-text/unrtf/Manifest
+++ b/app-text/unrtf/Manifest
@@ -1,3 +1,3 @@
 DIST unrtf-0.21.10.tar.gz 812696 BLAKE2B 3edc654feee461bb785877c3c3829462b9f55556e352bd12a19e426911336e161431badf5fdf5e00b0c488ca1804a0922ac7eb6980ebec58232112f6cf156f34 SHA512 31bedd1a23a052c1235e1328a12b346a0fe48b3f3cf78d72c068fe0d3edf18bc78f4c9dfe2f093ee8b4f3c79e923c6ceda49bc257d191dd5371f9273809343c9
-EBUILD unrtf-0.21.10.ebuild 410 BLAKE2B cd3520f0d3fc77ae683afe34210b2cd6c93d293274aa944f9f23df3c2d19b4856fc95525e2c8a82f0d72974eba1db24ec3704f866cf1e7af629826a231821ae9 SHA512 749fdba434a8788d2ede21351de8d5fa09119b3bfd4c1652ad8e0053ea7480243b7e845ae07026de447e4e9abbaf682a510f883a01d456cee280ce35f39466c4
+EBUILD unrtf-0.21.10.ebuild 411 BLAKE2B 240e0e23ee8975f9a35c1e11c76f1da62f3bdc53aab0b27c1d045322f09d86787063b332014295e129f1bb90154bd5f3b333e7b87d4bdba588761c52fc68f36c SHA512 43185632757787a8186f31a013618568d62f5948dc0742ad5edc2cd7874e2563b67fd8040d67b32e85cef26c6725f5f3a9d1e79a0d2badff62b6659593ef8c8e
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-text/unrtf/unrtf-0.21.10.ebuild b/app-text/unrtf/unrtf-0.21.10.ebuild
index 236514708983..ff1b58b9c25c 100644
--- a/app-text/unrtf/unrtf-0.21.10.ebuild
+++ b/app-text/unrtf/unrtf-0.21.10.ebuild
@@ -9,5 +9,5 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 IUSE=""
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index aa36a4ccdac6..f518fd188935 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,3 +1,3 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
-EBUILD wdiff-1.2.2-r1.ebuild 879 BLAKE2B 0c93fc63215b814bfeb75a3274f3338ce4e7c38fc35797a7ad29167703fb0e24074ef7a290bb18a84abf43503b78b3058f5999c92cb28637521076fc45e786ac SHA512 4148216f54eda9939d84ac8d6839121ae0b79d53704dc8762e90df4d0f27f8747cd70b8d14a085b639c4a8fa6309286e2bde92c7bfe86f6ff64c310b560f4bbf
+EBUILD wdiff-1.2.2-r1.ebuild 880 BLAKE2B 4c386057db6fa83679b42c0314abe6336dda9bfcdfc2c5887037595f210b8eaa81509ecacf991ee77b90597ae5fe21c19d3cbb27b73854468840977bb2c391fd SHA512 ad0383422e8aa931adeeb787d47d2fc2c189fa2b65bf6f7cb70657b6846de9bd71a1a1541d3423434689c75ee133cb8af3f80603408c0933e2e95eb5485bcb5b
 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 e16047fa8605..f8235bcf109d 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/wv/Manifest b/app-text/wv/Manifest
index 0931fcd39ecd..e0a7d7c1fdab 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 1450 BLAKE2B e9725127cc6fd80db6159117acda509a88abe56dee32a997ede4a3c56e84251859a460e657ed84674db0ce61467b33f7f5004a9fa3332b8762345bbfafd0d0d0 SHA512 b5d4dd127e571727d42b308c2c0a30317fe13785009fc75ff2987c4774b54461f2aa1dc2a9fee42d39cc25a0c3f95fda9f310763783a93bd98704e85f726f848
+EBUILD wv-1.2.9-r2.ebuild 1451 BLAKE2B a6691c959683dfc5cf386881596cbe48e42aafdf06af8a5356721f9bda3c058c702d459e697e65a0ef6b00a2426039d16a30fc1b8deb8bbbac50f40f5ff4025d SHA512 ea8ca4695bc9481fd7ac67d447682f9ecb00bbf961a1edb8705c14c06ef37197a14d1a740bff3bc6bbe945848956c0a3f57d563e533ed6c7a1f2bfcea58054af
 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 ed750acca201..b75a8fa43bfc 100644
--- a/app-text/wv/wv-1.2.9-r2.ebuild
+++ b/app-text/wv/wv-1.2.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://wvware.sourceforge.net/"
 
 IUSE="tools wmf"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/app-text/wv2/Manifest b/app-text/wv2/Manifest
index 15b264c9ac2d..b05a591b2ca2 100644
--- a/app-text/wv2/Manifest
+++ b/app-text/wv2/Manifest
@@ -1,5 +1,5 @@
 AUX wv2-0.4.2-glib.patch 312 BLAKE2B 7c68aff28688cf4ad7ee99c73d4509197e958bf05fc6dc8a556e2c2376cd586942778dcb8cbb1aa1a80cf24b1ab94415224b5af122756eeae02a316464eb6323 SHA512 0dfa6f75d9c117869eff3c4c5aadaf6096af8b2239626fc249a3df3ddb5437c417c3265a0a5d956af2241c9d7b3cc137b6c79598c38506fedd2964e85bcf54ea
 AUX wv2-0.4.2-libgsf.patch 425 BLAKE2B 417d6b340c34dffee0301308ee5a04f4468a5627670638399535f7336cca7515927392e66dd723e8a13742e71ccb1bf850c7b91608b7f280b545a707d6425a2d SHA512 634b1a336506777f8976b81cd906f8a896e2b777a3f04c5791277ed5ca2856dacb71adab807efecdf29d07c02e4c95b5d6fe143b1660be77e37ed9d7bd177143
 DIST wv2-0.4.2.tar.bz2 452759 BLAKE2B 6134739459617189f9d4e11a660dac25114b5d329b43d02fffe773d25bf62f2eb9f4ccb2712016e670c72f089a6d48f764e99b0ce5d44554d3e9d69ea9e14762 SHA512 7b4fb1dc6aa05da52ea169bf13f3bb544a7a896cf9127b6d67a08e991d798e81e2bf65724cf9396a9b89902f7856007006d8b123fcaaccce77e2a4668a9c9d5b
-EBUILD wv2-0.4.2-r2.ebuild 820 BLAKE2B db90a1b22c10d6c657814b7c7feb8754f6905b2a76026388fc10acaaf53b0fc29b41ef1ad3d57847af103ccff9abac29c16e571ff85161e422c6e37458633e0a SHA512 b561f27695a8e0d2f182bade41cdf32418d589b1ee0989c65ae6e25bd9e814983ae13a1e05135513e63bdc34881842aa1643e3ed6b4d8c1096b3145ddc08eade
+EBUILD wv2-0.4.2-r2.ebuild 821 BLAKE2B 60ccf8920cff67dcbfbea46ea71389a73dbbc02d39743af6dd8393378ccdf78b92e0a6b5029cb6fc8abc1b387c1b026fb48983a903220d2492674be00ebf8cf6 SHA512 ed0bf0d11f2c64042a357830700f78dda76c4280e7a967a7731766c308df17d4c6eea05054675a1954ef59b853cc85dd931aaf6fcbab71a38f47570d3e3574f2
 MISC metadata.xml 385 BLAKE2B 3528b2f800f83faedd0d61e9842dcd95c97a6fd805beec944ede5967c6f7da198d742521c1d8a5202366518407011ce8cb2b4a6072b9aba2aeb5a5b9642be09d SHA512 700605145c4883ed52e8f5a2dbc230aaabbe12038006c31f784d2bacfa71f8942100ae8342d393a27fa74d19dbc2a6d9cdd829659cf7509182761ecfd4782408
diff --git a/app-text/wv2/wv2-0.4.2-r2.ebuild b/app-text/wv2/wv2-0.4.2-r2.ebuild
index 70f4624a6b54..0bd111c40a1e 100644
--- a/app-text/wv2/wv2-0.4.2-r2.ebuild
+++ b/app-text/wv2/wv2-0.4.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="zlib"
 
 RDEPEND="
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index 91a41f1a9328..232135943ee8 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -2,8 +2,8 @@ DIST xapian-omega-1.4.14.tar.xz 540532 BLAKE2B 193e03bfea5cf7cb5fc5bfca57f80b139
 DIST xapian-omega-1.4.15.tar.xz 545916 BLAKE2B be89c817d13888bc8de28973be15a512992dc1e6c23ea55f0470b179c9b29b82f2f2988c6ac430d62c3e45e6502555a3497bf3f3ce7bebf832fc8cf8e3dc9f1d SHA512 99ffe32c37b22db4557cae214a157d3b1bda27b2eb86f99862ca59ac326e5ba3f044fbd58a0ec9db7098700dd6a2422634c80987c9152536ec217e48d9694679
 DIST xapian-omega-1.4.16.tar.xz 546360 BLAKE2B 990eab976833854d2a172e1584383b71375fe2e0b83a8ff0a150f4c9fdb6e99cbd42e58720e81698292843918112426d3b445efe14d9ee5f76e85304439475de SHA512 7f8c3d4e372c49f89e28da999ee49f0754052a339bbc4492b50f8134cf29b2c433ddae9e58ef3a2468898b711b4510ea87687a247ce21e83eba2f8daaa2910c4
 DIST xapian-omega-1.4.17.tar.xz 547372 BLAKE2B d164ee2f96d395e2a45919aea821d1bae9b028b64389b4a6e6f1179c0e1c2a92983a3fe7a71f68fe11e04eb61e9f011c21f2edf5660f9feedccd41de8ed2f445 SHA512 0388714ae307044b486e92eacac2d8c09c334e1b77be6cc2c36f8c0c679b4fee660c9b12074e9a278e2981b4a5b4a607d068a5d16c852bef719245bb70b7ce7c
-EBUILD xapian-omega-1.4.14.ebuild 1154 BLAKE2B 8811fc7b98c00a549752cc33f1f6ee53a5c9af856e3bc534b830e89aae2a8f2e4dc9b33f14bb5de528bde8941c5629e3c31660daa9e20c5a77133203befd539d SHA512 58671f926670abde77437ed28e6b602777475bc5e5a57775d65d02ff0c6e0ef2c6fa1eb3c2db250c44496697ca6fe4c2bac9a48f73a0b6b8d2d657114227c347
+EBUILD xapian-omega-1.4.14.ebuild 1155 BLAKE2B 94dac57941897f814698abc23b3f6dab6d474ba32c287149ad0ec0fa60a2b9f7267c8a6f54461b6806ff80feeafaaf22ae2d9eaa1389c6c2e7e42a2b3608b647 SHA512 89fdd79a01417932e68eed66b129b6fd70180c11d135155a40797e5fd8a86e769cc665f69702b3ed1e599cfac2edd07b40b0ef71f329723812f6f456a5272b95
 EBUILD xapian-omega-1.4.15.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
 EBUILD xapian-omega-1.4.16.ebuild 1155 BLAKE2B 3b70ee62f59ab3806970362fd4fd2c954af2c4bf0aa9c223cd0760789aadb8d10450b528081c11a608f24a163c46ae8a5d56537c21c3020e5dd6c36765b309b1 SHA512 a696a22ae33e14f232c98d7d50e9c7431ad0d98c755a823542276cbabe6c1a78c6788d8b26086edd96f31c43a0d64cb2393bf846e07017906dda4df4714bd302
-EBUILD xapian-omega-1.4.17.ebuild 1154 BLAKE2B 8811fc7b98c00a549752cc33f1f6ee53a5c9af856e3bc534b830e89aae2a8f2e4dc9b33f14bb5de528bde8941c5629e3c31660daa9e20c5a77133203befd539d SHA512 58671f926670abde77437ed28e6b602777475bc5e5a57775d65d02ff0c6e0ef2c6fa1eb3c2db250c44496697ca6fe4c2bac9a48f73a0b6b8d2d657114227c347
+EBUILD xapian-omega-1.4.17.ebuild 1155 BLAKE2B 94dac57941897f814698abc23b3f6dab6d474ba32c287149ad0ec0fa60a2b9f7267c8a6f54461b6806ff80feeafaaf22ae2d9eaa1389c6c2e7e42a2b3608b647 SHA512 89fdd79a01417932e68eed66b129b6fd70180c11d135155a40797e5fd8a86e769cc665f69702b3ed1e599cfac2edd07b40b0ef71f329723812f6f456a5272b95
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.4.14.ebuild b/app-text/xapian-omega/xapian-omega-1.4.14.ebuild
index 5d0f5ddcdc69..51e7f7c7a19d 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.14.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.14.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild b/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
index 5d0f5ddcdc69..51e7f7c7a19d 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.17.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 3a9b62acc97d..d9f04e1fb5c6 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,5 +1,5 @@
 AUX xdvik-22.87.03-freetype2-config.patch 1019 BLAKE2B a675a238fb147dcb67eda572b9a3b1e1b1ab630726464eb740240be0815b9a9da5e5f7a8a6d404648f060995c64efb02acbb67fc907dd6139c6817f0bdb5a946 SHA512 be5b7de6957c5bb2ad884e5b3a6a21f074b84b6be08f519b80a24dacd8630b2bc75dc64e225dba388d17a01bfed6784b2862db2e6bab4b73a1f6d4aebf23a9c6
 AUX xdvik.xpm 3125 BLAKE2B 97990fbd5b22e51319c3f55bfe16808b01f215a92185a170620c8c0ef1dc44906e38af48ad056d4fb40a1777f92a88afaa0f80c0b36e7dd770954f7009d261a3 SHA512 697c888c481d7cbe7b42980d2ae93a8d25d781f926970d9040f8fbc6a37545349fbdbe2e8c98fb686e5a5ebe9a7a5ff661793d3a264fd8641182b0397365517d
 DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
-EBUILD xdvik-22.87.03-r2.ebuild 2896 BLAKE2B d8e3310ac58b7deb3de603719a8de3a2408481c3882dba14e27219607becb657f594b48664b4511f34e4ad1efa1345424ef27604d610861510cfee78466db12f SHA512 65eb8d3c8256efe25a8825a8e1fbbbfeaae3533f54d6ceda9900ce4008cdaa574ded9bbc79406b98f69be5b369b1706b8187b75f338405eb86a23143d35c8531
+EBUILD xdvik-22.87.03-r2.ebuild 2897 BLAKE2B 3a0ef2e1e1eb649e7424087697301555046c7a4509ec306002787760ab0fb800856cca16383c30ee3d19208c21c7fc00c819fa957f18eed381e2ba10fde5e5e9 SHA512 787a29d47bb28175a1c5e9dfaac488cb3174c6f1a1481c11ae4e60ae1029ee50b2f55b4d93cd4dc4bc9e007818ba090be3b6c04e7eb0df0835d4cab0d5d07521
 MISC metadata.xml 594 BLAKE2B 338b1aedaaf7426ed8bc2b9ae08e03f9fd6170b0714f938fc97a0f4555e8daa385635200bcbea4d0959604fad44db3212bd7436ac70b2e49ba353dd48713e7c6 SHA512 b1563a6578aec4be3df4b47c9914de3ad80a8859e60bce3a9b3e48f1b8bff3c38dd266523c913ab97bafa2c0804ab5003b5a449858582ef934044d80065c5cdd
diff --git a/app-text/xdvik/xdvik-22.87.03-r2.ebuild b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
index 4c654107366d..584d1a9aed5a 100644
--- a/app-text/xdvik/xdvik-22.87.03-r2.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="DVI previewer for X Window System"
 HOMEPAGE="http://xdvi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
 
-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"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 406f8d8c270d..41f55e17c692 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,5 +1,5 @@
 DIST xmldiff-2.3.tar.gz 92561 BLAKE2B f18805a9aa00a99a3f63640de60d3ea37393208ade00a14b817d42706bb1b3e407f2645d7df5b5e9f4d60d75d48afe6475e5c1f1bab24ea6fdd78d8646c79b58 SHA512 1dc3f76f51df3c506af827c9a7f67386143b4ce49c2159302e07c5f56054ffd9e858f086bb76d64a038b7e9ae7c116d1146714d4528ea9d53e23e1bacb4bb812
 DIST xmldiff-2.4.tar.gz 93437 BLAKE2B 9f0001da8e39b7a3e7d0af052ce60a43899b2cd644b3fa6c6cb7cfa08ebf71439bda3e3dc6cf497120f20cb0f9346b0a074b8e442b42531fd3bdbaaebdf73bf6 SHA512 d8a0c9cb850259b3288d8fb5fde50c69f24036bc46ea48f24f3d63c592ccdd2aab4daf416f0f75b38fd70cc58e00c12db626e61a983d1a002972a6720d62c6ae
 EBUILD xmldiff-2.3.ebuild 636 BLAKE2B 2624f1ede10d236dd47d79c9a1773001d5246ea5363271d1b6823ad49ce7836fa2f117877c45c1ab8f5799422b27376d6906ff5fc900eef501395ff29c0ea9f0 SHA512 31e29d00d330a3c198e7a0daab2ddae51d0604352df01e350bcec40eb4b0e0b1bd6d7bf39b7937229012fc3d9850b0f14b93e74408eca616f1575bcf3994c510
-EBUILD xmldiff-2.4.ebuild 642 BLAKE2B 1668b52a63100ea22ee659dd08bdc5cb7ab26d974fb3bf01c7c2c81f90ba0e39ceefa844804324a68ce80d26cf96d9766ab7339d8965851fcc050c993c2f160b SHA512 74318d14ef0931a3e470200bb5c190f7a2bc30b1a41bb662ed51f52bcfe60dee6dcd4c56e5eab7bc8cbd3d4964119a97d558df7a99d9295003f16051430e4ae9
+EBUILD xmldiff-2.4.ebuild 640 BLAKE2B b4f75da02e4c66d7f36fef92d221410423317ad84467745dc93b0a0a1b5ecddcc21bdc50781225e0b901b8c13fbf1ab0ce79600031ed7992137d2bf6ad11fe31 SHA512 fe73007ace22daeb9c3f286f858fab08a11f044d2eacbb0df7199bbdff226345a9028d0169aebf444310fafb91141d6227b9d924b43618968194922a9d2cd6ad
 MISC metadata.xml 776 BLAKE2B a2813ad30729db3a2e48ef6fefc7603df138326e05231b955475ec61cd44a175f4ba83c7fa7ce4c2da208676b0f72f1b08e371670af1ba368c9223e947eda4f7 SHA512 579b4593545777f8c244e8b3f0532bd968a420409b946dac93ff875358b814064e8d24548f2d2417602e2840f6e3844dc2c6ccbd07804f948f22e5467ff5254a
diff --git a/app-text/xmldiff/xmldiff-2.4.ebuild b/app-text/xmldiff/xmldiff-2.4.ebuild
index c1261561d3c4..ad30ca94a723 100644
--- a/app-text/xmldiff/xmldiff-2.4.ebuild
+++ b/app-text/xmldiff/xmldiff-2.4.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
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Shoobx/xmldiff/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc sparc ~x86 ~x86-linux"
 
 RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]
 	dev-python/six[${PYTHON_USEDEP}]"
diff --git a/app-text/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 3ac0d7be5df2..037f4222042c 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,3 +1,3 @@
 DIST yelp-tools-3.32.2.tar.xz 211668 BLAKE2B b45aef4d03f1954ac33bb05a9c788af40a74d76b54c2a0bcc466098e18435e02eb40004465dda399eb74e986caf404e51a393974d37ef1abeff6d76289840ecc SHA512 c9383426b854ae46ff4587bef07955541de3026f845025f9e99ba095cce11ff307e23d00d07a2da8763bcb6f9f061fc610351170e2abd99b5669912463729a85
-EBUILD yelp-tools-3.32.2.ebuild 629 BLAKE2B a31a7aa094c1c42d974e63d7576ceeb1ee149abb22f9a161d3407a20bf00e9753523fd89e0d5aae697583907d010ed751bb0b544fa3ffe6ee0486548a2d68a1d SHA512 07ecb3457fd3e313bad9b4c8d6ebc19ceebd9ff8c39c35d962b9ba4bc97cf811224d6891db4d28ed652d21536ee5dda7df5ec7c108ca4a904c5efca304fa2a27
+EBUILD yelp-tools-3.32.2.ebuild 630 BLAKE2B faa9e31442ff615884c3ca248a90a6796bbbdf8147672f8ce454272b01732d5f99641f187cb9663eb99007b23a8c7f0988b035a30feeebfd207ad7aaed8564c5 SHA512 97d6b8a3375edf5b61040840fc634728a331216aa1c13663eac5faa78fc4910769093182ae75f1872517e3613470414b04eb9ff32e72c6672a705b0f2fd42abf
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
index b751bf07c120..97eac351891b 100644
--- a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 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="
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-01 21:06:00 +0000
commit	129160ec854dca4c3fedb5bcfbcb56930371da0f (patch)
tree	53bf797418ac5e9b99c41ca0382c87b82421e5de /app-text
parent	441d1370330332b7d78f238d2f5e13f7aed5e4e0 (diff)