gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /app-text
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
274 files changed, 622 insertions, 1695 deletions
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index deb955ac82de..a938f4d834a0 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/a2ps/Manifest b/app-text/a2ps/Manifest
index d00f2fa058c9..8d91858f7d45 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 3641 BLAKE2B 610ec607885f418601dcba97914958b715551d05a10171097ba95873149b1bb4818d04c85765b5720858b095e51565e69a09d80ab902d54b9c5de4473ffbd925 SHA512 5b6f2cfb666a2ae626e89be7be30044b64ed80862a2a4076982e58b8145429e77dbfe465e658429a68d5f719da0adf54a5a1950817e8501fd40e751b34f7f638
+EBUILD a2ps-4.14-r6.ebuild 3642 BLAKE2B 4f3c8297e553aa7b86b048d8eac1fec88db7de130627ab26b2f59697e70cd38369d4058f3ddf2b4ea2f9201d9bded336cd213638d796d7ac4011c5e12b1317f9 SHA512 9b615cc1e4e28f95691443b48a09d8b2dc3506afa00d5e26883315198130699c09482973eee31e8a04e9349f6ccf52d3b99759e4d4e16445431d9ae4092e6a6d
 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 516e52823725..86a4a8512655 100644
--- a/app-text/a2ps/a2ps-4.14-r6.ebuild
+++ b/app-text/a2ps/a2ps-4.14-r6.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="cjk emacs latex nls static-libs userland_BSD userland_GNU vanilla"
 
 RESTRICT=test
diff --git a/app-text/aiksaurus/Manifest b/app-text/aiksaurus/Manifest
index c4b87e8fd4b9..1a698e1b71cc 100644
--- a/app-text/aiksaurus/Manifest
+++ b/app-text/aiksaurus/Manifest
@@ -2,5 +2,5 @@ AUX aiksaurus-1.2.1-format-security.patch 822 BLAKE2B f8891b9772367ce4aef4b68e3a
 AUX aiksaurus-1.2.1-gcc43.patch 734 BLAKE2B 9c8b5c401bc116d9daa52ee100bd42127639330449b44d0012494fd8536d46dd99079ee606df794b515ae002d5834f379706af7ecb41785593be150842baaa53 SHA512 6f821ac66f0dd4601f84a6fe8f71b14712854e293f4ebc755a80d34032725cee61b919da1547b514e3d8b6a07edd29016ae53283a28f1792119ae99850016241
 DIST aiksaurus-1.2.1.tar.gz 928893 BLAKE2B 12bcc77eccd921e4e2dd3f148be76905bb162a38483b0aee620be2fe069685a4289df4ec12f91286eb88d9c2f1f4d58556b0b6ac38857fe4f11bb5d31adff496 SHA512 48591850f28f1a8f4b4986df14090ef7bd57cbfbad739cb0013db021f6f5bcb3c592b38e36774735499e27b9e99330504f8d9c6022158e25469cbc81d13f7463
 EBUILD aiksaurus-1.2.1-r1.ebuild 911 BLAKE2B 123b26f66856a3447fd19c282cb6b33dc2fd82d0cb98fa36b8a09fa798a410f6e6f202da88a03ae6c87b6a640b6b4b97c10cb9b7034d71ec8480e1f191646711 SHA512 81e07f8b5aa16025e0a6a980eb0d5a42d2d45001a660f72ac5aa9148693dd101975c5eee1ca0c87355313194651cf378757ea6af4b5d7e23aa721a644bf5e5e1
-EBUILD aiksaurus-1.2.1.ebuild 793 BLAKE2B a95cc8ac39de6255d16bbc9b14f25c80a3403660ab7086f3cb75d21cba5e72b6764e48c7c0fe75653e3b70cdecada769efc76f9da8992bff9572b49635893856 SHA512 dea3afd48ed71d0b2e7c0c265d12af342c309ebb4f40261f32b8f80cf8bb2a1a6f7928b4640bdaea6b8a2eb4008260ef1e5e67b1ffa71b0bd32860646efce088
+EBUILD aiksaurus-1.2.1.ebuild 794 BLAKE2B d233fa13e149041d67c70bab3d9953d07f120b4ec8c35352251592b92b5331fc2fca0a039746d0dd25d22a4082bfab500872e67d4ab1f6d328f8907f3d6f5ce1 SHA512 d639bb6a2d2b8ef6565f5c2e0b1c30666b04a1fd275fa62d1f7da24da57111878a3f0dedc82a10f0f1328eff1f5dd9240a9ce5b0495900704657999d8fdbeb8e
 MISC metadata.xml 245 BLAKE2B 163eaf1f9854d0f7906920339f1ddf8321c4658b23e14d44bdc7e07ea3eba22d7cedb1cc63285aff307a1287555463807160d380836d63032637eacd5ce97f1d SHA512 34945e0950bf668d24db2565287fdd8484cccb8968df2efbcc665905ee583f45222fe0ff848c267cf9a25f58d3aae9e870656d88b1f813b7812a185782564e08
diff --git a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
index cea5c259a4d3..acab9592005e 100644
--- a/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
+++ b/app-text/aiksaurus/aiksaurus-1.2.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="gtk"
 
 RDEPEND="gtk? ( x11-libs/gtk+:2 )"
diff --git a/app-text/antiword/Manifest b/app-text/antiword/Manifest
index b59782699128..37eb6bb5262e 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 1381 BLAKE2B 0e2161bf4fc71bbdf466aa8f279104231163dba8286c1f06b399889a7798651842118e8a003ab2a0342505f883be4dc4660af55735ac3378d74994d47bbebbce SHA512 f214ecea89b8cf04974cbf9c6bc940ce96683998570b5ec90e19648be2fce441d2ce5809b932bd2156379152d585bcaa5eec833bd888c26fae07d411df1ded85
+EBUILD antiword-0.37-r1.ebuild 1382 BLAKE2B 5959e0f322381f7452a9843881508c82c45527885e1ef78333087507490bace13d0bfe7e5f11e2820f3aedbac9b6a7f28ea4527208b944b76178900ec1a5af98 SHA512 370e8e840879d57f705fb207156f53e00658c9b152c0ce89543659dcf33eaa6963686fb65c81694c01f137c9a8c979fdd9e00ff82da1a794ca9f22e2c7c71732
 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 53c8c77377b0..d9b88b122f28 100644
--- a/app-text/antiword/antiword-0.37-r1.ebuild
+++ b/app-text/antiword/antiword-0.37-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.winfield.demon.nl/linux/${P}.tar.gz
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 src_prepare() {
 	# Makefile is a symlink to Makefile.Linux, avoid that we patch it by
diff --git a/app-text/asciidoc/Manifest b/app-text/asciidoc/Manifest
index 0a9c2504a542..0a12099dee72 100644
--- a/app-text/asciidoc/Manifest
+++ b/app-text/asciidoc/Manifest
@@ -1,3 +1,3 @@
 DIST asciidoc-8.6.10_p20181016.tar.gz 576694 BLAKE2B 4d255606675346d00ab03398bf48cb30d357f9f9366944e4faf66ae4c96dafce49acdd930fc848f3dbb2d704a004bb5815d17b53416a76c8368a92e4716328b2 SHA512 801f360b0c444e932f1c50897d446de0ec3f0fb2206080b5aa6dda396fede96065f7bb629a84c8a8e40c5d8897f305fdb1877512f04ae757f3b142fd3a7305d0
-EBUILD asciidoc-8.6.10_p20181016.ebuild 2579 BLAKE2B 2f67af887cf2cbb86d5c8fde6825a536cb6534f85e2b3bccdeb04e57b71dc9f7906bf847f886bb393657bc920d20f018a52df65c10a5440e7443a840282a4134 SHA512 4e36560dea5ce1a59260e5ad5465c63a220691d3acddedecc985ff2297a1bc1fb5c0fa6b8f9add2feb775cd5daebe592fbedcfcfeb470cc10f5b6ac67a70124a
+EBUILD asciidoc-8.6.10_p20181016.ebuild 2580 BLAKE2B 05f5a6ca1c08d08837e0be753ec5f15d2e0e5632e4de5d62b359a8054b4c371e5ab0d0bca8755461cf1cc37f92034f0b848fa1fc7a975164aea6b896225137f4 SHA512 9005a49fcf9e12e89ef5de448f7f70e9d33b0c74abdd62b41bcd9929cafaf302bf78c2e06b301d7f2ad8c32841a199f9bc982f0bccd92cd1a8587bdee53b5dc0
 MISC metadata.xml 514 BLAKE2B 89fefee3e8081fc45a8251255bf365f58eba6aa9eef92a23bd8f234703b7062b1dd2a415260fcda1b799cffa4b46d0da22b153ba8de6b77cb6076666ff43ccb7 SHA512 2587ac6d8c24ceca295eef2dc6e0735461dd09864d6a1f282d67fc3c58cd18aa565099a2c280edec143024295b74a251152918932c37d3be450aef68d367ca70
diff --git a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
index 73ce57de3752..5f5423e5152c 100644
--- a/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
+++ b/app-text/asciidoc/asciidoc-8.6.10_p20181016.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="A plain text human readable/writable document format"
 HOMEPAGE="http://asciidoc.org/ https://github.com/asciidoc/asciidoc-py3/"
 MY_COMMIT="618f6e6f6b558ed1e5f2588cd60a5a6b4f881ca0"
 SRC_URI="https://github.com/${PN}/${PN}-py3/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-text/aspell/Manifest b/app-text/aspell/Manifest
index 8c07f77c295d..125642d84621 100644
--- a/app-text/aspell/Manifest
+++ b/app-text/aspell/Manifest
@@ -7,6 +7,6 @@ DIST aspell-0.60.7-rc1.tar.gz 2034916 BLAKE2B 7518660b0bb7f75aa3b659519a97132675
 DIST aspell-0.60.7.tar.gz 2071890 BLAKE2B d0c8780179cca304361b9d58be667f3dd99d9319cbcffd92a0cc69c65c3a40410b10f6953471ddd9d6df355b557761ffff71ccb5bc6995a57de69a9adb07db66 SHA512 6f5fcd1c29164ee18f205594b66f382b51d19b17686293a931ca92c1442d3f7228627ca7d604d860551d0d367ac34dfb2ae34170a844f51e84e390fb1edc4535
 DIST aspell-0.60.8.tar.gz 3486448 BLAKE2B a72e70af65749059a576740377f93b20ab283f73fa7919894f6af189b5aa73581fa0410800851c9396e7d13f4cbc2f7edc23c53d46874d0389ffdb2432ff08c2 SHA512 8ef4952c553b6234dfe777240d2d97beb13ef9201e18d56bee3b5068d13525db3625b7130d9f5122f7c529da0ccb0c70eb852a81472a7d15fb7c4ee5ba21cd29
 EBUILD aspell-0.60.7.ebuild 2760 BLAKE2B 60bdbc0c7b9bae9d1581b56739f787757e4f997df5555ea281d911a6a499c6f8e2f868585ff56d91f0fd623fb02dd621dba4cb5443737451404ca58cf587e4aa SHA512 e1b48dfcba09975fd4648483b5923ce598eca3f61a0caf9256b2ac6986c12f56ac3911a74e70312b2d84e0c7d4494ffc190b57ec17683f60846fdbaf538c88ad
-EBUILD aspell-0.60.7_rc1.ebuild 2693 BLAKE2B d8e53782f55571c0c53d2dce4069e3c3f2113a4977c78ed113294d4e7d342dbb2b295c3606f1a760212cbd0958cb3aad57a3a161c4ef6eeb3b4c558ddfd89a98 SHA512 54bc31bd148687657ab4700bf757bdd9d632689a50a28f606b29c5e550341acd9f4fde53bca338406127764ee9c467aa801b9a234b18f44d422112fc3e5d88ca
+EBUILD aspell-0.60.7_rc1.ebuild 2694 BLAKE2B 2f7e60837db7e2355e9b47e3095732b2401a3080127bec55b1534447d4de96fe69cff4c53e7d80fbf67148ee58f676b8df3b9b99b9cf451f15aa1f9dab5c4594 SHA512 ffafce2079be426c182ae9c03d56a015455fd372b55bd8c5197b9d8927365bad3f0539c37d70f831da1ace8f424f85d2d6d24bfbb138470da261ea831c2be818
 EBUILD aspell-0.60.8.ebuild 2760 BLAKE2B 60bdbc0c7b9bae9d1581b56739f787757e4f997df5555ea281d911a6a499c6f8e2f868585ff56d91f0fd623fb02dd621dba4cb5443737451404ca58cf587e4aa SHA512 e1b48dfcba09975fd4648483b5923ce598eca3f61a0caf9256b2ac6986c12f56ac3911a74e70312b2d84e0c7d4494ffc190b57ec17683f60846fdbaf538c88ad
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-text/aspell/aspell-0.60.7_rc1.ebuild b/app-text/aspell/aspell-0.60.7_rc1.ebuild
index da438fc07845..c0f4cdd6e0ce 100644
--- a/app-text/aspell/aspell-0.60.7_rc1.ebuild
+++ b/app-text/aspell/aspell-0.60.7_rc1.ebuild
@@ -17,7 +17,7 @@ fi
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls unicode"
 
 PDEPEND="app-dicts/aspell-en"
diff --git a/app-text/bdf2psf/Manifest b/app-text/bdf2psf/Manifest
index df0dd89806c6..63a7be02eb3f 100644
--- a/app-text/bdf2psf/Manifest
+++ b/app-text/bdf2psf/Manifest
@@ -1,5 +1,5 @@
 DIST console-setup_1.104.tar.gz 3272857 BLAKE2B ae7a5929a059ddd2258884e5207198ae517da1284e264527878ad25bf883e48b399e53f2a987265623a5cffa3eefce8cce5fe8ad632576c46bba40689c17c586 SHA512 72b07a0ed955069777c1691b16753534630bcbdb5cd94f05ae95e8c27436c233598f01418fbf52a29b6ecf7d8217e6af841778d8e5d329569f2f585b538ba03e
 DIST console-setup_1.155.tar.xz 1641952 BLAKE2B fbe1e58915c2aac1148a1de31eca5bc9b7fc078c9840b5d51d8b1211e178315360e294d81040c464e2404774594606b3fecab6f7924b1fd4bec4c24b219e9197 SHA512 e00b0b48d91c9587c0659714f74de259bf3efd1caa553c4a06d9bc545335463808db2da16797ffca1dc59cae4f524619d3cf9a68db2ff5ad7b47cdd8aced37ac
-EBUILD bdf2psf-1.104.ebuild 683 BLAKE2B 537e2bf5e0be96a56796def32a886b0cdb164957e02efd909240a5d831429550d1d1fd5648ec1ccf281b683d004ac694839063ca890fd285572c136d8c452581 SHA512 a2fae1806d040303b1304a00e4234b206991ac08cac9291e61302fbf042e259ad73517d3d7ebecaf055370273f3056ed6aa93567308e2e25b42173c082ae217f
+EBUILD bdf2psf-1.104.ebuild 684 BLAKE2B 5ded08c63fa787c36e472ce3ccc01faa4dcc742f9893370b500a124ca05440de504b31f098de2d0b1482620cc9e646b93308e29e3450883dc24e4694cf91a49a SHA512 a437a6e476839cb291ff97bf938a8ca3bb79f212183035e3905efb9821c3180dde98b0e1f11fe5cbf9aaff959e49935e390c3083565944e96cd40fc38b5a2319
 EBUILD bdf2psf-1.155.ebuild 691 BLAKE2B 68b89128f921c18f77376a4972da9a258e11b53f2ce973a83584e3c8b52750592f6ed2b97e49b90934f395b81e2024a4b1b68406eefa1451e863808f58cf0631 SHA512 39cbd5722bad1f5e8e25e2edf14a52d767eaa8fab75c56a043d7aeb7b50f28ec412e479989189f512f1b60207463084e504f75437031ca4d0fbfd96411ca0487
 MISC metadata.xml 246 BLAKE2B f94a229d0ffd7220f14c23ca2b0b6b84128338b5af27cd18ddb0c9e2f95f51c943fdfbc368c03b4a87d7bb381c668158fdc169fd067cc0cd8cd35852acc29d62 SHA512 b6df287a6e1f18bf267a05d8eb6dea788ae7ec74de31d9cea76fea038e4090c6a83d62221505d280d55e9b314d059c409e442951d78eb3a58928307ff118147b
diff --git a/app-text/bdf2psf/bdf2psf-1.104.ebuild b/app-text/bdf2psf/bdf2psf-1.104.ebuild
index 84e96bab4fc9..9234f3ff7337 100644
--- a/app-text/bdf2psf/bdf2psf-1.104.ebuild
+++ b/app-text/bdf2psf/bdf2psf-1.104.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/build-docbook-catalog/Manifest b/app-text/build-docbook-catalog/Manifest
index 2e97477168dd..5a8c56bd2588 100644
--- a/app-text/build-docbook-catalog/Manifest
+++ b/app-text/build-docbook-catalog/Manifest
@@ -1,3 +1,3 @@
 DIST build-docbook-catalog-1.21.tar.xz 4620 BLAKE2B ed4aa645a5bb8e168c291c05891a2359114c9148a81588d93542528a0c74828a1824dc98a14468e8ba65525edf5aae8c936f29190d54063064cd54e2af8dbc3c SHA512 0becc1bae100101b072c62bee844157151336aebc39a046030c8b7b501e13f1b3552097b244ac51339abd2e724304f4fe728861b7d5f070c26973998936861bc
-EBUILD build-docbook-catalog-1.21.ebuild 1071 BLAKE2B ea2ab9074f9bd1b16a6bcd40c97b336651f68f4a5356e85eb077e4e208f3d79b1f2823966870afd6cc275ca35022d5852578cde5d180acfbb9e511a48998403f SHA512 83762f55316254a2bf755cbc3b58843fc6a13be063f1f251db3ccf62aff2480c42c708addb0d4d3383733af07acd5ec5484446cd95da8489c3ae002d56be2433
+EBUILD build-docbook-catalog-1.21.ebuild 1072 BLAKE2B 7e1835926d0a079c02b1517edba8bfba7e2ff3313df79a418e5d0b29f0e14ec2a5211bb044b5df66f540df5fa0e4e59738239df6c3f978e7a2d55fca865869f0 SHA512 552fbaf057d72560ea3d533c15035c04467a989e994dd532737d310061c76595bb44384c3731ff32a96734b3556b4ea11fd826e1de84645791fdb3ebd96e31d9
 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 78f6ee18a6b3..a18a99cbe2ad 100644
--- a/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
+++ b/app-text/build-docbook-catalog/build-docbook-catalog-1.21.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( sys-apps/util-linux app-misc/getopt )
diff --git a/app-text/calibre/Manifest b/app-text/calibre/Manifest
index 9e623b64d3e9..76c53aa9c993 100644
--- a/app-text/calibre/Manifest
+++ b/app-text/calibre/Manifest
@@ -3,14 +3,8 @@ AUX calibre-disable_plugins.patch 1042 BLAKE2B 92a56016c2c54f1b156bc910314205944
 AUX calibre-server-3.conf 541 BLAKE2B 06593633721e6adf2cf2077dffa83953eea46ccdcdc857ad468a9b74788326e9424f6ab9058be344dbbac8e49d343f5a1e53ddb486f2018b77319a7f8f713cf4 SHA512 12ef793a5b6ffd4413f780a13cad63927a95f15d17d85d4229eb5005ead68e51779abb822f9898ab5ae8c2094affeec1f9e85c34f109499739e6726b7641542a
 AUX calibre-server-3.init 1796 BLAKE2B f87d785d6f6fc10fa648d40944ec8538027854bb872d9a3be6b5b35b0abf3cda1e4e93874a9422914da5eb4287f193459733956e3f1e25e61bec0c214c552c99 SHA512 88110ded1b9c6cf8d3bfc3d5889654f77578f9d299e88daea9023767b930082e00fbddbb92a6e43c46d900248f3684232d93396ec1d0e784c7ec14b44783f98a
 DIST calibre-3.48.0.tar.xz 38777408 BLAKE2B 9a7fae20487ae93120cfdc06a312a42d54d68935fdd2bc18dc41be5f8d359c79eae24e0409ba8e7f4df85e2f073f80ce6bab56cba0638cead6693600fa93cb41 SHA512 6cee28fb560e2e00b8ac2f32756f094146c6fe744cfc343d68f1fb54b3f8b0ca16129a5b35018af54a103790faa2eb03ac186c01003f21c874d2ed5218441220
-DIST calibre-4.7.0.tar.xz 37432756 BLAKE2B 5030bee02506c2051949c248a941289da7b4e6b48aa638abcf14ab9c56f6552b1043f85bc6fbae644e33843711ad11d03da4ac3a320cb7cf4590bc1d0bf92ed8 SHA512 852f3ff45cbf055571c47754b55b51607ede63865fe04263a9c8d5d59973eaa8c5da718f589d2b830567796f59d5bd5189c8e5e9455e3f98e879a37acb7174e3
-DIST calibre-4.8.0.tar.xz 37448552 BLAKE2B 416500da33c5a7e0bb84e521db757c1ba5c6e38f04c2b92ad08c2039c64a7c7cc6daddf379cffe120e966e856468cb99da6d80feab75c518a3218a2e07c9cfd9 SHA512 5ab2340d9f4a8e4592aa5929827513127830bca5830f4861db97699fe491845dd17018158dc7c143255ce57730bc9e5ba556ddebb033d18086d0e1901388f840
-DIST calibre-4.9.0.tar.xz 37536676 BLAKE2B 6dd57d1c0e57197b299d253ed7b9b0a941664dccef4fe37cb5586bc32ca29617355db8d84944d8fa9f56e09d3cfea54e9cb893f2eec07f3f359516b6c47ea074 SHA512 5442daf6143571bac5c970ff5f6285cbcd63ec30ce6e77603ef7966fa4e033b3b575fec65887defe5e511b2157ae114349851e2d0f398c117e5fccc799e01046
 DIST calibre-4.9.1.tar.xz 37529656 BLAKE2B 5d703ca0c398b43cc26a54e0628d0fe938c6a5027a4fd0c9cac83944e5143eb08439bf79b2098182be7727eaa042748f17866788b02c7744178dce131f6b1d1e SHA512 bf06aa3cbc8d255934f3f7f3ce20b4798edf107ed9f822943d2b4ae7d95473842928ed79f8ba7571f7e0ebdc267c441916d543d5b7630aae5cb151bcc3184b71
-EBUILD calibre-3.48.0-r1.ebuild 8006 BLAKE2B ce4c88fd00d7c02d884b59568beb8ed80cd30cfa72d7017efa2fa0999b0655279ce5592deadd57145e0fc85b15e3dc533d85bcf90c2328a0aa1de13ea1adfb8f SHA512 7092be18d020aef0d5b5ce3b204f3b01a4eee3df8c343c51d914318e90c1bd8ed2c2829fb41f9fc31eb43e234a4c1e9df3216f28a6eeabc49d9dbc70a00aa3e4
-EBUILD calibre-4.7.0-r1.ebuild 8178 BLAKE2B c5e45268cd6aca431ff3abfd879acdab7b501f65efb5de7d8b1dfade42b7ff4671d5c3765f2bae93f41612738c03a079bd289fe680f24544dee7fb94b798ae00 SHA512 540cb5e9821829dce85af7b09fc95837ecd8d64d5c0e84548963a373a49d87228c5a67b694bfbf20928dc4030a6d1fe736dc702408036bfbd16589f558fc34ca
-EBUILD calibre-4.8.0-r1.ebuild 8178 BLAKE2B c5e45268cd6aca431ff3abfd879acdab7b501f65efb5de7d8b1dfade42b7ff4671d5c3765f2bae93f41612738c03a079bd289fe680f24544dee7fb94b798ae00 SHA512 540cb5e9821829dce85af7b09fc95837ecd8d64d5c0e84548963a373a49d87228c5a67b694bfbf20928dc4030a6d1fe736dc702408036bfbd16589f558fc34ca
-EBUILD calibre-4.9.0.ebuild 8178 BLAKE2B c5e45268cd6aca431ff3abfd879acdab7b501f65efb5de7d8b1dfade42b7ff4671d5c3765f2bae93f41612738c03a079bd289fe680f24544dee7fb94b798ae00 SHA512 540cb5e9821829dce85af7b09fc95837ecd8d64d5c0e84548963a373a49d87228c5a67b694bfbf20928dc4030a6d1fe736dc702408036bfbd16589f558fc34ca
-EBUILD calibre-4.9.1-r1.ebuild 8286 BLAKE2B 65d8355bf16393b7a6311cc8f95732a038548733530f19e59f9ad570a690e9b5fb2d806302dfd74fcdb5df75601320bcc41092f0af68ea14b86970890a20514f SHA512 03f8d2a9256ee2fc39fee5c6e4e7c8f09b65128fe1b60bd9f118c325b882d2a667d68e1bccd9407092f340ee07b284a77db04229f39107aeaa774d183840ba8e
-EBUILD calibre-4.9.1.ebuild 8178 BLAKE2B c5e45268cd6aca431ff3abfd879acdab7b501f65efb5de7d8b1dfade42b7ff4671d5c3765f2bae93f41612738c03a079bd289fe680f24544dee7fb94b798ae00 SHA512 540cb5e9821829dce85af7b09fc95837ecd8d64d5c0e84548963a373a49d87228c5a67b694bfbf20928dc4030a6d1fe736dc702408036bfbd16589f558fc34ca
+EBUILD calibre-3.48.0-r1.ebuild 8007 BLAKE2B 882d263a21ace1a51754426534139d9cf43148e1346cfeb08eacb86fbcb584adb4588ee2c6c483caf0cd76deb6ac4b7cb8d659eef7d89adacada9770226101ed SHA512 337368328e48337f68b0e8f315bc8159ac198ca4f85e2d886fffc31c4c8d7ece07290a0036ee327dbbc1e36d96399e8104f8970e0fd394d251a06a2ca134656e
+EBUILD calibre-4.9.1-r1.ebuild 8287 BLAKE2B b101adb4af4b9afa4b65acb34c131a1cb41d5d6079e5457ba3402ead5d3e7c5fd0caac101ae75367e4b658702f534d1aa8672e632c97950cbcde8e504cc7c54c SHA512 fa945bf73f846dc8b72e0e76a818289502745bfac6dc7ce42e31e5f58a04b3ee2bfc6c6b4e39bdb1b773cc9a61d455eb652c317e73ee542e9bcfeae573030a96
+EBUILD calibre-4.9.1.ebuild 8179 BLAKE2B 402c3e4adb13c25d68e1f0e914919b46618c75b6f74b6b936155eaec7120f6312b2408f9473c5e1a974d60d1cc6a50b6cdbef08611e1e2fa44669b5b148b6e5e SHA512 c346d84a029f66bc55b6d681236858f4648b75ae84c409ed1f5e47df51f5e4e91f242f8a6bcb73bc6b424a3851908a1a092078399ba7dd6d15e859bc8345e14e
 MISC metadata.xml 382 BLAKE2B 87fa7e63a6ed7a4ea55247b362288b43f7edd312cc3085bb8c1b947402ae4aa0df01fac4f6646d260653ff8af7fe28d3dabb8a213dbf3e206181b69835b33d5f SHA512 8503e0a4a48d93682c386eb1d6507b4b26585afc9d62b7cd52bc00b457a887bd17422a03669ff404570ff7f5ff6f0bba14ee935979f8b54722870d6620097de5
diff --git a/app-text/calibre/calibre-3.48.0-r1.ebuild b/app-text/calibre/calibre-3.48.0-r1.ebuild
index 438e9707f607..750bc132087d 100644
--- a/app-text/calibre/calibre-3.48.0-r1.ebuild
+++ b/app-text/calibre/calibre-3.48.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -203,7 +203,7 @@ src_install() {
 	cd "${ED}"/usr/share/calibre/fonts/liberation || die
 	local x
 	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
 		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
 	done
 
diff --git a/app-text/calibre/calibre-4.7.0-r1.ebuild b/app-text/calibre/calibre-4.7.0-r1.ebuild
deleted file mode 100644
index 3049f662198d..000000000000
--- a/app-text/calibre/calibre-4.7.0-r1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
-	>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
-	>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C #684484
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.8.0-r1.ebuild b/app-text/calibre/calibre-4.8.0-r1.ebuild
deleted file mode 100644
index 3049f662198d..000000000000
--- a/app-text/calibre/calibre-4.8.0-r1.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
-	>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
-	>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C #684484
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.9.0.ebuild b/app-text/calibre/calibre-4.9.0.ebuild
deleted file mode 100644
index 3049f662198d..000000000000
--- a/app-text/calibre/calibre-4.9.0.ebuild
+++ /dev/null
@@ -1,266 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite,ssl"
-
-inherit bash-completion-r1 desktop toolchain-funcs python-single-r1 xdg-utils
-
-DESCRIPTION="Ebook management application"
-HOMEPAGE="https://calibre-ebook.com/"
-SRC_URI="https://download.calibre-ebook.com/${PV}/${P}.tar.xz"
-
-LICENSE="
-	GPL-3+
-	GPL-3
-	GPL-2+
-	GPL-2
-	GPL-1+
-	LGPL-3+
-	LGPL-2.1+
-	LGPL-2.1
-	BSD
-	MIT
-	Old-MIT
-	Apache-2.0
-	public-domain
-	|| ( Artistic GPL-1+ )
-	CC-BY-3.0
-	OFL-1.1
-	PSF-2
-"
-KEYWORDS="~amd64 ~arm ~x86"
-SLOT="0"
-IUSE="ios +udisks"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-text/hunspell-1.7:=
-	>=app-text/podofo-0.9.6_pre20171027:=
-	>=app-text/poppler-0.26.5[qt5]
-	>=dev-libs/chmlib-0.40:=
-	dev-libs/glib:2=
-	dev-libs/hyphen:=
-	>=dev-libs/icu-57.1:=
-	dev-libs/libinput:=
-	>=dev-python/apsw-3.25.2_p1[${PYTHON_USEDEP}]
-	dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
-	>=dev-python/chardet-3.0.3[${PYTHON_USEDEP}]
-	>=dev-python/cssselect-0.7.1[${PYTHON_USEDEP}]
-	>=dev-python/css-parser-1.0.4[${PYTHON_USEDEP}]
-	>=dev-python/dbus-python-1.2.4[${PYTHON_USEDEP}]
-	>=dev-libs/dbus-glib-0.106
-	>=sys-apps/dbus-1.10.8
-	dev-python/dnspython[${PYTHON_USEDEP}]
-	>=dev-python/feedparser-5.2.1[${PYTHON_USEDEP}]
-	>=dev-python/html2text-2019.8.11[${PYTHON_USEDEP}]
-	>=dev-python/html5-parser-0.4.9[${PYTHON_USEDEP}]
-	>=dev-python/lxml-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-	>=dev-python/mechanize-0.3.5[${PYTHON_USEDEP}]
-	>=dev-python/msgpack-0.5.6[${PYTHON_USEDEP}]
-	>=dev-python/netifaces-0.10.5[${PYTHON_USEDEP}]
-	>=dev-python/pillow-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-4.3.0[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/python-dateutil-2.5.3[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.12[gui,svg,widgets,network,printsupport,${PYTHON_USEDEP}]
-	>=dev-python/PyQtWebEngine-5.12[${PYTHON_USEDEP}]
-	dev-python/regex[${PYTHON_USEDEP}]
-	dev-qt/qtcore:5=
-	dev-qt/qtdbus:5=
-	dev-qt/qtgui:5=
-	>=dev-qt/qtwebengine-5.12
-	dev-qt/qtwidgets:5=
-	dev-util/desktop-file-utils
-	dev-util/gtk-update-icon-cache
-	media-fonts/liberation-fonts
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2:=
-	>=media-libs/libmtp-1.1.11:=
-	>=media-libs/libwmf-0.2.8
-	>=media-gfx/optipng-0.7.6
-	>=sys-libs/zlib-1.2.11:=
-	virtual/libusb:1=
-	x11-libs/libxkbcommon:=
-	x11-libs/libX11:=
-	x11-libs/libXext:=
-	x11-libs/libXrender:=
-	x11-misc/shared-mime-info
-	>=x11-misc/xdg-utils-1.0.2-r2
-	ios? (
-		>=app-pda/usbmuxd-1.0.8
-		>=app-pda/libimobiledevice-1.2.0
-	)
-	udisks? ( virtual/libudev )"
-RDEPEND="${COMMON_DEPEND}
-	udisks? ( || ( sys-fs/udisks:2 sys-fs/udisks:0 ) )"
-DEPEND="${COMMON_DEPEND}
-	>=dev-python/setuptools-23.1.0[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	>=virtual/podofo-build-0.9.6_pre20171027
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != binary && $(gcc-major-version) -lt 6 ]]; then
-		eerror "Calibre cannot be built with this version of gcc."
-		eerror "You need at least gcc-6.0"
-		die "Your C compiler is too old for this package."
-	fi
-}
-
-src_prepare() {
-	# no_updates: do not annoy user with "new version is availible all the time
-	# disable_plugins: walking sec-hole, wait for upstream to use GHNS interface
-	eapply \
-		"${FILESDIR}/${PN}-2.9.0-no_updates_dialog.patch" \
-		"${FILESDIR}/${PN}-disable_plugins.patch"
-
-	eapply_user
-
-	# Fix outdated version constant.
-	#sed -e "s#\\(^numeric_version =\\).*#\\1 (${PV//./, })#" \
-	#	-i src/calibre/constants.py || \
-	#	die "sed failed to patch constants.py"
-
-	# Avoid sandbox violation in /usr/share/gnome/apps when linux.py
-	# calls xdg-* (bug #258938).
-	sed -e "s|'xdg-desktop-menu', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|check_call(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|\\(CurrentDir(tdir)\\), \\\\\$|\\1:|" \
-		-e "s|, PreserveMIMEDefaults():|:|" \
-		-e "s|'xdg-icon-resource', 'install'|\\0, '--mode', 'user'|" \
-		-e "s|cmd\[2\]|cmd[4]|" \
-		-e "s|cc(\\['xdg-desktop-menu', 'forceupdate'\\])|#\\0|" \
-		-e "s|'xdg-mime', 'install'|\\0, '--mode', 'user'|" \
-		-i src/calibre/linux.py || die "sed failed to patch linux.py"
-
-	# Disable unnecessary privilege dropping for bug #287067.
-	sed -e "s:if os.geteuid() == 0:if False and os.geteuid() == 0:" \
-		-i setup/install.py || die "sed failed to patch install.py"
-
-	sed -e "/^                self.check_call(\\[QMAKE\\] + qmc + \\[proname\\])$/a\
-\\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ \\ self.check_call(['sed', \
-'-e', 's|^CFLAGS .*|\\\\\\\\0 ${CFLAGS}|', \
-'-e', 's|^CXXFLAGS .*|\\\\\\\\0 ${CXXFLAGS}|', \
-'-e', 's|^LFLAGS .*|\\\\\\\\0 ${LDFLAGS}|', \
-'-i', 'Makefile'])" \
-		-i setup/build.py || die "sed failed to patch build.py"
-}
-
-src_install() {
-	# Bypass kbuildsycoca and update-mime-database in order to
-	# avoid sandbox violations if xdg-mime tries to call them.
-	cat - > "${T}/kbuildsycoca" <<-EOF
-	#!${BASH}
-	echo $0 : $@
-	exit 0
-	EOF
-
-	cp "${T}"/{kbuildsycoca,update-mime-database} || die
-	chmod +x "${T}"/{kbuildsycoca,update-mime-database} || die
-
-	export QMAKE="${EPREFIX}/usr/$(get_libdir)/qt5/bin/qmake"
-
-	# Unset DISPLAY in order to prevent xdg-mime from triggering a sandbox
-	# violation with kbuildsycoca as in bug #287067, comment #13.
-	export -n DISPLAY
-
-	# Bug #352625 - Some LANGUAGE values can trigger the following ValueError:
-	#   File "/usr/lib/python2.6/locale.py", line 486, in getdefaultlocale
-	#    return _parse_localename(localename)
-	#  File "/usr/lib/python2.6/locale.py", line 418, in _parse_localename
-	#    raise ValueError, 'unknown locale: %s' % localename
-	#ValueError: unknown locale: 46
-	export -n LANG LANGUAGE ${!LC_*}
-	export LC_ALL=C #684484
-
-	# Bug #295672 - Avoid sandbox violation in ~/.config by forcing
-	# variables to point to our fake temporary $HOME.
-	export HOME="${T}/fake_homedir"
-	export XDG_CONFIG_HOME="${HOME}/.config"
-	export XDG_DATA_HOME="${HOME}/.local/share"
-	export CALIBRE_CONFIG_DIRECTORY="${XDG_CONFIG_HOME}/calibre"
-	mkdir -p "${XDG_DATA_HOME}" "${CALIBRE_CONFIG_DIRECTORY}" || die
-
-	tc-export CC CXX
-	# Bug #334243 - respect LDFLAGS when building extensions
-	export OVERRIDE_CFLAGS="$CFLAGS" OVERRIDE_LDFLAGS="$LDFLAGS"
-	local libdir=$(get_libdir)
-	[[ -n $libdir ]] || die "get_libdir returned an empty string"
-
-	addpredict /dev/dri #665310
-
-	PATH=${T}:${PATH} PYTHONPATH=${S}/src${PYTHONPATH:+:}${PYTHONPATH} \
-	"${PYTHON}" setup.py install \
-		--root="${D}" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/${libdir}" \
-		--staging-root="${ED}/usr" \
-		--staging-libdir="${ED}/usr/${libdir}" || die
-
-	rm "${ED}/usr/share/applications/defaults.list" || die
-	find "${ED}"/usr/share -type d -empty -delete
-
-	cd "${ED}"/usr/share/calibre/fonts/liberation || die
-	local x
-	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
-		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
-	done
-
-	einfo "Converting python shebangs"
-	python_fix_shebang --force "${ED}"
-
-	einfo "Compiling python modules"
-	python_optimize "${ED}"/usr/lib/calibre
-
-	newinitd "${FILESDIR}"/calibre-server-3.init calibre-server
-	newconfd "${FILESDIR}"/calibre-server-3.conf calibre-server
-
-	bashcomp_alias calibre \
-		lrfviewer \
-		calibre-debug \
-		ebook-meta \
-		calibre-server \
-		ebook-viewer \
-		ebook-polish \
-		fetch-ebook-metadata \
-		lrf2lrs \
-		ebook-convert \
-		ebook-edit \
-		calibre-smtp \
-		ebook-device
-
-}
-
-pkg_preinst() {
-	# Indentify stray directories from upstream's "Binary install"
-	# method (see bug 622728).
-	CALIBRE_LIB_DIR=/usr/$(get_libdir)/calibre
-	CALIBRE_LIB_CONTENT=$(for x in "${ED}${CALIBRE_LIB_DIR}"/*; do
-		printf -- "${x##*/} "; done) || die "Failed to list ${ED}${CALIBRE_LIB_DIR}"
-}
-
-pkg_postinst() {
-	[[ -n ${CALIBRE_LIB_DIR} ]] || die "CALIBRE_LIB_DIR is unset"
-	local x
-	for x in "${EROOT}${CALIBRE_LIB_DIR}"/*; do
-		if [[ " ${CALIBRE_LIB_CONTENT} " != *" ${x##*/} "* ]]; then
-			elog "Purging '${x}'"
-			rm -rf "${x}"
-		fi
-	done
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-text/calibre/calibre-4.9.1-r1.ebuild b/app-text/calibre/calibre-4.9.1-r1.ebuild
index a158ed8ff2e7..96f088d77812 100644
--- a/app-text/calibre/calibre-4.9.1-r1.ebuild
+++ b/app-text/calibre/calibre-4.9.1-r1.ebuild
@@ -211,7 +211,7 @@ src_install() {
 	cd "${ED}"/usr/share/calibre/fonts/liberation || die
 	local x
 	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
 		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
 	done
 
diff --git a/app-text/calibre/calibre-4.9.1.ebuild b/app-text/calibre/calibre-4.9.1.ebuild
index 3049f662198d..1b5faed75d37 100644
--- a/app-text/calibre/calibre-4.9.1.ebuild
+++ b/app-text/calibre/calibre-4.9.1.ebuild
@@ -208,7 +208,7 @@ src_install() {
 	cd "${ED}"/usr/share/calibre/fonts/liberation || die
 	local x
 	for x in * ; do
-		[[ -f ${EPREFIX}usr/share/fonts/liberation-fonts/${x} ]] || continue
+		[[ -f ${EPREFIX}/usr/share/fonts/liberation-fonts/${x} ]] || continue
 		ln -sf "../../../fonts/liberation-fonts/${x}" "${x}" || die
 	done
 
diff --git a/app-text/cmigemo/Manifest b/app-text/cmigemo/Manifest
index cb7cdaccbd6c..b43c790488d6 100644
--- a/app-text/cmigemo/Manifest
+++ b/app-text/cmigemo/Manifest
@@ -1,5 +1,5 @@
 AUX cmigemo-1.3c-gentoo.patch 1948 BLAKE2B 5c182d0c9c93b06104d1067272d35b023386a9ce7bfee1828489268cfff1bacbe64d83cde803df1a0f52804b3474900077a8144a1bd5900785c73b77ea0ca1d0 SHA512 90035c0fbf3b341113e4991f08c9962e27d37f6f215983379e92d7c616a67662b8754f390f9f19f7c84f1d5cc9a51a815999ec6c84e7c642758b3324f05b7837
 AUX cmigemo-1.3c-ldflags.patch 502 BLAKE2B 3fc4c85592cc9feffbaeee636e8fcada10c7b7cd8696495239436808ddf9462da09713bbba10c3e5eb66cb45a3ec02e53f1e708fc0c1281dd96cc3e66db8caea SHA512 932bfad5afc4c90531cac96a9a7fb06d1ed690b3391ad9425c5ae1baa7caf2d8046d208e25816ea4ecfbbe44b2a95216e551cbbeb7808548f534853e6b817f7b
 DIST cmigemo-1.3c-MIT.tar.bz2 54447 BLAKE2B 37e561b992317dbf421b3d09203e92000c0217347235545483b4f8b99071794c2b240636a880c1758c1828782468670eb640fbd411abe779b28c52dfc3147650 SHA512 8c5b9109f4309906ed19d5d48643918f51c339be7f3b34c90d2d814fed1b6d30e77a1539f6c1e11ceb3560f83fd9e1079254af0b41e81b274e39128de6ffeb18
-EBUILD cmigemo-1.3c-r3.ebuild 1569 BLAKE2B 42211da0825a0e072a67c0fef575004f661d1d2d43cd32ef5bac7a63529eca3cda68a893eeae0973bd6a3f57ff9f5d508d3f5a1e770d5c9e83d2f15f6bdba051 SHA512 af7154cc3643cb97c9118155819a912dacc7a0defbcef5b1f8d0d76e221405a69510d0ca364a80a0c2367b113849d07718dd7fc64b354a88cd83ba8e1d0dfb42
+EBUILD cmigemo-1.3c-r3.ebuild 1570 BLAKE2B 5390c8ebd5a607243cf338946e870612f90963a81b895735715170cea025e5327bcfdb0ee8e0df75ff729131e724c4aa29d7e58b50e189743454c23b4444b0c0 SHA512 f1fd32e78496fe4d64a4dcc4d9e18421cc44d537cc5810d8b32004247f4a6e69dd5aa5ae7f4faecc1f90f1f134344723b4ef7e6700ed22a75ce9656c901df0ee
 MISC metadata.xml 234 BLAKE2B 8615ff091e2c6b2c5d9d4246dbec2ed0c5161ce154a59f492bc640a1428de7847757b68a8d926cae4bf78905d2aeeda10cb4cb0db9bf6870d38e811556299520 SHA512 16ea852f76297335e7ef70c8019fe09d46c0455922c049ba6e92696232e957955fd671d467ebdd0bf7837d39a26083d5be2a6f8abeba53807f0b8c5b97f2e441
diff --git a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
index b39dc8bc473a..f9f924ca3619 100644
--- a/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
+++ b/app-text/cmigemo/cmigemo-1.3c-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.kaoriya.net/dist/var/${MY_P}.tar.bz2"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
+KEYWORDS="~alpha amd64 ppc x86"
 IUSE="unicode vim-syntax"
 
 DEPEND=">=app-dicts/migemo-dict-200812[unicode=]
diff --git a/app-text/convmv/Manifest b/app-text/convmv/Manifest
index 0992dc4441c9..2ff85f644d3c 100644
--- a/app-text/convmv/Manifest
+++ b/app-text/convmv/Manifest
@@ -1,5 +1,5 @@
 DIST convmv-2.04.tar.gz 30082 BLAKE2B 51521e5e44c635b72c406b6b732850e7f5e50b64d30bfd8770ca1ab49e3fd10d45447114f8adbf8b79fd381dfaf6b4782246d3e10aae471a49a52a20c8ce0405 SHA512 987411047af0b1e952cd11937c70ddd972b2e3534f4fcc6c659243dedef69af4aad90ceaa3789aec6bad6cba0999c38839451f90844b171773165b6e5899f6ac
 DIST convmv-2.05.tar.gz 30680 BLAKE2B b0d4bb14995e42e55fa34cbdaa8cb8881e48972abb296af44eebfdf76664e837b05398e0cc4e9208ddee41213bc1dd7f11c3f503e39f9a6791d08797864776a1 SHA512 7fb0d1e2b64c3105c48d8a2cbb59fa4ea23202f17abc7cbf63acfca785683f00955fdcb03517e9dd8fe01be0171458ab2583e1c52d62c6081684462b0fec4125
-EBUILD convmv-2.04.ebuild 697 BLAKE2B 443ca020bb9892554971a94f01ac8a0a3ac46146f0ce988a05ca9761b333a1233d745881e8c161613925188b042069387bcebf83e1f49ad00f0a4d8a56006002 SHA512 4bb4a850b35166d82cba67b8e2c3da90e804c4d9fc6dd219566215bb0fe5af5649c67414eeef5e363fd6dab3ac3de1fa3fb68a3cf15b2b1f9e505a6262458f43
+EBUILD convmv-2.04.ebuild 698 BLAKE2B da92fb2ba16e3fee5b5f2876fd7995057e3dc081fe29c8564dc10306db12a0b99d03ff55bf6671043e1fd67197f5ae3574d45978c0bacba7e8dcb8d71172677e SHA512 c4bef8bc1579a18269ef6424d8ef3ae9b6bd593017412d280c141efc1fbe2bc125eff1a9aaefe02c13b5189dbc84045bbd62a74997a7036f05a140f6bc28612a
 EBUILD convmv-2.05.ebuild 712 BLAKE2B 0c338bcf39f82f15cb1e72fa53e7702a926f22890f548af0ae1aee2827ff1010dc5e809c012afab3e1a51dd4ddc4a0aed07fd0b1bb534d29c8f613b35f4a1f2c SHA512 fa5230e72fdf9e78df8c6b0e1d1c1170d96005660cedb3c829005312af4ab44ae7f9067adc8f6cdf30828b37e2cd6dbaa44731092f9540a53ab861705b57ffd5
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/app-text/convmv/convmv-2.04.ebuild b/app-text/convmv/convmv-2.04.ebuild
index b63b14e8de57..8322011c7511 100644
--- a/app-text/convmv/convmv-2.04.ebuild
+++ b/app-text/convmv/convmv-2.04.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.j3e.de/linux/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/coolreader/Manifest b/app-text/coolreader/Manifest
index c3c0f33915cf..961d6ad4b6c1 100644
--- a/app-text/coolreader/Manifest
+++ b/app-text/coolreader/Manifest
@@ -1,3 +1,5 @@
 DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
+DIST coolreader-3.2.39.tar.gz 17679570 BLAKE2B e84fb7d8032ae62fec24a74a9cebab086664a2ed3827f0664e667a4ab3b8d76b722790958f71f5fcd79729238e897c6592059f9b45eb4069c9ad483883bc0600 SHA512 1b92b35750174a8ef4df4b7c4f33bb9fcc94b36008c08a7f9d1f8e85c6b642c5b037e0673a783cde1aa98296887bb286c4a2da186911b26f298f689605e1eb4b
 EBUILD coolreader-3.2.2.1-r2.ebuild 2479 BLAKE2B 63c86c1dee137edc9f8937c72cb80c77c0f890347aa1d385b2be771a3fdfc11a1d895ee87b4bd295a52392dc72f9abcd34f019c5f350943d4a9ce45e3971f5b0 SHA512 8df9d4a6337416a8d394cbab4be7f9d166d7ca9febe6e4dc5054d842de4f006adb535342c24a1b80370988edad4c71f9a0e7f50a0aeb832ebcd251fa38f0d8b0
+EBUILD coolreader-3.2.39.ebuild 2476 BLAKE2B ec41e6b8d80f8985c69e30f555354394ce85b10e708ee66d82168659ce76a24a629fcc6309d1c7934dc4fb66d8505b7a85fc5e52baf1e38eaa08b7d9d9453d10 SHA512 debf995860319e7e0a91961823760e7dc3f4c09386d3982eedc45ca1eff9f296534adca3d318583af24c73817c4f45fff5c09e1719180faf206d398699231a31
 MISC metadata.xml 624 BLAKE2B fa86114594d823c9b73b590ebfa0ffe74955550f1d66b5f1197672484d4095be484f5f8f754acef06e34f9d69d658609653109bf8499235439bb1f3ad95b7be5 SHA512 33e57dbe75c3e2efaf1d793dad06b534fac861b3ffd25e4d441af91b8d6a8cae96b8d5c19bbf0845aa78ff404eee167998e09f948009b4ce1902a2f38625f9a8
diff --git a/app-text/coolreader/coolreader-3.2.39.ebuild b/app-text/coolreader/coolreader-3.2.39.ebuild
new file mode 100644
index 000000000000..50ce82bcf878
--- /dev/null
+++ b/app-text/coolreader/coolreader-3.2.39.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+PLOCALES="bg cs de es hu pl ru uk"
+inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils eapi7-ver
+
+CR_PV=$(ver_rs 3 '-')
+
+if [ "${PV}" != 9999 ]
+then
+	# git tag cr3.2.2-1
+	SRC_URI="https://github.com/buggins/${PN}/archive/cr${CR_PV}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-cr${CR_PV}"
+else
+	inherit git-r3
+	# github mirror has some new commits to fix page margins settings
+	# sourceforge mirror saved as backup
+	#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
+	EGIT_REPO_URI="https://github.com/buggins/${PN}.git"
+	SRC_URI=""
+fi
+
+DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
+HOMEPAGE="https://sourceforge.net/projects/crengine/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="wxwidgets"
+
+CDEPEND="sys-libs/zlib
+	media-libs/libpng:0
+	virtual/jpeg:0
+	media-libs/freetype
+	wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
+	!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
+DEPEND="${CDEPEND}
+	!wxwidgets? ( dev-qt/linguist-tools:5 )"
+RDEPEND="${CDEPEND}
+	wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
+
+for lang in ${PLOCALES}; do
+	IUSE="${IUSE} l10n_${lang}"
+done
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# locales
+	l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
+	local lang langs
+	langs=""
+	for lang in ${PLOCALES}; do
+		if use l10n_${lang}; then
+			langs="${langs} ${lang}"
+		fi
+	done
+	sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
+		-i "${S}"/cr3qt/CMakeLists.txt \
+		|| die "sed CMakeLists.txt failed"
+}
+
+src_configure() {
+	CMAKE_USE_DIR="${S}"
+	CMAKE_BUILD_TYPE="Release"
+	if use wxwidgets; then
+		setup-wxwidgets
+		local mycmakeargs=(-D GUI=WX)
+	else
+		local mycmakeargs=(-D GUI=QT5)
+	fi
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	if ! use wxwidgets; then
+		mv "${D}"usr/share/doc/cr3/changelog.gz "${D}"usr/share/doc/${PF}/ || die "mv changelog.gz failed"
+		rmdir "${D}"usr/share/doc/cr3 || die "rmdir doc/cr3 failed"
+		gunzip "${D}"usr/share/doc/${PF}/changelog.gz || die "gunzip changelog.gz failed"
+		gunzip "${D}"usr/share/man/man1/cr3.1.gz || die "gunzip cr3.1.gz failed"
+	fi
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/app-text/delta/Manifest b/app-text/delta/Manifest
index 8dc385c51a70..8a9579ef8c3d 100644
--- a/app-text/delta/Manifest
+++ b/app-text/delta/Manifest
@@ -1,3 +1,3 @@
 DIST delta-2006.08.03.tar.gz 32804 BLAKE2B 6e070aea4e9bb4ef849fb0e193cdef08771e74bcd46219bc380f58219d05d2c73ab0738a2d611e3c2bce72a92b82276ec4b8c741f33f092dc348acb153aaa6f4 SHA512 3720f164f3721ad06bf5a73e654c70a67d6e7a56d0ce574fb0e8571b33269e56611a909f915bd0ea46434d94206a9548fd99fdef98181efe41e7fb03de75c585
-EBUILD delta-20060803-r1.ebuild 745 BLAKE2B 3ee3b28d7c1f07d6e2e5c83161e2fc5c9604c2060d0f5d4ee9386a4bb69112bb10240d3f1925c5d5dfa39374dddef0928f7964c73e530fbc41059ca3d3256392 SHA512 2e4dcdfd9def9527809507cf92d27581bae9aa476c47b38b38063078956916b224f99db01d5da6003a6289df14605fea2281b66bc523b5ec8be0ecc58b2b721d
+EBUILD delta-20060803-r1.ebuild 746 BLAKE2B 60395493ccf85e59b971c0ac4040e04868cf14bea6152e04d6a8a534c8759fdc64c383c3367e16a4fa23156611e0cdf406b5daf527d8ec2d06080a186560e1d8 SHA512 13fbc12e1680c61a78aecec1921e09c0fd92079ab3b073ee5a62f391aa0372d6a82a9bc25015c3b5c5a69aded7aa33f71b25e7a653361cdffcca01fdeabf6d08
 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 5ba3fdf1514b..ce216bdb0624 100644
--- a/app-text/delta/delta-20060803-r1.ebuild
+++ b/app-text/delta/delta-20060803-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://delta.tigris.org/files/documents/3103/${STUPID_NUM}/${PN}-${MY_P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ppc ppc64 s390 sh sparc x86 ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-text/dictd/Manifest b/app-text/dictd/Manifest
index 45f5dc94a3b7..e9c2c1dae22e 100644
--- a/app-text/dictd/Manifest
+++ b/app-text/dictd/Manifest
@@ -8,5 +8,5 @@ AUX dictd-1.10.11-colorit-nopp-fix.patch 323 BLAKE2B e99dea0a194532be7239fab52da
 AUX dictd-1.12.0-build.patch 643 BLAKE2B e7f9ffbe56a15278a95537791af88a1866452742af218bac5e8a336c735d232775fafdd7338e7eb20cee2bf1ff45b4369d9c7932a6004d8733172732cdf2a6d4 SHA512 577a85b765a3a7e8e8510ea36567541073a79cd2f99a8efed69ee1fb1e7d32a864d872fe358c0692be56af0c94ea241cb4effb9623371f0eb8492d8c4d223433
 AUX dictd.service 181 BLAKE2B bf79654496f9ee30ca1c44a3c771927cd7bbf5bd7e97379cbd4d65c14ce3f8e4b90c4c50c706545b282e8260e0eed14469f42c9072e0c2be943979dfa88acf2c SHA512 e09f48b746977bfc118fe448bd41c33c6ad61fd94b42ce343ea087b858624498306d958203ec5e219dbdf94d54f8eb5a1feb7c48ad3b3ebc2eb1e9d3594828b9
 DIST dictd-1.12.1.tar.gz 423870 BLAKE2B 9a1522a9786fac732c5e8b481b2eaa36d75ab27d3388e40cdf80016a410123907c4b28b1ed32c1fa3b179b27a358447625de6c0c1e9ab9f35c6d5d3f16591b9f SHA512 51bceba36f9e34ffcbbf42a6235aab6097fe66ba8ed086ea60d0df8b7daf91c6449fdf7c5605150c77035d98029053233db106f9188786b30e02ecd61748209b
-EBUILD dictd-1.12.1-r2.ebuild 2804 BLAKE2B 02668dcd6d391f0605a48b6bec5fdbbf5ea51179e4663e56d71a7f7768a0307f4a130f5cebd38a7d1ff7b3b704ced5a6350094bd43e5d6147c243d4b511af08a SHA512 489ecd4f356e3d2631fb1bd783f861f26467695b66a06d9e97ce9407ec0fd27b6ba0607a5344a325995719248623e41ff8c3da4c13ae5a17589c7fa08c72f3c0
+EBUILD dictd-1.12.1-r2.ebuild 2805 BLAKE2B f9eda3be1a979bc022139cd7d147e3572da757aa9e36221f8f258a2dcde4f847c873aaf4538b1a4eb66e7bd365eaae9ba30edd64825e015a8870f6e645215a2b SHA512 6d92982c5d6634aad8d3ada9c6c24006ef48006d682919c5007d75b3f8421d2e87df4d6b499363a8369b3c84a5a97af5a373c10e5855069839f1b9e98464fec8
 MISC metadata.xml 484 BLAKE2B 8513944c0eaf7007a75c571dd29ad9e408db17a8e68f39424f361d19e488fa644a8467db234692bed15fd2d2425676c09f7187751b507a69967dcd598f9ab30e SHA512 b404b831fbea2146daf29f4bc81af88c5e226134950fa1eff68823bdf0b00208328936983d1e9c8c51e3420a27c0eca99e83d1178451b8e5df265b8623d3385e
diff --git a/app-text/dictd/dictd-1.12.1-r2.ebuild b/app-text/dictd/dictd-1.12.1-r2.ebuild
index 442e9519dbed..664b73428f39 100644
--- a/app-text/dictd/dictd-1.12.1-r2.ebuild
+++ b/app-text/dictd/dictd-1.12.1-r2.ebuild
@@ -11,7 +11,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 ~x86-macos ~sparc-solaris"
 IUSE="dbi judy minimal"
 
 # <gawk-3.1.6 makes tests fail.
diff --git a/app-text/discount/Manifest b/app-text/discount/Manifest
index 49fec8b3e215..443447a7c4e4 100644
--- a/app-text/discount/Manifest
+++ b/app-text/discount/Manifest
@@ -1,5 +1,5 @@
 DIST discount-2.2.4.tar.bz2 99482 BLAKE2B b04c372cef27d0a4a09a588eb66376dc70494eefe5c8a9e7aedb8075f081a6f32eafbb9671c29deea7d89128f4f30c93d38c17268eccbb1c917db6c1b7d3e040 SHA512 0650e0ce3f6948e3a30fdaa1a810e895f64621c55df46c7a5ed8755e65c1b718b7a1d1a1bfe0a87a3a59fbb13fca8907718f1aa095125a4b6e152602b8e490cf
 DIST discount-2.2.6.tar.bz2 102303 BLAKE2B 6ffcb64ff8889d79832b28db9a824e5a30bd194a6746dd08e4782cb4b7e60cf47c44f244884fc10372fc2b052fff7d70e6c263e6f4175829d1aedbc8c2ea15c6 SHA512 b67395afed0899563e28fdd2ddd5016d4f382b6b7e46612d12853d701ba191b90771d40e1223e24e3fbf497cad01fdd2e1c67a6b2bf4f6cf082f3fbe981bd002
-EBUILD discount-2.2.4.ebuild 1819 BLAKE2B f4b36bf7d003bf01a4a0db7d8b6c5c086b992a73d1c43da5c1d23d2cef856d7f86b84fdf4b962b5e8396d82e212e102386ea2d08ddf715d53f8ada7d070cefa2 SHA512 4a1038c3289588bfb2535ea4ed556e359d12d43f4cf7cb368cbcc704c0a08c36949a6de0bc848962b1966800dc0a980a3475ed6601cbe053546befe84cfc8cca
+EBUILD discount-2.2.4.ebuild 1820 BLAKE2B a1466852395d684f5b71c79c2332750053c40f019626daf89fb8044745b007969a99aa671d125908a1ef4813c034991423ca35f88e8b40c46b82499740f2b749 SHA512 bd9a4e9386a1dccf7be3e6727d31ad231bbecab5b6e14f8858eaccf15b486f5baa275bb606adceadaf9c3928ac46f0d47526e2a9155c178ac4f4d707d5d83408
 EBUILD discount-2.2.6.ebuild 1643 BLAKE2B eea19be77f9800f55465a5faf27690a18c94469e90151e1905c3f5cfff972610cd16ea65ce517e7ae70850884707f43531ea678b82673d5d6935b25a475de549 SHA512 a526b82efa2f3a26ca5cbd5b70b2b651b85dac9fbb17c687b2c0ca3b0971a5f893da66d65818a1d315e08e8748c9df4052acbbe61b7b29df7b9621230b284aae
 MISC metadata.xml 244 BLAKE2B 24ebafa89c32f799b62237b0d9442143de8ccb86c1625f2a49dd91ec9caa63cadc52000005b5b5ef148df89e907e1407330a8d8411ffb5f4facaf629a3184cb8 SHA512 d7a2290eb2970ef7fb9bea275b209c7ace388daadcf3e317b099767d72c7d9f0b894e23492f02e973d27010a7568e48549e4f502c9628efc3133012680304784
diff --git a/app-text/discount/discount-2.2.4.ebuild b/app-text/discount/discount-2.2.4.ebuild
index 6fa776e65d63..5122ef07fc57 100644
--- a/app-text/discount/discount-2.2.4.ebuild
+++ b/app-text/discount/discount-2.2.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.pell.portland.or.us/~orc/Code/${PN}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE="minimal test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/djvu/Manifest b/app-text/djvu/Manifest
index 25c1c4392769..c5760789a456 100644
--- a/app-text/djvu/Manifest
+++ b/app-text/djvu/Manifest
@@ -1,4 +1,4 @@
 AUX fix-CVE-2019-18804.patch 1130 BLAKE2B d83e7f74fca659d58731cb051aface930f1f3d0ffc737056e59323d436bfbad9b43aba5fb2c353b368a4fdbe9c257ca34ba53769e8aa2f0a42ebbd0a8d48181f SHA512 587aa61a9f9f7f845f1f0a23f59503efa7247862074096c707368316ad91aee40025d48c76a7351dc09ec1687c3902198fdbd6aa8623c4f1d8654d0c549ec4e7
 DIST djvulibre-3.5.27.tar.gz 3648522 BLAKE2B e1907b4b64c48304ceb24360cfd451e4690d38803f22231d4e136dbe754715527fa0300c623bb709fa05bba206348257137b2a755651bb51ca26259680e142d0 SHA512 62abcaa2fe7edab536477929ba38b882453dab1a06e119a3f838b38d5c61f5d8c252e4769e6534582b826e49bcfb490513179580fab9c3afa84aa92053ccebee
-EBUILD djvu-3.5.27-r1.ebuild 1576 BLAKE2B 20c0d04dff161eb7239be4b5220522303720d7f23796b41107a07684d1e5bea2ec6595c95758ff3ebf7f0f92d8910a439977626646c97bb6c9cb7785276f0d30 SHA512 7fbdeb60cd5846985bc4c9562ebbf3ad3aac2b3dc7a9cfb720f076b6c5edba788fae48c195bd713585772b56676cd87cc305a047474175dcee36f0f4981ad505
+EBUILD djvu-3.5.27-r1.ebuild 1577 BLAKE2B be38b81be79aec73c825aa4c485724818f16d2372130f872d80017f1ffc4e6fd0224966cf314292091a2e007f679b4ff1500a92c38ae1e02c62696e17107ab23 SHA512 8bc0613aeaced688967bea5c829d810ceeee08b5e4c598bd652c3f480e8b5d453def5cd74ed3565c6eae4d835c7a22bd31e2ec9f182991e37eccf896d31c1f0e
 MISC metadata.xml 948 BLAKE2B 1d15a217967f10397d747f2cc0844ea76d4f876ed0ee8cb56733b74a3b92f023e3eeff11bfcb4265766c14dad4b1e35a18f7d2fdd7442068bf82c4a8302690db SHA512 e5cfa3a2b2077a3f0dbfcc99165fb678e8c8759724790d520f1bed670fed5e753a47207bbbcd7d2ff2d55def5b34bf32201771918c9e7a16583d91553ac75e42
diff --git a/app-text/djvu/djvu-3.5.27-r1.ebuild b/app-text/djvu/djvu-3.5.27-r1.ebuild
index f15324a15f29..1118edb3d817 100644
--- a/app-text/djvu/djvu-3.5.27-r1.ebuild
+++ b/app-text/djvu/djvu-3.5.27-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://downloads.sourceforge.net/djvu/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-solaris"
 IUSE="debug doc jpeg tiff xml"
 
 PATCHES=( "${FILESDIR}"/fix-CVE-2019-18804.patch )
diff --git a/app-text/docbook-dsssl-stylesheets/Manifest b/app-text/docbook-dsssl-stylesheets/Manifest
index 9b4f3f0613b8..821d5f2a10f9 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 2475 BLAKE2B 583bb9723950d79d887c9144942b5f1b1b272a7058b1b1c37fcad6d256804d70504dc23bbab0444e09d2d56254c6bf3a5a76446fc0515eb563d405d4db81f028 SHA512 6aa0565adc07a632f106722823c3ffcc251b80212437ab2b9817cfef19ee063ac82f0a2b0347505d2a06b991fda178de05b92f7e73222d38ebdabd8af4b0af8d
+EBUILD docbook-dsssl-stylesheets-1.79-r4.ebuild 2476 BLAKE2B 02a1e868b2ee9dd03cc54eca7e23687c32f848f5b6bc9a1a03e329da246b211b953556fcff6f5d064eccdd735117e55e7c7383f357dcec01570363b43e860079 SHA512 b1a4e6782baf18d660010861c682c45cea8cb19d9f43cdba53ef89460bf20dba4260e6eb6fc520fa2275b58e9465faa42f82c09b241f646f71c0e17d62b3e5a4
 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 89a9c877a97e..411a4e7745bc 100644
--- a/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
+++ b/app-text/docbook-dsssl-stylesheets/docbook-dsssl-stylesheets-1.79-r4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/docbook/docbook-dsssl/${PV}/$
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/docbook-sgml-dtd/Manifest b/app-text/docbook-sgml-dtd/Manifest
index 9d14a47d31dd..08bf83620b50 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 1242 BLAKE2B 00b5b550b36c113d18a1b6f1daad7ad5036b8a9cdbe776a1f664d2026d9175af288dd838906cc7dcd48c185c48dc85d555b092ca7302c2a83958ae467b3df15f SHA512 727d35d3f4870b0e26023c1467c2e11e1770782e4dfef86148b76a947e175057e93af0c5784a2937dd3d305549c9ba0318b5a058d5c631973fbc17211b7f9adc
-EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1242 BLAKE2B 00b5b550b36c113d18a1b6f1daad7ad5036b8a9cdbe776a1f664d2026d9175af288dd838906cc7dcd48c185c48dc85d555b092ca7302c2a83958ae467b3df15f SHA512 727d35d3f4870b0e26023c1467c2e11e1770782e4dfef86148b76a947e175057e93af0c5784a2937dd3d305549c9ba0318b5a058d5c631973fbc17211b7f9adc
-EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1242 BLAKE2B 00b5b550b36c113d18a1b6f1daad7ad5036b8a9cdbe776a1f664d2026d9175af288dd838906cc7dcd48c185c48dc85d555b092ca7302c2a83958ae467b3df15f SHA512 727d35d3f4870b0e26023c1467c2e11e1770782e4dfef86148b76a947e175057e93af0c5784a2937dd3d305549c9ba0318b5a058d5c631973fbc17211b7f9adc
-EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1242 BLAKE2B 00b5b550b36c113d18a1b6f1daad7ad5036b8a9cdbe776a1f664d2026d9175af288dd838906cc7dcd48c185c48dc85d555b092ca7302c2a83958ae467b3df15f SHA512 727d35d3f4870b0e26023c1467c2e11e1770782e4dfef86148b76a947e175057e93af0c5784a2937dd3d305549c9ba0318b5a058d5c631973fbc17211b7f9adc
-EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1253 BLAKE2B 9e99e7d84a26391457c49c037450f222269e2384dd959469227c9523f44a42d0c1fd638d1dd311cc53f701cadad8827b7f2a7aef5ceee23c726339ad22550fd1 SHA512 6870f7d0edd338c08bfe3289fb23dad0e5714a609d056db9fea66fd1b2af3f2609d2a3480ef09393b1c2d5c1a72e7a6c92236f1bac64c28fc03427e29d7fabff
-EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1238 BLAKE2B e2d9486b56e81a6316fcba317597b76eeff5a24d1a1ac3c2b23257a0e86c9642ff7624a8d6ad651acc4d7a8c23eabff587f88560ce99a09dc03eb6f4d801f981 SHA512 e0a85aa9cd953090bc9c6e22fe0a262a6e9643febed4430a02b13561a04918dafc9888aa57d960e665faa8cb44971172b75ffa07502ce5185f151a316ea2bf48
-EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1238 BLAKE2B 5564aa069926cf2c706caeda1e6cab0701b18fa2aedf603eccb14e5ed38de7dba3a946b970f9538a73edbaeec1089f90fc9b868ed288541dd792b8cae5025f98 SHA512 2b02e87e9ca37218c689bff17406f8c490f3d090f55ee46a2c54b162f97003c2d61ee125d2d53d28e5ab57aae173c4afd9b4aea26709b986e6f7aec482d6113e
-EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1234 BLAKE2B f95b6448582b3628334dc13224e662a4d9089578a9f4723a40b409fd5686b92420ca02ac28f1cb50ced176fa05a8410f84a296a6a681f990c79919e503921fc0 SHA512 87c1c6e7b2ab2e024eb8617f1edb007a3baa0d9fd51c10c4cb83718467774757c43d52d0461eea126ac8dca3a3056830138765fa5f245a982bdc742fd8828fc7
+EBUILD docbook-sgml-dtd-3.0-r4.ebuild 1243 BLAKE2B f97945fe9764726a0f593672f681946050042fa6fc4179117198eea04e06264846d1f7cc5fe48c3d99bac57af401b3a2caba83cfe765c0c3c8c87deda50675fc SHA512 166d52b4dddd63c78db464aa2d9793abc6e54d96a455d0cf32c10b2e2fb96c59fe8de48e155100839c3e5ac82a5f438d00ea15ee4e1c4fe92fe02cd103dcb006
+EBUILD docbook-sgml-dtd-3.1-r4.ebuild 1243 BLAKE2B f97945fe9764726a0f593672f681946050042fa6fc4179117198eea04e06264846d1f7cc5fe48c3d99bac57af401b3a2caba83cfe765c0c3c8c87deda50675fc SHA512 166d52b4dddd63c78db464aa2d9793abc6e54d96a455d0cf32c10b2e2fb96c59fe8de48e155100839c3e5ac82a5f438d00ea15ee4e1c4fe92fe02cd103dcb006
+EBUILD docbook-sgml-dtd-4.0-r4.ebuild 1243 BLAKE2B f97945fe9764726a0f593672f681946050042fa6fc4179117198eea04e06264846d1f7cc5fe48c3d99bac57af401b3a2caba83cfe765c0c3c8c87deda50675fc SHA512 166d52b4dddd63c78db464aa2d9793abc6e54d96a455d0cf32c10b2e2fb96c59fe8de48e155100839c3e5ac82a5f438d00ea15ee4e1c4fe92fe02cd103dcb006
+EBUILD docbook-sgml-dtd-4.1-r4.ebuild 1243 BLAKE2B f97945fe9764726a0f593672f681946050042fa6fc4179117198eea04e06264846d1f7cc5fe48c3d99bac57af401b3a2caba83cfe765c0c3c8c87deda50675fc SHA512 166d52b4dddd63c78db464aa2d9793abc6e54d96a455d0cf32c10b2e2fb96c59fe8de48e155100839c3e5ac82a5f438d00ea15ee4e1c4fe92fe02cd103dcb006
+EBUILD docbook-sgml-dtd-4.2-r3.ebuild 1254 BLAKE2B fb7d18299bc015b83565006a266a4842457a72f4a300d01633b319609a5c911434caaca5de5f9d895d8326836150aa32ee56630ab2a4969bf1358bbce8ff0b2a SHA512 34e83f8a2f436efd20672ea426f994d2b965085e8e27ade239fb6938d5897f5252b66a7e32c5d5e9e30abaf958acb79e43fcfe56c27a7524a3f2b3852204f7dd
+EBUILD docbook-sgml-dtd-4.3-r3.ebuild 1239 BLAKE2B 49f687232cc1b8cc978f9f17b3c2dbe2bd626d89645091f59ae749b752227ab1bede3ceb1d0fda46bd596499de0d9635123ecfc58e711aa154513a7e61ec33f6 SHA512 91e888ebd7d0d22c6376834d38f8593eafd99d61a7eea1dfe8313bb6a4930bed0a4689c0a3c7dc22c9aa4a0f0802fd2c5b5bddacc0a905cb237c6467113a0cd1
+EBUILD docbook-sgml-dtd-4.4-r1.ebuild 1239 BLAKE2B 05f9d0065bd78f009abe578b16935adb7e23c99d7e86bb4e78e0c50ba85b3844b82f668153aa17765008cbf22389a3136cef5820b8e6ac5607b632da8814f342 SHA512 113566d7bfd44612c441da8949c0293d9f5bce4fc14cee99325cadc47d6f8b413fada9c9abc6a254bfa9be1b2d802aeb6392185623890800c4e5cfb1d31ebe09
+EBUILD docbook-sgml-dtd-4.5-r1.ebuild 1235 BLAKE2B 4cca15027c2fcc6be527ede4741b7615e8ad659896bdb248b34a54c1a3d1086910c004a613eb5fd88f03433843f391a35bd686db4ca66e72b4c3311d1afbc5e7 SHA512 38f03407f3508867b70ce3e4a4f1ae8ee83041eb0380f79ade92e1206f04cdf9404197c7eed529c376535f92e967abf8df972038495cf406b07288a23ba6e8b4
 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 485227051b7c..b0dbf6d6368f 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
index 485227051b7c..b0dbf6d6368f 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-3.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
index 485227051b7c..b0dbf6d6368f 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.0-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
index 485227051b7c..b0dbf6d6368f 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.1-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
index ed669365795e..9cb0d24e4eaa 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
index a05f25398105..d2b0894f6901 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
index 5bb97d5cabad..7cf331bfd899 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.4-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
index e1907f7a0832..281abaf045b8 100644
--- a/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
+++ b/app-text/docbook-sgml-dtd/docbook-sgml-dtd-4.5-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/sgml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE=""
 
 DEPEND=">=app-arch/unzip-5.41"
diff --git a/app-text/docbook-sgml-utils/Manifest b/app-text/docbook-sgml-utils/Manifest
index 37be8286d717..02dce70f2b26 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-r3.ebuild 1830 BLAKE2B 872bc4571ab58886490d921c6571ce6d9b7c8d22ed5cef7a2e4b9140c673c169615216db44dcb12226183f3e45db602b387a6e3fec69a4cab96d05b49bcf7275 SHA512 6d3b6c9fcfab53ffd269cf6a45c2cc4e6cf73c79e2f7aefb0a44fb23e2af2beef4342ea61ae7438f88d95bf3c77302a564212cd7bc1d90f82a95ac0ab2f714a8
+EBUILD docbook-sgml-utils-0.6.14-r3.ebuild 1831 BLAKE2B 2dab5e4ff5452c1f341a97e03ac0b0e837281b4705b76f2bf233602b64ddb8b104d396e81456354f99007401402da6c9109d70a2e5a9dfc5c3cc0016bd6d5437 SHA512 927fff233e621b500560088edda6973ae02a898c0be88da59bf1ef4b4fe8adb723b8fc9d866acdbe7001329801149280f815fdf31421cb28e9ec78530ff6165f
 MISC metadata.xml 409 BLAKE2B 326a67b502158f75dcbbd01ef2772bbab0099a4d4a1fc1e7463655abbcd807fbec8761edfd1d312b4d3c845d72506fbf53245779e657cc0baf7d2fa44b3e147b SHA512 abc9fadc1fe1a7a863308a566932f958df7b13800336db521acdb6cc93773fa6c8310a34d702bb996baff5718c2329ef790bedacc5f1d849810c174fd8b281ea
diff --git a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
index 38a3221cf16f..cc80e209a089 100644
--- a/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
+++ b/app-text/docbook-sgml-utils/docbook-sgml-utils-0.6.14-r3.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 IUSE="jadetex"
 
 DEPEND=">=dev-lang/perl-5
diff --git a/app-text/docbook-xml-dtd/Manifest b/app-text/docbook-xml-dtd/Manifest
index 05c0bb0d40a1..4bff1a5fbf6d 100644
--- a/app-text/docbook-xml-dtd/Manifest
+++ b/app-text/docbook-xml-dtd/Manifest
@@ -3,9 +3,9 @@ DIST docbook-xml-4.2.zip 78428 BLAKE2B 542a2b658a10e0eee4928666a2edbdbff12e96dbc
 DIST docbook-xml-4.3.zip 83865 BLAKE2B d231a6e6ba3d8023d83358080d136880a5d65b4b3b135b2f60e3a784d2f2231d12e1e9d1b5284a7d3fa1b9281466591e0438adbf6160d33732e3611f5c58f21b SHA512 f5090fb74884bae3d4fac8a3c5060bffff5d6a74272de183c181a7642e4b91f4ed32ad028537d198010782c3d98575ce679672f76a9749ed124432195886a7cb
 DIST docbook-xml-4.4.zip 96107 BLAKE2B 3616c20758de6c14e08f2a9b32682da33be741153d4586c8062d6ff895f0158decc188c5e1db4f0caafbea14afb139e39bd6805842f7bedc18f0770d22e0d2d3 SHA512 7df5af4df24e4618b09814e4e20c147c722962531f03a40c28cd60f1db16b4c330420adf96adb7d66ed6eda84046ee91b467fd6f6fbfac2201537e2080735d76
 DIST docbook-xml-4.5.zip 98497 BLAKE2B 3487f4488a9e3dbc3e366d63b61940727287a97f4e0ee2d2dda031cbba96cd4d85e5b729b7ee4d32e8a6842748fc688f85c94e1a0ab2f7ebc062dd8c7b800e20 SHA512 1ee282fe86c9282610ee72c0e1d1acfc03f1afb9dc67166f438f2703109046479edb6329313ecb2949db27993077e077d111501c10b8769ebb20719eb6213d27
-EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1618 BLAKE2B daf0384b931f81391b85b4a21825a7c2348452157b1e7b717ffcd75460e583ff8d454f155d53c26cc6f3ab62f9cdc3b18fd99156ce2744a205efd0b5d83124ae SHA512 3e45a2ec92cd8a6c74bb7b26b3e81ba6d584354a4e206331ad556a8430169716a9934cc1ef467934f4a1f9deda879c1474c4faf076b0f0b0d78c0a5e4ee43f5a
-EBUILD docbook-xml-dtd-4.2-r3.ebuild 1612 BLAKE2B 6d5718354b9c1b10c437ea1b9f95ab2bafc07939b8568656340b186d4e678b03330ddf32769a62d2e8e2c2188d23c89b4b76583817b70e385a83e15513bbc4a7 SHA512 73ac6f2f2132db8e9473fd38a35cf085534ba4e989404f163346a519db2bf27e223f0720e25456de336b32cb738aa9f28adc9028444bea8bf75bcc52bad0ed0e
-EBUILD docbook-xml-dtd-4.3-r2.ebuild 1612 BLAKE2B 6d5718354b9c1b10c437ea1b9f95ab2bafc07939b8568656340b186d4e678b03330ddf32769a62d2e8e2c2188d23c89b4b76583817b70e385a83e15513bbc4a7 SHA512 73ac6f2f2132db8e9473fd38a35cf085534ba4e989404f163346a519db2bf27e223f0720e25456de336b32cb738aa9f28adc9028444bea8bf75bcc52bad0ed0e
-EBUILD docbook-xml-dtd-4.4-r3.ebuild 1645 BLAKE2B 4e3337f482668043f3f3f82988c693a4dcc3c65908757509de3932e4c38f673b98533d168bc979e364735198a3a1a40f4b18c1655cef54969695e171aa76e6db SHA512 d7b1b20f06db3f47808ec1bd017ce987aa7b57103453421bbba0982b7a4053374f31a109462ff789ac6bef0d3bec697cd3bced1a8bd55bbad60b6b51ed2d8c64
-EBUILD docbook-xml-dtd-4.5-r2.ebuild 1645 BLAKE2B 4e3337f482668043f3f3f82988c693a4dcc3c65908757509de3932e4c38f673b98533d168bc979e364735198a3a1a40f4b18c1655cef54969695e171aa76e6db SHA512 d7b1b20f06db3f47808ec1bd017ce987aa7b57103453421bbba0982b7a4053374f31a109462ff789ac6bef0d3bec697cd3bced1a8bd55bbad60b6b51ed2d8c64
+EBUILD docbook-xml-dtd-4.1.2-r7.ebuild 1619 BLAKE2B fafd7e70d2a0663d6e7618fd830318e4d340da7335d2a7a621153725b89649132541d0fcb222e1f98ac0c468d282e4e0c10408a8a3bd5859934d89acab1a24a2 SHA512 80b11c8033c89cf73d1064482e1884f696dcdefeb9fd1dc6129f686fb42afdc7d4311984468f9327c9f8e3208baa711f870acddebfdef438380a49e508d56224
+EBUILD docbook-xml-dtd-4.2-r3.ebuild 1613 BLAKE2B e84bb121b7ff565db86b3e45be526856f02d095917a2a9f79ee7b7cc6bb4027e426142aeb0c74cf33fb4e2f94adffecfa4d66e1a33f0b102d42a2f0c49be63cb SHA512 c1db9417bba6ab783f68fd5c580c022ffc73ec500b0f726738151476bcb93be560707cba22e399b37934be59c6743861f9d568ed65a23e02a9192828ec252853
+EBUILD docbook-xml-dtd-4.3-r2.ebuild 1613 BLAKE2B e84bb121b7ff565db86b3e45be526856f02d095917a2a9f79ee7b7cc6bb4027e426142aeb0c74cf33fb4e2f94adffecfa4d66e1a33f0b102d42a2f0c49be63cb SHA512 c1db9417bba6ab783f68fd5c580c022ffc73ec500b0f726738151476bcb93be560707cba22e399b37934be59c6743861f9d568ed65a23e02a9192828ec252853
+EBUILD docbook-xml-dtd-4.4-r3.ebuild 1646 BLAKE2B dfc59de310dd7dd4038440a781c72ccc93b76ea973bbf47d417a41f2ceebf193131e1c5b5b4e9529d6c7f6406c7000e3cd6c756cbcd18782895176ab17660880 SHA512 5a55962306d97f1827197a3b050d7ba2d3c88f9f225abf0b395df8b68ec1d8e67cb73db16a7aab97c0404c51e7cafc5ebe2f6e38e8006e2589f16162fe7ab1aa
+EBUILD docbook-xml-dtd-4.5-r2.ebuild 1646 BLAKE2B dfc59de310dd7dd4038440a781c72ccc93b76ea973bbf47d417a41f2ceebf193131e1c5b5b4e9529d6c7f6406c7000e3cd6c756cbcd18782895176ab17660880 SHA512 5a55962306d97f1827197a3b050d7ba2d3c88f9f225abf0b395df8b68ec1d8e67cb73db16a7aab97c0404c51e7cafc5ebe2f6e38e8006e2589f16162fe7ab1aa
 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 c6ceaa35945b..7ee1989d65b6 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.1.2-r7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 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 275c23a389fa..a53afb426747 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.2-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 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 275c23a389fa..a53afb426747 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 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 b1cb368058b6..ee0f86857cda 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 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 b1cb368058b6..ee0f86857cda 100644
--- a/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
+++ b/app-text/docbook-xml-dtd/docbook-xml-dtd-4.5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://docbook.org/xml/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 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 7a1ea5347639..138195ad8d40 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 3008cab742172dc1e3baff033502f9bf6ed3ee391b3a845d823ca7c282c1ae4e7f2cdeeae018d0d99d136f64c435a038a2f2f1231da9a8a24add0557dee1cde4 SHA512 432c865a5fe5ae45cc745efbcee0cb9c29a0d9908b7b7b8a1d593b5ad50db5ffe32e0a83ae8448f70806276fb6033fa874a963c0f5bd3b64b3043bde3f6d2dfe
-EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1353 BLAKE2B 9a338c67e9814e0e123dcf38e8dd311ac5607c56e17156e014bcc0700adce84c9d07dd3afe86a893d040221cf610f85ba49785db0aae35f52094ae4aea1873d3 SHA512 ade069cf5e2701d1242bc6f1b49b0feb27c263de41a3e5741ed4ec4122353751cb746cb4ed1aee320ec07e7af281bb51ff906f55320385fd0d19ca52ceb0e38f
-EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1341 BLAKE2B feae5cbe3f3c1a2811d6b33f73816d06c1540e6978f8f7736643e8f52a7dfa9b1f090e7db07aed82e2f51be076b394a7da2b45b6ec1ea27f41e79e5989024e37 SHA512 fe978e28186aab7b8ec18262cd6b1815866c12d6a8748e14d44bc5751f54931c86c59b0f618d342c65f49865841291f39188eac92fe8de38c0d540c07c00f12e
+EBUILD docbook-xml-simple-dtd-1.0-r3.ebuild 1324 BLAKE2B d559ec88a014644504b2ed5e7202703fbf6b53b445319feca23457ffd8bab5b38412f43b42174417d0ad1c5cdedad77828c51bc6722a9e4326fbcec4fc50d867 SHA512 8d29dfc046d1192883ecaadd49e0b21d5c458e394a8e542b914e6ea85c680bb91ba48cc645c8e7d8e002239627c5f1e4609877ad4f42c1d6e72f8c19235745dc
+EBUILD docbook-xml-simple-dtd-4.1.2.4-r4.ebuild 1354 BLAKE2B 51a617467268abc72a36853cff4f46ee2ca703809aa8cb2b2c9539fe36bc17cf821d25ec579e563d5b8bbb72046bb20ac11b8f881061f6c9a8d969c51d3ca7f6 SHA512 9fdbd2cb5396ba10121dae7e901ce994f12bf12bfb593d2de0da87d7eda77b3f0f3476ae983ba4fe1615fa76b1a99691e57f60407217fbc9c346983581cc932d
+EBUILD docbook-xml-simple-dtd-4.1.2.5-r3.ebuild 1342 BLAKE2B 8101e886695d683a34af8b0e73d325eaeb7cac2ea2a19d82c5d1965f609a493e84c2b02775800ddff9f983751a0e9a43305dcc3f0461e34bdb8673d6cf246280 SHA512 fb4a87439441e1833aa971783ca6b580deae245bedaa93421c1a60e8b977c05a741f9ad9e789694169d89655cf02aa8b38e8e79203ef7ff42ec09ecba4bc0e93
 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 404b48682f1a..a8f46c3016d8 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-1.0-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~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 4e87683f310f..9312c8609372 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.4-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~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 dbb2560ee386..c5fb095cfd22 100644
--- a/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
+++ b/app-text/docbook-xml-simple-dtd/docbook-xml-simple-dtd-4.1.2.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.oasis-open.org/docbook/xml/simple/${PV}/${MY_P}.zip"
 
 LICENSE="docbook"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos ~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 1bdc6a3601c1..bc0faa6bd6e5 100644
--- a/app-text/docbook-xsl-ns-stylesheets/Manifest
+++ b/app-text/docbook-xsl-ns-stylesheets/Manifest
@@ -1,3 +1,3 @@
 DIST docbook-xsl-ns-1.78.0.tar.bz2 4992293 BLAKE2B 3bc93ca1dc45756121a4a3838093539957bba4ddffbbd7d27c5df6c63422a8694ea7d805cc9585ab1ce2d9092e35b91cd3bde97ee2fabb91c8c870eefa8ded1d SHA512 f3b9b52a4ba5670c17086cdf64674080ef82a9226f085887c23c53d2d102611d690895c71d14186cd84a25c7735b05d6c55207f4b2b9084d65889aaac7993cf3
-EBUILD docbook-xsl-ns-stylesheets-1.78.0.ebuild 1638 BLAKE2B f2be0d70be3c203b9c4e0d3478f50620b063dac00bf7f24a9d3a1bd03e725b7776de218aefe421193b7ea19a6d72d1e6f656f65e048451bf9cef90baf2daeef1 SHA512 3c2f496c12961c6fb2fc4cb413922d158311e9f04add9334d84050470cfbbfdfff276c47ebe6377a33ad6a1374837777883b03e3a35a8d52ec8fb61adfbc8b45
+EBUILD docbook-xsl-ns-stylesheets-1.78.0.ebuild 1639 BLAKE2B 302d9384c7e8ef28a97b8dd8df110446dfeaf0dec47692a62abde64aabd79a300a173bf71b9e510b18382bef4a56e80e04c5eee447f18d7139160364a2adaf8c SHA512 65d11feca4f733e7f9b2df77ad05f7292addc15776d40d2cfcefe3b45f11e29c69371cf3d7540ba1e963eb0a9380b1012dd9a6694a752fe51ac427e8202e8228
 MISC metadata.xml 411 BLAKE2B d10acaa19dc1518378813204f8afa18a97c88647b8cb6cdfa0e214935b999ee17aca34e6c3ecabfbaefabfa6ea229eaaa4c2a6ebf877888e32e6ef1351f5fad8 SHA512 55962cd28fad52f6dc931791e3e2288e22e183e3d49183e0f9ff890d23a38d6ad928eed4ce0b4e41b4f381234536ff67c219e4c8a75efd32cc0a14eefee6e299
diff --git a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
index 9377221f6af9..f2471143ead3 100644
--- a/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
+++ b/app-text/docbook-xsl-ns-stylesheets/docbook-xsl-ns-stylesheets-1.78.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE="ruby"
 
 RDEPEND=">=app-text/build-docbook-catalog-1.4
diff --git a/app-text/docbook-xsl-stylesheets/Manifest b/app-text/docbook-xsl-stylesheets/Manifest
index 3ead5ab59d3c..cfeb35c99f4b 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 2155 BLAKE2B 4dc4b8fef2c877112e64e1f4215aec25e16a3407aa65effe8254d311a37c2351b9151ba7d8a3cc4b7e6758cb3863575f21a1abda3da85eb2cb3c74a2984038fc SHA512 84eabdaaea52fafd33bcb3b84c44b88fdbf7a38c5d59fb38ca576874cd419287844035d6c3280c8f83c1d1f0de2a31e1f42427c37b4360c13be05317f0b74448
+EBUILD docbook-xsl-stylesheets-1.79.1-r2.ebuild 2156 BLAKE2B bd43df787eb6772679ffa67301d86008398c8971c7f8c496d2a9831a38f1b68e5b0670f1e1cdb864fbecb30d64e31c76b0878288dceb1af35f3f891a9ba66c5f SHA512 f59dc441cfc7fe764d2fbaa31c307eb64cddc04dc1a68754c4d0ae74d5b77c093dc77d0c9a3b234c2feadd025899263bb70b9b1ce1d1a9bd319cd88f68d3ed00
 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 c4e53b624f92..7e3283cae4e2 100644
--- a/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
+++ b/app-text/docbook-xsl-stylesheets/docbook-xsl-stylesheets-1.79.1-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/docbook/${MY_P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="ruby"
 
 RDEPEND="
diff --git a/app-text/docbook2X/Manifest b/app-text/docbook2X/Manifest
index 243c721a7fa7..aa9a35255620 100644
--- a/app-text/docbook2X/Manifest
+++ b/app-text/docbook2X/Manifest
@@ -3,5 +3,5 @@ AUX docbook2X-0.8.8-error_on_missing_refentry.patch 1247 BLAKE2B 1afaf90f76030c6
 AUX docbook2X-0.8.8-filename_whitespace_handling.patch 2080 BLAKE2B ca60c0da237260893d9c4d75b95dafde605ac5ef0d01d311f52ca3a77817ce389a3f0bc7edde06f83593bc24ddc0170507898da4cfd57a7aa081884d3be7f503 SHA512 3a72979c03a1b5135662ad5cedefd0d508001994e727a0820d628ff5ad2476c09befeb921b9562230fdec3db547e5eec4b301aa08430dd6c2ce2632624a1c375
 AUX docbook2X-0.8.8-preprocessor_declaration_syntax.patch 3358 BLAKE2B e5c8c38c4504e03d7bb003929c3723cc0d15448258b8d0770571f94279e66d565f5c7cf2926cafc0a71f66e2976039401acd6b3486a9a177115b56b44437827c SHA512 af88626ca61847a25ef8c4cf8a09ea27cd1dce6510952e9629b704d3637097b10d85b9727e502dd7eecea1d2152a71cd26bf6abf4a8370eb8647258faa30be45
 DIST docbook2X-0.8.8.tar.gz 723909 BLAKE2B 17593d104a8b50a3ab56e5de464785d86d41c8a3fd04f76037c5482de867efa6dfa1ed4047e11814ed18275cd3b856440deafb637dcec17267a946d5cb1bd085 SHA512 cc336017ad734fc62d96d289105e8ea154c418a03a37f3e21b0b3520063f8b466b4aae5a5aec2e0b83f6324c6c79b5557247a93338d0a9882a94a44112f6b65c
-EBUILD docbook2X-0.8.8-r4.ebuild 1573 BLAKE2B 6e01dc0007f2f00527c86565f512412b6d678e09190adce332300fd2c87656aa5abfc3b5ce8ff1bd069dd8458b30e73c936053092213d4b55403ed26807bfd43 SHA512 7e18d58a5986bc198037701c40b9e90869618c20dcb04f8eb417e5cf401db2384ecbe00c6057456c59526c69f2c7f04901814427c51109afafcdffc8aa8d1831
+EBUILD docbook2X-0.8.8-r4.ebuild 1574 BLAKE2B 9c452e04bc75c4cfb16307e9cb9f7059050c97047803aac6649a00777090f3f58ab71823356375eb89a044df4c894afbd57f1994268389a835042f7a086cd42c SHA512 d69b6c49fe8fe3a4528b71802895f02b0dd5f358f5412ddfb5440cf9f0ce46aad606b79af301d7a3e8ca1d27e43ffae244570d9427cfe4fa3affa35437dc7e42
 MISC metadata.xml 246 BLAKE2B aa5c9c8df66314e0c3f156b1f79b96a87103809e228bff9935544e5b0d9e61165dc0bd0080ecb78595e6e93d0e06c1b8c979b47b8a29f6bdae22fc3abe7a3f95 SHA512 751233aacee2a81a9b2e02bf872dc788d2fe39fa6d6b3781146dbd19e4eebf5854620b2ae9d62e0d4dada2a64903ecf789e94b3eefecedd131808bc575617759
diff --git a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
index c288e830bdbc..12b85aa5838a 100644
--- a/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
+++ b/app-text/docbook2X/docbook2X-0.8.8-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/docbook2x/${P}.tar.gz"
 HOMEPAGE="http://docbook2x.sourceforge.net/"
 
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~riscv s390 sh sparc x86 ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~riscv s390 sh sparc x86 ~x86-linux ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 LICENSE="MIT"
diff --git a/app-text/dos2unix/Manifest b/app-text/dos2unix/Manifest
index 9e9c8797c422..3fba31768184 100644
--- a/app-text/dos2unix/Manifest
+++ b/app-text/dos2unix/Manifest
@@ -1,7 +1,7 @@
 DIST dos2unix-7.3.5.tar.gz 662133 BLAKE2B e24f77d92fe0c5931f9ca762b79a1713b14cc39b7566f78d55c4fd58bb7d3c0de1f2a8add8ffd6c3fa26a6bae73c412572fc71701e26b7b52f15b51b0de0d294 SHA512 beafefa715d894ec51bd808b18485bcf413f93b888203486e659f7e30b922b32b2f1da2305ef9ae85e54085ba3819bd512957bb872b529fe4728000cec7d3e58
 DIST dos2unix-7.4.1.tar.gz 711570 BLAKE2B 3dbe33007aa3e2ef47ec3dc0c3165987986955fffd7ae1435725014d52ba716626e7891911afe11674beec11fa62a12983c8dfc28cff682ca0c3e798449a9b0f SHA512 81e7cff82d95b298fb218b073f54d17fa851a7507fbd54b3cd9af7c1efa6a7bd3cf59f7a84ffbaf395403bf458650763e1755944451b24f708878a9c62316dc4
 DIST dos2unix-7.4.2-beta1.tar.gz 712261 BLAKE2B 020b51a53b3b8ac601efd0f3fa424fbe5a42ca5b06e1f7282c2aca021e22b38aac21e4aa7b42ed428c95053d57bb5c35483881b06dc580b533eac2fe716142a2 SHA512 323c0dd90616bca1891f8228d43bca1c6415b5765f5fba4ccf5ce692da9b545c8f10f908ba5ebd65c3409fb4d9fdaaa2fb36d589faa8b5940d27ecf8f72bc422
-EBUILD dos2unix-7.3.5.ebuild 2062 BLAKE2B 68e7934f4731f0dc975085d6200c6c9e455ef065c0535edbb81abf0d4a1623d955948acdaaa1fd53807a206646d1c5d95b2bece673cac19a1d067f6ede876641 SHA512 55391478b1cc59f22e99adff149c4305eb3104fa97fc842d8d989a2b1836aca79af103561cec88c11f7e75438b267ee36741a935a34cc8e15daa1858bedb1573
+EBUILD dos2unix-7.3.5.ebuild 2063 BLAKE2B 59d7fe06c61c8719b1ee1b7e9b96dc1314b829610a2562790bed2f8f550157bbd3e3720919e9e7674d10fe1887cf7f54aa41d70db9b919bd59ea95a11b751167 SHA512 e89711760de4df8c0e3aa31b736c2adf282a41f4e39738b7e016c83d23ed8e6ece9723d29a3372be8d199ee903acdd5d09cb21c74db95712ec9feec0b77ee1f8
 EBUILD dos2unix-7.4.1.ebuild 2084 BLAKE2B 34ea0687dd9b62819ea07dc4d217950f395e69ab6f152971e69115e6fb0524448fd7aa20a83a09a80b24b2de58850a684d26e30cfebb97c7c13cee4d34f76713 SHA512 fe58262dd2b1a27d3327f7a2fe40c8f9d8b59e84677a494f632f67bdffc68c9a4ddacb237c4f0144f8b1774aa53d4ba04e61d8138c43ed74829ea9db6a5036f0
 EBUILD dos2unix-7.4.2_beta1.ebuild 2147 BLAKE2B cb95b8e2e6ff0138adb3d296d7b78af682ed71e5f80d1c985322144c2af0b63cbe3f2ce3dbfce76332c1d220250d3c853031db5a3343de9699b11303b5df6b61 SHA512 b8bca370d4b1127382a4b80ca87ed8aaafded29da6cbebcbd77db16855cba7fa3809010e7f7687b51bdac1d6f6722481e844496b71fab191f8b3f68ccffd8a37
 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 1df77cff6201..cce9d5bf401d 100644
--- a/app-text/dos2unix/dos2unix-7.3.5.ebuild
+++ b/app-text/dos2unix/dos2unix-7.3.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
 IUSE="debug nls test"
 
 RDEPEND="
diff --git a/app-text/duali/Manifest b/app-text/duali/Manifest
index fc94bcfb9aaa..ed05ae5a637f 100644
--- a/app-text/duali/Manifest
+++ b/app-text/duali/Manifest
@@ -1,3 +1,3 @@
 DIST duali-0.2.0.tar.bz2 13334 BLAKE2B 28366eedef3c37d40b88c1458cbc420be6dd44b252bd7b176939f1d794ef29659109d19bb7328388b6ef3e16ba8dc0c500fd962525b3e05c44900092687f5cd2 SHA512 9234647b722a54fce8f947f2f0eb8cc121e5bdd32bcf606bc8ff71854eaf68655474e374b3328b2a20af58484e5962dadf716bc220f7fd697a8cfbb99afb2d30
-EBUILD duali-0.2.0-r1.ebuild 946 BLAKE2B 78caa7e0559bdb52769781be9b23d1ae5632a1d7e281444b13a005ec26b744a78e128aeaf7791c01c751890af57dc70186a862e364d71632b7bd0bd96df7802c SHA512 76f7b3f2cef67e6e6c46c93e9f4fbac440a7fe0d4ff4d34e276d3ba918868d6c7c2750f6bb09226ee33950888b1853705daed2ef46f5c447c60163dd7fbd3762
+EBUILD duali-0.2.0-r1.ebuild 947 BLAKE2B 42db69ac33eba171c23ab4f68b167e1eb7c93b6adaa35631254e715b945ced12fec8ffa7436f141969927da3f40621c74f7d9f5cefca74aee55ba1570a993357 SHA512 fd239d9f82ece56aa818dda2051f72d4fde980a5387574149a41b5b9440e151419a5ae874e0a3bb22a4e0b4ecb95ef5a4907d74d12cb6d58ec0214d06c7011dc
 MISC metadata.xml 245 BLAKE2B 7dc5df660e9e3cc71fcd39abbcc77edc7890bd44fa6e2d68556b914e6a35c6e6526e281b6aa286a0f12893a527669c2fbf64d63c8ad555137e222832edaf2cc1 SHA512 5cf81ad67c841f8eb5a71ef18b6ae6c344d68fb63c80c21f4a9b9a0060de938264530276a152eb5451dd88a5955f04a48c8cd4d034be6bc7a1922b5e4f43539f
diff --git a/app-text/duali/duali-0.2.0-r1.ebuild b/app-text/duali/duali-0.2.0-r1.ebuild
index 4eb15157f591..d7d77cc4cbcc 100644
--- a/app-text/duali/duali-0.2.0-r1.ebuild
+++ b/app-text/duali/duali-0.2.0-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/arabeyes/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~ia64 ~mips ~ppc ~sparc x86"
 IUSE=""
 
 DEPEND="${PYTHON_DEPS}"
diff --git a/app-text/dvipng/Manifest b/app-text/dvipng/Manifest
index ed178b170ee9..79b6a634fe21 100644
--- a/app-text/dvipng/Manifest
+++ b/app-text/dvipng/Manifest
@@ -1,4 +1,4 @@
 AUX dvipng-1.15-freetype-config.patch 405 BLAKE2B cb60958773b1091026f4bd59cab2dbb51404a3696f61606a4394563b70e2d4a506664d91435b9485417fa8ef61a07051240b8d05861f4bf1e0196a93de69966e SHA512 65fb9900e0b929902713a0c61e5bd2cafd56828a0f294171852bd7d6a5ee44356a26e3f5a3bc57f5e0c532cc6e31a8111ca1daf52945909eecd7b7f1c74c3546
 DIST dvipng-1.15.tar.gz 171529 BLAKE2B 0653e1b6cace30cd510c0a4f7a5ac4c88d3e17a6283693b93202529b1453dcc1617ed5906112206bfb872af093d871163cc6a117be13575211712901ac541070 SHA512 54647526a9d3a26d2ba9c7ef17f285a426d9df06ffb1d5336a1da95cbf24cd17505ba7f6b1ffd14a0beb7f91ab3e519612ce3d3ea3f30c278733127dfbf07c5c
-EBUILD dvipng-1.15-r1.ebuild 1298 BLAKE2B 2d51c57723e886ae40a804e42628239cbdacebdb133837e8c2841714d46b87fcab345d50daf9b205e52b17d7afb09e0497ba328219fb9d7a191f046536478cad SHA512 77937854e35b8d1e4e8dae1e4c1c697828d3c81ca4904b5f1d456c076bf6a95dee75c3f23128d40f523f684ca8c022c0441ba9fc930b2afe3504b85ec72f39a9
+EBUILD dvipng-1.15-r1.ebuild 1299 BLAKE2B 5aadce1e9175f9474646cedf78a93ab12a6db4561596915bc0128e7f4ff491adc6d74b6e7333666a06b5a158caa4c042d5e7e791254f13657e9ea0abdbd918d1 SHA512 7d0e97e8d52c0dfeddb10df7e61b82096bde4dff5066a0479f2436bf014e637c7d8f3651bf24430d28c0fef8f39848049c2be89cef7af2d70ab2ff210d7249f5
 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 654ee932d78d..a7a522e0072d 100644
--- a/app-text/dvipng/dvipng-1.15-r1.ebuild
+++ b/app-text/dvipng/dvipng-1.15-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-3+ Texinfo-manual"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="truetype test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/dvipsk/Manifest b/app-text/dvipsk/Manifest
index 2ef8f5c4fb3f..501d5edf299d 100644
--- a/app-text/dvipsk/Manifest
+++ b/app-text/dvipsk/Manifest
@@ -1,5 +1,5 @@
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
 DIST texlive-module-dvips-2019.tar.xz 34492 BLAKE2B fcc7ae96fd1fc87a4e4164e61c611587ddebf628c156d798df819fc9e2fda2c23e70bf2e7eddd779275fbf9b223ed0e7092d5e0c82144d8dedc70c8a7b7a1136 SHA512 ee10b8c1b67997d1c781fe2c3e5ce7826c111a2b6f4078330b566bf5525ad2a1cb2b89c4efa8d877ae1557fb319941ed09db30b229a62b6d3ff6f6a784e48df5
 DIST texlive-module-dvips.doc-2019.tar.xz 514068 BLAKE2B 91e4717b49f7c3b3cc0b350d9b5d029dfb6dacfba7a0d0f95195e681bf55e86c18f666d9a0a72ea3a5ca6cf4ad85e91e3faf2febaac3878b3e6b2d8138097d54 SHA512 fcc91e88fd3536244d878458a90d31ad3b9ec9efbc08d09d8b23f13d3887ca575e17663b2e21451abf88de389f7fc3937ce3ab49bc9e6ea94ab77c66ba179a00
-EBUILD dvipsk-5.999_p20190410.ebuild 1497 BLAKE2B 04d1bb675d3467819bb8115338379928e1d449a35619671b7b5643b419a645e116fab7ff1d31454a38a255f1020eb5552025779f7bf6b11cd963a16a4ffff2c5 SHA512 173e54aba08f1dc0f2a2b864ad216b467ec5a2f8e431fe67f3f17452c43db3b3571b46577d069e0e4e846c989929a76ff3346996216d18f875c332bea84d849e
+EBUILD dvipsk-5.999_p20190410.ebuild 1498 BLAKE2B ec1a3b621a7d44d4899aee0e120acafe1481e1635f52077044701cc384acc42d36d9932c88a6fbbaff4e945638acb892d5268dbb9e930475f7fe69d3dfe6233e SHA512 c0637978d6d68b000c1b3751f237a117ba7c8475c5b5b5171b2381d95b29d988c1975b7f2465cf9c341ec99aa61d3ec7a8b3f90b2fe2fb8e73c4bcb1afa256bf
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild b/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
index a08c98aad8f3..e44d9fd94ae4 100644
--- a/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
+++ b/app-text/dvipsk/dvipsk-5.999_p20190410.ebuild
@@ -25,7 +25,7 @@ SRC_URI="${SRC_URI} ) "
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 1be3cd146bc0..06b0ba525db6 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -1,7 +1,7 @@
 DIST dvisvgm-2.1.3.tar.gz 2802278 BLAKE2B 36e523d4b82a71f26ebc50428c56863a3729d1cf79c63660a5a3cecdd7c55c27e7ad811121e8a2ccdaa37f1ec2fb345d1d5d4f7b59011be7877500df5dba1f48 SHA512 dfd6e94b28dcdf2d1be236f3f29eaf4e3e5b7bb34544cdd55ae09de612b02561dd782b693a9a94eea07420c795d31ef210eba34cb663d7de98f438c089369ff2
 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 1111 BLAKE2B b350c975dffcb39fbd837840dd37e1f078edfb17ee1b1c3bddfb6ec4d041b24a12c9d9bb8a988cf4b4cc403605d416c6228da6f858d788fbb7e0b9fc13d6170d SHA512 5597fdadb7cfaebde1c5a47cbc366416f1c14a910112717fb1f7ac27b1c6fea2fc9f017d8e7ef20f0d6691eeaab6a5580156481e1d2c483bc35305cff7dd344f
+EBUILD dvisvgm-2.1.3.ebuild 1112 BLAKE2B a64333ae2ae83fed9ebc7a765aa4837cddc310720ab418eaed8eb96d5063cda2e5c68924c4441a391c92e74922fd0d1592898c52a6e90deae1578ae17ffee7ab SHA512 5633a10f7d7267d551d7792244f5f721637c11c32586fdc6410a4fc1ac0fb5315831e23fc2eaf95e3b55ab891fd4465ffd334022c43d6c418d038f908ac8468f
 EBUILD dvisvgm-2.6.1.ebuild 1202 BLAKE2B 9571be4ce3544239c0206b459204066b595465b33ae0b5c1fb8c7dcf9f3d805232952d705b2197b4429fb511f55227d73b366fbd69688e5c05284440a93f09b5 SHA512 cf6e91c827a2f15634563da4d6f6536771eb26190b8e11bb93833468822fc0b348d420bba4655755e29076527fed66ac746fb119aedd42429fcdd3f60c60d061
 EBUILD dvisvgm-2.7.ebuild 1202 BLAKE2B 1c287a4cea343470f1df3ad65eefd20a3d722dcc092eda19087965ae54a59541984fcf640ca9d3af7e4b8ce9538883a3ec6258f43d28ee305931ce7c1726ab12 SHA512 206dade91b836bdeedf36e0d6e4923842060f05c4cc693d176593bbd6318f2ac514cc762cf64fdcd23d63135ddba873b70a6367e98e2d0cecb21eea90be6d476
 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 a1e242e123ca..db365f32f9ea 100644
--- a/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
+++ b/app-text/dvisvgm/dvisvgm-2.1.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="test"
 # Tests don't work from $WORKDIR: kpathsea tries to search in relative
 # directories from where the binary is executed.
diff --git a/app-text/editorconfig-core-c/Manifest b/app-text/editorconfig-core-c/Manifest
index 0b925b948003..493c87e69983 100644
--- a/app-text/editorconfig-core-c/Manifest
+++ b/app-text/editorconfig-core-c/Manifest
@@ -1,5 +1,7 @@
 DIST editorconfig-core-c-0.12.1.tar.gz 65369 BLAKE2B 30296b64bd215a8b51d3b4d6146ce5eac13cb1a8ba8a25d0faabcc22989503d9d73bc138240b475eb7ea4eecd5f5bbbf347519b1696373daf55ffd27fc772f4c SHA512 3517f7db84d632615ba651eeafab6730739b7bf01f4ea34fbca65f58463fbbcbabc101587b289a7922b55708453262c65569077c51087424d47d0676dc1db686
 DIST editorconfig-core-c-0.12.2.tar.gz 67002 BLAKE2B 6b808366acc8d0a96fc47cb74d620a4028978d7114b4a64d6799527276442f1d39ba8d5611530f873c78b7c49893c5edecec84dcc6f2616ba2663cb36fa92d0d SHA512 6ab3e4f7f95c83c0781064ca15bb70394bb947f9d4cd1348224f02e25c65021d14439b913775d7cfafb93476158799c34438fa548adf3c7ec6dbfd6f1052a046
+DIST editorconfig-core-c-0.12.3.tar.gz 67701 BLAKE2B d5e6310f770099f542eb81f4ca7ec975e74c49f481c4e8e07832a7f9fc0882e2cb65da5b4b18ad926786d7ac92c3deb6ac0a547188bd68d350143258796ad1b8 SHA512 4a17cd6317bd45f8b0131070165d852569d020f1cf74e72b44057b97672184b4992aee54aae6e3222c669fdce8bb6b1f3482235e6518acffcef05e1d74087e6e
 EBUILD editorconfig-core-c-0.12.1.ebuild 901 BLAKE2B 541ba2ea83d46ae92146d81fc61f33c28135596ada38f0eca29a8a8e4bf556cd8ccd640cb8c346e2e0df799bc821cd9649d96d4e6800019d4540bfc58cf973f3 SHA512 84b2b7388a7df7ac9d7de0d3ba136d513bc005f729ca833d9f2dcb1ee06087d3935c37b82ac2e85184500b157c08b014e1432eff4f09449f3d20e21efc6cd98d
-EBUILD editorconfig-core-c-0.12.2.ebuild 907 BLAKE2B 5d210b84b242c0ef32d601bb34674a0583aa9e8fbc0fddb39b41dca08a2e80a5c62d92b86761ce63f49cdda6aaa8803a607a9404c4ab7fa83b4829433596f7a2 SHA512 eec1a6c04c3ae5c18fb54d37765ab947dc99c6e113c8a81bf3036bbb2209cbc07cbf0eb5cef274dcbcc766a39885c9293beb6dc626e63ac273e5af8fee716b59
+EBUILD editorconfig-core-c-0.12.2.ebuild 909 BLAKE2B 9290ce0880026595276b999c28029e7b29a50e03e6341be6c01c923bf0706594c28bca7b642d55afd4cab7acc99b2bafb02774ac3edee46ccde6995f468f94de SHA512 09996bc585c98bfab81df6a76d024d550e84e1e1e8c045e5f8a1235cfb54ac1ca67ca41eb1984da446bdf138c2775b49200f87129df2ae1c52a4ca9190a909b1
+EBUILD editorconfig-core-c-0.12.3.ebuild 1023 BLAKE2B 137e85dc9b8755ee15fc24f65a153e17db8ca153120979b6810b94256b15a99f03e360ccc28a95058b0e7e9d1458e643f136e78a139f3a24f19ecaca90d85eb6 SHA512 9140af3b2e1d1b5f12d78c37ac38c3f79143a9bbc0cbdcaa04ec690fe1beebb346fbc58a22a15def09896662eaee2a1604c566b58ddaa37a30f60e1a03b4d2b7
 MISC metadata.xml 388 BLAKE2B d2a5f28be0aea3f3aefd1b8e82e337b87e67192b96bea1e2e0e5073e44f8c54d3f0380a089118d405c417d42ee6d978919dc8e0212a36ee0d3808b706846ad70 SHA512 fbaff22b9f648c2e94d68904cbb23de8ee0340641c626d5a533992837ec6405b65a96872bfdedce3a75351ac73e344d5faed1a51f63a4330f65e4aa8190ffed4
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild
index 1bfe84ca069f..1e1564aa1b52 100644
--- a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="cli doc"
 CDEPEND="dev-libs/libpcre:="
 DEPEND="${CDEPEND}
diff --git a/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3.ebuild b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3.ebuild
new file mode 100644
index 000000000000..98408d4748d3
--- /dev/null
+++ b/app-text/editorconfig-core-c/editorconfig-core-c-0.12.3.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="EditorConfig core library written in C"
+HOMEPAGE="https://github.com/editorconfig/editorconfig-core-c/"
+SRC_URI="https://github.com/editorconfig/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+IUSE="cli doc"
+CDEPEND="dev-libs/libpcre:="
+DEPEND="${CDEPEND}
+	doc? ( app-doc/doxygen )"
+RDEPEND="${CDEPEND}
+	cli? ( !dev-python/editorconfig-core-py[cli] )"
+
+src_prepare() {
+	sed -e 's:OUTPUT_NAME editorconfig_static:OUTPUT_NAME editorconfig:' \
+		-i src/lib/CMakeLists.txt || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=()
+	use doc && mycmakeargs+=(-DINSTALL_HTML_DOC=ON)
+	cmake-utils_src_configure
+	sed -e "s:/share/doc/editorconfig\":/share/doc/${PF}\":" \
+		-i "${BUILD_DIR}/doc/cmake_install.cmake" || die
+}
+
+src_install() {
+	cmake-utils_src_install
+	use cli || rm -rf "${ED}/usr/bin"
+}
diff --git a/app-text/enchant/Manifest b/app-text/enchant/Manifest
index 42ee934e3332..4933c55ed663 100644
--- a/app-text/enchant/Manifest
+++ b/app-text/enchant/Manifest
@@ -1,16 +1,7 @@
 AUX enchant-1.6.0-hunspell150_fix.patch 577 BLAKE2B dc57f0fd5a90ba36abe174949060b20c709f920aa7ef29e1560f4a194d744064f59ae7c812cc27debe30c1082a9f76d3eac8723f850803c5eb06c213fe39e91d SHA512 893620f45a1dd7956aef9f3517186a9226c00e6b85df4770d6ea388fc08854e7884143fe3c7a064c7ec4f8353a9b9571d0c07da22df5c6ee41fc4c6bbce5874f
-AUX enchant-2.1.0-hunspell150_fix.patch 783 BLAKE2B 514f18e5c6138ef069e668c3af554ec64f2087b1226ea6fa9912bb68fe84c26cee47b46ababbd55da1e5a371d889620a886fffeb14a5d4fb87facb4b4d98c943 SHA512 a8406777511f458f47a97c2c8246445abd05d611413beb0c9ad6e756418e5930f8516857c58193a14b700f1f539feb5c819881ea97d71d07839ebca0d3576994
 DIST enchant-1.6.1.tar.gz 642124 BLAKE2B d41aa9b313e7fe8b0887728b55f3c5218e270c7359b4edcdc8d9180af68687230bcc9f7d1abb9f85ac673478530e5674366c9bc7d08b983e7226725b2cdd73d3 SHA512 26c62dfa89ee40150db502651a2f876fba00569b7015f205dae27a029557effacff335bbe36124dbe6686537da2305bcab02592179d03e95fdf9741d54b98036
-DIST enchant-2.1.0.tar.gz 962857 BLAKE2B f1ee729f20f06c14cbe81c27eeff5ff3bfe9e815bdf278c0c5e27ab48a78301e0731cfc2a55d065cfc702b5939623e352817a3fa6102636bca6779a8903ce537 SHA512 5dee7c5693ffc4ca0933e0881ca6e1f6bab1553af79cadf29733589790c6626db524cf33b0008b3de4c48e122ed93929478cce35608d9a52ab71edb51f598f27
-DIST enchant-2.1.1.tar.gz 961821 BLAKE2B 1aaedc16e2108a382390c9401233d6a77dcff8732fb0af1a35816993b8eb127f22f9e6f4359b997f6793f53dd37c50c1c69d2aa09cf53bb5c47baa47277e044e SHA512 5cb57198ea826da6d9ed9042edca87fcca9b811e8e75b382ed1568c5b1d8d4f8d6ba732a167c8d52261cfce540f23f84bd4d2889a4beafd2db1d8509c0b6bc15
-DIST enchant-2.1.2.tar.gz 963236 BLAKE2B 3adaf9d96c7e2d7c5e31fe31ac426230f2e88b1cd6f68157e11f13c30fc5c161723d5a5b40bbe158307ce7352e098cd22272f4a75786854f7d82a0c5694b0f2b SHA512 6cb2eeccc617c005998b16ebc33a84a05cec116b26fd679fc1416110821a85a16605c8564672e1168ac6c865cfcca6680005d1219aa615ca1c2393bd523ae0c4
-DIST enchant-2.2.3.tar.gz 957451 BLAKE2B 294c4eb7afbe97a2c8076b1b26640cb15d13dde64de7879557992e3c8ec96d68ff4fbc2c911d3c6d8811d4d5ca5a104040941ab59f8a18e324134e7ac38a2dfa SHA512 abde9d6fec25edff694570455fd4c6e8e2e2c41a6b133bbb31a344761137a354cc1c655e53374cf712bf311c3732dc721e9ffd2dc933d78ec8ccf224350635d6
-DIST enchant-2.2.4.tar.gz 953026 BLAKE2B c1745c365c4084d92988105e072b4776e7f565a53748fdda67ab792777ce78276de5f843ae095d7c025f4f08cfa5daa5e3f9c26acf4e98b0978d589c9e9e076b SHA512 3860f04e276e1afa8969041b3f57411136d6b96ecf90996cdb122739e87be432f12219d2635c29d2e7ef3f2eeb366013026b6f8327a9749ffbc3a1dfafb4b870
-EBUILD enchant-1.6.1-r1.ebuild 1631 BLAKE2B e11ec8c61312dce4fc5783cf9723aa4a58f98d0265b529d70eb5813d705ee25def0110a6d8c3806ba5324c83911721653f18bb8ba92d683a659cc6d85c83f9ed SHA512 56ea5e50b9a64223f2835fb36adad27b52b61f1e97771cdb32fa1760dd6d414774c45438656c70ae6dd67156bb014eda9c8c284383835c536bc34c3c5383b6f2
-EBUILD enchant-1.6.1.ebuild 1499 BLAKE2B bbe5a8be0b9064a11afecb5cc4fe622c7c6a1fd039152c314ad127bcddb9abdce7c0a68b4233ce8510f0ea591cd9e8a8243c9ad4b24717a5a84de620584c9f26 SHA512 fa14c1d7ebe3913320d4e2af5d6f26fa8ade77eae5b8e4372f83b19ecb4236601d27d223f02add6227a183d26431506fa613d6d3a7e2cfc05278387edf9a391c
-EBUILD enchant-2.1.0.ebuild 1293 BLAKE2B 28adab1e239028e4c1a1bb58380dd03f6104a4b5ee5ed8323703ce828989bc9f435d4ab10c0e53f2a475dc109f175f5f5a5c894bff326b6a2b251b800d6b85d9 SHA512 1537657246a50e76a4c65082b79ee75c8ed324d448063d840c94f886c043013fbb7ed33ff75c13aa35cfb2b528a5fec294f234948bff9479bcd8f21dffbe30cf
-EBUILD enchant-2.1.1.ebuild 1152 BLAKE2B 3f06209033ef964fce26cb8d7e8555b502316bb6609fcad2d49b9a21f33b2eb804169716879b7b5a16a201fa07f14e6a4dcb324863f0877d26cf6eaa539f08cc SHA512 af7796aa6c0d4688327dc1cdf4abbf2fa84a579178ef26e15a3b61054b781f6987c0ec0fe6b2be182a987c1899180e61288c88065e1a40bca5d0f3eb54131c33
-EBUILD enchant-2.1.2.ebuild 1152 BLAKE2B 3f06209033ef964fce26cb8d7e8555b502316bb6609fcad2d49b9a21f33b2eb804169716879b7b5a16a201fa07f14e6a4dcb324863f0877d26cf6eaa539f08cc SHA512 af7796aa6c0d4688327dc1cdf4abbf2fa84a579178ef26e15a3b61054b781f6987c0ec0fe6b2be182a987c1899180e61288c88065e1a40bca5d0f3eb54131c33
-EBUILD enchant-2.2.3.ebuild 1149 BLAKE2B ae0cde32ccb00ea5a7b10d31763cbb79f0ca49b9e0b90b392fa10812fecd7be8fd8148b35a1dcaeee0eb2dbcd78f0520d3c649bd77f7f8b273c28865ecb5a8db SHA512 ddcf9e3963f4e31392cd4f55b6e15b0c413c560b2446275e30843e85d10c56692b8f4efa5077eb4af92c240fe206484bc9bda4053fe8d95a8c126f649a50d807
-EBUILD enchant-2.2.4.ebuild 1149 BLAKE2B ae0cde32ccb00ea5a7b10d31763cbb79f0ca49b9e0b90b392fa10812fecd7be8fd8148b35a1dcaeee0eb2dbcd78f0520d3c649bd77f7f8b273c28865ecb5a8db SHA512 ddcf9e3963f4e31392cd4f55b6e15b0c413c560b2446275e30843e85d10c56692b8f4efa5077eb4af92c240fe206484bc9bda4053fe8d95a8c126f649a50d807
+DIST enchant-2.2.7.tar.gz 951995 BLAKE2B 32232a0a8e5003dcc056b6916f95274f357ac2ab69a08fde806da12487f63eba273a57049250fc75699fb545e98e25b95dcaf00c67af2ceabe779b8798f24a5a SHA512 696455cf782b3186d19988ed59ca3cc6030a431d44ef3828039590afb08fd282a79ce6246a342e6bf7a0bf3bf63d4822d841ba01394da9f9e4394a491b2373b6
+EBUILD enchant-1.6.1-r1.ebuild 1632 BLAKE2B 82cda91d9057fe587552c05163822441f12dac10a09ebfd48672bfd3fb7f893b022da927cfdadd773b2d6313194dec4f3ebfc470d41080d125d1d7fd700ff2aa SHA512 01f3929470bb979bf376520c6c9d27c9b3cb03200d6b12d755c7d0495ed3dbaf46f4962ec9728b530ef8dcbfbd030e73fa257031c72fc302a2e6fc4b4e7d524d
+EBUILD enchant-1.6.1.ebuild 1500 BLAKE2B d779c9d6fdef22357426a9a2f492c4a1afbcd25be07a69db2a072ea8a11696973874e9108e546bf07b46e883b321a0076e06beb9862c27224e094fa252b131a8 SHA512 f310612ceb6e997b8f4de195b8b07f20ce4aadb972485e644cc687f89d4c696bca8cb6dd8808602004b8bc9465f6fb20a010dfce64855e6fcbfc8be47bcc49c7
+EBUILD enchant-2.2.7.ebuild 1126 BLAKE2B 74c99075bd8fce858a940032ab50edbf0bc31074546cf285c4886bdc8848ef976732e094da7aec7384c41965a6d60cc90a2166363b72e8ea01c3b2f1f730351e SHA512 e55212fde8c27c9c6227db789b27e02795ee6b2d7eaf7c0b1e98aabe612e3e1ad42e9da495dd75bb9b7cac797ad54a0397bfe0f8810b3870c334a6abf9c3afa1
 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 4c3eaad3737a..507ce985e927 100644
--- a/app-text/enchant/enchant-1.6.1-r1.ebuild
+++ b/app-text/enchant/enchant-1.6.1-r1.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/enchant/enchant-1.6.1.ebuild b/app-text/enchant/enchant-1.6.1.ebuild
index 7c319297213d..3ee15e26d65c 100644
--- a/app-text/enchant/enchant-1.6.1.ebuild
+++ b/app-text/enchant/enchant-1.6.1.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
 IUSE="aspell +hunspell static-libs test"
 RESTRICT="!test? ( test )"
diff --git a/app-text/enchant/enchant-2.1.0.ebuild b/app-text/enchant/enchant-2.1.0.ebuild
deleted file mode 100644
index 7edc38a439ef..000000000000
--- a/app-text/enchant/enchant-2.1.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
-	>=dev-libs/glib-2.6:2
-	aspell? ( app-text/aspell )
-	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig
-"
-#	test? ( dev-libs/unittest++ )
-
-PATCHES=(
-	# Fix build with hunspell 1.5
-	# https://bugs.gentoo.org/show_bug.cgi?id=600952
-	"${FILESDIR}"/${PN}-2.1.0-hunspell150_fix.patch
-)
-
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_with aspell) \
-		$(use_with hunspell) \
-		$(use_enable static-libs static) \
-		--without-hspell \
-		--without-voikko \
-		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-2.1.1.ebuild b/app-text/enchant/enchant-2.1.1.ebuild
deleted file mode 100644
index e6c8d4bc6a37..000000000000
--- a/app-text/enchant/enchant-2.1.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
-	>=dev-libs/glib-2.6:2
-	aspell? ( app-text/aspell )
-	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig
-"
-#	test? ( dev-libs/unittest++ )
-
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_with aspell) \
-		$(use_with hunspell) \
-		$(use_enable static-libs static) \
-		--without-hspell \
-		--without-voikko \
-		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-2.1.2.ebuild b/app-text/enchant/enchant-2.1.2.ebuild
deleted file mode 100644
index e6c8d4bc6a37..000000000000
--- a/app-text/enchant/enchant-2.1.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
-	>=dev-libs/glib-2.6:2
-	aspell? ( app-text/aspell )
-	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig
-"
-#	test? ( dev-libs/unittest++ )
-
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_with aspell) \
-		$(use_with hunspell) \
-		$(use_enable static-libs static) \
-		--without-hspell \
-		--without-voikko \
-		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-2.2.4.ebuild b/app-text/enchant/enchant-2.2.4.ebuild
deleted file mode 100644
index f4146b3a703c..000000000000
--- a/app-text/enchant/enchant-2.2.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Spellchecker wrapping library"
-HOMEPAGE="https://abiword.github.io/enchant/"
-SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
-
-IUSE="aspell +hunspell static-libs test"
-REQUIRED_USE="|| ( hunspell aspell )"
-
-# FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
-	>=dev-libs/glib-2.6:2
-	aspell? ( app-text/aspell )
-	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
-
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig
-"
-#	test? ( dev-libs/unittest++ )
-
-RESTRICT="test"
-
-src_configure() {
-	econf \
-		$(use_with aspell) \
-		$(use_with hunspell) \
-		$(use_enable static-libs static) \
-		--without-hspell \
-		--without-voikko \
-		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/app-text/enchant/enchant-2.2.3.ebuild b/app-text/enchant/enchant-2.2.7.ebuild
index f4146b3a703c..e9756f02d23e 100644
--- a/app-text/enchant/enchant-2.2.3.ebuild
+++ b/app-text/enchant/enchant-2.2.7.ebuild
@@ -1,39 +1,36 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Spellchecker wrapping library"
 HOMEPAGE="https://abiword.github.io/enchant/"
 SRC_URI="https://github.com/AbiWord/enchant/releases/download/v${PV}/${P}.tar.gz"
 
-LICENSE="LGPL-2.1"
-SLOT="0/2"
+LICENSE="LGPL-2.1+"
+SLOT="2"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
 
-IUSE="aspell +hunspell static-libs test"
+IUSE="aspell +hunspell"
 REQUIRED_USE="|| ( hunspell aspell )"
 
 # FIXME: depends on unittest++ but through pkgconfig which is a Debian hack, bug #629742
-COMMON_DEPENDS="
+RDEPEND="
 	>=dev-libs/glib-2.6:2
 	aspell? ( app-text/aspell )
 	hunspell? ( >=app-text/hunspell-1.2.1:0= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-RDEPEND="${COMMON_DEPENDS}"
-
-DEPEND="${COMMON_DEPENDS}
-	virtual/pkgconfig
-"
 #	test? ( dev-libs/unittest++ )
-
 RESTRICT="test"
 
 src_configure() {
 	econf \
+		--datadir="${EPREFIX}"/usr/share/enchant-2 \
+		--disable-static \
 		$(use_with aspell) \
 		$(use_with hunspell) \
-		$(use_enable static-libs static) \
 		--without-hspell \
 		--without-voikko \
 		--with-hunspell-dir="${EPREFIX}"/usr/share/hunspell/
diff --git a/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch b/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch
deleted file mode 100644
index 1dac6c11ec5f..000000000000
--- a/app-text/enchant/files/enchant-2.1.0-hunspell150_fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 87b36fd87d8ecc894850d82eed33f48d6c429cad Mon Sep 17 00:00:00 2001
-From: Pacho Ramos <pacho@gentoo.org>
-Date: Sun, 3 Sep 2017 11:05:42 +0200
-Subject: [PATCH] Fix hunspell 1.5 support
-
----
- providers/enchant_hunspell.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/providers/enchant_hunspell.cpp b/providers/enchant_hunspell.cpp
-index 609f856..0bc360f 100644
---- a/providers/enchant_hunspell.cpp
-+++ b/providers/enchant_hunspell.cpp
-@@ -312,7 +312,7 @@ HunspellChecker::requestDictionary(const char *szLang)
- 	if(hunspell == NULL){
- 		return false;
- 	}
--	char *enc = hunspell->get_dic_encoding();
-+	const char *enc = hunspell->get_dic_encoding();
- 
- 	m_translate_in = g_iconv_open(enc, "UTF-8");
- 	m_translate_out = g_iconv_open("UTF-8", enc);
--- 
-2.14.1
-
diff --git a/app-text/enscript/Manifest b/app-text/enscript/Manifest
index adb234f2bba8..5b48df79309a 100644
--- a/app-text/enscript/Manifest
+++ b/app-text/enscript/Manifest
@@ -4,5 +4,5 @@ AUX enscript-1.6.4-ebuild.st.patch 332 BLAKE2B 88feff57f5dabfb09dce2c11c65e64005
 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 1117 BLAKE2B 260ddca7530e760939e4e7a23b46c219ffa82ae7c95d944607f3f542710475ab56c2208d3709bf25cdc78fb81901991ac314ecad83bd7ba8437a33f1418c90d2 SHA512 070e1a5fbdb517806cdda9a2d53a9f163fd089b413c2407d318e9729169793a3e437a10318fdb02929b672c6f9cf11c01bf4fb0adce063726fe34abfb14d9b7a
+EBUILD enscript-1.6.6.ebuild 1118 BLAKE2B aa0b1908d3631caf34b130627ffb3ed8d2611fd2d2ea49e4de78684064c672d6b785fe7dccc1c8e0c3fb903bdf16dd0cd218bb1a0030cdf1e0ed8eff528ea406 SHA512 3f82e060b86a258633aae56b3fc66d9f7f8ab3841958271322c669e53c4d70fe7b6888aaa12d12b81b1768c18fb2cb8db5088c60d8ac58308565e834c97401b7
 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 a287552dc78e..f0f3a6408c94 100644
--- a/app-text/enscript/enscript-1.6.6.ebuild
+++ b/app-text/enscript/enscript-1.6.6.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Powerful text-to-postscript converter"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 HOMEPAGE="https://www.gnu.org/software/enscript/enscript.html"
 
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 SLOT="0"
 LICENSE="GPL-3"
 IUSE="nls ruby"
diff --git a/app-text/epspdf/Manifest b/app-text/epspdf/Manifest
index 820d2640cd89..f8823e034000 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 c0984abbe4657d40b05e0cc4e0aa968fcacdb0bb9e170a164a72e499d4370ab9cccd011ef32b0c841ff700c537709591f9147dfb8e960ea4d97d87e236455d8f SHA512 47f4e15c3009574ac1cd97490d62a6fd3a1a5e357ccfbf89e7157d77f4e9b4967b39c4c14afd46c81f6f58a4eb16daf0793cc0d1869ca1301fbef4b7aab183ae
+EBUILD epspdf-0.6.0-r1.ebuild 1260 BLAKE2B 62b1f8c098c5f1acbc3d62e60595d5e2ea1e83ebc4c8fb622f3effc6aee2bb584aff76078030cc9c279446ad1c350f9ee5c5c62afc720ee217f5bd52e4b3a868 SHA512 a993438157760a13e54a340c9b0da6beafa7f40db215833e03e1be18542b4ab648e72064ca2f6b2211c1cda5ba024565827fc516e1c74018239928943d358474
 EBUILD epspdf-0.6.3-r1.ebuild 1365 BLAKE2B 52676e8d006dd0ac4d7a723fdf2d7dfb153faacef0b11623e9d926a854be83dcda37eec6e5e1cffefdeb91dc3f246c155ef88a1c8b0058eb9303b3a178dee10f SHA512 9f90d537edec78139a28b2defeb3ffb253428c1539bb61dd5a394b3399dc3a892b94beb215790a1d0467b627b51797bda278d73f60ab68e432c79460b7098693
 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 71f98598f49d..a67586cbbc90 100644
--- a/app-text/epspdf/epspdf-0.6.0-r1.ebuild
+++ b/app-text/epspdf/epspdf-0.6.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://tex.aanhet.net/epspdf/${PN}.${PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc tk"
 
 RDEPEND="!<dev-texlive/texlive-pictures-2011-r1
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 77703418b3b7..81cbec133f66 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -2,6 +2,6 @@ DIST ghostscript-9.26.tar.xz 33059724 BLAKE2B 7ccb9730db8ae056e67bf8d7fa097a4cb5
 DIST ghostscript-9.50.tar.xz 34613344 BLAKE2B 999af7525ec84448256bac233a81ea3b8d4dcb8cd22fd67dc26dd542840259cef0c1438b85274f1d9c192784ecc5d36cb47a3d4482ebbe19ea8843404f9d0ad2 SHA512 3c1e5db519a427f4b6bfb8d93f3c3dfb67d5ec9ccd19c7afa7670deb768515f3fc617c5588e54934bbfbedfdf8609ce2ffa36dd7da3cb618937fe034f64f43ee
 DIST ghostscript-gpl-9.26-patchset-1.tar.xz 3716 BLAKE2B 0a4c32b3d0c0152b0dc7c62bf2b0bc8e30a369c2aed7c7be4a231948123c2242ce96ae5b1fd485bdae84d7cde1be9f3b3a16831fe77dfbc7ac6cd28bb5e14442 SHA512 7ad9558b00cc11d0872b32d2f1430d2e47730a2360c79d88299c87f8d6d4c15adb5c679ebdcaf50c58d9051c6a1d6f6873e4d81aadfbf3ce202ad94b6dc8981f
 DIST ghostscript-gpl-9.50-patchset-1.tar.xz 3840 BLAKE2B 12bda8633b5657b1b480b69d5a039be724c1af9a1a67e3509112fb607565e087500d2a6efaacd5e774e0f24b01fa6e8887a56fa0207cfc6fcdc3768b0156f86f SHA512 dc638ffb48425980202e7064ee40f65b0f78041c82601f87035100a50d5e18455aa1b852c8c1d852fa582b8be52276d078d80463e3b25ab73863a8544d0e08c1
-EBUILD ghostscript-gpl-9.26.ebuild 5128 BLAKE2B 30304f954fbef282379ad86802d4aa3ce2c8c5964ea9e63c3bf57c8d0b4896e59b3b02f2238aabc5ff4d90a96e0da3b01b16e42420e89670cf84f1181b0edfab SHA512 0d626ed577c443f1628b5f8f99672d27799c32ac83a73c6f2b3f3f3c1f92888bf24279ba7bca161552e5cc8f51de2d3ebc450beb6b724ad65329d4495bad273d
-EBUILD ghostscript-gpl-9.50.ebuild 5383 BLAKE2B b7fa5cbffe95ff242b5fd6b2f041d82e8cb90edc038a496f730cb89c5905436f6855ba33526feda902fb5c586a8b359ebee4aa375737107d44c7a927cef8c3a4 SHA512 1cc010b4532726af2206bf91cdd4c4b55e5e0f847c76a6ed393c091131dd74b1439bfc005aed9fd08dcdcd281a59f8ab287d3fd169c84f72954da68253e1171f
+EBUILD ghostscript-gpl-9.26.ebuild 5129 BLAKE2B d10dd5eb32180869530c7034382dbd7a980db02a120303f591ba2c989a43084adbb7e1bed1bea1551df93d3982d0f763ffa0e5a30206d47bc9b17a186650442c SHA512 b4bbdc7aaf49605e7fa5668451b373dd2448725094a0d24a4655d9917b16d914e982c599cd99759cde59a871d161ca88c10fd4fe993406342c6cecc35661085c
+EBUILD ghostscript-gpl-9.50.ebuild 5384 BLAKE2B 4881ee0e55a41e48a9fde7ceb2c1dd3b51b5b3a97309727e2b961c72a3414ccc781702f743d670eb075e5b0d1d3edf8190ad9443d416d2e519133082e86c2708 SHA512 14c542264ae96350f12231d5df0ff1a114c260473b25e8e43e29a34d5ea06a316a0ff41bff7f3b7aa74a19320c1da36d04712173aec24d0403e2777121d9dd9e
 MISC metadata.xml 583 BLAKE2B cc9bd976a53f467582f4657d0f08862454c53783d1eeedf90dfe9fab7e074a8903a48632b03847e4aeba4d9f6cf821ebda120c1de1e64740641e4849278646a8 SHA512 3de9e76a9a3b6fff971d0760b3590a60448014268f45faa742327a90b1cd8c40eae1426026cda590dd9f91c96580eabbba85125c88ed250479b8df675f45bb15
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
index 26e38ef9fc25..aba0a38e1d0e 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.26.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild
index 076a79cca966..6687df22eb87 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.50.ebuild
@@ -22,7 +22,7 @@ fi
 
 LICENSE="AGPL-3 CPL-1.0"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="cups dbus gtk l10n_de static-libs tiff unicode X"
 
 LANGS="ja ko zh-CN zh-TW"
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 7a4e1d8c9ba2..4551453ab099 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1,6 +1,6 @@
 AUX gnome-doc-utils-0.20.10-fix-out-of-tree-build.patch 2101 BLAKE2B f1970ffe2cf1d369ffc3f3a5a6abea2f04fb32cfdc54dde9052ef468c2a274db2318495c80ec1ef0048fb65df8209bacb86392d9ff594fdc60ea92ebb85584ab SHA512 25cff56b05bf4ec0ca55a6fcab1700bd6bec9f60a923e14607fd894bd9b63cd669a4e3e9b7bacc0480e040e393370be05f237ea21074cb439a3cf176be0dd78c
 AUX gnome-doc-utils-0.20.10-python3.patch 21576 BLAKE2B 487b2f7d3758d1df475178154ed92ee548c63fd492d59fb0c6cc3a75e6378ebe75e74e3bdc60b46a74ea0670ca77f9bbad279b625bb64d4cb8a432a869eb426b SHA512 500e952f12c1baae08a0f520ea7e08c09d20ee58c3ed5fdc5f6dd1b7a192d90f66de26956306ab685ef62298df9770af184c0f33b7d4e015023ef2129da351bf
 DIST gnome-doc-utils-0.20.10.tar.xz 526700 BLAKE2B 6019aa9b1d2c8153ddc1e6af589f79628ceafb6c14b0de5dc8f9ef518b5e626bbafdc2a4d93bfb70c6823ba0605a5abe899989e9f893c976d7a5fcd9c99a90dc SHA512 1cb5e3b9ca9e45e6c551801e9c9c4aac725c2ce85238c230a4c70b36c90419886b921d8dd464df0643fc3bbb877df075abaa83a36d1609c5664960c31e11d151
-EBUILD gnome-doc-utils-0.20.10-r1.ebuild 1745 BLAKE2B e07cdad251d540fde141223a257f9b8afd30054119cb5fc76292b45f50a7903f4d396e701c958dd90c198806d82310c9b02d2fde2375392cf07dd5e371a04f9d SHA512 11920ebfad4a4512e03e5d7da7906e4211220a39a2219ba896c87378ba2d1d4dd24d5f628857379b24e995770069f552cd8f9e92afad333091c594da9d1e7bb4
-EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1852 BLAKE2B acc502e1d0dd9a006294d3b83ab6457a063711f68dc9b98f59ea778572371cef72babd34a578b010726c63af4190fc0dc2265c6b75451c12fdf8894d4c6ad583 SHA512 2906f283f52f21b2495f314878a45d753a5981a6495fa6c04e992810588877879a089cf2cf226473d7ad3ec1303a9bd6bb500e1a019b23651633365ae50dc49d
+EBUILD gnome-doc-utils-0.20.10-r1.ebuild 1746 BLAKE2B b56d95da9ad61148d68d07829b334b8d6911d96475b48eb0156ca7089a0344d720ad2216752268ce0191c7829134bbfc2c1f2e10c517ffb8592fcf4138b325bb SHA512 7e75927a13df028f7851d0a7be82192a5d452281c17aac3c42c972d119085525e0c8909dfbd21152b7c51a4cb0b8ac061552ea1aa87729aae1c7f5b97b3ad598
+EBUILD gnome-doc-utils-0.20.10-r2.ebuild 1846 BLAKE2B b2f51268e6ddd15945d44c62ee48689e5b4c146dbec5c69df9836501ee03beaf7478a661afd58c61e245c38aca25aa300a74881f44361b04ccc9bf6787fa5731 SHA512 a6605b45f3c26c5aadc06f538ad6f6335472a76ab49fa39f36d96bff110984846b4c98b68e0737dba4be97bc5cc47b6eceedd38c0b3a03a09c23ce4ad0495b68
 MISC metadata.xml 259 BLAKE2B 32f8c5208a55a1dda504b7df969127393a2c70e672aba383fcdc870de8fe778366d3dde3c3313bd043068d2e7831d1e18bad6fb428e82266fc2a630104e0a193 SHA512 fbef629394690b3a5608abc6344816f6acf1e8e2663f29949fd14a662c628f16fee77a1ec1641066806d143fb94c1571bc5b46b829dc53620af6956377fe15cc
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
index 95f1de3c4603..8e1e99b08733 100644
--- a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.10-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/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 b13d0c227dee..796f921fa7de 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeDocUtils"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-text/gocr/Manifest b/app-text/gocr/Manifest
index 71662c7d280f..1c6a899956e2 100644
--- a/app-text/gocr/Manifest
+++ b/app-text/gocr/Manifest
@@ -1,3 +1,3 @@
 DIST gocr-0.50.tar.gz 419209 BLAKE2B 232fe240d7a559cdd4408a3dba3768818aefbd8b2718c7ae40829d69ab79dd68293eb6adfc52e661f2f6cf1290ae9656c84d9d7a8fc20229c0942a8e18fb3b68 SHA512 36392516711d43f8561147684b6f4e22a450bc87f1cb30ceaab4a1821ac583ff5a3d25b3bbf1637f01bfb55366b45cc7d5086d1f29f006d615bb658d0e5faab9
-EBUILD gocr-0.50.ebuild 1197 BLAKE2B 1d40723a64c90656f5a333d9834824e0a9baa8222a24b2f4042f3497b65ab823d9dd276d3036febb9f6461f4f7d07e25443d6a285cb6f6c2f07b86484ab96c6e SHA512 ee96d72859d2e29ff6b5405f49b5e6c102bd4058d6a38e8f319634012b2b21f64ce3cf314deac831312a6fadde23e55ba88b2ce2868919677a1944ab802371ba
+EBUILD gocr-0.50.ebuild 1198 BLAKE2B d3ee9f332ff3d7b16a29a9f061f7dd3ea5bb5f66cebc26426cfc2ecaee9b10cf205529b704096faa9486910f5ce030923de25b4ea7c96d0fa1008b0135c9ea55 SHA512 c84d04a2188690b718a9ac959b55d0f9aacace22c1084efe1d11339523a832fee6cb1e30e40e8c08e9ee35b045160174ffa57901e7f981097f929208ae914197
 MISC metadata.xml 323 BLAKE2B bb09f6949d6fdefdb0ff856c96a0ab766e9ef11559aed7bc424b6da8eb226f4f9090b708da8b4ab62a123530201bfe721e5e6b505b5a6f3d5cd40f48941a86d9 SHA512 5b38ff42ca62ce001e5041406a24ccd8bc1c7f33d7a9e1f84ca0d5d48a3ad2f80e74732a846ffb6768709748bd2dca5868f76ab4c1b00f1e75a6f622597858e1
diff --git a/app-text/gocr/gocr-0.50.ebuild b/app-text/gocr/gocr-0.50.ebuild
index 80528df1f6e7..4061044f46df 100644
--- a/app-text/gocr/gocr-0.50.ebuild
+++ b/app-text/gocr/gocr-0.50.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www-e.uni-magdeburg.de/jschulen/ocr/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="doc scanner tk"
 
 DEPEND="
diff --git a/app-text/grutatxt/Manifest b/app-text/grutatxt/Manifest
index 0bd3812bb67e..1049e5c854f8 100644
--- a/app-text/grutatxt/Manifest
+++ b/app-text/grutatxt/Manifest
@@ -1,3 +1,3 @@
 DIST Grutatxt-2.0.16.tar.gz 29929 BLAKE2B 11ed6a87884ed79e6f8705f6ed8ee94c2fa79e6867296eaf6255ed7f9473a99d5fce0dec0d29de16df2a15959b6593dcba7937b3f8cda88ee88072abefb0f01c SHA512 bf5203308d0fb4baea9b161ac3374116f7cd60de3d43e8699f90626aa3f67354d2ff304ab8d45ae6368add31777b4e56a7a4d944137aa5d3687dd457c71a8512
-EBUILD grutatxt-2.0.16-r1.ebuild 606 BLAKE2B c8edc7d139c9eb15339f933050762c5085cf3c60ece86734873976abdaef039e6a1f929621b2ca942fb03809c7be2c221bd04d799289c6bd4f874bdf764bbbbb SHA512 7e8e0ef1a2ab24a13bf08b744d3bde1138c8da073be28ecacf00d47d7fc7e60187ed15f7e8a3b73365a75e76993cac043e82574bda9975543b61939abbedfe2c
+EBUILD grutatxt-2.0.16-r1.ebuild 607 BLAKE2B 6526a353b4da799f21fa4390cdebee521323474fa13edbae63b99b207ad7c2d1e54600fa8c997308c47458a69c45e36c87e0e17e4ced04eddfa833ff66400850 SHA512 6a53af85146273193dfb204f9bad46a64cd485ca104566135611db6e8510c4a54788f6e6953f6a417cc064823baf25c33c75318816e79f7d1db5c3fdd2155cce
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
index 1509ebcd6dcb..1ddcd3de9d58 100644
--- a/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
+++ b/app-text/grutatxt/grutatxt-2.0.16-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 
 IUSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-linux ~ppc-macos ~sparc-solaris"
 
 # set the script path to /usr/bin, rather than /usr/local/bin
 myconf="INSTALLSCRIPT=${EPREFIX}/usr/bin"
diff --git a/app-text/gspell/Manifest b/app-text/gspell/Manifest
index 5986cb070bf4..104641cefcf2 100644
--- a/app-text/gspell/Manifest
+++ b/app-text/gspell/Manifest
@@ -1,7 +1,5 @@
 DIST gspell-1.6.1.tar.xz 416704 BLAKE2B 2a180bc52d3f09813d8de362e5bf900f831663c09530c8a9b993baf55f852a3939447a71c9c9dc0caafba7e8b74a2a5aad4443cf248eb87da4e15e0481e74262 SHA512 f1ffbd0d23d9743bcf924c25b3a3d7bf93c6a5e4ea5e362fb7300f657d8c1d0117e847f3dec29de377947f850e003b24a3231e88e99b313c955dd94ce358c23e
-DIST gspell-1.8.1.tar.xz 419268 BLAKE2B f32c9c518c23f8f560d65eb6fb122703561cc09e385eefa99d0761e8aa5b5bf3a8cec3cab7071043134314262979de56d08ee2929973b7968016b123e53d8f16 SHA512 ae94f46c7bdcdeefa0279cd4ac3c50e53b63092016e298ef6b502c40c2574a2135c503ab322f5a3a7b8b4422fdec291a6ed0c937683a8c0f32d7ad474cc1569b
-DIST gspell-1.8.2.tar.xz 421936 BLAKE2B 5fdff772e716c1f062002d7371064dbbaf6eb43e77cef03b8fca7ea71a91eac82ca54a5463c0f785153a15ceb65ad06aeecc069196765cb78e5dfaff5d81fec6 SHA512 220bdec2b8229e848960e5e31bda1209dedac232637d3e6d4931ca2552054fbdf3f576d52f3d5a7ac734e6e626f2fcc7cefd0bff906b29ba9930cef791906c32
+DIST gspell-1.8.3.tar.xz 421468 BLAKE2B 70a8c0649a9f1f0d5e1bbc170734c6ce7aeb4875ed1cca52c4c582688c56553ad2363b9fed732c504f3ff6bc33d994fc4ba12cd3754e4f3b602be2a2015144df SHA512 4116231fdfb416e70ee34c73e0ecf81f0071e81ad477135e3c1e270534dfe4be20c7f45e316e13d33c79944d282ed3223251122983a0f3199ea57c3431a24c1d
 EBUILD gspell-1.6.1.ebuild 1028 BLAKE2B 25d57e53d1d585b6ff94537ce7d65c079a66360fe11c5162c36d667ae1d59c03dbbb263b7a78a284a273513b43b6dadc90bbe8afa6dc47fafe9f1456a5d74b15 SHA512 25c33395a415b0b0207d6ed944729f424449ec45fbbf0eeda804778d3221bec6197e3f4d90181e46ac10ede0b3e5817d6cbf5134d60e8796c16b91a6fea5d2ce
-EBUILD gspell-1.8.1.ebuild 1020 BLAKE2B 7da0dc6bc3c16371a145aaab143bf102a76fff0d79fb23bbcf6839bea23a344eb26460597fe265fcf6078c53335ab7dc1bdfd69a5fc3c57174ebd7059497eee2 SHA512 6ec57705dc8790a0a8328746046b353c24f5d0129dbf071e01994bd5f198463df2712fc3cfaf2827460324317af9ab4d1d0e51608d439b754a8a3480bbf2188a
-EBUILD gspell-1.8.2.ebuild 1020 BLAKE2B 271877681d469ff4ea3341c44eaff959d34801e1addfa2423f3d34c4080ede7376b1a04c10ee332087f4ddcea3a315e03abb377f3611674285309f8c44ad877f SHA512 2388c82126c4a20bbba5e9e7588e407a093f0f606fe3733112b186c10d62b13fea60ef3c3b3dfcc680a546be105aa70a24427677ab2b59246111232ab522911c
+EBUILD gspell-1.8.3.ebuild 1029 BLAKE2B 4e0035e94f2577133e782aa0647156cea262e711174ed46a9fa69b42bedbb48acf2a4eaa5c7b559c0c476179af6de37fdb2cd1c392b0e1c7d48b533160b03f7a SHA512 b372be4d5202cdcc9e2ce04042aed4c8db8cf95d4d5fc11c26f12f1746d9d640c2e5f866bea2c5a4017f47d8e6523b3fd63e2489930f335cb07c66d4e7ab09cb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/gspell/gspell-1.8.1.ebuild b/app-text/gspell/gspell-1.8.1.ebuild
deleted file mode 100644
index ef631e0e2952..000000000000
--- a/app-text/gspell/gspell-1.8.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Spell check library for GTK+ applications"
-HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/1" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="+introspection +vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	app-text/iso-codes
-	>=app-text/enchant-2.1.3
-	>=dev-libs/glib-2.44:2
-	>=x11-libs/gtk+-3.20:3[introspection?]
-	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
-"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2:2
-	dev-util/glib-utils
-	>=dev-util/gtk-doc-am-1.25
-	>=sys-devel/gettext-0.19.4
-	virtual/pkgconfig
-	vala? ( $(vala_depend) )
-"
-
-src_prepare() {
-	use vala && vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
-
-src_test() {
-	virtx emake check
-}
diff --git a/app-text/gspell/gspell-1.8.2.ebuild b/app-text/gspell/gspell-1.8.3.ebuild
index ddbd5b2961b6..fa0856fa8c8c 100644
--- a/app-text/gspell/gspell-1.8.2.ebuild
+++ b/app-text/gspell/gspell-1.8.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,15 +10,15 @@ DESCRIPTION="Spell check library for GTK+ applications"
 HOMEPAGE="https://wiki.gnome.org/Projects/gspell"
 
 LICENSE="LGPL-2.1+"
-SLOT="0/1" # subslot = libgspell-1 soname version
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0/2" # subslot = libgspell-1 soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 
 IUSE="+introspection +vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
 	app-text/iso-codes
-	>=app-text/enchant-2.1.3
+	>=app-text/enchant-2.1.3:2
 	>=dev-libs/glib-2.44:2
 	>=x11-libs/gtk+-3.20:3[introspection?]
 	introspection? ( >=dev-libs/gobject-introspection-1.42.0:= )
diff --git a/app-text/gtkspell/Manifest b/app-text/gtkspell/Manifest
index e5fe7b71a9b2..225c9566c32b 100644
--- a/app-text/gtkspell/Manifest
+++ b/app-text/gtkspell/Manifest
@@ -1,7 +1,7 @@
 DIST gtkspell-2.0.16.tar.gz 351277 BLAKE2B ccb49b99c4f9059ed4461bb5ffda4dbeb691c5a062184ba7b51d8464d2461c5be0d648e4f69dbc36fe345be2addbc271af9701a0a387975265585dd3a7926e99 SHA512 7d3afb327c2e15608194e6ee6110107a0ce082e483788d831d636b2e579472304137373c09a966d8e5c0cd2f830bf2e0ee477c9b5fca7da6ee27fd1498915b9d
 DIST gtkspell3-3.0.10.tar.xz 300968 BLAKE2B aa167e9e5068e9c6c5fcf6933a28246de0be8386be43ab3af80a45dfbc092e1381503822d09742d20dde2e0b8dae77210001c955e37a8dab263b832ee52675a1 SHA512 3b1ceaa9ffa06bd3f6dae39c95db951588e5cf2edf4f551cac6972822ba230af3415c5045fa24f7a4dfe05c2e386ab3f67cb80cb779576b4e54293b7b9fbc28e
 DIST gtkspell3-3.0.9.tar.xz 298988 BLAKE2B 01a824ba91fff1739046134ef0025cf894ed3f524dcc96a11ba6b23def3b1d84ef66fc5dbf37c1a047d23b276b944b25e89ff6a84ebfe19a1189ccc59d230250 SHA512 de6cc24ca092067a101996142bf2b3cfb6a5af2170ea4b0185a997e5c88adead7ba53c5a297c3110b3a66dc87d37e429720f972895bb2931f9a033fc006e2eab
-EBUILD gtkspell-2.0.16.ebuild 928 BLAKE2B 33f64b64cc8dba2cae0e1482b2b727bc93652dab216fa835724c7d90c879626813ba666f6c5844b56920e4dd69936147d68c49f4ae6413e556e99145376c3309 SHA512 88a52df77ce6d7cde85ff6ff3eccada19979c288c3abaa67994a7aadd9f7d575c1aef356bfb4e4da4ee0748827b9b23a6e6c1397ef7e7a332f26b6781152ee6c
-EBUILD gtkspell-3.0.10.ebuild 1073 BLAKE2B 006313a3737900c99f1610b0eb5ef028e0e1be435de32e66fbe9127078694032e7b57ce24948b92136c0365fa5877b012f879d45b7dfcc3bdd5de4b879754770 SHA512 423b40803bae51080d22c9739a873ed448eb0396bc3876ee7a42a361b392b57a1c0311755879bb9e536562dd26f8f2726d7179bcf28667f578d555c3240a1f6f
-EBUILD gtkspell-3.0.9.ebuild 1066 BLAKE2B b839594d19911e619c8fe1e9d506e702f59191e90e91fe678d77c878938b7d1c6882211cd13618897d08bab43637c093db6d604e3da5030437638819fe378422 SHA512 3f508d14a63ede632cc91ca2894ed18732ab5a939e03c0cf6fe000f9ff07bad5019e07f525cee45d2692f67c065517c14fd974db61749ca6dbee2f7db95c2c35
+EBUILD gtkspell-2.0.16.ebuild 931 BLAKE2B 75d272bda8c12f37fb080473509f4316be54995406c7d3e83ddf3660f761667e7f27735a0fcdceccb51b06d2f410b696acc99f1ad37e2bfa15db56dff76f0b12 SHA512 3e121f5fee9f31b2c1e0b190e8d9120f8e45511a051bcc824b6f85ae444eb894946bf0a7b6be16d5db4166e0a297bf0e2239c93645eafcb510b11c8ea2894bb3
+EBUILD gtkspell-3.0.10.ebuild 1067 BLAKE2B a923dbea388402ba9d5ffa9a7b3546a3d981b415e5db1118d421f7a4e472c2bc3edbf8fb8ad314845376b4182c0511be19925783ecc4932326f7839d9109ee45 SHA512 df7fb08a67b8f02aa4f43fdb6b8edded00fe235ee26e0296240f032d0c595b531fe248d34ee3b064a733000b2bd8479012dc6b1230c5944b5ddaeca97fd021b7
+EBUILD gtkspell-3.0.9.ebuild 1068 BLAKE2B 7d93551061749ecd326399873069fb4018c7f780a81bf9dece3593b94ed1be9743402a459445d963362f13125504d45d00087cff2aea28474fad57a6a202c7a3 SHA512 ab4b025efbd51fb718b813db2a30ed367e898dc13db9953a388223e9a65f446613638a10f6989743d3a84d180c73a730db07671768aa4b40240ab7e314d5a73a
 MISC metadata.xml 331 BLAKE2B 09488ce0a015e7f7321a4a72cf8b046c63a5497694736ea7d9450455f447be0a328bb5d6f607d86032cf1fa77ce3d204373dea048a5b089f0eb7b38c4626ddc3 SHA512 51f55422f9e5a13f8cff5ae6ed6e00f2be248ccd4b472c0d8519c73fcda34d19129fc3183d4c570480198f14468fd8b208ddab0c70df05431ab8470399221514
diff --git a/app-text/gtkspell/gtkspell-2.0.16.ebuild b/app-text/gtkspell/gtkspell-2.0.16.ebuild
index 4db14eabbaec..e2851ea43dee 100644
--- a/app-text/gtkspell/gtkspell-2.0.16.ebuild
+++ b/app-text/gtkspell/gtkspell-2.0.16.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -12,11 +12,11 @@ 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-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="x11-libs/gtk+:2
-	>=app-text/enchant-1.1.6"
+	>=app-text/enchant-1.1.6:0"
 DEPEND="${RDEPEND}
 	dev-util/gtk-doc-am
 	>=dev-util/intltool-0.35.0
diff --git a/app-text/gtkspell/gtkspell-3.0.10.ebuild b/app-text/gtkspell/gtkspell-3.0.10.ebuild
index 1b3a6cedbaec..699833e8c8f5 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-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
-	>=app-text/enchant-2.0.0
+	app-text/enchant:2
 	app-text/iso-codes
 	dev-libs/glib:2
 	x11-libs/gtk+:3[introspection?]
diff --git a/app-text/gtkspell/gtkspell-3.0.9.ebuild b/app-text/gtkspell/gtkspell-3.0.9.ebuild
index b3ba00b85791..db2f17b17ddc 100644
--- a/app-text/gtkspell/gtkspell-3.0.9.ebuild
+++ b/app-text/gtkspell/gtkspell-3.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ IUSE="+introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
 RDEPEND="
-	>=app-text/enchant-1.1.6
+	>=app-text/enchant-1.1.6:0
 	app-text/iso-codes
 	dev-libs/glib:2
 	x11-libs/gtk+:3[introspection?]
diff --git a/app-text/gv/Manifest b/app-text/gv/Manifest
index f141c8325ebf..223b5a7d7081 100644
--- a/app-text/gv/Manifest
+++ b/app-text/gv/Manifest
@@ -2,6 +2,6 @@ AUX gv-3.7.3-libXaw3d-1.6.patch 404 BLAKE2B c77340974dd82861d952ae91b6b75d51c987
 AUX gv_icon.xpm 2837 BLAKE2B d4e15bbf39e183b0093c7f9effa2725e558b6f0fad3d44fc3831c7c142081e668c727cc1688d0bd2b61e1702b50351f841f7390d1873cf27c21474549eed87d3 SHA512 6aae3a463fbf3484028f7ca8f50cb7a332f5566f3bb84dd5c17843b581e1b6013b4f99a1de8600e9d4a0ba5b9b7ce131ee37b0fd80b97e32ef018d272f756076
 DIST gv-3.7.3.90.tar.gz 757506 BLAKE2B f856d23d3b9b9164db414534dec4b9a1c441a88d644011a46429b29127364fe429fc72ed3ce76d4142106d10c6a5305b81ec22ed353716df1c1a824907f7b191 SHA512 a80ff303fda1d6f13d66847f4b20aee4b364a05ec750bdb08267aa46470b201edf9762e16ad39dfe9da03118658598697f411dc8c32ab8bbad05a1161e816c50
 DIST gv-3.7.3.tar.gz 754282 BLAKE2B cdc2133e9be41e420401d23ab7691ca27ccbcabbe5c4d2c892f5661b5c47afc1f5b90f9f240a735d33e66813dcdda0a7a5c78580719ad715048fcaf6a2991446 SHA512 0c0339f023896016212bb1b8ef0185689dd669855c060d0491e1ac59c76ca19f3006b1b00b421cb40bb0beba8e2d35dad1da7d856ac9d33440cfbb07ff1e33c3
-EBUILD gv-3.7.3-r1.ebuild 1183 BLAKE2B dbefcf30dd0b7410eface0373aa1864c0589cd6c2c9a4c4bf3e9dd24ff1043cd3ab14191a7ea2fd96c473b0e2f1e858f637c6ac09dcda5cb844e2b448e3dfc40 SHA512 261e7c286d25790b2a1e8076182f2c021aefeb05d42be9302913047a0de78af93d11e362fb3bde4c801cc87f59a47173a08927eaf0b2815577ec44ab731e8234
+EBUILD gv-3.7.3-r1.ebuild 1184 BLAKE2B a786325c226258e1c9608d007c2ef22eb65e992c668e03ce68d829c6b3ffc9b6e5d7e352e91ea87956440108bd59741b33ff04dfc001cd39439fd412e7054383 SHA512 5a6c03f0b84dbdbb1d72507d015af28071ceb3c6b9bba042ecf2ce11e12a9471c838faa4e658f10d6f1e3df2dbe3c5a33265a12a5ce4beb11a4c77b205ffd704
 EBUILD gv-3.7.3.90.ebuild 1062 BLAKE2B 779fab28c23bc1cb4a48a657bbe929ba5c123323039b83d1654ac4b1c6484ea874b7a3ba07b0e5b9ab789e09c20e486eb655d587a9cba23029aa594d4a88945d SHA512 08b5b114166a20c56f78522181ad0e14ff5de1b9ba52b97ea1e3fca1874888a43b569d0035b441454defd05904351f5dc1c74c8d78fe2279671831912d2c040a
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/gv/gv-3.7.3-r1.ebuild b/app-text/gv/gv-3.7.3-r1.ebuild
index e93336e80634..babf632d7361 100644
--- a/app-text/gv/gv-3.7.3-r1.ebuild
+++ b/app-text/gv/gv-3.7.3-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/gv/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="xinerama"
 
 RDEPEND="app-text/ghostscript-gpl
diff --git a/app-text/hd2u/Manifest b/app-text/hd2u/Manifest
index 9b71fb2b77a8..68b3f2e4d634 100644
--- a/app-text/hd2u/Manifest
+++ b/app-text/hd2u/Manifest
@@ -1,4 +1,4 @@
 AUX hd2u-1.0.3-build.patch 666 BLAKE2B 14d1e7cbb7c7302ec0aa1354c4d0a493645f8bf4bf9e4c2e2fa2bd61b04e0e7e8f90477deb6a73a1777ff2f12ad13cdd97f604d889778759d7fe21222772eff6 SHA512 934fe3043aceeeee5df7ae5879198d385639f5b489581209c44e7ec91f5d05216424bf5652f557e154a1a442633848ebe1167b61af9c9e374cd30594744f4d7d
 DIST hd2u-1.0.3.tgz 60024 BLAKE2B 9dd57f2e15add3643aa92747836164b18c9c6554c435b718cea6b4e8d1455bbd775f9d4eda0f10a9bfe3ccb5dbd634a99b367ae849bce2145d9b1114400a2b1b SHA512 d354964f0ad5392315767b96438d843a5f1d6afe78da5b0c5ea65a3b0b2a61beabff3ecac89df81b9271a14ca443f23dfffeb51815e02b724ad287e42fc2d6cc
-EBUILD hd2u-1.0.3.ebuild 474 BLAKE2B 8fa25cacff5262f171763842396eddd333532cadd9668cff0660a45d4c9b54d551319b3f5cf449f4bc799eeb415cac4dda56bb79ecb2d489679ebc1e26fffb4f SHA512 243201e510563726ea23d743a0c9ff49158ba5fd722856098da4760be368fdba7c3946d12243134185c12451c08e73f65008d52d96ed7790641d5645edd3a041
+EBUILD hd2u-1.0.3.ebuild 475 BLAKE2B 5c8944573977ca83acd35e67ec119342fbbe7b4927958f902b712a646ad2ed9e2e9f0cea5bd632e27be43a6058c9e3e936486bfca94c645e776e9e7e2d5cf425 SHA512 5e7b0f406b802202cc63c3a1f54878dd136dabebc833f7425f3992bb172f494b345fe5d07c92b405dff8312b07cc5e57245f01f38fc48a732afadd6c6281f95e
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-text/hd2u/hd2u-1.0.3.ebuild b/app-text/hd2u/hd2u-1.0.3.ebuild
index 078f52b2e41b..e436af4d62ef 100644
--- a/app-text/hd2u/hd2u-1.0.3.ebuild
+++ b/app-text/hd2u/hd2u-1.0.3.ebuild
@@ -7,7 +7,7 @@ DESCRIPTION="Dos2Unix like text file converter"
 HOMEPAGE="http://www.megaloman.com/~hany/software/hd2u/"
 SRC_URI="http://www.megaloman.com/~hany/_data/hd2u/${P}.tgz"
 
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/app-text/highlight/Manifest b/app-text/highlight/Manifest
index 841c70377c36..e2ad33a5fd6d 100644
--- a/app-text/highlight/Manifest
+++ b/app-text/highlight/Manifest
@@ -1,4 +1,4 @@
 AUX highlight-3.42-qmake-fix.patch 1051 BLAKE2B ad9436c010cb1f9b8db5a21234ec6b80ae73bf49cd165f99638c93b251a53db4918bc1fd70260a5a9310f9d28b86b25190ec5b21cda09b7f4138c3f39dc6088d SHA512 5f74b45995b953c815c9e820fbb73693f3f28927b5785fbc86537f55d2f411f9a6b420e45a4834babda54fddf44c1640bc32cc2cd35d3ec22be07781f05108fc
 DIST highlight-3.42.tar.bz2 1294770 BLAKE2B 22c79258be6a665eda8ee17d1de6a97811f97dc4b4491c24b466dc5375d98d865e07ac4e462288d066613bef8bb5a469fa0bdb3065ecf098fc6c4f6090ecb63e SHA512 362150ee396d2b203f11ecc3d011e23b6f8c7d93ff9f8cb0e9e980be6da21e7b3b1ea1e347e3f09129ab0fb1a0aab19ff19f021e643b93a163a99d3882f9bf80
-EBUILD highlight-3.42-r1.ebuild 2207 BLAKE2B 3956e9a1d15dbd8e6149196a92ddab36da675a2dd35a471fa525e645fb9a0e4fa854c7a87b467f9a652372d83baa745afcd207e4c9bb357295bcd76f331da665 SHA512 7bf01a705b0df549e856a61c50d0723d0f116ae0cddd5db16b8c935ae51634b51983d1f32c9b8616b7ea7b2537a75d35d32d66621ee0eae19cfc0b18fec262cf
+EBUILD highlight-3.42-r1.ebuild 2208 BLAKE2B 5f5ba8a48854a7ebc83a719529cf1f972b5f884bbcc4b67076f9883e93b64ec21ec168a7eb1fb507aaa1144ff72164e20482ca1b61ccbba95f5759a3a3345fd4 SHA512 48a2c101ed9bc5a4d8cc98d48db712e3e0e772b0466b4f381b6fda3dffec02f7b00d41dfd0ea099b44bcf83e22da41d7edd1350c7ad284163800c37cf8e4086d
 MISC metadata.xml 249 BLAKE2B 1b34ce77c092c0664a18f32525d158d41bf36ab7ab7a4b9d01ed37e1e3dda3d58849d5b1375065c4e5591f6b09b2a93e88a624d399c495a0b1125edb30ec172f SHA512 895325641a176c848988fb5f36cdb567b584d22f6e778b3de674de480cbca30b7cf8f12ecbbe1173a63e3229889e1e0f5efd5afea4f0d4c429ac236598f80f1e
diff --git a/app-text/highlight/highlight-3.42-r1.ebuild b/app-text/highlight/highlight-3.42-r1.ebuild
index 1ba2fae9d484..9d357616acae 100644
--- a/app-text/highlight/highlight-3.42-r1.ebuild
+++ b/app-text/highlight/highlight-3.42-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="examples qt5"
 
 RDEPEND="
diff --git a/app-text/html2text/Manifest b/app-text/html2text/Manifest
index f71d17489d9e..753e2344c482 100644
--- a/app-text/html2text/Manifest
+++ b/app-text/html2text/Manifest
@@ -3,5 +3,5 @@ AUX html2text-1.3.2a-urlistream-get.patch 186 BLAKE2B 600aac564090a318cd60085836
 DIST html2text-1.3.2a.tar.gz 130088 BLAKE2B 97ca951ae7c501cefca78378683de7fb3c329905298de9e9675303485f3f4a83c5de39c90c8f9c0fe20b73d1e2b70897ee47cdabade9b3791a46f02625bbef05 SHA512 8ec2c17849615b8b78b6f7e9066e5bcfb419b293ffe98323ed0942e891993e205ef37ddfd2839eb12b6bad561989027aea0ba2d57eb7193d424715f93ded90e5
 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 966 BLAKE2B bed2bb01d9737b583602897df6a3f282bc43576ded681bf3777b8a245261e31e6b25fdf744aa6be48be5e6a49cc47d570e5bd10ad6cddf4997d5ba89bfdd9595 SHA512 c2fefe8343609b24840bb89bb43fbd30a4d5ea8d48fa85238f05d5b7df1f8ec2ac7141eb48a323791e425bf1fa95e75ebfa3967d9246b7d654fe527ff59d25e7
+EBUILD html2text-1.3.2a-r2.ebuild 967 BLAKE2B 7a21d2b430685754dcd726f4ddc836e1b4080f29cde88a30f1247cf1b5785ebe388db1fcaf32d6e495464847b9e431acd44ac483db0fe784d63f441094e60539 SHA512 66c779c7e389701b2605f94c9e872f4cb41f38c1f102e31129eb8e47c43938aaa458704c42b4681a0f6aaf1fd520f2849d51386e885b0bda46336c0f40480a83
 MISC metadata.xml 373 BLAKE2B a4ea5de91e4a5f5a7653f4c9d86262c999e72c69863f0185700bd4fab6c27cf87d3e392aa013dd4b60a84b1ea0ddc42d811c4131c8db3ba427df86df7fa4abb8 SHA512 ae24dd6abb85c0abb4085f15c9c140d2dc3bb0c201ee22f1762e1eadc37899e8b5aa5cb794f9cd12bc26857195c9b9ba8cfa46d05628cdf765ddfc0639dd6bd4
diff --git a/app-text/html2text/html2text-1.3.2a-r2.ebuild b/app-text/html2text/html2text-1.3.2a-r2.ebuild
index 06cb76ed7dca..5535a22f8711 100644
--- a/app-text/html2text/html2text-1.3.2a-r2.ebuild
+++ b/app-text/html2text/html2text-1.3.2a-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.mbayer.de/html2text/downloads/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 PATCHES=(
 	"${FILESDIR}/${P}-compiler.patch"
diff --git a/app-text/htmldoc/Manifest b/app-text/htmldoc/Manifest
index 6579633cfb00..3e75c0ad3ac6 100644
--- a/app-text/htmldoc/Manifest
+++ b/app-text/htmldoc/Manifest
@@ -1,3 +1,3 @@
 DIST htmldoc-1.8.30-source.tar.gz 3901592 BLAKE2B 1aad75973ce485fdbe15d6db99701f88a0fd48a075014c401cc8fdb1f9031214a148748e6731542ca8df7bfa5e5f4c50ec772dac4231fdd71e70f6b092bd20ac SHA512 713dc67622533dae896745ac8809e43a7f91696715aeb77df2628bd04c0d3e16c8402891499e8e0c10cab793b44114e600d5935b3c76a3cfa303c10897456804
-EBUILD htmldoc-1.8.30.ebuild 1113 BLAKE2B e4749513e062adf119f68acfa3ff0864ee035643791ded81316032196366fa74bb60a5b56ffe57b48481d458e973e7b406aa11f0b27d3dfa306b721d25991ef4 SHA512 535e27ae7e6ac09315b0f3b0290b0963320e0335ed91fd82cac323dcf431a99a2146f97a2cbbdf187dbd5401b8833594a84d912ae9ff832534848bcb7d35c94f
+EBUILD htmldoc-1.8.30.ebuild 1114 BLAKE2B a7b38e5290cf206b996ba1370f2693c8ffa90d58e421b09f6e3b092892b6f38a17e7c02f9a1e2c0d35c5c2b1944f50f4581bf82f3074fbf10f3941eabc1e324b SHA512 e4c4460eb41d8c27e3f6bf52b2ee57decfc3305a269dd5067b7756e2d61521b7d85c75cc2798e518751fad6474925f010cb2c9e26bacb4004b6cf23e082aac6a
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/htmldoc/htmldoc-1.8.30.ebuild b/app-text/htmldoc/htmldoc-1.8.30.ebuild
index 9fd2fd29c494..1c50d33e156d 100644
--- a/app-text/htmldoc/htmldoc-1.8.30.ebuild
+++ b/app-text/htmldoc/htmldoc-1.8.30.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/michaelrsweet/${PN}/releases/download/v${PV}/${P}-so
 IUSE="fltk"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ppc ppc64 sparc x86"
 
 DEPEND=">=media-libs/libpng-1.4:0=
 	virtual/jpeg:0
diff --git a/app-text/htmltidy/Manifest b/app-text/htmltidy/Manifest
index 8d3da8fd142f..2e435fe052da 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 1981 BLAKE2B 7c067dc7b28f6996e567bfcaf53697213a8b3eb65342e8a3f1bf5c7fc261b48ca8be41769b823dbc39cd2e76edf3c7dcdc84166b3e126b3710eb4c28a9ea7fd7 SHA512 0503e5972fd2ce2d9ccc26619174061d423613db8027379524d2cf014b46d2d48faa11a4d5969f5eaa17676317164c2dc17c31359ac9e680f2f5aef8c23b95a5
+EBUILD htmltidy-20090325-r2.ebuild 1982 BLAKE2B 598bdac1a4330127ac8ec2b53ed945825b63ba6c47ace090a44b6f751219db1d1535170a7426baecc85b9970b1260f5668cb3e613eef31731dd680fdaf49a96e SHA512 923d358827eac7f2e9b630250ef6583e20add5fa29d1fbbde875e27d3fafd28354e800c238a4d0755d57b2d8c33969827fda99517e6b48005253f5b52eae237c
 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 a47e38e16716..a27b7a03fb71 100644
--- a/app-text/htmltidy/htmltidy-20090325-r2.ebuild
+++ b/app-text/htmltidy/htmltidy-20090325-r2.ebuild
@@ -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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="debug doc static-libs"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/app-text/hunspell/Manifest b/app-text/hunspell/Manifest
index cb05f49b7eb6..a23eca59af99 100644
--- a/app-text/hunspell/Manifest
+++ b/app-text/hunspell/Manifest
@@ -1,8 +1,5 @@
-AUX hunspell-1.6.2-renameexes.patch 5104 BLAKE2B 83ea0ec81fdd5e8934c954bb2f2d07e9c47f725f8b63360aca7cd611348106a1e3f13ab08609ff4877272ec6b116927c382c5b47731945656ddb7927aca22c50 SHA512 0d1871eda31b83851bf153746e0f4957599e889a536e9c0994d1cb988bc4a887788c1fafe4dccccaa94e68a69e6fa4ff1e201678fa8d1afdcb9608b83211b0ae
 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.6.2.tar.gz 721165 BLAKE2B f377596d2031e89ad902a0f5da85e77948bd5d582bb4c558cc7c379d803a00787237d2feed9d26e037cebb77958709f41fb01d5f8bfed6ae21047a2da83c8f51 SHA512 a23127f1271da95ac06a1fb2f57b659485e959567b61da05b2bb350684003a0fb7e882b5e524c465fd890f79f513ed03174f38611989a1c09081147c47d6da11
 DIST hunspell-1.7.0.tar.gz 482156 BLAKE2B daf689ab44872c78d27bd035d996c61da9b01b7bbe5ced120034b2d64bbead573ad3807dfe5a06ecdbd96c610f42e4ea015be4b2046ebafad13347c08e60913a SHA512 8149b2e8b703a0610c9ca5160c2dfad3cf3b85b16b3f0f5cfcb7ebb802473b2d499e8e2d0a637a97a37a24d62424e82d3880809210d3f043fa17a4970d47c903
-EBUILD hunspell-1.6.2-r1.ebuild 2361 BLAKE2B b75f02e0862a9a8be86d7fb29b663a93f483410bf5d0301bdab8487516c00f132e6268ed0bdf133f2ef746528b93c6b0d7cc71a38eb3f49b33202b125e19e04e SHA512 fa6f2089e74c17adcfeebdce2ffa7f2a56ef86e53f1b05b2a2d7fc61e4a29dc9a5f010aa305e07cf22c63208bb73fe1c795efc47e951b666aad33feccd0aeaad
-EBUILD hunspell-1.7.0-r1.ebuild 2320 BLAKE2B 0847d45439cab6c110f629bc75148dc355be943d472944f4a766b026deeddd5941c6775b1afa96627eae476df3e25bcfab1ab3ef82a82fbf63dfe75f786927bd SHA512 bff1ea10fb94b6cecf2d62ce944ba05fdd1367c3a27ee7bb25a6ee44f3a9155a79198bc42e2027ccbf9a449fb9ea847ad7bdc0477a3d0c1ab840608531708d1e
+EBUILD hunspell-1.7.0-r1.ebuild 2319 BLAKE2B 857da415a1f0db4ef99f5ae21bd6e8887a53b1ece545e31563961309f0bbc8770f56c14590160eb800eb3e550241560e34080b154fbced069abb6fcb49443f83 SHA512 958ac4af5756761abe98ee17336469a51b3fa7f23fcb2b715883b2abf5df34d83ffb1b4e4b8b339cd9053c126541e2dfee5e8efd6b30158a1ae4a5fffb53d309
 MISC metadata.xml 300 BLAKE2B 03418bffa5dab48a3d9f5f7de46a79b8b5de44296b7c39d8d75d021f3c5693eea63148fbed02c8a77b1a0846e1d39d8e11caeb003297839fda0c5dc679aaca08 SHA512 b541c90d84ee8c1541d588948286428f065ebf0bb393108e7521ba8d45ab3fb235eaba61ca61eebc61f371e399e7d98ccf3c2994d8df97d1b6a7972e92cffa71
diff --git a/app-text/hunspell/files/hunspell-1.6.2-renameexes.patch b/app-text/hunspell/files/hunspell-1.6.2-renameexes.patch
deleted file mode 100644
index be56cabc50bc..000000000000
--- a/app-text/hunspell/files/hunspell-1.6.2-renameexes.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- hunspell-1.6.2/src/tools/chmorph.cxx
-+++ hunspell-1.6.2/src/tools/chmorph.cxx
-@@ -55,11 +55,11 @@
-     if (!argv[i]) {
-       fprintf(
-           stderr,
--          "chmorph - change affixes by morphological analysis and generation\n"
--          "correct syntax is:\nchmorph affix_file "
-+          "hunspell-chmorph - change affixes by morphological analysis and generation\n"
-+          "correct syntax is:\nhunspell-chmorph affix_file "
-           "dictionary_file file_to_convert STRING1 STRING2\n"
-           "STRINGS may be arbitrary parts of the morphological descriptions\n"
--          "example: chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-+          "example: hunspell-chmorph hu.aff hu.dic hu.txt SG_2 SG_3 "
-           " (convert informal Hungarian second person texts to formal third "
-           "person texts)\n");
-       exit(1);
---- hunspell-1.6.2/src/tools/example.cxx
-+++ hunspell-1.6.2/src/tools/example.cxx
-@@ -48,9 +48,9 @@
-   /* first parse the command line options */
- 
-   if (argc < 4) {
--    fprintf(stderr, "example (now it works with more dictionary files):\n");
-+    fprintf(stderr, "hunspell-example (now it works with more dictionary files):\n");
-     fprintf(stderr,
--            "example affix_file dictionary_file(s) file_of_words_to_check\n");
-+            "hunspell-example affix_file dictionary_file(s) file_of_words_to_check\n");
-     exit(1);
-   }
- 
---- hunspell-1.6.2/src/tools/Makefile.am
-+++ hunspell-1.6.2/src/tools/Makefile.am
-@@ -1,4 +1,4 @@
--bin_PROGRAMS=analyze chmorph hunspell munch unmunch hzip hunzip
-+bin_PROGRAMS=hunspell-analyze hunspell-chmorph hunspell hunspell-munch hunspell-unmunch hzip hunzip
- 
- AM_CPPFLAGS=-I${top_builddir}/src/hunspell -I${top_srcdir}/src/hunspell -I${top_srcdir}/src/parsers
- 
-@@ -6,8 +6,8 @@
- hunzip_SOURCES=hunzip.cxx
- hunzip_LDADD = ../hunspell/libhunspell-1.6.la
- 
--munch_SOURCES=munch.cxx munch.h
--unmunch_SOURCES=unmunch.cxx unmunch.h
-+hunspell_munch_SOURCES=munch.cxx munch.h
-+hunspell_unmunch_SOURCES=unmunch.cxx unmunch.h
- 
- example_SOURCES=example.cxx
- example_LDADD = ../hunspell/libhunspell-1.6.la
-@@ -16,14 +16,14 @@
- hunspell_LDADD = @LIBINTL@ @LIBICONV@ ../parsers/libparsers.a \
- 	../hunspell/libhunspell-1.6.la @CURSESLIB@ @READLINELIB@
- 
--analyze_SOURCES=analyze.cxx
--analyze_LDADD = ../hunspell/libhunspell-1.6.la
-+hunspell_analyze_SOURCES=analyze.cxx
-+hunspell_analyze_LDADD = ../hunspell/libhunspell-1.6.la
- 
- bulkcheck_SOURCES=bulkcheck.cxx
- bulkcheck_LDADD = ../hunspell/libhunspell-1.6.la
- 
--chmorph_SOURCES=chmorph.cxx
--chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
-+hunspell_chmorph_SOURCES=chmorph.cxx
-+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.6.la
- 
- noinst_PROGRAMS=example bulkcheck 
- 
---- hunspell-1.6.2/src/tools/munch.cxx
-+++ hunspell-1.6.2/src/tools/munch.cxx
-@@ -78,14 +78,14 @@
-     wf = mystrdup(argv[1]);
-   } else {
-     fprintf(stderr, "correct syntax is:\n");
--    fprintf(stderr, "munch word_list_file affix_file\n");
-+    fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
-     exit(1);
-   }
-   if (argv[2]) {
-     af = mystrdup(argv[2]);
-   } else {
-     fprintf(stderr, "correct syntax is:\n");
--    fprintf(stderr, "munch word_list_file affix_file\n");
-+    fprintf(stderr, "hunspell-munch word_list_file affix_file\n");
-     exit(1);
-   }
- 
---- hunspell-1.6.2/src/tools/unmunch.cxx
-+++ hunspell-1.6.2/src/tools/unmunch.cxx
-@@ -73,14 +73,14 @@
-     wf = mystrdup(argv[1]);
-   } else {
-     fprintf(stderr, "correct syntax is:\n");
--    fprintf(stderr, "unmunch dic_file affix_file\n");
-+    fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
-     exit(1);
-   }
-   if (argv[2]) {
-     af = mystrdup(argv[2]);
-   } else {
-     fprintf(stderr, "correct syntax is:\n");
--    fprintf(stderr, "unmunch dic_file affix_file\n");
-+    fprintf(stderr, "hunspell-unmunch dic_file affix_file\n");
-     exit(1);
-   }
- 
---- hunspell-1.6.2/tests/test.sh
-+++ hunspell-1.6.2/tests/test.sh
-@@ -74,7 +74,7 @@
- shopt -s expand_aliases
- 
- alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell'
--alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/analyze'
-+alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la ../src/tools/hunspell-analyze'
- 
- if [ "$VALGRIND" != "" ]; then
-   rm -f $TEMPDIR/test.pid*
-@@ -83,7 +83,7 @@
-   fi
- 
-   alias hunspell='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell'
--  alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/analyze'
-+  alias analyze='../libtool --mode=execute -dlopen ../src/hunspell/.libs/libhunspell*.la valgrind --tool=$VALGRIND --leak-check=yes --show-reachable=yes --log-file=$TEMPDIR/test.pid ../src/tools/hunspell-analyze'
- fi
- 
- # Tests good words
diff --git a/app-text/hunspell/hunspell-1.6.2-r1.ebuild b/app-text/hunspell/hunspell-1.6.2-r1.ebuild
deleted file mode 100644
index b7e862c9381a..000000000000
--- a/app-text/hunspell/hunspell-1.6.2-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools flag-o-matic versionator
-
-MY_P="${PN}-${PV/_beta/b}"
-
-DESCRIPTION="Hunspell spell checker - an improved replacement for myspell in OOo"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-HOMEPAGE="https://github.com/hunspell"
-
-SLOT="0/$(get_version_component_range 1-2)"
-LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
-IUSE="ncurses nls readline static-libs"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	ncurses? ( sys-libs/ncurses:0= )
-	readline? ( sys-libs/readline:= )
-"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-"
-
-LANGS="af bg ca cs cy da de de-1901 el en eo es et fo fr ga gl he hr hu ia id
-is it kk km ku lt lv mi mk ms nb nl nn pl pt pt-BR ro ru sk sl sq sv sw tn uk
-zu"
-
-PDEPEND=""
-for lang in ${LANGS}; do
-	IUSE+=" l10n_${lang}"
-	case ${lang} in
-		de-1901) dict="de_1901" ;;
-		pt-BR)   dict="pt-br"   ;;
-		*)       dict="${lang}" ;;
-	esac
-	PDEPEND+=" l10n_${lang}? ( app-dicts/myspell-${dict} )"
-done
-unset dict lang LANGS
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=(
-	AUTHORS ChangeLog NEWS README THANKS TODO license.hunspell
-	AUTHORS.myspell README.myspell license.myspell README.md
-)
-
-PATCHES=(
-	# Upstream package creates some executables which names are too generic
-	# to be placed in /usr/bin - this patch prefixes them with 'hunspell-'.
-	# It modifies a Makefile.am file, hence eautoreconf.
-	"${FILESDIR}/${PN}-1.6.2-renameexes.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# missing somehow, and I am too lazy to fix it properly
-	[[ ${CHOST} == *-darwin* ]] && append-libs -liconv
-
-	# I wanted to put the include files in /usr/include/hunspell.
-	# You can do that, libreoffice can find them anywhere, just
-	# ping me when you do so ; -- scarabeus
-	local myeconfargs=(
-		$(use_enable nls)
-		$(use_with ncurses ui)
-		$(use_with readline readline)
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	einstalldocs
-	find "${D}" -name '*.la' -delete || die
-
-	#342449
-	pushd "${ED%/}"/usr/$(get_libdir)/ >/dev/null
-	ln -s lib${PN}{-$(get_major_version).$(get_version_component_range 2).so.0.0.1,.so}
-	popd >/dev/null
-}
diff --git a/app-text/hunspell/hunspell-1.7.0-r1.ebuild b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
index 73ec87891865..272ebcc1de9e 100644
--- a/app-text/hunspell/hunspell-1.7.0-r1.ebuild
+++ b/app-text/hunspell/hunspell-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://github.com/hunspell"
 SLOT="0/$(ver_cut 1-2)"
 LICENSE="MPL-1.1 GPL-2 LGPL-2.1"
 IUSE="ncurses nls readline static-libs"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	ncurses? ( sys-libs/ncurses:0= )
diff --git a/app-text/hyperestraier/Manifest b/app-text/hyperestraier/Manifest
index 64503c8b3440..6c3c0789ef5d 100644
--- a/app-text/hyperestraier/Manifest
+++ b/app-text/hyperestraier/Manifest
@@ -2,5 +2,5 @@ AUX hyperestraier-configure.patch 11535 BLAKE2B 970d53c28c1dcc1bbd2f2354542e80e2
 AUX hyperestraier-perl.patch 844 BLAKE2B fd221a027e47ed7582e697a8104d1ef82d66b87919f20c82f185b9167ad03ae6b9f0b6996b47a99e58fb42443f1c1b1c9f53a6badab935361b26f8693b680694 SHA512 73c7bd659d80464baf1d28a0eed69c9fdb3052a62aa46dc0b56f2ba6f75d458531dc6023684bd92b22b7fc4b79869ccd82e835827096b163faee0f94b0615465
 AUX hyperestraier-ruby19.patch 5143 BLAKE2B c9ea3c9e045583dee3ca119ebea07946522c50b00aba4d94fc40f7172925b9aedb8cbdc88e087a87590422566b12269641511c2c1c0a484390b1c2fa8bd1fecc SHA512 fcae611f594eeb35b6aca6eb1139304538793afc6b794e8dee1a59243d5da216f364165c90e7cf7691ed9a7f38a610ba27f37c2eef2baa4042c4a993cbfefb2a
 DIST hyperestraier-1.4.13.tar.gz 1014600 BLAKE2B 02be7cd374c47094dedd239e967dbbe5045a77302125861541dbf4d5fc60d488968718fd6b9ca57b88aac96cf2cfe73397af6bbc3d53ff6e983063ed98748e70 SHA512 ec97f487bb0e085f74222106fc5fab227c8c02ee8d736c0b4adef57ec0e4310f829ac59fff5a1c92321786e89bbc2a059a0acff6ab0e5844b83627567bb265fc
-EBUILD hyperestraier-1.4.13.ebuild 3506 BLAKE2B 2493b9a78e690264c0344c08ac9d0400047fb87a17d6176c472f649e8a5004d643067ac689ea152c356a2e9eeb536ea61bf56c85d6f85623038ad88ac2b838fb SHA512 5a4fdde48475de2417da854c3822bc51edbb880b1dcc683308ef93e3b0f23f870d3fc18d35ceeb6e1929b6176c5187f662f0daac91826e1b0ec2a17b7a81ec9a
+EBUILD hyperestraier-1.4.13.ebuild 3507 BLAKE2B 2d0d6eab1007b7439d48b78f6613126761747fae445fe744fa258c0074dcdd7559004f64fb2fb57967a8143a4de9fa373e14c45172a12806f0a800fbb1f6da26 SHA512 50dfc5d9e3c26103402f839378be133f0e260eebeddd00c6fd3e8735389d503ee4fefbde2ebbdbdab3dd23f7380970dbc49257c08fcb799de4f31dbb0fe920cd
 MISC metadata.xml 423 BLAKE2B 188de835ec6f287d3a72451770f6b7f8c93758c6579b31182bd918127b9dd3c91c13813451d611d4cf24e4dd29eee21f9b214b8545250ac23e26cc696ffee719 SHA512 60323531c2e899eed9db9635ecc0cf11d1482738006e86bbcdfb74e931b1e0ce1cc7741619d3b473d504c35d4a73f4542e2e6904e75208a4beb818fcf7d06723
diff --git a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
index 283cffc03030..babee78d76d6 100644
--- a/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
+++ b/app-text/hyperestraier/hyperestraier-1.4.13.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://fallabs.com/hyperestraier/"
 SRC_URI="http://fallabs.com/hyperestraier/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 SLOT="0"
 
 RDEPEND="dev-db/qdbm
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 0b2e6a1c6cec..2f67b1e0f460 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,5 @@
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
 DIST iso-codes-4.4.tar.gz 13299605 BLAKE2B 485f3b0240f1892fb96f2b5c391b3f0adc593fac97d53748aa104208936d1bf81de1d40e742ab48e3663cea0ce5b28a20782df2f4eed251bab5b8a7055745d0e SHA512 d22ecdef75cd07b59ea0dbc87d25eb254676ab83297c1a43dbad9d3471ba355630f5588b4590972526f9e885b2e1ec307303ac0bb94b2dd5c707377c1cfa64d8
-EBUILD iso-codes-3.76.ebuild 2409 BLAKE2B fdfa564ff7e6c58aead012f18c879f62ac372677d3039a00a24d3e5764af36d3ae43fa818f4c5a57ba53980b3a54680db8e289d3d62fe26afd98652a84537049 SHA512 0d15de3e173f2788250d392a37c084422ff900483da231ffa720eb2cce56bdf8ea2b2bd2468109e59ec23fd6c6ce369bd953ac20b53b05c4bf20dbcc4369815e
-EBUILD iso-codes-4.4.ebuild 2634 BLAKE2B 69c72da7ed1925668478955ac2d547c8ee71b1f6171a641c93c88e77984a11b3b0e6be774665c550a46d8dac8086f9683cb922cb6678de54ddaa215b8d13a4f2 SHA512 9e1f1deca150804f55d3a993c24c8c4412e8e19ec0acfa25840d81e769cca34cd9ea26974ada3663173e52579e0a969810ebc99083f8a80ac6ba2039766d3f7a
+EBUILD iso-codes-3.76.ebuild 2410 BLAKE2B 72b76f1f783b774af898915ef548c2e1456562157579cf4a63512c82e91044bd4647f77e15ae9b3435458600acb53311dfdaaafa3f61ec180656b2672dfe16c4 SHA512 169c360a6da06810c9bbe57d29bc050ac2088f3536971cc2d5d2aab47ef64b801b9cc2a7b35db414fa7c5067201de026e46c306fbfb9048e001144b082bf7d40
+EBUILD iso-codes-4.4.ebuild 2633 BLAKE2B 0ce1b3565dd738ad71a86acb3754779d6a41c2955932754df6bf33468a3255ec2851a330a62d9e539ec6bb637ff9f145377071bd7e992d41a137934a6e256f45 SHA512 2c73e8d9caed70b4c0d936cbf5539a6f4bad26de03fb36215a0fc83840fb88c718e7f43cb11d28f59ae092b4b4b0e9c650a1fe1314aefda9842cfa9bbbcd28a9
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.76.ebuild b/app-text/iso-codes/iso-codes-3.76.ebuild
index 0264d30c7d18..13eee6bba9c5 100644
--- a/app-text/iso-codes/iso-codes-3.76.ebuild
+++ b/app-text/iso-codes/iso-codes-3.76.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/iso-codes/iso-codes-4.4.ebuild b/app-text/iso-codes/iso-codes-4.4.ebuild
index e5bd27de5b9f..9979cda36b9c 100644
--- a/app-text/iso-codes/iso-codes-4.4.ebuild
+++ b/app-text/iso-codes/iso-codes-4.4.ebuild
@@ -13,7 +13,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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
 
 BDEPEND="${PYTHON_DEPS}
 	sys-devel/gettext
diff --git a/app-text/jadetex/Manifest b/app-text/jadetex/Manifest
index 6ac4b2fbc3b9..66cafae3a55b 100644
--- a/app-text/jadetex/Manifest
+++ b/app-text/jadetex/Manifest
@@ -1,5 +1,5 @@
 AUX 80jadetex.cnf 995 BLAKE2B 1316aa328e42553d13ba377512bb1c7301a62ee60b8351a9209dbdf7ebd306f092e9b3e35c6b605c9847a1fd931cda3ccfb042a30ec3415b59f1c88537ebe55d SHA512 b1e940b79bbb76b3ad02c82e25120651ab64259be104849fc39aee94fcedaea091220b6896217faa84f93a45cbafca5b1855396b47210952723148b69d9727f9
 AUX format.jadetex.cnf 170 BLAKE2B f6f923eb38263e054ef470f0e9bb8f4beae75a9ea5f5df380077e1661e22fed024e1f77f56f8419127bfb831b7409f486cd53bfbf2aa81bb80a2c47ec674cf2a SHA512 8d5d6ed30c45e1d79f108268e045acb763fa6815ca90a8f246daff51350ab2c19c7d38237aff3ced94f10bb9de06e3021c11138d3f038f4beaff25c5cade391b
 DIST jadetex-3.13.tar.gz 103137 BLAKE2B f1b94f62a6a9c0a33acba4e8c757bcfaf26660a2d0b4ac338cf5afe8d03476a8744652244218d056678a59507ce3c8de7066314f5559469a60be5287a8c0ab37 SHA512 188fb83b50fbe82856a32ef95088d5c801750114810e3cdf7e1758f78b6a94b331b7ae7d81feb1c08b7bb31ac52f8435503911933350baa3068ad373e11dbba1
-EBUILD jadetex-3.13-r8.ebuild 1643 BLAKE2B f9c193757e3f2bdd61ec14da411cb034a643fe55dc48068b9b9525f0f2d5a5abfed396e994cdf9c118d810c2557b54fe137202656decaf72a138af9beb06b4c9 SHA512 e2fff2f88b3f01cb2c8717bda7bfe468382e86ce55fd2ec64b8748ba8d30703baebebeb5bc4b03441a105696faf75b43ccd3de2c28d840c0a4e8d32cdc4d9e8d
+EBUILD jadetex-3.13-r8.ebuild 1644 BLAKE2B 0ee75541d69e44dfd29511c343ba607f63b1f958e6075031e7cef97d49d6c4625a3b16c5ec40875736dc8a4e03ed3cc4db791991d5112e5922a0aef8ce6fbbfa SHA512 09e7bb4c879b78725acac05ef68daf00e64b7fe9867bd2e4053f8956a7bcf1720eabe0ed940bd1e49565eba5b381f4a8eec61580d0fc0ba26b9719e9373b6c26
 MISC metadata.xml 326 BLAKE2B 43480e556a9ce9c52fc46d18765664881cbb16ea08954b18d357df0a956d335815e9a0c3093504bd68a5b2249bee307ca05030fbe7fb4324beb8fdd7ff8b2e53 SHA512 eb50eeb89f113a376963fe314c979d5e399f43b0ab85fcecc923618c717e30c90f8f70fe22ba7a02b39b14c57861efebfdb785f607a2e7830578aee20c2bd915
diff --git a/app-text/jadetex/jadetex-3.13-r8.ebuild b/app-text/jadetex/jadetex-3.13-r8.ebuild
index b071fec8afd4..8462e728ce37 100644
--- a/app-text/jadetex/jadetex-3.13-r8.ebuild
+++ b/app-text/jadetex/jadetex-3.13-r8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/jadetex/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 RESTRICT="test"
 
 DEPEND=">=app-text/openjade-1.3.1
diff --git a/app-text/jo/Manifest b/app-text/jo/Manifest
index a1f624be0e58..30dee879ead9 100644
--- a/app-text/jo/Manifest
+++ b/app-text/jo/Manifest
@@ -1,4 +1,6 @@
 AUX jo-1.1-version.patch 217 BLAKE2B 366b69d941f5f324de39e31de160e0a296dd65259a2051f4adcefde4b8253b514e44c0d4c52413379b33567d7a744a8beef0cc324bd098b7d017ec6318d2f5f2 SHA512 c70e5993069229143f75f2360bf7b4756a988f71d321a0f26c821d0258d523fc2c9d754692b498ece20ff452444ee817af609435160409f1ebe4033287ef89a3
 DIST jo-1.1.tar.gz 50395 BLAKE2B 753e65e5b483cee357bcfc1fb95d93fae008acc8a1eeee75e6e68da6d0ed8c9636cd489278c466ffbd179ceaec7121b4fe3f64fe2e9bf70b81febbe15144c0f2 SHA512 fd220acf53d554cb9e9920510dba2f4a01337b126dca89882e02ba96cdd84bf7a5e935a4c06dddb5200cd808f0609fd697e51a56161dc99b1638e33181494242
+DIST jo-1.3.tar.gz 143425 BLAKE2B 32efaa84f64b0d3e82173a5121a30e13ce7fed991ec09f26400c90071e5e3cc5cc8af372550f4d9769cc338e852bf50497782c11ffd7d32a52d5769370742fbf SHA512 3c9480257d0ab9d9f19f1aaeb3a5b72e69caff6dcf87118bea8aca74a3b0864c0d17ed52bfc5550783c4636ee3a6acb8578f08316d976cea4f06af7096c12f02
 EBUILD jo-1.1.ebuild 426 BLAKE2B 7752fa82f7f4f99ca1873eaa98f9a2f9612fe57548cc7791e81ffb15bced18061d1bf4d17367506dc6a6f860fd0fea2c314d240f9d6fbb84336d77f00d867a79 SHA512 eafeac07b4a04c94a03de806eabcf620685043815a4df4db89e06783533767e09c38aec38197c34ff86c854ce29ba6456b555b18a0df7373a35620dd3e34d893
+EBUILD jo-1.3.ebuild 490 BLAKE2B e8a02cdb30d8bfc30f3406aa57d36e0e6b8af9e33a4e1c565335740031f4f0df40925303c6636de2929facab79db5844a78f3351347fcf44d84e923d5b530a4c SHA512 02b318c953290fe717adc703ee5edd40a5b8e7cd5194434671a80c00e87170bbcc4f93b3471362e18e76e7eefded218ee28fba3321147477e2d5f63d0d233d64
 MISC metadata.xml 288 BLAKE2B 8b66970135ed40287f00f96188b1679d936f9f58d59d2991aa36f2641e0a5ae48bdf3f36556be0b0296190a1c8bf59c88e6900de93e32c102b3adb880e524dcf SHA512 c8e9c740f13a6d2e94d28748750b51c44d9291d4fdc8823dc11647e0ae058866c06d49656011398d48fed78192bfe89f50a5fd05d36054974e3e65bdc82c55cb
diff --git a/app-text/jo/jo-1.3.ebuild b/app-text/jo/jo-1.3.ebuild
new file mode 100644
index 000000000000..432c8d4358b4
--- /dev/null
+++ b/app-text/jo/jo-1.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit bash-completion-r1
+
+DESCRIPTION="JSON output from a shell"
+HOMEPAGE="https://github.com/jpmens/jo"
+SRC_URI="https://github.com/jpmens/${PN}/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_configure() {
+	export bashcompdir=$(get_bashcompdir)
+	default
+}
+
+src_install() {
+	default
+	mv "${ED}/$(get_bashcompdir)"/jo{.bash,} || die
+}
diff --git a/app-text/lcdf-typetools/Manifest b/app-text/lcdf-typetools/Manifest
index 90227200589f..39f2d5563332 100644
--- a/app-text/lcdf-typetools/Manifest
+++ b/app-text/lcdf-typetools/Manifest
@@ -1,7 +1,7 @@
 DIST lcdf-typetools-2.106.tar.gz 643503 BLAKE2B cb016da74dfbad92808292842de653badec4dd3b703fee5e177016856a795e1383ceeed68de668846cce167b7b9c74bd7e0b17ea3a60b2f9b9caa0b73444e02d SHA512 039215132585214e6518864161885f7a06f08f8b36b002a961b1d83182e388b31eb034eaa4466ba56a2af52e1cfb202e88f004be17c22df1343f94481e3114cf
 DIST lcdf-typetools-2.107.tar.gz 652445 BLAKE2B bbbc428673c8e036f8d3be8ec80dbcf8892f60976fee7f11d622af8442c4d3eda0e118d47b364f55fe0dc8b53062ece0926be1d67e6627500a787bce810c074c SHA512 be54d4346d567c640b260dc513854085901af96b82701fccb8f0feae4b373ac69962c568a648515eb9ebfcabc828359ab2d742947ccdf9422643b0d889961ff3
 DIST lcdf-typetools-2.108.tar.gz 651350 BLAKE2B c60986672a31bcf47b876fa75d04a976be761442b04b1541f7f9082521d716708542b8708fd3da558f9df6b459cca1043a7e1ee2eb006f94054611dd4ef348d5 SHA512 2c7afe1c6838f432ddd5bbd5fa86a58743242d5a2203220d3cd0153c0c69f23ca734e8d4352ed3c8a6bffc1c61bb93c19d00c6483545a09d6f8363f870bf2fd0
-EBUILD lcdf-typetools-2.106.ebuild 868 BLAKE2B 411295ec92edf7c577345f40479a166671601ab5cb26389da9027d05a41d4817e9a5e77c3675e7f4a2f451508e681db57ed7bb058eb11cf0146870fe5ac9d6c9 SHA512 e88e2ebfd759b88f1c76bfca05db6a1d46951c8f234dd80e9f391e7c9b0f4833898256c74a1f4ddd078d2768f83b332a591f5b7aba1006697ebb7b85bb9c9599
+EBUILD lcdf-typetools-2.106.ebuild 869 BLAKE2B 7032c88bb3a2f8d6a55fdf31ba1f62c88900110c4d7a4c15db7799b51aa11ff1984959ca54c3738a9ae24900914ba0b10cb6a2da156e02f9b20ff446189a655a SHA512 5eb492bfbc4fffd2c0b60706f4c904003f5db4415f961a0db488bc80606f68d28a140924b3265d6d7fc522956a2776c9e9379179a03702c56a29ed3f40c044dd
 EBUILD lcdf-typetools-2.107.ebuild 877 BLAKE2B 7995727fe87f1c6c1ec126fd514195dfb94c73bb721bf6fce98d83a64b16d523d89e712e40bd0483c6cb876506740f84baba1f2f513443be97ad86297501313c SHA512 15aaf39828f08a6415a8e1930332fc64805d309144d9e1f06998d422129c1e82c4090f50fb161acd0b7816242e086f38d865bb655a4054339bc11f7d36de3aed
 EBUILD lcdf-typetools-2.108.ebuild 874 BLAKE2B 5118bdd86da617e6e8d88f13ed4cfc33364b7a6ce729fcb04e435dfda8193ff508fbac19bf690f3c7edbcb373cf54f072b6ba00526164422f3d512101f49f84b SHA512 6afd443bab6bcae29e392a9eae8ab33b6c5dc95dc1b59888e56cc90264c8430592b1746f235d0b824845bf9849ad8e9c3575f8dee3628c4a675d02afd0901477
 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 52337d788483..842e2acfb20f 100644
--- a/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
+++ b/app-text/lcdf-typetools/lcdf-typetools-2.106.ebuild
@@ -8,7 +8,7 @@ inherit toolchain-funcs flag-o-matic
 DESCRIPTION="Font utilities for eg manipulating OTF"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#typetools"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="+kpathsea"
diff --git a/app-text/libexttextcat/Manifest b/app-text/libexttextcat/Manifest
index a400bde39d20..2adcc9eecc96 100644
--- a/app-text/libexttextcat/Manifest
+++ b/app-text/libexttextcat/Manifest
@@ -1,3 +1,3 @@
 DIST libexttextcat-3.4.5.tar.xz 1041268 BLAKE2B 2686345b90fd4a4345dac3cab5a801b7eabfb380f7d298c32fbb86bdb36939f6b873ccdfc6d7ef976655b0cfc8ab457e110e966ed4fc586f53023e7cb47e810e SHA512 f05a9f08c2f2f335d0e483c024321b96fee7424bc1398d4c6acbd9c501f92e22f881bc3d6ec2c0434f9bf4604f3c4b0e880e37d3d0de410eac1a20ea6669baa6
-EBUILD libexttextcat-3.4.5.ebuild 627 BLAKE2B b6e418e9e373d92897d17d4750765dc809c627dffc8f83593879d67d61aa26a960057ac4a53d06a65c42145aeb7853c8eddd030c9a3974c8f3855c5679616898 SHA512 7f8ba955d62462b616cd0d0d3323a04235aea1569566d1ae14a8216328b51362de5833a11ba4353c64b5ae3630049406da212c436d9b36895d8faf5ddd7169d3
+EBUILD libexttextcat-3.4.5.ebuild 628 BLAKE2B cdc9614ebdcb5f7597e3a87349ce195e231b526324225d7f09f6f60c12700eacb8c161de16d90cd6d083ca682e3bd57aba64726f4dc08c85ff3105f7c2fb5b77 SHA512 de683199335e453f9c896338676b9a46f15cd58dd3a3bd320dce983ac508dc5af4be3f720f965185c768a051615c0269ccf51f9468aa3a3cb86cf85bb356442b
 MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
index 345828583432..cefce9c664ca 100644
--- a/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
+++ b/app-text/libexttextcat/libexttextcat-3.4.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://dev-www.libreoffice.org/src/${PN}/${P}.tar.xz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs"
 
 DEPEND=""
diff --git a/app-text/libgxps/Manifest b/app-text/libgxps/Manifest
index b8021e426844..5e4c6e9159f0 100644
--- a/app-text/libgxps/Manifest
+++ b/app-text/libgxps/Manifest
@@ -1,3 +1,3 @@
 DIST libgxps-0.3.1.tar.xz 93132 BLAKE2B 63af298ef1dc345ef7c40fae4006ba73aa7529381cc6cbc8cf86f4d5b69c8c5617b902bef833ed7d3fa968d927b441e888889179f598b06e2ca13084d3b199af SHA512 80401bd3c9753c74e425c5c08510cac314ad255ebeda9676bd5396a217770c7f5d8733c64b649cc6fdaa43423bb1a4ad21e1e0e3f7903f486e75a1d678850239
-EBUILD libgxps-0.3.1.ebuild 1221 BLAKE2B fbf495692afb265f9674ac5ee69fcf6cfbc0a94c262fae36b6e94219e76404923e835960e68fdc889b171e1ed936b95043a3834bc726ceb8854be44ed7bf765b SHA512 66e0ff99269687db10c99102fa10f6108ca67c62591aafc4e22ea08aa2aa55dad45587788d3de34ac75b44aa6226122e2e791c7b8817c3af1d27a9ac5a709000
+EBUILD libgxps-0.3.1.ebuild 1222 BLAKE2B ca09f6270335e779c1414429eb4f9f243f928a7c96abbddb9af9222b5c5adbb6324e97058cd01d8a8e30c3a20a568a8e9bf8e4ff3a09dcbb73ed7cb58d503b51 SHA512 60de2a5d9e3c55c99e7ed528468a19b15e8e15d84dd613d6ee02b140457ff3ab8de9fe21c7d4b9bc788a87bb8f74466a8fa03494c52352f6f567fa0c04b5769f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/libgxps/libgxps-0.3.1.ebuild b/app-text/libgxps/libgxps-0.3.1.ebuild
index 1e257ebf02ce..8dccec61cd7e 100644
--- a/app-text/libgxps/libgxps-0.3.1.ebuild
+++ b/app-text/libgxps/libgxps-0.3.1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/libgxps"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ppc ppc64 sparc x86"
 IUSE="gtk-doc +introspection jpeg lcms tiff"
 
 RDEPEND="
diff --git a/app-text/libpaper/Manifest b/app-text/libpaper/Manifest
index 18b27fdd5f35..88cb61605bfc 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.24.tar.gz 355272 BLAKE2B 28617744c7361a5d51bad3eda876b3a2c03e5aad0b381aeae037a7280c88dde7cf3c3a457e7aed2dbd86b116ae6ce2469f65edc0eedbb0c2df68451813a5a579 SHA512 f90816723dafa9ce0aef652e027b13174d2430208003d3715d6f96226130bc66cfc36465f1a5a3f855697708c389f219b964a5534a64a8c98ac53662040df67b
-EBUILD libpaper-1.1.24-r2.ebuild 1149 BLAKE2B 4e68022462064aaa9cd6b3d375614069543e7dc338d6b991ca3eaf28ccba5cb5167884cd8dd94e97e83eba69a145133241e6fd710956a1fb069e16f276ee93a4 SHA512 216a070587a25c945039afebbc19687a09b429ff9b86a25f567b93898efa340de68f6fd2a3046e3fe2bc61315bdd4b2ec14858fb5d336fa32fe780391f8fec8e
+EBUILD libpaper-1.1.24-r2.ebuild 1150 BLAKE2B 4d8442e26c0055624fc759419eaf9ff3b476bc8f7dce7a0c5e9519599ab6cf2e51c63ebe37553ee159e4bccdbaf1b8ad130486c1729418ceb13a00a94fb09725 SHA512 f3f3bcb01d9ac34a3bbfdbfa1d1586185a4e5a18aebca213c5855d3192f62764ee3fa64b63b3ee779182d81e14a098287322e5da00775b9c81658e8539af7356
 EBUILD libpaper-1.1.24_p5.ebuild 1221 BLAKE2B efcc5b15395b9f83576aa261570ca67e9c420dbb96c3a7819e27b8c28a37b1c522f0277f673257671335dd31d89da5093178c8fd3fea86d1ad6aa8ad5af42ea8 SHA512 9f78a9bc1ed0ea55f9dbd5579cc87e6d940a4abebc13515c21d50d08b363ff0082230b80ac2e60827ea6b6df43e243bf442c068fbfd3fa81b996b35a66a49396
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/libpaper/libpaper-1.1.24-r2.ebuild b/app-text/libpaper/libpaper-1.1.24-r2.ebuild
index 7ae08536efde..9f5956464702 100644
--- a/app-text/libpaper/libpaper-1.1.24-r2.ebuild
+++ b/app-text/libpaper/libpaper-1.1.24-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://debian/pool/main/libp/libpaper/${PN}_${MY_PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}/${PN}-${MY_PV}"
diff --git a/app-text/libspectre/Manifest b/app-text/libspectre/Manifest
index 442a350689ff..037ea438ce4a 100644
--- a/app-text/libspectre/Manifest
+++ b/app-text/libspectre/Manifest
@@ -1,4 +1,4 @@
 AUX libspectre-0.2.0-interix.patch 728 BLAKE2B 5954fa18e92c33f086e3cd45b1d837aa1dcebdef21f595ddaa7f3485bd02f563eafdfd8c0e541cf782875de2818aa91d07e2c1d377457197760095da0e69a7c2 SHA512 d5b35ea095175a3f51553e3bed6e0e02bf7396b036923660d2ea6cd73241ef6d84a8dac977c9ce38078d41b99aadc203e13853d7087624a43f2a3eae35fedb8c
 DIST libspectre-0.2.8.tar.gz 421791 BLAKE2B bbefa06cf80ecb91f0f780493e1829eadc34061b6f2b3004f9ae01e06fc4609edd440df290be9ff1c9f43e580b53791aae033feb4115743a0f03f703bc18e0c7 SHA512 ebbe7f6adcbc7f7d6af61f24e23b114116c878755dbe90f1163546c1284a005b4d539be01986c1f940611e84141ca19768b8effc2abf1013606da7c93547da86
-EBUILD libspectre-0.2.8.ebuild 1079 BLAKE2B 78361980640afce657b85057ff9ee82f6abb15cc900daa88053be433ff0c8abf3dd762f27af1d68f85fb79e49e90766b5fd80571bf84de86b9292543798d3eec SHA512 7245c26fe1989b8b66d377505425bd0ede4093a37a1d11a3c88ec93c73862b8cb3b143089951cfee0563a258967afc38a8858d611ed7c0fe8acc8ee20677f7cc
+EBUILD libspectre-0.2.8.ebuild 1080 BLAKE2B 25fc56704866a410cc5e815823578af45386569098d4f5ae873d345be9cf59867dc7a99dd5bf00a1f754e999dafb640525817c366015f6ceee19fbcfb4651c5b SHA512 2bd19fa243d24a1b5712f16663668d5d747a1145e8e8ffe9eed6e196bd32c83d0835ccf235851cfd878d9cfe0fc8a68c099ba9d2293b50dbe41b4cc8404b40e3
 MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4
diff --git a/app-text/libspectre/libspectre-0.2.8.ebuild b/app-text/libspectre/libspectre-0.2.8.ebuild
index 1685947fcfea..100d9588b14f 100644
--- a/app-text/libspectre/libspectre-0.2.8.ebuild
+++ b/app-text/libspectre/libspectre-0.2.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://libspectre.freedesktop.org/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-solaris"
 IUSE="debug doc static-libs"
 
 RDEPEND=">=app-text/ghostscript-gpl-8.62"
diff --git a/app-text/lv/Manifest b/app-text/lv/Manifest
index 61312f74952d..b7231f8c8303 100644
--- a/app-text/lv/Manifest
+++ b/app-text/lv/Manifest
@@ -3,5 +3,5 @@ AUX lv-headers.patch 725 BLAKE2B 64a570d256aae0e5d3c13c2c6a51c2311da1dff3057219f
 AUX lv-tinfo.patch 629 BLAKE2B 1923de4cb256d6752561f2489d1633a01987e4ad073bd28fcafcd2ab81c68a2ea8a4a278a0c4a8c1c09df581f0391fb2c469c65144ddf5d7975ba1b8b9ae5555 SHA512 3a33edf5ad11d77cd23bd27fbe071aacf83ec5367b100103954159a0dc4ba2856f3978d3b8c7f41c52006dc99097bdd9d127419f700d75cbb88b745ffe4694e0
 AUX lv-xz.patch 1415 BLAKE2B e4a9cbd5bb2ca71eb3c6eea8e132caf2f1bbfda84e8055654eac86948b7f0e57397af96beca2eeacf259f9258aafa5d03303a202ab5562236ba05f0adf22cfa7 SHA512 eb791a2e392070a01e372bbc6d0d4bc113fbb57394e50fb7a55e46ee4b0896177fdb1698db750b43e78b6aa120d0fef34ad4859fee5d4a1749c062a7afb6ec84
 DIST lv451.tar.gz 605082 BLAKE2B cbfdf1c4c90dc746de631e55e3d1e88335f22342991ca7d5bd4b3661803af4efc0c6dcd821ea58be6024fa7ce773ffaa0aa3844350b6f67dd61be09e2475cb70 SHA512 88c05cb06ddc56e7f16f30b38218ec3bf9c8ef6c3c2b08d5a3f950b6870b82417368ada3f14f183b0feb6ed32d144d71901ad8134e5f88ddec11fc7b9520e810
-EBUILD lv-4.51-r4.ebuild 984 BLAKE2B b5247729f6a722012c2e7264ce80f8f789a725da9fe2541dab5a55848e4747ad6081daa95c580573cd82b862605bdbd66639256eaaf7a7d45877ee494916a0b5 SHA512 6725013dd50cb01b2a1fee8ed6ea0564ad664296dbbfb76ad43193b1ac68f2edcdb5e0f37bd55627d0b3fe1c0d48d7dcbb6bb0a56ab940266f2eecf2b1ae5799
+EBUILD lv-4.51-r4.ebuild 985 BLAKE2B 63f7d9c627b883e1616537d753268870deb5f5f6206aa9b95c3d44eedad32326d4d5698f2077dffe339ca522dbdcb54c25b4fede58c0640dd8e4aa27c0d16803 SHA512 e2bc5ce7dbdb146eae4669a38efe131f7410130f2fe160f4476a566dab4101625107ba3dfc3bf2f3b6555670c7bf33d15ef29aac7b8bfeacb8a1a4ab8ed2b4a4
 MISC metadata.xml 358 BLAKE2B 56858cc481cec55add44dce0a02d0955fa787248b0a6861914fc450957d9b18ae256a698613d94479aca810cae4c264e0a91bf3ff89b52183c4945ce32a5dec5 SHA512 7b250d5ddc092d7ecd4e6f48175e1f57f1671af4f8529368f368071b777fd773e363e83bcd3cfee3c9352ee93c9c0bc205f940c4cb6601dac3164ad34766e6a1
diff --git a/app-text/lv/lv-4.51-r4.ebuild b/app-text/lv/lv-4.51-r4.ebuild
index 5ee1d812cc66..ef614f8b8f63 100644
--- a/app-text/lv/lv-4.51-r4.ebuild
+++ b/app-text/lv/lv-4.51-r4.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="!app-editors/levee
diff --git a/app-text/manpager/Manifest b/app-text/manpager/Manifest
index 58eceea14335..213fad305f3b 100644
--- a/app-text/manpager/Manifest
+++ b/app-text/manpager/Manifest
@@ -1,3 +1,3 @@
 AUX manpager.c 1809 BLAKE2B 3f17501b90ca4af07e2bdebdc02b0dfd9aafe4dafe878852deeba30219593b1dc4310bd4a152ebf8bc4a58df61cf40fd3fe341cf0fd69e9cccfa43568a7ec67e SHA512 4f827429dc46993010d0096cb352920dfdcaf2cc97bf10e2155dfea3fda601c011467be65ca3f2e3f5c44cb26de0fd9eb58f7d875f75fd5f1db4b2c6cdabdca2
-EBUILD manpager-1.ebuild 639 BLAKE2B f12ae2709bae1bf2acd7cb53cba87b8175aeaf32ffdf7429fbdcfdaa9084564e76eae40e3d76cebff84ea87447e8b5fab6f8155adb7e7b23df4b55528c9452c4 SHA512 40852546c3fa16af4d8b3fe8a9cd0259dfae724c3605e8eaef042e6087a9f5b564b94437e4b26addac3ea85692f73380aee2dfb0606cdba0bdf1065522cda8c8
+EBUILD manpager-1.ebuild 640 BLAKE2B 214c55c5659d2073749ac35eab7437d9eb663f712822d2e14984494f9a000aba061ff789c50e681087b05b590e9cbe989719537c63cc505fbc9fe8476107f943 SHA512 89964f09ea99bf1bf97df1762780bf1680c1f70c4c0faaa359f6b9b6670ecfc0aa07718ac7a0cb6403e215dd8d2cac78df02428e4ed5af1a9117087f82a624fa
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/app-text/manpager/manpager-1.ebuild b/app-text/manpager/manpager-1.ebuild
index b7961451e493..c925f2b1adb3 100644
--- a/app-text/manpager/manpager-1.ebuild
+++ b/app-text/manpager/manpager-1.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://www.gentoo.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/app-text/mupdf/Manifest b/app-text/mupdf/Manifest
index a800fe77446c..050cd6aaf4d2 100644
--- a/app-text/mupdf/Manifest
+++ b/app-text/mupdf/Manifest
@@ -5,5 +5,5 @@ AUX mupdf-1.15-Makefile.patch 1189 BLAKE2B 21447e2fd8ca7c396b9b2bd5e1e70ac6ebff5
 AUX mupdf-1.15-openssl-x11.patch 735 BLAKE2B 03e53970a145db913bad9c03de899ffeb7eed3abfad4d3db15819d5e101ba03e376fc0faea9c4939b7167b276fffe022975bae2e99238d5b4bee92edfb924fd5 SHA512 028930d5e6c86a9052de6e1e0f3e937d89a3f22e10b7fb71f1dba998c480c9914520e4248c21d68291c6fd7684c627b5068c1bb2e027ff6a518d1ca5533eb677
 AUX mupdf-1.16.1-freeglut-fg_gl2-gcc-10.patch 3410 BLAKE2B 1181234b618d52766e159366bd4358776ec39fc7091c05025a6a70cf626427fb3a36c0909569d4be22aba8c9695366d0b8a61592f5bbab766efbe8190077d66d SHA512 069c8150402fc463def14ff5690ecfe8a376579ad8319bf79f90823a04799bef1bfa25e79b759a0e027595a114bd3cf48f613541eeb2eec2c85e31d2105062f6
 DIST mupdf-1.16.1-source.tar.xz 45800404 BLAKE2B bc4158a457056c55db52a518efc13c289cca537c29a6b563046297dc225f3ce0add781adb8520c4d0829d653ed0539042597e341cb21c4fb4c462ed422bf735b SHA512 fa657e6b9251aff91c25e91b335ea829b797dd91a759505bfd7259f8236613f590a044bc741e9b0587da55817a1ab8c1499c067d65d683d099259d06d91a8f50
-EBUILD mupdf-1.16.1.ebuild 3480 BLAKE2B 4a2712e52241a5c763e8e06381884c75ebecc25331260be69675bbe34c2ffc153b0354bf8a3e3a73c6ec1532d398a89c84248e4115c034141d51c0dffff7195e SHA512 8341e53be62e5198f5de0a10a25e2d5b0c8643f77f90dc58d317b955666ac90b6ceb4c5bca8652fcfcb8d3541364426ba35f7fdf7db7e20afd1c452d9260fc4b
-MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
+EBUILD mupdf-1.16.1.ebuild 3481 BLAKE2B e5fce8fe9b26ac0258a67ec267a416cc6b99fd5bb2147a63ef27c56344f56d92d531682a6e070a95870d73168e8dd715f4552044c968cc1b39d7de2d7409a3c9 SHA512 9c9329fc73b52aa5c154463fac09082ff6b11063a1496d092466a9ccbc71c7d43ce07b7f6d5a38d4eff67ce1878f54e5b3c3df82915575eb67b4497900ae191e
+MISC metadata.xml 245 BLAKE2B 26bf988c73d073000ab8d21ea881c4088b90e7081410938828744375bfa8de31cce2c78154ccfc61105c853c1f24f4994ca4e5cbb80c4c89dfd489bbd10a09ee SHA512 ecb8a4621081ccdd43f08e4f560b0bc820c27d6a282c87e1a8f77137ec8b215188fe31f11fc6379533afee2ebe7e14d5395a45c1aab9abfe423fd832dba692a4
diff --git a/app-text/mupdf/metadata.xml b/app-text/mupdf/metadata.xml
index 7a38bb900964..15fd2f3a22be 100644
--- a/app-text/mupdf/metadata.xml
+++ b/app-text/mupdf/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>johu@gentoo.org</email>
+		<name>Johannes Huber</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-text/mupdf/mupdf-1.16.1.ebuild b/app-text/mupdf/mupdf-1.16.1.ebuild
index a7b999565155..72d1db2495d1 100644
--- a/app-text/mupdf/mupdf-1.16.1.ebuild
+++ b/app-text/mupdf/mupdf-1.16.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mupdf.com/downloads/archive/${P}-source.tar.xz"
 
 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 ~x86-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/ocrad/Manifest b/app-text/ocrad/Manifest
index 9c179ef93a7a..96a0bdab6a18 100644
--- a/app-text/ocrad/Manifest
+++ b/app-text/ocrad/Manifest
@@ -1,5 +1,5 @@
 DIST ocrad-0.26.tar.lz 91450 BLAKE2B 9ce2324c30ce3236689236ff2f7079d89078c61c4c78efef8c7c34fad2351fdc59a67a1ef995b3ec1b64620f7262563126c0305e3ffda3c5ec04ee5cf4c39a05 SHA512 6cf4c97c4dbbc3a623192de2da261e4854dc3082a26d9731fd00feb8ed371cb18d41f5a8ed992f98e2a00aed68d60f1f3aa90b05f8472431fcf5bc5e3d10e70c
 DIST ocrad-0.27.tar.lz 91709 BLAKE2B 4dd152e6ccbd41d2ce7e7e3d4fc38e30af4f0bb9c36e32b1f32e67772347af133cf67a8b89c03d5c9924a1d4ffa009205b80609cdb96a59b3dbeb76709a8e8e1 SHA512 2a4731e0e26eefe6d37b08859c4d3cc2b54180411b0f846f7b7e873b9da5b4596ca3c6042ee42284a07aadfeb96d953dce3e95ce2410e48624d1b6020750539c
-EBUILD ocrad-0.26.ebuild 740 BLAKE2B 502d136b0a7d9648c208b78e884edaea06a620719613b35f62ee62f786eee35bdbd66781d505270a8ca0f09c6d16fdd6b22d150b138e7cdb28daeeebaa1918c6 SHA512 af202d8d6d97ef15378a10f77028758c5cd9afe0cf06de897cb695f1c73544542b5daec11c9ae610157555cd786845e7eca373eaf28cfd14d4e91598905c69ec
+EBUILD ocrad-0.26.ebuild 741 BLAKE2B b83ff39ca3eef412ea85a4ae8ced8a1425ac823a7297e22b4ea042c6e3deeacc11b93c402aaf65b8f4fc140961927a478b77d5092f9cc49f48a4150a81116e71 SHA512 f6fdb86395f1bb67f971f64d8e8e294df1850ed657cdc72d2bcf196c002498e26edfe49b1e963f1e5ee9bf4932800e9bff9a48bcfd0e49c97f1e3757d131e476
 EBUILD ocrad-0.27.ebuild 745 BLAKE2B b122a8bd100178f6d8b24a7f8a4940bbbd21b2698c749844961ebe6efea30442ac1ff37c2eb05b22ad4892dd99ba5b34ab547319e48d50e98d70c55595108fb3 SHA512 d89b5a6ee2cf49c1a1c3d65135870b5d760a07c384078041aa7d11f909a9128e89a58e2223da89383144a9315ff015f49bccb94bd84d2eaf179625ce6a1edce8
 MISC metadata.xml 496 BLAKE2B 08ddfa7a7988624d9d48b627c5f29205a0615b73e956d9520f53ac0be56bf64303474fffbe02236c8c18a8cd3e0b5573d08c1f42a37d09a7f57e69f043867e17 SHA512 702db4a3d253c553bb6ca651e80da98099fa6bb275e3b166eb43f7324a9165a6d2db397b9339ad2909d6c276029a8dbfab63bb7d8087dfe2c78345b7ed8088c0
diff --git a/app-text/ocrad/ocrad-0.26.ebuild b/app-text/ocrad/ocrad-0.26.ebuild
index a17dd6ef8739..8a51b1c52434 100644
--- a/app-text/ocrad/ocrad-0.26.ebuild
+++ b/app-text/ocrad/ocrad-0.26.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 ~sparc x86"
 
 DEPEND="$(unpacker_src_uri_depends)"
 
diff --git a/app-text/odt2txt/Manifest b/app-text/odt2txt/Manifest
index 4d4014ae777a..bbe4608c1237 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 734 BLAKE2B ced2ae39bbf6a14ac6a03fcd04c319ccf818fda352f10a08fdd73e5a56b1e4708bbe1a1deb710eeecba8383e9d830e7798efe26354786d0c0d7988f3ecdf5f69 SHA512 11bd6caddec71145458b7b28198677fc3617224dcd67ea2d675db3ba368fd670155deb0ff36e366fc63c6d951ce6eb9ab88c9d534db0361a5d7f07e39325e1b2
+EBUILD odt2txt-0.5.ebuild 735 BLAKE2B d19c0d831d117d6994d436eba0dc362afd6e9ef095963c6d9c8e0bc59f39f3993f202abe94522f8ec2f9f1bec6f70370dba6ae22201cad1d24d3e6728f934853 SHA512 31bc131c371f93471963dba594a86671a0bf879daa483fabe966128975ad3666fe9c69fe3f0c29f62d9c0a4d68d8d89f0f5bf14c0bfd16b8a0630c73184eb815
 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 1931fab8e2e6..207136ac6704 100644
--- a/app-text/odt2txt/odt2txt-0.5.ebuild
+++ b/app-text/odt2txt/odt2txt-0.5.ebuild
@@ -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 ~x86-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/openjade/Manifest b/app-text/openjade/Manifest
index f8fe1b338331..39da476a8048 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 7e7bc7d9ce1ffa27b2b3f21fae14707d2f758f0f303eebf58a022befb6c3955d42108f445e96ecaa06132067138d54c5373789c83dd8355711da1a75d8619660 SHA512 258dc1dc0028dab40d89d32236ec60f49be09b5c9e5f1a443028dc791db55257814a70c78c970e2e5f98c90ae5d3f03acb9fe466a3f587c56b611de972241d72
+EBUILD openjade-1.3.2-r9.ebuild 4332 BLAKE2B d9066c7da7f3390dd12fa7ef696d6def5de1042745259092081598c997567941837bd7af52450731c8bfc6db5a95f96fbc99eeb5f46295bfacb4c7ba1b86cedb SHA512 a79933b8114a67b1da9d9ee0ee305bb9430821a45da70ce66bf7c397f45f52647051787484228a951fcc80e04912ff2fd8788430996575d92f5f6c4358c1b088
 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 25df3d82d4e2..330f522ded92 100644
--- a/app-text/openjade/openjade-1.3.2-r9.ebuild
+++ b/app-text/openjade/openjade-1.3.2-r9.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://downloads.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/opensp/Manifest b/app-text/opensp/Manifest
index a0b6ae51d294..e261d5d304f4 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 1999 BLAKE2B b9d5122c2f83642e1b3bc6625e4ef54d59a2ea79981b8f1446caa52cfb78f19eb816f1ae3360326baf81ff2939ab43a8b6503d164e2ac4fa49340e6756ab50ae SHA512 5802cc4d6e4e4bf42e1643135a4be3884a41b8262e0540b8bb928f9a14163e6489d541f5a411a06f75841785b5b29c5dfa5b5b79ba5abf99b629f33d931abade
+EBUILD opensp-1.5.2-r3.ebuild 2000 BLAKE2B 2ab926d37aa14f7f38f169c5674031ccfba90408c4007307c04b2f766c4029390d4669c73c19b561ec503421d3f7961d8a665af485e48db15023933f448ca504 SHA512 4742f5c87396f2e847b444257a9c3983d7379e22bf2bfdd10671911f20773a9bb5c8aaa468989ecd4e42104897e62a4d0b78bc50f6fbffded360d01d6730b3ff
 EBUILD opensp-1.5.2-r6.ebuild 2079 BLAKE2B 5a42484dcdb0c08abc879636dcd99930eaf101d65cef2f95cba0d9250f4c53f71a13b141d080a8b5a57361c0c6ba0c0285754abc1fb0eecc8e59bcf38cfa2f34 SHA512 f26b1028408a758af06cc7c824bee16648ee67e1f4a0e77f0e3d701b7257bffb916967788ea0410c6d7a80ec187f811525fc641140ffa9fb87ec5ff598ac13c4
 MISC metadata.xml 418 BLAKE2B 2650036a138376fceac69b4ca2ec3c7f2acdc958760902387592c5c5953fa37bbb41e643ed1133975aa8ec48306aa2cd654b7754272e06805f5f134b7dd2f63a SHA512 d69bb957dd6b4af7a13527a7c6fb15b7df9ae62cddafb561557654d4076c3e455b28ed16c081fe6c8843c0ed9ec26bef4d26035ac6389d6d95523953bd940008
diff --git a/app-text/opensp/opensp-1.5.2-r3.ebuild b/app-text/opensp/opensp-1.5.2-r3.ebuild
index 8abb9fa4c5fb..85ef8572069d 100644
--- a/app-text/opensp/opensp-1.5.2-r3.ebuild
+++ b/app-text/opensp/opensp-1.5.2-r3.ebuild
@@ -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 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc nls static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/ots/Manifest b/app-text/ots/Manifest
index 4a6643e14f26..0479b7575154 100644
--- a/app-text/ots/Manifest
+++ b/app-text/ots/Manifest
@@ -3,5 +3,5 @@ AUX ots-0.5.0-fix-installation.patch 514 BLAKE2B 932a241591dcc23b9a57070e23422f9
 AUX ots-0.5.0-fix-underlinking.patch 863 BLAKE2B a85d3c6d4c004a3105935e013705e10e26159500f7dd95c2edf6fcccf1af9bfd1a1f8854feba37ed7b8473e8c272d355367eb795486cc65b820c264a4dd32ed6 SHA512 34f189afbba9d1c8936142f27e5ab6ed4ab2eac8271a58e9295e46b993b0be7d48fa771cd62b3a8374da15b07deaa12eefcc01b0dd34643947cb43cd64f5d0a6
 AUX ots-0.5.0-math.patch 402 BLAKE2B 647dd793323f1eb6a470015053c066593a6fc4da95c3b36f3e0c7926e38ebd75997fd3482dffa3bda850f70fac5a8a65ad19cb6e725fd514d4e9d4b366d9fec1 SHA512 4ba250e3c51eb621bba6e8ee1d291719c86d04ecb2dc20cbd1bf7bae27ea22ffbe54376d690c24c84a0af0da9907dcf40d01c0aa53e9b610737930a442cf6918
 DIST ots-0.5.0.tar.gz 371126 BLAKE2B 05785a4d4ec5feba421762ba58a7dab649f3fadcf83a3f809a73b8027c6668263a29305766aba1bba4ce9447e115a89a59788026d567b5b82f9e1c1f7a934d97 SHA512 736a672e16b741f2948e6874b88d4ade8e0450941915e65285f2fe661194a6d384a6abb267b15c3254c638750c644b4b2cf4279d7bda163b02336fcd8da9cfbe
-EBUILD ots-0.5.0-r1.ebuild 1124 BLAKE2B 1f3213172db8d4c7e23170c887fc34e85611f22a5908e949545d8721af069100374b9b890d3d33ef6e33bb8894b157f2a24679c389ff3eac538869190e2eb66f SHA512 288c8c5dcb109b05dd0f36ed24a2419778e01da987b14c4f0d478f229979a7f01290f24a6aa1d2983c6fe23ba3b7eb2d4999e8a9ecdd27846050edab4f5c2d28
+EBUILD ots-0.5.0-r1.ebuild 1125 BLAKE2B 8c74ff7d712d5516f2ed8df6e5d662aec4dafacdfebbc5df6aee17858e593b190415a43addd679e7e1c24409e67431dfc36186d4102f10a5f2ba299af7949ef9 SHA512 9fcbdf3d28940591d4b711483c041b47ccb2e3079b65205a36a6726d2e10e32ef0cd303b55231b055844101fdb2cfcf0f29dfb6de198bfa0b0c2c45b6198ab69
 MISC metadata.xml 243 BLAKE2B aa2c4e92961faa40826e16a92582bb02cacbe1a10bd1e6e8d169560472923ce521ec642b1b0175ad5beac315e575d65c9a23466b08cc95eb9605ed2376af50d1 SHA512 354efb009da3999e18811a3e91f53628d4ce26aa103544be6b5d42caf9c5d9881097e81777665f96c7828a15a7e38f1e4a118579a865eb4c740e580527b42774
diff --git a/app-text/ots/ots-0.5.0-r1.ebuild b/app-text/ots/ots-0.5.0-r1.ebuild
index 9df04cf45067..ceb943235b2f 100644
--- a/app-text/ots/ots-0.5.0-r1.ebuild
+++ b/app-text/ots/ots-0.5.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libots/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/app-text/passivetex/Manifest b/app-text/passivetex/Manifest
index 2ca2e84677a6..34f7c33d5a27 100644
--- a/app-text/passivetex/Manifest
+++ b/app-text/passivetex/Manifest
@@ -1,3 +1,3 @@
 DIST passivetex-1.25.zip 1190258 BLAKE2B bc82a0414c5df9b5619b099899ac3970943672fc3b76fa60549ba36dd60861b591c62174f1f55b58b0f51458bc961ce47fee9b991795e2d321daf3ae4b328e9d SHA512 083ba4fab9fee327ed3fef5bdc48b415138951432dcb53b1478d1ba16a92bebc1cfc4b8590e2aa647a32c7658124f2aca8160230176c623bbf531e996c43622b
-EBUILD passivetex-1.25-r1.ebuild 768 BLAKE2B b08ef1eaaf77e31655a55d280c4d050824947d56eecf76e07aceffb64c4e7029dde98ec2f5ffbdd102d9635b57813290d01721a995ef4cd64842c47ac627993a SHA512 140ff69ad1e80d9a4d6044d8da11b375f71a6933b5a8ea2291eeb997106d906fb791beebca053379de4c1a2ee993c6f5d45c2bff9914b2c5f8d878f3be3301e3
+EBUILD passivetex-1.25-r1.ebuild 769 BLAKE2B 3c5620a55f16140005f81324749582f71eeca2db78b1ff0775938e100583ef7deb9d8f5914e3c86f6f52961778f622369a9b89b154b7491cbf3c182dd25eae0a SHA512 1a132637e47b3d16cacf095d1582918cf45c6335ed77a52b67226bcbb014c4e6fecb4f7817595e95e633630c2fe8e1bbb1d9c90c3c82cf60d83139269bf38554
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/passivetex/passivetex-1.25-r1.ebuild b/app-text/passivetex/passivetex-1.25-r1.ebuild
index d0aa4bc6536e..220275fbafad 100644
--- a/app-text/passivetex/passivetex-1.25-r1.ebuild
+++ b/app-text/passivetex/passivetex-1.25-r1.ebuild
@@ -13,7 +13,7 @@ S=${WORKDIR}/${PN}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE=""
 
 RDEPEND="virtual/latex-base
diff --git a/app-text/pdf2html/Manifest b/app-text/pdf2html/Manifest
index 8d292e720d86..be84c4c1ce05 100644
--- a/app-text/pdf2html/Manifest
+++ b/app-text/pdf2html/Manifest
@@ -1,5 +1,5 @@
 AUX pdf2html-1.4-gentoo.patch 2277 BLAKE2B 4f1698da379021fc9e10cb8d04644cdc15ee45550cad0a2cc84a6f129d65d1887235206ffec4704c27a28b39f73eeae003a268a82a99dde9fc41eb40a5887224 SHA512 5639f201a04d14347e13e4ff13d3b88c534f614dfaa0dac6494420e71a0c29ccfef83984fbfe4b130d91fa21c97b32f615abb2c875a2b447e48f542ce976ced1
 AUX pdf2html-1.4-libpng15.patch 218 BLAKE2B b81712c66f6e2f90aa378861306e5184f791f6cc148b4ca7f574f48edee0b316e60a7b3b31da2ca5ac1bf5875965369e4892556f94a95f802f45174f7a215d47 SHA512 2a0a80a639432cfdb067872d12c9c6ab9e5239a2f945d0fe362d1abfa4e8d203b377981807c686fccc53ed1afaee0b651345c8cd959f8cf268b5728c4145cb56
 DIST pdf2html-1.4.tgz 22976 BLAKE2B d0177c34065dda391204813bc0c05b16ad8a711ca3d8f9ced060e2ee2c2f276fd7f0a713c5dfec934f7f95dd37641ef6aada9bab010ed9f457698c23554906a4 SHA512 00488c5e6303e1609294e7873c892866d19f3ee820f22f2d75436de22037bf3e4e1a565b7db29df5f6b20a76c5e2df4786e39e1d803cd7cca88274da65c7bbbb
-EBUILD pdf2html-1.4.ebuild 1083 BLAKE2B e8242e5b921e921a2ab8e737f2bc89d935c28f7d8d7d4823fa1353531cfd8e6fb7da3e354ec7af10e88e2811e363ae17ad693a7123356eac374354cb0d962b6a SHA512 0de389bd8d2c32a4daef3a433a9f336b3f22d0e6c1b1d8c485605b22a251dd99732db0b3994a75a32ac5272ed28b57db099e4b9a5879062b087069a4b907694d
+EBUILD pdf2html-1.4.ebuild 1084 BLAKE2B f4680c63e5823f1ab677b78791400119e9d663e62ea23f2b8698bdedcb13148ac95613b8aed1b5fb2988704535360380dbbf8fdd35c70baf73d1013b35f86942 SHA512 ce695ba23ccee6f7f9d30f3b69aeba9db815664c79c945c86ce9e8bd8302b719ccd4816fe3793104a5f32083ef184942d1951df5636392ff7bc8e05d8ff00250
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/pdf2html/pdf2html-1.4.ebuild b/app-text/pdf2html/pdf2html-1.4.ebuild
index 6447a075494d..da6527521124 100644
--- a/app-text/pdf2html/pdf2html-1.4.ebuild
+++ b/app-text/pdf2html/pdf2html-1.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/pdf2html/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND=">=media-libs/libpng-1.4
diff --git a/app-text/pdfjam/Manifest b/app-text/pdfjam/Manifest
index 9aa8f6b30150..78d673a15233 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 26e23fca39e0fbaf66613745aef9d44865a806c00d5be73761ae19f37a238a6c6dc6d344d7cd5e7eee150366418c438ebea5368a8325e978e54a4680f685f665 SHA512 71e1d72abab0694b03565c94ebd2f8e687c82c7a8d5523c3e9221ca4fcfedd6504c96cc039a124c6309a345f83689829ff7d85531153a18d708d6e5f167725e6
+EBUILD pdfjam-2.08-r1.ebuild 584 BLAKE2B 565c0d4eb080c49a21167f95406746018d6fa854dac8d48a37fcf75db35b79b71730204a5b36e85ec0ad1a1e38315add5b6ef00f87d9d40791c49a10696a2dff SHA512 f88d6c00a497b6a724a700e406ca82017ff738b1bbe5f397aa45a2a92120dcb01e596541d0ed423ffd44032ea3a86a0adddd4fc6202acb3786a1514e66814ba7
 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 eb5d6483f273..5c78ff074ddf 100644
--- a/app-text/pdfjam/pdfjam-2.08-r1.ebuild
+++ b/app-text/pdfjam/pdfjam-2.08-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.warwick.ac.uk/go/pdfjam/${PN}_${MY_PV}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 S="${WORKDIR}"/${PN}
 
diff --git a/app-text/pelican/Manifest b/app-text/pelican/Manifest
index 58cfe4ddf56b..ea87165c0ce9 100644
--- a/app-text/pelican/Manifest
+++ b/app-text/pelican/Manifest
@@ -3,10 +3,10 @@ DIST pelican-4.0.0.tar.gz 1314626 BLAKE2B 18924209949b43063416f2e2c6e22a5524a36b
 DIST pelican-4.0.1.tar.gz 1314716 BLAKE2B 1fbe01f5df7f1c730d7a45429369311f77c7e8e278a05cc037e03d8193dc2ae9075ee1346fea072a08ee5d73baf9aaed8c1f8f210fd4331754accca9ebffa4da SHA512 26f91046124bb92de6fa31d17ab89f743cf9408c15b9b259875e2378342133313368418da083d1d4abc5de0537806a9dede327719c8fcf89d135805c47618a4a
 DIST pelican-4.1.2.tar.gz 1329126 BLAKE2B ec6067b9df2bf37877ca23602228b2eff035221ef16ed1f185e2806fd661c8b733603506f3f1d9516422bd8009a0712f726d40559a39b0d100224ee56c3e706c SHA512 9a20e3a16e2caa15b6a47281d4acd6ada344292f011d4fd30c6ac786aebbccffd9cd0b2fd80471d3a383d4cb0ba779c51653705572760e62f6c2d3d49a862a67
 DIST pelican-4.2.0.tar.gz 1332348 BLAKE2B 879a9d51f2b2956e895302dd613c877ff65bf8d420cd70144618ada07723037bca680f6983bdf3860d144ebae4eca8198219dad9caf0d6ecc06745a3881447fa SHA512 9c9f41306739acc4c6c6a7ddf50d955d958af7be1da197b42859b95405b18ab5b597fee4f9aabdf98cd508204558bff9c4f0c11bf4e5367b16e32568682a21e6
-EBUILD pelican-3.7.1.ebuild 1491 BLAKE2B 7a105324f0b3ed240446f4460956b2c915315afb3e64e66e2ba07bdad32c9be86cc15af57d0ea56dcab50ee8326aea434baee731a0be4d6bf1d7ee22ee1853cf SHA512 ca199078198a4c2076c7025ff6834b8a2546b238bf43a8b9c5e526e0a067c65f511a451528fe07b67670a98e833ea2912364b705b61cde8f8b7ba3e4ef87af7a
-EBUILD pelican-4.0.0.ebuild 1482 BLAKE2B 63fecab605b23f6c93bd4d72204402677b316d8c3843d135fd2c1bf288eeaa61b23727a2b53b88e5d5f6d6eae5bc3f7786a0e0a167c6346ddc771c7811e8b1ac SHA512 0851b09c5562df33d27633911182d25ce4fd00d096ce47448793c9f09ca97a75dbb14890f457123da011e0ce46f09817f992eff33a7b6bd5b440dc1db4ef0621
-EBUILD pelican-4.0.1.ebuild 1482 BLAKE2B 3ff476b565226836374e14b746ac04989d1c13c9138cfcba5d7aa6dbe542efcabbdcbd188f525a817092f137d86054bde3744a861cfee0b0d679b15f5afb0abb SHA512 d34aad7617897c738b43f6dbda68cdd8c3a5943ad685b4b213217f9f3ed74c94bd12263150573a58f2bb5c98c6bb0a28cc5a867bc2455dbb07b8a021db6cb3cb
-EBUILD pelican-4.1.2.ebuild 1482 BLAKE2B 3ff476b565226836374e14b746ac04989d1c13c9138cfcba5d7aa6dbe542efcabbdcbd188f525a817092f137d86054bde3744a861cfee0b0d679b15f5afb0abb SHA512 d34aad7617897c738b43f6dbda68cdd8c3a5943ad685b4b213217f9f3ed74c94bd12263150573a58f2bb5c98c6bb0a28cc5a867bc2455dbb07b8a021db6cb3cb
-EBUILD pelican-4.2.0.ebuild 1486 BLAKE2B 83c96a705d9dddf468e4ced92f7dba8db24a888c2949563253641f2f86cbcffea26cda9e9c08cb914567114077eb0d3ce4a12603be45f504f7fbe9686dee82ba SHA512 c11c7bafedb2bbe5114db0260a4c57ef0f0c8975b29de67f36f571dd1c00c88d0041d156cd8db52934c409680dcac2c6bb87fcd0204ce06d7ccefea11a4f7e52
-EBUILD pelican-9999.ebuild 1541 BLAKE2B 2ade3e11c773439efe530048ef0d5c07b97f9afa73ade817cb87aa6d6c84132060b732516234c4a8b7f7eaa1fc419263c3c8c3933969c21b494d6a02223ea7af SHA512 f8e7c9d488ad8e1dc126c3bcd9172984128de164a1f62c4a720cd32262d4ec32587f3c3b0de59f1e6fc92fd300ae447c6d490399870b253d8a01e055bb72b540
+EBUILD pelican-3.7.1.ebuild 1485 BLAKE2B c89985ae05b04c766a245b9c7b67d0c42a07f725859f3e35a1bcb765a485d9956d22869dca96438d25275f8f97939be41bc7c2e40ff16d304dab45f72f07c944 SHA512 d7fa4dac06fbe2f5a14b4e268c7f5fd616c120e011f803f9e578f8258bb9551dc875945a10d5d90727666afb7a5379cd491796a25bc3901a3f28295d3607b890
+EBUILD pelican-4.0.0.ebuild 1476 BLAKE2B 8398a4b2a07c8feb3d5c2ff59a2c4c11f6259357e5778fe7d979473d890a06a4e3e7a7192e968df9035e5a8e60321c36e0ea844b5a583c5b99e614409d525deb SHA512 6eef2b4031047462b97cd3b290551d002242655fc7695859d55d4d02b9932f44f1af084fd593d065367860143fe9faef9f46a22ac10a3f5d292c2f0cb9841f56
+EBUILD pelican-4.0.1.ebuild 1476 BLAKE2B 2e448917f219828c2ac769af3cc555306462bf7aaeb292ecf09f2a04e58a08e76a0278aa7eb2e0e5606818b7857e45d3c03c6959a0327c65e369e7a4d4e74657 SHA512 c8b0d401aa2e336e480f85c0aa9e9add412de82bbe5e2a6fe30f3a5ae8e66c64426bfd05df5bceb8d1cc092b7210b9c23188a6781d65570a5a5efa5979283ee3
+EBUILD pelican-4.1.2.ebuild 1476 BLAKE2B 2e448917f219828c2ac769af3cc555306462bf7aaeb292ecf09f2a04e58a08e76a0278aa7eb2e0e5606818b7857e45d3c03c6959a0327c65e369e7a4d4e74657 SHA512 c8b0d401aa2e336e480f85c0aa9e9add412de82bbe5e2a6fe30f3a5ae8e66c64426bfd05df5bceb8d1cc092b7210b9c23188a6781d65570a5a5efa5979283ee3
+EBUILD pelican-4.2.0.ebuild 1486 BLAKE2B 8c7a3f5f3ef30f7bf5436d1fde475213c3be90043a255fe2da8f8e14537fb92f49594e5691b97f0f6849695a26cc2cf10af6fed17ee52f21338ac02f5ccbef12 SHA512 ac7abb45d4b5468c3cd708168b1f2f05092b5e44c48a424428a5a96b9828c936c5112078fd3677773da09f02ca27afb6911a60f788848ec6271c54c4e94d689a
+EBUILD pelican-9999.ebuild 1541 BLAKE2B 2b961dc8dc31d683360f063c90d727a0f8553796b4017774c6f97ab1e3386ca6aea5ba600aafd5eaaeae6c09bb480290b5407e2807d3b1ac5a4dd2cca31b2363 SHA512 6470c2a01b936cd22e8405346deac26330b627d6a05147055697775aa40f2dc87194f521c871da98c90800262930161084c1d1b441d754af51767f1fc8c1dcb9
 MISC metadata.xml 520 BLAKE2B bcf1bbb92ce3d045a3dde410f9566322f5605796b3fdc1947b1ae08967f2af21319922001d1942ccbb46dda2a911c3ea4efacf95ae67af32f8a3183c734ab2e1 SHA512 1a10d48a737dd95edb40e5190e45bddd30fdbe50db08394d21834d1ebd4f7e5b267477a52f90934b9ba92252b5a2b1d60e208399ab96559d169f550055c3e65c
diff --git a/app-text/pelican/pelican-3.7.1.ebuild b/app-text/pelican/pelican-3.7.1.ebuild
index 362df26c4ce9..28cced5b2014 100644
--- a/app-text/pelican/pelican-3.7.1.ebuild
+++ b/app-text/pelican/pelican-3.7.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-text/pelican/pelican-4.0.0.ebuild b/app-text/pelican/pelican-4.0.0.ebuild
index a83f2587e5d4..8f8778fe8166 100644
--- a/app-text/pelican/pelican-4.0.0.ebuild
+++ b/app-text/pelican/pelican-4.0.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-text/pelican/pelican-4.0.1.ebuild b/app-text/pelican/pelican-4.0.1.ebuild
index b57181167f87..e3b6b62d0cee 100644
--- a/app-text/pelican/pelican-4.0.1.ebuild
+++ b/app-text/pelican/pelican-4.0.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-text/pelican/pelican-4.1.2.ebuild b/app-text/pelican/pelican-4.1.2.ebuild
index b57181167f87..e3b6b62d0cee 100644
--- a/app-text/pelican/pelican-4.1.2.ebuild
+++ b/app-text/pelican/pelican-4.1.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-text/pelican/pelican-4.2.0.ebuild b/app-text/pelican/pelican-4.2.0.ebuild
index 95251b6cc3f5..e2553e89bf4a 100644
--- a/app-text/pelican/pelican-4.2.0.ebuild
+++ b/app-text/pelican/pelican-4.2.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/app-text/pelican/pelican-9999.ebuild b/app-text/pelican/pelican-9999.ebuild
index ad1092526576..cda70ce55f5a 100644
--- a/app-text/pelican/pelican-9999.ebuild
+++ b/app-text/pelican/pelican-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+EAPI=7
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1 git-r3
 
diff --git a/app-text/pinfo/Manifest b/app-text/pinfo/Manifest
index 7d61bd78ff30..85ae15590fb6 100644
--- a/app-text/pinfo/Manifest
+++ b/app-text/pinfo/Manifest
@@ -7,13 +7,14 @@ AUX pinfo-0.6.10-libc-basename.patch 736 BLAKE2B 3e7a83dc07aff65003dc45ccbdfb698
 AUX pinfo-0.6.10-ncurses-check.patch 408 BLAKE2B a100e5e31424a1f846eb053c601b52969c4b8e190ed7dedab2583e1da6651600dbd604b0f735854e4d2407628a4c41055a6206c0f605d99936a861da978bfab6 SHA512 c7ed7036b5e629882129b559cbdeec3ebe1a8f6f72ad91db4b743bbce45ea7f55d49fd4c8884fb424a6df048f52f680d880fb2cba2125367cdbf993222203d30
 AUX pinfo-0.6.10-tinfo.patch 944 BLAKE2B 240107160cb76fef695fe826400dd4986d21c6c2707c50dbfe90f92d15663c915f7e2d22a709d8d25efd0161c2328d4b3a716dfa7def13006734e456bd9633d8 SHA512 9a4ff5fdc9a461c205f46e71cd43873270cfa1b4e5d897145bf30e51a0a0ffd350add33ff812a8870272f5e30bb8173c0a30af9fadd9f09ee9916512c106e42c
 AUX pinfo-0.6.10-version.patch 264 BLAKE2B 65bcfcdc4f49cdc011b5db956bc296e4b3ed25900fc25c8df667a8f221c5454b0b369e59df07b61604004ef2d0df1b9e98caaf7dc0597daf4ba294655e4ebc7d SHA512 aa998d5b63d50c844dcfdc6e6419dafab3d31c32e6e6a2e67101d124a5badf0968eb0e52fb46aea8ca2e8ac7e8eed7c4aabbdadffe9e99165d7525d89990625d
+AUX pinfo-0.6.13-fno-common.patch 217 BLAKE2B 80bfe222627299bb078cc33005a6470278ea68354efc6e3f18fa8ec7e3af0ae9da000338c406d839c75ea9381b320ae43b1fb154ccc83a2b8193de1ec379c9da SHA512 9a9b41df86f003592e8982cd59077df295ece6cd656ed8689fa79a4176e3030c7e861a461fc4cee7504408dc5e823e33d0777e9d590e5530aa8d0a0eb4101600
 AUX pinfo-0.6.9-GROFF_NO_SGR.patch 259 BLAKE2B a49a7addbf822436bc5cb8cf2da9964eca3b354274de1fb5f64cf4d634164fbe55e634c99282f87b3cbda5ac9f334b25d9123237b4cc64e7e5286b57ddf2a057 SHA512 373eea0e8feca230c14bf658ca5e73698ea16d35b5ca790c46b5bf02a83aaf1d55628183f89666913dfea96ef0f3653789255f8dfd616fe5b3a19be195d46ce6
 AUX pinfo-0.6.9-as-needed.patch 457 BLAKE2B 5e104b202a66c377cad570d3427043fe8273e6c907738283ed596185852cfb5713d430250d2ae83b11d7708139fa7f2dd962add064c3e3c96fe6112359faee26 SHA512 c4b23c4f273b35d2594af81ee4bf9aca60cd5208f1c3ab4a084805a63fdecc8bb7f2a7ee6118130ba691e3fa17e79f2671a90b7bc0af7e3cccaf12d2baecfe7f
 AUX pinfo-0.6.9-lzma-xz.patch 614 BLAKE2B 0b84247de91a42f75d0664f4ccab23e3d57bc66f6af2444e8b9dee2c0e6edb5afad1d467725507c9618947463cdd2f221024c7feb387282ebafcb6bc62741c89 SHA512 8e3ec8a98347c061826cc913c09fd2177d0f8625947c319b527e85d5ae3dcbf7dafb34b5f4a5e2fc9639bcc4db45afdea7dda6db6a88001e1c6a3994b4847ae4
 DIST pinfo-0.6.10.tar.bz2 133059 BLAKE2B aaac23583510f42ac8a0c71a380f2bc76c4db6d78518bb4d5399c100bf0aec291c869576b18313e00f8572610cb967c3acb5f8d643c48f1295fd2efa8e16e3e6 SHA512 d3aeb93a668b939a2be7dd397ef5c918a8d108a1a7613ce39d4ef2faafbd549582a35d95c74c1dc74f4c86c9f2bf09b7bca7b5006c5a79302403dd906e8d376e
 DIST pinfo-0.6.13.tar.gz 157103 BLAKE2B 18af4a5ae1bbd2abccb174ce1a3a16e4d17207a10015042723c58f80695c2580ca0c1c60f4f6f4f08e67eb01316fe48cd848a887e65159a6cd4463eca14bdecd SHA512 739e24821a363a087fb9df5651694f051286d4a15c3e51f2421a2aa60b1efe1da558b959ba22a0094e22854534ea5875498156e8ea2e198e31001aecab1a18df
-EBUILD pinfo-0.6.10-r5.ebuild 1317 BLAKE2B ee1268a45c8f9e716776274cf8fb7c86fc28c844aeebe5f3b5a036a4834b40ac85ab3df2414ea5e97b07485e534f9e590a6a64e3c24ad8c054ef155505701c6d SHA512 9c675ed8b4bda0a363c5060656b1d918fc86181f5db8ef359ec55ca9316576e12b63ca108dba183ba47c97931afbf32a563850f3dd4ea2c5f65e63268bb0f851
+EBUILD pinfo-0.6.10-r5.ebuild 1318 BLAKE2B a8c6c0b69cbabeeb0fb7683cad66cf59fd138f2e301601f2aa83b3a3d47c2e3a558b72759d192f2e03826494be98fa285638a16fc4f563bd0440705752aeffd5 SHA512 a0c786754864355413febf829b2ec429148abd3a48802288fe55a9df9486fdcc5e58e241e255fbe73e39043d8eae4f23ad3df9bd8d04e52a1bd378ec8701111b
 EBUILD pinfo-0.6.10-r7.ebuild 1430 BLAKE2B a369621e3778359219a0850f19fc950fc9699fcf6e53c3d63846b6b817442294fdb08b76f4441234a6a60d2e52c61972896a8f6f2781346ff1bf18b639e4fa96 SHA512 fb80e9c0bfed07d6dc37607cd05d2868102a554855f73dc3b4a7f780f50c3e525fbc096d3464ea35f524bb221b779982343afd3151e1e616e94c01356f800e01
-EBUILD pinfo-0.6.13.ebuild 988 BLAKE2B bd113e1cf335f64ad9cf2cca80fbffcfd9a9080b7b41ca903faccb82581cc9c1c4fb081eb530cf0e6777a685f88419a3bccc73df53c825cec81d80a7c4890282 SHA512 ae060920a54ff592be17e6016017e8b5161335fabf2107b9ae992a86870fcc2f2c5ed50ea5713b906e3c939a1e46d943fa2512bccbf51f24ae3069604a7b80c8
-EBUILD pinfo-99999.ebuild 916 BLAKE2B 665e86f2f287e61ef58076845d75955ae149a518fe40d3b39dd9795f13ea3f7295ab937d07e919843006603aed86ee8708d2f599a0ed8dcdb508ecbd4b7b7431 SHA512 93259861bcdaa1aee6c71ea59b2fce4913ec5dc61ecc6ed08e21e6d30994ef6a1dfffebb876cefeb583bcbb79123f0e89b6321f6e7aab8edb5e1b1878c7e19ca
+EBUILD pinfo-0.6.13.ebuild 1033 BLAKE2B 86e5709bbdf2163a2def54ccd00899d7b742b85a77ad4be4e069241cf4ca8c6152780d6db48f7cbdf27b83a1f38518af421bf2fcc2bc8603c046a569699b9615 SHA512 bf207f46871847d6e3f0e39e37c24d2b983a8b14cea5e3335beaede34e9041d58d48aded6d83a7cfb3866bed8fb5df18d6c99d0748a16ef0e512954b078c854b
+EBUILD pinfo-99999.ebuild 961 BLAKE2B fd9160283980bf7bdede66ab5133f511d820fba9570e305676fc0170845cbd31c9507367f10705de3e4e2e218b4b03732ceb7697b91ac7ac570103d5d6694128 SHA512 b6d9164f6b194b0cb2be0615890496cc522219d8b29e621f52bde86b37044466c1099e0df65d5a408c3c83cb62fff4e8ebe2276891626725210d31b6fb643230
 MISC metadata.xml 214 BLAKE2B 2714d2d15a382508ac07f9e3cf3c042bbba715d1a3f679a37d45fb68cbb7931bffe3479e8a9c3ef61c0f76d1b5822f9696d203ed0153a2e713865cce16ed2403 SHA512 6bd18312d33fe28edbaf93fa559dab76a4eb813f37bf3accccd113e111507617827f4423e81f6448edc51245f86c73a5b1d65c0a9310c3aa1d1b910597303fc1
diff --git a/app-text/pinfo/files/pinfo-0.6.13-fno-common.patch b/app-text/pinfo/files/pinfo-0.6.13-fno-common.patch
new file mode 100644
index 000000000000..676cd4b09d37
--- /dev/null
+++ b/app-text/pinfo/files/pinfo-0.6.13-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/src/parse_config.h
++++ b/src/parse_config.h
+@@ -85,8 +85,6 @@
+ colours;
+ #endif /* HAVE_CURSES_COLOR */
+ 
+-int use_manual;
+-
+ int parse_config (void);
+ int parse_line (char *line);
+ char *str_toupper (char *s);
diff --git a/app-text/pinfo/pinfo-0.6.10-r5.ebuild b/app-text/pinfo/pinfo-0.6.10-r5.ebuild
index 39cdfcd39c90..1a931b92ab9b 100644
--- a/app-text/pinfo/pinfo-0.6.10-r5.ebuild
+++ b/app-text/pinfo/pinfo-0.6.10-r5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://alioth.debian.org/frs/download.php/3351/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="nls readline"
 
 RDEPEND="sys-libs/ncurses:0=
diff --git a/app-text/pinfo/pinfo-0.6.13.ebuild b/app-text/pinfo/pinfo-0.6.13.ebuild
index 66c990a911d4..1edae9c02d3a 100644
--- a/app-text/pinfo/pinfo-0.6.13.ebuild
+++ b/app-text/pinfo/pinfo-0.6.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,6 +29,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch
 	"${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch
+	"${FILESDIR}"/${PN}-0.6.13-fno-common.patch
 )
 
 src_prepare() {
diff --git a/app-text/pinfo/pinfo-99999.ebuild b/app-text/pinfo/pinfo-99999.ebuild
index c6cc673a9633..697760bc7fca 100644
--- a/app-text/pinfo/pinfo-99999.ebuild
+++ b/app-text/pinfo/pinfo-99999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,6 +29,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-0.6.9-GROFF_NO_SGR.patch
 	"${FILESDIR}"/${PN}-0.6.9-lzma-xz.patch
+	"${FILESDIR}"/${PN}-0.6.13-fno-common.patch
 )
 
 src_prepare() {
diff --git a/app-text/po4a/Manifest b/app-text/po4a/Manifest
index 6b44413ed195..f835c8bfbabd 100644
--- a/app-text/po4a/Manifest
+++ b/app-text/po4a/Manifest
@@ -3,7 +3,7 @@ AUX po4a-man.patch 621 BLAKE2B abdbac744d7395ec5f008e2ac2bcfd9aecf0f24726acd1e32
 DIST po4a-0.56.tar.gz 2994792 BLAKE2B c95905c70d7e1e24367fb128d9096996d026f58dd4cd7fa77f19c6c9b8607cb4101a1a024773d2fd383e905a008e1ce4f0c019a73003168a90cb23328ac1d984 SHA512 4fc1ca5743471577d9e8bd0b80285b9dbd83b964f8e828472787a6deaf8b8388bb7f96e68afab4119c1f5488fe371d3b1fa94b101204a59228d1cc2f0878f3c1
 DIST po4a-0.57.tar.gz 3079550 BLAKE2B 54b1d3263aa0ebd90eec61d735c3422efb5f67b2d88f91a87a6893bcdb7f06131aedadeb3577d221cf75ba07f8001f6e23409375756afec8357e26e8f0f0a1c2 SHA512 7ac2e614c126b049feeb8edbafb71a875cee78fb85d8cd74f3bf5b555cc8b2d19d5e4606b732e714e937c34e178729d73edfe559de594c5ffe811b5162b27d81
 DIST po4a_0.47.orig.tar.gz 2389750 BLAKE2B 72cd81e10f638a660e201b0c733b08c316aa75dd29b054bbc4c645c265b9e7745ce762305a8296f8cc37d2f182755dfa1394861f6c471cff1c7c398d13ac28cc SHA512 9c459a9795977a39aacc09cfb6ddbdc7dd2174e22896fa7bde90510a43ea833054aef558f7ca798991addc052a2c7f91ee11e5d49658a5c80a9ecb9c135ff97a
-EBUILD po4a-0.47-r1.ebuild 1656 BLAKE2B 60e1a75c84bed91e7bb4728cce7d848835dd819d1e40297137212bb03aab6fb1fc88e1698e7b19ceb0494eda04c97fc5a972726813d7d48e9eda3074e4fbc732 SHA512 d1edabfdeb9ebeb220029b42bb9ef605791215f89b35a6c26d6d8a8ce5025ea710e46030affce56cf356cb63cfada034055e3715a22591c9a9e894c306ae338a
+EBUILD po4a-0.47-r1.ebuild 1657 BLAKE2B adf5a3fbae2eda2b0b27c8c4cd4ebf73760f6989815cda0de2691c0d2f0737394984f91c13f8e1f63ba0255bd2dd55f74e97c82464f89c9011ad021224c42175 SHA512 564bbf0f9734c62c12c5e2a02f9ba211138991c5dc2bfc8fedfd6ab322e0ebffa73bb4532a3afb0ce51fa3d036abf6bab6afcc496e05c8f5d6ccdf7cdea4e51b
 EBUILD po4a-0.56.ebuild 1324 BLAKE2B b4af81c57aab554457df323e68b1042f3a9d02d2d4353743b71addaa8ba1d14e8a6ac57822927f2a345e07f8daac775acfbdbac812bede7e4c5da98e2f2dccf4 SHA512 66ff950db06217a91de27665594fd2cdc7b8a7f0e295a6fd0f436065ce48029ca79ec91980ed7b186c347cdfb21c9703fd31af0a26b0aa5fed54042f9a6fccf7
 EBUILD po4a-0.57.ebuild 1327 BLAKE2B ce5f7c5865ed797cabf0702eb9f0e45816e39dff500f9b9da7ad2ded060481f10e86c3734b08304d656595b5b69754930bdb5fdfd39342475f55c9ae811be897 SHA512 a002b5fabfac6fc815119326beb40325c8535ce413a6667b2dd7a5714c3dc7f1abbc8d5e9fcca7d09a1315300fa3eda6ca817603348c15761f396865354c35ea
 MISC metadata.xml 326 BLAKE2B 6ec11e49a2b25069f1e2eeac2eaa7ce8adb48704986f873ba92de8a1328e7d2963cd79efac7d2672bdde1fc6c71cddbfa11fbb4bfd4cda28fa1f92e350ef5be6 SHA512 2fbc62c1bbc9a555103e9ba0eb3389004f9770eaff51e00fea853051ac6da43312366d3a50ba63ad28453219dfc8970f9a78c7af2bf7799f58911a33e0bfd3f9
diff --git a/app-text/po4a/po4a-0.47-r1.ebuild b/app-text/po4a/po4a-0.47-r1.ebuild
index c6cb0275ca5b..a3685b0dae01 100644
--- a/app-text/po4a/po4a-0.47-r1.ebuild
+++ b/app-text/po4a/po4a-0.47-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/p/po4a/${PN}_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 s390 sh 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 d1deb369303d..25f6a9c760f1 100644
--- a/app-text/poppler-data/Manifest
+++ b/app-text/poppler-data/Manifest
@@ -1,3 +1,3 @@
 DIST poppler-data-0.4.9.tar.gz 4196919 BLAKE2B a986dcff2c2295eeb952adbb4bfc59ccbc53c27668ecc44fcf862bbe3d65062ccdb9302ebdd9b530d9d0ed155666922086b368c81c0772bdab284e323e6ac436 SHA512 45afd378d0bb415c5e1bc9718025328058712c0bde6d529d2c7a4813b12f600be46ecd2ed2454b3f83fb9f8cad157b75d11d8c5d1ca849f347c310b58132ff7a
-EBUILD poppler-data-0.4.9.ebuild 762 BLAKE2B 1c926a648a2b5daaa9c11135b17a3a196c9a6f99128a0807f0108c5f04970cb8c15989e4c9b2c991836de296592870573faa6c2aed3b79f068d4fbbf8dd86de3 SHA512 5dc0e17254c5975dcbbf8f774e1ba7086b27614398e68667ac11e6e188a001d6ebfee2ed77b89de3f9d080963cee58890b7fe56432ebf911e311242ebb7cd028
+EBUILD poppler-data-0.4.9.ebuild 763 BLAKE2B e88c5ea4d1ed8545cb3aec2b03ffad0ab9486729dac1cfbd0f6434a0fcb23d263b2d9b2f379d6f0f8d7e81844d16c5495f9a168fbe4f54b26b5269f8844a5d6f SHA512 d7f762da0619966e418e8a22e7c647e8590ebe98b915decdafd9b9bd8790f72bb74526080167d6250e37c7ff21261e92d75e3171c59aeb37e26106114eff2a5b
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/app-text/poppler-data/poppler-data-0.4.9.ebuild b/app-text/poppler-data/poppler-data-0.4.9.ebuild
index d5a46c5c4bcf..428c59c5cfe1 100644
--- a/app-text/poppler-data/poppler-data-0.4.9.ebuild
+++ b/app-text/poppler-data/poppler-data-0.4.9.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://poppler.freedesktop.org/"
 SRC_URI="https://poppler.freedesktop.org/${P}.tar.gz"
 
 LICENSE="BSD GPL-2 MIT"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 IUSE=""
 
diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest
index 55ebce74fd04..b8a6e6188270 100644
--- a/app-text/poppler/Manifest
+++ b/app-text/poppler/Manifest
@@ -6,8 +6,10 @@ AUX poppler-0.82.0-respect-cflags.patch 2324 BLAKE2B 435986b347ffa1ac657a4fa2eba
 DIST poppler-0.82.0.tar.xz 1553336 BLAKE2B a83d476ce1174cb7789f857a52a8a9ed29dfe8863d082ef662508ad9957667349aa62b038fa1a52e9e7ae3ddf4701eb5fbd58545b041b6aebd69cb8b91376d8d SHA512 1631be30e398dd18a4e8c2cc893cf0d9469a98d93f02f2ffe3bc14857518b76674a10cafe89ee92b9886c3c6b03d50e214a6838c102f673a62789c9832cfa4a2
 DIST poppler-0.83.0.tar.xz 1555456 BLAKE2B 4ab24a85e879d0ddbf24cf7bab5b1da7c15fc026e88b4076dc2b8cd34d69a5bcc0113df20fabda6915afea880480613ba34be6e23b5b0d79a3c6197c92af7853 SHA512 bfde1e3cc4d9c626949aab770d84fccbe47bdde2331d3b9f5b98c24319eb573a5db62acbfa5a524b21ed0f195f8b163fee64677c2bd616d31d0bb219d1e66713
 DIST poppler-0.84.0.tar.xz 1561236 BLAKE2B eb85b2d0aac2d736ffa74a11df4fbdf28841ded8fec3d32aa92d22f0d1c51aae9d3deacc8cbdd7dbf95906cf46b01f1bca7aa8af99c7fe209e4169478a778e72 SHA512 e00aca76b4909621b79ec68374529396ddba756af5d60d86750095dfebbabe5b576aa7c873c3fcfabaff28c89e3e37e826d4a0fac356d76ef966500514a772e7
-EBUILD poppler-0.82.0.ebuild 3326 BLAKE2B fb2829f8b4d551f99a3aac93c5e5305aa2034bad095e793d01d6148b33af6f8b29d54a59d5c9bcdf2daf72e2f3c4f4edaec08eca5de5c383f2bcf60ce754dbbe SHA512 6a7e8fb84d66e340ab6ac80e04c9befb6e384a5c957e203f8b21ee3b4cb2159d3370a38c917b9bf4abb1fc610d4c93fdaed2fb4d79ec616f31fa49f9ec8d2199
+DIST poppler-0.85.0.tar.xz 1588616 BLAKE2B d30c16ff214d2b64fade28bb4099567150e99df6ab967702f48e18ed2191e444728f51d4c1ce1772567c31f9b87a8cf64993ebc383184e06f8b3707436c89143 SHA512 2311bde5ae52e065c12a6129f500469860f5ebefafc3f7be581393f08c2121f3eae57394ff54c1f83ee1b926f28c61530bcd8149d42de10a16b9ba7345f2604e
+EBUILD poppler-0.82.0.ebuild 3327 BLAKE2B 42fa8ced0fb8a9754f85c4e3bec617b8df279265b18ecbed22d785f566c045671c8bd33d7d0f426d51f1746959fdabe4f0384b8de941015ade4df88e16a2494e SHA512 19e0889e8e3f7e972181986c73ed317ee2070e803afe807efd044c7ce11223c42c93fe267616b5e010cc78288c5095c9b5faceee351952f217f0d4e8a978001e
 EBUILD poppler-0.83.0.ebuild 3337 BLAKE2B c71dbea37c103190528ba3e6f2cf0fdfb4ce53c566335b86b3585f28e31b17ffe801155f55a8be29e044e1bb86ddcd3efd669c6caaef6631ee411128a94f26e5 SHA512 4fbfb1bff3c4711c2c748eaa5f82982bf9a7686ac4ebb1ad41abd41867072816c3c858ae55b1ac8e1a555b53867b6cd3784762074bd33a5ddded56afc1ab1251
 EBUILD poppler-0.84.0.ebuild 3337 BLAKE2B 1bbd89a894f18c11bbf6a8f6c3cd7e66b8ba844af8109861f88618a0787b71919710bb5e5cea754d0424788c89e2411a19838201bc521a6f0bf956c00af358b4 SHA512 567e761c4a7b73edf02cc574fa2866f0ae0f461ac232d00fbebebe7f9a04650f1f7aeaa84584e1617fcb416bfde623f99314ebb207eeeaec1087d053e9b94849
-EBUILD poppler-9999.ebuild 3337 BLAKE2B 1bbd89a894f18c11bbf6a8f6c3cd7e66b8ba844af8109861f88618a0787b71919710bb5e5cea754d0424788c89e2411a19838201bc521a6f0bf956c00af358b4 SHA512 567e761c4a7b73edf02cc574fa2866f0ae0f461ac232d00fbebebe7f9a04650f1f7aeaa84584e1617fcb416bfde623f99314ebb207eeeaec1087d053e9b94849
+EBUILD poppler-0.85.0.ebuild 3366 BLAKE2B 9584abfe5136196387ca4b565aa0da160ee089b93750ee43f032efc0d588cd97fc1e64e1fabe736c4076a6ed0563abdaa0ef0f5fb0c44281195b5480df21385f SHA512 e08ea49d45b58d256f3a0ecfff5891b70bc46b27e8d0230f437eaafe55a168095304a35101d8ddc47a3b9a43c83ed2ef0f6f54b343ee3513bca2155965823b04
+EBUILD poppler-9999.ebuild 3366 BLAKE2B 9584abfe5136196387ca4b565aa0da160ee089b93750ee43f032efc0d588cd97fc1e64e1fabe736c4076a6ed0563abdaa0ef0f5fb0c44281195b5480df21385f SHA512 e08ea49d45b58d256f3a0ecfff5891b70bc46b27e8d0230f437eaafe55a168095304a35101d8ddc47a3b9a43c83ed2ef0f6f54b343ee3513bca2155965823b04
 MISC metadata.xml 995 BLAKE2B 0d99fda69e6b020fd1b6fa879a0c3af278b92111be31d97cabe88703f06b4af56ce64ce9e0fc556d2b056c6770e547ae3b88dcc82da9cc26e15e2d1d0b5f685b SHA512 ae813761c5ab4dab475b737085f14f5874655b31f247f26495c43d8fcc47805dfceb2a8cd23ead39a3f8ee75ac820edc7c2554e573c338c09e5ec8b9d383417c
diff --git a/app-text/poppler/poppler-0.82.0.ebuild b/app-text/poppler/poppler-0.82.0.ebuild
index 1ad433185f4c..0b611f7c7b6b 100644
--- a/app-text/poppler/poppler-0.82.0.ebuild
+++ b/app-text/poppler/poppler-0.82.0.ebuild
@@ -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 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SLOT="0/92"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
diff --git a/app-text/poppler/poppler-0.85.0.ebuild b/app-text/poppler/poppler-0.85.0.ebuild
new file mode 100644
index 000000000000..cdb9a9313740
--- /dev/null
+++ b/app-text/poppler/poppler-0.85.0.ebuild
@@ -0,0 +1,123 @@
+# Copyright 2005-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake toolchain-funcs xdg-utils
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.freedesktop.org/git/poppler/poppler.git"
+	SLOT="0/9999"
+else
+	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SLOT="0/95"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+fi
+
+DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
+HOMEPAGE="https://poppler.freedesktop.org/"
+
+LICENSE="GPL-2"
+IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt5 tiff +utils"
+
+# No test data provided
+RESTRICT="test"
+
+BDEPEND="
+	dev-util/glib-utils
+	virtual/pkgconfig
+"
+DEPEND="
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-libs/zlib
+	cairo? (
+		dev-libs/glib:2
+		x11-libs/cairo
+		introspection? ( dev-libs/gobject-introspection:= )
+	)
+	curl? ( net-misc/curl )
+	jpeg? ( virtual/jpeg:0 )
+	jpeg2k? ( >=media-libs/openjpeg-2.3.0-r1:2= )
+	lcms? ( media-libs/lcms:2 )
+	nss? ( >=dev-libs/nss-3.19:0 )
+	png? ( media-libs/libpng:0= )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtxml:5
+	)
+	tiff? ( media-libs/tiff:0 )
+"
+RDEPEND="${DEPEND}
+	cjk? ( app-text/poppler-data )
+"
+
+DOCS=( AUTHORS NEWS README.md README-XPDF )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-0.60.1-qt5-dependencies.patch"
+	"${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch"
+	"${FILESDIR}/${PN}-0.82.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.61.0-respect-cflags.patch"
+	"${FILESDIR}/${PN}-0.57.0-disable-internal-jpx.patch"
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# Clang doesn't grok this flag, the configure nicely tests that, but
+	# cmake just uses it, so remove it if we use clang
+	if [[ ${CC} == clang ]] ; then
+		sed -e 's/-fno-check-new//' -i cmake/modules/PopplerMacros.cmake || die
+	fi
+
+	if ! grep -Fq 'cmake_policy(SET CMP0002 OLD)' CMakeLists.txt ; then
+		sed -e '/^cmake_minimum_required/acmake_policy(SET CMP0002 OLD)' \
+			-i CMakeLists.txt || die
+	else
+		einfo "policy(SET CMP0002 OLD) - workaround can be removed"
+	fi
+}
+
+src_configure() {
+	xdg_environment_reset
+	local mycmakeargs=(
+		-DBUILD_GTK_TESTS=OFF
+		-DBUILD_QT5_TESTS=OFF
+		-DBUILD_CPP_TESTS=OFF
+		-DRUN_GPERF_IF_PRESENT=OFF
+		-DENABLE_SPLASH=ON
+		-DENABLE_ZLIB=ON
+		-DENABLE_ZLIB_UNCOMPRESS=OFF
+		-DENABLE_UNSTABLE_API_ABI_HEADERS=ON
+		-DUSE_FLOAT=OFF
+		-DWITH_Cairo=$(usex cairo)
+		-DENABLE_LIBCURL=$(usex curl)
+		-DENABLE_CPP=$(usex cxx)
+		-DWITH_JPEG=$(usex jpeg)
+		-DENABLE_DCTDECODER=$(usex jpeg libjpeg none)
+		-DENABLE_LIBOPENJPEG=$(usex jpeg2k openjpeg2 none)
+		-DENABLE_CMS=$(usex lcms lcms2 none)
+		-DWITH_NSS3=$(usex nss)
+		-DWITH_PNG=$(usex png)
+		$(cmake_use_find_package qt5 Qt5Core)
+		-DWITH_TIFF=$(usex tiff)
+		-DENABLE_UTILS=$(usex utils)
+	)
+	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 dc4ab8ebb00d..cdb9a9313740 100644
--- a/app-text/poppler/poppler-9999.ebuild
+++ b/app-text/poppler/poppler-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2005-2019 Gentoo Authors
+# Copyright 2005-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://poppler.freedesktop.org/${P}.tar.xz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SLOT="0/94"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
+	SLOT="0/95"   # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION
 fi
 
 DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
@@ -87,6 +87,7 @@ src_configure() {
 		-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
diff --git a/app-text/ps2eps/Manifest b/app-text/ps2eps/Manifest
index 77ba358d887f..44e711dec057 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 4c9ea75c7c0b50bef946e376b94a11ae2bb57ff1bc47f71a978effa6de2e7c42f86b642f889f36c2370003649bfa87a25b1895543b207b988046cd3b8420bc9a SHA512 822e934e632ddf6551ca91d23e89cb1aeb061a043d09f672203735e79a2e4fe84ec16fa7d61283c81a958d495e00fda51db3f7d4ddd15af6d3f6034b33839e71
+EBUILD ps2eps-1.68.ebuild 914 BLAKE2B 272712f71164dfd0d50b76994b308dce9e8e6acbeffa9886c2df7a03bd9fa056535218914eb5bc0c782e2c457da92a168b478ddc101d42d1e3495b15b018b912 SHA512 9f127fbd5818fda4d8249bcdd539c8403f5a837072e5caabe6804cff526f015db31903766e7fa9757697401ff124c0a70e90d0e9e51a34f70c59170c8e600819
 MISC metadata.xml 525 BLAKE2B d27db1f0104b7ac6fb9e61c95da58ce62a7dddb28eb7c160507efc87b9b6930df11f889e8a8f5ec1e606209d942254294933313581a2e5dcb0f56c578e4d4080 SHA512 0d250fa2b43ab06f9d214116054bd21dc43f130c5518b430c2bdaaf4a4038fee52d61c6a82b1fe0736b966634e24d7fd99c6a88e171a05e7b5d9cb83a45ca24a
diff --git a/app-text/ps2eps/ps2eps-1.68.ebuild b/app-text/ps2eps/ps2eps-1.68.ebuild
index 67beb71c430d..682a25f3cf1d 100644
--- a/app-text/ps2eps/ps2eps-1.68.ebuild
+++ b/app-text/ps2eps/ps2eps-1.68.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.tm.uka.de/~bless/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	app-text/ghostscript-gpl
diff --git a/app-text/ps2pkm/Manifest b/app-text/ps2pkm/Manifest
index 2a1f46cba035..163524dab2b8 100644
--- a/app-text/ps2pkm/Manifest
+++ b/app-text/ps2pkm/Manifest
@@ -1,3 +1,3 @@
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-EBUILD ps2pkm-1.8_p20190410.ebuild 764 BLAKE2B 8548c7d9bb5a6a1681c9db5de11294f7fce09500802b06f2c2b9f2993f7a68c88aae47e48e412adfcb5132bed04e47582fc7a7195c064e84727dcc3a0d4b50d6 SHA512 194bf00ea69c5f9d64b16dc8abd3fb8ba77bae4d8ee256964c0d7eb36d36ad65741ec130643c8bc4001fb70afb9c951a0180eae266293ccd7936fb514cf29b0e
+EBUILD ps2pkm-1.8_p20190410.ebuild 765 BLAKE2B 81e6e9d1a9d5a8c00a10e2c60f8f8366157144940e8ebbbefcc381ace31911e1c4ab968cdb454c384800775b3be3f95bbce811982b394b0b27431b4f893be7fd SHA512 4f6dfa028947f947b24520184c47e6a8422e8cd77029d5d8b24c5efe77929dea135aadbebbecc89341edf9d184f1e6bc290da58ff720c2d249745649f578fb2e
 MISC metadata.xml 358 BLAKE2B b5a2e9424ef1e5bb23c34e089d9204443dd5ad528b56db71d2fc2b3c5d428c14367805ca94a307f8856d21356abe76092c54ba0f0df204b5bce3665f9f3fd657 SHA512 51f6411780af5d7775f8f80d246d5f4e297abb1960a0b0c21c6dc5c03a9a407dad8cbc4977a679590cffb4523f1b72a0f7b15ab100c938391a5abfd3e17e8818
diff --git a/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild b/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
index 9aa30446d231..0a4d100f55a3 100644
--- a/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
+++ b/app-text/ps2pkm/ps2pkm-1.8_p20190410.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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 33086834e178..4fe5379be512 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 977 BLAKE2B 780a37f96c33d8e04974d31942951dc93f3e0edc59eb60e176ff778ab4fcdeee91a99a5b43cbfada34c9659a892088cec5e8b11abb0186ecc3903d94efedeff9 SHA512 67b87ece7fec638b7f759fccd8973dbf8b00be0f8588fcb37d5b06e6227c5d366f1ef29785fdeade4593fd5861517e5fcd5c9fca10778082de521c96dc396f8d
+EBUILD psutils-1.17-r3.ebuild 978 BLAKE2B a67c15ba2d2e958bb500e7d387c086a87aff4faffc6d07bcfd69fd29a84b7f2f8311a64e31b0b4e432a35fb43a7c9e88fcbf49b6a4950adf3aae5cf34e46c18f SHA512 cd3609b03b927f447425590b9a042b8cdce3a101009515c4cd7e048874fa22f937ef61dc57cce22241276410716cfff5c2f52f75b7e47f31d7f8cb787906b2ad
 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 fd952fa6a288..7e56ccb76fec 100644
--- a/app-text/psutils/psutils-1.17-r3.ebuild
+++ b/app-text/psutils/psutils-1.17-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/p/${PN}/${PN}_${PV}.dfsg.orig.tar.gz"
 
 LICENSE="psutils"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/qpdf/Manifest b/app-text/qpdf/Manifest
index 757248fdd36d..1819488c5a40 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -1,5 +1,5 @@
 DIST qpdf-9.0.2.tar.gz 18168977 BLAKE2B 46b397f0e6a97804c5e8dcbfc9fd2278960d5afd459430c1790bb8f9080062cf661cf186ab386721ed7560dbd4abbea43e4d31914c0636502c5c11096c250fe2 SHA512 275ca81603d53601e4389cb34eaebea1c5d52b310ef28f3375fbeee255a28edf9375f03f31649f580dbc3df73b851a2c8498feb3dd7b30067955571b05c9e69c
 DIST qpdf-9.1.0.tar.gz 18285597 BLAKE2B ef86cd4192805761e121bcd112e071dacb4bc108335da0ba237476d9f1698e4ba630010e3266fb63d9aa5b97e0e778f76fe226613e91d351b93a53b9fc9abee7 SHA512 7561ffc366dbce9df58cc85ff18480b28b0d46de04733ba463139188bee95690f92cf0960a328619f0c9f34ce865598db490fa1c6aaa76ee87d2c034a5f7f57e
-EBUILD qpdf-9.0.2.ebuild 1273 BLAKE2B e8d72973ae6531dda7e4a6d4b477c7aa96c6f70f4f36f0106bddc1d4a7c3409f1f959762521172100a65dd0968282ba563fc44b93e4107a2bfcddf76ff697ace SHA512 9662f0ea108cf14f766afe6ba649e183a05af9c47f1413495d7fdd2d988dbcc4ab29bb0af50e1b67fbf7abb9ce6dbfcf6a0710c8f00f1f2cc9fba0cee0f000c8
+EBUILD qpdf-9.0.2.ebuild 1274 BLAKE2B 070a9c72aa5cff4a6fa5e8e65d56c87ba04882527b242938087d9f876732c2e49b47cbb9baf37e373469d40d70ed3ecb6ec657126fdcbad63fd82a5299cb6c2f SHA512 e65ad97cff9fdb5ee261d139c9b391e1cdc8c4c13f861a988bdeba891ff02900e4ff06cc37801b170e3af442f6bbb9aaef8123b1a956fc0806f900babc5671cd
 EBUILD qpdf-9.1.0.ebuild 1421 BLAKE2B fcf852c0c05df1b7699d7dbabe2d01861d41eff1cf3b14bac03fb07fd67a28923cc063dfc8e7111cb1ba20a2485a48c863f86669cf9bfd25849f13b0b66d2663 SHA512 6bd4a49cbfc8972b0bd5781ddc7cd175191156064ae512466556a26eaae36cd7f7a830442744cfe1110810216ac5a98fb20e34f7b8c202c7ebc8880c65357a63
 MISC metadata.xml 499 BLAKE2B 9f6462a9606763352f0c823f877d1a39ffa207a8354e800d64bdb4d7686de8391309e08296adf23ca6b6e5d6fc2150d72ca9b0fed36cd4574e51ae6d04e48341 SHA512 77915adba55eb2b0fa68af06fa30b84c50af0a4a26a3ee6fafa71f9c7a7a307451ab76291dfc87f90479f6a208cb29c8a6c8c7fd0d574455faa15c87f8ea8de7
diff --git a/app-text/qpdf/qpdf-9.0.2.ebuild b/app-text/qpdf/qpdf-9.0.2.ebuild
index 16fe35a4e42b..562cec33bd2f 100644
--- a/app-text/qpdf/qpdf-9.0.2.ebuild
+++ b/app-text/qpdf/qpdf-9.0.2.ebuild
@@ -12,7 +12,7 @@ LICENSE="|| ( Apache-2.0 Artistic-2 )"
 # subslot = libqpdf soname version
 SLOT="0/26"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
 IUSE="doc examples perl static-libs test"
 
 RESTRICT="!test? ( test )"
diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest
index cc1b302045d6..f7927218620b 100644
--- a/app-text/qpdfview/Manifest
+++ b/app-text/qpdfview/Manifest
@@ -1,5 +1,3 @@
-DIST qpdfview-0.4.16.tar.gz 636095 BLAKE2B b25da3ed1b4bacc02701f6cd2c4e282fd1c7b1fcac8faa1687c5089baefa328854c520ba803a333ea107e7b423a004f6476eb9a7adf67287d4d0807146094fed SHA512 d3ac05fc51d48533e44e58cd19e5d222a8bfbc9da4df02ece6a405d2fdd3346eb4614816ae91e89facf28e107b920ff3ce7b2ccc8c9b7832ae2595ef70d65584
 DIST qpdfview-0.4.18.tar.gz 786577 BLAKE2B 07ef444ba39435578481e549fcbbd2d97362c6bda3092a17f1daa8b8437febf50cd2f145cd5e80cc1be565c5a658e85a428314a1bcd2a5a38efce0830f1cffba SHA512 38741520b20e3ed7100e52982930abac26e994a69df68c54dfa7180be8b2a4f377b91ba03993bab67b0a505ad79d62164f0f168a6715f4306b635ceba6840d66
-EBUILD qpdfview-0.4.16.ebuild 2137 BLAKE2B d0ce86840680b56afd8b925b820d0641a0754776d4054b469c691f5da10db072febd5b04b34b80394bc08f47d6b5b7b58390332c30d445116528cbc238fe2144 SHA512 2d89740ee569287794935eb369c8a035a3ceeceb3e428e740f0b0adbe808f532a336dae9739c789bd4ee71b1a7f87af222ce91c19028bb179275184607489549
 EBUILD qpdfview-0.4.18.ebuild 2200 BLAKE2B eac7bff184c91a78fc82713e067111c52d7c27c1b8d49d746996ab47b567b6ed3a816ecc734ceac93b0cbbe97e975fdd7a2b1974d7a508bf2b3990169a5f2ff7 SHA512 8f0595c5ce798ad0f8168854c67bb02b6cd81b12e3d91b36b6b827106a0431d6396aa49c34fde51e35decba981309f86cb7c89658e3579e4647739a4db201871
 MISC metadata.xml 534 BLAKE2B db66db041dd0875c8d4e36e3223d7f82263555f2d6a1dcc5270279b3fc8bc77499712253d43b56e278187f163af0495ca9e7e6aa0ba0dc8e9a5fe9cf7f2daf99 SHA512 e086f5e92c5ad9058f13c23c814a5cdc988a09cdbebecb1018b59d32a756dc2766b13ee1c3e09966cc7e221cc1c4ee26f9bf11c50610f94b28c20a34c316f133
diff --git a/app-text/qpdfview/qpdfview-0.4.16.ebuild b/app-text/qpdfview/qpdfview-0.4.16.ebuild
deleted file mode 100644
index 8ae9621ec5dc..000000000000
--- a/app-text/qpdfview/qpdfview-0.4.16.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PLOCALES="ast az be bg bs ca cs da de el en_GB eo es eu fi fr gl he hr hu id it kk ko ky lt ms my pl pt pt_BR ro ru sk sv th tr ug uk vi zh_CN"
-
-inherit l10n qmake-utils
-
-DESCRIPTION="A tabbed document viewer"
-HOMEPAGE="https://launchpad.net/qpdfview"
-SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="cups +dbus djvu fitz +pdf postscript +sqlite +svg synctex"
-
-REQUIRED_USE="?? ( fitz pdf )"
-
-RDEPEND="
-	dev-qt/qtconcurrent:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-	cups? ( net-print/cups )
-	dbus? ( dev-qt/qtdbus:5 )
-	djvu? ( app-text/djvu )
-	fitz? ( >=app-text/mupdf-1.7:= )
-	pdf? (
-		>=app-text/poppler-0.35[qt5]
-		dev-qt/qtxml:5
-	)
-	postscript? ( app-text/libspectre )
-	sqlite? ( dev-qt/qtsql:5[sqlite] )
-	svg? ( dev-qt/qtsvg:5 )
-	!svg? ( virtual/freedesktop-icon-theme )
-	synctex? ( app-text/texlive-core )"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-DOCS=( CHANGES CONTRIBUTORS README TODO )
-
-src_prepare() {
-	local mylrelease="$(qt5_get_bindir)"/lrelease
-
-	prepare_locale() {
-		"${mylrelease}" "translations/${PN}_${1}.ts" || die "preparing ${1} locale failed"
-	}
-
-	rm_help() {
-		rm -f "help/help_${1}.html" || die "removing ${1} help file failed"
-	}
-
-	l10n_find_plocales_changes translations ${PN}_ .ts
-	l10n_for_each_locale_do prepare_locale
-	l10n_for_each_disabled_locale_do rm_help
-
-	# adapt for prefix
-	sed -i -e "s:/usr:${EPREFIX}/usr:g" qpdfview.pri || die
-
-	default
-}
-
-src_configure() {
-	local myconfig=() i=
-	for i in cups dbus djvu pdf svg synctex; do
-		use ${i} || myconfig+=(without_${i})
-	done
-	use fitz && myconfig+=(with_fitz)
-	use postscript || myconfig+=(without_ps)
-	use sqlite || myconfig+=(without_sql)
-
-	local myqmakeargs=(
-		qpdfview.pro
-		CONFIG+="${myconfig[@]}"
-		PLUGIN_INSTALL_PATH="${EPREFIX}/usr/$(get_libdir)/${PN}"
-	)
-	eqmake5 "${myqmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-	einstalldocs
-}
diff --git a/app-text/rarian/Manifest b/app-text/rarian/Manifest
index 41e90135c2ce..66b640c2cf80 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 1815 BLAKE2B c6d699372a72c024ea32bca44c464519c2f1d4268ef373c54e2aeb202898874236e8e7687957a21aebb8510a09b5de798cb68836051a589f684779756a944819 SHA512 8c3e2a4b20695cf0b8a7ea357d6635bacc9c92ddaa884f6c8ccb7afc9a430fff0a871bdc7b825d966951a93b60cad9d4de5109ab5b1a9c743d03cec39985f08e
+EBUILD rarian-0.8.1-r3.ebuild 1816 BLAKE2B ac5dcdee6e3cb37700abc93e8f0ebc20f86e8bffaeb3e5d88e66e73054e9586613e67bbc441e8c3930ccca9e3549d7f43630421a12d2738155d35cb24ab9941b SHA512 27bf313f808eb853bc813205f931af6011efdee97cac232b66bb81f22573de16d9e2e06bb7d3620323c99b075469e66a664a7470314c846136bd71034a167a76
 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 db896b4f7e50..3f68b03d569b 100644
--- a/app-text/rarian/rarian-0.8.1-r3.ebuild
+++ b/app-text/rarian/rarian-0.8.1-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://${PN}.freedesktop.org/Releases/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="
diff --git a/app-text/recode/Manifest b/app-text/recode/Manifest
index 37f6ecb82934..55dbc1ff3a69 100644
--- a/app-text/recode/Manifest
+++ b/app-text/recode/Manifest
@@ -3,6 +3,6 @@ AUX recode-3.6-gettextfix.diff 514 BLAKE2B cbe2dc00927ce9215d1719f78eb78bdea0cc8
 DIST recode-3.6.tar.gz 1751886 BLAKE2B 94436343969da0ee6d16ed69a211d4f36b7a9cb59ce931ef71cfc1e0f11e5709e67ee1e0bb24f5320e6c7d6d01920a6c4d9edce87ff2c6aaaa8c80e30f3b536d SHA512 68de277ac8cd5f6023bb077b959ab5778a78edac1299d507bab906824080b6f86e9bfcd89169aa474197c2faa9af2ceb1ed272c8dd4d50caef373afa05daed1b
 DIST recode-3.7_pre20140303.tar.gz 1580388 BLAKE2B 8fb280368e6998c8cb4554f856dd779e70fd53958bf6da5839735e14e741f45b110ac106494703d97ac3390f41736b2d94539dfde4554b3ca70911788ce8c005 SHA512 a1821909e7ba68a315bbd5e0dcaf0a574f09ac6ef1ccf8858aeda1a0affc09cb70353b4bda005a14cff37ef41646a6f5246c5b5a0f6e89db2065eac7ace9b030
 DIST recode_3.6-20.debian.tar.gz 341117 BLAKE2B 748ee36b68f1d1501edde23e8afcbd58df70a86745e7c366a27a33496e539dcae11b746fb46767e95ae99b68a18684e3e85c1ea961692ac57ad1a01a895734a7 SHA512 bc586534e77b49da7d387187a8ddb042a12871f87f4f32c818ce7218b7254ac5ba6eccb14aaaf0312579f27958883f2da620016a7049c3af24c8bfba81acc3ef
-EBUILD recode-3.6_p20-r1.ebuild 1644 BLAKE2B 539f302c2e0bd2473fdb1bc4f9f2e6d5eff9b60fc880508d27e46a55142ca870e4fe2dcd86b6b7a7c434e20581da7442632540dbb74e517ca9049f4cc95ae9cf SHA512 ddedcf411f1180adfd15d68ac58d4a65d23607d6e9841a275978901fe019bef1a1e18761866cae0e19e78ec14eb21d5c3662978c134d2a3e115c615ac7300898
+EBUILD recode-3.6_p20-r1.ebuild 1645 BLAKE2B 2c56d3ff16cea97bc51b1609ae12bdfc284f4cf7ed9e76b12df8cdfd32bb95bb966f999fc4eca13f52371c8a41685b55358c3da4a9d5883700444727d64478b5 SHA512 fc90cb897b778da15e28d7d38485e47438b087115731fade0d3c04d25eb5567833b3d331d6666c6bc407b5be6a06f3475a5c7a70a1a724c76ab063fce7bd336e
 EBUILD recode-3.7_pre20140303.ebuild 1095 BLAKE2B e2a89f0b13ced5f68263ce75434a616d8627fb735739fdfcb0adef816598acaca2357a029de71227231089dff8945e441d73e146778ded23a2ae9d7b866d1694 SHA512 4e29c10baae6065d26b3f31671a0bbb6a9c31df9513fa171629e813d5312c0c3d97c99ffdf69c651079e0b89f16ef8c28003730a6849dab412e9f8a1584b6c12
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-text/recode/recode-3.6_p20-r1.ebuild b/app-text/recode/recode-3.6_p20-r1.ebuild
index 5d227e252fbc..eb9dd3a96c10 100644
--- a/app-text/recode/recode-3.6_p20-r1.ebuild
+++ b/app-text/recode/recode-3.6_p20-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="nls static-libs"
 
 DEPEND="
diff --git a/app-text/rman/Manifest b/app-text/rman/Manifest
index 098d10906111..d368b6bcafe5 100644
--- a/app-text/rman/Manifest
+++ b/app-text/rman/Manifest
@@ -2,5 +2,5 @@ AUX rman-3.2-format-security.patch 458 BLAKE2B 85807cbc0ffa292c56794f61f37133381
 AUX rman-3.2-gentoo.diff 560 BLAKE2B 7f63625d37971f537c44667a05ec5b65c7c2216c05b5cc447fc802be3a35df365def1c8a95aebd5ed2f462eeced80cd1c106fb2708c231568a7666d1fa7335d4 SHA512 528b2e7385882620ecaa0374a65579e0fe56803aa6991277ea1279d18d65a4331ebbfc2374a711bda2f5722a5fcc236681f9c4dfb3c0abed1e931ff986cbf74e
 AUX rman-3.2-ldflags.patch 451 BLAKE2B ee44bfca1a15b8a52a42c703ca749722257f8ded019fa3119687f0808ad85ae696096bc29d5a7b04c4527382ad1f3f9d8d2d3e3bfb72005a167be3e95693a4b3 SHA512 936c9fb92e3f018ec0006370ea61f010b61469171a22a9f52a6773f32ef3ab01764b726573aa30548b1c9ea6db3893302a45d20c06bc19f7e272b5e531bec433
 DIST rman-3.2.tar.gz 79397 BLAKE2B 2be1c60f77c3b2c4fa73a59c5a8965da1c8b1f3b569e7e4d5716a372228bacb81c5421f4bbf330781aa231835393c915ed14057c717cb1e8ed57101f7febb37d SHA512 a70aea0af1510088fd88a736e63a6dab9200040be5eb89912ede4f50e3de97d423574841bbb66e90fb12934f3834dac0acefe78ff1c73a78a79c95c3dd6fa5ae
-EBUILD rman-3.2-r1.ebuild 801 BLAKE2B 8d5c18c144bbe7895473b6d3f5348a4a4abb00604957a053b53afd8827f56709f14c7b2ffb343af272625734ba8e3f5bfa3323a552377d10fea12e9123a1c1c4 SHA512 fc5b40f2a57e73dd5a48a5a763d5cf499f01ee23a13640e75ea5192f29d7af23f4ecfe9b2ec73f128c96524677355a5cd45c3a5b5d743947f7264d7da38a0efb
+EBUILD rman-3.2-r1.ebuild 802 BLAKE2B f66c16814275f637ca227b6f1979e03695716757743cebfd00f3217ee8b320ec47bdd0675e247fc1d9ed420e9d5e779447812be17f091d69c80496ad00e737b1 SHA512 2ef6ad867cefcf7c80a4602091528afb751f3a991085a4d4036cce205bc52e04b0b13131b7d6d3a9b35e7e50b2c1def607a22a22236396f798e0894405caa557
 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 740f1a45515c..b6bab7b3b26f 100644
--- a/app-text/rman/rman-3.2-r1.ebuild
+++ b/app-text/rman/rman-3.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/polyglotman/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RESTRICT="test"
diff --git a/app-text/ronn/Manifest b/app-text/ronn/Manifest
index d686147029cf..5e4a06a0c1ec 100644
--- a/app-text/ronn/Manifest
+++ b/app-text/ronn/Manifest
@@ -1,3 +1,3 @@
 DIST ronn-0.7.3.gem 61440 BLAKE2B 3ff0a1752d7a972b7d8319cac2b1287e7d21207e22b9eb288694172eb9b30b2198e4378eb02df8418585a44d3d2c89b4695675933dc5ef5d9ba63c78e71f4e7c SHA512 885418c88d5a1073f9457ea11e29d82d3bb40ad12506589ccfab83ad447445e41282c9688aba5646082ae5ecc6a047fa9439ffae14561152fc61a136474f611c
-EBUILD ronn-0.7.3-r3.ebuild 1173 BLAKE2B 7d44862ed10f3a084b215c1cfdd8261d4160133cd11d9de87bcc509e3a92b6e2743a90b17b568bbdabd30961c74bfc7bf1c58108f70a81b8fb9a6176595227a3 SHA512 b82c03860d16952b331123301f6d703f0a00fc60b91df69730e34107c1d1dd9e9d9336360dcde247b3d1d64a48e2bf2c7e6553e0de516209674d2394d270cdfb
+EBUILD ronn-0.7.3-r3.ebuild 1174 BLAKE2B 80dc7cbb0b8ef0908f21cb2899633383143ff1197b6c06136f49b4c132958c22917771cfa4df51046b032b736ce633d5fb1286d142986f480dd24c0c828372c6 SHA512 bf87815d1640e760b61ab293772c52a3a4482ebe63cdc22c2907f62365c00ebfaf0cceff9e0fa0d137c4b933d5ffd1178527252a5290eaa4fb32e29b3016cb96
 MISC metadata.xml 339 BLAKE2B 2a1722a0531a1ccaba0d29a1ace114b95789ba4b0c692e8efcf38605f81de4dd1210671331fcdb5baa6536cf38fbf63f11b85fb13bd6a067be56f22a372fc5b6 SHA512 0be4072cf3514eba60569138ed409362b318616ad4514e319d9b4add120e74fd7655e2fc5c3ab8d7b5d813cfcf8e1054fb98395a1a89d9fb90e447a825ee9439
diff --git a/app-text/ronn/ronn-0.7.3-r3.ebuild b/app-text/ronn/ronn-0.7.3-r3.ebuild
index 50774daf7f6e..e288edab137c 100644
--- a/app-text/ronn/ronn-0.7.3-r3.ebuild
+++ b/app-text/ronn/ronn-0.7.3-r3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rtomayko/ronn/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 
 IUSE=""
 
diff --git a/app-text/sablotron/Manifest b/app-text/sablotron/Manifest
index f837938c4bfb..0910c3b97963 100644
--- a/app-text/sablotron/Manifest
+++ b/app-text/sablotron/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.3-libsablot-expat.patch 286 BLAKE2B 07728a2d174343133946519934a0b10aa0ea0d2c7e5ba73401b8c16ead71f059f78b24236bc96e17baf2467a5765ce0d82e67e97bb48225a9ba0fc5ac8a163d0 SHA512 29b7ae2798696439d3b181196677a7e7beacecac39abae631c73aff2d77e608bbf0088100953db78feb82cba37f89350da238cf8053e694c8ff0b3d8e8837040
 DIST Sablot-1.0.3.tar.gz 607597 BLAKE2B 429df09361d233b290e1179d5a3fbe7b421b834c23ff32d72466f007fd4ce19e810d68483b1b0314e943f2ff0f3713a3f28a357a71c69722883f5c85499cb582 SHA512 836c1a9d09317194333619461b0e5ea312277cadb6df5ae5ed327bdfee4090970bd3056ec0b3bd6aa8a3e3289af1bc5c1461c9fe15b53a944f1042190c485031
-EBUILD sablotron-1.0.3-r1.ebuild 1043 BLAKE2B b54ac77c2a6c570fe07ad380604114d63ae5ecd54b1e5786c6e634c7fd046a5c4791210691350537d43b198eeb9800ef355fc9a1bf422ea253e1957c1922bf98 SHA512 184c92b8c6fc4992fbc09506e67eebae0ab10839fee12b4321334523fd8942245013aa00e011b6d61ecfe69986ba6a3798f18e0481fc6fd58877816b51537c44
+EBUILD sablotron-1.0.3-r1.ebuild 1044 BLAKE2B b7ef4b347fa84b047073dfc29591f8ef826368fe138e15274529469823b1de58cc3fef25d524cd5bf772d0813b47cdea75a3dde31456e305d29f94dcd6bee4fc SHA512 c8c093a67a266f96f5d112815fb3a1c8c978d26b88920391a8fdccabcd7890083418c8a63f34741e42d62b1817db88a2bbf808e66e5b20c2d6d6363b78cc73ce
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/sablotron/sablotron-1.0.3-r1.ebuild b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
index aa2df2039233..7bfad20286bb 100644
--- a/app-text/sablotron/sablotron-1.0.3-r1.ebuild
+++ b/app-text/sablotron/sablotron-1.0.3-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="http://download-1.gingerall.cz/download/sablot/${MY_P}.tar.gz"
 # Sablotron can optionally be built under GPL, using MPL for now
 LICENSE="MPL-1.1"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="perl"
 
 RDEPEND=">=dev-libs/expat-1.95.6-r1"
diff --git a/app-text/sary/Manifest b/app-text/sary/Manifest
index 0bcedeca78de..f64b0b03d277 100644
--- a/app-text/sary/Manifest
+++ b/app-text/sary/Manifest
@@ -1,3 +1,3 @@
 DIST sary-1.2.0.tar.gz 393787 BLAKE2B bcfb393dbae4b5edd51b35a9bb542a1988a4293a321a72f9e3fbce48abbd034bcb96bac915fb330166c5d8adcb2f2b572e808b76508c0411521aef722422c074 SHA512 0eeae82a384970b4d96f7a0ca3929e74d17b8b3ebc61459ec9fc7172e61c3835ffe2de8aaab7ebd64f54be24d39f6734949ebc98758c28cec299b3bd25020632
-EBUILD sary-1.2.0-r1.ebuild 940 BLAKE2B 6cc0f09cd9d14a40b6d4a1ada57f132b2a63e6e3522b06e9483b3b850afc74c2b5a8fd2ec6ed944d8dbb23c1049c471e06fa0295d90f76f01a5869aba392f41e SHA512 b8c1473b0150a40141c1b426bead96695f32d15bfb383d946ae4274cc2976a1124d93d06b9a3b9498ea2856cd43ea49b55e580a4193b49dabe5310c5160f867d
+EBUILD sary-1.2.0-r1.ebuild 941 BLAKE2B 1ae46dd1816ad5ddea93801acf1be846d3a5b5135fdb81c1dfa4c5f90261e8653f0a4d5238428799739b0a88a7e4d5efecdd18b2b4347ad79cdb228318c9b020 SHA512 7060dbab3cedad01282c02383c5dce3e2c4f972c68a8339ae3b4e7303139186c9a7e0f6ecd56b74a7ed50236dbcce8c6bd43c9ca75056c0659895e648eeffed1
 MISC metadata.xml 614 BLAKE2B dbab63bef60f0c15430f90761b9660a90cc05561104ee73eb3848ba30fae5d8bd888e091afd6709d9796cc9fa087c350903e5c83077bd014fdfd9cb7d92dca3e SHA512 ef381dbe030d43e46f5b8aaf13c0783cb1a215bb2961793d75500712fd491983e2df30eb838eb504432d2cc844b7e064d0f96c0efd67d190295496b8cc082a15
diff --git a/app-text/sary/sary-1.2.0-r1.ebuild b/app-text/sary/sary-1.2.0-r1.ebuild
index 0a46d5be73af..409ea814d879 100644
--- a/app-text/sary/sary-1.2.0-r1.ebuild
+++ b/app-text/sary/sary-1.2.0-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://sary.sourceforge.net/${P}.tar.gz"
 IUSE="static-libs"
 
 LICENSE="LGPL-2.1"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 SLOT="0"
 RESTRICT="test"
 
diff --git a/app-text/scrollkeeper-dtd/Manifest b/app-text/scrollkeeper-dtd/Manifest
index dfcd30d9e88f..6dcc590fe34c 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 1516 BLAKE2B f99bfdb8a99533aace38abd7cfb5d5cb703372c8056b9fc4d1ca88a5198efd7015d1d9bb03df2c555850a880d6525d47b6ee3365fc6df9ad6fd438d891e550a5 SHA512 2500277fbb4cb09a703b280b5119d479b884789e711e1388b9f4f4147421c601bdd7dcd8c9525e0b44aa8d05d2fa336a5fa60d18484210599c0bd50757e04619
+EBUILD scrollkeeper-dtd-1.0-r1.ebuild 1517 BLAKE2B 3764fa8ef3e0620f586b2dbac6cec7722756f7fbdbbfca89ce667344c83e14ef764e320969463ba5191cc9cb8b5c4f242f774e33971a135c55b15f2d977cc4a6 SHA512 ca8a7dde34ff32ebd5cf3969f5691f610d7f6a8db3ca6271182558814bf6cd4947168e61302609b0880252e711ddc79fed2a269586925a236ed4933540a2c6d2
 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 8d1d95790d70..67fa50712153 100644
--- a/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
+++ b/app-text/scrollkeeper-dtd/scrollkeeper-dtd-1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/${DTD_FIL
 
 LICENSE="FDL-1.1"
 SLOT="1.0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=dev-libs/libxml2-2.4.19"
diff --git a/app-text/sgml-common/Manifest b/app-text/sgml-common/Manifest
index de6248aa647c..f62a04d2be3e 100644
--- a/app-text/sgml-common/Manifest
+++ b/app-text/sgml-common/Manifest
@@ -1,5 +1,5 @@
 AUX sgml-common-0.6.3-install-catalog.in 5064 BLAKE2B 2400dd32a80a64c89ded54d898a2331b649a35269bd3389e6c71c9f161b5b02b857230a6c7f4807cb975ff4c7d6a99a5576d2bb79190e5914c9faf9488e1d11a SHA512 85fbcdd7aceb28256e08ca1a5b6472247d81499e604d6a45edabf662bc32b72a22326db907e2a408b1a6da02deccd89606749e3fc8e42594ad6402ab29d501b9
 AUX sgml-common-0.6.3-prefix.patch 664 BLAKE2B 5b82b66824547c0cbae10f12c94eaccaa0789c1ff68a20c3ace00cc1620dc0e2d7c81cf906db8fac82104b9d1c5ea29af42746b200f1c1a5a9e9728052f5859c SHA512 62758c7ccb4e86e91292757546e6a1f932cf8282abfc2d9ccfe2e68008bbcc995d0a4eeac3f0c8584c4dfae552a42000b438defe38dc911b770a9e8e72b310ef
 DIST sgml-common-0.6.3-gentoo.tar.gz 128903 BLAKE2B 3b374179fe85cf6f098649d2014f9d34349ddccd17ae0ac4c5502414507601c545eaf27f7c76fafd63c36041068205d3b82309a204989f3b106c04c7adf14875 SHA512 c8de573d707ccf524407c9be9a6e7740341eb88ecb6bee69d6d11a2658ef74e6acfb7495afa33c9983ab015c3c925aac98278a4e01ee217892a9fb99e60798ce
-EBUILD sgml-common-0.6.3-r7.ebuild 2568 BLAKE2B 6733c3345bd061dee79494bb0fef871293a87d1c9486b18553a9f0bba01c17ad92620837015cd2701be9207df7b80e3bf56e9691d2e0ff45adaf676f3b0ca070 SHA512 8030b9f32cbdb52c95b6492c2ee7674c43cc8cb4520f3ee974569e4f2aaf18de42a2e8928a3a0a36d592a5b9cd4e8bc1c777b0708a4318381cab4d4c3990255b
+EBUILD sgml-common-0.6.3-r7.ebuild 2569 BLAKE2B 8ac93b4b9b13b2b015c227c9895482153b56c7bf465201b7bb3e03ba9edfb80059e63e3f177999222707b0d330c35460bd2ce6739fa78b81ddc686d3a1857e6c SHA512 06b1c7869c89a6b4807f188b231e00881ccf5bf09e193fdce70c0a046d7fa1417144ba3a73171efc825c905c2ad27d44ebba0665c0b537d72db8f1b4d61ec8dd
 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 1910a7b6edbf..b661f9a840e9 100644
--- a/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
+++ b/app-text/sgml-common/sgml-common-0.6.3-r7.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/dist/${PN}/${P}-gentoo.tar.gz"
 # install-catalog is GPL
 LICENSE="FDL-1.1+ GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 DEPEND=""
diff --git a/app-text/sgmltools-lite/Manifest b/app-text/sgmltools-lite/Manifest
index 37d99a7db37f..7d7a70989d3c 100644
--- a/app-text/sgmltools-lite/Manifest
+++ b/app-text/sgmltools-lite/Manifest
@@ -1,4 +1,4 @@
 DIST nw-eps-icons-0.0.1.tar.gz 8733 BLAKE2B 467fa3f341c1d6ea20af059cfa88529a0b3bc729cefac72d5b3c264d3a224e8bfb05a89b5f491a22aaf4c194b72cd27ac103a381adb671d9867ef8fceb41f030 SHA512 597062e9882bb9bb73144bbdb056c3ccc2a6d99efc7da836f483ccd6f3799705bcbb897099cb1a580c8e22d936d281d95c3a875694f8e15b6989faf437f6cc7a
 DIST sgmltools-lite-3.0.3.tar.gz 61342 BLAKE2B 8fcac5b48fcdbb8fbbfdbf8ad055ab00cb3fb6a8447a27bf5b14faef968845554a86f04b4984c1ccc1e26d9c64dc5654d5831896bbc44bd3dee0ef3fc28109e5 SHA512 36709ba726859b734a7402c533ba7d2abc0546007bc97dba76ac824bc42f6f8ac7ef263b3740d0be51749cbc0982d010ba938646fca2006fa2c5094a296b3c81
-EBUILD sgmltools-lite-3.0.3-r15.ebuild 2542 BLAKE2B 725ed4b559ba330370df718863bb53cbe838aa01e312dc39eca570bd94e0fb0d1cd49d4bcf3e2c00c6bb3fdd662f672da25d00027f60fe30ee3e08eadccbaa47 SHA512 6211911fc50daad41be3df2b537ead8cb442e546cae27cd7bf95979a399dc4d2533a03ec4a02de926d3e83efe32a0bf7621026eed146065f2ff609b626af4016
+EBUILD sgmltools-lite-3.0.3-r15.ebuild 2543 BLAKE2B ef9dd3f87ad71a25c08ad03e5f8d5276cd71bd0877824d918b181f67858011c928d05947c72d011300960ab46d7d0c05b24d3d7eaef5317787fadd37da73fcc2 SHA512 8a7876b2e3e2918e7bd44fba8571b95fecba3fb03d37fa6f2c40b5e6e5102d3d86e99d763da6b5e25370a55975d91dffa4d06f5c509c9f147e1058e6734fa67c
 MISC metadata.xml 493 BLAKE2B 36e972b80b557e131d5decb41945968ce24de810197ea457e50081017e50e3926baa419082222cbdfb494a55e9bae125bf304a431234efb4c4a67a8c3536852a SHA512 9f2e53faa5f07d791f7c4cfa7972ed42a26d1abfa5c11faf3e36dce18c2c30d086462e9c0a2c7664153333cb10c3923d47b4bb9e873b7e48dd144e667719a14e
diff --git a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
index b1e78772f065..53628328803f 100644
--- a/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
+++ b/app-text/sgmltools-lite/sgmltools-lite-3.0.3-r15.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="jadetex"
 
 RDEPEND="${PYTHON_DEPS}
diff --git a/app-text/spellutils/Manifest b/app-text/spellutils/Manifest
index a0929cd6badb..f178a7461c36 100644
--- a/app-text/spellutils/Manifest
+++ b/app-text/spellutils/Manifest
@@ -1,4 +1,4 @@
 AUX spellutils-0.7-nls.patch 506 BLAKE2B 686d2f97567d9e3521738307adf4622be83fb726f1a64057eef76d01b2ffafe5a2fdb3cc4d43d05a54ecaa5119c906dc18c1455db434b1ead644d97dccc80a05 SHA512 1d329b8cb27f6f50c3b0c7572352ca57420da12553143269c691f4998d62d6b7f730c42f2cbae324debddbda1729be3ea775c90ee3894d75e64d5f685f764723
 DIST spellutils-0.7.tar.bz2 110421 BLAKE2B b415a8be96962b88c4ba64270b43e90e42a3ebe23d765ef970cf55a22ada842f269878c4b3a72e6284864d1d1c3e4ade1e84aaf28d4fa39f86f0280db4f27e4d SHA512 030b06038c587e668fcbef95afc64e28db48a25f2b247b829155c1a5b66d3b3012650cb4c13e5de41a70a1665b05fbfb44a4cd0b1295868e611a21d855f02f9e
-EBUILD spellutils-0.7.ebuild 687 BLAKE2B 90946c46e995ebb86dac1bdd4c2b3fa0085ec7544f3a5022576858d0ea06d0476e72378cdf296a52cfa8ff95d7c2cfdafa3e944deac72c40e072df3a3a5ae9af SHA512 e8bcd5f2102ac432d67c64a993100c7bb77db91e036a01c0f8f463b6a2f9d969920d25ee44857a75519e969404acb164b83d2ca0a135e26909528603c0bb219c
+EBUILD spellutils-0.7.ebuild 688 BLAKE2B 5db94679ea701600d378c3a2366038dd3d1f005f4c4ecd9283c975892a8015249bc9dcabd055f4e6c59685889fad31fc9fb5abe947ead08bffa05a27114a2322 SHA512 276ac75505f54b5d6c562e6609ed970a55301e3434423461b76582d353cfa606dc6ee7e3c9c5f327d66d02f10874f9493033587b635e6113e53619b0c147ff65
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/spellutils/spellutils-0.7.ebuild b/app-text/spellutils/spellutils-0.7.ebuild
index 1c371d0dc919..f8fd05285e5e 100644
--- a/app-text/spellutils/spellutils-0.7.ebuild
+++ b/app-text/spellutils/spellutils-0.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://home.worldonline.dk/byrial/spellutils/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc x86"
 IUSE="nls"
 
 DEPEND="
diff --git a/app-text/stardict/Manifest b/app-text/stardict/Manifest
index c454f7ad6268..d7d197d8e717 100644
--- a/app-text/stardict/Manifest
+++ b/app-text/stardict/Manifest
@@ -3,6 +3,6 @@ DIST QQWry.Dat.bz2 4114875 BLAKE2B 3fb1a3b223b799645fcc7adc3d8158c80551bd1d35689
 DIST WyabdcRealPeopleTTS.tar.bz2 84329208 BLAKE2B 1dd9c00e4e914b0d747876aa566db59a4b973b3ec61fa1ed7a55f885d7f415f573f2f8783eca46c565bc52df4ba3576b3a0f4e863b4f7ba688007f6d6b375209 SHA512 1553e62c139ecb005bb04163147d94aa58e4ba7f9ee3172b760c6e4776587c12bf816c42e0131c82195b7c738ec9ee5082f39b974790f5cacd522367919beaa0
 DIST stardict-3.0.6.tar.bz2 9341740 BLAKE2B df0ccfbd485dfb514bdcf4edaf92b2faf3c11016b025ca09596adcc12738027395a049d9d27420427acdf5c46923cb43ba521d334f875070f5451b7ff147e36f SHA512 81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658
 DIST stardict-4.0.0_pre20170304.tar.xz 3603012 BLAKE2B c9ac41f1e27c013e9c20e5b5477889cb4933ebaf35629311362ec48e820b10a7492d464ac7eddded697ca49f56f65032a1af36088e8e731643e83532e0586e48 SHA512 ec27bb95069d727fd96cb30f2d7ad94992cc53e55903b373612e29265263ea5da2c8a25f6c9618db50dc38c33efebe13324c2b8eb09b198559a1ee70029f0b6a
-EBUILD stardict-3.0.6-r3.ebuild 6059 BLAKE2B e9747091de8ef6676d5e1b4fc50b38ebfa43bba4cf849a984572b926973be8e22e7ec36bc67414e7f638320357d14c84c4e30573f33802db207fcc0b5efe2ba2 SHA512 43cecc331dadbe8ed67f854bff4262b313af27edc8b8008bf2210e5388103325c26d1ccf3f87cf49c1801393517ac6e73cd653b0ec860a8b574625037ce41a53
-EBUILD stardict-4.0.0_pre20170304.ebuild 6472 BLAKE2B 6d153bf778298984d60780f5302f6ae66609532d6ccc6a1b71fcd9f0ecff9475ddd0af032691fba5e4c1e04cf5659c3f8ae5a2b0994354c96ef089270229e7ed SHA512 5ecf1e60594a9ae809567063d8341f188e930186b0d14fbc91dbe9cf226a9e4cd8c8dd2ce274f798494aca2d170d6e3452d241267e1727c6756fffc343c60a3f
+EBUILD stardict-3.0.6-r3.ebuild 6058 BLAKE2B 06cc43bf8f00ebc08a8bbcbe7482f3ba009cd3c92519c71f1613e745985f7e0b8bf31bb54a15241fd9d362e22e980381ac307661d3233bd161b60c1745255576 SHA512 80708e6f0a022f531a5e706ed72054819f395ff182907d60960deb9a9a62e7533a4c8f88c86503ff200cc80afb5537029c04f39a23c6c1fc8416093e8d1f3523
+EBUILD stardict-4.0.0_pre20170304.ebuild 6471 BLAKE2B 8886d9b8488d049ea0d99770290f914da06873c4b4486063dc27ccc75c1df6d23387d9ebd8aac71b9f6ec9eb7d417b9af47d72954329afb73f8c57270d193a75 SHA512 8d091ac639c52eaa9d17df4b7bbf1aa20a421214067cc6c0bd3a34204007988e73f79e21af34bfc7f64d4ca36798e1b87925e3cbae6425d196c51bc02cbfdf86
 MISC metadata.xml 2668 BLAKE2B f5d9f4b43187c2140f84addb9bf1c2d209d7ef0de7a5081fae594c27b439ef77686ac9fd8b555bc95b76bdef041dab75fbdbe1bf5451bd754b4cfd1dd5d7771d SHA512 caae150f5dd42c45ee5f17659df5700b52ed38c9005c37316df9c4828dcfbbeed1dd585c8c9b44acfe16f1f68f745354ac40e4dc5695df183cbf5c64e82826d7
diff --git a/app-text/stardict/stardict-3.0.6-r3.ebuild b/app-text/stardict/stardict-3.0.6-r3.ebuild
index 6d913303f558..66ab1895618e 100644
--- a/app-text/stardict/stardict-3.0.6-r3.ebuild
+++ b/app-text/stardict/stardict-3.0.6-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -36,7 +36,7 @@ COMMON_DEPEND="
 	x11-libs/libX11
 	x11-libs/pango
 	gucharmap? ( gnome-extra/gucharmap:0= )
-	spell? ( >=app-text/enchant-1.2 )
+	spell? ( >=app-text/enchant-1.2:0 )
 	tools? (
 		dev-db/mysql-connector-c
 		dev-libs/libpcre:=
diff --git a/app-text/stardict/stardict-4.0.0_pre20170304.ebuild b/app-text/stardict/stardict-4.0.0_pre20170304.ebuild
index 7ef439a91b49..068d4a3d51c6 100644
--- a/app-text/stardict/stardict-4.0.0_pre20170304.ebuild
+++ b/app-text/stardict/stardict-4.0.0_pre20170304.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,7 +41,7 @@ COMMON_DEPEND="
 	espeak? ( >=app-accessibility/espeak-1.29 )
 	flite? ( app-accessibility/flite )
 	gucharmap? ( gnome-extra/gucharmap:2.90= )
-	spell? ( >=app-text/enchant-1.2 )
+	spell? ( >=app-text/enchant-1.2:0 )
 	tools? (
 		dev-db/mysql-connector-c
 		dev-libs/expat
diff --git a/app-text/t1utils/Manifest b/app-text/t1utils/Manifest
index a8414ae42d92..5a6b1cd0101d 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 652 BLAKE2B e502ea6e67f30128c4a40d9b9b4ff2e11db6b5f6a1d352296643810c61b0dd457bb2d27afcfdf6a7e83f85b63dc6b48c42f84446cdb540ac33fed3a812878010 SHA512 d4a2d2a41c778d7a27e75e2c8af9aeaf3b45a5ed575b206e89a6db503dbc5273fc26a62dd0ff0151d793cfc57ec91f18d83634f52381fd3bb22bc1e19ddfed0a
+EBUILD t1utils-1.41-r2.ebuild 653 BLAKE2B bd73e8d01286c7c4d4c9c1a59a9c94cf3b8582ce83969c47e27dfed883b920d546b9b8a9f438626b7de4d8df2d90f17e5fe17fab88c201d4de19cd92d838bb31 SHA512 4eabb6ad757302389f96a1fd03243dad5c16c005edc3cf1018164cfacde382855d69c8528768c863a9aacaca650df33c36835ae0c2b95a15595e9307e3764c4c
 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 7e9e91c61016..86ba8cec5b47 100644
--- a/app-text/t1utils/t1utils-1.41-r2.ebuild
+++ b/app-text/t1utils/t1utils-1.41-r2.ebuild
@@ -8,7 +8,7 @@ inherit autotools
 DESCRIPTION="Type 1 Font utilities"
 SRC_URI="http://www.lcdf.org/type/${P}.tar.gz"
 HOMEPAGE="http://www.lcdf.org/type/#t1utils"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="BSD"
 IUSE=""
diff --git a/app-text/teckit/Manifest b/app-text/teckit/Manifest
index ab0f94de8b31..ef506ea6955e 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 1114 BLAKE2B e60a0f40710b941616f2b39f687969e36e96157590037d0d6ebf15c1e70459e50fb05a78e88102fa9b42de370460ae148daef57daef3c381c616f71d62701353 SHA512 0250028ac87cd2db74e717a1b2c0c8ef96d27f2450b09415fdc53867a5de72921eb19d927223372ab5790a0d359305405dd8c0bf24efad20a311941c81b66836
+EBUILD teckit-2.5.6.ebuild 1115 BLAKE2B 8a3353ce4d41bf1ab6a7e9c0dfc50df17e835d58ec954a1b1c6c1bf699c166a9b072d8c4dd9748e75a5a62d919eaf9812f365b7bc2e7fcf3a803ab727a7de5db SHA512 81b1a387db197ad24a8ba70d105ad8f4b1ca88beb60851b48d19e3cfe3300af85b6412fc58565d9caf847fb2fc7b64c6bbab9997206af76fdb36cc418baf46e7
 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 4988e808f6d9..d15a2908b97f 100644
--- a/app-text/teckit/teckit-2.5.6.ebuild
+++ b/app-text/teckit/teckit-2.5.6.ebuild
@@ -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 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND="sys-libs/zlib
diff --git a/app-text/tesseract/Manifest b/app-text/tesseract/Manifest
index 56373801adcf..e7f38b3246bb 100644
--- a/app-text/tesseract/Manifest
+++ b/app-text/tesseract/Manifest
@@ -46,7 +46,7 @@ DIST tha.traineddata-3.04.00 13565168 BLAKE2B 1fe254a7ace923a88579c46111a0be81ad
 DIST tur.traineddata-3.04.00 14069931 BLAKE2B 385714a9fb0efa7a8299de7152729a7f7e12a29d4c33cc4df6c5592bd1ddca145acb056caaf93f077279489c3a12e2d95285d0790979cbb036206ecdab910080 SHA512 822b51bf9836f0d2b5923fc8ea14690a16d6e1831dc8828d0aad7cb4bda2bcec06ba7cdc79187d48b93e3541dfd46f1f50dc44dae504af9dd7a788052a05b51e
 DIST ukr.traineddata-3.04.00 8043189 BLAKE2B 3435bdbdac2e4f343479515632f54345c96b9d626db6cdd8dfc190c4b8dd0919e6955db8ccea45dba2877b4959f3146cbdc5472a1fb813093232de8ea4d97a20 SHA512 16117151debf90d79eb9f84c0b215b1d9d72d5b61bbf0004330b34b1502388f7d81051ce5ce296720dd10f53ba08f1e15cebaf4030330b5a071810612f78e0ef
 DIST vie.traineddata-3.04.00 6096118 BLAKE2B 2314880eef055eade892e788cc1458ca1b4b3ee3a8ce7c8657ab7d36c2f57556d21045094f055961ab0ecca38300d4c986162ee79d437e706a8e54c35b552feb SHA512 51087e2141051906a1815798175ff8b9f214ae36c7d87cb60999489ccc684307ea7ef65c5ae4024f95c51b89084ab9f0e8dde0a4d480eaf78dceebfba87350cf
-EBUILD tesseract-3.05.02.ebuild 5835 BLAKE2B 8f81fd6853978106759c00b951ce428992566c68915dfd0ec5e826fd4b68d632f5fc0e76b2414cede74398ccae61258e9e9e30d832e85e9e4996559d9c9aa5a4 SHA512 f216c6b491698dc1edb47e53ebe9e2971e2c7d2acf2a02cf6c05aa6e1436eb225ae85610f1d01e746dc972fcc24d17d293a7bd3645a605ed72891de7a58e4134
+EBUILD tesseract-3.05.02.ebuild 5836 BLAKE2B 7c1e5357a27d8226fd4a032024d9b5ec725c6807a56166e472651fe0cfdd0b234bd09d647adff5dac98a7acec1b4401cf72c2cdc845625848f74002734b138e1 SHA512 4c50e453e0135e0fa7384e01782b582b56adb5d70ddf2599183bf6be410fd9afcaac02e21ad8edb6be69b2c1eea211764feb86e8442560905893d0af400a46a5
 EBUILD tesseract-4.1.0-r1.ebuild 2058 BLAKE2B 3751e2c6e91b98a19d1685b18dbf8eb3efbb199c7188c8004928895abc367f7a9ea5e60117a6d0d9294d5b16181a1b13531884e195bdfd7262134ef7c4b7af5a SHA512 af6a73442d988fbfe3aa70bc5dd232d88424665bc69b0621295247f07667eeeb11fec1c3e1cda11dd7912d45ce095bbdb025e554d0f17b92d80b8a0baadcd11e
 EBUILD tesseract-4.1.1.ebuild 2058 BLAKE2B 3751e2c6e91b98a19d1685b18dbf8eb3efbb199c7188c8004928895abc367f7a9ea5e60117a6d0d9294d5b16181a1b13531884e195bdfd7262134ef7c4b7af5a SHA512 af6a73442d988fbfe3aa70bc5dd232d88424665bc69b0621295247f07667eeeb11fec1c3e1cda11dd7912d45ce095bbdb025e554d0f17b92d80b8a0baadcd11e
 EBUILD tesseract-9999.ebuild 1984 BLAKE2B 2ba645fbf2b694c306b68f12a4340c827f513ef23c59e8d9be0cc956f5339ccccc29fa0c793143398afaa131b1a955214782809fe5b1d250fb5421bfd3bc69da SHA512 1fff8b3531684facc3eedfb41b9474ec2fd379e8a2669d3d53567d819d52a2899e6247a6b28c632d24d7a3aa1068d51b80d17387ad90668a227cfcde39ebb1c3
diff --git a/app-text/tesseract/tesseract-3.05.02.ebuild b/app-text/tesseract/tesseract-3.05.02.ebuild
index 02784759ea3c..321483c8307b 100644
--- a/app-text/tesseract/tesseract-3.05.02.ebuild
+++ b/app-text/tesseract/tesseract-3.05.02.ebuild
@@ -60,7 +60,7 @@ SRC_URI="https://github.com/${MY_PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm arm64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~mips ppc ppc64 ~sparc x86"
 
 IUSE="doc examples jpeg math opencl osd png scrollview static-libs tiff training webp l10n_ar l10n_bg l10n_ca l10n_chr l10n_cs l10n_de l10n_da l10n_el l10n_es l10n_fi l10n_fr l10n_he l10n_hi l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nl l10n_no l10n_pl l10n_pt l10n_ro l10n_ru l10n_sk l10n_sl l10n_sr l10n_sv l10n_th l10n_tl l10n_tr l10n_uk l10n_vi l10n_zh-CN l10n_zh-TW"
 
diff --git a/app-text/texi2html/Manifest b/app-text/texi2html/Manifest
index deff832f4937..a8a9d43e45cb 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 e22201f81e83a95bd57ea071847011c9fbade332488b1f46fe77b9acb9de378f90e953f83249e4797745ffa1c371c7e2e7dcdfb026cee4725bfa549088b247c1 SHA512 85c7762bf4cedb41c4da6fe721e467b175ddf8b6b92f017d385adc81af8e8de7fb16fbd58d867abfa4667a1f1e48a657213bd0aecb4861f015dd384f28c5bbf9
+EBUILD texi2html-5.0-r1.ebuild 1351 BLAKE2B 7bf87c9410d22dc93658bd66c73f83b675689f04fc565fcaba351f3c5665b1b248dd3d2646ac43a285b62ccef32a9c15e8bc0a76e7d836ca5a17212457d586c1 SHA512 b8fc14fdad4dcffa5feab8108bb0212cac885891c1a5d2d9543847aaedbc57c89b232c83101890d86e2dd11aa3ffa218cc5433420c7095dfe7eb1d56448886be
 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 51e4bdab7d44..d7cc53966028 100644
--- a/app-text/texi2html/texi2html-5.0-r1.ebuild
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ || ( GPL-2 CC-BY-SA-1.0 ) Texinfo-manual LGPL-2+ MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="unicode"
 RESTRICT="test" #411523
 
diff --git a/app-text/texlive-core/Manifest b/app-text/texlive-core/Manifest
index 0fc1f3bac729..d2acad6c2bab 100644
--- a/app-text/texlive-core/Manifest
+++ b/app-text/texlive-core/Manifest
@@ -157,6 +157,6 @@ DIST texlive-module-typeoutfileinfo.doc-2019.tar.xz 756 BLAKE2B 00d7c631ba681599
 DIST texlive-module-web-2019.tar.xz 524 BLAKE2B ec134eb2d40143e1f45a076e05eafa25f991568c53cef0d812be7415f8979e4da38ed14ab9c6d97f3b2aaaf62720816822939d4e79fb7a18ef77f0025317035f SHA512 0d2d771e8452d67278adec061e1df8cfc06f3af729ea5ae7849acd5fe1b628167b18d86b1037484dbb6b20d5f703bba7ba9fb255788becc53ce22fd87f39ca7b
 DIST texlive-module-web.doc-2019.tar.xz 41588 BLAKE2B e0bb24840f72cf3b8a2b2d314fc82ca124d09700cdce32a4472b69963b0c6d6b1287b573018fa2b4698a3ce6594398031db7becb5b7c09db2fb0f9a7e893e038 SHA512 5647beef7b99a3a552b8f55d12ef669481e8ba3e01beefb014fb8e3cae6e8f419862131379b506ab8197e1717d563c34fa81d69db3c6db8107e6167447d87322
 DIST texlive-tlpdb-2019.tar.xz 2079308 BLAKE2B 5673fa842b129208a7ec027a0b0a097e7b29eb8baa019371e20444dc4386859144e0c88125e0f085a57812fabf41af1a146a8d66f6eb9e4aefe49518c95590f9 SHA512 024c8cbc65b3bf4d3cba7f527bcf5585c5304c88508d03ff8cb14ffd3a10a666dd58af6db2fa58fad2b1d30ec9a1f03f31fc2486526ecee338dcf46aea8906e0
-EBUILD texlive-core-2019-r4.ebuild 11203 BLAKE2B 223fe9c011e12bcbbacbea22dc97a5d8633d593cd9ff38fd2376c51784f24c6cc4d9db8d12a0c1d87afaadef15c03d91cbae12ce60d64065e20db6020e83d700 SHA512 1100efaaa3bbfbf9609b2b5634457ef58a3613d595a73440beef7efa4be87cfe016b2d79fd0d2a3bc5c5a48502ae3f66501d610439fc7c720da8a85543f13cd0
+EBUILD texlive-core-2019-r4.ebuild 11204 BLAKE2B 58efddb7c26a18e262318e66ffee43b7c46bb89edef83eef0b571beb641549f07b5325142be7457196292dce4614af2bc81baafc3c6a814392d66e30a92f25ae SHA512 5844c2e39045b34361d8ecded8bfa1e8d570bf37aca89f1d7bc1526a85e04210316e6bc7ad8ba7bb059f72e14fb860d5fc20a5f98691fd67da19c46c9902f3e8
 EBUILD texlive-core-2019-r7.ebuild 11516 BLAKE2B 8d6bcc8f80382e2480b5dfaf9b5a9a26dec57708938f2e95f9ae392e0cabe7cd5b7c150ffc763eeacf2840c6c6e4fe90a2ffc5b70fff4cfae95879bdcfbd5591 SHA512 dd9638046c5b66227bc67562b49dad2469c33ad98990fbaed9ec95f7e3bdcb786610b64faf40a405dddd1a0498bd16ddb9099a3702a1e3a3ae977409aaa9a3e2
 MISC metadata.xml 661 BLAKE2B 23fd3817c5a9861b9adec9a78b6dcae0a23743cf685560a86a991896ed8f102fe66aa15a416939829c0c085cdfee24668f7a07631b3f4aeee469002f35b481e6 SHA512 c00ae9537fced06990a4ffff5fbe5101670ce1d84c879c0e9eeaf5c979107dd6a1f92f8f8271731b6c4818abead15b759fc9958ece317e554effbd3cb23fd2b9
diff --git a/app-text/texlive-core/texlive-core-2019-r4.ebuild b/app-text/texlive-core/texlive-core-2019-r4.ebuild
index ae11755e6dd6..5d83b8ec37a6 100644
--- a/app-text/texlive-core/texlive-core-2019-r4.ebuild
+++ b/app-text/texlive-core/texlive-core-2019-r4.ebuild
@@ -72,7 +72,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 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk X doc source tk +luajittex xetex"
 
 TEXMF_PATH=/usr/share/texmf-dist
diff --git a/app-text/texlive/Manifest b/app-text/texlive/Manifest
index f5da1f6eb9f8..a019470ca393 100644
--- a/app-text/texlive/Manifest
+++ b/app-text/texlive/Manifest
@@ -1,2 +1,2 @@
-EBUILD texlive-2019-r1.ebuild 7239 BLAKE2B 04b5a93d8994aa23f946e943855be77fd5d357311db5fad2108beb765a1dcc995b0b56d52832bad87a0569e74c3a8aece11f697768677811f1caed4c93847414 SHA512 336815e0ca228b8738944ecbd7ecc8e0320286b14fa5eaeeffa8f0133ca8aff51119c9e9d439fb727db44e847beaa888769ec6019ee7cc67363c6067e8debd6b
+EBUILD texlive-2019-r1.ebuild 7240 BLAKE2B d31813ebde231b62a0dfc744e76ed72be8c26bf7672deb404ea2073ab5ea2ede35eab605a33eda6987f41cc22804d86547f87d8bc0fd2347b8f92edd12c77933 SHA512 3e76b7a47a14938b3b0fc941d4b21c321c1e3b01fa8584991c7e443090f3a45ca5c0bcb5d70c9d5db3ae2c709191c739995af61bf3fd67e2421e213c444fcca5
 MISC metadata.xml 2419 BLAKE2B 2627379a58f80fd304b4c77ac3f3466520d8237458e4236d88ffc2b33a062d50e33a0f2cb07c6120abbbd27d0dd7d4aa79eaa44790280f719eb10fcfc230664d SHA512 e20c3f1c67f6250209b381aa21d827ee27006d6ba5558e913ce01ac704ba0d04f16b1c5b4666ed8833e6c744b7045276d98e777f3e3e1289dc33e861bc745941
diff --git a/app-text/texlive/texlive-2019-r1.ebuild b/app-text/texlive/texlive-2019-r1.ebuild
index f506a836ea8d..25489e9c0def 100644
--- a/app-text/texlive/texlive-2019-r1.ebuild
+++ b/app-text/texlive/texlive-2019-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI=""
 
 LICENSE="metapackage"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="cjk context detex dvi2tty extra epspdf games graphics
 humanities jadetex luatex metapost music pdfannotextractor png pstricks publishers
 science tex4ht texi2html truetype xetex xindy xml X"
diff --git a/app-text/tidy-html5/Manifest b/app-text/tidy-html5/Manifest
index 6ae0766bf030..9151635af7c4 100644
--- a/app-text/tidy-html5/Manifest
+++ b/app-text/tidy-html5/Manifest
@@ -1,3 +1,3 @@
 DIST tidy-html5-5.6.0.tar.gz 665438 BLAKE2B 3e362c8a22a5de827ec14110bad08985ff326c061043cd3cb0ffefd6b3af9a178197fca6a97bbb42b94760e530ec44646f13f6429736f7989effe52515580f21 SHA512 179088a6dbd29bb0e4f0219222f755b186145495f7414f6d0e178803ab67140391283d35352d946f9790c6b1b5b462ee6e24f1cc84f19391cb9b65e73979ffd1
-EBUILD tidy-html5-5.6.0.ebuild 634 BLAKE2B d5d851ab203b089e92d73dff812cad7c00734051e47979dd795a9959fbd7cb7aefd1d16063313381959c667662c6c178236a03b09927d5df62f9c85dc7937678 SHA512 1d8fc21e6d75565c686748d256187cb4f7387ade4a466737534abf5191bb7f89ed2b8e70c48167c3f284d58ecb6570be4e19b8381a8212f1f19e19d3a9d1c4b0
+EBUILD tidy-html5-5.6.0.ebuild 635 BLAKE2B cef7b01e0e1a5b54feea94b63b7d9724d5ad3eec1f597134036e4129a12016bf28ca4099841003c3b69336278548154f091cfd183fbcbf1a8070f2a5383e6dec SHA512 6e5aa9a5737eee2cb2073fcbf08c8b0bda764f0b9eb0acc943c8932bc3458ef0ecfbe90bc11c9bbed7d75eef076b521473eed33151028408e9fe54b058fdcd9a
 MISC metadata.xml 333 BLAKE2B 92aabf92af24245465d0e5b1f99faabf41cdb71fffd31b7fb1e8268c5d91977b44d3998ede7789f280031c80d70deb726ed201b896007d63fd0710ffbf8b120e SHA512 aedfa31a9188be8d3ad9ea8b278acf1b3e90f9b0c91dd63b00c19a90c6a74d16ee57d80810f39392564fbc1b782b35b6231a9b453f91e765296e5ec45d5c087b
diff --git a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
index 297866a59a6a..98dbc852a6e1 100644
--- a/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
+++ b/app-text/tidy-html5/tidy-html5-5.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/htacg/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 
 RDEPEND="!app-text/htmltidy"
 
diff --git a/app-text/tkinfo/Manifest b/app-text/tkinfo/Manifest
index 83ca7991561d..d904f1d2c060 100644
--- a/app-text/tkinfo/Manifest
+++ b/app-text/tkinfo/Manifest
@@ -1,3 +1,3 @@
 DIST tkinfo-2.8.tar.gz 56234 BLAKE2B 6351a8c3ee46092a5c46db147006cb462882cc9abec11f49f07f4f4b50888be6537625a0756a8f05837c21d769345e39837f650ad3a6488713adc304880a3674 SHA512 dfce278a1b33eebcebe3f6f9b5885a8c247f3181d154bc35d8b6d894f1f33043e9e40dd4c8dc336fa100700883295e8a648bece6f04ee556d4fa2f69adaecb76
-EBUILD tkinfo-2.8-r1.ebuild 576 BLAKE2B 8775b69546245ba882d10405a2c68008168c8800d11afbcc2342e2e0166b4187608e97df3cb31406587d59baa82c618baf7d13ef77bfb5fbdb75d2e379590fb6 SHA512 db60db2ae3495cf7195d83ba8d308d4dd268ff2b26daeb5414cdb34236505b30bd9b961e2295f342452d6786c5b3276a60531d2afa3de272da15f64fbca8c7f4
+EBUILD tkinfo-2.8-r1.ebuild 577 BLAKE2B 3f3995db234373b7619346b92445da1b2179eb2720e73befe88a8725b4d0ad1d48748d92586ec6dc51e3c8ed5465eb3f3e5fdfce09f6bdb13fe9c8a65216ea35 SHA512 a300d992acc34cb9e91e8a95ae13e61ad9bfbd44c3a727f0405b7ca24c2d1f6ade1627c0d3bc07fb33fc7b1cae5fa261ae8e65d4357aea6a0c11d4100a3477dd
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/tkinfo/tkinfo-2.8-r1.ebuild b/app-text/tkinfo/tkinfo-2.8-r1.ebuild
index 5be2e0b8d9b7..3285b5fd8347 100644
--- a/app-text/tkinfo/tkinfo-2.8-r1.ebuild
+++ b/app-text/tkinfo/tkinfo-2.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://math-www.uni-paderborn.de/~axel/${PN}/${P}.tar.gz"
 
 LICENSE="Old-MIT GPL-1+"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc sparc x86"
 
 RDEPEND="dev-lang/tk"
 DEPEND="sys-apps/sed"
diff --git a/app-text/tree/Manifest b/app-text/tree/Manifest
index 1785d02dca23..62a12d3c1dbb 100644
--- a/app-text/tree/Manifest
+++ b/app-text/tree/Manifest
@@ -2,6 +2,6 @@ AUX tree.bashcomp 847 BLAKE2B de05dacd7b54426e89e4afbbb6fba74376212a8f02995ff9ba
 DIST tree-1.7.0.tgz 47082 BLAKE2B 07449f50a44f857733679ae92a54a9dd61fe19b282f9244534393527d5f344835864e2acff3b2c43ed406d65657568b21440044af21fed2c4ab623e88d2e396c SHA512 b234fb1428ba75da72d7e4aeb24bf961e123332342593e441b29a0baa2270d12bb187d889c179d6463c940c8dce9fe9dffeb4ad3f06cf11f057b83234d7b4b4a
 DIST tree-1.8.0.tgz 50286 BLAKE2B 51a27500b89a46add6e792d446b465696d2b34339bbd06f03baff9ce589131b5d82c414849f891dbb79a3f3cfb23b89336e783ad23b84c1fb5415a13fb9488cd SHA512 3f657a6278ec5eab2fccab39dfd69bf9376811189a368b5e3213dc900b90a4e7a4961fc58eb80ad2efd5b40d2fbd0146ec59f30fe0bba576f93519214f240695
 EBUILD tree-1.7.0-r1.ebuild 1077 BLAKE2B 54aa6396e6133d47bbe177a90f26a0ade3067234f1daa7839d43319e72216231c6dfbd580896278600c82814bb9675855e2289feb8d7195d7ba714a747bbabb5 SHA512 394215eccd5bc26a4acdd444408b263438342159d188fbc719aa34024ed72d46f103bcf3eca3089c204c2d5da1b05ed7d88c89f5771a523601c6f3c2ac003723
-EBUILD tree-1.7.0.ebuild 1060 BLAKE2B f5eeeafe7a06591a692a8b7f8dafbcea1cf0e10c6f073227bdad412fcd9bb6295a946787d003a50b9e12645a2c135e3601a887851e8777bf0b3a1ee528445692 SHA512 b0ac7ae78f15da79c9fb9a7b622e4715ece42f6767cd1ba4ae4f4f4c46b059956e62cc1442b8eccaa090d5a8096620056a989d7b333af1c1c10e089d9a44449d
+EBUILD tree-1.7.0.ebuild 1061 BLAKE2B 288554aaa4b0b9b234cd73c12ab0bd93507cc49ad8339637b12a2b9bb3e18abdc75577760e33328b236a411d2640662aa051ab7aada3743b3e96de057584b63b SHA512 59d13678d50be58acd785e8ca431766f1815c328136393087a59fb813aa8f2473e478d57edd2147051b0378fa1083f67ea42ab4d1685a988b786beef5ac0ad87
 EBUILD tree-1.8.0.ebuild 1053 BLAKE2B d99be9d907d49d58263c444afa7954f5256f30446f2497616ea4185a5ead7c9cb00e6035151278282e02a3214dba404ea6f42587b159834e8b6f7dd14e52b1a5 SHA512 5747dbedaa6b5d4e6f737e3798d171ea26709b0cf0a3bb20ed1f97dd70da9414829e716948aeef77679ed22a8bc9617961c61a2c8607efc6a8a95cc4593feeaf
 MISC metadata.xml 581 BLAKE2B c8ec671fdf6834012120004fc69b9957364d6c43d6b6dcdd78d1c0a850976d669c4044109c6c08d818a4167be2582cf6b0d20fd634843924a86e031d5d0a8f2c SHA512 ca6717181a7ad2535be2384b4abb986c4daf7d4defc2b4e7d7487fe62b5209c31e81f86843168681debda99dabb6d2c0165b0ca0b154464f5eada572bdc1fe42
diff --git a/app-text/tree/tree-1.7.0.ebuild b/app-text/tree/tree-1.7.0.ebuild
index 403081c551cc..cecf18ce3cb3 100644
--- a/app-text/tree/tree-1.7.0.ebuild
+++ b/app-text/tree/tree-1.7.0.ebuild
@@ -10,7 +10,7 @@ SRC_URI="ftp://mama.indstate.edu/linux/tree/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="!=sci-biology/meme-4.8.1"
diff --git a/app-text/ttf2pk2/Manifest b/app-text/ttf2pk2/Manifest
index 7fb373d11328..b9d4be5e1d8f 100644
--- a/app-text/ttf2pk2/Manifest
+++ b/app-text/ttf2pk2/Manifest
@@ -1,3 +1,3 @@
 DIST texlive-20190410-source.tar.xz 53783408 BLAKE2B 8e34c7c2b74eab1c4d16ddbf7eddd8566593e6d68c42a2634760f11d86e68970698d8b9deddcf3297966968ede11ecf30e0b04ec19b708dc3e6d0a2abcc3799d SHA512 7759d8e668e53c0c73e48907096da9d8fb6384dd9c3342ddfb05e17d077054c5351d35256cf4e63a6da502de2f09f521979bede7209cdd5bd8ae80eba0efed2e
-EBUILD ttf2pk2-2.0_p20190410.ebuild 1088 BLAKE2B 64d3bc3fe7fec8b8d6b947d28eff0fed017060aa4aff176671efdf2f600e433fb28129c033c71f2751f1feb5aa4c0e1d9643983806cea2e236d4ff03627685c8 SHA512 1ca94b1f380c8d8f908d6ede4c7d613d296273b949626aa041deaa651148f87f99958e0c865316e6dcc78029340499586e6942caef5da03dd125ec21396a817e
+EBUILD ttf2pk2-2.0_p20190410.ebuild 1089 BLAKE2B 5b5029b5b30a1fffee513985ea7748a1e573e2297816e595bbaeea220ddb1163b05a5bb5d3ea20bca053f253db29184a2909ae04995c42e843328373c6e0bfd7 SHA512 3dbd27d7134a8b8e087a53de69ede547fde5445d626ced22b87b9a52ce75b8502907b14dce8e8a8779cb740dfa137a966eaeda27c1471c2a8ed722b35c1a889a
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
index 16620e115f19..6499ac50b3ec 100644
--- a/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
+++ b/app-text/ttf2pk2/ttf2pk2-2.0_p20190410.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh 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 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 # Note about blockers: it is a freetype2 based replacement for ttf2pk and
diff --git a/app-text/txt2man/Manifest b/app-text/txt2man/Manifest
index ed8f6c1181be..9693957c049a 100644
--- a/app-text/txt2man/Manifest
+++ b/app-text/txt2man/Manifest
@@ -1,3 +1,3 @@
 DIST txt2man-1.6.0.tar.gz 16941 BLAKE2B 4ca7d13bb61b0b65ff47a6a6f37c5035910804cff71f0c6d848105d7ee9b8285fd6433fe019fc075a5b28769df5044a462296ad63514d44a75abc1fa552b64ba SHA512 7ec2cc0bb685d890cf06504d4faacf7a02c5a321963effb71ff63b7310f64f092e666c055c1dbdb699958a62272fe4dc0f31f3947ca6895aa425753a11b75379
-EBUILD txt2man-1.6.0.ebuild 607 BLAKE2B 844975db6865e85d5c4f590b3e02ac40b46bc32b901691cdb66c91fa700370099b7cdbe3fb0cfc3e96aa9cb3741b635a5125155e2478269b023cc38455f139fd SHA512 10e24692220d46e7ff209be118b0852e84ec90d495c3429833417fd04d1170bc2d7a34d94c2c96b454c73e73169de6e4fdf4e4d7eadbeeadb22ef78b12a51b40
+EBUILD txt2man-1.6.0.ebuild 608 BLAKE2B c57c5d8a1999765314cc00b7af9395c384b4802f2f176a7ac31eae3986c5b41cf05409baa2338db64985a1914892040f69164e8772eb78b44ed8d0f02246a93c SHA512 8c150ded7941c016faf9f46a7ad7859471637c8cc4dda959205d8baa6c76a5530c3cbb286ed72eb277dc16adc51d548ad926c4b5d000f6943498f8c1c0c95704
 MISC metadata.xml 308 BLAKE2B ed6f6f83ed571ef3966c646eb0b58cb8e711f9ddce51fe8e97e0a961c5d2c88fbce7199308f5460005a393ae8b1854037e152d81290e97aba71465d96cc67159 SHA512 bf9580b121de871786c26826a398b5e0c5108b61da60fbbd797a6ff58360f7c983541574bddcf4ee8809ea0ca603a4bb1ace88e725484227fe810a44608ed51b
diff --git a/app-text/txt2man/txt2man-1.6.0.ebuild b/app-text/txt2man/txt2man-1.6.0.ebuild
index d429afa2f5a0..dd4ead777d8d 100644
--- a/app-text/txt2man/txt2man-1.6.0.ebuild
+++ b/app-text/txt2man/txt2man-1.6.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mvertes/txt2man/archive/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE=""
 
 RDEPEND="app-shells/bash
diff --git a/app-text/unrtf/Manifest b/app-text/unrtf/Manifest
index 966c2286764d..5783e59f77d4 100644
--- a/app-text/unrtf/Manifest
+++ b/app-text/unrtf/Manifest
@@ -2,6 +2,6 @@ AUX unrtf-0.21.8-automake-fix.patch 191 BLAKE2B ca81dbbebd8ab2ae786e6291018ecae8
 AUX unrtf-0.21.8-iconv-detection.patch 301 BLAKE2B 53d3125d59e44da9c539a13f76d99828be94261e61e367c3582da17cb8625caa75accdd38bfb59b6a7e15a3879ed8ecaf62df3ff26d5e757a86f963ef6c3094f SHA512 57d51baa1160b772896a7fa2ce88c5ea70110d2d7edf6cac121d86849e7352e34ff0cb684161ef9a68e96e886beb6072323c9a66517691e42dce852e04035ca0
 DIST unrtf-0.21.10.tar.gz 812696 BLAKE2B 3edc654feee461bb785877c3c3829462b9f55556e352bd12a19e426911336e161431badf5fdf5e00b0c488ca1804a0922ac7eb6980ebec58232112f6cf156f34 SHA512 31bedd1a23a052c1235e1328a12b346a0fe48b3f3cf78d72c068fe0d3edf18bc78f4c9dfe2f093ee8b4f3c79e923c6ceda49bc257d191dd5371f9273809343c9
 DIST unrtf-0.21.9.tar.gz 828590 BLAKE2B 832ab672265efa8f1ed5dfdcc73e310ef920199db57cc2be5303c7d0c502a15e7027cb9539ee5a27df66e2589d9dce88aac40d465f87d39770de9c4b5d886b8f SHA512 56d279ba8c8c20b8e39705dd4313c2b1607273d02ca2cdaeca5771bdbb3d99c338b816671dba1037961879be8ac6efddcd1af4cecb5c337f899575cae2989c03
-EBUILD unrtf-0.21.10.ebuild 412 BLAKE2B fa0e1bec3f02b40ae0012643cc3602dbcf2d878e6fcb7968ececd30d4a50aa3ccaa8cffb473ff3b27b3333c661403cfc991bf1a1a8f246f449a65c44fb905f3f SHA512 acb90f6f9347a43f67f3e176f6e0618f1ffb931aee804c65d7511bf50cf10f27cc7ed3d83cf36bc9ce62ce7f9f1305033bf91014ff0be6a3adf386c474e1d15a
-EBUILD unrtf-0.21.9.ebuild 735 BLAKE2B bccc2ee4512c901399b519aea8ebdf0d6de2a5dc6999d15ce2110715d5322b614d804d1815919827b56aeae1737604e848e92f71ca23329ecb788757734ae1e8 SHA512 00130f5ad9a8ea05bd87c1ae43cefe47a5842215dd69d3195fe33af033ffdef6e719b9945e8523189acebe78d2eaddacc1d56f5b441ff730048cf5274c656a8f
+EBUILD unrtf-0.21.10.ebuild 413 BLAKE2B 066dd08b7aeb5a78eb719744d8971180f194221b5ffbf838ab67f15f133083e1acbf9235ba1ec02f4e1cbb4379e181a967cffce023d1a33d942832e3f5b7bfa2 SHA512 5ddf262c897a89bd2d53758a32a1974a105883c6b4e155cc3586d3cf8d3c367f393bc86ed03604b3919c7bcbfb64cbc85c7040da003aad210968b897f32249bf
+EBUILD unrtf-0.21.9.ebuild 736 BLAKE2B 78f9915a6de3e44da937197b6ac28b4eea515b2f2ec7ebb799aa995ce100b37e0a64802061671ed6233a769fbac8686350f3afd239d8bc163d0edac5a531d856 SHA512 bc1486c6a68c450d8b588e2631d4e00110f08b6bddbc9224840bd7ad58496437f02a0e2cce443ad0d0f085f5d790e47fcbc9082411138d4b37ba9eb20c8a2204
 MISC metadata.xml 216 BLAKE2B 20531789dc11e43feee7ec315a0c1c7249fdf73764e29cb7d6db439826e9ff72f24a5cdb8eb7f1ab99bbb41fb6e4226874a1d1fa4185de52598602bb3b0479a3 SHA512 e881b59fe49746eb25ad66c258b41aba501e4eb563129093a3898ea970a20506e7898f7c355cfcf99605234962bf2c77c1309c258b9a2b84ee4302ccb71c9dbd
diff --git a/app-text/unrtf/unrtf-0.21.10.ebuild b/app-text/unrtf/unrtf-0.21.10.ebuild
index 82d08af27342..c60c51bcb02d 100644
--- a/app-text/unrtf/unrtf-0.21.10.ebuild
+++ b/app-text/unrtf/unrtf-0.21.10.ebuild
@@ -9,5 +9,5 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 IUSE=""
diff --git a/app-text/unrtf/unrtf-0.21.9.ebuild b/app-text/unrtf/unrtf-0.21.9.ebuild
index 39b505eb8e6d..53b0ef9ef425 100644
--- a/app-text/unrtf/unrtf-0.21.9.ebuild
+++ b/app-text/unrtf/unrtf-0.21.9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 IUSE=""
 
 src_prepare() {
diff --git a/app-text/uudeview/Manifest b/app-text/uudeview/Manifest
index 6988e2fc3f51..5ae3f7ca0be0 100644
--- a/app-text/uudeview/Manifest
+++ b/app-text/uudeview/Manifest
@@ -5,5 +5,5 @@ AUX uudeview-0.5.20-makefile.patch 822 BLAKE2B b7729d04f9b881924205efce8dbb398b1
 AUX uudeview-0.5.20-man.patch 3246 BLAKE2B 390d89a13080798b1ef0f902d92c82df59c10c6bb5b34eb8655ceadade0e31b0e81c100fc3e8908edf6c482c51c2560b90aaff8156b7ca805908036aa8342b77 SHA512 a940d6663563e7a91b35f5350e05b6cb7939f06d7db8767a8a5483dc82477c796a351cc03be9de49bd55513ca0b2e3203cd82c4b834caa54da9c8aae5750136b
 AUX uudeview-0.5.20-rename.patch 1736 BLAKE2B 820e32f9d2fd248ee2748e3f6173994b02074720814ec8adc6a896b72defc29ce24a356626c7bab414c516555547fe04cbaf304a52c9f141b80a836593c8638f SHA512 afb5b72bca70eb7c156584df1b44fa3cbb6cf07da97a79ff6330acb52ff102584b7a382ce779f2f695c9384d017984cabc670d31b243c0e5d916df19c6846439
 DIST uudeview-0.5.20.tar.gz 261574 BLAKE2B bd345144a87e2322c89e185d0fe5f31f1cd1ff8f73a5c5b6e585b79a0b319fcf349f2bb51f814a6d6a81e0e18271b5c37db827ba414007785b1743c64e5efe46 SHA512 d080e9c3940bad7bacd28457f21133056384a01e33ba014de42502d23f81f2c7f5fa7f6c472ce9f37bec2edb8e18d27135bf18426cf2f23188a3683558e1721c
-EBUILD uudeview-0.5.20-r2.ebuild 788 BLAKE2B 3b67e40bd88085a6182524f9f89a087c9ac5b3e8d9a8dd9425d994e2b6aaddf92a3ec6ae85f5549b1f2ec7966130a4e747a21d94f1f1df36c285efc58020bc6d SHA512 381dbd18cb9e1f8159f148423fa44d0e22ec4c1494fff3adef85162db362799ca1b9ec0c68d310f2b568aad6cfd536a6f954efccb32414642729e4b8cc7d87c9
+EBUILD uudeview-0.5.20-r2.ebuild 789 BLAKE2B 5899404408299e4a9c221de9a046f6d26e06e23b660f1d8cb0b131224288b4bbbc26db3baa802061f6115f17c460874663d7d98b7b28f1c0c3dbeca228a80e9d SHA512 3552e7ab17aa3cadfe7cf8a26e397bb5ade4789c69b4398616bfbe49a472fcf92d1070e15e0761838137e77749f7a303fdb02a93f97952663694625d60774df3
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/uudeview/uudeview-0.5.20-r2.ebuild b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
index d8c47f134083..1e0174e5eb8d 100644
--- a/app-text/uudeview/uudeview-0.5.20-r2.ebuild
+++ b/app-text/uudeview/uudeview-0.5.20-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fpx.de/fp/Software/UUDeview/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-bugfixes.patch
diff --git a/app-text/vlna/Manifest b/app-text/vlna/Manifest
index c4e4ae241eb2..ce1f31b8ed0a 100644
--- a/app-text/vlna/Manifest
+++ b/app-text/vlna/Manifest
@@ -1,3 +1,3 @@
 DIST vlna-1.5.tar.gz 146670 BLAKE2B a72cae3b276bb0673dca940d15df4ec0af8c292bb08b0a0ed55680d6893a3fbf80de9588bad4698c8c12f056a9a66650a63c100ea3021d7809f57cd2b9b09d19 SHA512 2416fd4183a5be495fa538d05bd8a7514265c4cb68d78aff6f2dfdd4b3c9abc34b6eb829e5adb6fecd20aa5d110ad77d9e0f56f260ac8ced3ea2218cb6cadee2
-EBUILD vlna-1.5.ebuild 492 BLAKE2B d90cb90f36e89173985edbacb0ff98b6c617406cb7e187f45f86a59243301a7330e76848e4c92048f7e47c4a17d68693b3b76f059fca688502caeb603b8ca54e SHA512 a2419dd9f45b0461569a94d94e9a392ac2aed4eb7a87776a3a54e4057337d6d8c179a8587e156b0b051c841f59ca5349749e7771c3bd4f35cb3fb90c2c2e7fa2
+EBUILD vlna-1.5.ebuild 493 BLAKE2B e7e595a592978021ecca6ddcdb27fb63193b00b05b1f3ea52e3cb70b212c8c6a3aea97b9f3427660e24708653f077d22af4d4ee2fcb6a86d3acf9fa57ff74ae4 SHA512 329f675f041c6c8dec1b8f5a82723c583671b339952a1fba854e4707cd3837b46433fe42638fafc399ac5f820c16a6d4a0b01a6a01c8449604e9a19e719750d9
 MISC metadata.xml 245 BLAKE2B ee3a163cfe0a4bc59c0dfb46f9ddb580e2d259b4d0e33cb4e684eb9e6d4b901bf97c6edd891f3b75a613a782f1b89318d0ee3ec9bee4e34c4441d9e8f4267678 SHA512 1653777623e2c15e1ce13229e396723b2cc9c214983e0f8592de98c01a31badc6c38c6735ed44f937d145883b43fb6f049af3eddb9ff96b18c96ccf8f67dd690
diff --git a/app-text/vlna/vlna-1.5.ebuild b/app-text/vlna/vlna-1.5.ebuild
index 303d7c68119e..86e36c2b64cd 100644
--- a/app-text/vlna/vlna-1.5.ebuild
+++ b/app-text/vlna/vlna-1.5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="ftp://math.feld.cvut.cz/pub/olsak/vlna/${P}.tar.gz"
 
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 src_install() {
diff --git a/app-text/wdiff/Manifest b/app-text/wdiff/Manifest
index ebb8becaf430..8ed196a8a9da 100644
--- a/app-text/wdiff/Manifest
+++ b/app-text/wdiff/Manifest
@@ -1,4 +1,4 @@
 DIST wdiff-1.2.2.tar.gz 1478567 BLAKE2B 80de7ecdd8fef1a4c9e6e0830e1af52d5087abc235dbe2bcf7542c0f017c1a21036243162fa6f70e714f3544d74e9a1add70dc22e69f306a17ce9bdd49c5bc15 SHA512 9272c225f4f61612197fe151cf8c913107169ac9fcd6c9f8472a0f56d9124d78a060944cea1b51489ca34311220f23638d043d43c733a3252cdbb7cceb1085ed
 EBUILD wdiff-1.2.2-r1.ebuild 890 BLAKE2B 6166cd255032106697bcec4ddb6d16241eec5bcc4acdea7a35168e53e562171d34603c2553d332a7d0b461e7a61935596abf05c0bbdae4ae7b0fd0f7f8f1e081 SHA512 c775b29778cfc4084f41cf7946b99124587d27204e255f85aa48e3fdfa79913b123246889e8ca0f030b85b2f1fd1e937fee63f559a2aa1f8fa25f5d1bc1dd8c0
-EBUILD wdiff-1.2.2.ebuild 853 BLAKE2B e729b5dbf7752805a08647969d011ae47269ff25c04119097159d6e3dc770d76ff35719aa59ac0481b9f87a96d0cf3547c2d4b94f79e5bd856688585efdd4e1d SHA512 56414d56a2ced3b215e565454ab9acc31c6e40a38b4183b364c2436c80d05307919f31c16e50829461e5af7ecaf27b8307c225fbaf1fd07c841af98332e69f7f
+EBUILD wdiff-1.2.2.ebuild 854 BLAKE2B ebaeb47c0a1fa97695847f765110786ae655580fc3f977ca897a5bae84ce5053e479b7c0ce6d3f08c570b2ffae8ffb31328041826db31212fb4c3d9dcce8c952 SHA512 63e82ddd3c9385040663b3bbc845ea66817dbc2512fd662704148044997b1d7647d27521f87992e8933089ff714d710f8391af096c7b248a9b2e81ea4df7491b
 MISC metadata.xml 377 BLAKE2B ddada9afaa9d6031b4493ad27870959d71c7ad7852399b36468f41c0c11dbd591e0809101927d82a4f80520562b1fb8b65d577086218cc922a7b0e03b761005a SHA512 675191d217533506137aa85c390cbcf2c9683157b451c862701b5ab59d3ca437266243af0cb458f7ee5150fadb444a7eda648091eaa8b4f7e211e0bd98d92c7a
diff --git a/app-text/wdiff/wdiff-1.2.2.ebuild b/app-text/wdiff/wdiff-1.2.2.ebuild
index da067814bd80..f630138cf21a 100644
--- a/app-text/wdiff/wdiff-1.2.2.ebuild
+++ b/app-text/wdiff/wdiff-1.2.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 IUSE="experimental test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/wgetpaste/Manifest b/app-text/wgetpaste/Manifest
index d45d9fb8b05a..f5a1c531556b 100644
--- a/app-text/wgetpaste/Manifest
+++ b/app-text/wgetpaste/Manifest
@@ -2,6 +2,6 @@ AUX wgetpaste-2.29-fix-bpaste.patch 1401 BLAKE2B c7a08ac708aace5fbafcd8de2452133
 AUX wgetpaste-remove-dead.patch 1069 BLAKE2B d11664112833cf72b3f0cfd338e6a3e7b41549b60dedb61915501f45f86d72e6003415fd30badb3820453c3b4c81829b34d5bbe501e33aba735b8668487f109d SHA512 edc121802218f7c32664d76e737195b50e167b8b86e62314bc5c818822ee8dca2807d0d38c81167c9771a9a2023ef507f509abed574bc5f1906fbf39ba72ee18
 DIST wgetpaste-2.28.tar.bz2 12448 BLAKE2B 231b6d00ecf9c355f45683d56537c0fe6a5d6561e42edee680b228f5a76e7e1b202669e429f7941b6daaf14682e5a8469521713930bb42387e168965acfccca2 SHA512 b3b9ee4bfbc52da6762b06c2640385eeedab7910ad1bc4e92ff9304371ec2442e2d30b69ebc0f1407a00a9c8afde398e00dc3d3c048452d730517227a68e6b97
 DIST wgetpaste-2.29.tar.bz2 12988 BLAKE2B 838b84632754f6e07c25fe3648e14bf939dff4e08ae8e8064e94008beb436f77738e4f54859115321fbf445a323641ebfecf5fd7d09bbbb46c72e913687deb07 SHA512 6596842733bb5d1d52cbb3cbcf61ba714f0cbfdc13acb4d6025ccfd27c214adaf886ac3a0a11baefaa4af3f33165619e5a3360b4e0807d29e8dc8ef5ff819bb6
-EBUILD wgetpaste-2.28-r2.ebuild 757 BLAKE2B b594c0b1a36f75cf15efd675e4e493fe5e3f79a46cd739d3da834a795ac84de4285e2bfd868ee6ab09924aa48cad1c0d537cc8fc8b0ba8dd483748c397b79b7c SHA512 3032579ee27278a160eb94be3ba56ceac8e7536cdf035a9240ea4cc7489462a8fed4cf1042f99ddb32c76c3ff884dc6e1a495336522d32deac4e3708f4dfe9a9
+EBUILD wgetpaste-2.28-r2.ebuild 758 BLAKE2B 7c57324b7c04c341aff9073984fbc0ed1af6216b69e40a1d5037423ff09d7c7428dfa2dbc4649c786c81f733855939ef460fd5881ddba962bb6f5bc852f8ec04 SHA512 740915208c76ddf913e19e8c6949d162ace407e8f22a6a2bb19520452e212b11641615c6fccf2d963b8ad42089c1ded1f523a402c6ce781cf20517b2e6054a6b
 EBUILD wgetpaste-2.29-r1.ebuild 765 BLAKE2B d79f0a29fa9723e71eafb8196ffb596f601c54b4966b9c35867b4ddc9650ffe20f1b1fcc7df65f39253721ee7e5800fbc8e053190c33abeee47c0fcb4b0b6a88 SHA512 d4d65e84ce13e48d056d9e1035dd036643b8c604742774ad2c90be7fe8325c2de89a2e9151976de9007f55856d33b1a293580a814edd36efb6a6f28e9643ebaf
 MISC metadata.xml 498 BLAKE2B 9442c088cf776d11e625be4466d161c7a2103fd34da4aad288a9e7b04297db23c2cf04745d533376fec8649e1ea4936ab27db42963f0e57623018add15182b8c SHA512 e312aefde50dcbe35325de6215d85d82f16d51beb3a5ff1d3e07c5408aeef66dd7a4ee7485cc3f795462429193dd977cb864b4f1ee8a280bb2e2e7f45e521278
diff --git a/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild b/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
index f1ba13c66922..44a8e2ee379a 100644
--- a/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
+++ b/app-text/wgetpaste/wgetpaste-2.28-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://wgetpaste.zlin.dk/${P}.tar.bz2"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~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 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+ssl"
 
 DEPEND=""
diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index 0be750094d88..b414a580562a 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,4 +1,4 @@
 AUX wv-1.2.9-format-security.patch 336 BLAKE2B 18641a15c75a32250012771bd8ca8b0739f503ef8d1d2eebe23f2d378996aa3f6e2f0cfa72f8077add3db33f8ece86c57e80cc5b868719472b45ba1bed10a7d0 SHA512 99fef3bec0f129ae2d138c50d1e3e9288d5309db87a72d9b1970d1d230e20be3469b423f0b74c5083a0a5cdca8fed0b2ca32ec1fefdca22f213e4a02a6bbd405
 DIST wv-1.2.9.tar.gz 616256 BLAKE2B 6a6aa6b5f87a934c703c8a74d85af3d7aa84dcd2bc613a3af7fb8d69a9339e71ba2618ae8f725b90c3fe0b0199f4b224bdb32a50c2b6b6614f84b6a14437633f SHA512 ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5
-EBUILD wv-1.2.9-r2.ebuild 1437 BLAKE2B 9263afac97d9e1ebc8332392d644ca3ca32098853a34a36fe8fda6cb0807eb96d06408ba12ad3f7a95c1bc46d3760429a5782cc652fc3d70210d584e180ab725 SHA512 d1c7e7fed27797c417b1fcd1d8aa3d738e771ec26530722d9dda5ed96a5a6a0f8a266775fdcd1853fdf731d75b260e301378467783a7ee79f9c62f3795d233bc
+EBUILD wv-1.2.9-r2.ebuild 1438 BLAKE2B 554e3b49b19d8a426ae806f30e493f71ecbbf811c134a1539459e8108269d1caa2acfa6256f868df084b6be4a9e8b6825545ee63ddc2c517a9d728bec3156a73 SHA512 1982600ec0779f53b4c107b12c003caa14b9f358ee81f1bc1f80b924cbb236edbb057abfb6d967af872905097915862f02264b3ba3bed3b99fe70cf07e43660d
 MISC metadata.xml 448 BLAKE2B 2ad03c8351da9b74d3420841cbb63aa4a5f8723bdd698ded80bfbc91f0d7bda75b0f2d671a74882e32f7f7e1b1e3d6bc4f1ff491132af931e5914b853b3ff854 SHA512 f6ed1d52b212ac06af826dea4218cdc3017d2d7e417f943bd14f2f223221da1d8a4401852e4fd8375195a77f4f10465d93b8ce62e3981c41570220b5699e4a55
diff --git a/app-text/wv/wv-1.2.9-r2.ebuild b/app-text/wv/wv-1.2.9-r2.ebuild
index 68d702fa29a9..ae075b68d725 100644
--- a/app-text/wv/wv-1.2.9-r2.ebuild
+++ b/app-text/wv/wv-1.2.9-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
 HOMEPAGE="http://wvware.sourceforge.net/"
 
 IUSE="tools wmf"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/app-text/wv2/Manifest b/app-text/wv2/Manifest
index e581cab0c4d0..0da70a12f612 100644
--- a/app-text/wv2/Manifest
+++ b/app-text/wv2/Manifest
@@ -1,5 +1,5 @@
 AUX wv2-0.4.2-glib.patch 312 BLAKE2B 7c68aff28688cf4ad7ee99c73d4509197e958bf05fc6dc8a556e2c2376cd586942778dcb8cbb1aa1a80cf24b1ab94415224b5af122756eeae02a316464eb6323 SHA512 0dfa6f75d9c117869eff3c4c5aadaf6096af8b2239626fc249a3df3ddb5437c417c3265a0a5d956af2241c9d7b3cc137b6c79598c38506fedd2964e85bcf54ea
 AUX wv2-0.4.2-libgsf.patch 425 BLAKE2B 417d6b340c34dffee0301308ee5a04f4468a5627670638399535f7336cca7515927392e66dd723e8a13742e71ccb1bf850c7b91608b7f280b545a707d6425a2d SHA512 634b1a336506777f8976b81cd906f8a896e2b777a3f04c5791277ed5ca2856dacb71adab807efecdf29d07c02e4c95b5d6fe143b1660be77e37ed9d7bd177143
 DIST wv2-0.4.2.tar.bz2 452759 BLAKE2B 6134739459617189f9d4e11a660dac25114b5d329b43d02fffe773d25bf62f2eb9f4ccb2712016e670c72f089a6d48f764e99b0ce5d44554d3e9d69ea9e14762 SHA512 7b4fb1dc6aa05da52ea169bf13f3bb544a7a896cf9127b6d67a08e991d798e81e2bf65724cf9396a9b89902f7856007006d8b123fcaaccce77e2a4668a9c9d5b
-EBUILD wv2-0.4.2-r2.ebuild 821 BLAKE2B 90e207ba4f3ac433eb1b55665859230f473ad6294e2b3b9d338bfc8408285709ca8cf23b894e75625d503d9132993de74f5744bbff716c5468ab83e6c757ef8f SHA512 ae933724c832942bb00e3a4930c3502c87871ad4d341352dab4c6b5b79fb49f65712913bec126af609dda55e69f7355c3507f3b6f50a3195c3a3eeef1600a75b
+EBUILD wv2-0.4.2-r2.ebuild 822 BLAKE2B 3a1c1e5e5293238456b46e0f7b211088e0518f4da082e4666ed736ea05102e411ddc7212082efc41b01b5910860fd198dbb13c329acfddfcc0c8d70d6ce3804b SHA512 1bd7632b93ce85b4ca2d373779f29cc9a401ce028f5209c32e5444c8f5f35cf09825af0739326e40e1d61a0d4f07527b825b3f6162afefaa396cda57f533d7ee
 MISC metadata.xml 385 BLAKE2B 3528b2f800f83faedd0d61e9842dcd95c97a6fd805beec944ede5967c6f7da198d742521c1d8a5202366518407011ce8cb2b4a6072b9aba2aeb5a5b9642be09d SHA512 700605145c4883ed52e8f5a2dbc230aaabbe12038006c31f784d2bacfa71f8942100ae8342d393a27fa74d19dbc2a6d9cdd829659cf7509182761ecfd4782408
diff --git a/app-text/wv2/wv2-0.4.2-r2.ebuild b/app-text/wv2/wv2-0.4.2-r2.ebuild
index b28db4eef3a1..10a5594f3e79 100644
--- a/app-text/wv2/wv2-0.4.2-r2.ebuild
+++ b/app-text/wv2/wv2-0.4.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/wvware/${P}.tar.bz2"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="zlib"
 
 RDEPEND="
diff --git a/app-text/xapian-omega/Manifest b/app-text/xapian-omega/Manifest
index a2f16125a85f..31734e477cd9 100644
--- a/app-text/xapian-omega/Manifest
+++ b/app-text/xapian-omega/Manifest
@@ -8,14 +8,14 @@ DIST xapian-omega-1.4.5.tar.xz 502820 BLAKE2B 3077a9a4fd177daa7f8470bea0b8dde254
 DIST xapian-omega-1.4.7.tar.xz 510644 BLAKE2B e2106b07a0ccf765dad25c3e83a745936156b002e638fbd9cbd1fd194f507ad663c305fc4981d72f92a74f645601aa83b1bc3133d10d8d4c308f28657a90a356 SHA512 e7e2c7dfa3e76ccdde103b34aa1b0732033e9f218346a81f1b0b865c6e2d17c356b96a4522a3a2273fb55eb2fbd2dd57e835368771f46c9fb458c0c11329893b
 DIST xapian-omega-1.4.8.tar.xz 521352 BLAKE2B 01d914c0dcd7e8a8cf7ec4b997af49c01883d83a5c9bd1c59da058d3329dab5f517bb4d3aa243a3e47ad36311acafd64505fda1ecf86d3605a38ef70760d8711 SHA512 5d27c03891ff941b23c899b1a293ed9be0129de08ff46156380638408360ea6e4aa2dfb4fe0ffb13726807849802fe8d19f6dc817a52ec5bf50c2bf94ed94c2f
 DIST xapian-omega-1.4.9.tar.xz 522100 BLAKE2B af1d01d918ff6b6355bd3ebdd28883d7f833384ba7ca53aa7e8affef77d71bc74602476ef7c6a8b11b67a60e0ff2e007e0d4da38020ddcac9d7ac7f2df4774d9 SHA512 3e784691c7de807a2eb9c00c97e03cfb7e66686d54e0ee572facad7bcfbdcc2c7aba4b60996bc56657a5ecabc79984e838b9d207cf6f1b7df1df90c108d17d1d
-EBUILD xapian-omega-1.2.25.ebuild 1264 BLAKE2B 27605dd5b1836e5f14399f08d3d65c64114a9a95365875fd33060ae5a9ef876e1fafd4dafc9d15a16d379fc4e05a45849cfed94e719056e130a5bb5f7389380b SHA512 86563482b4b14c4686e86f4aa216a2bedb615fe2dc695934041ba8f33b5bb5ad460f4fe6e9bfec81cac557cf267aae79b378569d6f0e6c84cf57badef1cca638
+EBUILD xapian-omega-1.2.25.ebuild 1265 BLAKE2B b4595ec9710097dd1ad51bf252ba49919794a71a721059380d7236fd55050d4cdece520c1af7adf707d29579fa00a141395d8a8ac861c8dd422c1a91516bb74e SHA512 d2294a786c6348c229c9faede8b827b61f11ba8add32c7e427af728bbdeb663fdd3fc09fbe894e3ce5e72377bf63f4c00cacf045370edf33582247b77efe557b
 EBUILD xapian-omega-1.4.10.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.11.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.12.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.13.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
 EBUILD xapian-omega-1.4.14.ebuild 1156 BLAKE2B 7678c709dfa63c30ff24b194adcbee10b9eacdb9fc8ab10820f761453e89e385767220852a586c3455858fc552ec58411f28b6e5ef3b9bd24bff86f1401f7f1d SHA512 f3da59ad5c6291ffcf3f84e56b98687dde6c8873af3f697a82bc69343c3b1691cb6afc57de69afcbf020305688dfb9a25d721a9ade0b10e244a3f7fbc6dce992
-EBUILD xapian-omega-1.4.5.ebuild 1152 BLAKE2B 1cdca6a87ec353a468a65a7dc5df903e452128c8df66930d3b7eb651963d211305962cf5b415dca9a56475ff782c4693aa34cd2a91e4d2a444e6a1d2f00b5144 SHA512 540c43a135aaab12509e155b188e17f768d0b9c50a4170f39a29d815532aea4c66c24c65af270c7b906321527f4795a06d325d87b0b67f51600a0da488408944
-EBUILD xapian-omega-1.4.7.ebuild 1150 BLAKE2B bbe0cb3e15775f23f40799de8ec549b9c98e0431d7f0902fda28fa1310dde288082916a79164cf34cb214a4e80c479055177381ec2957d88ed5f0f87a717f2b3 SHA512 0587dc11102ec089d71438ab2f8059f892b8b78d2b2add8a27220f09858096368e0d6c235c20885150101df91fda0422d5d63c82cbae9c14c22bd0f6936ed14b
+EBUILD xapian-omega-1.4.5.ebuild 1153 BLAKE2B 64534bb236faa6cfcd664ca0a36d3833e1eab8611295fd06bd0d9ef65732e6366da88d0dd88530c293fc31a5c230496faf29eb429712119d38819815c65bcae0 SHA512 84b18d740af8a36863c787c78194172042e6857d08b0ebe73b02c8fe63adcf07a76566332cb4b981b784517d787fc4733f517d822e75716f8a0273fbbe03acd6
+EBUILD xapian-omega-1.4.7.ebuild 1151 BLAKE2B 2cd97e938686e550a3443f494fbabf1d6bd9192e929e2999cfae6acfdf78ca8d3114fac7c4ac3ca31cccb146896c5bd122378e02d7af86e93f470f38f4ef9a5d SHA512 a5eccbcaef56781223718d38f85d0eb14c4ca1d64e3761babd4374064553ce9d3eedd7f604c3c35d5879b57516a57ad63932b91d5ee597c9e8a8dde6a51d47a9
 EBUILD xapian-omega-1.4.8.ebuild 1156 BLAKE2B 098b20d7e4f03036303c6a5e63692b0e90b8f64cd9c6c29699e91a4d3d0e795624911546375cb330e8db9aff0cf8962d7392990c1fee6b30c387897c7bd93caa SHA512 4132801108201759b6a7a32eeda1a0ed566c4d9e772df586e174036b9042679ea42fab1f5c80d0d7c8dff6dde4af768f54ca17908e352cba7950a3ee01551108
 EBUILD xapian-omega-1.4.9.ebuild 1156 BLAKE2B 098b20d7e4f03036303c6a5e63692b0e90b8f64cd9c6c29699e91a4d3d0e795624911546375cb330e8db9aff0cf8962d7392990c1fee6b30c387897c7bd93caa SHA512 4132801108201759b6a7a32eeda1a0ed566c4d9e772df586e174036b9042679ea42fab1f5c80d0d7c8dff6dde4af768f54ca17908e352cba7950a3ee01551108
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
index d818655ee8de..7689f5835335 100644
--- a/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.2.25.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/1.2.22
diff --git a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
index eb4d381967b4..5e4d36385d58 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.5.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-text/xapian-omega/xapian-omega-1.4.7.ebuild b/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
index 8b43090ddcad..062bc700d6f5 100644
--- a/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
+++ b/app-text/xapian-omega/xapian-omega-1.4.7.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/xapian-omega-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 ~sparc ~x86"
 IUSE=""
 
 DEPEND="dev-libs/xapian:0/30
diff --git a/app-text/xdvik/Manifest b/app-text/xdvik/Manifest
index 3e27884a4187..7aa9aa9a75d3 100644
--- a/app-text/xdvik/Manifest
+++ b/app-text/xdvik/Manifest
@@ -1,6 +1,6 @@
 AUX xdvik-22.87.03-freetype2-config.patch 1019 BLAKE2B a675a238fb147dcb67eda572b9a3b1e1b1ab630726464eb740240be0815b9a9da5e5f7a8a6d404648f060995c64efb02acbb67fc907dd6139c6817f0bdb5a946 SHA512 be5b7de6957c5bb2ad884e5b3a6a21f074b84b6be08f519b80a24dacd8630b2bc75dc64e225dba388d17a01bfed6784b2862db2e6bab4b73a1f6d4aebf23a9c6
 AUX xdvik.xpm 3125 BLAKE2B 97990fbd5b22e51319c3f55bfe16808b01f215a92185a170620c8c0ef1dc44906e38af48ad056d4fb40a1777f92a88afaa0f80c0b36e7dd770954f7009d261a3 SHA512 697c888c481d7cbe7b42980d2ae93a8d25d781f926970d9040f8fbc6a37545349fbdbe2e8c98fb686e5a5ebe9a7a5ff661793d3a264fd8641182b0397365517d
 DIST xdvik-22.87.03.tar.gz 4760306 BLAKE2B d242696fadf2980cd307d4a172d2af06d98d07b090279440117f869c9a623bcade8745d7a4d3c108c4eafbdeaadefb8d5ba1ea00bdf77d350cbf83c49c2ca0fb SHA512 d4d418d78658f16d4d278e387ed484b291afc8623b00acaf4110e9f123ed76568714ad50f80588373657f412e8fff36f3e76b3e43f69756d46f031c0f2269a88
-EBUILD xdvik-22.87.03-r1.ebuild 2773 BLAKE2B e41e55c20bc55ba501765713a55b9551c15581e8f0cdcdef2c81fd9273da99cdac8f7c82a57200aa500cdc75cec2975bc5d8157e7cbedcac9b8098bd902288df SHA512 dc696b2cd75490bd9ed7954b3fd78ca76b0a4aaf8cc1e63cb1bc2aee6db5d7c3fc3e899f4832154dc59050239c1a5bea08d01f2784a11103b0029ffdc7af5a74
+EBUILD xdvik-22.87.03-r1.ebuild 2774 BLAKE2B 7c35a990a20f6109290e2bffe5964265fd372360f0f40ed1950638be26d4c578ad54d91ff03d436a92c9b654d655c468648c649861d838c10b44fc043ccf4483 SHA512 bca78f308051bc8def5f7e3052f0f2d0dce559d4a258f12c952e70a7568e31b151a7518ffaab0b33119c224e0ad98023582f013f62e192e1c5d5b67daabd13a9
 EBUILD xdvik-22.87.03-r2.ebuild 2914 BLAKE2B d3b3b254214fa79a2a1e65aafa22e756d1b1155afe676a97ffb698f03938fac8fb0c5dbb96fa3918d1725bdba3575e5c84d886e51aadb7ca43c5a424bf3c55b1 SHA512 a535c091e8baff1dbac9eb47f81f2c7b29a0934073cd9858285a5d884759c664ca328f9e932547b6a8a4afa3058af90ad3d500eafdd00e11da3d7f1de5552b9f
 MISC metadata.xml 594 BLAKE2B 338b1aedaaf7426ed8bc2b9ae08e03f9fd6170b0714f938fc97a0f4555e8daa385635200bcbea4d0959604fad44db3212bd7436ac70b2e49ba353dd48713e7c6 SHA512 b1563a6578aec4be3df4b47c9914de3ad80a8859e60bce3a9b3e48f1b8bff3c38dd266523c913ab97bafa2c0804ab5003b5a449858582ef934044d80065c5cdd
diff --git a/app-text/xdvik/xdvik-22.87.03-r1.ebuild b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
index 3f2fbc15dc71..680c76c9f082 100644
--- a/app-text/xdvik/xdvik-22.87.03-r1.ebuild
+++ b/app-text/xdvik/xdvik-22.87.03-r1.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="DVI previewer for X Window System"
 HOMEPAGE="http://xdvi.sourceforge.net/"
 SRC_URI="mirror://sourceforge/xdvi/${P}.tar.gz"
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="GPL-2"
 IUSE="motif neXt Xaw3d emacs"
diff --git a/app-text/xindy/Manifest b/app-text/xindy/Manifest
index 00ba2b07edee..d3dd8d1dff0c 100644
--- a/app-text/xindy/Manifest
+++ b/app-text/xindy/Manifest
@@ -3,5 +3,5 @@ AUX xindy-2.4-locale.patch 679 BLAKE2B b67f436e0aa67b8474336bfa1f70f6da52199871b
 AUX xindy-2.4-nogrep.patch 431 BLAKE2B 97543e7eeff2cb4c23c8b9cc0d5673fca2c3f682553a8a3d25bc39253a371320a2a423fef63294be32f5c36b5bac30717766b3a9a4c75663535ce0a6bd8e13bc SHA512 fdcc109b89a6e56c86624f348ebe1c98f574b9f788e3f307e3b110fc2b93643af087e16711b3f0bc6604dbdcfae06080693e4976d8ebec5816e68fb73f89fa6c
 AUX xindy-2.4-perl5.26.patch 337 BLAKE2B c869adcd80cc93bbfe46a385effab94a920f3fb76441c653ea269962071ad5f9269961caebd13d6fce38f3f4dea485291b510db6e884aefc5edbd22cf4b9bd4a SHA512 3f3abc9654e3c7c9de12a542241e107d80046bc26d0eed336e046835a221ea190d526b37c85f91b722e6cac89f140e38b0cebaf208a2391d8d7a42a2ca4b8459
 DIST xindy-2.4.tar.gz 498024 BLAKE2B 67cc7f96e4937e8130c66449226d581f121e7b06a82bde40f3f880e48e48e49805856e39c7670a34080731168ee7386beffe52fa6c3e8142a3d66f4c7ebb8ce3 SHA512 d718954c0c9efcf36dcc99518542b45b3fbbb922b98989c56feb542b00944003adb5834656add0aa88b1983f98e1d9d76e5355aaf9e6ad39f3e0dd109a18ade4
-EBUILD xindy-2.4-r1.ebuild 1001 BLAKE2B ab261500f7a94ab8c5986fa8552554af11c4ab47598e2c08b0e6ee52f1d6c4201f480579ee079fee0dddc373c827c6cf7a42a3a35af6b3ae7772a9d39f008b31 SHA512 99b6fda7294d8291f6ffe1c6d8335f96572f9b715530421c89091dbc26d3302324df7cfbfd35c541e18f4a0aa79609f296ce67413f5a4831af3fe954968acb86
+EBUILD xindy-2.4-r1.ebuild 1002 BLAKE2B 705b690e451d3ee89ef9592e86d011fe82bf3cc3e252bc4e242da3741ea5917450f7a00ce1bdd2c78e827611e5594b889b8b3c69e00d71d3b8baec16449f8dfd SHA512 2d639e4e006a329524fc7b2c3e0e6e18232ef2bc11414c49fadec626142e4b7bdbd477e63184cc9e9f597d2c31ea45a6a3622db25f1535b393ede417b5777256
 MISC metadata.xml 1118 BLAKE2B 1bb41c8208737b0ad0d3545143cedd0b70aa2cdf632905f1572ca2c2aaa2eb35e712eb5971b4e4bd8a66a3130ebc1f21c8d6ad194056fe5a1c15c522e1d57219 SHA512 ef09dceddfc91214cf575c58f9ffa8f82ec10bfa7274caec809a00c83b9a07668139eca7e420e04c5fe38bbca9084bfcb6fafd10bc91092138726dfa1dc4cced
diff --git a/app-text/xindy/xindy-2.4-r1.ebuild b/app-text/xindy/xindy-2.4-r1.ebuild
index fbfb484e1482..4b4178e9ee2d 100644
--- a/app-text/xindy/xindy-2.4-r1.ebuild
+++ b/app-text/xindy/xindy-2.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.xindy.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc x86"
+KEYWORDS="~alpha amd64 ia64 ppc x86"
 IUSE="doc"
 
 RDEPEND="virtual/latex-base
diff --git a/app-text/xlhtml/Manifest b/app-text/xlhtml/Manifest
index ad382167c7e3..9b102e6cdc68 100644
--- a/app-text/xlhtml/Manifest
+++ b/app-text/xlhtml/Manifest
@@ -1,4 +1,4 @@
 DIST xlhtml_0.5.1-6.diff.gz 119282 BLAKE2B 032ba3c27a8d1d8b3b0bc40b30d137ff03f6b3d2d6dd0cec00203d705fd70fbf926e737536829e3aeeb3592a157402ce49c0754e5b232df3d28aee046141b5ad SHA512 f1f4bba58858e6033f164e689333904887b7cd60bf082e2247e7fe0c54f3737e72aff6590deefd1d8a04d4b25d27631664594c50c9cc4bbdc8c9b20c6ccce7bd
 DIST xlhtml_0.5.1.orig.tar.gz 263933 BLAKE2B 88d08e4e3dd573136f8a7ef27038b80bf8dde14f648e200f1673e1a83ebcd4ba085f3073d51f0473e5ca45e731414bad5bf00381dd7c56b369311cb6473342c7 SHA512 9ac1cafd4496293cbc5ca9109a8d467fab6dd24c1daa91754b7f49502e2607272292b8bb9ed876b21fe1b287ef3293a0f6c5882c18a18fd715137c27d63f9f01
-EBUILD xlhtml-0.5.1_p6.ebuild 969 BLAKE2B f1a7ff55f6ec192c2ec329951097dc35f0907b228cbdb61f19d9c25c663882125af1244ae553a1e5fbd79ffd3dc972de5387ebfbbc4a6e298768c1c05181596f SHA512 7041a06c8a35e5c268e0ee4377cee1980a4f812184dfa27ebbeb363f845fac4e15f01799627ffa229e335e70979681d49db5cfcc022615fa921adc07fa45e178
+EBUILD xlhtml-0.5.1_p6.ebuild 970 BLAKE2B 660b453789bba2089fefaa8ef347377f818522022f9d42b5cb83c6e69d5c972e4ee854b64ce78e5fdc96128fd1a54cb0fad3dc020f47fc1e4c2f056de9617387 SHA512 c1b9ce5c43152564de69c29dbbdebc844783f2cd7d8f762db77c37a8ee3c80c37448be629813e3f315fd7886133835d6fb8bf1cbf63fee285dfe245d05eebce3
 MISC metadata.xml 249 BLAKE2B 31251b3297cc7eb5625140690803a9f0f7471c492eb02f10594f5031c5ca133bd409f65d9285644c6c3fadd1af1155a4946d0935feba73a3c90c4d95f60889fa SHA512 f6d4ee96a09d5be353d8965ce7944db541bfd6fbe75e2a80dd660993e36250fe146c30ca914667c0d09ae3916274295661f2a6b0b1bc1c2fcc0123a7cde2b3a6
diff --git a/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild b/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
index eb983af44ba3..ade3e740825e 100644
--- a/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
+++ b/app-text/xlhtml/xlhtml-0.5.1_p6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 S=${WORKDIR}/${PN}
diff --git a/app-text/xml2doc/Manifest b/app-text/xml2doc/Manifest
index dad5e21718dc..589f68d9542c 100644
--- a/app-text/xml2doc/Manifest
+++ b/app-text/xml2doc/Manifest
@@ -2,5 +2,5 @@ AUX xml2doc-20030510-gcc10-no-common.patch 195 BLAKE2B 3c90b98f57ae23f78b586dadf
 AUX xml2doc-20030510-makefile.patch 2661 BLAKE2B d9822ba57187553ae6da3f2b3f146bd3ae4316a99cb9608d88112a18462345c4614e167bb3757a723b6a12e2b521f1a2fb575ef19db480ed45fa60e133297c38 SHA512 c5aee7f9b98f1c64345459cb3ad6132082c04020a56f39fa950584689953c1058564332351a5b51e130e077fbe15c08ea88f35504888a153bfc878d8210b8b00
 AUX xml2doc-pointer_fix.patch 627 BLAKE2B 3ca9313b44d88fce3f548874d40ed57b42b9faa66e30574677c911f7d5c9d0a8d5eea8c35781162302543df82c5b38b1327fcaabee0a50c396c95937c3a86e44 SHA512 ebdf69986821fdb1a22e3da4447729433d7f30d08e516b5b28c1f9e4fe6ec98d7a31e925028f940e8a0aaab5c05bd52a1a4d12564fd47a79953b1de606fd2430
 DIST xml2doc-20030510.tgz 53307 BLAKE2B 3f7e44ede6ac0a2ec4762e66181de34ffe553035b54ee302345d1b38a5063106fc4ba65abec042b4ec693b173d70fc4b548ebc942b2a8f6636f84e7beeed2bd6 SHA512 9eb2970b7adef1669b9b0aede2b3d2b42ba234c8294f0f8e6e230d8fcc6cf878675b2f0bff87ee36a255ab29376be844d92d382be7aad0ab11972847cfe49dbd
-EBUILD xml2doc-20030510-r1.ebuild 1010 BLAKE2B c66afdbad87d601f358b7fe438c4f483833c4b84f38dfb12ffd904ca9d3594c3eaa9228b19af46432b0583c879cc8248f83ed74d6a9c161c6f0a0e0ebd7e2c18 SHA512 1b15699e2cdf8ed954631369a4f83683ff0d0c86a23a539494877704867c90708bfaebed4b0a0966c8c61a2aa92e4078727e9df3ffff28d990264f193050b649
+EBUILD xml2doc-20030510-r1.ebuild 1011 BLAKE2B 4b5214bfa4a90b1847687f819f3ebf684894e708ddc68db4c28c87da3985afff69712a20ee3a868180ddf6b665c32e07d46ed39f29a512fcdbe20f93f974db2c SHA512 92ffcb74053d0f87669ae2d5c6d10e5dffcba368478e2358f36fa6e8edbd71cfa67e269af963c33aec1df9d22534470dfc82ccacc1dea2898a6bba31b76c0717
 MISC metadata.xml 244 BLAKE2B 6c0f152456a096c4bfbf861d8d7db04d0b8c605deb5f9a3277cd6b60df4a714c77bb12d5e4a491a193da11883447855986468ecf5c707600febbed973253181d SHA512 b4abe1dd13476a480e518e284cb832c2b41893049169975ee44edba8661af79b7cd8f8110e03b920fe90cd8e0e1d926bd5a692a24ecb841bd454659de3422ee9
diff --git a/app-text/xml2doc/xml2doc-20030510-r1.ebuild b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
index e4a387e503a4..6dd7a88b09f0 100644
--- a/app-text/xml2doc/xml2doc-20030510-r1.ebuild
+++ b/app-text/xml2doc/xml2doc-20030510-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 
 DEPEND="dev-libs/libxml2:2"
 RDEPEND="${DEPEND}"
diff --git a/app-text/xmldiff/Manifest b/app-text/xmldiff/Manifest
index 751fc2169ca3..2e4e6bd84eb7 100644
--- a/app-text/xmldiff/Manifest
+++ b/app-text/xmldiff/Manifest
@@ -1,3 +1,3 @@
 DIST xmldiff-1.1.1.tar.gz 36429 BLAKE2B 2d84a1552851b0964ac837a30c61a99a3360292020251aa06ed71723e89b6a8f89a79107c69a317b16d810ee74241d38837d382b0dcb134b43f72f58ee2b6ea2 SHA512 cf65bdd827b76781b693089b8742f6358931456c4fdfd0f4b2a9e13b30101b48379ea9c2bf3dcb32d6d22198769262f2603172ffa877bec2ddfa5fabfdf74326
-EBUILD xmldiff-1.1.1.ebuild 629 BLAKE2B 63b443810bd6011d3119d42c61f7a9eae6a9616f96b2bccaf7c6448b810acb0ae7ea7750f9fa9bf6a846fe68f22d0cde61170136ece48023a065b73e756bccec SHA512 f779583cdfd312aabd74de0ee00f567a6f5a969e22f49efc468735d4a35e61595a23a63858acede25844a88c1c20e1cfbde154c690d72f0f02eabbe6e3476d66
+EBUILD xmldiff-1.1.1.ebuild 630 BLAKE2B 54cdaec6d22306598319ee4189092065534fa9b1d007bd3c1d380b434922388820781823594eca0c2b0153c5f0063b0d1ae972e920abcae4c0ac77a13127c003 SHA512 a264985f789e9e6d7f5f37663eb35e431aa1dd2c8f769c30823cc53877d26155d5dffdc342dda1e72918c0e621441a760b13104967ad07363ed3325b137fd0b3
 MISC metadata.xml 578 BLAKE2B ae500988e52962a46d0c79c948a163f7d3414c230d14ae344d33b09979085cf400ec38e911fe54f71da6035f40a795cdb9b70ed2c3299b9e37d0e6e3a77fcb7d SHA512 09529a22484d9b660b11b70137cf7e113ee07af4de0c58247d9f6dd7c9e85e222111b209b71dcdb342e734897fa0243b5f9a83688fdbd649584fa226a36acefb
diff --git a/app-text/xmldiff/xmldiff-1.1.1.ebuild b/app-text/xmldiff/xmldiff-1.1.1.ebuild
index 16880e320495..c09c04958826 100644
--- a/app-text/xmldiff/xmldiff-1.1.1.ebuild
+++ b/app-text/xmldiff/xmldiff-1.1.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Shoobx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 ia64 ppc sparc x86 ~x86-linux"
 IUSE=""
 
 RDEPEND="dev-python/future
diff --git a/app-text/xmlto/Manifest b/app-text/xmlto/Manifest
index fa2fb2315101..08256af93523 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-r1.ebuild 1513 BLAKE2B 3c483fd0b679631399c05f9ab464f994585c6a67e8f6424fddef806c8923d49ef9fe3e0b24f704658fa9c9cef022a9ccd572f02e1e30c36fced8b6897b66d2a6 SHA512 1aa034fbf1930bbfd6d3ef2be1c5452185c7a0a87870b67e9a2107fb65c7a1ec47d0688f264ff7f2bb4c5cb68a91f6665b676a517a6a3a760a7da3c2d389a41b
+EBUILD xmlto-0.0.28-r1.ebuild 1514 BLAKE2B d17e85741ebea1caed9ba4fbea38b888f1906d3c0efe1d4bd538e51dc7d13ec36f65b192ea5fb5de66821210c6be769317e01e74fea54c6f47300058cbe04103 SHA512 d7ccfe10d74e51952963c13a99b77204ea6707cbabe40c28995dbec3ecac5a28883b57f63098ed84af55b754524462240af4c2d47c8e468a8010de402162a115
 MISC metadata.xml 247 BLAKE2B 17c173af66eaa7e25c4a88ae4e5b8cba24cd1f324224ddeb95774690a862c678f2c6c51cfd175aaa3781efa83d0526c01883b7888cba6fb9ba8f62b9bef5942f SHA512 f2b92e9bda8e4466d98436c15ee46b2a382afa4bfcf868678bb245abda936298ed41d03f3dcf5a61000ae1b1031a5578635e15293d63c531773d6a42d356af47
diff --git a/app-text/xmlto/xmlto-0.0.28-r1.ebuild b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
index 7db02ef37d17..f75f3368c3a1 100644
--- a/app-text/xmlto/xmlto-0.0.28-r1.ebuild
+++ b/app-text/xmlto/xmlto-0.0.28-r1.ebuild
@@ -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 sh 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 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-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/yelp-tools/Manifest b/app-text/yelp-tools/Manifest
index 0e31e047df46..3520f40898bc 100644
--- a/app-text/yelp-tools/Manifest
+++ b/app-text/yelp-tools/Manifest
@@ -1,3 +1,3 @@
 DIST yelp-tools-3.32.2.tar.xz 211668 BLAKE2B b45aef4d03f1954ac33bb05a9c788af40a74d76b54c2a0bcc466098e18435e02eb40004465dda399eb74e986caf404e51a393974d37ef1abeff6d76289840ecc SHA512 c9383426b854ae46ff4587bef07955541de3026f845025f9e99ba095cce11ff307e23d00d07a2da8763bcb6f9f061fc610351170e2abd99b5669912463729a85
-EBUILD yelp-tools-3.32.2.ebuild 631 BLAKE2B d97b6eba684eb8f3c7dc3bb7663a724b37dded1b90f36584c638b81b8d2c044a4c8b062defe1864f3e353c93bd60a9d56f7bea5604ea9b807e396540136ce3db SHA512 4b6fccbd5abd2eae1302f82abd5617c1d5855a627c088b1ae33a37149382728c129dff8eed0225c5ed4e4073dafae742b997b4c42c8df241a2e5930bdd11b106
+EBUILD yelp-tools-3.32.2.ebuild 632 BLAKE2B b48998fcb5ae9bcb767e99861f133de88f39f24c28f4e9b6fa2090c4f96814675481acd7110824f6334922ba7ea511ca6b4ad4fc7d4e9730900cc5db54391af2 SHA512 3dbc9c96cac8067f38ec853a256064c11e6f2c1e1e83654616e704ba4fc965893ad0b7b1f06ff770138831ec4ac82141ac3581a46823975a15703478d5ceaf31
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
index fb87f22c263f..c382ed87f3c2 100644
--- a/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
+++ b/app-text/yelp-tools/yelp-tools-3.32.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Yelp/Tools"
 
 LICENSE="|| ( GPL-2+ freedist ) GPL-2+" # yelp.m4 is GPL2 || freely distributable
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /app-text
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)