gentoo resync : 08.01.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2021-01-08 11:28:34 +0000
commit: 24fd814c326e282c4321965c31f341dad77e270d (patch)
tree: 033d63b33c21a3209964ab56005bb9bdd523630d /app-text
parent: 129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)
203 files changed, 837 insertions, 450 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index dae91fa0dbe9..f25c9b8d9508 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index b0358bba1044..78a7bdf71758 100644
--- a/app-text/a2ps/Manifest
+++ b/app-text/a2ps/Manifest
@@ -16,5 +16,5 @@ AUX a2ps-4.14-texinfo-5.x.patch 5996 BLAKE2B 720a408c88c848fbe9b6ece319a8eb05a10
 AUX a2ps-4.14-texinfo-6.7-encoding.patch 1372 BLAKE2B 3eb51e4c83e60f7073c4957963dfe92931fa63eee1410e615171f1f823e21702032ae7dca9ae397851e0620df40a09c8e09bbb0ff12e2843b3c7aa511adda8ec SHA512 31d77113c5a727cc2aa72bc31a6e961cfc5d5871c40aa1f59f3edbadaa06ba55cb35bf6cf9b142276c83ac0a69fa49df9eb157d732fe44dc392f7dac7e014db4
 DIST a2ps-4.14-ja_nls.patch.gz 27576 BLAKE2B 7300971fb76f6c8d2b0e5ffa519cf6064519a33f24430b9894e43778dff5b78f7cf7e2b9fe1e98fb475f452b39ccc29f88f579bbe1922ac3ef70775a05591b32 SHA512 f02f553dd9d9dbd9dfe41ebfe103493000aa4e9de5634c94e7453f73b66d88fea6b0010095913a4a99c7285990a1df1ebcc39da451b2b34f96b0c191112b125f
 DIST a2ps-4.14.tar.gz 2552507 BLAKE2B cd15a2b85f54f8bfb92adf9f4cf2c3c29091e528ae8072d0e905c58cc94caf55b76ac3e37891f8a0bc0909a177c5ee434fe5aaab3625a2c14127dabad8b506ed SHA512 fd6ac8ab47d789114c283e8ca508f7f56feabd1a189f4ac772cad9e6be7e3791e210892cfffd04ad1d39efe4b15386b2e61bf4cd56b70ed581c0554f36bfe06f
-EBUILD a2ps-4.14-r6.ebuild 3648 BLAKE2B 4b8017dbbe481e0410de1fe91278188a17d511b596816a2d5d5e411b57fc1220fa6417f378ad816075a35406272b2a50d15474a37e9d6f1e5f919f199b6ae989 SHA512 a58d4111e64afe5f978d321042857c95d29855c431a40cc5d8730cc495e8206536d1c37472996bde392b74d8d1899308f16fc37132205132bd154c614a4715e4
+EBUILD a2ps-4.14-r6.ebuild 3637 BLAKE2B cc1d04371e996827413900a383d3d76e0476b93fe3da03d06b067a7d7a7f44818cc9eeb25460c7f1610f45f179b5bb08c21d969e17c147fcc924a62fc6b373e7 SHA512 94975723d040b16502306c27be86e1f88b480381300d71f1c60c6248f0c93a3dfca12dcd75c99b60f353cc581c7ad589374d2c998c8d06811291c417a59295f4
 MISC metadata.xml 346 BLAKE2B 5f3d7c0d868dfb3ce0ec6e47c33087f9d41b6b2e11d569c48b1a6a635f1a46e7cbb51e793f7df235c4b9dc20eb2eb24a5c8764ca2b6eee34a900d1f4641c4de7 SHA512 0973b9c922d40a291ad52b590c40ef122167070e2f3c2c30980a83188bf8ed8742d825542ca1ea88139fd7ceb0e251f91dff13822ffbec4c9a6af2ea2b7a0010
diff --git a/app-text/a2ps/a2ps-4.14-r6.ebuild b/app-text/a2ps/a2ps-4.14-r6.ebuild
index c8da672d4e7e..6414e3d42237 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cjk emacs latex nls static-libs userland_BSD userland_GNU vanilla"
 
 RESTRICT=test
diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest
index 033d8d5b5b91..93bbc8722197 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 1370 BLAKE2B 5ad4f68420372d2955d4110aac2722abcd24cb8fbc240bdd6e7ba74f7e3c4c9d1cbf04af5e3f7274752c51480cea88365161a2ee9b2badb9004595d960f28ff1 SHA512 e4fc13d72c455fbc49d6e3427d33bfa9a1e0213cf8bf89172160bd021ffc5117299f097945781e6b3e2a8a81cfb60e21a962b89d7f4280a7e676cc5d56237eaa
+EBUILD antiword-0.37-r1.ebuild 1359 BLAKE2B a2a34aaf741a67f871f78d6b8a8ca72abf21fd6e9ccfd0fc40e8fbf622b99e60f0400e960a8ebfc87ba04544c14b6db4087411dccedc9f8e0575b46878ea9684 SHA512 53a818bae5c6935bb085a15a8f5125928ef07bd493e223e40f645aef320e01998501a14b14f8cdb85d0bae8748ff468efe8bd9e0d31bf32cbbffceb0d4d27d4b
 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 5f81fbace13b..e0384dc06f81 100644
--- a/app-text/antiword/antiword-0.37-r1.ebuild
+++ b/app-text/antiword/antiword-0.37-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -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 ~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 ~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/antixls/Manifest b/app-text/antixls/Manifest
index a4892e35107a..ce2766d6f719 100644
--- a/app-text/antixls/Manifest
+++ b/app-text/antixls/Manifest
@@ -1,3 +1,3 @@
 DIST antixls-0.3b.perl 4627 BLAKE2B c1ab58bf8ce934586edeaaf1961921341f32149e53ee8b4add0fe1bea5adbfeeb0626ab97ea9791b9e9de47a39a85075e08ef9392b6144f446fb4c0f643b36b7 SHA512 7e6a6ce26ea8134ee35bab55da73fefc1b211bb58b52468e012abb3ddd0688afea5f3b87b9de49bdb0daff1b6d79b02d4cd6bc2b045a88ff7dc557610ac6fd7f
-EBUILD antixls-0.3b.ebuild 622 BLAKE2B c82868017a2d0477fec57281ef9f6c6bf2c0f39242dddc98b8f358aa4a4c0762955b9d852b7ab57a84437ec67ee5aba5d26d05da905f4fac6b38cf5cec0a88fa SHA512 7c9ec8b2af98e250c563fdd19b975f83f8b9759a9c871ceb5e9790d57eda715d2ee12310281375b93525db99f12315f86b5cf2b5451b9a03a31d673df86a25d2
+EBUILD antixls-0.3b.ebuild 608 BLAKE2B 0327548bb4e86bf69287f3336ca95e03d122395f81e5544a7ffcb1e0ebf8a39acaeefcdd318a531b1cb809c87c3e7a4dcf36588b0ec92a03755e361e1513898d SHA512 2c29891cec4fb84ef14cb822e4211c4cbc95372839452db428b17004d199b74e60f44d1c36dc1f45022abc5a09afe2b2d7b2a537853322cd576463880d31b9b8
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-text/antixls/antixls-0.3b.ebuild b/app-text/antixls/antixls-0.3b.ebuild
index 53e29234db59..a9040566c5eb 100644
--- a/app-text/antixls/antixls-0.3b.ebuild
+++ b/app-text/antixls/antixls-0.3b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.perl"
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 DEPEND="dev-perl/Spreadsheet-ParseExcel"
 RDEPEND="${DEPEND}"
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index e49c15742852..abfbc2f5656c 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,5 +1,5 @@
 DIST asciidoc-9.0.2.tar.gz 1144308 BLAKE2B 5f5deca6b8c15d4b86e2bd6fdb131908eecd862a5fdbbd8418937050d335a25ad012a3b1bc716379f5623db676176fc6da1a09691c2b42a213a6230281626b69 SHA512 ea8f64ce54d2f1aa38eceb3c1c9be17b388776de58038f3b888ac5ebed76337fa2779e43eb7f47174adf0a0446ee808dbd1e4f8f7e1d7db99db7c4c8584d5624
 DIST asciidoc-9.0.4.tar.gz 1111102 BLAKE2B 3c073e20e0b4cb1c3e43d45217240675d5a1349c5d27c8e03c4499505c17ad0a149f9495a42e28490f9c89f29dc25a1216e9145a6fd1483e589b5fee49a6279f SHA512 9e24aaaf33ab56cf1dfa510a6be9722af364633234c9ffb20eeee3d0ba756059290f443de53b040570654a316ab4782a177c31377fc69747814da75760fcc88b
-EBUILD asciidoc-9.0.2.ebuild 2350 BLAKE2B 00b0c901aa6e0afc605d9aab86fb92c61257031b6f5307e412bd33e006b5475d9d8b3ebe8975c5199cd5074fb40200fb80e1642d56bfa3991f3f0793fe8c82c6 SHA512 64d685ce15c063c58426fec009941c7ba90efb6367bd9b109e1f53e5c53df152fcc169c9e5e15a2b8963cbf6d351ef5ab3112c88b5cf5ca4c6689e20fcf82315
-EBUILD asciidoc-9.0.4.ebuild 2359 BLAKE2B 73483e2f453863fb082197713c8332572defb7c97ec1d1b4bfdc34c6da70f374cbf6b613d8245e803fd831c95636dbd7b1181eac0bb7c9e27560d3be2c926553 SHA512 d8187de4533f6fc9357d1fc7de72ee948956d02c0473f0273b172a833e86973f6f7160956886a291b5214795de29d13c4125e222f34052a07677edcc1cfef123
+EBUILD asciidoc-9.0.2.ebuild 2339 BLAKE2B be823e3192d224ccb45bcd9098079e3ce91a24b89e47c3a268a1af319ccdd0d1d37fcf4ac7480bdcf05304e513f53cd4bc674f0c1cebcd3c27cf35211fd2d24f SHA512 7d0558aa08c47e76f6240afdf61396419bb2b67b1d1211a3a11e119d38add6976c4b71ce84dd9aa8d59ceb89c6e83c2018e5395803ac4aa7711369ed8fd9801c
+EBUILD asciidoc-9.0.4.ebuild 2348 BLAKE2B 55bc2eb673c3655dddb9a8e67a45d41133fd77bbb8b8c0fb9b7c04cf53633ab1d28fda8adca8ede1812b65a56306da1784a73e150f312b4fceca0c0cd1663723 SHA512 cb20dde88257725778d35ad58ceeb66dfaea5cd83b70e85db6daa28d5ac72b620fb681f465d8a419aeb48425e2ab08f6f9c9cd2aa2351802e100aef909827406
 MISC metadata.xml 435 BLAKE2B c6a62f25ed62fc8bb28f94a51985d44a2b048eed430d1e92670bf257039c15ccf741414f9c64f3a60220217fd8c2e995910c611890664f0118541996d7b9c9d3 SHA512 b18f244fd4bce0103b7a3c6a5d1e063d45fd1f17458d9a8c4cb2b6543bb38d7bb7047105be81b39d309ff0c3d9343e36df44345f31e32c348fc8aff30ef6d837
diff --git a/app-text/asciidoc/asciidoc-9.0.2.ebuild b/app-text/asciidoc/asciidoc-9.0.2.ebuild
index 261ecd80a732..7a609a2d5b0f 100644
--- a/app-text/asciidoc/asciidoc-9.0.2.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/asciidoc/asciidoc-9.0.4.ebuild b/app-text/asciidoc/asciidoc-9.0.4.ebuild
index bc94bbefaca5..830479e4b11e 100644
--- a/app-text/asciidoc/asciidoc-9.0.4.ebuild
+++ b/app-text/asciidoc/asciidoc-9.0.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
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${PV/_/}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 9ebab21a3e8d..b5fc0941cc0e 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 2755 BLAKE2B a021ba281fafb50eb65e870c823638b307f38059451d0c90200e5ef20e1d50ce98abb524e40dae2c6b6f236ecb3874680649dc108441b3759d25e53a576808d7 SHA512 af3b18e5a27b33aa7bdfdc4d63c577b5f6f6e9a7f573d60ed14aa29800517f0ff0a58bd6fa2e2ea083f6c4752822ad8b7dfc7a51a4d1b8bb80a6d4d55b240cd2
+EBUILD aspell-0.60.8.ebuild 2744 BLAKE2B 3ad1277dc1f15e7df451156bcee28e63911478f26ad24e759e64e50cfdff6ae6fd6eaee858d12b237b6fec9e679ecebcf2360ffe57e89d06e3d47b4a6811e257 SHA512 70787a237d059fd42162756902785d5a61d8d0a168fe490d02e0e50f24a3019e2161fa63a6f6c4d2e6d03e1a9c85d1eaa9140deaa7a756bc4a89b1ac4541d399
 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 e60d5bfbe108..fd9ccc335282 100644
--- a/app-text/aspell/aspell-0.60.8.ebuild
+++ b/app-text/aspell/aspell-0.60.8.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
@@ -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 ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 2c38a35492eb..cdb975dc73ff 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 1051 BLAKE2B 2b132298766daf96b2e4faa7ea6b382ecdb0ecaec985ea36cd024ebb360f6a3502ea90f045b87083e1e1a6e4cdc25cfd7a1f14c5661c9ce626e41b5d6feb2c32 SHA512 5e5840072debede38b6f46075a7b822c9e0d3d69b90eb7b33400b2b0826b00109f96fd5efb2d3b0400d7c1e7b257c26783aa4112dbd524829a8a7c7a444c8e5f
+EBUILD build-docbook-catalog-1.21.ebuild 1040 BLAKE2B 33cbe98d5fead501192276d369261c87d051dd10b09935c67f0df8e5b4608c371bc3cd77dd1f21be608ac4e50bdb19ebdbd4b711a137186171d2cf03b5af85c1 SHA512 1751d566f0965b9b5de0b294d974ae696ec267c6027eadea25377feff17190013293bb06168f7e3417616e5f9270f9825bc1893640e095f2654d258d9579e9a1
 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 b788c34138ef..debf2a49806b 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
@@ -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=5
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
diff --git a/app-text/catdoc/Manifest b/app-text/catdoc/Manifest
index 9e8891e35b48..47d0f98f4652 100644
--- a/app-text/catdoc/Manifest
+++ b/app-text/catdoc/Manifest
@@ -1,4 +1,4 @@
 AUX catdoc-0.95-parallel-make.patch 1568 BLAKE2B 868cad85a1882c60e1f6f37b630a233949c457afd66f59b1e07616a8403bcb4710cb7ed7d914e58ea2e5022787ad94a4c4db20572386d373b27e61257c5cb2ef SHA512 f40d7440bf19157b862226e8d956b5505e6d79db3a39a21f71f68d6943b162f62863333739f1f4777c2c38b4116b4745888ed0cf5cd4159ccc84d02979f691ea
 DIST catdoc-0.95.tar.gz 217779 BLAKE2B 37c01c485410a6eb08c5935351b00f60f1d4c418f4c1b3cca73da23f870cb5d5414ea6cf7c37effb295e6ccb12a7981367bd08ca6226ee0fc64d2dfdca2762ea SHA512 dd6bded4b6b70749c007256b182b063ff266f86d53024d8582001678821e8096c5b980bc8f43015d9c82bbe022d71d4ba5fe68aff31b2ff6db3688595e651b2c
-EBUILD catdoc-0.95-r1.ebuild 1347 BLAKE2B 84a1a8e91f6ad67f23090505bafc683fb03d0394109fd7c35eccb7179cd3159f20354dcbfa36e067e8bfedddf409edccd41e70f5b2823d7c7409e0bf92552927 SHA512 c1935e15391efa1e64e1c4f0bececd22d15b68bd92c3dcc67a990e0446a3621b3b84363727bfd7a9c2096fa8883c3cb2550d796545282f68866b62b55a41b4f8
+EBUILD catdoc-0.95-r1.ebuild 1336 BLAKE2B a90b5b458be3ef9d5df1c9a977fd316aa6c556023f9b00884e7eed90b42eb6ae2e040a7a5692955155dcf0c59c6979a6fc18452700f63155251159eb9edc8761 SHA512 dc3d0bbc689bb838a3ed640017db2f356a02f2e68c2400bcbcadb0bedbf769dc3b8d331f7794b9d3f732c017cb2c1068e2eff408bccd0c82859ae8db3cf73b3f
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/catdoc/catdoc-0.95-r1.ebuild b/app-text/catdoc/catdoc-0.95-r1.ebuild
index f0636d133f30..c3758c220516 100644
--- a/app-text/catdoc/catdoc-0.95-r1.ebuild
+++ b/app-text/catdoc/catdoc-0.95-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="http://ftp.wagner.pp.ru/pub/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~ppc x86 ~amd64-linux ~ppc-macos ~x64-solaris ~x86-solaris"
 IUSE="tk"
 
 DEPEND="tk? ( >=dev-lang/tk-8.1 )"
diff --git a/app-text/delta/Manifest b/app-text/delta/Manifest
index 133dcbe9ae03..4dfac448a6e4 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 746 BLAKE2B a8b8b4536f4eaecc6815cf8e2a3491ec2df173eac1ac6d3e7ca87dea5e220be931cfaf6989140d15062c2382ca45f1aca93de6e25f93fd22abb4881b96d3c4de SHA512 0d9430629839b65478e0bb37d7ca69919cdd878006b9e86822c2b4b3e2977ac2db2137b60e821fb1eea6a1bb83a74fbdc0dc228dc5918ce73ce3e1fc75b14146
+EBUILD delta-20060803-r1.ebuild 735 BLAKE2B f22ea31f529e9de9f4fe5a2adcf66a7c7976b6e62475d39d3bbded3ad659add2d425503e13b5cb33b4405db9acf6d58e579cb7816509dc004389dbf7f801099c SHA512 5f1b3ab0cc0378fe43b44d12ef80030a2960c86acb457c775fba8bca802ce7e4a82d1c5a06caaa3130577cf67953624c640d9efff80781409772322d898bed51
 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 3e9e37157091..4f0369adcbb8 100644
--- a/app-text/delta/delta-20060803-r1.ebuild
+++ b/app-text/delta/delta-20060803-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 42b6823c81f0..6eaf3d916974 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -8,5 +8,5 @@ AUX dictd-1.10.11-colorit-nopp-fix.patch 244 BLAKE2B d93eddba872d67b2b5ce0ab9e4d
 AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a1866452742af218bac5e8a336c735d232775fafdd7338e7eb20cee2bf1ff45b4369d9c7932a6004d8733172732cdf2a6d4 SHA512 577a85b765a3a7e8e8510ea36567541073a79cd2f99a8efed69ee1fb1e7d32a864d872fe358c0692be56af0c94ea241cb4effb9623371f0eb8492d8c4d223433
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
 DIST dictd-1.13.0.tar.gz 395455 BLAKE2B 222ce7eee03083ee23066f43330cce0cda3041d2ee4a0d54b2e9f2ea18a77ec83f91fbb766bdad645bdcaeed0674361ba600a393e4cb6c42bab6be94098991f0 SHA512 86871aaf34a182d1d7aac1a1282d4a75f2d7c112c762e92f303924c324f665dae75c51e7ca91e3cc1dde2053ad8e2d1fd50a76934a5f84ff70975aa858e26439
-EBUILD dictd-1.13.0-r1.ebuild 2895 BLAKE2B 7b4e5e4a67fb18ad32dded184b647daddb8ec9760481508f349e4b4760aa9a6042d31f26eb751c4e8fd1e87f177f98a1d0cc385df849b04430b2d3f086e5c724 SHA512 8634f4c0bb47368ae01521319526b8cdfc351ac48fa3cbcc819696fe4676e055f71d1fdd572f7641dbf5c294eb71403dbc7381837cb843e3d118e2eb4f144014
+EBUILD dictd-1.13.0-r1.ebuild 2884 BLAKE2B 4a23318de1a4cd27992f15b7b4961ce1c83350b839cf2e57f896a29604e5d8818daf9287965f49e6dbe0a5ad9e27b927868b3a781102640c5a81628dd1d7601c SHA512 3088514a61e38a5f552e366f5af7061cf1a595bf5abb71465e1946b96fd9fb65ca20f30848878cccf417d29aa9dce2eb3fbad5a2d5768ca25f21995ef820fa68
 MISC metadata.xml 484 BLAKE2B 8513944c0eaf7007a75c571dd29ad9e408db17a8e68f39424f361d19e488fa644a8467db234692bed15fd2d2425676c09f7187751b507a69967dcd598f9ab30e SHA512 b404b831fbea2146daf29f4bc81af88c5e226134950fa1eff68823bdf0b00208328936983d1e9c8c51e3420a27c0eca99e83d1178451b8e5df265b8623d3385e
diff --git a/app-text/dictd/dictd-1.13.0-r1.ebuild b/app-text/dictd/dictd-1.13.0-r1.ebuild
index f9886dc73f58..234f0f2b0f93 100644
--- a/app-text/dictd/dictd-1.13.0-r1.ebuild
+++ b/app-text/dictd/dictd-1.13.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/dict/${P}.tar.gz"
 SLOT="0"
 # We install rfc so - ISOC-rfc
 LICENSE="GPL-2 ISOC-rfc"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="dbi judy minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index 698f7f69ba42..73e2c52e89a7 100644
--- a/app-text/docbook-dsssl-stylesheets/Manifest
+++ b/app-text/docbook-dsssl-stylesheets/Manifest
@@ -1,3 +1,3 @@
 DIST docbook-dsssl-1.79.tar.bz2 277650 BLAKE2B 6a12f46965ee705096f679b672610395b24f151e3bf3cb05f7d920c052b7a3fdafb4f5ee4526dbf765bbab6b7d4ca9f021277c6f35926f47edc61d0f835afdbb SHA512 fad71e67227b54b0a7c31a351b4d5c0695517b3687714807d7b144d239dc6f7e0d556520e705eb75581c82e0deea4b32ccfde1eccad2718337b757eddd64843e
-EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2481 BLAKE2B 89b3a425041975a4154738d36ba7753297fc55b460c76acd53ea0be6e9e488db9de497b98d433d3093f8269fd60c8b9c8ffae74408beaef8c46e8615cec4610f SHA512 83b1f7657ad19f00004ccbbfea8566f3f7a41ca3857c5c4d9932d8e3f1e0b16102b3de4ef587f3cb328f23c020d643e40c557922dd37deb4246a4d5933d7bf0e
+EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2470 BLAKE2B 7e0d5e34acd48629c6a244829ddcd19e5f495ba472625c4204b1f16d271cd5dc13c6a3c46adc9eca567265f3120f5121a85d65874cbc5a52bee661edafa3ebd9 SHA512 6ec770297c4c5a6f0cfc7798c93fa3f8811177e92204e15b92e44b7dc643cf4629346bfdd646b2e483603760c0496e3208d611ef161d2048707e3bb92b209f39
 MISC metadata.xml 377 BLAKE2B 035eb23363be52cbeb11b0ca2fbcedbb608dad9d4b26dbd2155a538db51cafe7296614f5005c0460ec4ce02a35378d98f2c7834fe2f098d7b05ef835bdbf520b SHA512 c965e64e4582a7452d8cf7eb46b794788cc8ccd9d93a48ab14e7ef606979cee706f682545bfebc2c5e380e9e18db0b671ce0f9ad935a0812472fc1586c989c28
diff --git a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
index f74268994c76..ff35e2651fe5 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/$
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index fa9913a29041..a86fee496b13 100644
--- a/app-text/docbook-sgml-dtd/Manifest
+++ b/app-text/docbook-sgml-dtd/Manifest
@@ -14,12 +14,12 @@ DIST docbook-4.2.zip 61830 BLAKE2B f9a26e9aefe2da7c785f065374bb082f15e3f39dded7b
 DIST docbook-4.3.zip 66117 BLAKE2B d92d69b6f94c85bc2e8ead87dfb31db331206ea3d014e7dc240b47d8b07f43f8c1053003f50c398c4723726980e553dee7b34db629f1eee19ef6ae95f06c6ae8 SHA512 18ead2e683a9e9bc39e1487ee06fb72542557fa0c76f0e899b566cb52207e3bbfcb415ed59163c6d59e8d58f92289e115416d56bc6ed8f182910f7a18565b227
 DIST docbook-4.4.zip 66879 BLAKE2B 7a21c99e934851bc7c6be77da2b65079b3b6b32365672b40b70b1819e7aa6987cb65f8725ed2b9cc804d8cd0fc7c17f02601466dcd48f5314439df626db6aa89 SHA512 561d6f68e293fb98d13010dc287c6ea59d9e6a033af3518ab4d735a374a7a603150ecf555a1126577dd00baa692a6c5d09afc4d3fed70f2fe8b5b86d6bb5ecd8
 DIST docbook-4.5.zip 71252 BLAKE2B 0bdb424ff47be140d4d18eeb5f3dce509d47577737b485d5bc34af1a02596d577eb7b48c3884acd04965014819e4a23a444c198134fec14f2c2e7c2d5bcac58d SHA512 cde483678562a18f67fa5fbe631fbdfcbef907b6b6fb63749125fdc883af2448d4a95aefb8fba8bcdd0417fb078063984fe8eb3c7050978f4f4b03d527c329df
-EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1249 BLAKE2B 9ab8bfb460f974c24b27cfb73bf36ff108bbdc9fe45fe8a4e6720b1e770e152a03b2753a6c8fb5f6d457b89e86aa22bcdbe3c85b2810097cf3816ef44586b09e SHA512 7ebc7e23fca5dc965165cf37400a5168ff5471affb9c827169ed5cda2ec0db44151fee5b157cfe2f45b0bc2bbb49bcd221d527bcffe492b51da6a5f3e636cbeb
-EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1249 BLAKE2B 9ab8bfb460f974c24b27cfb73bf36ff108bbdc9fe45fe8a4e6720b1e770e152a03b2753a6c8fb5f6d457b89e86aa22bcdbe3c85b2810097cf3816ef44586b09e SHA512 7ebc7e23fca5dc965165cf37400a5168ff5471affb9c827169ed5cda2ec0db44151fee5b157cfe2f45b0bc2bbb49bcd221d527bcffe492b51da6a5f3e636cbeb
-EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1242 BLAKE2B 17b909bc422758d17dacf948f31f6684ac182f24fb756723cc61480a37e05a247418e0272dccbbd87fe492279647f08e7142c6a99e70e12d2c568fff8f19fe28 SHA512 070aea951bfb898bbfe3bba6b92d8653d2fbb4e2c87a33abea36f801d11bee5c58b9727e7fa78f61f646548c1067a184d567b0f80123d2c79a55ce78eee9baf6
-EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1242 BLAKE2B 17b909bc422758d17dacf948f31f6684ac182f24fb756723cc61480a37e05a247418e0272dccbbd87fe492279647f08e7142c6a99e70e12d2c568fff8f19fe28 SHA512 070aea951bfb898bbfe3bba6b92d8653d2fbb4e2c87a33abea36f801d11bee5c58b9727e7fa78f61f646548c1067a184d567b0f80123d2c79a55ce78eee9baf6
-EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1253 BLAKE2B 48e913aabf0307702a1c1cca1be62f0e1fa35ea2902e9f06c584201cc69547cda776177bdd325041562e693e80a4ec94fd4310d0d1cf6a06a216607622776a67 SHA512 ff8d5fa3ba1a5497d29613af4fb905ab6c41fac7f6a6c8f23aa453bddd765899ce436c8c5e1c0b96c09295f456b00728d639d896fbf8f3b54cf165a07bce2377
-EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1238 BLAKE2B 9ef6216a5c8c038ede683f04caefee257a2b0504612d01da8183dcbd6559eabff7070365cd226c0f0624b33df543c7e6b272fa3371b50ef93426d87e519676b5 SHA512 d51d3d59c9dea06007e960b72e98b59648ea37f6186d87edeecba737c7a6f1adc8a8abe71b72d46d263c257cf774eacfd9dd052d50013d546ca9abd22eeedf4c
-EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1238 BLAKE2B e702894a034794674ead6467c9a4850f4b1dbbf532847dd4906e4c88ef5b7167d7858b9696cc59b82fd1c346b5640dcc713ee846d7618f5e076b02640ceb62b7 SHA512 572ef029ea213c84ffadbccfad022b457b2f5abf5f4cd70ee4f238f8a128e0e311bf02add6bd9f254a7a22dc5ed7b4bc596a93c652211a8db37ae9ccffd3d6df
-EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1241 BLAKE2B 63d92adcd75408b9f919cb45126d7a571a8b05c01b34624d26a94462282ac9bdf761dcf2114439689f28b69fcd77b82d90ef570055c6acc77fd61a39484ed1f9 SHA512 9bcd091519ac14f7e2e95b83c9fa2632ef6a1ba7d078f388156a9052e2825d4a9551f5006c3a484e3b05ec20eb6b8acc9558f772096ecf7e8f80f922d2c072f8
+EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1238 BLAKE2B 87a26f4bc28de4d728d8a2bcd066e62b1e72e6cf6579e48999bd6102d9c38491d9ea587ead966fc7126a0c44b34daacb78b2657c7f74985d7f1a36578c63a26c SHA512 926a260a31195368606bdcee7cc37751aea546c67ebe5f1aed6eab015b44ea474090b961665d3e5c1c05ad879da1524597bb3768c52531a918dbd21b75dea502
+EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1238 BLAKE2B 87a26f4bc28de4d728d8a2bcd066e62b1e72e6cf6579e48999bd6102d9c38491d9ea587ead966fc7126a0c44b34daacb78b2657c7f74985d7f1a36578c63a26c SHA512 926a260a31195368606bdcee7cc37751aea546c67ebe5f1aed6eab015b44ea474090b961665d3e5c1c05ad879da1524597bb3768c52531a918dbd21b75dea502
+EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1231 BLAKE2B ddf85c9ab16c48026ccf0bfd652d8839b5bdbc2d957b76522b58a7ff75ea325e4b3211a954326339b0fe1d1da01b6cb54ebe2e9a064fd54ec95e1bb80b0607e0 SHA512 a5050fd247a2f93e4f0296ffe842342afc2b7d062825df6fdc22245f44f0f6b02c163f121745123fe048f7bdef222dab3a6f3f82e7fb3dfdd76b2242e697932e
+EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1231 BLAKE2B ddf85c9ab16c48026ccf0bfd652d8839b5bdbc2d957b76522b58a7ff75ea325e4b3211a954326339b0fe1d1da01b6cb54ebe2e9a064fd54ec95e1bb80b0607e0 SHA512 a5050fd247a2f93e4f0296ffe842342afc2b7d062825df6fdc22245f44f0f6b02c163f121745123fe048f7bdef222dab3a6f3f82e7fb3dfdd76b2242e697932e
+EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1242 BLAKE2B ad1d5bb8cfe599fc2532f42312e94f278fd47aab93caae99cdea0135bdbc940b03953c8f5f8643516db90dfb6fa158b05c8db9b2fa324f93c5c58c04b3800a19 SHA512 c85ce5031aac0c6ab02363f43aaacd9233c8b77c4a0945692aeb01c238b2d00abbbcf3acdfe1c69ddce8af5187740ef2a248088d0b0e395de1e9d122ebd65061
+EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1227 BLAKE2B 9fde28427fe6bd0682f12e67b0e13e9e2374f1d2520a917da1cf63ac2686546f835509f9d833f786b50561f256aa432bf7d0ec2e403552ecfead8e176d3cf22e SHA512 f99b46a247b75632ede4e7b60e39bace80019458285579b34c1fefe877e7ebb1b7cf09304e819d8e7d134bdb07a38fc881aab1362a976a14c009b8d457c8afd3
+EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1227 BLAKE2B c83633234f8ed449837093e831161c39346613159174c4bcb573602cbd1a50914046d982fa274e44b02280093c124f1b1ab41a67478d6aadcae36a4b9eefa3e5 SHA512 3954b4358b46ec6c09c70f49db9efd44988420f93f01ac2a03655e64be090c57cd3ce43e4bf3b4178f053f60dec13281999308ff763dc9f0f61937dfc411cfe5
+EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1230 BLAKE2B d76e4805293f1697dc4ad27bb6609ebed53db816240626af3bd2da1fd409f21ccd4773cfd7f9174061b3fd3e905f4060ba11502dc89843997344aa86e36a4efc SHA512 159d6600c14bc9ec234d8e94d195242066b99584d68b033e7b062e386a0036463b67da7c9deb6479f0f5c9c9eb68f6899dae55da789d907f23f05dbf4291ca51
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
index 76bb85201018..928f01013d7e 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
index 76bb85201018..928f01013d7e 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
index dd1e251a03e0..8f58b7ab5143 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
index dd1e251a03e0..8f58b7ab5143 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
index bbdbc671f226..42cd2d5cbe69 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
index c526980b7a4e..a4ed3e2f4d15 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
index f89f3c86d601..14f15f538111 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
index ba58a5e516b1..ebaf2e04218b 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 3b015cad6c52..0b40f9f0b88a 100644
--- a/app-text/docbook-sgml-utils/Manifest
+++ b/app-text/docbook-sgml-utils/Manifest
@@ -2,5 +2,5 @@ AUX docbook-sgml-utils-0.6.14-grep-2.7.patch 603 BLAKE2B 9b7832675ae7776e25c2a76
 AUX docbook-utils-0.6.14-elinks.patch 445 BLAKE2B e4e64e0cdc22dec01bc96ce5ae0b73c8e080f2d64bdd0cdecb86618bd6e46e2b00fc076570b26bb16490a47ed9d83ba28e630ecf95c00166ce12ab31b4b40f0b SHA512 67985be1ef2cea086a1029ebce17edbb9508e9b8498cdb304cde71ca3a58a48c461c9a1ff5ec83758864c67cdbc4fa7e414270a7783a41b8cfe95f0526e00f42
 AUX docbook-utils-0.6.14-prefix.patch 3055 BLAKE2B f8b7f5ffa47d0a1d18fcf9ef66dae9db74b30086bed3a6d3900e73f83dda660c6abedf697f71e51f9b5145751bae2d461ace626a7336f95e95b284468ed50857 SHA512 c4f95b8507070dda4ed102c45e6b8fe40172a2a5d8b041259903f46c3bedb351d85924810cb9bae3073b674ec8b39bd86d5f570c8c28c8100134f62abb59c1a8
 DIST docbook-utils-0.6.14.tar.gz 124998 BLAKE2B c0ae31adbbbf78732362638bdc73638cd67205b4ce2b2ac4e740334fd230c8cb031e5ba3ee9e34110c48ea42115f2f5f4dab4b4b6dd45d963976d2b48d7836a2 SHA512 8052316a643b5eaa6c0373a9ed7f2406e7c3cb3da9d3c955a271c89813a8f3196fcd9e6c8385c7b6b7ecb916515e3ec7897aece4473989f0e4dc52a2bc8bbfdf
-EBUILD docbook-sgml-utils-0.6.14-r4.ebuild 1846 BLAKE2B 1ca06b9c750e2d99b065a117b9e23615bbb7422a4d190e64f97bde53503f8f5e97b0b1083d96c1c6e817a686d385650656820a7e5839462d19d5b26776b15a7b SHA512 fb71b8783e43dae5ae432881adee681095bc0d1d67015c2b54fedd809230a632af58e38d684f7aef7d3917371f3269088ce0bab4033bcdc21af444c4b04b4da8
+EBUILD docbook-sgml-utils-0.6.14-r4.ebuild 1835 BLAKE2B a3e226d4c9b70af0a2fd4ca5d66b8e9a091fc0f97de2a54bb3163cbc989b632491de1798a67c5d435be75fe527ddaf46501f7e43196cf766523137d1edb11674 SHA512 82c3d7216821ac376ba8ed065f244340b1474b8ed453ba7f37fa875f1049fa63a483b4da4fe473b286142f0824388cc1393e270df55c0ccb5055c6d2817ef6be
 MISC metadata.xml 375 BLAKE2B f1655f0698fe7e1374db6464010f2dbfee8db3c32e7bb35a2c6b275faa9555ee163cc9aefdb069eaf05cb795333af67d4f8c2594b7426d885132eb228ecedfdf SHA512 1ee377b0ace2956254d9d8751eb25463f6e7034328ce0a620e4a2a36c01d70d3f8e3e8b94da1f25b83536468aac558d410348b9e0d4890409104347f712fa0a6
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
index b3e158e62674..d87738d5d619 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r4.ebuild
@@ -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
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index 513787e6f9fb..312d270d7894 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 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
+EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1587 BLAKE2B bf4f1a7e199137917b4881fafdb1ce0f8043866c0022256e5c6bfb73d0623da6a56617b9e7c1978a52661edf1c88aca5d7ac06bf400c90e70f653c30c10083db SHA512 26e8c346a3125cb285aeaaa70ebc8ef186fe125af60a3e4f1fdbe95b51505b051f28f98d4aa751bfa60aed847d5f6393800007ab279183f88791f50d5909cb8f
+EBUILD docbook-xml-dtd-4.2-r3.ebuild 1581 BLAKE2B 98d4c9c04ac68d90f72f114b601f89008eb0de0e019c176e72ea320df46ce03ffc22edbe749e9bd52d51af38829f2da9524753c54f43754adb80cd04ea20007e SHA512 c72caa63dee2625e0f17f487028d2d60f117d079a049ceb03cc96f8078e6b5dada694072e012f0f571a1e9e27432a73952549dc6c695415b7c634fe2c14f5e33
+EBUILD docbook-xml-dtd-4.3-r2.ebuild 1581 BLAKE2B 98d4c9c04ac68d90f72f114b601f89008eb0de0e019c176e72ea320df46ce03ffc22edbe749e9bd52d51af38829f2da9524753c54f43754adb80cd04ea20007e SHA512 c72caa63dee2625e0f17f487028d2d60f117d079a049ceb03cc96f8078e6b5dada694072e012f0f571a1e9e27432a73952549dc6c695415b7c634fe2c14f5e33
+EBUILD docbook-xml-dtd-4.4-r3.ebuild 1614 BLAKE2B 2f5ce6e9ade1cc708af3e6111037d3e7f1f278a0a4d67ba1579b748ee58f53dac0b33e3bd956316e43b6380d61006b4f02e33bd8a7d3d54450120cf662e4cb75 SHA512 07b4ea235f77ee22e92385b5c55d0063711a3d514a90d62b21e9bb56f083df5f8b71f4bf80d9fcdb63f3477ecb6a5a9ab6a1d74e66b98095d7460985059e9c90
+EBUILD docbook-xml-dtd-4.5-r2.ebuild 1614 BLAKE2B 2f5ce6e9ade1cc708af3e6111037d3e7f1f278a0a4d67ba1579b748ee58f53dac0b33e3bd956316e43b6380d61006b4f02e33bd8a7d3d54450120cf662e4cb75 SHA512 07b4ea235f77ee22e92385b5c55d0063711a3d514a90d62b21e9bb56f083df5f8b71f4bf80d9fcdb63f3477ecb6a5a9ab6a1d74e66b98095d7460985059e9c90
 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 6e67cf3e70ed..0bda68359cde 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
index 2293c3d4de53..cb13e91ee151 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
index 2293c3d4de53..cb13e91ee151 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
index cfa917192271..901970ab03b6 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
index cfa917192271..901970ab03b6 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.65
diff --git a/app-text/docbook-xml-simple-dtd/Manifest b/app-text/docbook-xml-simple-dtd/Manifest
index 6a8ece051519..2438b0496f35 100644
--- a/app-text/docbook-xml-simple-dtd/Manifest
+++ b/app-text/docbook-xml-simple-dtd/Manifest
@@ -4,7 +4,7 @@ AUX docbook-xml-simple-dtd-4.1.2.5.catalog 1728 BLAKE2B a5ba21fb9f622b7427adf142
 DIST docbook-simple-1.0.zip 31173 BLAKE2B b19054783553be68eaa2a689cb673bb4a270f546e7c45416b3176cf413bd3be46b1b7321ff9360018c93d7f2eb2db904c9d194dcb3b4de6eff4ea33dcbd228f1 SHA512 5be8a2fb48b95912412eb250d2dad6126c78f81155b7eb115d175d32831430ede285d5f4bbebd0d8a50a1a3159fe1b7d133adf84ff8447111ca88a441b415643
 DIST sdb4124.zip 35199 BLAKE2B bee2de887a662978b6f0bf8b9ae663d37c4da1859f07a09e869cff91943bd65946dfd493b9bbe9244ffb8794f3cc5c828c647ab00b183326b63e179540765664 SHA512 b5c158cfcaaa4150d5ee719d11f3fc2b5a207cace241a147b39ab4a9f721cae2a894a88cd3dd944ecd24feae850b387faa03c669747b02de839f5d6a3ff0821f
 DIST simple4125.zip 29839 BLAKE2B 83f2b65e5192334bf6a9b5b5388a77d8b566a924837d041329d16f0ab864d5e69b7ea0a60b70fec4affcf0161fb724c5ed99fe16dd230dc0984100e40642709c SHA512 21c8d411f5b37c82442283dadbde99352778efe90fcf7eab7cc6a74fe9b702f14ffa5bd39e058d8f29fada7dbcdb197d5c880c29b207e3509ba856c5d19cfef1
-EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1323 BLAKE2B ae26e5ad2cfc2073601914a3b8bd0cb43ad52814b537c2ce4469fc6b6cc5bae3a0673fe49b7c3a49d709be9a423c2d1c8a9a13907fe2880e1447c1b72864fe4c SHA512 01e5dff413321a7065afc630b7b10326ff9a974213adb7d02a5122360968644fcb1e1518cc8613a26058ba83a12778190456d5fb2c879011464c8b77149d2ead
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1353 BLAKE2B 605fc3d9652974852519959a28afc5dea4b3758f78d8fcdd009fe3d2a4afed984e4076f0196477e01ad03d73edcb39d9bb075efe931fc139c81b329c67fdf590 SHA512 cbac340b5caf9392b7d680fed7553b216016b05a05dada87f38f1f787e5abe9074534500a52440984685e02cc97c2989408d8d8f876353002801bb75cdb9eb43
-EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1341 BLAKE2B 30d5d4f96b24636b7a28313454b326506333884b8cc3a74363bee90188edc85bcaaca5802dd7169593d646bdbe19089ee722feadad527250f3a9227af7d320fa SHA512 743e25ceb76a09801e1f50c68da72e5e817b9a06cb16bb1be4ce28a1e79ac741cc8a34120ce601c2801587d8155774b527e9ecac2c60c07933d914b9f005c010
+EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1312 BLAKE2B 095110735259d67ecc95095a21e0619d05844be847b5d729c8dd291f2bf3649e77fe0e23c76a7aa19b2933ee90cda841b6174327958277ad8c33dc1ae530d6e1 SHA512 782539ed931170657b932ac6ca5d9c9654ed029347f17a7a71eb5f5be30cfded2c91edb79cdf76136f1ebbec9a435b5d9fbb7b4a6aed78573e5fd504f960f3b9
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1342 BLAKE2B 698dea3e68b98bd199c7598b64f2a8686aab3d5d0db5e427d371a4a4e8d036fe5c4f2c940768dd952fac4d19b4c73a2bac18290948f783fcd3dd731260cee83e SHA512 79789d9bbab7b5e689262ac589b31d2b33b3fb99167c13dc11e066afcd92245e5038c3a32a7e480678b7cfbc345a644a36bf8b0f65eb46a71890c65d7630fa9c
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1330 BLAKE2B 097f3ec3909760c74af2f4135cc2d1b5e35fc3412c1d64973c2b6bbf4449e1908bc6a97bb3e8ff2bed9f0eb7f8a5d62920bc80de42851f410488ca5f9587b1c9 SHA512 12ee85086a37b816b7903e8ef3c353ad6e97a2c95b49daae923553fab33ab30dc54b699ff3fa0f858f05792810cce0ab754a9d4015efffd70986992f00c7fbed
 MISC metadata.xml 247 BLAKE2B 1750cec57189e711ca5eba89a78e1d317f0839fa53564fbd39b4e955c28d98f4ae04caf9069afc20a18536cdc92b30fe7b15eb086767c742bad07d9980cfd24b SHA512 d6e2ea8a9d74791bcbf3d6311a66bafc20b8f4db3a576d9a8d54b86d7afb231122b8d87f71f3f46360980adf8d815c633b6d5041f9a30fc8656e8fb66057a282
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
index 705f8baa103b..e62bebcb25ce 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
index cf9dcd4d90fa..ffae4c7c48e5 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
index 699969c95ec9..bfec21f1fcec 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE=""
 
 RDEPEND=">=app-text/build-docbook-catalog-1.6"
diff --git a/app-text/docbook-xsl-ns-stylesheets/Manifest b/app-text/docbook-xsl-ns-stylesheets/Manifest
index 66b7d2ad57d2..3e0075a081ea 100644
--- a/app-text/docbook-xsl-ns-stylesheets/Manifest
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -1,5 +1,3 @@
-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 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
+EBUILD docbook-xsl-ns-stylesheets-1.79.1.ebuild 1663 BLAKE2B afd99e3ecb49c51f48662e034d3e13b936e726176a5083547b068c0b79dd6b748d66fbda4360eee67f8a18e7b9e292b41f8512063ae47c61f87288a63ef3b160 SHA512 e254052c593abd3f786eedd89d7b4ce04b69412447140839e8ed18071589cb54091e163ea487d9290a67f94d7f814b20a7031cf38071617ed9f812d0ac07fa65
+MISC metadata.xml 435 BLAKE2B ad101421ffb8e517aeb459f60058c45e6c022f496e5053fa25d6f4543b814be1940f327b934cc88d5545844c9a4e6ac9c01954b4f96b2697307425ec0b487e61 SHA512 3d7ea2c260b9d5ebe5517a8b8841d36114433b7276ef247dc88bd2f728c1d0336d83e508fba1ef2d020bdceaf4ecf6750d74bda1678422c083e18323b539b18d
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
deleted file mode 100644
index 7c98fc5c085c..000000000000
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DOCBOOKDIR="/usr/share/sgml/${PN/-//}"
-MY_PN="${PN%-stylesheets}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="XSL Stylesheets for Docbook"
-HOMEPAGE="https://github.com/docbook/wiki/wiki"
-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"
-IUSE="ruby"
-
-RDEPEND=">=app-text/build-docbook-catalog-1.4
-	ruby? ( dev-lang/ruby )"
-DEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-# Makefile is broken since 1.76.0
-RESTRICT=test
-
-# The makefile runs tests, not builds.
-src_compile() { :; }
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	# The changelog is now zipped, and copied as the RELEASE-NOTES, so we
-	# don't need to install it
-	dodoc AUTHORS BUGS NEWS README RELEASE-NOTES.txt TODO
-
-	insinto ${DOCBOOKDIR}
-	doins VERSION VERSION.xsl
-
-	local i
-	for i in $(find . -maxdepth 1 -mindepth 1 -type d -exec basename {} \;); do
-		[[ "$i" == "epub" ]] && ! use ruby && continue
-
-		cd "${S}"/${i}
-		for doc in ChangeLog README; do
-			if [ -e "$doc" ]; then
-				mv ${doc} ${doc}.${i}
-				dodoc ${doc}.${i}
-				rm ${doc}.${i}
-			fi
-		done
-
-		doins -r "${S}"/${i}
-	done
-
-	if use ruby; then
-		local cmd="dbtoepub${MY_PN#docbook-xsl}"
-
-		# we can't use a symlink or it'll look for the library in the
-		# wrong path.
-		dodir /usr/bin
-		cat - > "${D}"/usr/bin/${cmd} <<EOF
-#!/usr/bin/env ruby
-
-load "${DOCBOOKDIR}/epub/bin/dbtoepub"
-EOF
-		fperms 0755 /usr/bin/${cmd}
-	fi
-}
-
-pkg_postinst() {
-	build-docbook-catalog
-}
-
-pkg_postrm() {
-	build-docbook-catalog
-}
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
index 3ad9535de821..579c448bc0a7 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.79.1.ebuild
@@ -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
@@ -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-ns-stylesheets/metadata.xml b/app-text/docbook-xsl-ns-stylesheets/metadata.xml
index 7af5ac28f350..cb97b29419ed 100644
--- a/app-text/docbook-xsl-ns-stylesheets/metadata.xml
+++ b/app-text/docbook-xsl-ns-stylesheets/metadata.xml
@@ -8,6 +8,7 @@
 			compatible with <pkg>app-eselect/eselect-ruby</pkg>.
 		</flag>
 	</use>
+	<stabilize-allarches/>
 	<upstream>
 		<remote-id type="sourceforge">docbook</remote-id>
 	</upstream>
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 8ff30a0a486e..593f7a46fff8 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 2128 BLAKE2B d5c40f639238ed54a009b44f089f37eca91b29c5d169f853f544de40130e0d079e1923a662fcbef6a55524e67a4db9a71858fc4916332d23688b48940ffb8768 SHA512 47318afbcdfaee0f367378002db49cbb2292797c63fd1f9a2498d928cbfee64e9bbcf0ae61c324cce7b8d04fec29efa730fa0ee3b82f13d716c9137818761f23
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2117 BLAKE2B e6f00ad1030955f310ffe5e0316369e126a42a4c5d43f1f0de388712ca4f64b155c116bc9cfacbd288cde647d9b3268e7a6597e8cd9a02642e53eebe918b4ee5 SHA512 91d2b6215555d1b9fb2ea2ef80a1471a023530259837227e3184f8edc296887522655b7c5259c0b4a1dc659b9d3f3a8fac2331eaf2d604fc1eff18aebc06ac0a
 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 87000ed1dfd0..2d652f9131f6 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
 RDEPEND="
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index feb859a5bb1d..82bdc19f05dc 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 2061 BLAKE2B 099e35bee439364ca29b05cec0c2854e4c56934fc0ea7f6ef80e6519672cecf908c460a865654dedd84459b53112b6be1abffcd8e80447a6afeb169991ef689b SHA512 a2589e5eabec4efd11d8315c9666ff0cf904d14b41f8f47c92e5f53cd768cf42e91624c83acdc864bcda9fee47ebfe0943fd103a1ed4f18d5579eca61b501a3e
-EBUILD dos2unix-7.4.1.ebuild 2080 BLAKE2B 4ee1a14eabb90520cdfb6a163d2bc04f2c3aa7632914e47efc8d5c77e974d2590d422eab6e59cae6e4ce0ecd0723721a640797b8a5b6390a2041cec6f7919cf3 SHA512 71a45fdfd99e9e0ac65b12f81e7f7ff5d15608f82521f24a5bdc17bf439237aa6546e0bdfa8dc6a5e00b3c02344d14f43ea1ab5dbf219c8221b988e1e87f941b
-EBUILD dos2unix-7.4.2.ebuild 2152 BLAKE2B cfbe03e21d8d1eff52084ffb099f1c1dfc92c94bbdd7c79fb63cea41125157f2ed9c0ccab0971048a7967bd8d69104b18293af0c503928c0f62a48fc58ab618d SHA512 480dc9b86ee00c6361484c7fffca46a5a87567d5ad416856ea30c2aa86080b9e77f09dfac1f99ad64f621fed93ae3e748198af18d002dafb28d6fb97cda6dac3
+EBUILD dos2unix-7.3.5.ebuild 2050 BLAKE2B c97f63d9cb7551e5c69c78487cc61fdba549f76c79a91c28b76fbe252e02ec9e34e4c448e6feca677df62a175600e21282816b903c023acd6b4d5a9dc6282514 SHA512 8329df38d2efc3e120b063a0df2505da939437acbb45a091a2bc0abcc52976486cb0e6219a850d3a4f9d298757572f181531490936a6d424cad6333a4f755216
+EBUILD dos2unix-7.4.1.ebuild 2069 BLAKE2B 3b8c79f046a011136ab334b5b8e177802d0519301d00bf8f3362cfded559157e6355bd627a62e7cf0924f741b214a67c310350f916df76a0d16d000a9aa4f6ed SHA512 7fa928c0b91275a08468ea3de683bc16c5ba998a863f5e5ca5a2fc7cef750cc122d1ef1fbae754f0f00d110f43bab3f677b84afe850fe96ffc3c19c7e3f76b25
+EBUILD dos2unix-7.4.2.ebuild 2137 BLAKE2B 114becd07be998e80f8adb82278fc8b3e32ab04b4722a3a8c93fd6096261932bff5de4111039a68c258865ec3f9d0ce0702ef8061b56077f6dd43508d35f65f5 SHA512 2f8012ec3381996cc2390f27e7af9e74215d2341d0dd6f31ef4d35aceb0aaea2df162cfad018e9775fb978adecf3356207ba1102fca001b353b996ae4fe591fc
 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 115772b6ad1a..21b83510afaf 100644
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/dos2unix/dos2unix-7.4.1.ebuild b/app-text/dos2unix/dos2unix-7.4.1.ebuild
index 74ad112aa731..3b359905bb71 100644
--- a/app-text/dos2unix/dos2unix-7.4.1.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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 45a0999b5fc5..79eb12cc1460 100644
--- a/app-text/dos2unix/dos2unix-7.4.2.ebuild
+++ b/app-text/dos2unix/dos2unix-7.4.2.ebuild
@@ -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 ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index 84e9f460cecb..7ae9b86bb3fb 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,6 +1,6 @@
 AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2dbb51404a3696f61606a4394563b70e2d4a506664d91435b9485417fa8ef61a07051240b8d05861f4bf1e0196a93de69966e SHA512 65fb9900e0b929902713a0c61e5bd2cafd56828a0f294171852bd7d6a5ee44356a26e3f5a3bc57f5e0c532cc6e31a8111ca1daf52945909eecd7b7f1c74c3546
 DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
 DIST dvipng-1.17.tar.gz 171049 BLAKE2B 7165135d818aa399d051977908bf7865774803127312fec515284bd72c4f9e88ffd7f1f7c3c8f1b5adf324fdbb9ac8d039582ede2398123db6ee7655500ac32a SHA512 b56faa6f2b24572233e1f0d9b74122b3bb7fed22cf47c9c05f5530691854dffc9a1953b51803f7d539f9a9de364160d557560c68c369820212837bdbacfb80c7
-EBUILD dvipng-1.15-r1.ebuild 1296 BLAKE2B 50bb4592f8ee749252bda8785b52834bdbd28d9c25e4455a919472310e57c4e3617d7f8b5a7db8df21dcde2a86b9452dfbadf38c165d482ad6020eed2af8547c SHA512 9e89d5e1773cb593936064fdb02b59edd917c74b54f9941a7d9ac3d698d35d27690dd6cd6956b07fafff27d6cdc18b88da4808c4517b811b2c7304d4ca466189
-EBUILD dvipng-1.17.ebuild 1113 BLAKE2B 791361e4820fc0e85b04f3544dc64745f8bc4f71f9c5d5834793a9eb1f6b8e8c940a78ff042bff831184913c82b6edcb60e01b0bf9008529bbd64c13fa6e62bd SHA512 ce800ecb8972247c4929358e7bd22a9ae18d911cbf44f918d18324205083f54a7826842cf1225d070ad3d2c1f320bd8eb94117633bfaa2fd80a519f45a6e442e
+EBUILD dvipng-1.15-r1.ebuild 1285 BLAKE2B b1966083be571eb035c58ca968ae0e15ac1648cef37e7d60772cb8c0a4ae0cc52afa75e525580237ca7306d8b34d367ea5de1703d68142ce6a4bbc0927d7d3a0 SHA512 41491e753d5102ea718ce2d991ecb04b12aeb90ebf32aa9c848479105780f527763d4d580619246ea1b016d5bf965c03f7927fc4379ffbed47372ae44dc04625
+EBUILD dvipng-1.17.ebuild 1102 BLAKE2B 6065c23f7b8944d39293d24a0c52e28926390987421c776a39a83efa4c3729ac191f69775c17518a8fad0bec07fd5fb73c95f20bb0d2867b5faa7abdd50d6441 SHA512 7024d5302582be69b1823fde6c5c460fe932d5588b2a793e20577a464ceafea59be1c503f492eb9d448d13d0a65ba15c9482aa463820996c4713ebca4d9e0c70
 MISC metadata.xml 1122 BLAKE2B fcfe5bf7616dd40ccaa74751ba1c653012de0f263ae8c4764363c4a5b1ce9546a335b7e2c0917a9d2a0a30cde98bcc5b8e3184619b83f1d6267d7172584144d2 SHA512 c2f663c6ae8113fc462e16ce50ef44172c8d5cffaf34e9095701df7e3ae568126bb782c8a02e3d735239ea7263e6cd9778bf21f4d7166c24799a9090ecd8bc26
diff --git a/app-text/dvipng/dvipng-1.15-r1.ebuild b/app-text/dvipng/dvipng-1.15-r1.ebuild
index f3a16d4a27ab..00c92cd61184 100644
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ b/app-text/dvipng/dvipng-1.15-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~sparc-solaris ~x86-solaris"
 IUSE="truetype test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dvipng/dvipng-1.17.ebuild b/app-text/dvipng/dvipng-1.17.ebuild
index 4b506d678ec3..80b7d38c3a40 100644
--- a/app-text/dvipng/dvipng-1.17.ebuild
+++ b/app-text/dvipng/dvipng-1.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,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 ~sparc-solaris ~x86-solaris"
 IUSE="truetype test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
index e020228a5fa4..e62e3a07356e 100644
--- a/app-text/dvipsk/Manifest
+++ b/app-text/dvipsk/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
 DIST tl-dvips-2020.tar.xz 58076 BLAKE2B 329b4ffbb759a040143269d492b58037dd803e1e832f263da9db918d9cdbe66dce86a0bc23d2ac421a52da017e33a38b6986c89be9ae9ae0591c9261f4510b7a SHA512 835a289ac24755904d7d39e09846420b286c0aaf5c57a081ea8da78dfc29e2289bc326d735a0281f5559418dead10ad0d040e2fe6362947e15df672c82d7900e
 DIST tl-dvips.doc-2020.tar.xz 521496 BLAKE2B 1a19670ea2a6339f983564580bfc15374737014fe5dbccc4fb3f3f81455bab2c0ee9cec9ea0b9858ccd3d75cff6465d825a4a2fb095e7d4e70edb459e76634b5 SHA512 6f97f38327335ea711ec467133d1fa4e3124f3362d177e19af2cca06a50be1cf1de4d9e5b1aacbd1ba9779e0062a49a7572d47c5de918030fd5f78476e2bfac1
-EBUILD dvipsk-2020.1_p20200406.ebuild 1573 BLAKE2B 1d4bfe24b34af9e03147d775e6541be96791a701f1bbbc1dfee3e8b32d40a5f2510bd86207903916985cac903576b874c38ff3f1d7bd0fc87436e0321fd6c04a SHA512 b4bfc9488803613e88d16b63c492c401717845651157a77c4cb3bbbe1cb5ac95a24b3865daeb6349f0483c271a8bee99e8f2b24ec214e77cadd04523a7157063
+EBUILD dvipsk-2020.1_p20200406.ebuild 1562 BLAKE2B a7874bfa7e1cfc899066612d254d80d8ca6c0dce1eba6c58b4871fa8976c6bd20c80b525231080cc4bf1d4c6077265bcd376c4cf7ed320e6fa6fba8f2f8f4b67 SHA512 670bada7c10c8c239152aafdf198177e69766991d73015c5ab38abbcf7b63f8132352c342d13e4603b8fead3e5ed5e02f057284b87e422db30756769379529e8
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild b/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild
index 9c90c3058e59..e9431319423e 100644
--- a/app-text/dvipsk/dvipsk-2020.1_p20200406.ebuild
+++ b/app-text/dvipsk/dvipsk-2020.1_p20200406.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
@@ -25,7 +25,7 @@ SRC_URI="${SRC_URI} ) "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc source"
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 4752a6d2f499..4a21a48e1500 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -2,8 +2,8 @@ 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 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
+EBUILD dvisvgm-2.1.3.ebuild 1098 BLAKE2B b65e4082e5bc9ae1449ffe319b54dd83cfa2d08b4c66c5e69cbfaf165598ce7bf0c891672a2ee5f581c86e52d9c8fa33a5a5859b221211498e4284b76379595d SHA512 0d182e7884dc102759b812324f478e6e8d53d37ba50a071e8797723ad417af104903f9c46a401af85e36f6becf3fbdbe365b7f89db7df48d05b8d25f659061c1
+EBUILD dvisvgm-2.10.1.ebuild 1155 BLAKE2B 5f072ddd7ff2cf1d564b8f2a290dc2ba6aacd1b17cb93da6398efe1a9014bc9906cb210a056b622c47a1d69d080d786bee4660d6764c0adc440be959c2c8dea2 SHA512 9f3910191087d9cfbeee6642bb752147d8d4cb539502ba3b0e1f3857f2caff0197ff6ea832c66be9f0ea7f4ef17b2ffc9789d1236ef60b484e771651a7c4ff64
+EBUILD dvisvgm-2.6.1.ebuild 1187 BLAKE2B 6fa1cd59060e980501c34d1a4a207de4987bd037918e6e28128a55247c6f28121054e8036b9a1e8932f65f3530a1c43cd47fe39ab5eab318d3800b5a20aeaae2 SHA512 8c1ef49c8f3978e10271d92ff5249cf56a5e9111b84ed474bd5a3ecf6a797dd2f6f079d32cd7e65471959aa67625e4d24266323f660ae673b9bbe8ffe672f3ca
+EBUILD dvisvgm-2.7.ebuild 1187 BLAKE2B 1fcabdfd6ab8fd3e46aeb7b602c17b1f402785fc4b784d864933e107d52a758465d1024420cc6a8945617d57a75ecbe2afc3969ec4d9b498dd83783b6daba320 SHA512 11f4fa6fb5b2a6dd1e88748e85bee2127e910257f446dc8d5457a52464263c2fa353c582e91a20415f0d013e2c2bace4ad8361f0b8a0a48a79db63f985caffb0
 MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
index 57d5723ca440..6891f3e0b5f2 100644
--- a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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"
 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/dvisvgm/dvisvgm-2.10.1.ebuild b/app-text/dvisvgm/dvisvgm-2.10.1.ebuild
index dd9c838f52f0..50dc39495c0d 100644
--- a/app-text/dvisvgm/dvisvgm-2.10.1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.10.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,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"
 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/dvisvgm/dvisvgm-2.6.1.ebuild b/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
index 72a976d24bc5..1307115f485c 100644
--- a/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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"
 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/dvisvgm/dvisvgm-2.7.ebuild b/app-text/dvisvgm/dvisvgm-2.7.ebuild
index 043fe1d0dbe0..fc2a5095bc13 100644
--- a/app-text/dvisvgm/dvisvgm-2.7.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,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"
 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/enchant/Manifest b/app-text/enchant/Manifest
index 99fe3c8abccf..9a25e2bd92cf 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,6 +1,6 @@
 AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060b20c709f920aa7ef29e1560f4a194d744064f59ae7c812cc27debe30c1082a9f76d3eac8723f850803c5eb06c213fe39e91d SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
 DIST enchant-2.2.8.tar.gz 976715 BLAKE2B 50a96c69b6f6575db0a8d6f30420db4b273901a9a0261ae606d81d96b044ece03078a2549f34972fef47a36f0b85c27af90c90c2f2efab2fb258e17621d927af SHA512 4bfa771af0deab3d0ca5523abab1fdb14cb596747dba7cf887e8cd812601015f52502cbd3df68247f102bba259cb281414e9ccde83b8bdd3c8cc83c2fcbc9090
-EBUILD enchant-1.6.1-r1.ebuild 1629 BLAKE2B adf64823d275f228a0056b7ef888bd399f9e7d0ab0d487ab3316272a0d04e944472a60a90dd16f545b55d742f5dcfff0f05200763ff11492ca576423a59d0e03 SHA512 2f132714843ceccfcbbdbcdeb4a5d24c66635dfeca4f95f676046dc9f0313bd1bf8ff6b62ed5f1ee666649e519dd67b2a3f9b15854e050ddd0dbedd003530edb
-EBUILD enchant-2.2.8.ebuild 1230 BLAKE2B 2caf5298fc0b7a922dcf2f2d8732248294b21ec88998fdceaf83c7003676ee509c453bd7b31af0f0e6a7513a56a2ab3a09e68bb068ae991e9fcc6926b8b7b085 SHA512 6ccf011411e6e8b321c67da98dd4e91eaccf0dda407a81950d03f35ed15405b222e1463da2a647a5adf5d3711a0784beb63504d724885d5c00b2cea437aa2310
+EBUILD enchant-1.6.1-r1.ebuild 1618 BLAKE2B 339676eff2871a9abd5bf85a3509924677ec5d9939e49416d4d09b71d4d228b45e81f8ac6b207c449c8ca837aab0d8d63add052598a0ce9430873bf0ea3df250 SHA512 eedb24e76290dffa83a68a565e2f5dc10544360a62617bea107a4270d13b5a6dbb19418a245c84923ad3dd5d6e77dda2338f14bee2b3a17ddeff1b7c2414ad2c
+EBUILD enchant-2.2.8.ebuild 1219 BLAKE2B a68741164e6cb8eb2e96ae2349bc18e584327a10aeb4fe9c6ee0a294a2101709327afda22567832248b36fbeb4d84f6281e99acd0840ba93619d9daa3180ba44 SHA512 a3549c67b4543d18180e6b09072f56b234b04cb374535b3535f71ce5f9156e90705748f0289f127ff5c1074349c57a467f77f2669172abb9b3f6c3929686aebc
 MISC metadata.xml 446 BLAKE2B 46f91a78cb6d8ae11b77da0f640e07fd3842e4ed162d0037b9620132f8ae9ac81e4b6353371d2350abd634bc693e8d64c8d94a5496cb28931863ce7a246ab209 SHA512 9e1bdbc66c53f055c8730a6ff7a833e2597f648067087e268495a3337e51fb3d806fbed698a69ac59599100eba90401679f6141c71dd9298030f4771230429ea
diff --git a/app-text/enchant/enchant-1.6.1-r1.ebuild b/app-text/enchant/enchant-1.6.1-r1.ebuild
index 38c1d56a3d42..7a5f39aa232e 100644
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/enchant/enchant-2.2.8.ebuild b/app-text/enchant/enchant-2.2.8.ebuild
index 0c48e1849305..69e96cf4c78d 100644
--- a/app-text/enchant/enchant-2.2.8.ebuild
+++ b/app-text/enchant/enchant-2.2.8.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
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz
 
 LICENSE="LGPL-2.1+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 IUSE="aspell +hunspell"
 REQUIRED_USE="|| ( hunspell aspell )"
diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest
index 84d57db2120c..295734c81630 100644
--- a/app-text/enscript/Manifest
+++ b/app-text/enscript/Manifest
@@ -5,5 +5,5 @@ AUX enscript-1.6.4-fsf-gcc-darwin.patch 832 BLAKE2B c16294bf4a42827bf7af1b4df233
 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 1260 BLAKE2B 2dde173704d326fbca73dea97bc412d98db5f2c3b906e99ab5cada051018396b0fbd0595fc3ba8a27f30a74598dc2a5d8a45f28472f2afbd4dc802c9e83211bf SHA512 ae6e7ee1ee581730057f7805b20757e57fb80d4c4aa0428cda0b741fa4acd8c34b1d92d9317ca16562433acae1b23fceca9de64dce9c123e08c8f28d39bb64ca
+EBUILD enscript-1.6.6.ebuild 1249 BLAKE2B c42f8f6142e1fbd3c7f704e6c9ff11c562818473f424ffb87a0c736f4acd036766d59ad8e7de4d669a8ae86f77a9d0c5273edc972f0d1d43b2e0b48f35e8aedc SHA512 4b16d2ca248f020bd4bfdb699e2a71a7fc1e3466941d2a3290daceab3ed5015f4175f94d894ce256808dd46f24f33d20205828b0289827c6e05677a866850cd2
 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 40d647506bc5..b613378cc142 100644
--- a/app-text/enscript/enscript-1.6.6.ebuild
+++ b/app-text/enscript/enscript-1.6.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 SLOT="0"
 LICENSE="GPL-3"
 IUSE="nls ruby"
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index aafdcab74141..3f6c55b5cd24 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 1259 BLAKE2B 24f45b7d2d4d1dd54647f4caeaadec2e55abcb8dd67b182d5b33f160f44a9759d70dcca273255a88a2a24e4faa5c475d5cb398f5781dbce636b4be9c64f8857c SHA512 271c37c1d54710859a632b921ecdf386a31e1ac01fdc9a3677790cd73a9dc1c3fc89ee6ea868cc085cab08fb8acff0833332e7c426203f3a03f7fcf017063e48
-EBUILD epspdf-0.6.3-r1.ebuild 1355 BLAKE2B 5e963e2d124cfe173618c5be2b4225d48aec246e9fefc5e246fac4cc0ae1294527851ab6260b43cecb45f41df5516f03c10f627accb64767af14441e42c42b44 SHA512 b300c3f1d318cfb70c155d7a1fbcfa890de90733ac4e16582e9833d14799216ad72063b0325b68f3560fc63fef1fee649991681373d1961ef3b9949b390357e4
+EBUILD epspdf-0.6.0-r1.ebuild 1248 BLAKE2B 87eedfdce26007b3a8e51514f3fe9ed39a22f5df35c2c8c4b7f15332701f18f1a316ab416203ba45843af3562f3aa3d8145b3b472db4e376e6085afcacf9b0d5 SHA512 1ad4412914e276774fe5e204db34e691a41b08d4f167df492a27aa2d0ba4df1ef08fcaab64722bc0b9e94a9cf0294cb58ee37d6af39a2d51df7088a5073eb30f
+EBUILD epspdf-0.6.3-r1.ebuild 1344 BLAKE2B 3107fc17f92c58007cbb85c24e9b9aa8cf79accb4b7d890b5fa68a557550c69093171c2446ac33129b57208f0b9b175ee504fce839ec19173446facfab6e4bfc SHA512 f2207054f038b8f1b13d4435722873f56636bf1cfd1d20016681a5dc745403ac374481cd7649dfd2c442afac168c1f7487da1161d165783f6908ad3c8a041519
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/epspdf/epspdf-0.6.0-r1.ebuild b/app-text/epspdf/epspdf-0.6.0-r1.ebuild
index d7ce44288f0c..3c672aec748f 100644
--- a/app-text/epspdf/epspdf-0.6.0-r1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~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 0ee97faf33fb..d19bd91cc735 100644
--- a/app-text/epspdf/epspdf-0.6.3-r1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc tk"
 
 DEPEND="sys-apps/texinfo"
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 4ecf9594e19e..b0873338bd02 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -5,5 +5,5 @@ DIST ghostscript-9.53.3.tar.xz 41368160 BLAKE2B 6b5840a420d7527c7155bfb707fe19b3
 DIST ghostscript-gpl-9.52-patchset-01.tar.xz 3292 BLAKE2B b6ac4f06c149301b07f57a5dd1f4507cc1e6d17ea60132b64177972ca58a29b2f6ff2f034b20b8ac083b60ea999f50ff75b74f86eec0cd73179741ed8a1486a8 SHA512 2498c5f396807a282727a7a9bd678e2008a1e4112722745aab48a12601661b08557c5d49f0a5ee67fb636f8c2b00c737640e894523b904ef3600f66d107999cb
 DIST ghostscript-gpl-9.53-patchset-01.tar.xz 2340 BLAKE2B 55d82c88f1b57c084318839e1382ffa112461d074411b1f6586a5a9ace37772b144abdda9f742defd077ce937df590d63bd7a2306bad52438949d1036bb7900c SHA512 ab58485df9152bb32c6f0eb25bd45689089bd17ffb0323c54e1977c5f810ec5eb09f358637251c428591749bfb42c6f8489c74d4bd0a7ae5d696eb2346503c44
 EBUILD ghostscript-gpl-9.52-r1.ebuild 5175 BLAKE2B 83b725c22dfae426de0735f8195e6e4477b47d3fff6fb0f3108d344ffee6eba03bdb875078c472a048c2be7ed1f3347cea7e22707bbc1c0c77629ad11a3c5106 SHA512 f242c79f3ac85c147ee9d6ea203b716ebf44170e5574db68fecb04940b2e7c6146631bb2e1a46cf06673d91fc6cad18bf4828ef97af91896815cceb5efba0e17
-EBUILD ghostscript-gpl-9.53.3-r4.ebuild 5237 BLAKE2B 68d98e9801e88d18bd549f57aacb26af3d34834e1d12c0158f8811d7eb977b60389581f523d6f3a756a5be5653172419abbb610d5f9910099b5701b8fffc6467 SHA512 f242179908dcc4d7f10902e60ec4e35f52ed0726790c53928165f3e4d3f928c38dfa76d1471bb89f7fc6daf4925c553e393a358f54aca31e30f16c8c46feb5e3
+EBUILD ghostscript-gpl-9.53.3-r4.ebuild 5226 BLAKE2B 2b1d6f5835e87b87307337b062179b38742b8094b9e5bbef175c23b3799bfd1e7c10400e3f92e4e6d0f461ed7f26008822464429901ec1f077bcb4624e0a49aa SHA512 d81ce6ceb51cbce7d9fc5b61e19e2ea8825140d367bb7891046fdedee6cd2b1bda7fd96ed9468750426782765ff38f1bf47686e0a06e92fd6ace8e68fc588809
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
index 7551704f99d4..e201db027681 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.53.3-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -23,7 +23,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cups dbus gtk l10n_de static-libs unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 8990822cbe98..50fd7f0ab788 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 1937 BLAKE2B acdf5285c83cbc02d6014a67b196cc507f8921e993832d7fbb30035a6eb62cc186020ac05743a97ad974aa423ec774df1d66883c561a6842ccc791a6dfe8a5c0 SHA512 c2a366757870e64140d7c7037c4bc628a0a4f67c728aa36683df4597d1bdd21d99ae81f747bea6b3ef77c5d5227ca91afaa484f537e9b71f3c32a71648d3a1e7
+EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1926 BLAKE2B 29d247e3dc0051729622b1ea7f431db7cb0ef73bc85877e8bfae6e87cc43737a35e8a648ac5b7d3f635389f936d902be49ddfe9012982ca706022a2b05b5a990 SHA512 a801b31eb016a96c0881c10a439bc3817f0f6d50ed3b8f169dfcd9564b8ee0ca6b4fc2f5aacdb404442e3bb8cf1253dc66552e2d83bb45b09d6d536d7dad9227
 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 30c9b310e829..2cb2b6274d6c 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index 204b3aa92bd3..aabc893d18bd 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,5 +1,5 @@
 DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B ccb49b99c4f9059ed4461bb5ffda4dbeb691c5a062184ba7b51d8464d2461c5be0d648e4f69dbc36fe345be2addbc271af9701a0a387975265585dd3a7926e99 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
 DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B aa167e9e5068e9c6c5fcf6933a28246de0be8386be43ab3af80a45dfbc092e1381503822d09742d20dde2e0b8dae77210001c955e37a8dab263b832ee52675a1 SHA512 3b1ceaa9ffa06bd3f6dae39c95db951588e5cf2edf4f551cac6972822ba230af3415c5045fa24f7a4dfe05c2e386ab3f67cb80cb779576b4e54293b7b9fbc28e
-EBUILD gtkspell-2.0.16-r1.ebuild 989 BLAKE2B d4fb62ab9cfc3b9b8f3e78bd3f67273aa46c3b73fbf4eae23335a7668de6558ed85e9e746dbfe3dadf2854dd8456466ee43df0a9da43c1bc07dde79daa1b35c8 SHA512 634f734e83cc736d9a53dc2a03f45ec4e69614bffe7d97870f10038f593dd58ecb09b31a7a7f10cd604e1e67e42a59d609c9197f2ec708a27a61343a171130d1
-EBUILD gtkspell-3.0.10.ebuild 1060 BLAKE2B 7cb42c272a70ea0e2cdcf5d0178c243ba6dc70e67a728506a7d08cb00d3d6d92fba11ef2c49acfd9335b0a0923286766b4dc800eba96f4ac51eaab0b68e68377 SHA512 5e9e9d41cd1dca5dfc744d4ec4153e012070e4ca5f0121335cf8409a8e5b72ccc9700a7cbc2b67b29f7b7b8213f2d797968a62bcebd95aa271b95a56fea377d8
+EBUILD gtkspell-2.0.16-r1.ebuild 978 BLAKE2B 4ce2d2ebc6fb10c9070a9cf4797df8c7be291349537e347eefec020e59082525d45353277692ae95d9bbac4336dd10d3172eca6fd01ead4fb40d1a99e570c8b1 SHA512 3637d73b28a5fb05885871837e7540f8d8f5e4832b4ec71cc1527e6c8bf68925c23da78fc4787b51f84121ca791c709b2eceef95dfd0644ac1784f2bc8500b6c
+EBUILD gtkspell-3.0.10.ebuild 1049 BLAKE2B 571ae5c4eb78934fed4a53dc7c882c598f75318d472fca3b9e29ec0baa87bb999ab3cf00a2bdc23b0252db43fdad249840100c5c938f7dab1f9d422fef3cb0f1 SHA512 4066930b06f1ffa693a339460af9f73e426994dd55361c13b198d3ae227736ad15b91c2d53f30890256cf35b250b05b58d47d802a87bfdefe30a2966070123eb
 MISC metadata.xml 331 BLAKE2B 09488ce0a015e7f7321a4a72cf8b046c63a5497694736ea7d9450455f447be0a328bb5d6f607d86032cf1fa77ce3d204373dea048a5b089f0eb7b38c4626ddc3 SHA512 51f55422f9e5a13f8cff5ae6ed6e00f2be248ccd4b472c0d8519c73fcda34d19129fc3183d4c570480198f14468fd8b208ddab0c70df05431ab8470399221514
diff --git a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild b/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
index b859a9164733..d6db37423a36 100644
--- a/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
+++ b/app-text/gtkspell/gtkspell-2.0.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://${PN}.sourceforge.net/download/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
diff --git a/app-text/gtkspell/gtkspell-3.0.10.ebuild b/app-text/gtkspell/gtkspell-3.0.10.ebuild
index d4ae70848754..679cc5564c86 100644
--- a/app-text/gtkspell/gtkspell-3.0.10.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.10.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PV}/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="3/0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest
index 846857645774..4ba738119c4d 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 1057 BLAKE2B 94710654a664038b21b2931c0faddd4eb5032a959b5f0c089bec1f256db8aea27b51b850d10f68a81ebb0b3564ed95c92d305c798f1612edd7ab5f4dafa53811 SHA512 d4f96f9e95c2b79ba39fc4ccc6370efb9366407cf375b7e7e90a63f0c2b30e411ba9837b8d616b2fc163347f1565081df085180cd88566cb36422fa843502d33
+EBUILD gv-3.7.3.90.ebuild 1046 BLAKE2B 22b6c9ec3cfae0bc8faed072b8acb4e42bf6385aab66f0ffee5ea06a167611a43d4ae0518aaac55b59322fe0e3ec22ca4758c3d5118f2d1a3b54547bff689342 SHA512 23534891e0c433d97e21e215fa76a1f619d1b25444341c261bfae51c7ce75bc8c554d756e791c39502023502bed8acf3127dd8dbaee3a3fa85b7010818564f00
 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 aa0f587b889f..eec0381d633f 100644
--- a/app-text/gv/gv-3.7.3.90.ebuild
+++ b/app-text/gv/gv-3.7.3.90.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="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"
 IUSE="xinerama"
 
 RDEPEND="
diff --git a/app-text/html-xml-utils/Manifest b/app-text/html-xml-utils/Manifest
index 5fbbfd9f763a..9be7437d8a52 100644
--- a/app-text/html-xml-utils/Manifest
+++ b/app-text/html-xml-utils/Manifest
@@ -1,5 +1,5 @@
 DIST html-xml-utils-7.7.tar.gz 403664 BLAKE2B cdb97003bb6fb0138910f8f00b9612db3eb8ed4fa0ee81f27260e8907c088e14ac010f2862839355a4a6c0eca49508ad47c4e26f1c1c62e178c3b0e880ed124d SHA512 72b71982717de11b3b5f601a157a04bb6ecc235db6810a0dd830ad7682ed16cd6a928730013cfc918f722e1e5f03c357cd2545806288986797230f9d04175460
 DIST html-xml-utils-7.8.tar.gz 408201 BLAKE2B c2fed68e8fa0ae331ff6ce100afdd4c7c5b272b47d806c8e557855d32d2a140c2aa580d200644158350697e62c416d16a5e264c09897cef06d29cc5f0ab67091 SHA512 8d3a242203de099b36ca78a8d84571ecc5d8673855ee613f98edc48d388230367f40b87006f7b429e2927026300626bed7ff7f146df317d078e332091d290930
-EBUILD html-xml-utils-7.7.ebuild 717 BLAKE2B 210ddf6ba853c4eb205cd496f2e6992321929e7e1f5513fc3885213d7b89c3af09f5553b6122dbd9b934306d96c4ea81fac9b0de968246509a0e5007b369472d SHA512 573c185e238cefab05cc378c976cce51ad08379aee51335c7ea2bf75325f807dbb1e4ff695e4bfb7a49543e225e20c9a7a426515032c2d975d26b10c6d19dd6d
-EBUILD html-xml-utils-7.8.ebuild 721 BLAKE2B f305a5a3ead744dad71a9bd2dc015d7185f3faf283aecf83da2108eb95bf0fc00b0aa1ea63eb7907996f0a7624d30f8d03d62b6ad7e8cd183be7ef8824998b58 SHA512 113ff3debb917d330eb33f49879a3cf8a615101a2f9a72d1cc6ce47f7e318d355b46396d785c2a57b44e534725bde9c2968175687a6f2e5b2668047262169e88
+EBUILD html-xml-utils-7.7.ebuild 706 BLAKE2B b6eb99787e84991903117b2b40bc75aea37751b36fae817bcc13c60aec820ff607097860ba1c0088922344755dc483cd9d9ea48eceb18022e04d6a5b99ea9fc7 SHA512 07fe7f249953e71fb1a2481dc5f69b518ff74bc02760101dc508087f9d45bf1be9c267d07a9f53d72e2784675222d721b5b493ff3273786ad2550171309689f4
+EBUILD html-xml-utils-7.8.ebuild 710 BLAKE2B 80933c3811d0657e262d6d35f7a18e98059a6af02ccd36dcc0ad7b85c69a08f9fc0a1e37651c5886b817cf83ca389f940b0ab71405033f3a3d94eef7527b8fc2 SHA512 8cbce0f907935e8dd9a396631cbd43b803834cfd43d02aad04af2892cd820c40f4d77b3283985be7e91204d456857e9a1e9f9fde91d8b9a7bd98a195b379b857
 MISC metadata.xml 220 BLAKE2B eabf3517ba7e5b67320254eeb2b07adf1dbe0c3432b693973bc25a3e3dc8ed160b7313f9f8ae64d994ac272487b785f33202d9640bb5a7ace9f56ceb42978a19 SHA512 1db105eebacb6c7d44fd17746981e6e24badb2e81327410aa935a7603379cfcc8f3cf27dcf4e9d870cea2f73f6a15cf052e3e785205095ea9a93d72980ff71cc
diff --git a/app-text/html-xml-utils/html-xml-utils-7.7.ebuild b/app-text/html-xml-utils/html-xml-utils-7.7.ebuild
index d684951d281f..52e4be4a403a 100644
--- a/app-text/html-xml-utils/html-xml-utils-7.7.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-7.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-linux ~ppc-macos"
 
 RESTRICT="test"
 
diff --git a/app-text/html-xml-utils/html-xml-utils-7.8.ebuild b/app-text/html-xml-utils/html-xml-utils-7.8.ebuild
index 29a3b176a17e..6859458d15d6 100644
--- a/app-text/html-xml-utils/html-xml-utils-7.8.ebuild
+++ b/app-text/html-xml-utils/html-xml-utils-7.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-linux ~ppc-macos"
 
 RESTRICT="test"
 
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index dbf926bffc89..6e5f4a7515c2 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 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
+EBUILD html2text-1.3.2a-r2.ebuild 958 BLAKE2B 8ec2e489b36030befdc0c0eba73feb43d0a723ffebabe9222666edfe9592152992a4b25385566326cde8fec7270c80bb8526125f4c13c9d4e1bb2c092932f157 SHA512 16881d04627f3d372edf2dae0640e1c7fc41a68b4f68934728d1030683cd3358243c88e2ef0309770cd1646d8bb0bb57e4c7228502c7a78f51b229eefe8d4275
+EBUILD html2text-2.0.0.ebuild 886 BLAKE2B 780ae465e27819ac3583d900c9a5fbfb208d291072f8dc47604bbe857a6bb61b42c46f6516fb1fd6652dfd8dc7d9d797ac1e2c3e3e4c75bf53f5baefde962abf SHA512 876343870bbab2e889c4a62edf67d84d2bc1a1cbb13d95e72e25950015186cace38231d5c445a20c72ac99197dde98964c66f3c5564f02a35027916b772133ca
+EBUILD html2text-9999.ebuild 886 BLAKE2B 780ae465e27819ac3583d900c9a5fbfb208d291072f8dc47604bbe857a6bb61b42c46f6516fb1fd6652dfd8dc7d9d797ac1e2c3e3e4c75bf53f5baefde962abf SHA512 876343870bbab2e889c4a62edf67d84d2bc1a1cbb13d95e72e25950015186cace38231d5c445a20c72ac99197dde98964c66f3c5564f02a35027916b772133ca
 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 28aedbdcb328..16360f5083c1 100644
--- a/app-text/html2text/html2text-1.3.2a-r2.ebuild
+++ b/app-text/html2text/html2text-1.3.2a-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 
 PATCHES=(
 	"${FILESDIR}/${P}-compiler.patch"
diff --git a/app-text/html2text/html2text-2.0.0.ebuild b/app-text/html2text/html2text-2.0.0.ebuild
index 564b1370c781..f7558b5e8e28 100644
--- a/app-text/html2text/html2text-2.0.0.ebuild
+++ b/app-text/html2text/html2text-2.0.0.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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/grobian/html2text.git"
 else
 	SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTML to text converter"
diff --git a/app-text/html2text/html2text-9999.ebuild b/app-text/html2text/html2text-9999.ebuild
index 564b1370c781..f7558b5e8e28 100644
--- a/app-text/html2text/html2text-9999.ebuild
+++ b/app-text/html2text/html2text-9999.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
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999* ]] ; then
 	EGIT_REPO_URI="https://github.com/grobian/html2text.git"
 else
 	SRC_URI="https://github.com/grobian/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="HTML to text converter"
diff --git a/app-text/htmlinc/Manifest b/app-text/htmlinc/Manifest
index 93db7482d33a..9ff561f4e84d 100644
--- a/app-text/htmlinc/Manifest
+++ b/app-text/htmlinc/Manifest
@@ -1,5 +1,5 @@
 AUX htmlinc-1.0_beta1-fix-build-system.patch 768 BLAKE2B a9da434128aeb20a2151d38353b8b7ce5eaab8fa4e4b44b9f9c79a87a55ba63cb6a344f6328b9b2c439a530aaba1b5377844946b24def2b1b0ca62c7fb52a145 SHA512 78c386be5ca30e15c786ab882800a065fa785f4ea5d3683d4a703948d642945077e00cf59f724cf7dc4a533827102883dfdcbc799752130d41bc846da83ebcfb
 AUX htmlinc-gcc3-gentoo.patch 3601 BLAKE2B d268406b773c21cd2885d3f9b5e66ad0121493152a454811b5af1bb20e8ee857777374f2424d68ae9634c74d30d6e24a8d09779059c8fe4440db390259108e23 SHA512 f29d5c823fae27ef027002a8e075e105f028c8a4892d142c64d69af7bca52a63de4ca19aa0cf86acc67f772349472d2b04003c71257cf1b7464c9dee56d95afd
 DIST htmlinc-1.0_beta1.tar.gz 17042 BLAKE2B 07c9333599876c17846dec8d40c0eba31f1f9321cfa463e4c5dd2698a120c878c6b2d0e6593eb78d22a15fa5333e0fb26ed064a9cccf6b95641cd9a7e3a13a53 SHA512 2bdb7a5df4a8152d9a23f7b740995bd565e92998ef199cfb7d08b1f5e8ae4390c5179f78da71dfa4b7ce18a2a0bfe6002d465b0fa8d860a25afdec5eb4f3ee4c
-EBUILD htmlinc-1.0_beta1-r2.ebuild 587 BLAKE2B 9dd12c0b2cbaec3fdfb21ffe63de9487acbcedee0c06b31fb6b41f24b8965699581c813dd892a018f0dc8933644162d18e039733b431f9214d755f021ac5a995 SHA512 e643b5b2324d70fe8a2b9c485c3d41b8967229aea2aa80f5573b9b8a7399d708ea094f76e90806ca6056ab739f5fa04b762704e601e8c27b19630aec315e640f
+EBUILD htmlinc-1.0_beta1-r2.ebuild 576 BLAKE2B 73ec1c98adcb4192a87f7c8f07c994676f121ebb28b898e97ce94347510a3693c90d558cdf07ff8c0758d1559ba484437d921d86087d9afae98f65ae17599f59 SHA512 a848c2ab1894565901173aa4786f97300f37da61e2cb86847c816220c4bb83e3d4d2c4c3e8409a84ae159d8e413956cb88387000f7077d7ea07146453dd1e5c2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
index 180d093a6ff0..4c58bcbbe842 100644
--- a/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
+++ b/app-text/htmlinc/htmlinc-1.0_beta1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc sparc x86 ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~ppc sparc x86 ~x86-linux ~ppc-macos"
 
 S="${WORKDIR}/${PN}"
 PATCHES=(
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index de2aee9f4a88..9d74f042d356 100644
--- a/app-text/htmltidy/Manifest
+++ b/app-text/htmltidy/Manifest
@@ -3,5 +3,5 @@ AUX htmltidy-20090325-tidyrc.patch 923 BLAKE2B 1ce5800a8991d37edb48d652c03525ce6
 AUX htmltidy-5.10.26-strip-O2-flag.patch 370 BLAKE2B 7c2a58a6a8c00460871278f59676d3b8b8077a7cf2fc1f65dc9ae2987e06d760c73177baa37a197eb0f45f3a5c09bc2030f556948cfd2470fabe2bd734527e3d SHA512 671a0ef17388fb39d5623e0dd2b8aa6c55c22d9f3ba8eea093ddea1234a2786ef983cbe9dd7002fe04b2986ae888458f4f44120c47aa34dc145d34d9db2f81d7
 DIST tidy-20090325-doc.tar.bz2 13319 BLAKE2B c55c5e10cdfbf0eb62685955cad24f628c21e612bd12c41018c139b3b93db95cc201888f6766d7f68f2d1c4d4cfb2cab25b668eff0d2d241462f4cf9b65e79e1 SHA512 0224d1f839f3829a9c879eba8a98ceee3b0c9f8bfe1721076859714428d534f492acd11e49992fccc2e45afd64d79067793c90f7af06d623ef89e7c16dfee35b
 DIST tidy-20090325.tar.bz2 382016 BLAKE2B 3373e94d54cfef866e701e2e258be821b8749dbbbc37b10e4e4e4ba6d7f5995676161ac11bc6a2497f5e02c3907f680fabe9ac6dec2f2365aeb39c03b9697e0a SHA512 daeab2c3dd7f1248a5dbc1585267a8fdb0be09a940b79c3e53c97051f692cf85ea9f0a267f37e1c877054b77efb836d422a1e7ff61b22b383a2d2ac08939b970
-EBUILD htmltidy-20090325-r2.ebuild 1976 BLAKE2B 05f5b0708bbaaa12b285939dc86f09958f2bf3ce0ed4ea83814660ef2534e507e054122aba9ab4415cf6afd1a82676bd83ce035b487a1f28e1885b2b07ae2677 SHA512 9f7d3d4c05f036ad262d83fec3e0d246c41389a2faae759fb6cdc3ce6185b37bf1b9818d79c7d3307b729020c5c437dc187888376ecf0140d659f55fce86a720
+EBUILD htmltidy-20090325-r2.ebuild 1965 BLAKE2B 04ab29f7753a0d48324d8d4f82a5ac1ef2ad6c3ff6fc0b56d49f2a2fd10632d4c86c636dfe8706342bc770fb5ab0007f460a2f4d95af041c56b0e36ec08903ac SHA512 5c96b385acca7929545a25b7d0682e50cbc2ccdbe34bc5662dc8b0d0a868e02b90a82d8efaccfc1d35fe15ec6a7b7cbb6c9e0bf5b31467db519c5f7ec1fd748a
 MISC metadata.xml 299 BLAKE2B 45af58b9f27f8329d072008a1089edae34741b855b1626cc56eb97efef684b316ce5573308ef1e73d4aa7e1cde74b0c10d5d7becee71707f5b3439f451a433ea SHA512 cd21089fbc56a2608734a5821826da373a5112e1676bf3c3481320236f5583ff1240e118e0021130625826c76cb426ca681e0dec3c6e4d2df22f8967da15321d
diff --git a/app-text/htmltidy/htmltidy-20090325-r2.ebuild b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
index 810cfcf24a55..abb1985534cf 100644
--- a/app-text/htmltidy/htmltidy-20090325-r2.ebuild
+++ b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2
 
 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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="debug doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index 5909c47fe1d7..122271c07f06 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -2,5 +2,5 @@ AUX hunspell-1.7.0-CVE-2019-16707.patch 811 BLAKE2B 5adc2e6009a0381bbe6ea10a64fb
 AUX hunspell-1.7.0-renameexes.patch 6399 BLAKE2B d852305da0dc0330e293a028a1e178d7887a3567a35bc6feebe48e7a4bf205103155ec31b5a483a1002c505ae89bdf47ae80c1b6ccd866eb62cc7e6851c1a1b9 SHA512 3703b49728e8ce92637a602478995d38deb64c1b3281a06447f66c352ca0e2adb7d8aa9167debd9cb15e4009ee4efeb7618065bf16dda47155245c0266d97eaa
 AUX hunspell-1.7.0-tinfo.patch 1719 BLAKE2B 1b612edd63dc04fe57a27fc94937b1cabcb32c4158009c3444d43f506d19b94d0aa79d746ba409ec429d467e29619cd32894e935b8f8c0deda7f0ed2600841c6 SHA512 297f337895f805c9ce27ae63f424c88e8f153fb8f6724aedc11dd564acee6264b8eba01b09f43d75585d6d5bf3eb245db69b3da00c349c3c1c0d04a5a99b1b48
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
-EBUILD hunspell-1.7.0-r2.ebuild 2320 BLAKE2B bc7b4f92f384d038fe285081abf7bf1cc5843c06e404bb7683454efb4990c89b363531d66d256dcf5df39ca83db0cd05ba450f9e693f66fadbd40d0637930b09 SHA512 f4e959a98b002aeccec5b0fe8dc08b6829f439c8fdd457d911a13cef96755d655eb7d5d3cf980ecf048eb70119218eeb56bdde94a1a54ffedd962669d7c062bb
+EBUILD hunspell-1.7.0-r2.ebuild 2309 BLAKE2B e7c468c928af4d5725068bd3aff75e21fe66ec6faca85d3426bed959ece9c929d1c067fe819f7266b378475b9683e582fb8e5ee87c35a4385bc1a194bc0ebad3 SHA512 9b497025439fd7b94abc65255e501c485af1e7a8f356b44524bdc77e16d7583fa50a017d674be87dc56dda678a08df961dcfea436f2d376bd2253b746e158b49
 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/hunspell-1.7.0-r2.ebuild b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
index 8d9db7372eea..cc1274d78f52 100644
--- a/app-text/hunspell/hunspell-1.7.0-r2.ebuild
+++ b/app-text/hunspell/hunspell-1.7.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/hunspell/hunspell/archive/v${PV}.tar.gz -> ${P}.tar.
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 SLOT="0/$(ver_cut 1-2)"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv 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 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 83fb6efe7b1e..866602f2298b 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 2635 BLAKE2B acf990830c852e3d3dfe4250aaa519d8bb967d28a1d1cfe0f2de41fdb826bf1d1e44e15373f892960a62be9dcb42838ba3358fab564296f6949cb4e03a71e46f SHA512 4482a80564c918a41ebf78c7a155e01b13543284b609af6e9cc4a8f15322e5182ecf25ead2e6ece6187bb66a38320b03c447cb7442d3b05fd3cdc5576ee61530
-EBUILD iso-codes-4.5.0.ebuild 2648 BLAKE2B 9bc6ffac0709af5b016d96bad98cf91b8418be861fbeec683a295f7aecb6d5c49811fdeac101ac7bfddcc1dc7d23b0cb7687b3d1d347b9bf14db7a15e2cf82c8 SHA512 e3259be91478ff1632ebb8863223dc68553f8691cdb6ba0903310300a83228d9103c2a022cbc6fd34f3f8ce76670e0be9829177eff9ab5196a16425698c93fe1
+EBUILD iso-codes-4.4.ebuild 2624 BLAKE2B cb58cacb146de31b8a9f2ad10ab240b093b36cea1ba7fe4a9ecb44ee11adbb0fa5cce3e8ac0b46699e28ab9b4f6810dd1dc63e319027faadbb032d641fd0b7e6 SHA512 b7fef33789b0a8c19aaf47a59c751473ca2d6c69a7eec3b09ac862f2c18e5f8860a3de89e5357a2675be1d23689f98891b8bf1df373b013fd8b727e57ae54e8e
+EBUILD iso-codes-4.5.0.ebuild 2637 BLAKE2B 8ff2a0dce35878ce71e686bec7d876f7302e0574fe711e206dd4f906e3b1a213f31f684094bf8eb33209291b4a38ec2f04622c70fd07f4923a265a56c97f575b SHA512 4f15c360fc33d8d0b6cb2a4ab9f1c27b37f851fb4fa820ee014e083f290869bf5bd0d2622f88302ccc391cdcd8f05f250448672a3901df94b1ea815646cb2ef4
 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 2c7d6d871825..7ad61f03a952 100644
--- a/app-text/iso-codes/iso-codes-4.4.ebuild
+++ b/app-text/iso-codes/iso-codes-4.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://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-solaris"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/iso-codes/iso-codes-4.5.0.ebuild b/app-text/iso-codes/iso-codes-4.5.0.ebuild
index fea8d4f45fa0..fbd7f1ef2bd0 100644
--- a/app-text/iso-codes/iso-codes-4.5.0.ebuild
+++ b/app-text/iso-codes/iso-codes-4.5.0.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://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-solaris"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index ec9a7c73fe56..ac282af098e5 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 864 BLAKE2B 8b8ea9ead6ba95887a8ef22b1af6fcbc8e78bd45dbc8ca28844e4c05728e273a8ccf8af3e88bc2eebae113768d1fdf46fa7eb49f95c9e9aad618dda4ae68ac45 SHA512 299a7a6027e551e690350ffca529ccd8c92c54128bdd9afe474a05c4c25559644e1e7db0313695e4060464ea9aee22d37c206f8525807db1062d30e6902bd520
-EBUILD lcdf-typetools-2.108.ebuild 870 BLAKE2B dc9521fe2510e84e01410a8e0f9b1ab67f6f2b991bb85eb28c822f7dc3cad20c00833c6ccc2385b9a2ab21bf6b9e7115116c9325cd35ced95ca2025c878114cf SHA512 012fd232f0a36178e410ff311b6fb75a522f2dcea6ae4d97a06123a944422c09945fd01722da51f22c271176554fd8616093fd22fdcac48666c668ab5007cfd1
+EBUILD lcdf-typetools-2.106.ebuild 853 BLAKE2B acb7103b146925009b3e9b0d48cc3c28b47cec11cbc1a95769c79e908934d7f3755697dae11cbedd169a34e25f54b937009af6bed6eaaded1aca9da156399910 SHA512 d85c7af83d30ac65b2aee65fcf057e950a41e62bcd4e73f7b2b1cba1044c678232b8db3b616438af97cb1563627bdd2f10f361567e3da42a35a3b9dcbd550d70
+EBUILD lcdf-typetools-2.108.ebuild 859 BLAKE2B 5bef7e0d7cba6432f90026502ad1bf9b599cc926e6682d71d05e4eda9486437ae38340f4f9882e1a3fc8402d1314599e42843929ba3c6ca1eebf884429b882ad SHA512 13250fcc28d710c2b8462d3918bf1e2b4e12ced6ac46e11c25a6ed7b673244f4281f2302a5717735cbbdeab505c3a44c5fe4b480b38c9e4d189383db97717d52
 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 77899d23e7c4..dc9d70eebb0d 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.106.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=5
@@ -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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="+kpathsea"
diff --git a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild b/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
index 54e4b30c16d1..ea6d68087c1a 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.108.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.108.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=5
@@ -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 ~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 a690336d50bf..d0cdc6b91948 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 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
+EBUILD lesspipe-1.83-r1.ebuild 1063 BLAKE2B a3bce9fa46ddeb453cab46d0b0db9d24069dbf365546fb039ec8adbea85945e22a4e380e162552151d6fec19203a7333c3d1299f35d6f59211ff64087e6d238e SHA512 be2b04bce7919507d8a62ec04623651f836470879295d65d79a5f98509a71f3e8ca29317cfe569389957ba3aceac7837ea68538275c73ea9cfd66da1721ffe5f
+EBUILD lesspipe-1.83.ebuild 1076 BLAKE2B 43e138721dbb29c653aaf5a0fb1ec65565f065eb6026056755a961ea0b7d7692f9957eb395120894c11453355daad1ad904e14f26bf41da125238bcac0b8eb75 SHA512 15a08ab8ffd2b0b111494b74a960f65bc7bac8dafd12d9017d69f42933ce34c766e9448ff85a469d65ee40c16c3b5bb2cc1b6db4385d491c71d2839f129eefb4
+EBUILD lesspipe-1.84.ebuild 1072 BLAKE2B 1b362a414ff398ec0d1e965cc6954aca215c43bdcfd5fdf360ab051989e3eb1694f38c96ba97cc252e113f0c65a144ca163e17cf1ec7d1cc09470cd3dc8808d7 SHA512 2ce9cf72e190a9456d3b593ae69af134595646e4120a551fa8713918e7f1917f9151ade81e7a68f70a84e21ccb78c000b55535fc61246733b17a31e0ac5fd27f
+EBUILD lesspipe-1.85.ebuild 1072 BLAKE2B 1b362a414ff398ec0d1e965cc6954aca215c43bdcfd5fdf360ab051989e3eb1694f38c96ba97cc252e113f0c65a144ca163e17cf1ec7d1cc09470cd3dc8808d7 SHA512 2ce9cf72e190a9456d3b593ae69af134595646e4120a551fa8713918e7f1917f9151ade81e7a68f70a84e21ccb78c000b55535fc61246733b17a31e0ac5fd27f
 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 176bb5dc9d8c..35049dffb23f 100644
--- a/app-text/lesspipe/lesspipe-1.83-r1.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 4165c991b5ec..6f0b97d1b104 100644
--- a/app-text/lesspipe/lesspipe-1.83.ebuild
+++ b/app-text/lesspipe/lesspipe-1.83.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="5"
@@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 e9496f63a8cc..6629361ef00b 100644
--- a/app-text/lesspipe/lesspipe-1.84.ebuild
+++ b/app-text/lesspipe/lesspipe-1.84.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"
@@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-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 e9496f63a8cc..6629361ef00b 100644
--- a/app-text/lesspipe/lesspipe-1.85.ebuild
+++ b/app-text/lesspipe/lesspipe-1.85.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"
@@ -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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 80341b06cdf7..c8817ba17f52 100644
--- a/app-text/libpaper/Manifest
+++ b/app-text/libpaper/Manifest
@@ -1,5 +1,5 @@
 DIST libpaper_1.1.24+nmu5.tar.gz 49032 BLAKE2B 27a684dc02d5d25c84a92161e7178d1f369444d50c316e7303579a2f8ede8590d4a19637b7066fcc8909f7942fa965d8421d468b28e99b8e963f4b2b170f2ab3 SHA512 4d20d454dd7d09dd7e84b9ccc3b0ff8d65d95e0ae3874ec41462f812882e7ead032310396801a47a32bfff112c4a9adaf2d8d3e6235a1fa6fbb853196a363c56
 DIST libpaper_1.1.28.tar.gz 42356 BLAKE2B 48c4a28c6ff01bd91e257b6b306e787e5c6112052cff09bdb501d1cc4ddd10964c3588942098a6092d5a44391dfb22e10d5147d4c5012497f473473129ff7422 SHA512 3bf6ebb0af89931d2f72ea4a09a7fa958b2facda5f238983ec7bac39652e08614b33f0de3af74a03457b2a4203eee4950bf18a4b726e79aa64093ace6a1fb0bc
-EBUILD libpaper-1.1.24_p5.ebuild 1209 BLAKE2B b5bc822e318b691585d7251ce235bf6dd54e160898d1999ec4c18d1d73300f55836075be87fc9b2ba2142ed1349229e603ee788d0a61ed542af807e31fa633eb SHA512 5f8b53eddbec4c1d145602228d210c4ce931731005f699bea68825a57180e4a011dadbe19c85ab18cb379a7c23b4f785022c0b1f5eb98f88094429f484c11baa
-EBUILD libpaper-1.1.28.ebuild 1160 BLAKE2B 4562c4cbcc74029949fb8213ee0366b1c37934d54eec1c7012c6d2eb7ff925eb6e8e35554908ccf264db269676092ace312432745b0911047de1b9e3d386ff55 SHA512 4cabc5e88432dfbbc20c7e48cdd61579f2663877fb470636e42f507b9b0c335287af5e39c2768cc2580ab11ddc80278a618da90222e72cf248e31aba68277e44
+EBUILD libpaper-1.1.24_p5.ebuild 1198 BLAKE2B c87cb19e0c116e8bbf45fb2073978fa74b657da6d10265ddf0474c68dc42c2b99185ba6875f2393b79811a5dbfc30624af11826c4d36ecec9d8a07a473cbced4 SHA512 8c95be4e8c74f98e3d35b25c146f5c283afd562cbe3e69d2803feec5d0e0d5e549e2ea69f742e426aaa2bd05295143776754a8d9cbb2a17cbfa287e12a79a159
+EBUILD libpaper-1.1.28.ebuild 1149 BLAKE2B 82fb96c254f7c440f27bd5a8792764df0edc50366832a465002866b3156726d8423c530af196d10933290656f2fe3c5507c2b9c16022a59d0cc25a6e40e5baa2 SHA512 e4a5e79d3203017e6af6ae21674dd8fcd03bd0c4d287174060773d603fdf0175b21ebea2057332bc1cbbb8a73c9bee54e209f7f2dfbf2291616a507a753924c9
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/libpaper/libpaper-1.1.24_p5.ebuild b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
index 565c9d02f404..82f55efb16ed 100644
--- a/app-text/libpaper/libpaper-1.1.24_p5.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24_p5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/libpaper/libpaper-1.1.28.ebuild b/app-text/libpaper/libpaper-1.1.28.ebuild
index e1a02fadbc34..cabd7abd8f93 100644
--- a/app-text/libpaper/libpaper-1.1.28.ebuild
+++ b/app-text/libpaper/libpaper-1.1.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${P/-/_}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( README ChangeLog debian/changelog )
 
diff --git a/app-text/mandoc/Manifest b/app-text/mandoc/Manifest
index 5d413b536796..23eccdee0a75 100644
--- a/app-text/mandoc/Manifest
+++ b/app-text/mandoc/Manifest
@@ -1,6 +1,7 @@
+AUX mandoc-1.14.5-gcc10.patch 1304 BLAKE2B d7f5c74cc4fc0da250eff19dc54c541bc1fe974f902242a17a3f287a1c83cc5afbfeb9de56269445bb99ce58fbd6b37a20efa7642f465df3726f78d267d2ddbe SHA512 3114fd538a235c9f558ab1b1e94b322b98216fc20f04ccba3999fcee453a1cc30d00d97f5011c10f9c0e8a1299151a654c7d5cfbef4136ebde301a72542cedea
 AUX mandoc-1.14.5-r1-www-install.patch 637 BLAKE2B 2550351e29db19b43de500f039f0563af8a720ef3bf7efa60ac715ca956d7dd0d13d0e092ae2749e3a76fc456eacf0260ca6fc03d324e08bf287bd8d4ac56dbf SHA512 5ed589e1322a2bbd261eb56aee8376526b80cf72eb5eafbc6e2772018c924913db0fb27eb7a50ec2509640e03e41d11e88401f76293d1d4230e777e39056c9fe
 AUX mandoc.cron-r0 87 BLAKE2B 2fb4946dd2a9025f5bee78e61c11d77d6c6b9b32f9d17c11ea4f0d890e54b42817981e1cd4c568229927fd04bd0592e53ce18192f8359dded28be8c8690904f6 SHA512 74bdb16bc498d741128f1b6966afec8e21eb6899e26d20cf57cb0408ae6bdc63d75538dd355a21ae55593c359fbe707a56bbcdf6e78d557d4b53570db56fd6b3
 DIST mandoc-1.14.5.tar.gz 651846 BLAKE2B 27aaf97e7226e989b33861d2a255304bb64a7cd43ca026568f4b044035241c3315a0d73673b023d9ca5b80575b8c584889832bbd86b80aaa49bb785b37559367 SHA512 848f290847f3095757f25647e6d73eb7044018b145bf6f9dc8b5db164b1421911efdc5b3b9022ec3a2c5af9687a84d5acedee810f2bd2f7caaa9242dadb2cc52
-EBUILD mandoc-1.14.5-r1.ebuild 2792 BLAKE2B ef7c7d491b369dd2071f8dcb0a532d2968182db8f21911c63d45e4a39b39a52cb573770ebee587ea376f171ea2419db110034aaab032f510656db59bff79f38d SHA512 9972596dd9afb8910c6d5bf9ff87f8ee61761cbda119270d1f148a5c0ea126e69e9a500a6aba223638d1949efe1a2e273b66d0bf618b509c65abd85266dae917
+EBUILD mandoc-1.14.5-r1.ebuild 2954 BLAKE2B eb4b9ffbe134ea11c1fac9fce45e8f84d7cad63a0ff803b4d1fdd0cb6287a732c2c29f1114be40eb4b031d90035858edb79fd83e170b6e9de1c34e6fe7a03d96 SHA512 5f1edd81227c09a9eab1f348f1e34bbd8b23e7e5c710af31667a9cbc94943965f5411aea9594ce611b08487b4137f5627452c45ad8668b33b73f2a1d56765b87
 EBUILD mandoc-1.14.5.ebuild 1727 BLAKE2B fbdad7247703bcea768dd034b2169f5183cf7ca644dad09335428356d83935d3ab4db2449d18e9c44d23b76c2d5fcfbdda4f6c09ec4bb5b81e8ca2732fdc65f6 SHA512 92be1ad119597580062788095aafb9fc951f8c55d1c368cc412b7afcff32476b01aa103f6f067c326d8a459b97e6071c8c79af8ef51482d5205fa27a743b1f42
 MISC metadata.xml 375 BLAKE2B 6b3565c3419b306f33ce9ad867319cee386b20c92743fe1a6565a348aca03d13133906d07f5aa10ec145d84645fa11894ad8abd73a6f65d5d0680ce03ef339d5 SHA512 1814f8bf92ec3500aba2e6a194a8a1b0e7adf53de5ac5408ef22fa42845b9c7270a27eea0061d77b5b53ea7cf77e9bfc75c865dc1d6fb661a5bb8412fb9cda3e
diff --git a/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch b/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch
new file mode 100644
index 000000000000..6d976683772c
--- /dev/null
+++ b/app-text/mandoc/files/mandoc-1.14.5-gcc10.patch
@@ -0,0 +1,54 @@
+https://cvsweb.bsd.lv/mandoc/compat_reallocarray.c.diff?r1=1.4&r2=1.5
+https://cvsweb.bsd.lv/mandoc/compat_getline.c.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
+
+https://bugs.gentoo.org/707254
+--- mandoc/compat_reallocarray.c	2014/12/11 09:05:01	1.4
++++ mandoc/compat_reallocarray.c	2020/06/15 01:37:15	1.5
+@@ -1,8 +1,0 @@
+-#include "config.h"
+-
+-#if HAVE_REALLOCARRAY
+-
+-int dummy;
+-
+-#else
+-
+@@ -23,6 +15,7 @@ int dummy;
+  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
++#include "config.h"
+ 
+ #include <sys/types.h>
+ #include <errno.h>
+@@ -45,5 +38,3 @@ reallocarray(void *optr, size_t nmemb, size_t size)
+ 	}
+ 	return realloc(optr, size * nmemb);
+ }
+-
+-#endif /*!HAVE_REALLOCARRAY*/
+--- mandoc/compat_getline.c	2015/11/07 20:52:52	1.1
++++ mandoc/compat_getline.c	2020/06/15 01:37:14	1.2
+@@ -1,8 +1,0 @@
+-#include "config.h"
+-
+-#if HAVE_GETLINE
+-
+-int dummy;
+-
+-#else
+-
+@@ -22,6 +14,7 @@ int dummy;
+  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
++#include "config.h"
+ 
+ #include <sys/types.h>
+ #include <errno.h>
+@@ -64,5 +57,3 @@ getline(char **buf, size_t *bufsz, FILE *fp)
+ 			return pos;
+ 	}
+ }
+-
+-#endif
diff --git a/app-text/mandoc/mandoc-1.14.5-r1.ebuild b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
index c6058c164364..e23baa856a58 100644
--- a/app-text/mandoc/mandoc-1.14.5-r1.ebuild
+++ b/app-text/mandoc/mandoc-1.14.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://mdocml.bsd.lv/snapshots/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="cgi system-man"
 
 RDEPEND="sys-libs/zlib
@@ -24,7 +24,10 @@ BDEPEND="
 	cgi? ( app-text/highlight )
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-1.14.5-r1-www-install.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.14.5-r1-www-install.patch
+	"${FILESDIR}"/${PN}-1.14.5-gcc10.patch
+)
 
 pkg_pretend() {
 	if use system-man ; then
@@ -93,6 +96,10 @@ src_prepare() {
 	if [[ -n "${MANDOC_CGI_H}" ]]; then
 		cp "${MANDOC_CGI_H}" cgi.h || die
 	fi
+
+	# ./configure does not propagate all configure.local
+	# settings to Makefile.local settings.
+	tc-export AR
 }
 
 src_compile() {
diff --git a/app-text/multitail/Manifest b/app-text/multitail/Manifest
index 625b2ba506c8..43e4159816a3 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 1316 BLAKE2B a791eddcdc501d050773c76a1ff83781546f7d0e5a563a2a7a7ce3bb8f09e6366151660d87ff1055e1e60b409abc1c2d7bd28bc628dd642f70ed52e937658047 SHA512 978ab556dcf9a7bb59875945d577600d68d8154f3a1d79eb90d2b2e9ef33178b97f3d56cf7ae86f1a98d22b24172f33521991ced2dee5cd7f5f7d8f3f2c2caf3
-MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
+MISC metadata.xml 346 BLAKE2B 664f02453aee33a2c256dd6bc38117edb07ebd971f2b3caff2042c905bd0eaf0b9b58374c448c6f81d345303f7eb449ca7637dc21728cb8be3464a30da7cd179 SHA512 0e40da217b3ad26c858f6d8b995300a903fa77eda44927c710881bf7968d4033dfc82ef1c775c76de3ee08fd7de067882253d848b51373b0ac25d6e33e02220e
diff --git a/app-text/multitail/metadata.xml b/app-text/multitail/metadata.xml
index 3cf14bf74636..8f762a00e909 100644
--- a/app-text/multitail/metadata.xml
+++ b/app-text/multitail/metadata.xml
@@ -5,4 +5,7 @@
 		<email>shell-tools@gentoo.org</email>
 		<name>Gentoo Shell Tools Project</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">flok99/multitail</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index a44175b47477..06af22136398 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -10,6 +10,6 @@ AUX mupdf-1.18.0-fix-oob-in-pdf-layer.c 3462 BLAKE2B 861f5d6d0f81aed837d19ed19ba
 AUX mupdf-1.18.0-fix-oob-in-pixmap.c 1123 BLAKE2B d49194b540b489ad9d3a4b5057bbe6ac3a1414d0123b7c2d4710adad1ed7fd439f8e83162d07a86aee6bd778c35ea6798da166461ac6e358af6910cc6b492624 SHA512 1d836c1a3f37c21ed349da799d5cb0c57d3fc275a632a42343cda81aae76394273c06230fc9c22a6d5366498b51a057d5a11797376a4b2af96b937618ba31e11
 DIST mupdf-1.17.0-source.tar.xz 48559964 BLAKE2B f46b09a6d288054da79bea356df4d7d98fe2759cf82bea1f0df2e961b94acebbab58826f7a731c4c68e8b086fd9367fddcabea6c7d2838f25ed84ddc1a0c2bd9 SHA512 39188e6ce3eaefb525b2c32767c4bf52ed881b41889edef086aa64bfe1c38e6f3cb853450c8284d175ef8854f32e9bc67415a692048ead26cf31c35645f9e0e5
 DIST mupdf-1.18.0-source.tar.xz 53621544 BLAKE2B d0057f4240bd4f6b4b6d9381ae1c3871c56b97604d5c6ea6438a8bde72d4696c10a9f0e8e2ed8f43d63a04bb1d973bade8a708327c00b0d0c6802b28af697a55 SHA512 7551f18b9bac6e2dc1cf073741cbc975ce3a16dc7e37c9d5a58254c67bf2c07bb36185d6585e435d4126f3ae351f67d7432d19a986c9b47b15105ca43db0edb8
-EBUILD mupdf-1.17.0.ebuild 4380 BLAKE2B 3c75b04d913c07617c738c1fdb6b87a6ab762f5fbf51cf723c8e485516b6de55aabd42857d9f84bc7131f8fac360df9cba112d0e5e40314f4624fdfb5d2ec7f1 SHA512 ae5b7d2b3374cdef700b65669fe3179b63e343a319e1f3c0ca1e624dcf8eca0819d8ec82d33ab348cd2e5d051a94b686e4f2dc3e4f9ad32a09b9a15cd966ff28
+EBUILD mupdf-1.17.0.ebuild 4369 BLAKE2B c4adf900b26b5a9cae62d270afbc7a574e15a8163aa7408a8b6af6d5f6ac1f64ae53a1d681f82015a5e095ef7b18f15097a99a74da9df6eb282000cf3609dcc4 SHA512 ea083a9a8d1f50e07fa0e2787a75aeede44a912e1de3297c2e0c9553faa6df526cb13e0d161a2e89d00c774a691802f44edf065375a7de552610053f16640653
 EBUILD mupdf-1.18.0-r2.ebuild 4122 BLAKE2B e8bf328f63f9b469a4e1a561ef97c029252fa69776ebbc0a4677ad6668757ee26c083842e78cac6807c86932b04437ed025b5e6a82b4492c6f898a04bf7dea3f SHA512 537ce8ff3f792ce0eca92f7a209d1984158b44f7ad214fa7d941a80ff19288b4ffce80e5a83508bff156aa287f100a8304c504d60a4831284fba7f46320520c3
 MISC metadata.xml 345 BLAKE2B 6adf08490e4a701eeb6ab07c2e5619cff42ff02bf75ec38fd94f215f000972f0b3d88c8b0fab827728dd12d7906dd580b7650f11da1d77964eb5fddd773ee4a9 SHA512 32902c1fac57a44927a53dbb52fb22cb04317bcdf3dd2ae8e9863bef557178e33565bb122e128908c61ade9a5e2d1f067c530ff05e7ed0242eccf193e6fa2026
diff --git a/app-text/mupdf/mupdf-1.17.0.ebuild b/app-text/mupdf/mupdf-1.17.0.ebuild
index f195aa318853..7841103a97a2 100644
--- a/app-text/mupdf/mupdf-1.17.0.ebuild
+++ b/app-text/mupdf/mupdf-1.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ S="${WORKDIR}/${P}-source"
 
 LICENSE="AGPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="X +javascript libressl opengl ssl static-libs"
 
 # Although we use the bundled, patched version of freeglut in mupdf (because of
diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest
index 292e25fd886d..f5b59e620e77 100644
--- a/app-text/odt2txt/Manifest
+++ b/app-text/odt2txt/Manifest
@@ -1,4 +1,4 @@
 AUX odt2txt-0.5-darwin_iconv.patch 366 BLAKE2B 37fa3b5710de1df1760960ffc4b4e00773464bcb63408f3bc03968ad4e758420f508165f6d450bc25bb034f85317dd3a001e13d3694fa9fa3ad77606579c9d20 SHA512 0341c6d4d06b96766e35f55358f26ed52d8eb456f853cd83b098fb3e2adae690bc47090dfd8a1a66f9d24c77586a9fb7151cbe9695dcbdc3f9eef8f5d81b5762
 DIST odt2txt-0.5.tar.gz 24460 BLAKE2B 703dd48447aa38a9a8bc0989231adf6f3dcf2796cb730feef6649cd14bff0265b12d6dba258a2779911f908a8ec322c5543b43222676e78ff12246daa3753b40 SHA512 95d782a088908518191dd0dcd294676fff25c95a2f23a2b8577b8e3adcce2f9d6d5ccaa2a02c7d36be19d05687a4d7a43bed36056c044af0934af810363c7ce0
-EBUILD odt2txt-0.5.ebuild 733 BLAKE2B 5376feae769c364f9176d4a70a2d6d946206dd98bb86d1a0362c941a7f374b8f7d5da67ebbcae3c8662b98d1b2bbdebffe5aa3eb4e1b6808ce08158e5da788c6 SHA512 ffdfcca2ffaf7a2cea9b6cbff24cc455e73e6a61f330cc10c8bcb3515506cf5c0bfbb60f4f565fbae1097b33579693c54228f6663d4f3ef85350140712ec16cd
+EBUILD odt2txt-0.5.ebuild 722 BLAKE2B c9ef4fc3458743347fbb27854631da0162f53fc6dbdb82c0303333410f7398fda6c512f189c96e77f8ae8ef5ea040490ebfe1a1ada87e1fa38af8175be40ca1e SHA512 ed87b89753904440345aeb27031d222f827940d72331d1016bc2e7163fc9da6e8c56af283d93e287b64ff698e9e3764da8d8660250c346aec6f4c6f3ec6798bc
 MISC metadata.xml 167 BLAKE2B ee34aa7c86910531f97e3ba5ec71670012761b3523ddf4e0e1fccb2134b6ddaabdc9329c3b45d697b4f745a707dd513f6b71a8cd32fb840a6b0b5af774ac0015 SHA512 bb251ebe24a6b0c9ff8ee0298e1aa3653443fc97bf44ff71ff56b88b82c36696a5db75c19cb345a1852e6a455874c603efff97b15799d7e8a224124a312df8b8
diff --git a/app-text/odt2txt/odt2txt-0.5.ebuild b/app-text/odt2txt/odt2txt-0.5.ebuild
index d98a0992c75b..16e68da6d7d7 100644
--- a/app-text/odt2txt/odt2txt-0.5.ebuild
+++ b/app-text/odt2txt/odt2txt-0.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dstosberg/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc64 ~sparc x86 ~x86-macos"
+KEYWORDS="~alpha amd64 ~ia64 ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index bd20be382d66..2372e73cb7a8 100644
--- a/app-text/openjade/Manifest
+++ b/app-text/openjade/Manifest
@@ -10,5 +10,5 @@ AUX openjade-1.3.2-respect-ldflags.patch 500 BLAKE2B 65c8a9a71b7141e6fa8d47220e4
 AUX openjade-1.3.2-wchar_t-uint.patch 496 BLAKE2B 0576cdd89a5d9c187eba41f740662d2d5e9ba5414ab931583f1e791ceae948e381e558f8337399e6b853573388041288d0f42d7c45e1f34befb8d65bfa8b03b7 SHA512 e483c08b6ea63e78dfc6351670f7bb6a55927f458c6e922c542981b25389168f32eb79e16554a41c102b19b7fa12489c0303beb35b839dfc9767b5ab9e5e1027
 AUX openjade-1.3.2.dsssl-catalog 269 BLAKE2B 1faaba3f7b351d312c3499005d9b3d71186b8e1cdd8f2144c8b91f384cf8e2e70763bbc929beba64be019b430ef8166d726688f4d1ddeaf5f9aa05b301fae60f SHA512 fba4332fb995c05ae9f9a83cea5422c11ae37ec99b4e37f40edf11acd5be011cff9c7d3b0fcfd0bf2f9569bbe991374678811301ca07a7ef033556309012e340
 DIST openjade-1.3.2.tar.gz 894834 BLAKE2B 972251c63d27f86fa3e1a0760e05213dbac440e7222c81c67dfa6a5c216922ef575705bb7a6093306d6aab771b8a9e1335fb0aaca4b893de5a4d792dc0b55da9 SHA512 c39f70ec8020bd7a2b3e125cbd146b49ddb57910a042bd212da02722617ed5681f32dab60acc26ab89ac658997c6f604911d7be3be391d6278267481f3bcf2f1
-EBUILD openjade-1.3.2-r9.ebuild 4331 BLAKE2B bac4ba1103b1d8b8a7ea1883e377c4553b37e88019522c704389409d4130d3537cddae2ebf107815b6b32f51eca8c74dc16dd06b4ca7fbd26c267e13af4d46eb SHA512 b4b97035d7e8590c405d5cc0c7935241b597b0dcd658c549ad94362787a082e0d14f6d6bdd1457dc66efd72f6f272ba1cc723b580c5b14fb0cb322bc3fc49972
+EBUILD openjade-1.3.2-r9.ebuild 4320 BLAKE2B be2066693ee8d272002d079206af78115987064aa470998915203bf67c9002d29146015930f069206cc50eac180e5314779c7e097b19b0b178dc352f12f57caf SHA512 f73682d2f7047b76aa391b0cd63690f88ccd8a1e9b511b002d8273ed4554fc534ed942d22820c634889727b2d9220a3214911428754b0c8565c6919457661cf5
 MISC metadata.xml 325 BLAKE2B 3cecdaaecd44faf19571367fbe80cb75e687e6231c26c696cc9e7412aae427b95a4967cad7415b9df5e499bdb74c6b6fed54edc52470ff207cbba43e423ae223 SHA512 4e1e28e8c1722c9bcbbc2a8487ad373eff6679f51a5213850e11ce2d7d569afbaa093d215965e4fc010a9fa3e80121949a3db9fb98bfaf8ab70eafead9e14657
diff --git a/app-text/openjade/openjade-1.3.2-r9.ebuild b/app-text/openjade/openjade-1.3.2-r9.ebuild
index f2180c35eb9f..de8ea2dace28 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.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
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/openpaperwork-core/Manifest b/app-text/openpaperwork-core/Manifest
index fb9526d4eeba..522ef976cefc 100644
--- a/app-text/openpaperwork-core/Manifest
+++ b/app-text/openpaperwork-core/Manifest
@@ -1,3 +1,5 @@
 DIST openpaperwork-core-2.0.1.tar.gz 62459 BLAKE2B 8b513b7ff79f3e81018b306d69a3f71ab6a132b57495f19b013ef4f364c1c4782a5b9ce05b3410be588c1b859b413b13ef8e990094e217d300fd70b36b93974c SHA512 cf048afe1052a6a63eade9944330f9c1c20c89e9c94da58f31562f1eea9286fc96b74af8bc32a010a37369463cfffd1847a407940dfede4dee9b16504beb2d88
+DIST openpaperwork-core-2.0.2.tar.gz 67268 BLAKE2B 85fcd8d4e1c8a054267b28eb5ec826617e13f93bf7cd54d6defffd62be65fb0306a0ae4fadb1cc8e875c23933c3559e41aab46b58a333489fed0174776ede597 SHA512 fb47d1d8b7747274a6b60248180786f4142110feffa1a8f886b0486a1e1cefbe11d06e3ec1f3a3ee33e38cd40d8e7460afefb466ee938e847deb2518d642ed00
 EBUILD openpaperwork-core-2.0.1.ebuild 493 BLAKE2B 97d09b4ff1d947dadda6c58ef88592224c7fbd0e43621ba01c6b341ca9adf910181b50c567176d9a095f235c56654a6e3f12e41e14842aae36933c94f989b404 SHA512 aa3e1acebda6d1b1c195647441d3235f0e29eadd5f3d103c6503eb46b2280b64a75b652eaf1513beda09ff1b7d96cce6c15cfd14defda0685cbf5a7b58f402e5
+EBUILD openpaperwork-core-2.0.2.ebuild 493 BLAKE2B 365495899dfd085158227ec1d92dd930d9f172b7dd0038d7c55a656cd65d9a4a712a65010decc41476d1e61f366ab5536b55436af3a64907268b5896dd242f1e SHA512 625cb7b637a6f114386c0fd9e57fccf44b71fd6014a39a265d1a54c76dfb65b8b5813aeafb4036249b8e5e618711e7651e1a24378e46c190186e540d435c9601
 MISC metadata.xml 343 BLAKE2B 3b3ef7b9f3c0aff87d5f7f743a17d16a160ce7e03a21ad0f9e61127e591e0dce9a2a9b9483e04ad56779c7c848c5ffcf1f62ba06edd6780b9263fe066ecf6b65 SHA512 8c2967efd1bb4b024bc97b76fb4e3b92a01b08c82e12b5f86015eeadba7a22d5ceea1c9219d7517f79469308afd62e2cae20930931d918afb3b45dfc6400f8ef
diff --git a/app-text/openpaperwork-core/openpaperwork-core-2.0.2.ebuild b/app-text/openpaperwork-core/openpaperwork-core-2.0.2.ebuild
new file mode 100644
index 000000000000..0d9a9fadfbf1
--- /dev/null
+++ b/app-text/openpaperwork-core/openpaperwork-core-2.0.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2021 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
index ea602d657f87..f723038e4c45 100644
--- a/app-text/openpaperwork-gtk/Manifest
+++ b/app-text/openpaperwork-gtk/Manifest
@@ -1,3 +1,5 @@
 DIST openpaperwork-gtk-2.0.1.tar.gz 37716 BLAKE2B ab8e617148c57530d65952846c9bde4848a7b7019f49428dfce419dc3ac46555aeba79c5f6a4b7b8954ab7f5905b0ac4c2cfa5856970b640f53d4c768d737489 SHA512 1b342161f68680d298197bb3681203c251000e50039cc0935e674747ab5ce89950ff59d7afe3f6cad948450921d1b922d110a8607115f30cf53e264400e76f0a
+DIST openpaperwork-gtk-2.0.2.tar.gz 37740 BLAKE2B 40e1570364dd23cda97184211205186dadf7826624c1d8846a7fb31378fdf0ea9aa715c07adbf657eea9b08f4c583d86eb248b8907317b572bea51ac52c9a54b SHA512 c24f19a47f1ea1452f8efcf5cf1e4492f49a4f1c7fa7572f09341f4a8f70c2e9cfea478c32635d4ad998be90a069a55c4fe2a4c0e12a9835b9fa7e6b707494d7
 EBUILD openpaperwork-gtk-2.0.1.ebuild 580 BLAKE2B 7e6ac276db2c7b754709e2b7233118f82403d3f4a8e82d7d7ec4f92fbe6c25026201d67907b4dfe5553374e2630a94e23c491b95753a75950636fab17d3d894d SHA512 6168cfb527264b21a3ccd42d2c0339892b92f262550827a6a8bbaeb9ba825921384b196fdea079c6065d4ce29ec8422a337cd3693f15dae047bd223221ed1a9c
+EBUILD openpaperwork-gtk-2.0.2.ebuild 580 BLAKE2B 330a01a3730544130d4fd303a03f9006b2f5241481771bac67e830d699235719dbe62c70ba64cd572a9f7f7f967fb0d3028f1b99bbbca49693e31f5e83445c00 SHA512 759c6a869b76efcb9eb141c069d56f17ed4bf95a0f7cfa21add21c9b381f25757b892a4ac1b683a12ce102633255af49f3b4b9a40049c21cc5ef44d3cc3fb8fc
 MISC metadata.xml 342 BLAKE2B dba2557bfd27cb470cdb5a6c4cbdb2b444a02b3f9dd28186075075a31613f33c2f308657c6908060a20967c569a5c2c310fd99ef83d2a2762b4df01bffa4258d SHA512 25e1a179c9d45ca0a587fd60bcd77d05b66b20aa001ed0f45c2163b2f224b486ac337af7bcc3cc2aca4c3a236fe0f7984e02fc2089004062182df69ca33ecc07
diff --git a/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.2.ebuild b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.2.ebuild
new file mode 100644
index 000000000000..35e357881cd1
--- /dev/null
+++ b/app-text/openpaperwork-gtk/openpaperwork-gtk-2.0.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 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/opensp/Manifest b/app-text/opensp/Manifest
index 1a19b13ce633..d070799e4a6f 100644
--- a/app-text/opensp/Manifest
+++ b/app-text/opensp/Manifest
@@ -2,6 +2,6 @@ AUX opensp-1.5-gcc34.patch 263 BLAKE2B f881932f2d35c87a13b28608efe853c54e3dd4608
 AUX opensp-1.5.2-c11-using.patch 2626 BLAKE2B 16ff8ba1701831fa0c87e0788f8b420f1d96bf5b2f645d2d6706e82ae1767a99fed8f6ca4bd4f1abbc24bf80c4fa00d848f03056b01ac98f5b8a74d3a78c4467 SHA512 dea5fe17ea2662150b201ab6011bb01ba0f0c07689d267ec4086a914cefef3e91967f8db4be0258bac87d3cd73a9b05eb1f879415860552d9853e66e98e16e11
 AUX opensp-1.5.2-fix-segfault.patch 747 BLAKE2B 544dbb8a638d2fc8fed5c7426e828d1524f4756e6882ac837b4cf3deab4e039a0b66564431b1849d9067f6071955f82b8057cde5168094da70b1419844b000fe SHA512 e0c72df8e8b191c6cecabcac550cc52918bbff7c2fddf8099ff4403de0fe817c1f3f5deb44b4c33e9d135a97a4fd8978c4090f6740c99dbadc6f9b06e24c41cf
 DIST OpenSP-1.5.2.tar.gz 1521390 BLAKE2B 2c6f8dfc721c77ab223aa67e90c8dfb45855b74fdd382ac98303c6fb23af08019ca96b5430bcdb87b9e86fc333114bd8b2e5f243c87f2cf84ee04c880c8c309b SHA512 a7dcc246ba7f58969ecd6d107c7b82dede811e65f375b7aa3e683621f2c6ff3e7dccefdd79098fcadad6cca8bb94c2933c63f4701be2c002f9a56f1bbe6b047e
-EBUILD opensp-1.5.2-r3.ebuild 2007 BLAKE2B b61c7fd843c1f0967ce850ddc669ee1abac553ecdeadaf8d6e21dff8d02d897ad1f3a5b18f0a464583a53315468febadba395bcfdbec9440a27aef967e4fbc5e SHA512 63ac01aa40ae20e851086afa4ce3473573a27d79375350b2b7d96b84e3573318c29a36743e79168513d0b312e774830744d831cbb672660b5cff5f168c23c442
-EBUILD opensp-1.5.2-r6.ebuild 2083 BLAKE2B 0b81f55f210161fa10460b5e1ab53e3ce49b8855ffdc23f7e378090d649134c5e45df0b46f9651eecbd464016d494727dd385be333d8e02922175808075b76f7 SHA512 c7871c02c1fb7fe8c6bd3845c53acfcd5295b755289b5f66f8ea6fb51615b48a3fb90b7a8dfd9da8a6473ccac3af4b35ec4f049f47470553a16d9de9657995d2
+EBUILD opensp-1.5.2-r3.ebuild 1996 BLAKE2B bca31a777164cf72923d05914b2529b11b3b9dd44a2f484b7bfd57c6c5eacafc609aafceefb573e5a6240866c2dd33980c6c9b220e8c868145924088a6bd386c SHA512 b77c93d4e06f1437c0e8ed331b5ea7f8e6c6cbd6b22bd43859752ebf7212882edc2bd53e8097cb246281353066fcf334e5f0aa84e69f848c41f3542b9c4114fe
+EBUILD opensp-1.5.2-r6.ebuild 2072 BLAKE2B 5312a2e895bd5b7335373a2f4d13773957d8a6eed9af8779b585d0661837543a50d4181dfd6c26d663441a52a5712bbf9ac62fe38835b1fa5d53d23346dc7de8 SHA512 873173a1c9df1a947c5dd93b6524c8a425c8f919459e69c78aad0f8901328c7e39979271dc6ee3687167ae98ba06aa69f01887bfb5d48dfa146105623c75684b
 MISC metadata.xml 320 BLAKE2B b93835e4e002171464888c0ad80df13fa041436cd16525da0bac6087af3013b8c43bbcc2a12e6924894ea65ef141c6e739ca38f914af7e83910b85a4f6700547 SHA512 8614ddb85153854eee8f3a61e308a4590b17bd457f1dcc813fdad1f69265a06f4f74295a608538fcee757e147af9b269adf3d0dafc0e613a936e5e605bedacf4
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
index 1cccf2020816..1fb1a96f4000 100644
--- a/app-text/opensp/opensp-1.5.2-r3.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/opensp/opensp-1.5.2-r6.ebuild b/app-text/opensp/opensp-1.5.2-r6.ebuild
index f34b25fcdc5a..7288276a5076 100644
--- a/app-text/opensp/opensp-1.5.2-r6.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r6.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=5
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/openjade/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc elibc_glibc nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/paperwork-backend/Manifest b/app-text/paperwork-backend/Manifest
index 3fa9e95a64d4..866e36c144b6 100644
--- a/app-text/paperwork-backend/Manifest
+++ b/app-text/paperwork-backend/Manifest
@@ -1,6 +1,8 @@
 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
+DIST paperwork-backend-2.0.2.tar.gz 1293642 BLAKE2B 3785f69e941c14c1146ff1c9a5afa149559821f915ff1068b38f94c3fc3fbd591c2144f24070232e885b616eeb88b5dd1a7c86d608d9ad42f6512688db79b1fe SHA512 36261b89078e7ca10ddda3ad03871db34931d8a04f16edd663873a2f7c46b527bd607c27d0f4ff005ed869c16e0b7065992e629e257677b46d5ccb4b9a1dc7b2
 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
+EBUILD paperwork-backend-2.0.2.ebuild 932 BLAKE2B e682c5ca9642b77ec9db4fe0de38822d367a8b1f87b39839fc3e43570b4c67e66ed417b9763b5b029b12cb93f5dd0f055cff7a109cfc28779fed29dae2398503 SHA512 3264031d2e8f655266dbecdbd0f9bdb7c6b478d23245d835206aff803fb7b192a1a8863be9e7d35643c51e101be087cba9167f5eed2dcca8e472661c7e94ca25
 MISC metadata.xml 342 BLAKE2B a73c59727e066a3ffa217b622c58343a42d34351791f6619aa94d1a659b9d43ccbdfc9682901fb074c876a3e66b19403c02657aac3956502f400a93bd73ba6b9 SHA512 5a3a63678f9d83107a83c1bc6e4181544627279e89b3b589fcd2b745221dddb0201779f7b8c3ec1d7b2812a92ec7ad8d290ba58c11860f46f3c5329840bf1730
diff --git a/app-text/paperwork-backend/paperwork-backend-2.0.2.ebuild b/app-text/paperwork-backend/paperwork-backend-2.0.2.ebuild
new file mode 100644
index 000000000000..c4ef89b0740e
--- /dev/null
+++ b/app-text/paperwork-backend/paperwork-backend-2.0.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 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 1210d6279ee1..1e9a60fa4e9d 100644
--- a/app-text/paperwork/Manifest
+++ b/app-text/paperwork/Manifest
@@ -1,5 +1,7 @@
 DIST paperwork-1.3.1.tar.gz 4631298 BLAKE2B 9b111c524da29c6d547141a64ff39a5c50f18375484ae60702a2c7ce57a7be51b62621cf114ffbfa9c2175f9978225525f321449a4a9cad2570cd26dd956e496 SHA512 a0e6a95ebd0b5bfc290b8981488967bb5f2198ac5ec768f824ed487648d0dea6abc3ab8b8cfd8107eac1223a5ecb351a5362d9cbd7d5efccf5cb8c9a318490bc
 DIST paperwork-2.0.1.tar.gz 6224111 BLAKE2B b643548caa306ed3a7ce049694518ee25e102c73968eab9a812d4b088213593d08d262f71510bae61b015f685f0ca38e578c4ec6db0df279f42ba068b450a813 SHA512 bda94421e48a76878c661f201f07cb3d10c932dab3da33cacf229214022ec0ebcfbfef675d12bf62865b11e05d9450057244d5ed6bf4d3073df99823dece6087
+DIST paperwork-2.0.2.tar.gz 6222075 BLAKE2B 6dba798ae2b18ba81891c8f9c29e1e2bc8670f24a65e554aa169f05fbf1a89382b9ea24abaa1784da657ac5b9d9d145ffbadaff86ddc3583023f164ffb40c351 SHA512 bde28c167eac5b134b4bdf0f2ac8d93eca4f99c1881ca0edc105c33674114b3a4e3508a1f45048f45ce1c2f6b690a0f765c1b980dbe42c7e1282172f12c3a853
 EBUILD paperwork-1.3.1.ebuild 951 BLAKE2B 7fd9d8dca8ac034015f8f08d57c5cb59a69f6cb8d787c82286302b578b9da9638245582778d54cd309cbf841e919f2a3ed72b443eaf88103208b7f342106fbdb SHA512 2ac325e5b704ef244178dba5af6ba159b945279c9a1875854e218c6adab5cc13949ae103f73066579334991074de597320caf7f6507a283b401ee6753fa91451
 EBUILD paperwork-2.0.1.ebuild 1028 BLAKE2B 2775344dffc3da82966df3778814facd171e2feaa292a5636a8b0d59454198cc94f774f97f202df41ee2cc7ba598e12766d54d8836e842db6747920cf49e3eca SHA512 65eda3e0c1a5dc7359ac29c9acb2f6d1081bc7790be36efd7b484c2b98b493863d0d8a93791c7acd7b5b26b7033d4532cdba4d57f720144c2aae7f6c95bffb37
+EBUILD paperwork-2.0.2.ebuild 1028 BLAKE2B d478f8a37dc767671483176ba2864a64b8ba31b0e83d12962b9244916a680d4f4876461574c8c15a308b269adfda730e1ee625881c756797e1dd7437d045a62f SHA512 3a78b3db599abc75fa36913ce0474ac6773ffd4fb818fddb0d02bae1fd380cc04c08b803845ea233b31461514244d13c788dbb13d623dfd5d95e553bd4b402ba
 MISC metadata.xml 719 BLAKE2B c97e258d05155df5380f08accfa9736ce44514ef9fa9b0fd0a4d5966a48df7ae940902ce929893ffb828f30883c4591c93a2bc5c8ca0c7a6f636e477e8f52eae SHA512 a36e28273a451c529451602b80ec70bca26d2db40a683e6fc7297db185c88696cc359c3f80951ff9580e81e7e221379913f7d1db3af3d00fb02128e1994e7f4d
diff --git a/app-text/paperwork/paperwork-2.0.2.ebuild b/app-text/paperwork/paperwork-2.0.2.ebuild
new file mode 100644
index 000000000000..0e238eca623b
--- /dev/null
+++ b/app-text/paperwork/paperwork-2.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 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/par/Manifest b/app-text/par/Manifest
index 41fd38ba3267..887d1902def1 100644
--- a/app-text/par/Manifest
+++ b/app-text/par/Manifest
@@ -1,5 +1,5 @@
 DIST Par-1.53.0.tar.gz 52209 BLAKE2B 4069f75e1d0ff397938941ab58020c41cb1b896ab91b370c4f9c9a4d4eea1fe695cc0c27b0129780d40b7274e355ac1f41a933d051bffebc938c284e71971fe6 SHA512 3f8ac57fe19ebcf427b11f4d79f2c5cc9286c1439c38a53d45bd29b9219369db2798efbd0e203ac359d59ebbdd3ead1c50ae75352a1ffc568d4d3b9ad50642b1
 DIST Par152.tar.gz 47999 BLAKE2B 0f76abde64d00d0511d9b0b0ce2a97b13917e08fe3bd1c69fa98ca19dff75a2b55a21f5eaa8bfd0660b6523336de6c29b2a58647196ff6af8c24ec156a426bb0 SHA512 f5a46da4b693e6a3d15ccd57e24ee9b0332ebfbcfc88da9ef0731e18932ba6f0adde7691a233264d6361e8903ff7e2263f71885a415c896dc4c45a0d05b1978e
-EBUILD par-1.52-r1.ebuild 722 BLAKE2B f9aca7e9d0a3d81f5971cfbaf0eb30477d87dca750d7ec2a5993178662f256ba5c7da487395690f3b1f437a503f3fdea7eef61b0e033a8d562e5ef14bd28cfaf SHA512 0625322d759184ca511567f15594cd44691699df0d0df985ddac874af5609e95c40bd42a522152d9223ded7432894cf94c7c4e3c75fc98ef464d92f026d01028
-EBUILD par-1.53.0.ebuild 757 BLAKE2B 5942b5bf3730973502c7138eff2cde4e0ea0b7c70288ca631f9bdd8e96fc449873f48cf97fbad111fcb8e2402873f79bbbf55993133ed3b2d82ea06638dc6795 SHA512 8cbd7d8edbf1ec06fd776948d21bfb7300f585b019cd3277b259eccc94feebcefd6f56c3cbec3f094e767428a57a324d679915a5854ea9da8be6a21c8f7dd9f5
+EBUILD par-1.52-r1.ebuild 711 BLAKE2B a87b87a8476a7074cf3eed2e017abbdc6ecda7cd9a99b47343511bfa0195e9b93ac5f374bbd0207e44a62a67c6eb740f05598470333676ada90788ea53d0ebfb SHA512 3fafda24ab5c87a5119ecbc2a88c27c29d574a63a046ddcc1bbb7d8d094335c0fe58883a30d6d575ec8f03ff5b070e3caf02fb527a7277aaecd3ceebf4cdf8f8
+EBUILD par-1.53.0.ebuild 746 BLAKE2B 506f2f885f72d1953e693a00618643d56b0eaa025b9207da7238a7f818f9b7f63ea9f3d56eb035528e9678fa51bad6db170bcc1b031a0b9bdd8c20b4401b4136 SHA512 b452304ba06c2ed4f82759eda2d4f941d3457369c188f01253e9ca20bd14a85e7e029eec0c7956f5cc26cde635bd21ee32f15d9fcc48cddc992dec277e24aa71
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/par/par-1.52-r1.ebuild b/app-text/par/par-1.52-r1.ebuild
index 2f34f767653c..8bb95b8b42e1 100644
--- a/app-text/par/par-1.52-r1.ebuild
+++ b/app-text/par/par-1.52-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://www.nicemice.net/par/${MY_P/./}.tar.gz"
 
 LICENSE="par"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 DEPEND="!dev-util/par
diff --git a/app-text/par/par-1.53.0.ebuild b/app-text/par/par-1.53.0.ebuild
index 3165b8c44367..d830449783fc 100644
--- a/app-text/par/par-1.53.0.ebuild
+++ b/app-text/par/par-1.53.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="http://www.nicemice.net/par/${MY_P}.tar.gz"
 
 LICENSE="|| ( MIT par )"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~amd64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE=""
 
 DEPEND="!dev-util/par
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
index 045ff70400eb..2c5b3f3caff4 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 583 BLAKE2B 76e44e86f459b5643e88b2e32dca0ae141bad2968b00899c6b174fbb97ca5b89159591db65fb42de6f1b5c03cab704849ce7daea7e396fdd92d17da38cfd0f82 SHA512 2a6ba575c5710e00c41078f65b705c37a9d2b98b23b7c9ac3e2c17efd2c07af5621abaaa7078236a43880f58c497cebda71d3b1b00f65327e1950027e27e909d
+EBUILD pdfjam-2.08-r1.ebuild 572 BLAKE2B 5704a26e0b2bb394b590fd20a4c41b1f27d74341eee9fd71c44cb4bef2459228dfa0c1af1969f9216328cdc978356bd9869abfea4df685044063132926b8495b SHA512 cb888787ef8024c46d627e9f391ebbbd249e1fe3f62950ccae1f80238808fc2ccb7d651da98a976ce14500639ac236ff16f820a21c8a8fa5f9496244618cd5b2
 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 927fef83557a..692950ac5474 100644
--- a/app-text/pdfjam/pdfjam-2.08-r1.ebuild
+++ b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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"
 IUSE=""
 S="${WORKDIR}"/${PN}
 
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 28a624fbf6ba..d7a7670efb03 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -4,7 +4,7 @@ DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d8
 DIST po4a-0.61.tar.gz 3863796 BLAKE2B f10c7d8b42c32be1b100f724e6d0d1b419e5ed10e0762c45bda8d91bbec7d5de331265611edc8cfcb04e3afeb044258697a54bea996240c27eb113f2f6aa0df3 SHA512 51038a3d2b2056de9bb258bc0b83dba4dec4414d6a06dedc17067441fba6824cd93296308abaa418248e3583bfacd6c81621fa6eb42e5596a3c29968ce154e77
 DIST po4a-0.62.tar.gz 3980028 BLAKE2B 4336c09254728b6a8d9c1220628612735e10d1531e3473eb7606900b9f20db3cfec1bb1c1c57f5c40bf8fce84fe823d25c743e2d50b3c56558239526f12bf09a SHA512 a91a31d9d80bb48ee071f39148572a4ec2b65f472a26696aa517c9d52ad56accf9fbdf971dcf15dd1c492cca7efab328ebffe1f20e98f7fe2532d4bf490a9997
 EBUILD po4a-0.57.ebuild 1285 BLAKE2B bcf6b815289c5ee26d89fa62cdc838214c55c96c389fd3c702b8805250154662f857035f830254ee845e940e247ee5233703045b08746cef04d935643f93021a SHA512 0708efd6af416b9041c046a4d4ef6ac3548f31c971a818813e72b2eba1e19a68ca1b898557f1c9984f514efd8855bc0c807a8528fef90bcbf627cfa8580b956f
-EBUILD po4a-0.61-r1.ebuild 1344 BLAKE2B b61f8141c47df9b47d372c6ab6dcfd7d0f63b7079be0babab0da802b1ca1dbb382f3f37fcc12f3bcb20bf6b9c5bd82ad4e7547d8ad60c1d4e6f5ae01479f3fdb SHA512 a89c33d0cb1b63981b2cb658a9413c7b82a99f2678d01a3da2a86657afe6f93c0c246724253aee5e1e0344114004d30b7a204043f0e6c152f2c78d49d310ff60
+EBUILD po4a-0.61-r1.ebuild 1351 BLAKE2B 6debc9afb688b43cb32ceb5f7917725bdc3789b5a85608f9bb04b7ad0c068736d9aa017e833736975391822238a7da423693b47e9dedaead57e411d3163b5920 SHA512 bfc6365370153ef887cd12c35b54bf266cfa058f10e897394cdbc39e663ee059b17414c9dcd758ad8efed8efd2de36c49f1edd5e4d19887227af41161752adb9
 EBUILD po4a-0.61.ebuild 1326 BLAKE2B f588b1f4753b7e4d59c1c5b5eaa74a13773392ceeb3859663472b52ef131011e419884a1d49f6bd9f611a04243140b642885df8fa0a858666670f86c70a7a4cb SHA512 8be8325f4e2cf06e0a4b039a23e2ed14d54ec7e2d2668f58eafffd4bbdfad02b60d86c8d2be0a24a34884b348768688041c3a2da0929eab68b72d2763bcfc428
-EBUILD po4a-0.62.ebuild 1344 BLAKE2B b61f8141c47df9b47d372c6ab6dcfd7d0f63b7079be0babab0da802b1ca1dbb382f3f37fcc12f3bcb20bf6b9c5bd82ad4e7547d8ad60c1d4e6f5ae01479f3fdb SHA512 a89c33d0cb1b63981b2cb658a9413c7b82a99f2678d01a3da2a86657afe6f93c0c246724253aee5e1e0344114004d30b7a204043f0e6c152f2c78d49d310ff60
+EBUILD po4a-0.62.ebuild 1351 BLAKE2B 6debc9afb688b43cb32ceb5f7917725bdc3789b5a85608f9bb04b7ad0c068736d9aa017e833736975391822238a7da423693b47e9dedaead57e411d3163b5920 SHA512 bfc6365370153ef887cd12c35b54bf266cfa058f10e897394cdbc39e663ee059b17414c9dcd758ad8efed8efd2de36c49f1edd5e4d19887227af41161752adb9
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.61-r1.ebuild b/app-text/po4a/po4a-0.61-r1.ebuild
index ce4c88c02b9a..2732597fc5fa 100644
--- a/app-text/po4a/po4a-0.61-r1.ebuild
+++ b/app-text/po4a/po4a-0.61-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/po4a/po4a-0.62.ebuild b/app-text/po4a/po4a-0.62.ebuild
index ce4c88c02b9a..2732597fc5fa 100644
--- a/app-text/po4a/po4a-0.62.ebuild
+++ b/app-text/po4a/po4a-0.62.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/poppler-data/Manifest b/app-text/poppler-data/Manifest
index 80e9999a885c..cbd96e4210ec 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 756 BLAKE2B 10a80bb161f85612fc45a4588b6d606744985b098a38fa954e08e8e163b5a6701003d86eb4abd40003f46a3ef0b7f6b7b0ac6d57dbd802c31e46c58cc764de82 SHA512 d85293690f9cdb32d568ba8be2bff555ea82f2a424f2bac90b95433725c471a5fb9db1c8053c70d3e362f478de6e0df8962a8f5e26e01f4777a7e4fd4a67c004
+EBUILD poppler-data-0.4.10.ebuild 745 BLAKE2B f2658bc21a7dc72357adf4ccc85887a66c347de4739a0f404cc462d4f52ddbad2fdbeef5446c1e0c415c6cc9f3e061c11284250f83fcfb7b64f16986d35a176e SHA512 1a0018be9d43d25fd1c3b840a0e62b16794a1820ad34372f4ae101dbd1941d7e18c9bcd47b16aa9f5174d9eb9b9e8a66b9a95d986b278b46970ea069553c7aed
 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 d0da6f4ee55c..852c9a5491b4 100644
--- a/app-text/poppler-data/poppler-data-0.4.10.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.10.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
@@ -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 ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 64c9d46a4346..9f6497fac332 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -7,7 +7,9 @@ AUX poppler-20.12.0-respect-cflags.patch 5494 BLAKE2B 8107bd3cb374694aea1dbd66cb
 AUX poppler-20.12.1-qt5-deps.patch 1626 BLAKE2B 7dfd227e1e8d4449e0cc72ca297afa78b58e97dea19fe7f72bc65a599890db586dcb46780b3c737e2c2723749cf53078fddf565aa58bec0cbf553993d18bb6ce SHA512 286ddcae2bb639107f3d3ffab9317b10c437014d466efc8e39407d6350acc77900ee60888863b9dfa95c546c39b5b7f1a97a8936a4ac3ed7c6b2a30666eee537
 DIST poppler-20.11.0.tar.xz 1648432 BLAKE2B 373464ba60ed84863b40eca2e4f99ebc1625ea06f68a1621165675cf46e70713b649f90630049d15c5c2bc59bd0befb437a4039b47e17509d4fcc4fed8586d53 SHA512 c8237e931ef20d939656e2600453fffb12a2beeafb273782b2069aec6e5915d8cc85136982b7eaf5956af30ce00da2faf84d86ffab47f725447dfbb9d6ffe335
 DIST poppler-20.12.1.tar.xz 1660164 BLAKE2B b96198be824dad6bde3ed89cbd05ebae001914c253d1b95321088ee209c73134efbb7f0044aa5d20c07d35b2460f5d17171810f36b873d2542e4bc93f423273f SHA512 a7ede8b11ce73c724fc54bc1e522ecfedaff65a08265c5faee4645765f1d6670a35abf67e57bdebacfd01b2071f1c532a04b9e302939a500fea9185f6e8226d0
-EBUILD poppler-20.11.0.ebuild 3375 BLAKE2B 0b355ab38e00f5f0ce9fbbb95463ef4b990534e4f60f9923a8d21b5d6e0fa30e40520861ca6681a5fae3986ab0c358400170cb159b5ddc8e87a3cb6a4684156f SHA512 d96627f44264078a1d95325ffa3fe71f8d6819d809ebeea608080dc1e9b73019d3c30c32b216797b4a5a72bcf3c3c69830df75e367ea72a70311fbeb1b324be0
-EBUILD poppler-20.12.1.ebuild 3267 BLAKE2B 1825c9f020414404b4493b443b583ce52a733812faebade33acc5430648acb94bf9f20dcb452d6292893c299688f5c077f07ac479a8409ad4f0da7fc768113c9 SHA512 ab20e2cf3c32f060b19d870dd04a2b53d943cb6e15c2b42e96866ecedc5b6c9e1dc411efaae958d6e4f1239c9126e7b613a345c331de03619cc238f87a73621a
-EBUILD poppler-9999.ebuild 3274 BLAKE2B 1fdd72dbc4471b9609f1751fc1715f2e65b3b9bcfae0c3524c4af6cb42e05c8c49cb5dabae79f0367a5f0c90b6b3dce8bcb8690e060dcb8b90af689e87741b42 SHA512 3d440f7099d12ad5e550a75ce0fd31594a973dba00780405658acc6114ed4db38343818ca2f5d2e011cd526be65ca6607704d575337c97bb187fec455fb34fb4
+DIST poppler-21.01.0.tar.xz 1680536 BLAKE2B 5f8d283cd26f4713c09b0c102dd3295bc7ae1c2ad2ba0f51d12fdaed5f89a864d98d10be7176e17c5613aa4579da3bea1aca56aff3cec4e5c53e977a1e84659f SHA512 aec130446df73a2fc66851a563a14cb40299212a2de4a0d03668b0fecb28312fffa70d0a82431c774d0c0e3f7293788bd2bdf28c8136aa09ad80edbca4cf0ddd
+EBUILD poppler-20.11.0.ebuild 3364 BLAKE2B 0bed70002e75a2ef80c1504057f77c6fc89b0729d219352d534f6cec73a117d718364773520ed5fddc6e9f339e275a9ac2278e1755b01d6099fa8bd27fdb8d0d SHA512 674e487dee7bd6cb117de9c4eac0e0c7602e397b0c20224a90edd848ba373364d6d270f51fbbd49ada7528b26675e41179ed03cc6e608abc070e4aaeaa9252b1
+EBUILD poppler-20.12.1.ebuild 3256 BLAKE2B d4d15f8c5326f93b4cb981e6c55c8ee16ceff579d8ef2179a50efcc64a0fe1324e2093f096c6cfbd1f006fb5b3f554bb276f47a1366592e6f30d03475450b6d1 SHA512 44c3d7707917b40b52a681a2772a444fcf9ca0eefb8ce56f76b1b8bfadfccee29bd4ef9674d01dadc24886a84163d8f913978ef6cd5b73e51f8c08024da6df82
+EBUILD poppler-21.01.0.ebuild 3256 BLAKE2B fb1e49a39eb0b6fb4971b909c7f1f9bb5b4ff1f0c141c7cf141d6ba84306a4cf259cba1f4edc109cb8f3e649147004de0940ff9cf7808ac3f80a4d0ec2012eae SHA512 75de0d830cc06808e20d9355d3a551302602ef056c1e9ccdebad7874d500cc31488f76455296dad85100dc158c9b5689c09c5f361bcc19506bc57fbd456ec8f3
+EBUILD poppler-9999.ebuild 3256 BLAKE2B fb1e49a39eb0b6fb4971b909c7f1f9bb5b4ff1f0c141c7cf141d6ba84306a4cf259cba1f4edc109cb8f3e649147004de0940ff9cf7808ac3f80a4d0ec2012eae SHA512 75de0d830cc06808e20d9355d3a551302602ef056c1e9ccdebad7874d500cc31488f76455296dad85100dc158c9b5689c09c5f361bcc19506bc57fbd456ec8f3
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/poppler-20.11.0.ebuild b/app-text/poppler/poppler-20.11.0.ebuild
index dc53016a1218..975d1342c8b4 100644
--- a/app-text/poppler/poppler-20.11.0.ebuild
+++ b/app-text/poppler/poppler-20.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2005-2020 Gentoo Authors
+# Copyright 2005-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/104"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-20.12.1.ebuild b/app-text/poppler/poppler-20.12.1.ebuild
index 9a3ae26fd3c9..d9ca76490186 100644
--- a/app-text/poppler/poppler-20.12.1.ebuild
+++ b/app-text/poppler/poppler-20.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2005-2020 Gentoo Authors
+# Copyright 2005-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/105"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-21.01.0.ebuild b/app-text/poppler/poppler-21.01.0.ebuild
new file mode 100644
index 000000000000..0c0be114df56
--- /dev/null
+++ b/app-text/poppler/poppler-21.01.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 2005-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/106"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl +cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
+	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+		-DENABLE_QT6=OFF
+	)
+	use cairo && mycmakeargs+=( -DWITH_GObjectIntrospection=$(usex introspection) )
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	# live version doesn't provide html documentation
+	if use cairo && use doc && [[ ${PV} != *9999* ]]; then
+		# For now install gtk-doc there
+		insinto /usr/share/gtk-doc/html/poppler
+		doins -r "${S}"/glib/reference/html/*
+	fi
+}
diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild
index 17f47a8d2432..0c0be114df56 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2005-2020 Gentoo Authors
+# Copyright 2005-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,8 +11,8 @@ if [[ ${PV} == *9999* ]] ; then
 	SLOT="0/9999"
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/105"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/106"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -57,7 +57,7 @@ RDEPEND="${DEPEND}
 DOCS=( AUTHORS NEWS README.md README-XPDF )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-20.12.1-qt5-deps.patch"
 	"${FILESDIR}/${PN}-20.12.0-respect-cflags.patch"
 	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
 )
diff --git a/app-text/ps2eps/Manifest b/app-text/ps2eps/Manifest
index 7932703f36a7..b66cfb718315 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 913 BLAKE2B 0f1acc4d9691816fa9cd4305beecd227de805eefcffdfb16be4de421c14cd3587caedafdbed620299545d7a2a879e7e17550fec59912fac3be8f01f6c6e05d68 SHA512 7e408def77bb2f01e31ea560d67755af047f1cc3b12a25a023e18e921b01779e257ffbda8d13a1c4334b74dfe871b7fc55e38dee8455fc65e97cffe4731442e1
+EBUILD ps2eps-1.68.ebuild 902 BLAKE2B d5b37cb938cdca3ceaea3168cbc4bfcf9dd93d095bce924b6bc5813b1fadbf7d39f86fd41c5b0be84d53159803fcaeed9ccea6378436a8b781fefb6a03de01f2 SHA512 2d8411ba7fbbe7b2d47df75ec7df2f9e7afbfa97ee8a4162576865b5a111d1cb01876ca3266e6eff2014add512cfd58038bfaaa7cce497cde995255b0c0e9f21
 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 0daa860881da..30bdbe08d154 100644
--- a/app-text/ps2eps/ps2eps-1.68.ebuild
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-text/ghostscript-gpl
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index 18180b2b4c01..9f35e11de65a 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -1,3 +1,3 @@
 DIST texlive-20200406-source.tar.xz 55383320 BLAKE2B 3bc024166ebfc269389531c7cf818b062856cd2dcc27cf0a2e790f07cd941d9905c9c6a54566ea627ea1ca334d2b6da8d3e5bd1c686dc9d6f8ac15aac388c1e3 SHA512 65be52cb5e1b52f12feb62c6cf23e56c581b9dccb8d3b9ccc85c12c62b0cb67dd71de8d22d967d2cbf8403502c66bccb238523d13a0d081be104fc9f9c68b477
-EBUILD ps2pkm-1.8_p20200406.ebuild 796 BLAKE2B 86ac25a8da4e244dacf6ddd45ed7afd4c55f7f522ffdb7f435bec6c5e62fa2b0583c2c47a5c4229553bab05afdecff0c503ed984f08e1386b22518626d03161a SHA512 06317e329c658aea63a708ca556167d75ff01543710dd99ed9bfbec5aed2fe48c272da91a291b6ea4e4cc0092fe4b1ada24b970ef2cfcf08ef343b924430dfbc
+EBUILD ps2pkm-1.8_p20200406.ebuild 785 BLAKE2B 240d50eff5af66779936c1ab5ed933194740078e4fbb9d01da32ea6b3ac70fba1a357a747f13fae1f6479f555787e979bff1e2989ecbeebd92c156656dfe9f60 SHA512 2f9211df86f43b057714836f7862de01f80d435db3f9460ff220f93a0e125fad701041de29903f87c4159a8307fadf261494f9290d09e86d018e78d6126091eb
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
index 052184f3d529..272bb9fe883e 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20200406.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20200406.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
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/texlive/texlive-${PV#*_p}-sou
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=">=dev-libs/kpathsea-6.2.1"
diff --git a/app-text/psutils/Manifest b/app-text/psutils/Manifest
index 6caa4fcbbfe0..ec01af4ec507 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 972 BLAKE2B 182741389910617848d19be6b2019d5a45d89abbd571b5c6124e6f1568e1cb94f4a0b85b385f640711787fbe16a3a6a233f11cef6d46ccac487a566de0082bb7 SHA512 beb50a8273935766b3f4ffb13b9ef22c8d14c5a3f2fa03a3fa82ff000f192464c0c1d00ccd9af70ef0887d63344a07d1951ce77112545950df1f25a82e272317
+EBUILD psutils-1.17-r3.ebuild 961 BLAKE2B 6f6c62273b7b97dbb382103b85cb5cf3c918c781468689b1680a095612c05d8c8edeeea7719bbcc134389e6897e02adb20e3f23d74b2507d4a2a48e823a9216b SHA512 1dfb9e9949d98d9305da4fd28675c104c7476c57d6fd57aea4c30c30b94408fc22e7a0071bb7b37406f826c8b547cb80c1e1090926e0e5da1dc448dcfb3fcaed
 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 0f1c2740cf9e..ebf36d5f8f57 100644
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 4305b2655a8b..2d21dd8c9ec9 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,9 +1,11 @@
 DIST qpdf-10.0.1.tar.gz 18399985 BLAKE2B 5e113790e7c2b48987c18aa7f562ff18f0efb544c48be8c36ba201ba1420168a7f32ebfe2e5754e8af679557df29093e0fd550c991b5201e4246be827952b3d3 SHA512 b73c0839b08905052d90ed78645cc9fb4fda4a0fa803db7b46f3d77a2c2f7e8cec52173834b1e1f008f3a3475a7d913362d22e1ebece11187a90c9035b81de94
 DIST qpdf-10.0.4.tar.gz 18465085 BLAKE2B 3b9edc38069d58d43d26b131da755b7921b7add905ed652e3abb48d9b2e140d0c3b38f0250dbd3dca1c4b3dadf76c636606c6fa802b1ebe2dda77444badd828e SHA512 0a8c243928a3273d78b4a898e17a619f1565ec5e9b6f637800a2937749fb8006d0438fee2e623d2f8dc715bfb478ee818e86e9da7c7e0fcf14af496464b79a07
+DIST qpdf-10.1.0.tar.gz 18528427 BLAKE2B e62b1c8ca8d301b082cde292cb8430d6ae26433c77a30a6a21379f00cbfb3df09117d042f532f77d372d091a89a3f6581ef7d7734c67a4a1b29c1708129078f3 SHA512 f9b22d89fc62e430e6232c840ad74d220ac9eb09d7f2dfe2c42c1c943d35b5fd25e2abec9970ac19ad7ad25dc3d95c74e68e50bad395abf815cf71c432233106
 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 1336 BLAKE2B af9deec49e7152963e27e1eb9991459e5fc69894bfb3bfd46042a6dc4e96937adfc871d119155fa2bb53a037aa4450b1bd41f428dc537254063225fb3b501fb2 SHA512 a0e6b234899a8c812d6f5e913d4a67f4c3b859d1efa9d39c5bbe5a7ffb879326b6c9db1a732dcd5b1a4542f99747eb7d68953d3c25632ec0d146b0a680e1216e
-EBUILD qpdf-10.0.4.ebuild 1305 BLAKE2B 8b6e915d5587bee7966f7f0d223b73c5be4e5b5c0f59489af31acbb08cd64d36a37af81b0b668482bbc72592c522ba9991fdcd26daa569e502eabab2b1dc0de5 SHA512 6ab620a5b5e159d0abc1f524e73eb91448f32b19681a62e86fa05bd040706a268658c59e8d75bc1cfb12f1347d0e590b400118cf3904ef2fe63b0d54f4e41052
+EBUILD qpdf-10.0.4.ebuild 1304 BLAKE2B f646282ac712a633e11ccbac8843da606371c91285e6f92df82febaf1161b90f0a19a62afcc00d3396e09078a3272cb666d3fb5f766be0260d8c4ee4ddd4b320 SHA512 e692d7326d710d7508e29348966323e43c802d5e9d9abe7062553f565b43bf565fa5069952420eb0b509570bb4b2106d34c65011767f3385abc8e8f0869192ed
+EBUILD qpdf-10.1.0.ebuild 1313 BLAKE2B 7575b134b18c0eb1417c715679248f5f8dcc83f57a6b5fdec88379cec30a40876de1fe628967a746f8d4d6383dfbc8906ecfcbb54f412c36cf637c7680902a66 SHA512 216a2b8f8ddd7d5f830df667d156011fb31ade13a8ea62d4197ba159eb5dfcbd4f7cbd20ecdd3b9f5024915a999b9e0f3422b95f3e4266dd25aa3c03ed6a27b8
 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.4.ebuild b/app-text/qpdf/qpdf-10.0.4.ebuild
index 1b4a64c53423..b39294df3f29 100644
--- a/app-text/qpdf/qpdf-10.0.4.ebuild
+++ b/app-text/qpdf/qpdf-10.0.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
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
 LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/28"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris"
 IUSE="doc examples libressl ssl test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/qpdf/qpdf-10.1.0.ebuild b/app-text/qpdf/qpdf-10.1.0.ebuild
new file mode 100644
index 000000000000..fa194fe13674
--- /dev/null
+++ b/app-text/qpdf/qpdf-10.1.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+# subslot = libqpdf soname version
+SLOT="0/28"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE="doc examples libressl ssl test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	net-libs/gnutls:0=
+	sys-libs/zlib
+	virtual/jpeg:0=
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
+"
+DEPEND="${RDEPEND}
+	test? (
+		app-text/ghostscript-gpl[tiff(+)]
+		media-libs/tiff
+		sys-apps/diffutils
+	)
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	local myeconfargs=(
+		--disable-implicit-crypto
+		--enable-crypto-gnutls
+		--enable-crypto-native
+		--with-default-crypto=gnutls
+		--disable-static
+		$(use_enable ssl crypto-openssl)
+		$(use_enable test test-compare-images)
+	)
+	CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index 3ee2bb876554..743589a5107d 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 1819 BLAKE2B fba06c6eb72065802082183cf17c552c5440409f37ba4997c85c60c67337d5cf8174e953b45df2b4a2110f9c5dfcb2cbe5a8b2c463fef76601d56060a65331fa SHA512 85d7d483fa3b0bed71a7cad1dc6996af66dafd099ae7c951c4c993cf04d76ef0482df7fcc2f89a8097320c95ef455a53d6dfbbf971f752b41b8f00185f85e2f8
+EBUILD rarian-0.8.1-r3.ebuild 1808 BLAKE2B b2407fa7e6237a6fb99fbb7914608a7c9b9a77324659675eee4aa5e1b88ef1e3e808f4398b384faa529382e556d5445c17cf0588179df1642e666429af0b25aa SHA512 d4768d827cb5de4bad49668d7e4ef5a6b65a3bb6f793d0e8d8aa87818b03824b1bc6bed1774dbdb6488d395a8c43ca672e564a64c56116483d77771e6c5d8cfb
 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 b6ebe6012c46..cec1db78048f 100644
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index d4f55108e93b..454bdc38123f 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -3,7 +3,9 @@ AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8
 AUX recode-3.6-recode.texi.patch 445 BLAKE2B d612b6b513908fdd7756cf3b0d8bf2730071d71acd91d330f32b149bb42fcdc2da353f00bd77e5d39d87abfce3ecb917b97c5471ceb79f6777778f36854fcd9d SHA512 bb25c3d36e77e415577518561f1c4060e923c0f2a992eaa4cf561cc27372820810e7bc8ae3db70dcbf20dc1ba7384370a51c6072a71b1a22c4b71d5a1369fcdb
 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.7.8.tar.gz 2230154 BLAKE2B 853a53d86a3a3600e5d70a8dc67bab9b0fa7a9dfab79e3f4ae8611f54c955802862689077774f7b21ce360f2d91c65ee238406ffa137a84545157e3a70853f42 SHA512 e6cd9c7d3eb5c179d3f62804018d1d19b71a3fae72b0d76aec730c36e64c50a571cbfda5340ac50244a16ccdd9265f5610deadb8908067c3866fa68cbbf0ac70
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
-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
+EBUILD recode-3.6_p20-r1.ebuild 1673 BLAKE2B fd3d0fcaf3ee85cd8a27f2f9ce203bbbd59a7c4ce31a9c4f7ceb58f12f4b0ff2b196ce236975bd6848b71e669765347a1b6757994b69d3e432fcc256f03a3f7f SHA512 644dd61fd3f6989d561aec93cbc44dc01c9293fff5845945564b5d22a2a57a8eb7c5f0505a31f39e404d8059e6002243091a0b62087d396894624cdb6326bee2
+EBUILD recode-3.7.6-r1.ebuild 1006 BLAKE2B 23141789d5bbcc6beabe28c9d45b29f9f0c984c5d8145351dff53cf73cf97192b6c022d74b864a5265d1b90eccf28e0dfdda7aea0d28ffeaf7923bce8655207b SHA512 4d598eacabba0db13ceee3101e738855f8f7bf5560dcfeb18f9bd11433c65c053cc2f79c36a63025297b6fa7309a23962d9340eb6bdeb7bcdcf1c80cc42bbcef
+EBUILD recode-3.7.8.ebuild 1306 BLAKE2B aed00a09f17165e8a0f5d491c3166a718a50fe8a6d7040716c809e46dc6c6ecb819c31d986aa1178d0e1b1be863c96d2712c84c017a6ad6e942b8ccbc7e676fb SHA512 b2eea5e29f2da46efc389b8b49c584144c40af5a40bc24ca0ce7b3879ce15db1953a1c79d5d33a90d0fc865bcf779082a89d8e174246dfbb2e1db43ee6628890
+MISC metadata.xml 430 BLAKE2B 2df5bd5e46e37f7e60a6064a2f13876bc190121189057c703d98354a24de68e49b3a67337bb10a43c419b777af014fc0238940b44ef812862da5eb2250a06a5e SHA512 796421baea5a32814112194ac554251426312280ecd1517076a1b73b4e21026cb149e294df50a00e0c4674066640d0f5fc9f650198cde5b1a44f8f1446715d3f
diff --git a/app-text/recode/metadata.xml b/app-text/recode/metadata.xml
index 9a994f3a85a3..6776427c11f3 100644
--- a/app-text/recode/metadata.xml
+++ b/app-text/recode/metadata.xml
@@ -8,4 +8,7 @@
   <slots>
     <subslots>SONAME version for librecode</subslots>
   </slots>
+  <upstream>
+    <remote-id type="github">rrthomas/recode</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
index 80002423b7e4..d68206176512 100644
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -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 ~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 493663fdbbe3..52086b8a4c8b 100644
--- a/app-text/recode/recode-3.7.6-r1.ebuild
+++ b/app-text/recode/recode-3.7.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 DEPEND="sys-devel/flex"
diff --git a/app-text/recode/recode-3.7.8.ebuild b/app-text/recode/recode-3.7.8.ebuild
new file mode 100644
index 000000000000..163176ef093c
--- /dev/null
+++ b/app-text/recode/recode-3.7.8.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit flag-o-matic python-any-r1 toolchain-funcs
+
+DESCRIPTION="Convert files between various character sets"
+HOMEPAGE="https://github.com/rrthomas/recode"
+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 ~sparc-solaris ~x86-solaris"
+IUSE="nls test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="virtual/libiconv"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep '
+			dev-python/cython[${PYTHON_USEDEP}]
+		')
+	)
+"
+
+python_check_deps() {
+	if use test ; then
+		has_version -b "dev-python/cython[${PYTHON_USEDEP}]" || return 1
+	fi
+}
+
+src_configure() {
+	tc-export CC LD
+
+	# on solaris -lintl is needed to compile
+	[[ ${CHOST} == *-solaris* ]] && append-libs "-lintl"
+
+	# --without-included-gettext means we always use system headers
+	# and library
+	econf \
+		$(use_enable nls) \
+		--disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-text/rman/Manifest b/app-text/rman/Manifest
index b70403c5f1c5..b641fea20374 100644
--- a/app-text/rman/Manifest
+++ b/app-text/rman/Manifest
@@ -2,5 +2,5 @@ AUX rman-3.2-format-security.patch 336 BLAKE2B 04ec15b8d7e20293d3b5da4c85107b209
 AUX rman-3.2-gentoo.patch 418 BLAKE2B bb7385f95e443a175e86c7c8c19871cfd8682b037487b6a73f3010e50d1e177929ef89e02041b70dc575a55aa5144cec99b2c13942f87ddf9f31c1c327ad8b36 SHA512 267896a7db4dc559e3162c66996bde552c655f8dd32ee3f1a23520d1df8728fad83e783fa898159e0aa96730b03092be516f711091f58a4f1b9228d24a4bc87c
 AUX rman-3.2-ldflags.patch 339 BLAKE2B fa4e72627e79841e2650025d9772953834907a41f06e3a18d8a0bcae83cf104724cf29023d128ec272656d4ba9696b05243466372299f20b796ee8d3cd495fdd SHA512 ed9350878621a90aea9467afcf0fe1110c9b876c236c314e0d7566ee6c5674663c47457f8acac76517b0409f3eccff91dd3e869de1c3d1002a671610fb1e38af
 DIST rman-3.2.tar.gz 79397 BLAKE2B 2be1c60f77c3b2c4fa73a59c5a8965da1c8b1f3b569e7e4d5716a372228bacb81c5421f4bbf330781aa231835393c915ed14057c717cb1e8ed57101f7febb37d SHA512 a70aea0af1510088fd88a736e63a6dab9200040be5eb89912ede4f50e3de97d423574841bbb66e90fb12934f3834dac0acefe78ff1c73a78a79c95c3dd6fa5ae
-EBUILD rman-3.2-r1.ebuild 763 BLAKE2B 1a5d86ef604cb2fc0ab91b3c3590dac92f008837e6012a6be2df1828f4339cf3775599a9d6dd06f1003eedddc4c98de1670b1393bf274fc5f3cd372f77966b2c SHA512 4ad491f64f73afa3be772e2c238f3625f21edc1c8af2d388ce4ee32894552efc7c000a1c2e5f37345e47298206726686b00dbea99fd43527e7fe6980009ef6eb
+EBUILD rman-3.2-r1.ebuild 752 BLAKE2B 1e79722a78df026cf73a36c4b77c2c6b0618b34cbb7eab05be4914fbf12d4b12fb768a5608549d7edd42f94c201f96893df0a395a2c654ba2ba64cfaae027ac3 SHA512 22f89ad35b2c88ba500f89033992d287a92c43ff56cccba24847c47d3c748ecb7c59083fdf4f213ea4b8597662d9d0d76c510adede802db2a0725b28714f3385
 MISC metadata.xml 334 BLAKE2B f3759592bab3b3f8426acb5a0fff5d5d7efb5618c951e2c0a26dcc119f609702f45327dcc47de6132befee7064536413006e77a09ab67415c041b0697129df6c SHA512 29d5b70060964469ce308fed8bc01e09bb74b3d2ac0605760d88f7dbd19a1cdd6517cdbab76f4269188454112837e0d27b32bbf3c5b9ecd5bb4d3ea4f862188c
diff --git a/app-text/rman/rman-3.2-r1.ebuild b/app-text/rman/rman-3.2-r1.ebuild
index 486e973975b8..4527f2dbaadb 100644
--- a/app-text/rman/rman-3.2-r1.ebuild
+++ b/app-text/rman/rman-3.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RESTRICT="test"
 
diff --git a/app-text/rpl/Manifest b/app-text/rpl/Manifest
index fb18fdcf2301..0bf45be2a6b2 100644
--- a/app-text/rpl/Manifest
+++ b/app-text/rpl/Manifest
@@ -1,3 +1,3 @@
 DIST rpl-1.6.7.tar.gz 21867 BLAKE2B ac523aa836312d6ed6db9eabaf9b6499ce00047ce1a4d35bf398f769036d65aa5b52c410b2110cf5bb14c31d782bc1c424bcd1b2a26692de28ca70fd452b18f1 SHA512 f853eae0ce0a82d864e72ecf3fd3f20fba10553357b23d0012ed22ee0efd57bbefea71095775f7215323d829057f6579aadfc006b6a893972e05039784dc5add
-EBUILD rpl-1.6.7.ebuild 710 BLAKE2B ce1dfe853ef5e91d5d729751c44c641c8d003074335262db7b01a549fd08c5319a42b4a05a80f328963bb504da3b8b6246d165a7dde73552a87f41905ba4bc87 SHA512 8d3bd5ab28972bff224ffd29874bb14d16936bd1db1a7ea3aca8e33e9e66375b7042c85c4d82e9a31d31bc8cff5f860dbb2b5e231338c2406cfd80f0cefc65db
+EBUILD rpl-1.6.7.ebuild 699 BLAKE2B 96252444486478f421942989476311710b3fa8925bfd734791984675d01b091aeac2a5216b390edfede919cfcbc6ec24854016a3355b674bca880bb1da8cd56f SHA512 0ed10c86134712b76464a8ef40faccde42dfecbb2e2098795ee7d6520b40509db300c00cfd196e8c84d1222110b3de5719fa8f06808d5bb94785833c9df9dfce
 MISC metadata.xml 338 BLAKE2B 64a9c58a45097871d3d71b78a46857234cb27a5db16cd80b1dc9e7d9f4dfe650f605d1e8f1ba8a645d50d67b4e2ba21b56308e06aaae3cd264920705e5c4a8c3 SHA512 e8231d1fb1b810948ec4ff31afceaaffa7b6d3f0ed565118f8555cb0721de20dad9a845e213162b3b1619e2b20610e4df0843293df049e17f8e4e1977957104a
diff --git a/app-text/rpl/rpl-1.6.7.ebuild b/app-text/rpl/rpl-1.6.7.ebuild
index 4524edb28594..1cee4fcbd692 100644
--- a/app-text/rpl/rpl-1.6.7.ebuild
+++ b/app-text/rpl/rpl-1.6.7.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
@@ -13,7 +13,7 @@ SRC_URI="http://deb.debian.org/debian/pool/main/r/${PN}/${PN}_${PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~mips ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 #python_prepare_all() {
 #	iconv -f latin1 -t utf8 -o setup.py.new setup.py || die
diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest
index 0c7cb973ea66..e8934770d7cd 100644
--- a/app-text/sablotron/Manifest
+++ b/app-text/sablotron/Manifest
@@ -2,5 +2,5 @@ AUX 1.0.3-cxx11.patch 524 BLAKE2B 4b8c5f68e662b2d65e4acb50e2cc3584d2186f4ecc5c8e
 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 1039 BLAKE2B a8f3a9e0cfc0a4036949d66ab5d0094f8f0a0932b2a456facf415372aa3277b58a864a5014f70dfce7888cd54dba6f7c73c7fb3891541e92d3c5d64ebc8da437 SHA512 3ec6dcaf05dcbe7fa07332af1190dded1db1efaad4bec8b029cfd02f162823a2dde24d7d0daef3456b7d3eddf8e71a9742f6e32368af1d21daaca3d0ec245a83
-EBUILD sablotron-1.0.3-r2.ebuild 1145 BLAKE2B 762b95b9addbdccd631858b53ab44b4408ca4591cc2925e4a80ede9dbaa32cea71468deb0249c7cb2ea34e37937a20b546a7d20ac77fb6b1d506eacc805556f0 SHA512 284a6a7a79545c3c85dcb938ef5a44a71c419483702a316eb011be0c875e67265e67b9e932915ecfb32f536acbf03269657bd176931abdd4ae30e97e174d4141
+EBUILD sablotron-1.0.3-r2.ebuild 1139 BLAKE2B a8d85d068908b8659752bf48e19ed6cb4052759e74079d5f9b8649e8c35ddd9da3221797f043179b3cf22a36df2ff08bd8565945d65199c65dedfd57437924ce SHA512 61c6c96c087a6ca54e5233ae2c709ff5d049b954e392656f9a1259e6f99c1968d324fdd4f6157fd41e614b375877934114efd76346a746eb3d245a301ee09404
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sablotron/sablotron-1.0.3-r2.ebuild b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
index 9910b99b55bb..1b8ec6960d0a 100644
--- a/app-text/sablotron/sablotron-1.0.3-r2.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/sablotron/${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="
diff --git a/app-text/scrollkeeper-dtd/Manifest b/app-text/scrollkeeper-dtd/Manifest
index 2d5e48563c0f..63382b6523c8 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 1514 BLAKE2B 6d73a6b760dfa940be0974338b2aa6d99b7f5552a6f69c8cf8c0b1069ec2870954bec4ca3cf67e8fc209f1ad647945fe0678644ecc3432f5a0f6129fc5a3edfb SHA512 d0b86e86931725309790a924648518cca1833598c4da2ba8e5d3e2adf70ea7497042046d6ec2a3d480de484b32434532e1e9e5bee43c8d31872ad014f79d773e
+EBUILD scrollkeeper-dtd-1.0-r1.ebuild 1503 BLAKE2B b81551530c6b3fd09acc867cc502bcc36f57a2a30b161c228b61b31d703e83c815ab00f77acc15fbca404aaf551e000546a5b970ed2d24a35e03212bcd49b68d SHA512 bc9823d02a474e9776fb7ccb07086cd931664d6582211929a3a0dd5dd948f5a1ab772584310a8c3ab93c59011e647c2677391dd5b80ea59e0b8667a249cb6192
 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 6e6ccd06e2a1..a3d62ec869e6 100644
--- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~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 d1a66265df0c..c4e4ca6f9de2 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 2548 BLAKE2B ed389f04d2ce9453c1ba82b46bf03a5925a133c7e3ced626ca6394e65607086b8e5a804afa63e7744cff8fd0912f82c9c9ecb59f08431fe4f923e01faabf6faf SHA512 7e0a7cecbeb348449945085370117c749c967a35e138ef342d7c5d86459875d8869b33f7f228de6f9daf30bf90a9fc83b1c7243048429397e169c559e80f14a8
+EBUILD sgml-common-0.6.3-r7.ebuild 2537 BLAKE2B 85dc28211d840e643ea698e0e0b0ac344fca4b651ea875e71a387c5c6f16e93081f90f4beef01c356ddd1cbc9fc64033e2161a1a217b9b8b0fe982566223417f SHA512 840e89a2078451d1fa2da8eee5c8f336ef66e6d1d9522dfab730c5f595bedea20d5d5d889d6e07d1e8d5245471e987c298e4cd01128083d5d9f0cc7355c8aba5
 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 3f1c4a6fb357..fce56eecf964 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
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
 # install-catalog is GPL
 LICENSE="FDL-1.1+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/sgrep/Manifest b/app-text/sgrep/Manifest
index c44668845b5c..3e7afadfd934 100644
--- a/app-text/sgrep/Manifest
+++ b/app-text/sgrep/Manifest
@@ -1,3 +1,3 @@
 DIST sgrep-1.94a.tar.gz 193267 BLAKE2B fe37f62e2cb5c2ccad88df8ee3000d937357b5801ac6c55938a575f77735db7f94c0475e2eaa2521dfbae194132dcda4efe009db32e23b50c13acbc359b9abaf SHA512 8d2571a738c6a87cc34aea3a0692d15aea1d4a0439401b97368da2a021992ef8d0754e91e10409c1c059712bfe69ac4188e3be856211e48f8e6d528b5684283a
-EBUILD sgrep-1.94a.ebuild 721 BLAKE2B 18ece2417c18c5f3578222d2a2aa5cce21307213c46e9fdb06170b70148b6679d3ee34bd80a22c84ac89c47141eaa7c3888a1af9512d825560a59f4a3a999265 SHA512 64fa85b4e830e83694a516c1760f612078e0fe6d5ac5c256ebddc20f2a0cafa24220d1929b6e3561c8d52cfe3abcc7a57a11ec97b4eea0b67e25d8b654e2fa87
+EBUILD sgrep-1.94a.ebuild 707 BLAKE2B 6ea4827c2dcedfb6c2c73b4761bc157328aa45a0729c8b0fe2fac2ff8701c1eb27d577a4a905fe6a56e5060ae4777e6332a153734bf4a203c445914d622de14f SHA512 f5ede16338af4744ba9444b0508a442ddc20fbc4248ba5fc6e0593c370297e2cc877ab3d41d9b5294ebaf457661d072f5e8e2047ab9b4f171099b35cab10f71a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sgrep/sgrep-1.94a.ebuild b/app-text/sgrep/sgrep-1.94a.ebuild
index 2f7bae2fad40..9facab819c5c 100644
--- a/app-text/sgrep/sgrep-1.94a.ebuild
+++ b/app-text/sgrep/sgrep-1.94a.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://www.cs.helsinki.fi/u/jjaakkol/sgrep.html"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 src_prepare() {
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index ae00392a036b..880f9398d44b 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 651 BLAKE2B d0202da20c7c23506c77d126891b05f9aa918f3ef7809f3d71aa4f916ccfa6d5870ef2382ffc5f08a7262262ae2e678d0d407ead2349528c8369fd4d6512330b SHA512 9519437c64df81e49175b71d95bce5aaf7ab3721066cd3148edfcaaf68f14e3aab473d6c6ce562f423ebd32eb1dcf05a2a9cd445fee48780a99c99ed5f906af2
+EBUILD t1utils-1.41-r2.ebuild 640 BLAKE2B 8dcef17da233d4937e09343a1c5154d0e283bfdaea33f78bb989c3785635169f784c3f43947990484ececb877cfabb42a93e81776ca368b0fb74df1df46e5b88 SHA512 b9ed4c33535bdc05815171a9814717838c578b101654cc08e79e0e7c7fda5939083c177d59dbf07edf93c1c7d1ec98b47ad531064c5bf15960421aa9d6ef4e48
 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 e8b67bc33c19..5f654e5053fe 100644
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ b/app-text/t1utils/t1utils-1.41-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="BSD"
 IUSE=""
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
index 2fef4a699f4c..0555a3f7ee61 100644
--- a/app-text/teckit/Manifest
+++ b/app-text/teckit/Manifest
@@ -1,4 +1,4 @@
 AUX teckit-2.5.1-mixcflagscxxflags.patch 534 BLAKE2B 98c7ec0325821d6fc8ed4952cce4ec38233302c25e0b6e4157c357693c16ee756c553347cf70aa1381315e0bb1c721e3e423ec6855a5c80fd2a5a298eaeb62d2 SHA512 7b76d3ebc6ecba24a7cd6469b47b35245e73d5c02a32c67a6205434f8c4b73ab6f1a77d0f8cf95081c4b441e876a2d62a1c276f69171d4f9f4679ccccbfd1c87
 DIST teckit-2.5.6.tar.gz 2500800 BLAKE2B a41c51e80b558d9735be782ed655fe36ec673180e559a3063c3b78ece14e470e194740f2039863a6e7a12e006c2314c3b73eff5de4d289c8eca1b6c9744f1e0d SHA512 d3462dbf22658de85fd718c43229259c460730d907226435195742f1ab65accc4ec83f7b6cb32a0e99fa12ddb7f2b7b5f2598c8853636aa5b31c8592ed9b4745
-EBUILD teckit-2.5.6.ebuild 1109 BLAKE2B f88b5ca5225ca1cdefd624449b553727f2891dd51841ad73471f7f818ee5743afecbb5a90daff16c1aeec5d8e4f3efa2f89aac7f17f4a5bb35aed23ca1614478 SHA512 9a0c709d24a6061977b02b4db6a9421973698efccef736a0eff342d22769ca3e14ba1a6186ad0d90402b0ca52952e680c45dc97c139e0ba7c449b184e793fd6a
+EBUILD teckit-2.5.6.ebuild 1098 BLAKE2B 9436882972ea3e20da426aae4bb5c68864bb339287cc71fd78f53ea1bc1b04b6ef7dbcfb067adbf96cf494efb0d82b852e66062449feed67f52d2873e072eaec SHA512 bad1481c8080d3639edaddea4d698d4fd45138e8aea40c21ce51fe86799f21e610460bc749cdbaba6376031a3a5b2ee3ba5672525507fa4f689ba28024545da2
 MISC metadata.xml 328 BLAKE2B 55a9af22d43fe5270c143f0bdd0fdaa5bf58665a47c6386b83611071a25c8e41e0116bd48c3b6ff051b51e28f9f0bbbb1d09a97939f03df5e367a352c99b6f09 SHA512 f4ee21269605eb831d9a6cbe639da9f2bf63aa14ffb69bf41b7fa4304e4680f5e11ff9efaf30b63cbe0f3708468af19c5412353dab4af8d9a49e6f845a2b7f67
diff --git a/app-text/teckit/teckit-2.5.6.ebuild b/app-text/teckit/teckit-2.5.6.ebuild
index 6dfa82d29799..465bce230049 100644
--- a/app-text/teckit/teckit-2.5.6.ebuild
+++ b/app-text/teckit/teckit-2.5.6.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=5
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/silnrsi/teckit/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( CPL-0.5 LGPL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest
index 7977f226510c..b1f29879d8fd 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 1350 BLAKE2B b02b06a0c2e16c8699dc0fa7011b58dbda615e4537a36896bfd8d97261517281a93ef0e47b2c64cce9d249ad79b9616e5aac5a4aa97514f0aca5210fc70e5281 SHA512 b8cb493abe9de5adf01c3ab2ac0c7c6896398e9a02b670f948270161ca67b8e58965f9f33fe555e2f4779da2d03e0fab92aac204e609c10f521771d5033aa0af
+EBUILD texi2html-5.0-r1.ebuild 1339 BLAKE2B 5503cdc3b0caf6605e8248cd3ed54b3b94d6e101092500d35ce350fd0db65c369f075b0aa20e595d7abc798c15d22d0ea1c82be83974e922d2cb7cc0e259e37e SHA512 af0b57af9f1b0f0911e031664013139b3f991fec4d6135e0586e7350d0365049c66267e1f9e4bfdf4b8c55e79b11106fcfd31fddb2d205225f0dea93fc4b000f
 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 2c205ac29904..5ea9b5a78ad0 100644
--- a/app-text/texi2html/texi2html-5.0-r1.ebuild
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -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 ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="unicode"
 RESTRICT="test" #411523
 
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 361079046a07..582de29ff45b 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -184,5 +184,5 @@ DIST tl-xindy-2020.tar.xz 141192 BLAKE2B 47a053cf02e7ead9a86801731e211663c5ead7f
 DIST tl-xindy.doc-2020.tar.xz 406620 BLAKE2B 143e9810da19aa0bd9080801ceb42923bd5c8ceb6a1055e6916489a306b40bfd6977a7b17b3434ee04c88ee975a5313c3beffb536b1e867ce6e7eeab1df3b1b5 SHA512 9e6c10388a7a707695e2965c3e3b851f939a68997cf880560a4a05ca3a167febeee9f1a7803cff1927bf7aecf0d6baac65bc4827c367f9c2d086d17d5947d64c
 DIST tl-xpdfopen-2020.tar.xz 580 BLAKE2B dd5bba56ad86e209daf6030f5aabf59c41a0474142e81a840b647ae2abf744d0a53ff76ba1581bf2f7de0db4432bcd607553fc3a2e5bb739e483357f02ed454b SHA512 4bc35a5699e39b12f6f38b48ed7e136e9c5c54cbcad71119d7ffcb0688df9739187b4e0042782a2678233b289902b24c6537ba10303ff26846bfe73b98c9f54e
 DIST tl-xpdfopen.doc-2020.tar.xz 28176 BLAKE2B ba0a9f1621999a8d98dd96f72fb93cd7a380e1f6285d2d59dac812e68ac91c08e815756553e10ff8cf1042dcbfa71bb994abab000910cdb1e6ddf113eefc481a SHA512 8dae12489e11fdc9e5e2aec22a4c70e8f8d15708b907404dde849b915515fe1f3d0771762f3a18112c8e2760e30bd1605d208b4315753ab37f738646e90c6f32
-EBUILD texlive-core-2020-r12.ebuild 11952 BLAKE2B 38270a6efe8e2e17f72b05fe4e96d8f413aed54d4df32a8901ae733f0184c9d2d315007d5ac23e4724301187678f09e200c78cb2bf83294563ef8326711474d5 SHA512 ad78860262ea4c6f10c110008c582c9bdd803a497790dfe9aa75bb07a2e739352ae00a506bf2d6f908a10510d9eeef98a4e3f21e2033dab25f571e155c74c914
+EBUILD texlive-core-2020-r12.ebuild 11941 BLAKE2B 06ee8afe2cd8345b6a6f7f50767b36661db7bef5d0cbdb7679490bdd72a48e7d013682cd7a8d2ec0ca1896d10de2127b665f23acab62460a055e1b0895496a11 SHA512 47938416987dccdf293554654287e306f2e3e122711818f7439f61beac493ec9eb9c80d6967038f4c12fc01a9bb18a9a4f49f2ea853170beac7bce6fc099b557
 MISC metadata.xml 674 BLAKE2B 4bab73d192039ab8cb3952877ced5e1b7b329f47d2a5b96e72ec82428dbc2236629abb7e2de1af1997bf577fc81cc91ada9f173eadcd2a2e726acbd79b9607bc SHA512 6faf1b433b9236aaca1fc07aa5679752b2d0214b5bb5f7aea03aa6c21e8a1880a103dea2b9a4c87ea84e85d91d259a2c01f5906190c96c7467f8b0a4863d85c1
diff --git a/app-text/texlive-core/texlive-core-2020-r12.ebuild b/app-text/texlive-core/texlive-core-2020-r12.ebuild
index acbfb66e3fb1..8920c560ed8d 100644
--- a/app-text/texlive-core/texlive-core-2020-r12.ebuild
+++ b/app-text/texlive-core/texlive-core-2020-r12.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
@@ -75,7 +75,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~sparc64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~sparc64-solaris"
 IUSE="cjk X doc source tk +luajittex xetex xindy"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index 42ca069a7c3e..8d753252a72f 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,2 +1,2 @@
-EBUILD texlive-2020-r9.ebuild 6768 BLAKE2B 4297e1c6dfef665d5cd20d111b6cade9ef8b13e2941d17865bd0d8488c47ec4dc4cff1c5ef10d238f6d55c678482e5f9df0feb9a8baee4b346e05949f27ba8b5 SHA512 b6a330f4e059bab84f18b15def8996c71a5fb10e4bf76d8aed0e086714629a784ebebddb3841e5964ae0dd9c812370e8ab7392d0d942eefcc047119c307700a7
+EBUILD texlive-2020-r9.ebuild 6757 BLAKE2B 8866925633c7d7696a38cfd400f8e04b0754351c9627913d592d9a6bc73246d50384466ad65a99990e7ad93b3e433f932b679bf2302979e698a9fb906e9dd020 SHA512 429f1f57a69f0511f5b61b9d0923aa6beef92a467f40b281d32d69406319bff081cc1ccbd97f1707920ab0b8bf95c084b7097b9b58a636f23e59788f97fd541f
 MISC metadata.xml 1932 BLAKE2B f69f70507b754ea964ffc2c7a1d5f693d782e87b4b40fb715b2be25d044a628cb9177c3b7695ef4093afd72b54e15f43564978b104f8246d3b307e288b06585d SHA512 3f9f2defe49de21e0eb8c6398f607d0138bd789071766e0c3a737dfd5692b41423ba29107e817a760a410080fe55e42cba33f84c08f70258ffe5b7337d34f2d4
diff --git a/app-text/texlive/texlive-2020-r9.ebuild b/app-text/texlive/texlive-2020-r9.ebuild
index 4db4500bce9e..724092f9c785 100644
--- a/app-text/texlive/texlive-2020-r9.ebuild
+++ b/app-text/texlive/texlive-2020-r9.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"
@@ -8,7 +8,7 @@ HOMEPAGE="http://tug.org/texlive/"
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context extra epspdf games graphics
 humanities luatex metapost music pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xml X"
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index d20b66411d4f..a00c41ce896f 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 1041 BLAKE2B ece993680e9263a6c1e93c0ffcdd7a508c2a05ad3e3e7f407930efc84557f34f238c94c6ec64bb76b4180a889b507cd7ee7ac0e91481d9282bf851b739d71ce3 SHA512 491aa6dfd716f70796e18b8a01c1b63b69fee860c6aa6a005a9ec283603b7d848d68e76b34a1e51c6eabab968ca4218fdae5b6ac868e8a937eafd6fc21146154
+EBUILD tree-1.8.0.ebuild 1030 BLAKE2B 9ee7a68db1a1a61461d1af44288ed5a31714eec2bc9f95454f67e79fffa55417bc7f8abaeaee7821d704695bc20398df15280b2613b8d68a7b894343416924c7 SHA512 b9da69194a4a787e035a396e32fb26b6bf916dbeb0a33513bb9db0a038f2e2b46be890676013b21f6bd63e1dafaf4f36eb8239b622e3f39b679b40df800ce999
 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 b862f8493c38..dde5bef051ef 100644
--- a/app-text/tree/tree-1.8.0.ebuild
+++ b/app-text/tree/tree-1.8.0.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
@@ -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"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index cc03fa41e198..a4633665a610 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 1111 BLAKE2B 4ef0cc7a325233798807a5e8e1fb10816fdc0847ea7ec8ae24b1ada1a5e38800720a701bbb3f47d183895efd58b1de31b0d01b69dca93b91bdf972a2bb88480b SHA512 915b9967322c53c846141166037b1277af5761298868dd9ce59668b44f11bc518f653a84085ba32b75c81ec9a02497ee054261dfc973221cf5806a51d73f2b6c
+EBUILD ttf2pk2-2.0_p20200406.ebuild 1100 BLAKE2B 4ed88e2d099091286e3f5e820a0f5015b32333f342c6b6a59d4bd7bdd5cbb855eeceeac56d824616e8ef82d161b52c737e266ae9512a734962fa4014ebf8deff SHA512 6c9d9b819ae17f1d1c4081f5e192cb690141e6d28b481bf0535c8e4a944d02848ba18fa598735890bae634ab0cefe0cafd05ba60d32d94f8201893075fa18ecd
 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 388b18b099ce..293df0af0ba9 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20200406.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,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 ~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/txt2tags/Manifest b/app-text/txt2tags/Manifest
index d1d7972fda96..fd0523ecebd1 100644
--- a/app-text/txt2tags/Manifest
+++ b/app-text/txt2tags/Manifest
@@ -1,3 +1,3 @@
 DIST txt2tags-3.7.tar.gz 248392 BLAKE2B cad49f9815f2e8e466a0fa83715eee27c16cc67fac4c0c55324a3ebc22707857a4bb59176b62fbc1a922c465f60dbc6a057b326789f82a9a9b4babb7b8041486 SHA512 70f6b72b9555b881149e29581a200bf5195d740ca134fffb9faab3a8a04909173f40fe7758659bde44efa9aa50e9816e7164d8164f84b2046de500a49906072b
-EBUILD txt2tags-3.7.ebuild 538 BLAKE2B a9cea8e12a121aaf8e659826fa6221bf1ffc9146f71809a6e1481c8687862cce06dbaeb817f6a31817047b76852a1c8bbd7745335d898874fdf0bd1f48139355 SHA512 7a57e84b34121dc1169e6c34390111aac11348c904f04839eddf2e19c6dd6d6f0466098c706ed6d667a9527a0412cc2d7c627e59d3145e8040ec6360b49a5f1f
+EBUILD txt2tags-3.7.ebuild 527 BLAKE2B cb3a5bb606857c0932cd0075516fc889c4f6725dd361ee2bff18f9c8f598ba6b8883b52a5a6c9514609ea190aeb9d4c324dcd417773fe6c22381fcfd2f1a2524 SHA512 7f00ff8d5d28a7798100f1d88260519dea446e5996b87d724c1ae30d03d9b1262ebd1dfa62044fd672d6365e89a4e3e0dce8454e03265c71573078d4f0d4b66b
 MISC metadata.xml 245 BLAKE2B e2a831e97b1c75aa3e161109943ede73b2d686a83fbb11b84d3f201c8214b997d759c93298c2d7f14a6a8486443cc52ea9369fc12476747528509d9d8807b1c9 SHA512 4fa0282e97338eef99cd0be8c2cda4a5eb6d6c1393a41782a45ad172c9b99690d572598f3de81f5828ab568fe32d4b28890c22908f86c73ac8e399837f28fddb
diff --git a/app-text/txt2tags/txt2tags-3.7.ebuild b/app-text/txt2tags/txt2tags-3.7.ebuild
index b29495dda13b..8917079d6b34 100644
--- a/app-text/txt2tags/txt2tags-3.7.ebuild
+++ b/app-text/txt2tags/txt2tags-3.7.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,4 +14,4 @@ SRC_URI="https://codeload.github.com/txt2tags/txt2tags/tar.gz/${PV} -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
diff --git a/app-text/u2ps/Manifest b/app-text/u2ps/Manifest
index 7599178a5ae2..0de9da18a660 100644
--- a/app-text/u2ps/Manifest
+++ b/app-text/u2ps/Manifest
@@ -1,7 +1,5 @@
 AUX u2ps-1.1-nostrip.patch 579 BLAKE2B 0b76323c430eb56730dc15540424d12ddc509b0dbb4dab2a58a2bdd92d24952d95527faa62d39d295c3eb90f90403ce9fbdac6ee0791c61b021dea8dc4e97ab5 SHA512 8b45c626f439c7f72be092a310dd105bd1348185ed4c2bea05b084360b4b5f01cbd7cc6a2b1b3b9e8510bc1f1cc4feca429b0347bbc7a9c40694cb78af4391ac
 AUX u2ps-1.2-respect-ldflags.patch 337 BLAKE2B bfb1dcfeffe9bef0fa201fa71679e5c63a114c4fbcdecae249da5fb13d8600fc4acc101e6a32a9caab806dc2bfc4b14e73ca14fda478f12f5cd929c24ba51ca3 SHA512 e967f92c06a30a490604efaedc681d4156acc8dee8ace9e73bdc75b693f8a74dfe1ddfa6261c5c0f1dc3e9661868c7085518dd65cddd2ff6c93e4a2f98fb14c3
-DIST u2ps-1.1.tar.gz 110892 BLAKE2B af0dd92d47a8530e8434983132c3bf0f0e6b88ff14cc9d7e73e95c842b4c1dad1b900d91c22a34c8f94373e62382841329e5b2e6b3aa9b51f6e5d6d6d164b596 SHA512 44a470268aafe7b90c17e14a15864924d0ba78b0c8707b9bf076e13b262a9d43d71b6527c5a995f82741e52fe2d07eac6a2626921e7465127a57405d4b5babd3
 DIST u2ps-1.2.tar.gz 110917 BLAKE2B 223aec319d36191032e45a73d9053a970ef76c780c9260e3d6a3799c24f80eb0bddd645de87806570844c3e4e763a2eb1929d44bf122daeaebcefd711d61d35d SHA512 3c5c12b50b6d2d50c67a1051375aeb4cfb32a2c8c898837313ac7ff4a11f30c4625f71f77203f7b1367b1ccdb9143a1106b99deaef8f964af3d08336ce686198
-EBUILD u2ps-1.1.ebuild 683 BLAKE2B 03ac72e425c30bb34bfdb9b790b16a697545f51f5d152203f9eb64bb05237e3ec0acaf4e18a1b4935ce8d2fa0020ce185c9ac8b9828710453ed1080b345ed512 SHA512 65d1d3dad868a2bbb3c3dba3fdf5f9037b3a301157f943ba087e8a0733e8447def370f04fdb866231c1b77d4308a8e06551f8bdbc3a2eab2ce88ebe75a7faea4
-EBUILD u2ps-1.2.ebuild 816 BLAKE2B d0a0aa4587135beb17b032c2c6b83881e4f38f9e7eb8d4c819057e26f367a4b08fbdf891b97bbc1ccbd779425b2da09bd23ef39f6c18f571ad051b4cfb4891ef SHA512 e69458dc9c28511127052b3514bf29a192be743ad3415c96b9464fb7ea860d0b8e79af1b0a8cd18d16844bc55c1e0c721a6fba21a2a64cf3a955c83894b71b8e
+EBUILD u2ps-1.2.ebuild 815 BLAKE2B a824c828098608b30f732aeb25eb7932eee78b1187805d8eae1e71613ff105483b05b1814913aed98e481e010006896e62538087a9d7728dd693c634632fa2e3 SHA512 1d78d6ff6776813b738e6dd18197a5516935741c7cdf17d35850ca519b89f76582138b27c15170e9b9c2d7adbeb78444427d4adba20600a0646957ac507120e3
 MISC metadata.xml 249 BLAKE2B c8d28416ba97bac363e00b75508b255979d89984b4b053fb86e63deb2070dc32a4a363e5594e4fcf4a4c33268fd59e5e4d3c962087c7cd97e2912a6d62f0cefe SHA512 23e993b72c46792c1d03d216adc82fe8392b7b695187308ad3c5b181da2dbd9d1f68b884c60429e3bcae79693112369ef84a02545aeda90460aa2504b4057d5a
diff --git a/app-text/u2ps/u2ps-1.1.ebuild b/app-text/u2ps/u2ps-1.1.ebuild
deleted file mode 100644
index e8d7cb002289..000000000000
--- a/app-text/u2ps/u2ps-1.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A text to PostScript converter like a2ps, but supports UTF-8"
-HOMEPAGE="https://github.com/arsv/u2ps"
-SRC_URI="https://github.com/arsv/${PN}/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="app-text/ghostscript-gpl"
-RDEPEND="${DEPEND}"
-BDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-nostrip.patch" )
-
-src_configure() {
-	# this isnt autoconf, so econf fails...
-	./configure \
-		--prefix=/usr \
-		--datadir=/usr/share \
-		--mandir=/usr/share/man \
-		--with-gs=/usr/bin/gs \
-		|| die 'configure failed'
-}
diff --git a/app-text/u2ps/u2ps-1.2.ebuild b/app-text/u2ps/u2ps-1.2.ebuild
index b26e759a2a62..71ad11c5557b 100644
--- a/app-text/u2ps/u2ps-1.2.ebuild
+++ b/app-text/u2ps/u2ps-1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/arsv/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="app-text/ghostscript-gpl"
 RDEPEND="${DEPEND}"
diff --git a/app-text/vilistextum/Manifest b/app-text/vilistextum/Manifest
index a1b39716c3e3..5974427a0098 100644
--- a/app-text/vilistextum/Manifest
+++ b/app-text/vilistextum/Manifest
@@ -12,7 +12,7 @@ AUX vilistextum-2.8.0.20200411-list-alignment.patch 855 BLAKE2B e23391c5e3e33d05
 DIST vilistextum-2.6.9.tar.bz2 147743 BLAKE2B 1cf6f187cb277271ddd9946984afb4d59336ea0cd446e62df3593070ccc63b3510a107e2b7e7b8dc757c63e4f5caf3790c7d998b6be325f4d22d2a6b9fea3432 SHA512 ce76a4061b766e4544d1a86986333314a3b6959439ba6995a2977c10b01b0142c524d4b215c3272a1dcfcc4f5b6fda03210de95d65cedecfc6a1c940cedf487d
 DIST vilistextum-2.8.0.20191023.tar.gz 219395 BLAKE2B 5e3962b4b18b9e6e3896f26e04a63394b3ed58473862f264a3255641b5d13474e12529acadcff3d2f71eb5a41ec7b11a1367f3da15e473551e87e554472f6727 SHA512 99023b4801159047e1433dc5a887e6164192f7aa25bdc79594e717f047f83177612e5120d55cbbc22f3ad4e225bc229a0b186f7fc337c6081ff27ac781422f4e
 DIST vilistextum-2.8.0.20200411.tar.gz 219791 BLAKE2B 95b86d17e8dbf29b520aa48c88eb8c9e8abb01a234848ed55bdad0a63a7c0ec8ca9ae7c437fe7f84bbf7f4dad74fc8437a9e3b53493552e9e01b8029b10ef18a SHA512 40a219ebe7bebd61548a3bad794690cf091b67b70e8e6c44548a0c1b9f61077b141a035335e7128b191a8501103707f5324b00326a407e29ec0fee383c4d0917
-EBUILD vilistextum-2.6.9-r1.ebuild 1806 BLAKE2B 9692e921e5f06d757f4b47c753829e2439135eea8727fc6dc9900842abe0e991ad312fb30381d8b7e248fdcbd979f35bc18492cbd11ffb444d64d6ade0e7d997 SHA512 261bc0e2152ac048f39508c57e5affda589df7ed5d53cd2e204adcbcd636bda4cd67753ae88e4a6a48e855b4f0e0ed90ab8b9f3fbd8e368bcdb840e5e5780fce
-EBUILD vilistextum-2.8.0.20191023-r1.ebuild 2053 BLAKE2B 41e02bcc3319ec55627824665b66b09c1892bda67ef6ec5964eac3aaea0b144ac8f89b3528753383a51d5c3127c4145bc2204e388ee886d367891951c3ea3e1e SHA512 72a7041a04141e6b3dcb27c03c546e898c0926f3e6164f731b17a3aaea34b62b749c0c63c8c0c0d57ea71cace8e6a86f9baac036bc97dce991cd0fd76c97e6e3
-EBUILD vilistextum-2.8.0.20200411.ebuild 2024 BLAKE2B 9417906045d9e0db48e70fbed1955638d07534432c481e0f0f1612929f0e8ace58e60a8a372662ff21c00c4b93e85efd6bf25ad75ad62352535d2d09e45a31bb SHA512 40566437e477aa0945e7abf4aebf1c40eaeca526b8545cf4cb9d7226674151c556a30c7376190ef83bacc95d0a2acecd52bc658036ddf1def6625cfc5032e5af
+EBUILD vilistextum-2.6.9-r1.ebuild 1795 BLAKE2B 3a9b4d9462338f2524f649aedb4945012c093f7275f3a9ee1f5852f049318ac06634c74362f6eddae65cca4e339aff8d87801b18628785f3c72b6eba794b983c SHA512 ce2733938218ede9fc6577567887cc9d6d6668ee04a1c077ad125ddc4f3db263cf96d863ff9402a3200370d10552bbf5a21433aa72746c034fda5e337c545697
+EBUILD vilistextum-2.8.0.20191023-r1.ebuild 2042 BLAKE2B 43f180fa1d9526d2b86d33512195ca3601808bd82cbbf9ec4f6bcf19c1b00edd30cf05a148070fdbe455dd851da0ebe84b27b6715e0f702518eed32364803bf9 SHA512 b68a906d38a98ea2a69d1d1eead9588f181a118c83ea84a6ae05d768b54d29718af2b8549e6ed98b45064b1e0ea6b45bf8b7258d61e6baf7a5314b4523b2fa56
+EBUILD vilistextum-2.8.0.20200411.ebuild 2013 BLAKE2B a922c1aa97ec3d0a1f87a07ba78e58b0d7db1c9833c56a45a77db53ad40f3876519a0d7d4d3e3bc0cf68ba01bec87cf262a2bacdfde45108d1d2f2dc042c2c9a SHA512 36429d685f784440d7b1a1cbcc260c3ea1e774a27d0b5f9d44051daa639e04e01d8ae5e7c300f5d684db350f38daa77feb5c2b4aa0c5e662f713be6610930fb5
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild b/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
index 3f7750da8202..37ed62c44954 100644
--- a/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
+++ b/app-text/vilistextum/vilistextum-2.6.9-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://bhaak.net/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 #IUSE="unicode kde"
 IUSE="unicode"
 
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20191023-r1.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20191023-r1.ebuild
index 4b514c9679a9..d36c583c8dda 100644
--- a/app-text/vilistextum/vilistextum-2.8.0.20191023-r1.ebuild
+++ b/app-text/vilistextum/vilistextum-2.8.0.20191023-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${GITID}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="unicode"
 
 DEPEND="virtual/libiconv"
diff --git a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild b/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
index dd8c207c466e..53e0a57b8f02 100644
--- a/app-text/vilistextum/vilistextum-2.8.0.20200411.ebuild
+++ b/app-text/vilistextum/vilistextum-2.8.0.20200411.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
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-${GITID}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
 IUSE="unicode"
 
 DEPEND="virtual/libiconv"
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index f518fd188935..5e1f1a3859cf 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 880 BLAKE2B 4c386057db6fa83679b42c0314abe6336dda9bfcdfc2c5887037595f210b8eaa81509ecacf991ee77b90597ae5fe21c19d3cbb27b73854468840977bb2c391fd SHA512 ad0383422e8aa931adeeb787d47d2fc2c189fa2b65bf6f7cb70657b6846de9bd71a1a1541d3423434689c75ee133cb8af3f80603408c0933e2e95eb5485bcb5b
+EBUILD wdiff-1.2.2-r1.ebuild 869 BLAKE2B 426d5ee138f5fa6f86702b391b8fccb6c65867cd2271712eeabbb4678a6b9f91ec8c26bb5a4f438df0e7b044b342946727949126e3f28b9dda8691aa825e1917 SHA512 47448ef8e3d4d8ec636116de592d449fd8ae2e59043087a0319deb3d77414a0c95d2cde2a8abe2e33503c0b848f0eaae8ae15b89d332aac6ae9177d6a19d704f
 MISC metadata.xml 377 BLAKE2B ddada9afaa9d6031b4493ad27870959d71c7ad7852399b36468f41c0c11dbd591e0809101927d82a4f80520562b1fb8b65d577086218cc922a7b0e03b761005a SHA512 675191d217533506137aa85c390cbcf2c9683157b451c862701b5ab59d3ca437266243af0cb458f7ee5150fadb444a7eda648091eaa8b4f7e211e0bd98d92c7a
diff --git a/app-text/wdiff/wdiff-1.2.2-r1.ebuild b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
index f8235bcf109d..4e865d7184db 100644
--- a/app-text/wdiff/wdiff-1.2.2-r1.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~sparc-solaris"
 IUSE="experimental test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 41f55e17c692..29c8b790b791 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 640 BLAKE2B b4f75da02e4c66d7f36fef92d221410423317ad84467745dc93b0a0a1b5ecddcc21bdc50781225e0b901b8c13fbf1ab0ce79600031ed7992137d2bf6ad11fe31 SHA512 fe73007ace22daeb9c3f286f858fab08a11f044d2eacbb0df7199bbdff226345a9028d0169aebf444310fafb91141d6227b9d924b43618968194922a9d2cd6ad
+EBUILD xmldiff-2.4.ebuild 638 BLAKE2B 1d359e9782b14a28ad024906e3fd49bcbf76ce7d3e3bdc91be8d4c29b93cc668e4d5ecbb331f0b54a09392e3e50bebe16e61a1485f012a1ccb0eb7d7b8c5d3de SHA512 9d6ebc21102bb07aceaf5c84c9b5fd42e9e9091b066f0d7f8e48ab0b547e9e8d8cd07e68e41979ad0ead1d58fd33e38db52545ec0a34cdcb8a412d1301dc33b5
 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 ad30ca94a723..77e4b4f9ab53 100644
--- a/app-text/xmldiff/xmldiff-2.4.ebuild
+++ b/app-text/xmldiff/xmldiff-2.4.ebuild
@@ -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/xmlto/Manifest b/app-text/xmlto/Manifest
index a25d4cf1ed1b..bd23380ba4af 100644
--- a/app-text/xmlto/Manifest
+++ b/app-text/xmlto/Manifest
@@ -1,4 +1,4 @@
 AUX xmlto-0.0.22-format_fo_passivetex_check.patch 2286 BLAKE2B eb004b4fa394840b8e6fd792bfacfee75d180a1493d960348a33c7737a33a15a809fff28f4b6ade3deb045b629eb48a675b56037da56a7fabcd20718dfdaa6a4 SHA512 c8eeb3dc909431dd2fb9f5286b6ee98a40dce80a29606a9884bdab50c039ac90097720b9b968dfac76546492844de0b72f2f6c937da14b47142ad81b897023f4
 DIST xmlto-0.0.28.tar.bz2 127921 BLAKE2B 12ef3e2e1436c330e7b003d08f4a4d4032d70255777956949eb8b47b6f5466e7c158b0f85dc87069c1e379603cac0b01c88589f98ca1ef9e862f0aef31169f6d SHA512 6e0c4968d4f1b7a3b132904182aa72a73f6167553eabdeb65cfafa6295ef7b960541685769d04144207963cca77b0c44db4f9fbb2796348ffcb37b3b399f18f1
-EBUILD xmlto-0.0.28-r3.ebuild 1431 BLAKE2B 769b8e65b67c99527ffafed511b5681072739aa01e5c361ed86fdfcaed178698fbd2f5a5f14cd55a3fd033c270da1d25157c6414ab7500d2d93dfbf3fcd9048c SHA512 a0a2c8b319a067354454c34ae959d2766d7b1e2ecd6aa7905d2a28727cb49fe210e85bc6ffe552d8b7f7107d6778f31167aeddb95caf63e5244ec438291e515c
+EBUILD xmlto-0.0.28-r3.ebuild 1420 BLAKE2B fb16508bb472a89a2312c7fba3d61694f59fbbf28f6a011fcb000439146ac40f7175a85fe416958bb0cc491d8388b02ddfa9782a3ee90f898f1c56b57dc37b51 SHA512 5d40affae036b2dc9e1d44136c00b3cd68327a06d7946cebb219c597acadabd0b64f006481e439693e28ba28373c44c7c89e5f5ef9ce758274791edc82642ad5
 MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
diff --git a/app-text/xmlto/xmlto-0.0.28-r3.ebuild b/app-text/xmlto/xmlto-0.0.28-r3.ebuild
index 5602e66567e0..21e100a54846 100644
--- a/app-text/xmlto/xmlto-0.0.28-r3.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r3.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=5
@@ -10,7 +10,7 @@ SRC_URI="https://releases.pagure.org/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="latex text"
 
 RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
diff --git a/app-text/yodl/Manifest b/app-text/yodl/Manifest
index 112c3550de69..595584f3e2cb 100644
--- a/app-text/yodl/Manifest
+++ b/app-text/yodl/Manifest
@@ -1,5 +1,7 @@
 DIST yodl-4.02.01.tar.gz 308670 BLAKE2B f94c094f17ec99e66f64a704e41814274f61128ff21b11077d772874dcbc9f15fbc878df8831e7f73d9b6c89a497462c694bc0bdb6cd5637c0db08303e3838d5 SHA512 59e23bb173786b8806f56bf302dee9d8d971d0d840c609e2b24d9783b5866fca2509be844616318f9a4f302117b3a41f620be5cba09181e7ccdcf0c141402be7
 DIST yodl-4.02.02.tar.gz 309075 BLAKE2B ce9da287ca59e20319ae8a132553b669ffff926c79e7ffbf7891af3e777c45815cbd784eaf8d706b7f4b8240ceac41c38882c7b5d2b51e2691da249b0f5be43b SHA512 531b5b61f85ed556163b0cf76a30451212849e5e03e11819cc466603db0856737a9d3bc34ba11419befd7925ec1bac33f92b707c38acd2fa8047e3e1223d0a78
+DIST yodl-4.03.00.tar.gz 309212 BLAKE2B 9a89dfda5f4138f466bc2f871724087ff2c0084d06d81c32e1e865744e1c133b1073becac30e817f2f997c351b8f8192e942616174acb644dcab40d5d64c9d36 SHA512 ec5edaf932d94e9272a08867322e8fbfec65f612447fa412a7c19412569a6d811bbe5badd0af692837086a9ee8cdf8bb8f0c10a3e8333ef6096513b263c8d831
 EBUILD yodl-4.02.01.ebuild 1184 BLAKE2B 7547e9d39fd312c30e1d465cec9f95fc15ef1acfd04e45af85105b95ef57a5fa8a24949d2d70348c9c03a89a060c59a785f771f0a70eb99b673753c0ea939bfd SHA512 a33e23178c78cad05f8f3c1e1b67cab2676706e2c989346a823c993ee3ac60dbe3c303a01c71d38ef9bb5cbcbd8ef039e0ef63c8cec52409a9ed200a6d53dbf4
 EBUILD yodl-4.02.02-r1.ebuild 1796 BLAKE2B 40a83cd6c04bd975f6562f80b4c699027763816ca55594cdf647ba2f06f47328eee0c4351a1a7f94849b793ebb96dd8de3c3170613f2380b3a8a580fb1d3c994 SHA512 a9fa0a475da628273c15a772983821aa1ebb50656be96d2724f104f2c6eadc087ad354ac5b6812ca96970a9f21eeb6fd7ade54a03294b63ba8d3df3f1316825a
+EBUILD yodl-4.03.00.ebuild 1797 BLAKE2B dc4fb5136959359504ee13f2913fa30580324b093ea2511e2dc87f4985137004b535be551217242f259708bea391d5284e731567533c9d67e27cda89f1416046 SHA512 6d18ec183571d32048b9ad756298cb879eb2672c239762da2ec91a29299afb07e2b28933a0641b839c20c71fbb23350327e3e77d077d655d02d369a3d72a419e
 MISC metadata.xml 244 BLAKE2B 256b5e0596820baf1555605a91d2b5a2454bd96180ac95ea34b705405212a37eca42f21754f8f11f875607f97b82badc149211361ec253226593297d867d1376 SHA512 4116d229be9545299fb52d43d3c5f3f1bcd44e53ebb05483cf231f05d76758b59a6a1a6b7b2eb0fc78304dc3a2422d9ba70c89ac159eef4afbcc5730b58f297e
diff --git a/app-text/yodl/yodl-4.03.00.ebuild b/app-text/yodl/yodl-4.03.00.ebuild
new file mode 100644
index 000000000000..0f7adc8fbc7a
--- /dev/null
+++ b/app-text/yodl/yodl-4.03.00.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Your Own Document Language: a pre-document language and tools to process it"
+HOMEPAGE="https://fbb-git.gitlab.io/yodl/ https://gitlab.com/fbb-git/yodl"
+SRC_URI="https://gitlab.com/fbb-git/${PN}/-/archive/${PV}/${P}.tar.gz"
+S="${WORKDIR}/${P}/${PN}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+BDEPEND="
+	>=dev-util/icmake-8.00.00
+	doc? (
+		dev-texlive/texlive-latexextra
+		dev-texlive/texlive-plaingeneric
+	)
+"
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != "binary" ]]; then
+		if tc-is-gcc && [[ $(gcc-major-version) -lt 8 ]]; then
+			die "Your compiler doesn't fully support C++17. Use GCC 8 or newer."
+		elif tc-is-clang && [[ $(clang-major-version) -lt 6 ]]; then
+			die "Your compiler doesn't fully support C++17. Use Clang 6 or newer."
+		fi
+	fi
+}
+
+src_prepare() {
+	sed -e "/DOC.* =/s/yodl\(-doc\)\?/${PF}/" \
+		-e "/COMPILER =/s/gcc/$(tc-getCC)/" \
+		-e "/CXX =/s/g++/$(tc-getCXX)/" \
+		-i INSTALL.im || die
+
+	sed -e "s/g++/$(tc-getCXX)/" \
+		-e "s:#define CLS://\0:" \
+		-i verbinsert/icmconf || die
+
+	sed -e "s/ar r /$(tc-getAR) r /" \
+		-e "s/ranlib/$(tc-getRANLIB)/" \
+		-i icmake/stdcompile || die
+
+	sed -e '/strip/s|"-s"|""|g' \
+		-i icmake/program || die
+
+	# required for std::filesystem usage
+	append-cxxflags -std=c++17
+
+	default
+}
+
+src_compile() {
+	local target
+	for target in  programs macros man $(usex doc manual ''); do
+		./build ${target} || die "${target} failed"
+	done
+}
+
+src_install() {
+	./build install programs "${ED}" || die
+	./build install macros "${ED}" || die
+	./build install man "${ED}" || die
+	./build install docs "${ED}" || die
+	use doc && { ./build install manual "${ED}" || die ; }
+}
author	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2021-01-08 11:28:34 +0000
commit	24fd814c326e282c4321965c31f341dad77e270d (patch)
tree	033d63b33c21a3209964ab56005bb9bdd523630d /app-text
parent	129160ec854dca4c3fedb5bcfbcb56930371da0f (diff)