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-misc
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
128 files changed, 523 insertions, 385 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 3a49f9dbd445..7990eeca4e3f 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/abook/Manifest b/app-misc/abook/Manifest
index 4faf02d9d939..20954ae2afc2 100644
--- a/app-misc/abook/Manifest
+++ b/app-misc/abook/Manifest
@@ -1,5 +1,5 @@
 AUX abook-0.6.1-tinfo.patch 531 BLAKE2B 8acbb9fc21f2e78c508a1daa481d626501f12d22bf815b2663415d624a1a5e31e378cf6a741bd2a310898dbe6c18fa88137df238b760b0d5aebaa4f695cfc1a6 SHA512 1e0b7e3c2134e39b2fcece60a3c31927a6c4bd1049c9f14b1ed3426111efe035a433878dcd965bf1a3756daba75ebdf6983c0cd777bb4b1a92e62199a16f10a1
 DIST abook-0.6.1.tar.gz 319558 BLAKE2B 9d750d97aac2336f1de22121035c0fc9c4707d970976f95890907e5ae2ae3249f563dc45fb34c32c2a5303a9cdb35256dc4581b5759058e14486ca2a7cfe3cdf SHA512 993895ef2fd6d98d50db610699f8f0a28112778065ac56484373eb814afd8ab7371201fc21506c090514f4b29570ec229dc62c606ab068301152567e2c47fe66
 EBUILD abook-0.6.1-r1.ebuild 943 BLAKE2B ac67f194aaff7772d4457da67f5068514fd8801e6e891e427e569659c36d716b5fdf708361f4178f2ea6794808c17ab6789982e4a04946c1d440664d26d165f6 SHA512 50aaabde17ba2d54718fe219fbe8b87d7feb9db3a84d2195be7dd847302dbf68b408df5affcd6c1e264fcefd0f904b0db666f514500c3ae7d5b5fbf4bad0af78
-EBUILD abook-0.6.1.ebuild 961 BLAKE2B b9c6b2f4019cfaeef68af15c009553e5c874f9fa460059ea0a9bad6d0edeffdf5f5c2ef239542135848e9a958d5d9183f8696c43d67d0cdd5875bfab3f24115e SHA512 e79e18762afecda642e07011ab4cb2cdc9ff52903b28648b77a8fbf5abb86f0779fda94ab5a08b1e1c471956b42abf4a074bbfb006268ff1e282a1418ce0c907
+EBUILD abook-0.6.1.ebuild 962 BLAKE2B 5bb281a4eef7093b7e48cd86f4eb8cecf074104f0881b59cd784a6245cc38b677466aa0f17541b6e6afdf662fe6962353031e73e8f413e9117de0c84c53512ec SHA512 cb343d27380c02f1f6174706adc9e0694e02a162e1a5330694fe041e73d0ce9877f8aebbcf7d4f476d97022fdf3a9caee3a3513eb21134261da38a77e3bfebd2
 MISC metadata.xml 346 BLAKE2B eeb4ab910846e474790ee173c5e0f614fb075e1caf8940eebf996e21da8475c717f26e083b78688f90cba3027196de8d54e2fac3693e01201fc5fd62afdb3f02 SHA512 2c3e1bc6f955a54ff62cec0b321b317441bddc8ce29ffc978bf1390118c84c7d250378f71d1fa7ef451ca3b2eb49d0dac2e9d171afdb84519a2a8cd2e3e83814
diff --git a/app-misc/abook/abook-0.6.1.ebuild b/app-misc/abook/abook-0.6.1.ebuild
index 63f75d43f870..d286eb2e49ff 100644
--- a/app-misc/abook/abook-0.6.1.ebuild
+++ b/app-misc/abook/abook-0.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://abook.sourceforge.net/devel/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE="nls"
 
 RDEPEND="sys-libs/ncurses
diff --git a/app-misc/banner/Manifest b/app-misc/banner/Manifest
index 1e7276d1e123..87e3637b3e05 100644
--- a/app-misc/banner/Manifest
+++ b/app-misc/banner/Manifest
@@ -1,6 +1,6 @@
 AUX banner-1.3.3-ctype.h.patch 158 BLAKE2B efdf872b1d26d0bba8e3886b406e1642968aa4207c5d136a8558da37f5fd51113a5884a900584f13c98200471aea2e7ecaf61e97efbb63d244c31ecc1fa0e8ed SHA512 84fa0555f3fd6c41c3cdf06db92711e9be4c08e32b182ffdcd1385cccdf0d9056a7e3c61431e4a73d660b3314f763ad7e109f0b84105bd555e0c5d60a63746d8
 DIST banner-1.3.3.tar.gz 114237 BLAKE2B ea9773ce8b65ed7deb5ec377b53ab974bbb4760627788b461f5715b15f99bcde25e2f58f7fb69d937ede30de8f87be7eabb662a05c7d8c574df298446ba21649 SHA512 38f16f2a25bd7fb270056ebe43691c989a808891ecc75e4f794456d1752a07002efb7ba7b90a2000a40704e6b6f11760b47a3fe59deeb05ff3578f0d982f7d96
 DIST banner-1.3.4.tar.gz 120537 BLAKE2B c50952b7e4f73b896ef204914479ffe7c2ac2ec7a0d979f076a0134c3cc6280d01be448f08fe3914cca4b144798c1d9a68042826ec81f55353596be1c3420aa8 SHA512 c98b4b690e73d04fd9731a291e80e89b234f1af47541fbb2eb9edcb987a7c029485dedc1eef6a479fe4f876cfd4d41b090bf6c3685a8c54e4c658b76cc9cec20
-EBUILD banner-1.3.3.ebuild 482 BLAKE2B 32e35eea88537f8debc7d9da68315444f2574ece0057444fd552fc9ff4712b82634f56b8f1c2b22380bcea80ab680e9339b890d024717b695586ef78e33bb355 SHA512 5a472bad37e23953e956c2cee7e2bb927d031dfd09101f651c9e73b912ef3277db1eb917c2ded63b6f1610814e5b7da15d12189509fda3910063d263119312d3
+EBUILD banner-1.3.3.ebuild 483 BLAKE2B 73acd7f922cde8489b39549f9ce05bd991ace4bfc22cb41fdadeddbb3871a0205da22e2695947626f2e243d7eaed6ae819c4db8e494d591f29769f334d6a5981 SHA512 96aed1ca715b11ce2abee1438419d22f0dddb2316ddc29ff7903f576ac98aa73ea2c558e5db73109ae660bd519230d7cf771a4860627060bc57b2a78411594b2
 EBUILD banner-1.3.4.ebuild 465 BLAKE2B e92722257e58e40f51b81c532f87b3d1ee54ae3d47960a99b9af43009c73d66e76ca76158bd19082be45905f750404f799c0d5cc85165beeebaf6f12098d160f SHA512 df7059756b4944436d444cea7e04bd9bda43bae7d68c33238455cad4327506df3039b95a25d717bb16635c736103fefacdfe7d05b312240f6d11662198569a49
 MISC metadata.xml 276 BLAKE2B c4cbc92f4cc708c8a571df5735be5dc6d3b2b9d882265fbf398ca38a7c685a9da8d647e78d05a85edae0568f141b065edaa6ac6f6022106fabb8126740b1c60d SHA512 3497963f4fb51bb32521472b54a995091cb457d2cda65c786bd4b46e5af325caf8f6d5c969cefa0c09fe717df09fb015ec59b52f5571c3b2b9d4ea33e6c843ab
diff --git a/app-misc/banner/banner-1.3.3.ebuild b/app-misc/banner/banner-1.3.3.ebuild
index 952e978f5c03..35fe602719a5 100644
--- a/app-misc/banner/banner-1.3.3.ebuild
+++ b/app-misc/banner/banner-1.3.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://cedar-solutions.com/ftp/software/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 
 DEPEND="!games-misc/bsd-games"
 
diff --git a/app-misc/beep/Manifest b/app-misc/beep/Manifest
index c70d0923038c..d42f76956ee6 100644
--- a/app-misc/beep/Manifest
+++ b/app-misc/beep/Manifest
@@ -1,5 +1,5 @@
 AUX beep-1.3-CVE-2018-0492.patch 3292 BLAKE2B fafed7dbe65438869adccf674b19c4e5b6655dca794043bbb9914879fc8e9bb6eac67b35254f47ec61a9ad5147aac6b819edb3fc8633e81c79d555023a422147 SHA512 e7ba3db3e70d2560c2a8701d9424db43a2e94988728b84bc84c5e6d777fc1e0596d767470fca41774a104cba9d2e58ef59f6449570c3d3887c1bf97861bc5bad
 AUX beep-1.3-Makefile.patch 516 BLAKE2B f69b5907e7a1342a574bedc273e609415e5853939aa694894c732333e482f2507462748cfb9ba1f0945f4778653d44c3fa04c4aca3eb78afb7152597beba759a SHA512 b21f788780a13bbef436b80ec020b8727b9c1a8ddac3552cb8bf05d7ab937851d05d72279b53b51dd0ae1f99e44f55caa494b7e61b59800d91dd186497b65009
 DIST beep-1.3.tar.gz 19344 BLAKE2B 4f9cf12f6983eeb53502fd85e5e1d428e1c1af481f8f424f6ae18cbe104462e8fdcc96670a72daa8a8a0d1430d00824d8795b4db53437e7bb7320cddfd84cfd3 SHA512 3f71146202208fa0c0cda360d125dd972ea003cf8cd62da21d67eb544c92f7b82640e7ce7c3835cbc65c75909a882edfa54dbd8d8b748d6f243711ea331477fd
-EBUILD beep-1.3-r3.ebuild 680 BLAKE2B d9b7f48c566189b8eb6c35cc3bbc39824bd539d74b2f95072b4dbe5d28e5361bcc7d08d4575fdb6b0f9e3fd301186c84b251accd236b9f004a206f0a30ae8f11 SHA512 2069f3daff4130277d6b1062040aeda4c494e1425ba55eaf85ffb130859971cccc56bf1dd99239cbbe30f17870acd80777723eb1e90a67be8d6863f347d94dad
+EBUILD beep-1.3-r3.ebuild 681 BLAKE2B 83bf4c8bd5022fd0c2a81459100d9bc9f19e628cc54985ba2eb6471e73db4e2b68a23137ba2ff0e107d07dfd689ad5f269748bf48fb78dc87de9f004e26b89a3 SHA512 94c3f18399fa93b43765d2649571f2339f6e63b094ae868c96f90a14e7e98610548805726b5df3dc2c2aba93e50fa02c0851d14c4c7f1e0c686d0972bbd41bac
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/beep/beep-1.3-r3.ebuild b/app-misc/beep/beep-1.3-r3.ebuild
index a6c0024d4f55..d5f733d61b14 100644
--- a/app-misc/beep/beep-1.3-r3.ebuild
+++ b/app-misc/beep/beep-1.3-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.johnath.com/beep/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ppc ppc64 sparc x86"
 IUSE="suid"
 
 PATCHES=(
diff --git a/app-misc/binclock/Manifest b/app-misc/binclock/Manifest
index 13ca25acb435..4268fb9abf77 100644
--- a/app-misc/binclock/Manifest
+++ b/app-misc/binclock/Manifest
@@ -1,4 +1,4 @@
 AUX binclock-1.5-Makefile.patch 479 BLAKE2B 72cb38107301d133e6c17f43f5b3cb35d9401d6c41712603e3c8c6231c4ea560e3e24958ab46a1a9878272ddbcb6ce7cb82e64d2716736eae2b5e4007078e209 SHA512 7f120eeed63f27753875c7a4b8924f5db9bfc9c5048d414c1e5de7f53cf36138bfc185843e14292c9f47e87e2aeec1fd08a31254f7ac0716e4549588776fc773
 DIST binclock-1.5.tar.gz 12301 BLAKE2B 598185f21d257bd02cd4d91e0ddc707d5eaa9ff52160bd9af0d8d50238fe6ca134952bfc99d285568b77c747ec388ed7e23e3c4bac0fec5fd150e34e55687ed3 SHA512 f3650c8befb999a7e6261bc72ee4f81be670fe95899efc742112102c4107ebbbb25d015d57a702630ce2104cf8c738953c7fe70f24814514d8a2705240000e75
-EBUILD binclock-1.5.ebuild 643 BLAKE2B 7742dbc447638df9bac3260dafbe86eeed5a5e8efc6f6cfec435a970b978c9ad49f4c93f98ca2103456cc0ed96fc2d61b8696295e264cf7ddeb0736e86d405ef SHA512 d9b9a5878ce902b8c56812a0f290a47f33441b435c94b68fb5343096baf02daa41d1dbfbc68db345e09be62be1730dd5b0f8ab2648adc168f133baacf22dbdf0
+EBUILD binclock-1.5.ebuild 644 BLAKE2B c2878052da402a6e47454561478025cbf36a58bd917d61166bbb83ee3f9230fe3f6f1d3d0fd024a8f3be81127558dbad65b88905dbae559eb94ee0cb2454b94f SHA512 a6a4788445f8982faacf2f2b41c9385a80bbe1225ebd5478af2fdcfa0163342124704f7ba9d98e6e7455f4013ed8c86e7f8caa54753ac1d676b7cacf2cf951d8
 MISC metadata.xml 352 BLAKE2B 27cde27260dedf58780e1e1a2d53eababedd9d5166a2894ba4de8c50ecf78f3367c40e9fdcd4d8e55109bee2e6f371d5cb90ca57884dee5aca45845109d986c1 SHA512 f4fb925a021543b198c3fb8d4a53e5d1c5450fd7f49cd76c99d9252e1c52747359c327fa99ea3a1a8882d51949b298c39c368049f86b7890c84dccaa6746226c
diff --git a/app-misc/binclock/binclock-1.5.ebuild b/app-misc/binclock/binclock-1.5.ebuild
index 0c4db18b0aad..f648f7804ee8 100644
--- a/app-misc/binclock/binclock-1.5.ebuild
+++ b/app-misc/binclock/binclock-1.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ngolde.de/download/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-misc/blink1/Manifest b/app-misc/blink1/Manifest
index 0e0610d8f471..4888252ccabd 100644
--- a/app-misc/blink1/Manifest
+++ b/app-misc/blink1/Manifest
@@ -1,3 +1,3 @@
 DIST blink1-1.98.tar.gz 29439933 BLAKE2B 5c775819c9401c04e1c9adeb3dcb1f524ed30b6493380368b063a6ef94af75ab30e8b7f43e1b195f17578a1625bc6118bd65c7402376560ab5ee00e80f0c5c04 SHA512 2057e3ccf149dbdaaea2d09dabaa95317125d65151dc79c675365f55e85a3d0988232fd5ff404bdcfd127ebc266495afa04fb1b3fd0e4ac931bb711b0bb63568
-EBUILD blink1-1.98.ebuild 2466 BLAKE2B 884a29aee69457cc77ffa318bc2ff20d1353003e387fd58ea409054b9c74d2ae31a4d74796ffad3df9561344df4b8763e712836afe11961a1a32e85c1fb062e0 SHA512 b6746da3e2a6bacc52369198ea5e45531276e1924abaa4e97708c64b23b7ec25da77ba1f1afb0ddbd92575fba8081c76ba068ae10d5cc908d49116cfd211b519
+EBUILD blink1-1.98.ebuild 2414 BLAKE2B db04108f1cef9fa3d1ef184bfa3e2c373a2a87f613ae5f2053f7ceaf029126013ef3d1f7c9cf126238f99d2ad57c1fb48794808f04cbfb698c0f1d593f2cbcca SHA512 0f7e756b91caaa36c33cce0c844678033c58efdb3f0b455dbb627b4ca355d5533bace1300b1895619e89de91f497a28f6bbd132bd77ee378f0b856bc4ae41806
 MISC metadata.xml 579 BLAKE2B 1644cacb6985bbe68c7cdcdaaa5f602fdd79c63c8e3b54ad34b6d97e9c50415ff9d343ab60b9c91bade52b2f59b34e4b0488a091001cb36ba294e0a29ff1b90f SHA512 a848eee9c39a574515aa6a5b70f347960a4c117583e58e2a31b3c714fb91347061518f96b2c8f13cb9167afd9e5478a4c76717af10a5ad5fc084a82fc47a9f7e
diff --git a/app-misc/blink1/blink1-1.98.ebuild b/app-misc/blink1/blink1-1.98.ebuild
index 5c644a5a7e37..4e4ac4135a5e 100644
--- a/app-misc/blink1/blink1-1.98.ebuild
+++ b/app-misc/blink1/blink1-1.98.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -81,9 +81,8 @@ src_install() {
 			dodoc docs/{blink1-tool.md,blink1-tool-tips.md,blink1-hid-commands.md,blink1-mk2-tricks.md}
 		fi
 		if use examples; then
-			insinto /usr/share/doc/"${PF}"/examples
-			doins commandline/scripts/{README.md,blink1-*.sh}
-			docompress -x /usr/share/doc/"${PF}"/examples
+			docinto /usr/share/doc/"${PF}"/examples
+			dodoc commandline/scripts/{README.md,blink1-*.sh}
 		fi
 		dobin commandline/blink1-tool
 	fi
diff --git a/app-misc/boxes/Manifest b/app-misc/boxes/Manifest
index 4a2156d812cc..47d5ee5e177f 100644
--- a/app-misc/boxes/Manifest
+++ b/app-misc/boxes/Manifest
@@ -1,5 +1,5 @@
 DIST boxes-1.1.2.tar.gz 101658 BLAKE2B 002cd1a458d39069cf0955fc37c05e60590003ac987619d89851b3943cdaca986b57e631081a196e7c9a2a245397e72f8c882fb6e190c0127289602ead223a7b SHA512 10efb5f62d94003532e2f32d6a0f7c76dd86c7cfaf150f35c24516dc6684f5e3909ecd5fd48c1c64f25f874cb1364bdf3d959a2fb837bfe74c2d879a35f443dd
-EBUILD boxes-1.1.2-r1.ebuild 861 BLAKE2B d53ffa33ec9f1617908e1206c079ff51cd58993c3e1ce65bc61f40807c914f92e14e22771741979c2bcdbd268273e997a172f17fab3c607776cdba2f01beb661 SHA512 c528b010b53d79d63eb9c5094975e86134960c606030577be41f1d18238b2d1104d2e8ed795b87710f103af00015ed5b0eb7b05af5503382d69c5da8fd7cc013
+EBUILD boxes-1.1.2-r1.ebuild 862 BLAKE2B d44c6842e41a36f4f4923f3592d799c33f18c7d63c941ef5dc84ea1b88c5858c5ceedb6a52938ef16c24a369e92e88ff0302af3f6a8d0839bcd6ff9320e567a5 SHA512 d51df78d9a99e976517e417f5e9924131144b0716ce661975dfb550c0eb8ec030fac3385670f158b2e4281b5d213f1934b2a458397ebc524eda58fa1324a97b9
 EBUILD boxes-1.1.2-r2.ebuild 869 BLAKE2B 5f3bd74b15f2d94d34001195d5c1856e98ad1056c51b25a82ab745fddaa7467ebd00aab5d39eb9719bb64ab3dc9b68cd74791e8f5593d6dc782123c648ab2817 SHA512 93ae9c4536ccae41faf5d0e7635a1071b44b97cebb82e243caa6661ba5ce2537f4bbc8e6617fb822c0545c661d0d99a05d4acfc72199a45adaf836e0afb1fc23
 EBUILD boxes-1.1.2-r3.ebuild 865 BLAKE2B de22a3d24051526bbf7d6b8cab6d900c37cddc769c40e63da62f5d45c77137aec3cf1d8f63fd4b3ba277e75da9b63ba020c16ddc80e7a73ad619ab4175948953 SHA512 81690b190e92686877552b49ad1e0d974b74b6e822cf6c101b4e5de85c7b256be6b00a4e3fbf6f04c09f0e3e328aeac4d941bdef33f78bdfaf935895103d554f
 MISC metadata.xml 357 BLAKE2B ce56f6092cc7e6a1509a1be7627f92c543e64274915bdfaab74a03bb64c230b586c939a1fee654a1d81774076e35c9651e90b73d262330fae7b4320a31693af2 SHA512 37d5831d4633bd9f5d3d113841f6300adb8945827fd113bb9366181e11bd0234f7804f7bbb1b930e40a5a0a55e402b4561c8765d9d747100021c2e4ec5ba2074
diff --git a/app-misc/boxes/boxes-1.1.2-r1.ebuild b/app-misc/boxes/boxes-1.1.2-r1.ebuild
index 396033fe7e9d..9f7fb3247563 100644
--- a/app-misc/boxes/boxes-1.1.2-r1.ebuild
+++ b/app-misc/boxes/boxes-1.1.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/ascii-boxes/boxes/archive/v${PV}.tar.gz -> ${P}.tar.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND="
diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest
index 5410ffd8a91e..e38cb5cf1831 100644
--- a/app-misc/c_rehash/Manifest
+++ b/app-misc/c_rehash/Manifest
@@ -1,5 +1,5 @@
 DIST openssl-1.0.2g-8.tar.gz 21497 BLAKE2B 77f0361d338b203dde230817b5ae405ef929c6f8b92192884b1549e152c72aaab2bc280e3a8da427cd478c432acba587bf652d1bf6abfccab51df5a445fc399b SHA512 1b8c0cf8d21f2c9f2f32b4442e02a0832ab9cf9d4ec9943b20ec8363df916bfb218da26b9cbc79783090dea01a9b04accd797c3dada893ac767565ab32047eeb
 DIST openssl-c_rehash.sh.1.7 4167 BLAKE2B fc501a74aec82f37c4c967434df208ac38fc9f7385db6e0bc90fa8d8aef2e5f71b40f0a40d59e2f8e57e9e8883251e4f977759fb484f4b4b6def14967789b55e SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da
 EBUILD c_rehash-1.0.2g_p8.ebuild 992 BLAKE2B 842e588cd44c38a14b7e6a1530f00734b0b3c43bfc98ed5d668f5f323a13a133c4b8cf40b9707521a411dd1b4446a1483330833cf83d250248d5364c90726ff1 SHA512 db7aa21b7637ec97ed37b7ae14ebe841afd913d1b4c27834e1199790ff1db0f64837b37ea50aa869e842a76881450076e557d04c8b9837723df1c18f48e2e117
-EBUILD c_rehash-1.7-r1.ebuild 999 BLAKE2B d771d9b95e422b3575571beca73db431835fb497da6678360a7586b929f2df252302bcd390b6d6c0a70e57366d2d231b9869ac22c312d3254efa148d215cdb05 SHA512 eab8391739cbc0e26b66c7442ae4b9beb4d16c8fd9d51adebcc1caae04a2aa16d87265f427df83fe983f1b1e8022035ba040ee2260ad5b2481ea71a3e77458bc
+EBUILD c_rehash-1.7-r1.ebuild 1000 BLAKE2B a4c4f999bc56e2af4eaeb6e3622aa990ba212739e92370c0a679e1ff1a5cfda60d8d535f04cc671d72da0524c6bf533e2fb30bbceda1c5d67ebb888fa7ce246e SHA512 585da030be0f007d0dcc33288c1925c29f3441e694b595b8b75978a2c4cd5f0ce10f061c1dd07b9e07d036d51ee4a69ad0fa18386e58f6fe8ca082a470c16131
 MISC metadata.xml 339 BLAKE2B d4fe9d24a3b12ddea1d503e6998c510bdbce33677cb45c3deab9c4de28a0c88d592d1357e9e7b029ad46d043095cdfe00e747dc63c1feccb5fab6c14d4459710 SHA512 611bcd575733b05ac99027ea49a79c29fa969eeccf75b12cfda6e77a42b2241e414951b25b089eeac7fd2255d42872b38c68fc5d004880b5dfe7a89c73e8f64c
diff --git a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
index c486487cf562..582d5382b7ef 100644
--- a/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
+++ b/app-misc/c_rehash/c_rehash-1.7-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openssl/openssl-c
 
 LICENSE="openssl"
 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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 
 RDEPEND="!<dev-libs/openssl-1.0.2d-r1:0"
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index e9c833f625a7..8c70d8dc0b9e 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -2,5 +2,5 @@ AUX ca-certificates-20150426-root.patch 1336 BLAKE2B f52a2ab1f84a18e447b37905f2d
 DIST ca-certificates_20190110.tar.xz 243472 BLAKE2B b63e541fcf611712634f8c7fd2da5f189b999c39118047a7e2fd43ddd5e0fbefeaa08788363482a02be55a347447d4cc95f1505bf869accf9cd847578ad2e879 SHA512 9ce2661018edb120d0ef5bd3ed52c0f73f577d7607d135a31730549f5eb4176db4865cdb8bde77a78dc3efb8968846da5e72af8a833a9da2a8a7deb4f1560372
 DIST nss-3.43.tar.gz 23466026 BLAKE2B 1b43036daeedea1643a7fe1a8defa167097997efec529417c4857eaa29d453b6a588f462078f13662193d58dfd8f9566c22d729729591934ef154b9befb8f98d SHA512 e9dfba5bd6f68c5ab58fc7a6fa1b16a035be1b1b7c436cf787bdc99257c5f54c78d73d94d015bffd29420df19b2a2818166c68fe592dd7208ab5605344827fb5
 DIST nss-cacert-class1-class3.patch 22950 BLAKE2B 9d5e60df5f161a3c27c41e5a9419440a54f888eda454e3cde5ebe626d4075b65cf9938b5144d0fb022377f4bd415bff5e5c67d104409860aa9391b3eb8872c68 SHA512 a5aa740bf110a3f0262e3f1ef2fc739ac2b44f042e220039d48aee8e97cd764d5c10718220364f4098aba955882bd02cadb5481512388971a8290312f88a7df0
-EBUILD ca-certificates-20190110.3.43.ebuild 5777 BLAKE2B 5e11560a645c94d6ed9a93a122e1c5a568e497cfdd17c41965b8f4ddd5ac5ae8f10ec426e700abebe26d562386566b94a20f193a0ed815d3c127b444665dab09 SHA512 2e72531dc37ad9580894c25967d303319d82c2379aeeec0b3d518f137e1151058cafbc835a0e21a0070a745da4d888f9ec9ef408c3de1895bc6cf4e89ad3962d
+EBUILD ca-certificates-20190110.3.43.ebuild 5778 BLAKE2B 9aec117e4d8c24df3440bd594a0781699daca17683fd07ff653a4c05cf8bfc9d416a934e0b27c15797774127bed1879793a1667dd962ea91161d880b7d3c2061 SHA512 35750546f115661f99d466cd76787412d669b21beda840a67ce7bbc942a16655054a31a6777fb837bb03a9b36003f4c78191db0eb644ce55b63108219638cdfc
 MISC metadata.xml 436 BLAKE2B f37fed732b387ea5e778bb88c349c78127b0db613def815d75e5cc2b7a7dbd049131eef33617fe3139975bd0c6bb187cf20e98c27e3ee10c3928b394fe6f02ac SHA512 dade84534ac0e574b3d127a1dc367b2f206874500057662d6139a00dc30506e1d977e3020b8e983750a8ef243bcfb34e152391d12027d88f8c116d151090ed9b
diff --git a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
index 20736459a2ad..ef88f80cf3ca 100644
--- a/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
+++ b/app-misc/ca-certificates/ca-certificates-20190110.3.43.ebuild
@@ -59,7 +59,7 @@ fi
 
 LICENSE="MPL-1.1"
 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 ~x86-winnt"
+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 ~x86-winnt"
 IUSE=""
 ${PRECOMPILED} || IUSE+=" cacert"
 
diff --git a/app-misc/calendar/Manifest b/app-misc/calendar/Manifest
index 14737610d0bc..2f4c3da70cb5 100644
--- a/app-misc/calendar/Manifest
+++ b/app-misc/calendar/Manifest
@@ -1,3 +1,3 @@
 DIST calendar-0.9.1.tar.bz2 65225 BLAKE2B b8ee591005d57fdb3e18412c9665ee3447f607224efad261ca0cf7a3dc88e94e8bfb8309b19996e38e7e18c26bafcaddc9ebf7d612ed25d7d1d159b63b7b6827 SHA512 c8f373ad06265720ab6ba1edb9066cb5474806d023bf0cb3a35876c5bad72de8bac8ab58c2b6d3a9f418d20d04b1811e256abce9296c9c8547c9b7f8005adfb3
-EBUILD calendar-0.9.1-r1.ebuild 629 BLAKE2B a357c49d2db7065e887c29b898696bc097a26b77b775dbd8a56112a871d3ca1573009d3ad1ecbce3b954c99bc3d538e120ed2b6f47aadf5504dbbd51449ceffb SHA512 be43b9744c0936fc7498e6d9cda7b378dc665d6784720ef2dea424d360376b9df2f1abd1e5f4e0e1ee148257cf0bfd70bab7c09e317f95409a131b463b08e229
+EBUILD calendar-0.9.1-r1.ebuild 630 BLAKE2B 6c1242be49794ca42b672f3fa5285bd9b7dedb4e814860cc83785bff0105d4fe9eee46cbd75a697b4e3a65969664fd57901d3f5bf480d8a841b8d6c040da33ff SHA512 17dca194fa54e41148cd14e2ba72339d2edcf5ea68f459746bddf2517eeca666502d37b952b1697f3a5a7fed820770ac18703db22607814178ceaf618138abe9
 MISC metadata.xml 346 BLAKE2B 365bbcf4fca5fb793b4b9499b021c028eb13d1634d21a1c1627cd528c0fe77c195f7f789ee7cce987297ed8e8e20cc9937e83f6d5292b3878a25426488a3d691 SHA512 9fb15d47c1b5ea5eba7614339ed44e8812550589416f8fdb5aa02dfc899c95b782526577f97a24e024c0298e09af634b8a3dc27474755728d81866100c8d066d
diff --git a/app-misc/calendar/calendar-0.9.1-r1.ebuild b/app-misc/calendar/calendar-0.9.1-r1.ebuild
index e4eb46e51434..748b5fd40d7e 100644
--- a/app-misc/calendar/calendar-0.9.1-r1.ebuild
+++ b/app-misc/calendar/calendar-0.9.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://bsdcalendar.sourceforge.net/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 
 DOCS=( README )
 
diff --git a/app-misc/cdspeed/Manifest b/app-misc/cdspeed/Manifest
index ba0c82f200e7..6b2ffe578237 100644
--- a/app-misc/cdspeed/Manifest
+++ b/app-misc/cdspeed/Manifest
@@ -1,3 +1,3 @@
 DIST cdspeed-0.4.tar.gz 3696 BLAKE2B bb3072478897c202de3732bc75cf1a3306066e639f1b23daf275af8b7e627c7a6353a881a19606f155f3c6a0938c7a72171a7ee070e7313dc19265f5c1840daa SHA512 2f656c0a8269a568f10a499efb6414c217369d42dc6fee393ccfdbb69b89ab6e01dae2e3901049081a29b7a2bed857591f9ff8b2855aa6e325b85aecba2e2b37
-EBUILD cdspeed-0.4-r2.ebuild 600 BLAKE2B bd151803e507ae48438aa30c6fd715992f1d91136a96ee68a8d5013e9c4836da2c4ba2c53703b60212bc3ae5a7788a514b61625a54bbcd4adf09d0ecc096449f SHA512 0ea41cbec546f786630b320f78fcd708056d99d5c6ae319b84e97e7f99d0ea7f304ef7bf88bc860620bc5e35e13237a78fffe829e41a9db5c94bb6a0100a9d28
+EBUILD cdspeed-0.4-r2.ebuild 601 BLAKE2B f5dd0b98178fe80d067840071ca0f2300fde22edfa19a715b49fe3602a76778198f31774cea0862d723f967b7819bf8264bccb8db2b7dd58cd96a88a559af875 SHA512 05308b8184aa33cbc61e4764397813201a28e70a51801dfac27e748fa70b798d95cd0a3e0199dc10c70738b7885339b8310cfdc0074f97a49b0d8f608ff1b4a4
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cdspeed/cdspeed-0.4-r2.ebuild b/app-misc/cdspeed/cdspeed-0.4-r2.ebuild
index a51688d15102..3e8758f60b38 100644
--- a/app-misc/cdspeed/cdspeed-0.4-r2.ebuild
+++ b/app-misc/cdspeed/cdspeed-0.4-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://linuxfocus.org/~guido/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ~mips ppc x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc x86"
 
 src_prepare() {
 	default
diff --git a/app-misc/cmatrix/Manifest b/app-misc/cmatrix/Manifest
index 93adf0b2512f..782d93412f17 100644
--- a/app-misc/cmatrix/Manifest
+++ b/app-misc/cmatrix/Manifest
@@ -2,6 +2,6 @@ AUX cmatrix-1.2a-fontdir.patch 1794 BLAKE2B 2355315f4d119ba4df43b99b6aa7485eb933
 AUX cmatrix-1.2a-gentoo.patch 3034 BLAKE2B f882f43ffe02f966bad26f560bd9eefc726f8b5974657b267699cb111e9dc02dd1106d4effdbc2b13cc34273f591e2eb1d4d33ff508907f98d65f687b3046a9e SHA512 a72651c778fae74d0b05f59a7a94bf7a9807be0367dbceef9086d9a94da0062ab9f727c6708f5a573450c8e28fcbf729828ff4c8813b68a0fbfbf9106f451c92
 AUX cmatrix-1.2a-tinfo.patch 827 BLAKE2B acc326c3c70d3844ab9bd87751b590d357e8b29e5dd3f19381e8af69c78588b383982cdca292854f0bb95ce6fd829f34dabe22c61338ff35a187c3910e2f0df3 SHA512 cadf16edbdb2c43716de77b00bca725faa8802ab9cb6a4d5665bd20f3e1b0bf5aa5ac4b6d36c57573aa24985fe2abce4cef40b31ee288c1f13f87e31bab1922b
 DIST cmatrix-1.2a.tar.gz 74376 BLAKE2B 03319cecc8b15c441f36aa6c3267c4c0793855835c374e6fc45be731fd5907333ecf1f179b6761da8499a40bd199afc0c3c018949a325f5ca139c8a09662917f SHA512 a653a840378da87877bda1b48fc4087e7789b548e0f943ae15b81b5dc7a847aed28c69d2ad955bd467f38d6a08b0960349490b61c30260767e7d1560bb542d82
-EBUILD cmatrix-1.2a-r3.ebuild 989 BLAKE2B ec16cb5de6b9339790373f4ffbf6445cb78e878febaf7b2ad79df5b70c3abd03e52510e3dc905ee9403b5cc4aeee5ab4e1243c04e6ecf2c5cac464319ac4cce7 SHA512 95f1a50f676e3960b212fc650dd1dbaba919284e89dac07d1393b2502d8e1152244f92b274f6eaead4b48daa718d5e4fa5cadc4e8d0366faac1953136994c9a6
+EBUILD cmatrix-1.2a-r3.ebuild 990 BLAKE2B c1002d4541cafb40d1525639373f65648619b9367fd7d210655c8390e227c8a1e97c0670143d4467ec1af579a27d945c3104d7fc067bde10e16a036732b725e5 SHA512 9cc190bc76cd8780af899549140b2e422aa8a3d774d679f86111b9b7893e567dafe3f752cea80669e51cc40ef62b15fe9f075c48120cf5059c3803267c688ab6
 EBUILD cmatrix-1.2a-r4.ebuild 1065 BLAKE2B 4d5958b295a53f1d17a32338245d079298932262dde0ee4e0948bec0dd4e74f45532e7aa1cdb696811b93777248ce5cbad0a497d16d0544ba745b4571790617b SHA512 8c3228954bfa3c3a950c3da31695678712320d78eae77ffa55cda3609086e0a782b5016c1be64478343ff7657eb9ad9e48ebf695cdc82321a566c84c4e0a9b73
 MISC metadata.xml 210 BLAKE2B 5fe5983d28e12b1e05d7cdaea69fdd87becfb2dd9a9b0353caab5f617a2f806227181e7100f623c8c814be524625c2739db8a93226b35b3cd9ec6d72db9895e6 SHA512 267d83ef7ae9579f44c22fe568d6d2064e426acdd07c00a69c735801e588ae0fb1988ae60199e349d444ddb5393a6a0a6836df89b2205fc85e25144ecbf56148
diff --git a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
index 2c2b301e60ad..caa990ac488d 100644
--- a/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
+++ b/app-misc/cmatrix/cmatrix-1.2a-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ppc ppc64 sparc x86"
 IUSE="X"
 
 DEPEND="
diff --git a/app-misc/color/Manifest b/app-misc/color/Manifest
index 09671a68b029..c737c20e30de 100644
--- a/app-misc/color/Manifest
+++ b/app-misc/color/Manifest
@@ -1,4 +1,4 @@
 AUX 1.2-ldflags.patch 404 BLAKE2B e07b9c473e8b673d11c3837c6759c5beacc58fcf81ed1b9f0804d614fedc524983c237eb83be33182a384997f666842af554a950d26d8e7106f109ab5beee6b1 SHA512 44c774102cf9800b38d0831be640758a802cb2fdc2949036617ee23a47565944d514ecbee6532d2f426c766aef48814f362f7e0cb27ce8b280295af106426380
 DIST color-1.2.tar.gz 10040 BLAKE2B 1359f77e88c1c20d3643d6b00cad43fe5fbdb26d406d338132a5541668482c1a14e452ff502c10164f2d32d5c79b390328ffdad85012093d69fd767255f08fda SHA512 58f7d379bca3352b2e39eab83d2fa5891df86c45722541eb810becce813c8e866f28b856ed244a75b173f0dab5dbdc84ceb91d96175dcd2484e29abb98ba87ac
-EBUILD color-1.2-r2.ebuild 900 BLAKE2B 6957a36ac51ab4e082e7738ecce00a8e760da19dd04048b9ab0822eb0931114d5839e6f0ce195550bceefc69279c4259715ea350f34f8558fa18129720c86ac6 SHA512 d033d6fde544788f6867636f7ef0222c8edec1f5ccf5d5327caa843a48f0a30ec610732f08fa536e033793b707049e6ea05810206cc47e028761984a869ed92c
+EBUILD color-1.2-r2.ebuild 901 BLAKE2B 972a63525ab889f20da52e914915169c1718d1b83fd8f54f20a40425ddd201db5f31401d5d8651f72ca543c9a8b39c9a5fc74b8124cf27e56fe23e28d0cbb803 SHA512 5251cd0290f295e4e44a8cedd5bb59823769924368115d66c6f6b4863d09f6285cb158a88960e35676bbcaedf984d0152abfd4805746f439a9cb584fea7ef3bc
 MISC metadata.xml 588 BLAKE2B a751663c366701d7dccc560ea5e3961c5a2c428d98c341b8b74267c5bb1369c200fcf8c8f5c9d88fcd17ef072c3d98994501be12ff35445cb2c9397a44ec901f SHA512 eb169977c0c6512fc4a6bdd31083a0175bc2c5688f6eafc36807dd82494e2bea9dd263f3c2982ac059f50589cbcfbaf03b1e49eff20f7fc99c1f1b76c5f0fae6
diff --git a/app-misc/color/color-1.2-r2.ebuild b/app-misc/color/color-1.2-r2.ebuild
index 198bbcc3a821..d0a41d384692 100644
--- a/app-misc/color/color-1.2-r2.ebuild
+++ b/app-misc/color/color-1.2-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://runslinux.net/projects/color/${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=""
 
 src_prepare() {
diff --git a/app-misc/colordiff/Manifest b/app-misc/colordiff/Manifest
index c18a840d8c96..ab72310f1bfe 100644
--- a/app-misc/colordiff/Manifest
+++ b/app-misc/colordiff/Manifest
@@ -1,3 +1,3 @@
 DIST colordiff-1.0.18.tar.gz 21695 BLAKE2B 034e105d92766240d2f854efd44efe8c68d443803ac994983829be0e02fb4c6d087ffc76a626bf34832d30755c9be5d97c1c0e0629ebc1328d08d3d24002447f SHA512 53eb855b2554ca736146983adb522c8c06e4cfb9eb27bf9acb659c210b2af8101dba76ae392cf14db62fab61e3e5d3b664196c0f6432d47acdfa0846c799aa83
-EBUILD colordiff-1.0.18.ebuild 937 BLAKE2B 4f762041454b318234c1fbfb1151ae1f3d7939492d39eef29a927126efe91f1765d5a631c9f2ace758cc5851eb8329bc2394ed82d6720c5ec1fa9ebe1e39ab8d SHA512 910af57272ac2fd46b90ce729abde5c8b81c418f74982bd700e9f1874fd39db252587199ed80b8e0e7dba70b63736f72f13b0451615672ffe8741190f17482bf
+EBUILD colordiff-1.0.18.ebuild 938 BLAKE2B efd589fd24ac64666b4540d417425726a9261e246514c62f067c4db984f5ba19ca5298750db37ad6db7988587a55f6d917d50016d14e414ba055b3ee48873cd8 SHA512 192bccae040002e5fa941386c7dd3253607cd77d502bbc1691cc767637ddd5610e6dbefd132fab84d2638c641fd8f58019c68a0eec1c54b021bd337ffa13705d
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/colordiff/colordiff-1.0.18.ebuild b/app-misc/colordiff/colordiff-1.0.18.ebuild
index 4b975fa07313..ff43c67d4fb2 100644
--- a/app-misc/colordiff/colordiff-1.0.18.ebuild
+++ b/app-misc/colordiff/colordiff-1.0.18.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.colordiff.org/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	dev-lang/perl
diff --git a/app-misc/countrycodes/Manifest b/app-misc/countrycodes/Manifest
index 8e89dd1deb59..d7fe4f5a8663 100644
--- a/app-misc/countrycodes/Manifest
+++ b/app-misc/countrycodes/Manifest
@@ -1,4 +1,4 @@
 AUX 1.0.5-Makefile.patch 1034 BLAKE2B 54c932527ba2eb9cfc9906571ab4e683e854359b677ef454e674e79bcb71ef2a28679f523785ad4eceab767fb976cc4a2388cbecca5e715aa21f6f5a9ae245aa SHA512 a0416ee6b6b7416d9f0f1d379b2b4a86fb0b0ca6df2dd5f0bf3d4e54ba1fa3213da1561a38b1757d2f98b4cf96df1ff74cdea1b7e05587c7250d77353f522832
 DIST countrycodes-1.0.5.tar.gz 18621 BLAKE2B 1f2e1fb0f96d1388687929895c310e1e93c320f4d3f3f4cfe19c50d2ab850bafcefb5e13cfdaed546237ae5873eb95ae574ac47c0048bc2fa37c96158b5082fe SHA512 d62beaaccdbc8f7e14f3edf0044aeeef6375a3deffc0e4246a49fb8209ed7256208c878f811950c5c3bfda729988a46c173aecec72ee66e8843932d97064f035
-EBUILD countrycodes-1.0.5-r3.ebuild 718 BLAKE2B a898ca882636d63bd98cfb6df0ff7724efbb94d8c05664236d459b3b81750cba6d47ed06b5f6aea3252eb907e0f8b283de033f4ee52b5ebf8b12677bbe22e99c SHA512 4b34f1b15dd64e2fd328d6107117a4008f778ced83978c9262380a63a538cf7b3b1ad5656eb32ab74065fb0b80f6b606df06c34285b839c523ef903d36895a9a
+EBUILD countrycodes-1.0.5-r3.ebuild 719 BLAKE2B 2af1056a91cc6a2223b9c2fbcc69454ffd31908ac593851da31b5fc979433f36465296e97633c0443abf90a03bfae0d7e0843110bb209198cd7abf0deada1d54 SHA512 08a361358145dc599de69f6d1e08c40da951f4f9ea6184e310c09a8b7c69d4ec072f323d7225d4cf3067a30179aedcc2b37af7e2c66ad531fc4908d04d88f14d
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild b/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
index 1860a7e686ea..bf410b092fcd 100644
--- a/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
+++ b/app-misc/countrycodes/countrycodes-1.0.5-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.grigna.com/diego/linux/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 
 S="${WORKDIR}"/${P}/src
 
diff --git a/app-misc/dailystrips/Manifest b/app-misc/dailystrips/Manifest
index 0ec5ae069096..2ee0d865185d 100644
--- a/app-misc/dailystrips/Manifest
+++ b/app-misc/dailystrips/Manifest
@@ -1,3 +1,3 @@
 DIST dailystrips-1.0.28.tar.gz 58713 BLAKE2B c7d1c04c7bbb655898a21c042636655b058fcdfdba3843d6d42bcce0c0315f765c4080987c95256e37601773b6587654e8d9b9eee197253b7e93a1804823de10 SHA512 a5388d5bd45ce1b8b22420c3d53bbbf4d26fec9737c6edca3b579126443e4f88ae5a7ce5c6770264ca96ea1488ab69b73831ab6bbd20e0f68854fb08714565cb
-EBUILD dailystrips-1.0.28-r3.ebuild 748 BLAKE2B d47b21c95c6d56b19eb2890dc37fdd40528edc3bbc227b588ac84f4ba6d25e8046e577b3d72b82cac3814b8f109554f82e4f7ccb6f9f3b53fef2994084b9cba6 SHA512 955a0f2476b845f087fcab960d96ee9c042213d1600399281dce5d552104d277a287bc264216a449d3dd3f18b8bdf2dca5835f76917344372323647f9a8733fd
+EBUILD dailystrips-1.0.28-r3.ebuild 749 BLAKE2B fd5afb6023a9426b403b0ad0dc64b4b8ccb3532fa11e1cd69684343df1c76e34804c8a2a2482f7345c1d97194b55133c6b0dfebeeafdd75ab6b7a8f13386d93a SHA512 bc3e0e2e18e3a641a3429cd1624165166e0a1dd6a4f244789fe5e8b422773222b4a6f288f2eb0f468229c6feefc4ed1aa304e07cde861c40a346ba79401a4dd2
 MISC metadata.xml 248 BLAKE2B f0ce888e7f1c4373cc6d4f88a6e2870bb26e24adc5a50f747425399e154b44a93827635635fa82be033506a79d4d033119fabeae8bf24367d1dae19ce4129e67 SHA512 d08bc57fb26bc08dd2c8eb96219fcf98dd63b1e9ac4725dd0bc246ec90db63ed13cf9653d94ad11789ae3efc933d9ed9781bbb4db6f439c5596bac12011b7552
diff --git a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild b/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
index 55c6f5085372..894cd6e226d6 100644
--- a/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
+++ b/app-misc/dailystrips/dailystrips-1.0.28-r3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/dailystrips/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc x86"
+KEYWORDS="~alpha amd64 ppc x86"
 IUSE=""
 
 RDEPEND=">=dev-perl/libwww-perl-5.50
diff --git a/app-misc/datefudge/Manifest b/app-misc/datefudge/Manifest
index 278214c855c1..87c158afddd5 100644
--- a/app-misc/datefudge/Manifest
+++ b/app-misc/datefudge/Manifest
@@ -2,6 +2,6 @@ AUX datefudge-1.17-bsd.patch 2751 BLAKE2B d6d5bd6048126bb4f95dfba76eb538b555829c
 AUX datefudge-1.22-bsd.patch 2839 BLAKE2B 995dcdf0b03346ffc8dfa2b119ab9f2c2e4a9db1d56738cb152aead17d1ad079977e3ca0853ecfcb23cf9ee7cff10114e96d5d7201923861beaebe9d11d77168 SHA512 4ee404f54ecb4f7128fa77423f4773fc0e85120ef4f5335ad742b7b5eb7339cb6150241c943ce56967e451a97dda0461b62ff0612a542f4b88278a77ddcb6f43
 DIST datefudge_1.17.tar.gz 12606 BLAKE2B 5aef2bab1b434f66bb761dc6858984c4b555aff55f5cf076a6a66af2f17ff7677501ef9a6d9a8aedc7cd531093e7efe59b9146abe250fe2a1fc44e05bbedf313 SHA512 6d335f2c1f42792756d3a81264be0bdf4cde5efab86bec5b62de9ccb2488deaff67e4a4f6c7984fa7a5336156df2d76e366bf486436052d2c5ee5ff88067335e
 DIST datefudge_1.22.tar.xz 12964 BLAKE2B 2f76647a3f7c73e43ff6b4fd57d57d21cae75fd8bc304a5cab7c66d9798795e2386f6219a51d71f57e13463e88a3e518160d90ae01bae5253cbcb7c8a3acf763 SHA512 ed67d334ca8296ae1c7b5ee1efc6ec7aafaad0aeb9f0f0387245c2eeea94ccc59ab804778b93ab8b34a512b83a3ec81d10f341d4f4f22b4a07fccdadaefb6d8b
-EBUILD datefudge-1.17.ebuild 950 BLAKE2B 82720a9c28feb654e55136aa0c1b31aa35e4e67363c7502bd1baedb544c9f51974784a0071b438b930ac35a5747d052809d6e47602f4f6b074e6436289e69d33 SHA512 269894aa7d6226bf88c25b5b38c9e1283ecea5fe2ca2850ecc848eafd16c653d7f7dedd4d81b777ede2e7b03394834e0c8233939ac3e02fa9d0c5e8a216b3096
+EBUILD datefudge-1.17.ebuild 951 BLAKE2B 6de6aca0f52480d9d2eab3f91ddef79e56e7893f99d1d7af09c07d6704371e3b1c4ba830ac90b0f00fb8e2313769f2ffea8095419fb9e658adf7bc09444e2da8 SHA512 e859a30d42e1f4eb496132b58f77a412da208b502cabd9823490659d20a6436960e7a520b7e373251752fd9f09416a969051e378c76d9a5ee044d27f0b6edd93
 EBUILD datefudge-1.22.ebuild 976 BLAKE2B 2378144ecf8ca51493f777bebd0f15a798cb37aad7e9bc329465f7d1ae138672b1c71c477e36747fb1a1bbc44877ca2fd4b1d82f1f414108093286cddc2d0844 SHA512 c2b0bdfabf8e2d30f939be8b98bd1e2af7106ef7086196f0b8d66fa58e65284142c95cd405f17a56857e20027368bf53a9fe07077749511a996e9b4f0f4697b1
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/datefudge/datefudge-1.17.ebuild b/app-misc/datefudge/datefudge-1.17.ebuild
index aceea09a64c3..d9481c2b24b3 100644
--- a/app-misc/datefudge/datefudge-1.17.ebuild
+++ b/app-misc/datefudge/datefudge-1.17.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${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=""
 
 src_prepare() {
diff --git a/app-misc/devtodo/Manifest b/app-misc/devtodo/Manifest
index 049741e572bf..6ffaecc3797d 100644
--- a/app-misc/devtodo/Manifest
+++ b/app-misc/devtodo/Manifest
@@ -3,5 +3,5 @@ AUX devtodo-0.1.20-gcc43.patch 217 BLAKE2B 9d8af6ddf3036120498fda96bc493b3ce5e48
 AUX devtodo-0.1.20-gentoo.diff 3744 BLAKE2B f80130ba310593442d92013a51186af2ec082c0c4cde25981432ccab76a77dad38197e8d84b9939d3ad78e6442196315b446d431daa675bb082e488723b86a48 SHA512 f2a6de30807c2ec718725491d92f4906c50b944eff389e15d17cb2982127112d443e08096b6923ca76ca720832afc1fd561bd55a327ffa435e1e21abda07abbb
 AUX devtodo.bash-completion 1424 BLAKE2B 10166a35074d1f501d76a0f60e383c6f6198242b4c22ae2b17468f887e2d6caa2466bbfae290d76cf8199156703591633aaa755298c7ebcd1274faa09656a369 SHA512 6139218a2bc4d06f2af23fc04247e8fa3d70eaf3affe326dbb8b1bbbb880f2534f1c1bf4c54079231bed7c1c64465705deb5a5cb1a0f4ca5415ccddae726b20b
 DIST devtodo-0.1.20.tar.gz 390935 BLAKE2B 1605fb6ae6f416ea9b7c072463aacedf7fe997a362b3188addce9c6fbdd9bf99f2f7d4524870fb09f0a0c29e9886011a8fae737388a3151ecc489f3fe4fec980 SHA512 58cff0455c735af4530fc9321d1eade8272dd5759eeb8a688a641c9be11830b87be116801e3cd1d90a27e070775fa00d7b4d6b3399eba7aad5c752bfda9c28fb
-EBUILD devtodo-0.1.20-r3.ebuild 1678 BLAKE2B 318be2820e5ef69b7a38a112f440089b6cf7b0fcddb07a991c586bfe23151b32871d34c77383c128425bdd7dbd8f67c236fbafa273ebf2a6ef746ecf2647c8fd SHA512 4f5de8e5e1c034cba934df1e488e86933b118d5288ea6a17863d5ef297050dabc5928424746d28096087e8666b617ed99cab4cbcd701924830775cf09b1dd714
+EBUILD devtodo-0.1.20-r3.ebuild 1679 BLAKE2B 4e795e13d74770a679840ceefe9d063f1f65d32a65959e4f86e476b8f42e6fe9402b4aa9c1eda5d9906732c0fa9adaedb7a6610c6b3f23e2c56644ad4f070716 SHA512 44a81213344fb93d064c53b5e1ad535dfa0086ae0db0f1d5006ebd6b60e277614cac85fcdb6f3af800fea51e6976450888b4473e373aaf5e1bb4892ebd98d32e
 MISC metadata.xml 271 BLAKE2B 46146f4bf13e9f4d33435225ec1012dd9bb89b20812963dc50368cab2a60a3c542052cb72f8963cc72074b2c13a5b054c77152de1d108027752601a349bc4ef8 SHA512 3e98f5382cf789992bdfc0f32e6e36eba31944be654c03f2ed9bd00baf56c8b768c256c4f8778d5775d6df38da4afcf8e32b6e6495a1ecfc8e7982c7c8943b1b
diff --git a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
index 41dc7c7ac58b..69ecacea54d0 100644
--- a/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
+++ b/app-misc/devtodo/devtodo-0.1.20-r3.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://swapoff.org/files/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND="
diff --git a/app-misc/dtach/Manifest b/app-misc/dtach/Manifest
index 79faccdbc11b..2a14ab63336e 100644
--- a/app-misc/dtach/Manifest
+++ b/app-misc/dtach/Manifest
@@ -1,3 +1,3 @@
 DIST dtach-0.9.tar.gz 60608 BLAKE2B 915b3a13cfd86a2e72505c9f8778ebbc9f25db761815e1352c0bc1281aaddcc95a837a880999379c19912fd3980bb77a20711796ef71b06282f1a27a6cc3572d SHA512 28c13dc8c96c16b9c6153a3a11fdeb4a4bc72e84e1f2575043b047cd8e600a47232f29544ffd87d82e2575623ec2e999a26e23e9eac25ec81c7722bdf98cfb18
-EBUILD dtach-0.9.ebuild 455 BLAKE2B a9cc8ac912ea0839916c82b2d2424857374b8cf18a427ec649a90594372ababba6675150c03aa842f30f12a0efa906e38c3447066e45a35a1e4ac7224943d8a7 SHA512 081db08009360a8eb87875f122a849ed89115ccd90d0444a55ae9f54688c79f13a54f79d7dbc74ac8e890301e0116a8d50a71d1e8ef4bea2fd38520e5cd527ab
+EBUILD dtach-0.9.ebuild 456 BLAKE2B df51d3ba97a9f20ee901ae60d1be6e6ee93a5b0fd9d5951f5a79609cbd021923ecc3dd0802d0d3c0abb645e04caed102c1474aa6f64bf25740773263c9ce1eb9 SHA512 c43efab2e0e22a3abc9268563b434fe377211c6d8f41e44e1d9ec87cb8a3e29349061381a680a62d0e2b89fe76e3b2d02871fdf20fb753021460956e82c3fd14
 MISC metadata.xml 393 BLAKE2B 0a07b0eac6407190f07439b29f3cfbe185450ba5dfe0c4d3988c6d6abfe12c728029bda874cfaef61c48abe6182288e70ceee27d5db22b8eec03b20476db2991 SHA512 39071ddc8ee3913fb6898bbf5ce5488c76f6a7fa5f3f3905359a228d432cc76fe0336c0640d0fcd26c1be97abc220626c4258c5cd1de280a50d033b57d84aaa7
diff --git a/app-misc/dtach/dtach-0.9.ebuild b/app-misc/dtach/dtach-0.9.ebuild
index fde18e156228..de9ef5b67193 100644
--- a/app-misc/dtach/dtach-0.9.ebuild
+++ b/app-misc/dtach/dtach-0.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ~ppc64 s390 sparc x86"
 IUSE=""
 
 src_install() {
diff --git a/app-misc/editor-wrapper/Manifest b/app-misc/editor-wrapper/Manifest
index e364ba0e7aec..96ab96072f0e 100644
--- a/app-misc/editor-wrapper/Manifest
+++ b/app-misc/editor-wrapper/Manifest
@@ -1,3 +1,3 @@
 AUX editor-wrapper-4.sh 402 BLAKE2B 1cbdc02b300968ad6d8e6b68dbc27507d92820373efd3101f85c170c2a1e7a9e3114558fb04dcf0ce91a5ea094781f1c50c2c92ead0421f9ac8e2dc24aaf09e0 SHA512 502f8018d3c135ac05081cb896cad0296cc94f636a2410562afd915d9e44be3c2d71db319a803f5453396ebc2509cce0d5b4c5affdca875a27de2b0da1101052
-EBUILD editor-wrapper-4-r1.ebuild 933 BLAKE2B a53ea6a210b95f226405e9ab470a0f6175edc4f0e348d3c95177440eff53e843d60c1e80ac6ddbef42589c371168f93461360bea794d38f0483e9586db52f80b SHA512 1e930ee7c26349537379d7cd1f3b957d23b86ef8c0291e0b2c2f08c8b8f2bf318e6fc74c4476be75f78841266226230d171fe8cf676b0b79cdb16e689bc1e169
+EBUILD editor-wrapper-4-r1.ebuild 934 BLAKE2B 33d58a7fc57a5d7a20fe1f23271a35a3c26ec84b9bd84b556b64024fe9257d9babef000557881c2bc7caa8b0be5ea5ba842c376984d900886327402c7f67baac SHA512 e1f0a1df74f555819e2151d184ef5e84e2377faca493b749854ded5e3cbec0024e4fff9f4a1eb845edba78d4ba346ed5e5040a0c997f932893acf5fef51cbaee
 MISC metadata.xml 367 BLAKE2B c144d95fdc55aafe6dfe786f325aea6756cb51e05b7b370392bf201e5daf827ddd5b0b755d5d37d6e2a06f7929af634223f2d33a1e0e0684677ca90464e5e4df SHA512 f566d335cb37d8d951e7b86e3f4a3bafa5ed2d1b270d5d730c6e9576230848e64849f7ebf0a133a7572847faf0c075f0158f125c3f29d941b598b46ca0c7f4c3
diff --git a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
index ae6d5e1ad4a1..eecd509d9bb4 100644
--- a/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
+++ b/app-misc/editor-wrapper/editor-wrapper-4-r1.ebuild
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
 
 LICENSE="MIT"
 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"
 
 S="${WORKDIR}"
 
diff --git a/app-misc/fdupes/Manifest b/app-misc/fdupes/Manifest
index eb967a7d4af7..06d4dd1dbb18 100644
--- a/app-misc/fdupes/Manifest
+++ b/app-misc/fdupes/Manifest
@@ -5,7 +5,7 @@ AUX fdupes-1.51-makefile.patch 779 BLAKE2B de015e63777f64b2f798eb61314f71e3b66a9
 AUX fdupes-9999-gentoo.patch 426 BLAKE2B ec2b67101e35617fdd479c68df0b61161852d1895b2de1ff8ca127746b4b3deb5906f388a7f6030cd4ed95ff6781b648133ec50ab075039092b560581a89e690 SHA512 86482e46a6e2b3800f34122ef44ca830c065360fce5806962fcc49b2d9a6a76f65b52e89283e150ce5b885f038b70d992f753fecbb38694f2485a08e221f1216
 DIST fdupes-1.51.tar.gz 48942 BLAKE2B b2673a5601d0bc1d7bb0d312c3d4fbf67494916e9445fba6c46bccbeaa471ebc776b9deb18b323c6eebea4f231bdf1503af9010cbe83b6aae2a3efe479c3a49c SHA512 7cbc414f25427793317667b8d5494f7247a08ba402855929de77d1db01eb3dce41ea608f8dcca047c4a7856e02b10261982cf2acd7f6a79ab726b3009c710a8d
 DIST fdupes-1.6.1.tar.gz 20869 BLAKE2B 683b75b44ea4662e555a81405d6c9c291c7980b579c866ad953e18ad8c92beb37c2b6f7ca29ea4e40269ef751851dd8afbb77b0bffb5139bbfbcc0d41ab23a5a SHA512 6c6662b70068c2f48f4be64a6830c81a66852d650391d0756f20b9ac0df7d70c1a32918bd7cbd50e19de524d9ebc09ea338c19636e1807b071eb96b325e641db
-EBUILD fdupes-1.5.1.ebuild 964 BLAKE2B 3c4e2a8e7a1c2540e30e5d2a77ffc3b3ca82803cdcd99ee140cf39e13f8da3eb64879ed47ee1f1463e57522f89bdecf929f6d963799f5316bc42e4f3b317792e SHA512 d3b500ef04700bbf3958bcbc2635b8ce894c994385ce2b7b6021c52cab0ca159ab2ce510010225cd3c581f86a8a7eaf58ca8ab3c22ee66bf7ce0fbb01f4c6883
+EBUILD fdupes-1.5.1.ebuild 965 BLAKE2B 1a30d4d476fbe86b0a7b1743d89ba7024dec78e5c71bf766778ac2667f64af8aef27c959a1fed787ecd02925642b6ba003d3eb28e7c27398880eefe93ad6d09b SHA512 bf59751ceadd6c7b421a660505a0b37a77a373c66e7003af83718541c9016406159971f8f096e0a5379c04f6a28ae15ebfc8e2cf1dd5ab5d6d0550f01c8b8481
 EBUILD fdupes-1.6.1-r1.ebuild 684 BLAKE2B 18a6313c4e2f3192c049db83278630ba938cbf8e48503f672b1be4ff6a3fc5e2071b8cda985ace481c3fa2fa093f35df9bd0a274cb8f2c376d0111fa1407e6e6 SHA512 84434c700455f906ecc95f8386117c338cad2150bbd7b5fabf5a9e4251618a0831410aa2e9c817e4a6971d2aee1477da44e5e1d76f5444422177469c1678f4f7
 EBUILD fdupes-1.6.1.ebuild 707 BLAKE2B 6c1f60031766bb4d10490242dfcca71afd27875802e742a3bddfae3e976610dc5252ba4ccfe71e036efee845f014a83818b493bf6202271743970537d6846845 SHA512 0be0c0134f22a83e3e862b828d151fc20ef76635e33a77a4c6c0e93eb2a4197951be64c64a698466e61b3238aa06edac4593bcf727fc7d54c50597b22c3a5278
 EBUILD fdupes-9999.ebuild 676 BLAKE2B 061f5b9146f1a815ae16a056ddc95bf0f8bbcdda0b22e704986018df8d178582cfba854205814d41a7587433200eef4e326edc21b27f2715d1f641366e568077 SHA512 f04df62de8ddd45ad72015f8d346f15f4b81c066be0ff53e0f301ff5eb370ecc74192e2e03265f3fe729059cd1d330623eacca57177b1d8b9e777f8a090608d5
diff --git a/app-misc/fdupes/fdupes-1.5.1.ebuild b/app-misc/fdupes/fdupes-1.5.1.ebuild
index 8365eb23a2b8..dddb0ca0d754 100644
--- a/app-misc/fdupes/fdupes-1.5.1.ebuild
+++ b/app-misc/fdupes/fdupes-1.5.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/adrianlopezroche/${PN}/archive/${P/5\.1/51}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
diff --git a/app-misc/fhem/Manifest b/app-misc/fhem/Manifest
index 2d02094c4780..684713e334f8 100644
--- a/app-misc/fhem/Manifest
+++ b/app-misc/fhem/Manifest
@@ -3,5 +3,7 @@ AUX fhem.initd 447 BLAKE2B c724aa0b16fa7c6e1018e78c6ece9d1ba6357d147d1909326a5ad
 AUX fhem.service 208 BLAKE2B b577fd84a166ef87f2aaf58f2fc6758d070b4181f3254e236aa376322ad4bd4b0c7e04aa9205fbc235fc39f9e8f27d17a6ae36a732058d9a7ca97154ac61398d SHA512 3f2baf5e2238074ce65e1eacfadd8f2ffd582c26e50ab03d3ac18a03acbe6b5aa85bb1258e405dae81b51f9c5554a2ee872f72dc4e929df88f7fa5681916171b
 AUX fhem.tmpfiles 31 BLAKE2B 57659fe7fe189d03cd1fdbd073421f2215b90db9d2c00b335ca3b98b7c42b23085c9ccadd85fc40c5c21e393c571bacc6804b06dc47de88bfcfe4384d7be88f8 SHA512 4e29020ae5d114c6ab3ad1935a8b4b1b4d6d521771554130304534f69a0ec6961f93b64ad45aabeeff9ab1a73dbe97187922f845c849565105801edffc1ac0ce
 DIST fhem-5.9.tar.gz 23267499 BLAKE2B c2c2e4ab21f82fbe67c9e99aed4d1edd6db889aedac0611b5ba2873667520c4aa63d8553e014563f6f6ee58c5792ae1735853f58c8f4ef0599583b2ed23a9efe SHA512 9f75058e698fc33ec64081695db3eb2511f686dedc3107c87d4377f655c8b204892c6f61141de28970f2ed3f8cef5d24124d17ee20ee71a9eb9318bb17335bb8
+DIST fhem-6.0.tar.gz 28562819 BLAKE2B 4bc4f232caf0adc35ded72f380c1d4c816a22304af357f9b204fb856c2053038e3db2d834b7448d3cf43e84d3f435a36d047e48606b9e1083ab4963b38a75301 SHA512 a8e9d74b1d68ad7c9aea0a4d463aa877cb607458cb6ecf76203c96ff2156fd8b8a3b9cb5687ac0a5cd1eca5f94552433de55f3696b7be54a3cfa8df9cf74fbe1
 EBUILD fhem-5.9-r1.ebuild 2317 BLAKE2B e49fb1a0c0819ac6ffef3e077207a5e8710f76ddca3c8adccd1de0331a9f5502392cc89e19822ea2509cc0b772e08e1ea61aa729f544a2c4abdaeb15dae48498 SHA512 9958582935a807f7c13a2500dcc06b19c137d8cce14c19423316833731d1c861d85e1d21c885eaa9cd0528bd18341454998ffab8a8ff7644f4d5ec088d9aa0b1
+EBUILD fhem-6.0.ebuild 2319 BLAKE2B 13c6329ab170884338553f8dba66eebef9364928ec7f8913193be517034f686a4bc05b520a6977504917e09afee09d5979876bb86b614ced50a5f8f1416bd8c2 SHA512 0eb4d04610546986d17f1c430206bc9063c3e1c5cbb4b893f866bc3f43251817f24cb8d4a8b098389119a02025dfd9c595da61b560e1451e446210f57a9f7cff
 MISC metadata.xml 648 BLAKE2B 7d812ebc3a0e960a7a3eb744d339820af256c558220e3bc3e041751a253890be6227f7b6a19df7ceec363318800c18838fa6923a0d5c71049fc1352416d6d9f7 SHA512 4518524695a6efbfe86db125d625bb5fe58174c74968e336a34f648bf2784832eea99f322e340c922aca9c5ab43d50f3f4d0334377eed4447ea1f3c5ea6e995a
diff --git a/app-misc/fhem/fhem-6.0.ebuild b/app-misc/fhem/fhem-6.0.ebuild
new file mode 100644
index 000000000000..55c757a712da
--- /dev/null
+++ b/app-misc/fhem/fhem-6.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd
+
+DESCRIPTION="A GPL'd perl server for house automation"
+HOMEPAGE="https://www.fhem.de/"
+SRC_URI="https://www.fhem.de/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	acct-group/fhem
+	acct-user/fhem
+	dev-perl/Crypt-CBC
+	dev-perl/Device-SerialPort
+	dev-perl/Digest-CRC
+	dev-perl/JSON
+"
+
+DEPEND="media-gfx/pngcrush"
+
+src_prepare() {
+	default
+
+	# Allow install path to be set by DESTDIR in Makefile
+	sed -i -e 's,^\(BINDIR=\),\1'\$\(DESTDIR\)',' Makefile || die
+
+	# Remove docs in Makefile, as they will be installed manually
+	sed -i -e 's/docs//g' Makefile || die
+	sed -i -e '/README_DEMO.txt/d' Makefile || die
+
+	# Remove manpage in Makefile, as it will be installed manually
+	sed -i -e '/fhem.pl.1/d' Makefile || die
+
+	# Remove lcd4linux binaries, as they are provied by app-misc/lcd4linux
+	rm -r contrib/lcd4linux || die
+
+	# Remove log dir, as it will be replaced with a symlink
+	rm -r log || die
+
+	# Fix fhemicon_darksmall.png, as it reports "broken IDAT window length"
+	# Reported to Upstream: https://forum.fhem.de/index.php/topic,86238.0.html
+	pngcrush -fix -force -ow www/images/default/fhemicon_darksmall.png || die
+
+	cp "${FILESDIR}"/fhem.cfg fhem.cfg || die
+}
+
+src_compile() {
+	:
+}
+
+src_install() {
+	local DOCS=(
+		"CHANGED"
+		"HISTORY"
+		"MAINTAINER.txt"
+		"README.SVN"
+		"README_DEMO.txt"
+		"docs"/*.txt
+		"docs"/*.patch
+		"docs"/*.pdf
+		"docs/changelog"
+		"docs/copyright"
+		"docs/dotconfig"
+		"docs/fhem.odg.readme"
+		"docs/LIESMICH.update-thirdparty"
+		"docs"/README*
+		"docs/X10"
+	)
+
+	if use doc; then
+		local DOCS+=( "docs/X10" )
+		local HTML_DOCS=( "docs/"*.eps "docs/"*.html "docs"/*.jpg "docs"/*.js "docs"/*.odg "docs/"*.png "docs/km271" )
+	fi
+
+	diropts -o fhem -g fhem
+	keepdir "/var/lib/fhem"
+	keepdir "/var/log/fhem"
+	diropts
+
+	dosym ../../var/lib/fhem /opt/fhem/data
+	dosym ../../var/log/fhem /opt/fhem/log
+
+	default
+
+	newinitd "${FILESDIR}"/fhem.initd fhem
+
+	systemd_dounit "${FILESDIR}"/fhem.service
+	systemd_newtmpfilesd "${FILESDIR}"/fhem.tmpfiles fhem.conf
+
+	newman docs/fhem.man fhem.pl.1
+
+	echo 'CONFIG_PROTECT="/opt/fhem /var/lib/fhem"' > "${T}"/99fhem || die
+	doenvd "${T}"/99fhem
+
+	fowners fhem:fhem /opt/fhem/fhem.cfg
+}
diff --git a/app-misc/flirc/Manifest b/app-misc/flirc/Manifest
index ea76fa45e86a..838c92682a88 100644
--- a/app-misc/flirc/Manifest
+++ b/app-misc/flirc/Manifest
@@ -4,6 +4,10 @@ DIST flirc-3.22.4_x86.deb 8989574 BLAKE2B bb1171def52e9171e3f97df7230de1f7bb6e2e
 DIST flirc-3.24.0_amd64.deb 9027598 BLAKE2B 5ab9b0c24eeeace872aa0c022d78afbd19a1edd5b54be26216f4cd1e63f2ecd11b257c53254c76aab0fa96eea57d2a346633c091ba109aa08551a5d6aeae4115 SHA512 12bc6fedc097491cbfa30ca26c0bf3c97a2fdbeb51e2a9ad26d0bf44f9020d2f2becbeaf2d760338894466f5c7f455abb608cdc11cd46893fb4bb79ed1ce7f37
 DIST flirc-3.24.0_arm.deb 8988130 BLAKE2B c201521e8cf4fd1e2dbd5be4eaab30a00660271524d0be9ee58563f60731247ee488721d6c2561cc4bbf24aeef56530ed87be5d83c73696bc2877b1a35e58526 SHA512 b5af7ca16587e6f89ea32b9127ed6f6fb1a4634189a39ca9242a87471efb6f0400a8e9ae2f0652095cc3a92476e419b2df529d938685435ab1f740dfe2621790
 DIST flirc-3.24.0_x86.deb 8992950 BLAKE2B 2435d65371cf4209a16862e2f18b3bfa24af6b1336bae87bf3fc701a764b491551c687602d0ed68834fd7083a8271b234db70003240e23bc970e844383faa92b SHA512 8c9a16c59a88057b90f6f9640c0729e2ed2c862f544cff8e42fcf3a7ee85cd2be4ae1e4b5e76e38d733996b985b01cdae40892f4fa1ddc52fe327a7ef07282c2
+DIST flirc-3.25.2_amd64.deb 9059418 BLAKE2B fc08c69defdbaff0c5b387855b6e9eee42ceb3e710fa398b7f32f694b978d5ffd6e49d942e8d94bb41b68bba05d44d8fa8fe88854ff4dafd0a607809ca229167 SHA512 75056d86912add575c5540bce59061fee949462d2011f601b3234abd3f058e0285f4e57a1151c59604250398cc868c7baf0fbc257d960c68f56409eece872245
+DIST flirc-3.25.2_arm.deb 9023232 BLAKE2B 527b51e09d52a56e2aaa3f23ca3ed52bf25651b649cf7bedbe0e21d693efc81a14821648ebc965217956c022af30cf23db3e6c07304cadd4234eec8b6ecd48c6 SHA512 325d569e05e4f4574e942a1b2e93bd462fa947ebafe6345adf38f07c0d6c3d4dbfebec106cc7034c737073fe6a82ad5e1fd38208f7a9432ad3479d0082180156
+DIST flirc-3.25.2_x86.deb 9029446 BLAKE2B 8efaf2fe21f04b4af0cf76c0c440d75724e47021c69e7c754ac46dcc4d7e808894a7cc6ef1a3f8dbfc929c53391f2697add079690019d81c6822113b9220bde8 SHA512 aef30713d0df41a1b0c964b4fbbd4aaac9cd75875926fd646a6f9fa3cf6688714cb148d5ab7750a8d182943c1980af3233a324ab8d7deb48b35753f2acf43128
 EBUILD flirc-3.22.4.ebuild 1139 BLAKE2B 7c5ea57b5ceb92346c1c137690eccf54d808bbb70c37d9f1b12cecb0ef2e8038db91fdd4addfa149203d229e44d829471b0afb7e08747ea05b1d74de78102c8d SHA512 b54e2a8014bd550a3913c61d1f093d3b9893d29c82cbd774538b7b31be22ca4f3973f34f267b1cc3ba0f023d4f2826728428f6ce6dbd3aa4afd243baa84b0edf
 EBUILD flirc-3.24.0.ebuild 1136 BLAKE2B 7c48b0b65f5643ddcb16b5b5d7898784848d140a82c72abe6d82df0709b56f224a261df49b5d1069642ebf3e540a572bf229c71c8e6e252b0e7a81d89e266b8f SHA512 62717f284bdfa73f2315a3815c12184ccbb91adb13a9b5fcee3d60a97843045de810a2df6e399cf68f430ccf45c27160d9cc0914b9e5d7c0bea7c3a7028fd850
+EBUILD flirc-3.25.2.ebuild 1136 BLAKE2B 7518ecb349a65afa372845415ecfb65035f392a2772628586ed6a344b20d0a139923530567ce37f20051dbe0f4fe5a4a1f42c02689a253c89dbbabe9a1bfcf1f SHA512 ce034fac95f2b4823718012a06d6309478312f34b5c67ab7a84dbc3621351ef0ed9e03835a2fcf16a98512897913251982efccbfb722655c0fcdca8d34f57a84
 MISC metadata.xml 378 BLAKE2B f2b1adfb373a67d901affeca1c30b1f9fea6adb9d73a5d8b51fb6234964dd04e9dfada31a3afdf5f9a76e47a50cfd65033f86142701291e0797822f3a0daef41 SHA512 70ee7283d595db52d0a82896b29825d4e671fc8f1723f98c4a64dbbfc4bc1198343e155d4c624c8436d99201101d71a917205e89c6372911cdb700ba9e8ee508
diff --git a/app-misc/flirc/flirc-3.25.2.ebuild b/app-misc/flirc/flirc-3.25.2.ebuild
new file mode 100644
index 000000000000..d0279f48d691
--- /dev/null
+++ b/app-misc/flirc/flirc-3.25.2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop udev unpacker
+
+DESCRIPTION="Allows you to pair any remote control with your computer or media center"
+HOMEPAGE="https://flirc.tv/"
+SRC_URI="
+	amd64? ( https://apt.fury.io/flirc/${P}-amd64 -> ${P}_amd64.deb )
+	arm? ( https://apt.fury.io/flirc/${P}-armhf -> ${P}_arm.deb )
+	x86? ( https://apt.fury.io/flirc/${P}-i386  -> ${P}_x86.deb )"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~arm ~x86"
+IUSE="+qt5"
+
+RESTRICT="bindist mirror strip"
+
+S="${WORKDIR}"
+
+DEPEND=""
+RDEPEND="virtual/libusb:1
+	dev-libs/hidapi
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtsvg:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtxml:5
+		dev-qt/qtxmlpatterns:5
+	)"
+
+QA_PREBUILT="/usr/bin/*"
+
+src_install () {
+	udev_newrules etc/udev/rules.d/99-flirc.rules 51-flirc.rules
+	dobin usr/bin/flirc_util
+	doman usr/share/doc/flirc/flirc_util.1
+	if use qt5 ; then
+		dobin usr/bin/Flirc
+		doman usr/share/doc/flirc/Flirc.1
+		doicon usr/share/pixmaps/Flirc.png
+		domenu usr/share/applications/Flirc.desktop
+	fi
+}
diff --git a/app-misc/gcalcli/Manifest b/app-misc/gcalcli/Manifest
index 958be223e2f6..13d38114cc11 100644
--- a/app-misc/gcalcli/Manifest
+++ b/app-misc/gcalcli/Manifest
@@ -1,13 +1,3 @@
-AUX gcalcli-oauth2client.patch 1306 BLAKE2B a853208d6420a7e39ad66e796d3877a5ed538934f22beb3752ae56d92de0958d68bad4501cd03ee861c91d62553b7df98c86b78f694d976ce0d0116109172f9b SHA512 6028e8ebe14b763421889621576367838112d2cf56dc85a424dfcdad540a8d7c8010b7f48361a5317552ef827d4922c436922d0b34b9fe7f07eb69300f3a977e
-DIST gcalcli-3.2.tar.gz 1672457 BLAKE2B f54e90cbff2676238a4e5d41fd5d2935b48358748655b4817e785abcd2bee0f50bce99a4c1e8b17d6e5d34c0ef8e2a4649d044de55ff45844656928550de2883 SHA512 a2e0d9aea2f27eaee3796acfbfdc08b88a7792002b10f0e44b0db1187a7ecd50aa97f78df7236038c8c18bc1b6dacbfa4b26db6bfb5762c880415c10a5364d83
-DIST gcalcli-3.3.2.tar.gz 1674569 BLAKE2B c141bdba5a337ebc4ecc81f845c66281ad3d5b5442a664f195bfdcf866eb1c0a1f7c395808d939caacbf8af74bf8f2cd25b35815b72ca92beb2b7861de4a1ade SHA512 725290de1c7c768ad48e77bcc74e65b2676aab2fe5d40bdf59e63e1552d96dbe849fe99680b1f33c8adebcf2ee4a1ad898879820e20d8b2050679348820f4ba0
-DIST gcalcli-3.4.0.tar.gz 1675456 BLAKE2B 38ac6eed8e03f806fa2311389c4fc3377ae16ee95af8d42d15eedfa37599d56d56c0b950e1eabb1968e4270657a5af70f789eb9e86d01baea35c9f84b13f6d69 SHA512 d3844dc34dfd21b1cca6f46bf2b66b6aabfccd4d7b23ad4e076966aeec51681792c0dbe5f61e4cb84a75ce3bbf4fd1c63a2ce759cecdeee3e4608c0238c07a4b
-DIST gcalcli-4.0.0_alpha3.tar.gz 1675261 BLAKE2B 8388e489abd21a916568c9a39e1b41875613656ff60fbf6b555bf22408619e940512405c89615eb9477a20c5443e5d7d1c714905df86da4d76d1eede033daf01 SHA512 215860f50d2b32b94124537b3d8dbaebd7af5b9c907d565a58eab5357efa8a8c8bc6c20264811337ddbc33ae75029bf59c782e1dbb317667084f11da8c41ea18
 DIST gcalcli-4.2.0.tar.gz 1701050 BLAKE2B a0e310097cdb740ac873049d19d21dc8698afe61c919fd082258864e7170f5ca42a55b4eb211cfa9ecd9b2bef63f3e107839a4e3cad9ec2c278a8529f58ac33c SHA512 2dd39a62e3fd81753f30b77be196476ef366cb6914e62c5de82ab946b7159751a5cbf246aa54eaed1fb6adfef7dbba785d10e29571a454b627b7ff45b52375d6
-EBUILD gcalcli-3.2.ebuild 771 BLAKE2B e4b3332ded640174ead07262bef4339e927eef1d00cce37d782d30a70e33f0faa4da5d11ee73bb0c4e9335fed49315e3b3e0481d779d825a78d8db37f9baeea0 SHA512 8d5312d90a6bcb742fb13d2ad2ce0977e87ca6fac781378196bb418c350f46ec7a677b326d20b339374ca93ae6dc22f9af1c3c5c2402a899a5075ede029fbd3c
-EBUILD gcalcli-3.3.2.ebuild 771 BLAKE2B e4b3332ded640174ead07262bef4339e927eef1d00cce37d782d30a70e33f0faa4da5d11ee73bb0c4e9335fed49315e3b3e0481d779d825a78d8db37f9baeea0 SHA512 8d5312d90a6bcb742fb13d2ad2ce0977e87ca6fac781378196bb418c350f46ec7a677b326d20b339374ca93ae6dc22f9af1c3c5c2402a899a5075ede029fbd3c
-EBUILD gcalcli-3.4.0.ebuild 957 BLAKE2B e711b0dfcf53ea457cd43946e2808ace36afb7806f8eae00ca556450f6ba3542ed6c7ccbaf0b1ab3626d49605dcbf36bb36a8fde44e80774a35a1d357e82d052 SHA512 105df2dfa0d1962616c650d05c901b2b8d6f63d2b799eb5f1a08fb062f7555e5c0f67b150cba95a2cfbc473fbe7b0b182054165a94a5042e1cc74275c45298b2
-EBUILD gcalcli-4.0.0_alpha3-r1.ebuild 954 BLAKE2B 7f8206a50d8b9ae9c50bbfa3e1c37ee31a7ada55152dba63ddf6b9c71b0c0a0a8caa4a5a86e1b0ab889b8a49f1fb829b30d8de5ae3909b758325ae12dae3e692 SHA512 ebd57c2c8dfe97ad3c7aae89f02a937af3a8687924ef501e93a96b7e53dd522c40757bc3a4f6523bfe6cd565b4d413fd3329b5fc942da4bc3fe4545a78690d95
-EBUILD gcalcli-4.0.0_alpha3.ebuild 828 BLAKE2B 19dff43e187e6c9a776e78a27dff913140996243f766a40fde4710779bce97f838c563202d89aac13a68745e5cd1d892ddbe22fc826c8c618a496ad0c50b7bb2 SHA512 cc4c35ecd2f36deabd334d1300ff11e648752142a745b2005f3acd6d9cc9e6aeed702c60d1e521f87376f8ac652d48229164b053568628b4870fe195e1634384
-EBUILD gcalcli-4.2.0.ebuild 896 BLAKE2B 5521f59654158920e3ce1d917e14f78b4f7d0887a3e943c26a1be2bce014fed7418338122434ea32d46b20baa8ae06f5b89eff0f8acaa30f129b827a980306d5 SHA512 92ff03bc0cb966c2dc7ba59353ca0e8576480cb8f0e8589508e370c53f59816d7e5506fe14baca41d3851e1e8f785cee1c869762fbf06c8797904cd41af89a30
+EBUILD gcalcli-4.2.0.ebuild 892 BLAKE2B ebe549935bde659c91a2790f4930b376b85161d00177c765d9b06fa0e9d1df2346968292561a6b42472a5d2b975f3d84222531661155dd7401fcac8549de827f SHA512 76f37e831d025d5f93eec6dfecc059f08240f005ce71b2729aa9b0c3f451627c4642428b61192f6e678be42fc4ff5634f5fc3beb35493f18bcf14da1bf1553fb
 MISC metadata.xml 340 BLAKE2B 206e5c230d6379249a0cd6e99bc41cd3246cd37dd3766be939b5fea135664b63e9cf1aa92e24f035be65f0553f7f7cfbc8a460391f52119aa1f052399c05ea33 SHA512 4d2abd6d07db32d501923eef6b9aa7752b844745a0511a36801480833dd205adef443bea80efa86d270cdd6d0edda16a9989d678221d0b480366a47a7c76de02
diff --git a/app-misc/gcalcli/files/gcalcli-oauth2client.patch b/app-misc/gcalcli/files/gcalcli-oauth2client.patch
deleted file mode 100644
index 2ad7a2981f82..000000000000
--- a/app-misc/gcalcli/files/gcalcli-oauth2client.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/gcalcli-3.3.2/gcalcli	2015-09-14 02:26:55.000000000 -0300
-+++ b/gcalcli-3.3.2/gcalcli	2016-09-21 00:20:45.817051537 -0300
-@@ -190,7 +190,8 @@
-     from apiclient.errors import HttpError
-     from oauth2client.file import Storage
-     from oauth2client.client import OAuth2WebServerFlow
--    from oauth2client.tools import run
-+    from oauth2client.tools import run_flow
-+    from oauth2client.tools import argparser
- except ImportError as e:
-     print "ERROR: Missing module - %s" % e.args[0]
-     sys.exit(1)
-@@ -665,14 +666,15 @@
-             credentials = storage.get()
- 
-             if credentials is None or credentials.invalid:
--                credentials = run(
-+                args, unknown = argparser.parse_known_args(sys.argv)
-+                credentials = run_flow(
-                     OAuth2WebServerFlow(
-                         client_id=self.client_id,
-                         client_secret=self.client_secret,
-                         scope=['https://www.googleapis.com/auth/calendar',
-                                'https://www.googleapis.com/auth/urlshortener'],
-                         user_agent=__program__ + '/' + __version__),
--                    storage)
-+                    storage,args)
- 
-             self.authHttp = credentials.authorize(httplib2.Http())
- 
diff --git a/app-misc/gcalcli/gcalcli-3.2.ebuild b/app-misc/gcalcli/gcalcli-3.2.ebuild
deleted file mode 100644
index 9d7904b49960..000000000000
--- a/app-misc/gcalcli/gcalcli-3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# google-api-python-client only supports these
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Google Calendar Command Line Interface"
-HOMEPAGE="https://github.com/insanum/gcalcli"
-SRC_URI="https://github.com/insanum/gcalcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
-	dev-python/vobject[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	dodoc -r ChangeLog README.md docs
-	python_foreach_impl python_doscript ${PN}
-}
diff --git a/app-misc/gcalcli/gcalcli-3.3.2.ebuild b/app-misc/gcalcli/gcalcli-3.3.2.ebuild
deleted file mode 100644
index 9d7904b49960..000000000000
--- a/app-misc/gcalcli/gcalcli-3.3.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# google-api-python-client only supports these
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Google Calendar Command Line Interface"
-HOMEPAGE="https://github.com/insanum/gcalcli"
-SRC_URI="https://github.com/insanum/gcalcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
-	dev-python/vobject[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_install() {
-	dodoc -r ChangeLog README.md docs
-	python_foreach_impl python_doscript ${PN}
-}
diff --git a/app-misc/gcalcli/gcalcli-3.4.0.ebuild b/app-misc/gcalcli/gcalcli-3.4.0.ebuild
deleted file mode 100644
index d7933f2763b5..000000000000
--- a/app-misc/gcalcli/gcalcli-3.4.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# python-gflags doesn't support python3
-# parsedatetime doesn't support pypy
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-DESCRIPTION="Google Calendar Command Line Interface"
-HOMEPAGE="https://github.com/insanum/gcalcli"
-SRC_URI="https://github.com/insanum/gcalcli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
-	dev-python/parsedatetime[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-gflags[${PYTHON_USEDEP}]
-	dev-python/vobject[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/gcalcli-oauth2client.patch"
-}
-
-src_install() {
-	dodoc -r ChangeLog README.md docs
-	python_foreach_impl python_doscript ${PN}
-}
diff --git a/app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild b/app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild
deleted file mode 100644
index 70df094b061b..000000000000
--- a/app-misc/gcalcli/gcalcli-4.0.0_alpha3-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# python-gflags doesn't support python3
-# parsedatetime doesn't support pypy
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 versionator
-
-MY_PV="4.0.0a3"
-
-DESCRIPTION="Google Calendar Command Line Interface"
-HOMEPAGE="https://github.com/insanum/gcalcli"
-SRC_URI="https://github.com/insanum/gcalcli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	>=dev-python/google-api-python-client-1.5.3[${PYTHON_USEDEP}]
-	dev-python/parsedatetime[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/python-gflags[${PYTHON_USEDEP}]
-	dev-python/vobject[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/gcalcli-${MY_PV}"
-
-src_install() {
-	dodoc -r ChangeLog README.md docs
-	python_foreach_impl python_doscript ${PN}
-}
diff --git a/app-misc/gcalcli/gcalcli-4.0.0_alpha3.ebuild b/app-misc/gcalcli/gcalcli-4.0.0_alpha3.ebuild
deleted file mode 100644
index fac4a749a287..000000000000
--- a/app-misc/gcalcli/gcalcli-4.0.0_alpha3.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-# google-api-python-client only supports these
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1 versionator
-
-MY_PV="4.0.0a3"
-
-DESCRIPTION="Google Calendar Command Line Interface"
-HOMEPAGE="https://github.com/insanum/gcalcli"
-SRC_URI="https://github.com/insanum/gcalcli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/google-api-python-client[${PYTHON_USEDEP}]
-	dev-python/vobject[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/gcalcli-${MY_PV}"
-
-src_install() {
-	dodoc -r ChangeLog README.md docs
-	python_foreach_impl python_doscript ${PN}
-}
diff --git a/app-misc/gcalcli/gcalcli-4.2.0.ebuild b/app-misc/gcalcli/gcalcli-4.2.0.ebuild
index ede92a3b662b..af9446273a06 100644
--- a/app-misc/gcalcli/gcalcli-4.2.0.ebuild
+++ b/app-misc/gcalcli/gcalcli-4.2.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 # parsedatetime doesn't support pypy
-PYTHON_COMPAT=( python{2_7,3_6,3_7} )
+PYTHON_COMPAT=( python{3_6,3_7} )
 
 inherit distutils-r1
 
diff --git a/app-misc/geekcode/Manifest b/app-misc/geekcode/Manifest
index ed40f2f4d7c8..06348fd6d4b8 100644
--- a/app-misc/geekcode/Manifest
+++ b/app-misc/geekcode/Manifest
@@ -1,4 +1,4 @@
 AUX geekcode-1.7.3-exit.patch 276 BLAKE2B bd008224a005aa5554d4932b3d7ecaba241009deed3e633bf787d04546141f64c9e00d3617af20fb9a84b3f304bb2b037c860528919faaf6e7a0a979e5999378 SHA512 eb8161f72166c6c03c9b6a6355a3bc6fda6aa415a3cb7e9b7d8643de9b7a414249a42d5816e191e739a433b6633b146b5058ef43ca959775b8dacf8ed9cb44bc
 DIST geekcode-1.7.3.tar.gz 60617 BLAKE2B 9e848d45054805e21489e59c6e31ba4aa41a557bf9f89754a3423724bbc449415b3033de0383b9e035af6409abfb24c36b5fcb5a25ad90a14602f7d2164b59af SHA512 eca8489dafee507246538bbb8d35cc17c5712571603bad1f470803883cdbaf9658769df77e214704b6a5adec382f76e599a2f6c48ec3759861159ac626131bfa
-EBUILD geekcode-1.7.3-r1.ebuild 690 BLAKE2B de2c8ec0bb2da26240967e578a689d2088f376fd360bb2097f976280d4a616a0d2e59c51971da51929b5be993f71a0093d367051cb236ddaaf8bf1bbc2b6ed54 SHA512 46001ff446098410b6d7e947aa79f51b669c78a25dc099e7c3bd50ca46d534d22cbfd13a26aa7fab522b1c47e8836bf21c7d0284b7dcdadf66c1317c55494763
+EBUILD geekcode-1.7.3-r1.ebuild 691 BLAKE2B f28fd3b2d67d660cb66985b7245a128a7fc5ead7a6da3946c6cd569603653f001a8e1b236ee0e65efa081062be93f6f30f406d924781a24408f3a984989a0d3d SHA512 88d47d589cf3fe54aa5baf64aaea287399d7736ae5acfb4bc30f0957a4b42caa961524ba0e9bc84af0f13a69944c54c4b13ed803807cc7774ab9176103a94c75
 MISC metadata.xml 325 BLAKE2B 54f0eab50c63d869f888be5d8293aa90fddb6c3bba3659903f9a3f91e5fb5214ce0bcbe08c72718fc51fcd62ae251f4b999714f2d425c9091a5700e2ca7f59bf SHA512 53919d4488a8dd446a22f6d5017d7ba41d1e510a66be9a24cf20b50a9eb047b2c771518b5bc1b2c5c58b7c34ab6465f80a40cda72594586f23f96c39bf0208f4
diff --git a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
index c3ff27fca315..35237155ca0f 100644
--- a/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
+++ b/app-misc/geekcode/geekcode-1.7.3-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm ~mips ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 
 src_prepare() {
 	eapply -p0 "${FILESDIR}/${P}-exit.patch"
diff --git a/app-misc/geneweb/Manifest b/app-misc/geneweb/Manifest
index 299bb0d7e502..5115b51df9db 100644
--- a/app-misc/geneweb/Manifest
+++ b/app-misc/geneweb/Manifest
@@ -5,5 +5,5 @@ AUX geneweb.initd 429 BLAKE2B d216c7970cd7e62a3732faeee6ac97062712023a6bbad6d654
 DIST geneweb-6.08-ocaml-4.patch.gz 22259 BLAKE2B c3471b44bae06db04f51f4fbfacaf5d93388f79673686d0fdd988df482f836bd49f853c5acb3b94c39f890b7d9bd8d118b4042100c466a06a2e57227da9eee3b SHA512 333a9ca899bf454e1c534f6c890b5cbe842821573b39e9d0e432cfbdf30dbe3a495a5ecb5a9b4a00882ee51bbb3ec1ca4b417e34050a7f84e434d0424c126def
 DIST geneweb-6.08.tar.gz 1791450 BLAKE2B 35fcd0a4087892b992b87dd4fb54b458be0e300042a237458fdeea9a4a9b8649f93261d896d6b7ad19b681b95b343013d99d99027d86b1796f74cab916178d32 SHA512 7f1d552342e8a5b05961be75c1afb768853f22cc7eb4477fa63d6a3af29ea852862ce043ae89cd1589ede20fe561ad7d77ab757cc1ecb26ce1473f0e3621b835
 EBUILD geneweb-6.08-r1.ebuild 1958 BLAKE2B 70ac814ce345ac8e26461c82551323f56d8331644977454f704a774f9b84ad76560ec2f6943c16271cf81cef4925f616d8125f26557714436b77a815c51e2c38 SHA512 2b992d10ea2307d2b2bb68b28133844874bfe8481427b549d8e404f84f5ea4b2ed8dc35d158af656b113ca8787babf1f0c2d126c95216c1662deb7f71b4de951
-EBUILD geneweb-6.08-r2.ebuild 1944 BLAKE2B 709302e66b2cc8a5efbdac4acde6181ccdc9525b1f6287f44044763d3eb3ca4f3885c66971ddddeb7ebba7371690ef64ee38ca03149403998b77567a59bb107f SHA512 89ce86e780688601e1e82d44cf58a83f99ff4f43956f19489d3e404bdb98b3d6089997e926b6fa1d7dc2a5011a9d7c5958c012a4f0634893892ce2fbda7bc417
+EBUILD geneweb-6.08-r2.ebuild 1946 BLAKE2B 84a5c4cf29cabbb0e1d3573c4aa5739fbd80dd3df47fb813475837e1671f654dc1cffe7f76573de856212500be85dd6e1faab594f0df332fe3bed0d9e3bc9234 SHA512 8cd06829353ca61ad95af45bdd32076c642710cbc63509aea8c431055c44715923515bf3a3389ea1d84a3bdae9e54c78361332da284d35bd617d5643ddcab955
 MISC metadata.xml 652 BLAKE2B 0a523f6b4dd3d65cf1668c16c07d1a9a4547bbcb9a800c4f9f706973d159ce434c2567d5b23609bd33f8c5f3ca4a25d8e7c485e15a640a941d21fd29fd52589d SHA512 7c94f8655959224e21113156e943d28dc9653f767fcd0cb6a9e7ec149abf3deabe850b404ba3b92384fd5bc919cce973c73b622746efc2a2862c86a62136d973
diff --git a/app-misc/geneweb/geneweb-6.08-r2.ebuild b/app-misc/geneweb/geneweb-6.08-r2.ebuild
index cab25ce06688..a962e673485d 100644
--- a/app-misc/geneweb/geneweb-6.08-r2.ebuild
+++ b/app-misc/geneweb/geneweb-6.08-r2.ebuild
@@ -23,7 +23,7 @@ DEPEND="${RDEPEND}"
 
 PATCHES=(
 	"${WORKDIR}"/${P}-ocaml-4.patch
-	"${FILESDIR}"/${PF}-gentoo.patch
+	"${FILESDIR}"/${P}-r1-gentoo.patch
 	"${FILESDIR}"/${P}-parallellbuild.patch )
 
 src_compile() {
diff --git a/app-misc/gentoo/Manifest b/app-misc/gentoo/Manifest
index d55d57466994..67ba78ed94dd 100644
--- a/app-misc/gentoo/Manifest
+++ b/app-misc/gentoo/Manifest
@@ -1,3 +1,3 @@
 DIST gentoo-0.20.7.tar.gz 1414198 BLAKE2B 18af2f136557d5d5674e05669839e1213c1c8234bfb2a14875057989040cae2955e7a569456a93fb181121afa796e711a8b26e26397d743dc6d3ac2eefd7088d SHA512 7a4d601526d7071392bc3f2f34fd86337f4186fc45e633ed359b32ba44f43faddc4760a9ebd2e20d08662755052dd4c02a06724d274f98db342ac53fa28e39b0
-EBUILD gentoo-0.20.7.ebuild 1288 BLAKE2B 19c34b30733dc7586e5b158f1f8c4641fb3850b6cca2877c746f2294aa2d65f62a8d8ce8f719ef143624de93e3c3dae5d587da886609e208eeec383c7406af82 SHA512 6a25e0435e3277847f1159dc55098f88ad484e55d2419d18d06657b08f66c2662fad829f70441f35d9d091ad574f94938500b3b480825948ad6f75317149e98c
+EBUILD gentoo-0.20.7.ebuild 1289 BLAKE2B a43d3eb6af676e496126befe7d344df3a51d9a507ba05449f31f1e2e855323b292c9375399e09cb375f28c91a81bdc6aaa1c1c53ce96693093dddc8789004edd SHA512 817825036e24dfb3861cdbd91948fb6cf352c885b80142b682ade87b7086d7840c44bd60bcbc74118cacf61b1508def49faaae557d1ec644e71999db5a257970
 MISC metadata.xml 352 BLAKE2B 72fa87ea40fa0242a63fb53b736533de198a19cbdbdd751ee68413ff914b064169cdf5df0b5abed6d3d757a8a044c40261abd25bbbfe90ee159264a703fa977b SHA512 ff05feda3a7284c70f12d7fe7f7beca8c49eeb120c6c7302c73f5c28f2f903ecb97cf91a8a374e7b0c86d9dfba1c80627274a30249a388a65390303dd09d194a
diff --git a/app-misc/gentoo/gentoo-0.20.7.ebuild b/app-misc/gentoo/gentoo-0.20.7.ebuild
index b7996052edb5..fc126a228ae8 100644
--- a/app-misc/gentoo/gentoo-0.20.7.ebuild
+++ b/app-misc/gentoo/gentoo-0.20.7.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
 IUSE="nls"
 
 RDEPEND="
diff --git a/app-misc/glimpse/Manifest b/app-misc/glimpse/Manifest
index c0a2f380cb0f..96e601cc28f3 100644
--- a/app-misc/glimpse/Manifest
+++ b/app-misc/glimpse/Manifest
@@ -1,4 +1,4 @@
 AUX glimpse-4.18.6-makefile.patch 1048 BLAKE2B e937f045dec826e5660ba4f38e4f6c9dd05ee4cd71b5b9044d5c9f24c22d5ad91745d526638b2daebf29dc8ae5b0fafe0c30a3f13a46193185805be7e61a730a SHA512 568b0cc6f52d8ce79e5ad552a302a814162072b85f1a3b7bd2b00bf18ae2d7526429f68f6910d9fb91ddcde43387a2778f9f61ed3f86f0fb533b69946cfef0b7
 DIST glimpse-4.18.6.tar.gz 812595 BLAKE2B 427ab2523236d9aa04ad789d001d5234483842f4d8d812a01b7cf2adc9354917da2e95df7b88917d8c0a282c7aab67bfd2cfbb87a6600a31fe6b07b6936137c9 SHA512 884daf2057f46bbe29ad2c3e9000e18a3fcc5101abdcb5193dcf66e5da650e2528a6d2cef05ab4176243f381ba03f533cba989cad329697808d97a61f1b42d3a
-EBUILD glimpse-4.18.6-r1.ebuild 1422 BLAKE2B 67d8b20dfc96a3f2b6b3130175bc91dfebc4b0cdc91f32795c4437f785671aa2f4c5a964e9d1ab2137dca24fe3aa1069c17c1542cdca8e7525080fa43e965d80 SHA512 d8fc26603642c4732b3beedc8c4747d3fce0ebffea62ac59f11c46d8d49cfaf5618d51c3b0cd5234fd0ed822bf2e3d45659f4278b3c014adc25efc01b9e74e72
+EBUILD glimpse-4.18.6-r1.ebuild 1423 BLAKE2B b865a413533cf0c098cea8c83ebdf6ef21df4b8c2f31fb6ba16d10cc40f1102ed4b307894b0390397dbf355405d8ecf5e5ee37ec222b397037712cc183989922 SHA512 f8addbd18b003524c3e79e9400556188659d45099f76032c7e50f88654f6eecf39f5a9f2e82a1949b8a2a8c59614863521af0734882e90ba3f2e192971eddec2
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/glimpse/glimpse-4.18.6-r1.ebuild b/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
index 0db485045de1..5fd556278b43 100644
--- a/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
+++ b/app-misc/glimpse/glimpse-4.18.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://webglimpse.net/trial/${P}.tar.gz"
 
 LICENSE="ISC"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ia64 ~mips ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 IUSE="static"
 
 RDEPEND="!dev-libs/tre
diff --git a/app-misc/graphlcd-base/Manifest b/app-misc/graphlcd-base/Manifest
index 400165e993e1..ccac56334811 100644
--- a/app-misc/graphlcd-base/Manifest
+++ b/app-misc/graphlcd-base/Manifest
@@ -1,3 +1,3 @@
 DIST graphlcd-base-1.0.2.tar.bz2 522753 BLAKE2B 68612f197d340a7baba4f88b5f7ac4e96de1882d132a0a680fa4b81233094cc67d900cb05d855d74dd5dd777440d3be92faf74b4098e1c8027e09b50e602a40b SHA512 625fe6d0c3dcc698522aa1653ba8d22bdb377cbd187de8c26ab3005de4990c8c02f4c0ee477d27ed3930f5d69ea78eb3cd40a79c6272820c67f587e7fabd30ca
 EBUILD graphlcd-base-1.0.2.ebuild 2164 BLAKE2B 6b4ae541c0947ff0d77864c57a7be8c2359c991b051451f8a79600c8c1f95547a84d0c90b1bf14984d779b0abd062c2e4f8dc790a4f54aedc650b6101acf1211 SHA512 c38c31b8c6a6e9653273b7803e3bd5ba393893d45d7b152052dceb38c90f7273ec82728d5c47343e6fdbfe68f540a635bed4c466021c00275289b9072be90287
-MISC metadata.xml 958 BLAKE2B d705544ee3477a7a1578ebe0fd4c96b2efa4fdc41e98eb6b53a7c48194ad054a3bc1abd77237fe279d062fbc1088e22d63bf898e2d3948d3b535cae502694b79 SHA512 774f0ea0197291a2a114d126121b5db76374893dcc5873af1eece93f482bd0db12f4964b151bc142a2c4f986a9e5e19079a47feb3440fc40d94cb930f074a82c
+MISC metadata.xml 1117 BLAKE2B e3d013a602807ef6a36ad0975c6b31ce1f99933fd50411882095595df5913077e257e08d019060216df048c6b01d38c296725efa329aaba7a376e1102aba458a SHA512 9bf31404b8812b414871f45d9312b6e2dfd492ef4ff3de0230d1eec731b93875729d76fb0e2a06f383aa88d8921f03fbf2e4a054e7ac794722eae32bcd99b747
diff --git a/app-misc/graphlcd-base/metadata.xml b/app-misc/graphlcd-base/metadata.xml
index 73cb3bb594cd..3e6de0049c66 100644
--- a/app-misc/graphlcd-base/metadata.xml
+++ b/app-misc/graphlcd-base/metadata.xml
@@ -10,7 +10,12 @@
 		<name>gentoo-vdr-project</name>
 	</maintainer>
 	<longdescription>
-		Contains the lowlevel lcd drivers for GraphLCD, which are also used by GLCDprocDriver.
+		This is the base package for the GraphLCD driver.
+		It contains multiple parts:
+		- lcd drivers for GraphLCD, which are also used by GLCDprocDriver
+		- lcd graphics library for GraphLCD
+		- lcd tools fro GraphLCD
+		- lcd media files fro GraphLCD
 	</longdescription>
 	<use>
 		<flag name="fontconfig">Add support for <pkg>media-libs/fontconfig</pkg> font names.</flag>
diff --git a/app-misc/inputlircd/Manifest b/app-misc/inputlircd/Manifest
index 15f1b486ac75..ce56823a4252 100644
--- a/app-misc/inputlircd/Manifest
+++ b/app-misc/inputlircd/Manifest
@@ -3,5 +3,5 @@ AUX inputlircd.conf 75 BLAKE2B 5de0021457cc642073bd3491344ed404c59d8cedd80c6a451
 AUX inputlircd.init 259 BLAKE2B 19ed54f2a354fc9efd4a6f48944c5546901d8d23c7e2a45d1272428c874d0d7daad69b93e3206b271e75f98f1fcf1d57d5a5a44bcd39969d44bafd5c88bc575f SHA512 0d6299a2b1ffd2b6161013888e06a59b531769ce2723b00c1ba55e9420ed4a6055023b1d892e372d1d9c438eabe446a6341adfb2dd9b19371727d1c92b5c27b1
 AUX inputlircd.init.2 297 BLAKE2B bf8676b94101dcc9e4ed5480ac5a0f0c3654188892d9049af0fd72359b5da4e160c9e34e371d68278264ca810af0dca4174e97c09e30e4602913a78e3bba5915 SHA512 50f50859ed048b561416e7c21cf083ddda3114331ea14abef470fb04c0108f925f47a75be2b4396fd98b7d140d988288852f2c0ce9fce8218ce2a31e90c48626
 DIST inputlircd-0.0.1_pre15.tar.gz 5226 BLAKE2B 92339021451b2575de5adbf6123f1083e93bfbd8cdd3233389301032678160bb622cf4b92837470151494ec87bcbde5462c557e5cef9fa601ad6da71607dbb78 SHA512 6f7dd15875eeccac1f666af82dabba243707c9b3c3b2e39070032fb3d4a40c1c0ae6fbca2e7be02ce7061d289d9ad07b9ee38c5f5b0f33d5a6c413df5bfd6365
-EBUILD inputlircd-0.0.1_pre15-r2.ebuild 907 BLAKE2B 70f9697226ba3a58e6ed1de74bf034dd29814f13fd569524f8e7a5983d1c632446f624e9a4807e5ff6882fcfa0a0305f12b572e64d50a92f8d0bdd91db8801aa SHA512 393bb7e94cfdfab9b037f94476d1f62ee3c1cb38bedf09c22049558f4eb068bcb14d39c9233344091ebfe9d6a1188e60815416d9f95f8433252849007a3cc4e8
+EBUILD inputlircd-0.0.1_pre15-r2.ebuild 908 BLAKE2B 1ca6b04adf6b57420c78fd3ee3a6a027c03b20c944b0d291672abfd500ec6bfa812ef16ffeedc191be9179f871b976caab146fb8618fec58fdfd4a46db431a60 SHA512 fba410d5303b41b636d8d022e746119e1cac1830840579302e6d37f24e207ba537af38bbdcd0c94cabf2450ea67f8914ff54ab0db80fc7e57d535853ce798735
 MISC metadata.xml 258 BLAKE2B 1878517d827956dbd45c2d86e97fc066cd4293c3cc94d6d4beaff553462c1badb68aa38b3082c01fe6e21ca1519fc482e2670931d007382b8b2c38af715fe02d SHA512 33d52c9b472999f5722ba6a13598524745093ff45394dd1c9f560b051c9d28be465f72db260a148831b1ff8bc175f41d0c1e4b2d038afc0afdd230b039c67c2b
diff --git a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
index ba0fe2e31990..77a0061604eb 100644
--- a/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
+++ b/app-misc/inputlircd/inputlircd-0.0.1_pre15-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://gentooexperimental.org/~genstef/dist/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm64 ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm64 ia64 ppc ppc64 x86"
 
 src_prepare() {
 	local ver="$(best_version sys-kernel/linux-headers)"
diff --git a/app-misc/khal/Manifest b/app-misc/khal/Manifest
index 8acebc8fe5ce..6ed3547fd011 100644
--- a/app-misc/khal/Manifest
+++ b/app-misc/khal/Manifest
@@ -1,5 +1,5 @@
 DIST khal-0.10.1.tar.gz 173636 BLAKE2B 97158bc78dfbda3a3555df3588c61f6a5e8b20d71921099a74ba997eb7ccef05ed931e930afbb09f9c125f3e0e782143dd2cdf4d0da6bd09952765b9117d6ac4 SHA512 5b81a60099c201fa112ab17740b73edb17b29efa1548086766d57d9d595451e7d779aad5a2ce7a2afc78050116782ff6696c4bd284021a5e12c87fe361d15e47
 DIST khal-0.9.10.tar.gz 171132 BLAKE2B c9356bd65197db3a492939fbeec3c51c092ce02388a61fa1c426cc16e97fe509110c2f129203882504dd4d7bbe6ddf95a01d7147abf78a0a9b6c898af89814ee SHA512 7618e34e35726670721dfd12e1434d5ffe4221ffad5d751ef26dc26edab4334c847582bbd4f50cfb93f37a07397ccc467e240adaf3dcf1d9446e0ca6faff7721
-EBUILD khal-0.10.1-r1.ebuild 1264 BLAKE2B a59615939e8a7ffcfec1fac21b93cfece6a5375c7620750b26f1b4d4daec2d08a557c56f387e7b84c5d393c734766a8751e4f67d60dc701de07eceb065112537 SHA512 695583d16532841a04df14f4f22410a3f61ca07eb5dd99bd2403b5f3a0c20ddc745d5df2cf0ac473a29cec48ca92a7b9bfa9a4bb20d7d8222da60b431016b5d7
+EBUILD khal-0.10.1-r1.ebuild 1269 BLAKE2B d5d22e6aadee22cfef00cfa95e429e9a4616c6ae735cef3b7c7bb102a14679c1a9e221cfdf4a6c65a57b1aad317d49b0d64f4e4c134232e0695e6ad9ee922587 SHA512 0adf14a347bf860b8cbbd225c7a27ea13805fed76b3f0711094e08304f22e4fa555d2107924c3f7e3fb64fa535242428d7129888488eeefcae9d2890a0d8a74c
 EBUILD khal-0.9.10.ebuild 1216 BLAKE2B 368d898fdab658268309d486dbf00e081fb52ddcb78224b43c710526e34faec98e3ae92bdf049b240dec6207496e82ce742d3f5dcaaf284916a10fb066451be7 SHA512 9f71b2c9eb0557be1fd20fc1215bf6300a6a30ff0c7beb48fba84e66079ce3f4fda9fb8965d7ac1afb409f56d0fbbe3f154d2f5d2774014ade5370e4bc4313ed
 MISC metadata.xml 284 BLAKE2B 4707a8b6986fae8507e28c42ab61a8cad2b420743fccb5cbfa1bd28b1b4cd507903a3dc59e82411309ae03cf94f10a393a24e94627a15c9698ad26ead19d3db6 SHA512 f820693ee6476d881b86783e810e6be3ad1df41f35dc1c30d03f44551ae71b1e5a99a1aa5f8543ffa15a0a5a1e420193c57d6ef4b88fa98257bf0d4f2fab5934
diff --git a/app-misc/khal/khal-0.10.1-r1.ebuild b/app-misc/khal/khal-0.10.1-r1.ebuild
index 4ac5f62001cb..210ec0a6c51b 100644
--- a/app-misc/khal/khal-0.10.1-r1.ebuild
+++ b/app-misc/khal/khal-0.10.1-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://lostpackets.de/khal/"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 SLOT="0"
 IUSE="zsh-completion"
 
diff --git a/app-misc/lcdproc/Manifest b/app-misc/lcdproc/Manifest
index 1870b318acc8..c31db18d5771 100644
--- a/app-misc/lcdproc/Manifest
+++ b/app-misc/lcdproc/Manifest
@@ -2,11 +2,12 @@ AUX LCDd.initd 310 BLAKE2B 415321c1b8c80016f21e283339e21c6adbbb92dbf99649846044f
 AUX LCDd.service 166 BLAKE2B ef3d9a7af9e8e8d8bb54e11110dbcb44c968cbc8fec63529f86dbb0a027154997d12e927405ca228a5740fcadc7518448c640ddbe5f38eabee1b7698b17b3035 SHA512 d09829efb26c9b8ca01f6cd07f704d55d05b3328866c169251683b1343ec37e569f95ad14b3b51e2d832ea7b0d3eba5579cec02decb86504016e535a61d7ea46
 AUX lcdexec.initd 325 BLAKE2B 7a7b48e2e24c763533934bca78debd36a1fb6146f6e72204777f50d7dc962a519ab06ef0bc9b1c91b36cd726b67679e7a94d2edbd28bd524ecccf6d20f6a53de SHA512 f8bf380b2e452e830cc3805f297d06c4cdf623db91eff310da2b20cd87cd87ef850c1c7e5b843044333167fa8724acb8de8d65752328ec4144b486d0bed6bfce
 AUX lcdexec.service 171 BLAKE2B cad9c32ce67365158a210fbc65c794881cf84ddcba870019e2772eb6b0913fcbcba99f82f803621930b867d72c63f16bc61710174c35da0ba923e9f68dc119dd SHA512 5372cf10ee750122d2312ecb595a827aa3c5f14bf34049f90950b36b7a77a7c36bcf2d72a30dc6ebf8830251c901c9703c05a6c92fdc580940b6ffe1e421cb2f
+AUX lcdproc-0.5.9-fix-fno-common-build.patch 1751 BLAKE2B 4132254e240ec6e2268174c977332bf8ce31b4da28f6e09279d3afa7774051dab5c87b368366f1050da23337152384e1a2d1a116940b4d45cde61fed6083ffd7 SHA512 2a230cf311699f5d30a36d73784e9539c6a018b281282f341a167a0f946212a9d156b23efdf7f921f5ed8941f7dc6f68878ec2d87247727bec78230eb04eda0f
 AUX lcdproc-0.5.9-fix-parallel-make.patch 910 BLAKE2B 5a9daa1871e64b4bfcc7ea2fbc06f0e4ec6493fe61d678d5b0cc252764ecbc1906c102f2347e18a10432bd390b19d990a270423e8054690283b17174a8297a08 SHA512 75c42f716175751c07b5385f87c2d378229c59cb7ef5adb517b23d3c032373627f9d6173987251c5d3c259764dbaa2ad167d8769bdcb2afa1b1387ff1926a316
 AUX lcdproc-0.5.9-use-freetype2-pkg-config.patch 552 BLAKE2B afa135d8abb2bb47f75f5306ed26a5447289618575c26873bf5335c94286c36dc0444b2ef8b74dd7087b0a3d2529602c25de680ff534df303e094a90f258f8bd SHA512 d5922c61274b420dc3138c5345868924ab7562f7aaa267068c925b4c36b74309ce8132103e265cdfc5b84cb6f3d6f5bea7036c617e14e7a22aa32c360202014e
 AUX lcdproc.initd 325 BLAKE2B 405944d2808e308c27732ef9e75d65e388616596ede330848a66d9135c6dfd48101534159c344a3b4afc1fbba9694f412e5a82ed8cc3a9a2cff0a74754348192 SHA512 057c0f6aef2d6e09c3707382f281888738d7e30f25f151f0588c5a678e34f5bc2e2f11a44fe1c4e30ba13c18504e8578f45b92c3ce5822259f9e9a9cba8a6ae9
 AUX lcdproc.service 171 BLAKE2B aca4177b065f31aab4c940629850f7045ff7a9420975f8555f1dad9071cb58a17be8123c4a72f26e6a366ca0edd5581724b16bb3fbc4e0457c9016af802a18f2 SHA512 c71684ad0ff7b81466922676fd8612f6f8ec6641c4504089efb1a335d5f7eccbcce010de1e0c7a33dc07d9cd8abf80a3f5d0118fc7c711fe592ef9f98643a629
 DIST lcdproc-0.5.9.tar.gz 1091292 BLAKE2B 10b26fc803cf14bf301177336bd14497131440f129d16fa75cbb4782da839eb3a3835091d7c211cfc75d35f07823a1c301cf7ebfae25f2a344d0dfcaf894ca17 SHA512 48e11a587570376b9524591f4c23deace9ac1609b83ba9e17f2a4e950d5598f8f88b580ca01c174ec9c2ef98b1eef7ac274c23ca3541d4d7ff918af0598c6a25
 DIST linux_input.docbook 1764 BLAKE2B 8e82173d0169e2e79f2625b7bd572409b10fff1ac1a6ebd59527887e3568aad2aa459bb225d95af5e7b2a24b23671d8e7b3a78fdadc7a70e2fe33a36129bed32 SHA512 9b0579713c6d084fa9e0adee6c04387a3f91375f2cbcf2c7e47c01238df07e355330ebeb98081fd296279980fa808e4943c958772891559731465a9e75436ec0
-EBUILD lcdproc-0.5.9.ebuild 6440 BLAKE2B 0561a24a9874580f067afb5d3fd239182c7bcfff6111cba0c4249e6becdefa5ffe79f5be08510220e42419625b0773837c6a9da7635c0e2f8223c55ca26b6a63 SHA512 64afb2ac8bbe5ace6ed869d68ca77f1264a46466ac3b00d320253ab2b172a58ae197c97ca8c07e5792664e5b3c18ced1876f3db2240ef75519915624ebd25a34
+EBUILD lcdproc-0.5.9.ebuild 6487 BLAKE2B 916b6d67e988f59d64f661dda297a92b2188c2e9e4f4d1252b8f6609f222b77fbaa5f04dd7948bd6560992fd4222423e317ed39ab40fadb05cdb2a65ecdfd533 SHA512 be81a184f0cc244123bf2a63c93d418d8ad5c4643f75aef1a3b8c687fd25e9d038ec6803e97eb44bb2fb6025647adad272c0aba1aee5228b460f28f0fc7be78e
 MISC metadata.xml 1538 BLAKE2B 33c2755d4bae3208e9fb175f57b8e241d62cde6c63ac509d6443722bc8617cd48f566ec6300fbad08bb0b3ab04c5aee652e1b67340f5d82e61423c02ae948aab SHA512 52c3e7e8e0dbfdd2b06cbda0e6bd7b538a4f0a2ddb396940cb3345920ed2e7917f22e2620ac9de1e0a4acb3e9144848f13916ce91f54252632eccdc8974dbfd3
diff --git a/app-misc/lcdproc/files/lcdproc-0.5.9-fix-fno-common-build.patch b/app-misc/lcdproc/files/lcdproc-0.5.9-fix-fno-common-build.patch
new file mode 100644
index 000000000000..2dc472f5d22a
--- /dev/null
+++ b/app-misc/lcdproc/files/lcdproc-0.5.9-fix-fno-common-build.patch
@@ -0,0 +1,53 @@
+From fda5302878692da933dc03cd011f8ddffefa07a4 Mon Sep 17 00:00:00 2001
+From: Conrad Kostecki <conrad@kostecki.com>
+Date: Sun, 2 Feb 2020 18:48:07 +0100
+Subject: [PATCH] Fix compilation with GCC >= 10.x
+
+Starting with GCC >= 10.x, -fno-common is used as default
+instead of -fcommon. This patch fixes the compilation.
+
+Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
+---
+ clients/lcdproc/iface.c | 1 +
+ clients/lcdproc/iface.h | 2 --
+ clients/lcdproc/main.c  | 2 ++
+ 3 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c
+index 40e50cb7..45be5b97 100644
+--- a/clients/lcdproc/iface.c
++++ b/clients/lcdproc/iface.c
+@@ -32,6 +32,7 @@
+ #define UNSET_INT -1
+ #define UNSET_STR "\01"
+ 
++IfaceInfo iface[MAX_INTERFACES];        /* interface info */
+ 
+ static int iface_count = 0;	/* number of interfaces */
+ static char unit_label[10] = "B";	/* default unit label is Bytes */
+diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h
+index cc6dbaaf..ee188f38 100644
+--- a/clients/lcdproc/iface.h
++++ b/clients/lcdproc/iface.h
+@@ -18,8 +18,6 @@
+ /** max number of interfaces in multi-interface mode */
+ #define MAX_INTERFACES 3
+ 
+-IfaceInfo iface[MAX_INTERFACES];	/* interface info */
+-
+ /** Update screen content */
+ int iface_screen(int rep, int display, int *flags_ptr);
+ /** read interface stats from /proc/net/dev */
+diff --git a/clients/lcdproc/main.c b/clients/lcdproc/main.c
+index 01b02baf..7c7a4215 100644
+--- a/clients/lcdproc/main.c
++++ b/clients/lcdproc/main.c
+@@ -53,6 +53,8 @@
+ # include "eyebox.h"
+ #endif
+ 
++extern IfaceInfo iface[MAX_INTERFACES];        /* interface info */
++
+ /* The following 8 variables are defined 'external' in main.h! */
+ int Quit = 0;
+ int sock = -1;
diff --git a/app-misc/lcdproc/lcdproc-0.5.9.ebuild b/app-misc/lcdproc/lcdproc-0.5.9.ebuild
index 592f9d1f576d..2fc2ad8d6a88 100644
--- a/app-misc/lcdproc/lcdproc-0.5.9.ebuild
+++ b/app-misc/lcdproc/lcdproc-0.5.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
@@ -88,6 +88,7 @@ DOCS=( "CREDITS.md" "TODO" )
 PATCHES=(
 	"${FILESDIR}/${P}-fix-parallel-make.patch"
 	"${FILESDIR}/${P}-use-freetype2-pkg-config.patch"
+	"${FILESDIR}/${P}-fix-fno-common-build.patch"
 )
 
 src_unpack() {
diff --git a/app-misc/livecd-tools/Manifest b/app-misc/livecd-tools/Manifest
index 278c0ae82c70..632e8f183ac7 100644
--- a/app-misc/livecd-tools/Manifest
+++ b/app-misc/livecd-tools/Manifest
@@ -1,6 +1,6 @@
 DIST livecd-tools-2.5.tar.bz2 11500 BLAKE2B ed33e82931eb36f6c2648e31cdb867e1427ae7af740204334dc851d710078b87ee52ca0c1b3b714eb05dea78e1e6ace8feec19e8e516a31f7b7623a7c96a58c0 SHA512 b358cfb4390eafa212f2f1b1e604f2b021844f03490e3f0590bd7b5aa12777b096b8db7e2109dba1be5b05f35b625547041cbc69b155c7d910aaa3ed1ddc6798
 DIST livecd-tools-2.6.tar.bz2 11555 BLAKE2B 732cb5f17c0684d778925268cf326b57c36ecde333f177b6cfd51219f1a89d2866df19b1d1a997219fa3e8358eea33c7f87fb53118d5ecfc75671f89a08ce8a6 SHA512 5bf8b293909abda87ae892b92c996a4d64830f2b2b00efed2529beb6d01d6b6aef4703db0ef26087cacc1e48f20cd0ade37f4eecfa6e2bfd90471722dc06f3b1
-EBUILD livecd-tools-2.5.ebuild 966 BLAKE2B 0a99c19101cffd0736f89928f1c67fb8bf8b3daaa17d305891ceb78404edca8126dfb04bb4625ece5ef41e26a3509329305d5a0637ae51bf920cf4234b9266f4 SHA512 34d888c58fce2f1728ec8c5654f7c337ae236461fb6346a49cea6cd8aaeb4bfa8f13fb8eaa5417f2b518384dfdcfa43c27918a0ee115801bba46b73b1bbed3fb
-EBUILD livecd-tools-2.6.ebuild 967 BLAKE2B d57fb14481aed10b32bbcd948b3a2e62d02afba41c5d16d1fa54f7c1dbf68be61e036d1867e4bed50303179f2cb930f6823fa3ebf1831ddf31e45f25f99cf245 SHA512 fb1b115bc548488766e131cccc524481979760dcf18642fd10a1170e410cd6a1fcdcdda18b45b8314c87386964f2033775d44d2c2cd614a6423207dba103653e
+EBUILD livecd-tools-2.5.ebuild 967 BLAKE2B 45753e82c26ec63610bd472a7b3a962c8657bd4b7823d6b1286c1bf2f1eff85d0835fa01751567c3d01d2f916a52089c5ef3d9a4199d8b4c6a089e8844189108 SHA512 e1e4348a1f995820978248aded77a105f566def0dd573bade7051d2f7119b04c44ceee1235dc9edc70258cac4bbbffa0688f5048183d0ac30e73acd12376393c
+EBUILD livecd-tools-2.6.ebuild 968 BLAKE2B 0a0047cbece559afd000da12a8d7acaf598442da8674ede2dd82037a242c804387595aa8ee445f32bf74bb447df7f525044137c931b6cf71bc5ccca3a821ab38 SHA512 d8e9ed170a9d948f17c8e36264bd5880876c41e29524c753080ec1bb9d16528889d72c5438247112f995daaa6b667af8f12fe13c25c4363fcaa3e0486fdaa4dd
 EBUILD livecd-tools-9999.ebuild 975 BLAKE2B 69f5eaf3530334e88e39b197a5843eae6d2eef7b0d77d7b06c47cf5e7dd1d7a81d3a08469586a309aacff0ff2a6cac2b4c64d1a2f6ede56bbb1337aaf1f3074f SHA512 d04bcc2070275017ea935e6a60e43c7345ff39980420c3087f359eaf1b6bba727ccfddd8a18a9c6766c616be078b7b2e3e42201a6e8ebed91f918c67acf5d80f
 MISC metadata.xml 251 BLAKE2B 914f6ce3b97ef33310dd17c219739df48b081adb06e58d6a38a10cf4368eea50a9096c7b274077b6ca67d17ab9601b7c46995bbc89479d2842705dcc3ba75461 SHA512 2da7a6b2b1b7153b8803cc52201fa006313bf75a25f7d917f26eadd7a6426529e4b30a57c3c24cca20865d9dc4f3d56fdfa14b10254158bea2dfeb2c64fcc18c
diff --git a/app-misc/livecd-tools/livecd-tools-2.5.ebuild b/app-misc/livecd-tools/livecd-tools-2.5.ebuild
index ab215519597d..dd81387cc093 100644
--- a/app-misc/livecd-tools/livecd-tools-2.5.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.5.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
diff --git a/app-misc/livecd-tools/livecd-tools-2.6.ebuild b/app-misc/livecd-tools/livecd-tools-2.6.ebuild
index 4e8b71fb4abd..9cc93d10039c 100644
--- a/app-misc/livecd-tools/livecd-tools-2.6.ebuild
+++ b/app-misc/livecd-tools/livecd-tools-2.6.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/livecd-tools.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="Gentoo LiveCD tools for autoconfiguration of hardware"
diff --git a/app-misc/mencal/Manifest b/app-misc/mencal/Manifest
index 06871a039d12..1b431cb71070 100644
--- a/app-misc/mencal/Manifest
+++ b/app-misc/mencal/Manifest
@@ -1,3 +1,3 @@
 DIST mencal-3.0.tar.gz 19560 BLAKE2B 741628e02756cce02386f6439a015c9c1bf8801c1eaf136a761f2dc823b38d746d8e4af23e7c22ec0147f153130c11dd01912f477ffcdd75bf0141b1cdc23276 SHA512 0a99af941b9cea4923a90065813d8434c908d52e4ead1309114a28b565ca8b8e81cf132740be4ab88159b61628c22fba65cd8a74213b58d4db69a2f315d737eb
-EBUILD mencal-3.0.ebuild 502 BLAKE2B d59c58bb4753090fa358814b2d98074a5ce2679ff1673938012340300bbe7c0e6ba968f5a1a3c2ab0379f4f8208458e0b5083b347e58a0f180cf11d7a8307fcd SHA512 7675e6e34d3e4d5d33b1dac1d7ed2175a65f96e22ef71b7f63720f8d2e3b16b6af884168a13b33d9bcc558798e264c19173ac8d572010f2862f337f505c0159e
+EBUILD mencal-3.0.ebuild 503 BLAKE2B 10436e5f9902c62b8c31d1f2a46c7b1434da81dae61f5255bd723c62ac3ba6cef43ac7b8b228245103aadab267dcaccc6d9cbdb6cba59d5723c568c314a68548 SHA512 765299df8770913576984ed82ba5d697bfd08dc4a39b7a0b7c902c08ac231a9bf4126de65093ba269ae07252deff951bd2822b81740b744c366a2948bd5c8d66
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mencal/mencal-3.0.ebuild b/app-misc/mencal/mencal-3.0.ebuild
index 3caf6c1be637..8384f3c76b83 100644
--- a/app-misc/mencal/mencal-3.0.ebuild
+++ b/app-misc/mencal/mencal-3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.kyberdigi.cz/projects/mencal/files/${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-misc/mime-types/Manifest b/app-misc/mime-types/Manifest
index 78049af3b973..9b2a298d85a3 100644
--- a/app-misc/mime-types/Manifest
+++ b/app-misc/mime-types/Manifest
@@ -1,3 +1,3 @@
 DIST mime-types-9.tar.bz2 15524 BLAKE2B 075f73f6d41a6b9100baf891378b12658c1370ac3aee8ba47cdb972cf30835eb2e9f6eb8a6314a7097dc5f90b091607519750860b065a2c4a822e26223925447 SHA512 066cea30c02a326e64680422b31aff0849c0a8c7486738f2edf339b88426c6ac5a365d4fa4c80c84df0fa4c39b5e13d45db314a1bf47ce369c132dd1c46130d6
-EBUILD mime-types-9.ebuild 574 BLAKE2B dee8012293608bf0308b1e48b79cdcf1fef1ec203994d19c78ca400a05a1ab256877e48bf4931abc32ae174473b9803de30401df200d1f5c8f47cf90919e15aa SHA512 ce7d3499ea38d568ec4ec5a29a02cc1f4d51e59a02671c1b8fdcb346b3a40e96b05956e9e406834fbfcf3e6e9819a23956edbeb5839cdda1f5b86f7ac5840957
+EBUILD mime-types-9.ebuild 575 BLAKE2B a6e18056ba58ca999048c7b74597eaadad425887a2ec99ad1ce14c11b5f89412a3b2028aa453e29fac28e0cc7d702fa3b9e038c753b82e062f3bc63793e827f1 SHA512 cca6f05cc893f12ba2f8f8823a30b3d620a41d6af585b7dbc069c391aec84fbcaca507d2852fa23fc6baab24a481e9f7613dfa78a33d7f269615f474de2cbf85
 MISC metadata.xml 243 BLAKE2B 01e59967c1ef8c4287aa399e0b64a651d273858118726001d0cc8c9450f219696f7827ede0f3613b0947613186bd98b31629a5dad3a9e67b0517b37d9e08843f SHA512 563d66eeb96298c8537589586287f9c8c6819985c37609ce4a26e0ecab1ce19192f99a73f63a4577193f90a371ff00ed2a15254a25be6061516b73d0c1141278
diff --git a/app-misc/mime-types/mime-types-9.ebuild b/app-misc/mime-types/mime-types-9.ebuild
index dc95bd899a6f..8a62679251b4 100644
--- a/app-misc/mime-types/mime-types-9.ebuild
+++ b/app-misc/mime-types/mime-types-9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 
 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=""
 
 DEPEND=""
diff --git a/app-misc/mosquitto/Manifest b/app-misc/mosquitto/Manifest
index 7ba7dbea84eb..8c8e2b8e692a 100644
--- a/app-misc/mosquitto/Manifest
+++ b/app-misc/mosquitto/Manifest
@@ -2,4 +2,4 @@ AUX mosquitto 559 BLAKE2B 16a34850c13d9fd6007b5fbd26b4db9e31caa0ee91b8eee8dbca60
 AUX mosquitto.service 261 BLAKE2B 6ea8059914acf8730f2e7d04bfd5f79c59a335b65ddecb4773bb4418260c6ed6d0120eaa2e3f7ba4842fc7014e5b51d1ba376cf1db2009b7a55a53a4e6747221 SHA512 3552618733fc106705375c5a1126db72e356694705312072f27f18e21c142cd75ae3ff1f17854ce54cdee092ff9e01fd75c1a8a12d68f75ead8a3697c69623e9
 DIST mosquitto-1.6.8.tar.gz 589873 BLAKE2B aa2e13397f7d4b6305af3180cd042cd143054e154cf8e6d93b05bc5a10d48419174711a1893fe60c1303a2f83cfbc5341cf03ec595e3640f503a2407e869491b SHA512 c15897df4e0979ee29a1e67cc671f56db600a078e9eb0bea376248b3f53b13ceed36616ad3678e2c9e07d6834a6d75e4efca2c40086069c1546e0223be04c071
 EBUILD mosquitto-1.6.8.ebuild 2844 BLAKE2B 184a91a2834bce30e09267647ceb52a7a2be5aaa38497cdfb0432ba7fa06a4175f45089da2ebaa96e9f51dcccb02aa41564e3b7583d8236854bac083a45b8b7d SHA512 7ada49932aa9eae6b67e0d38e7654c5f4228b3d47682a13b2f27b09e008814fa0b2940bea45b1c393d325932d226423ed2eac9e8d0d9d19d004fbca1846ab9f7
-MISC metadata.xml 655 BLAKE2B de83cc66cc1d0be8f565cb8412104868536ba0f2abf7de393e449805106d0e80d9277dea323cb19c989d4029a8a84bda13a3d93eb1e00f39165b0b204297e596 SHA512 4fd71c3aa058a2a91d8b9f769c407a81899809e30e023ee2bb0c87306792619a90eb34bb17053403b6aeb06549f8deec5db631bfaed946e485e8ec399aed8709
+MISC metadata.xml 762 BLAKE2B 81753b278d8724a15874fec9c3d28c64702687f0ea0e4cf066124e6d80ef78ecb1245b982ee4cdc7d0d616885a09b30a7158d95a7499509f689cf7f15f703fa0 SHA512 d52f55a22638892ca718224f913b795524aecfb3f4e5937133735c294ec50678416cd468746d405a8706f1ee2034d40273aaf74c942df16b04c3c42b8655749a
diff --git a/app-misc/mosquitto/metadata.xml b/app-misc/mosquitto/metadata.xml
index ec6718456c6e..821a61e21436 100644
--- a/app-misc/mosquitto/metadata.xml
+++ b/app-misc/mosquitto/metadata.xml
@@ -2,6 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
+		<email>mattst88@gentoo.org</email>
+		<name>Matt Turner</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>ramage.lucas@protonmail.com</email>
 		<name>Lucas Ramage</name>
 	</maintainer>
diff --git a/app-misc/mtail/Manifest b/app-misc/mtail/Manifest
index d45bea6c4357..c72b8e6d3492 100644
--- a/app-misc/mtail/Manifest
+++ b/app-misc/mtail/Manifest
@@ -2,6 +2,6 @@ AUX mtail-1.1.1-remove-blanks.patch 1850 BLAKE2B dfaffe1b7dbbe54c1db30a7e0ce9c3c
 DIST mtail-1.1.1.tgz 9124 BLAKE2B 804ec168eb5dc5408ffd91fc80a6f080b0575dfb58bc667a3ff3d657cea955a4a697ff3f99470e86e59387e0bb2275cd2a0a6e5ee97bc88f28df4424a4c012b8 SHA512 987816ce5d12996192c881be1ac5a28c3457757e981ab35e657fb226c3980a22091c9fc85f68c13eb1c01939e08e492814b6a03c9b1f4f4bc1878c4f13ec8a0e
 DIST mtail-1.2.0.tgz 10798 BLAKE2B ea822f5430ff67fdc153db5c7d79ecb40f0f9025434eef216e13789ffedf79c00ac3fae1f161805d4ee247f993ab984ffb2e44cb94817e06401ec48820a8272c SHA512 f63686a6b93788ec4e72f5dc59bbd0c5bc5c51cba0812cc894b5bd1af497fd0931f0d5834c0feb5c72a057d3f387e379de6fcd8e3a09c98fc77e5a76ee8da274
 DIST mtailrc-syslog.sample 1785 BLAKE2B d060e9baf750505a0908bb18533aad72675962be98875e9f1fed3c734a0339589122ebe2774cc585b05dfde61d8877e05a42184c966050e245bb57ed2dfe500b SHA512 d6bbaafa7c599f443c788697087ebef69a8e279b0715fa4e5b770531cbd254a646014fa98e5e5d444c48d23974201d36a856b34507a91e1b6abbb423f7015c75
-EBUILD mtail-1.1.1-r3.ebuild 767 BLAKE2B 03b552b47cb444a6be967586324960c47fcd8b7c81521b5f1b1a3fd50588eb76c0da6e91345e2c559a170408e3f2edcc2113d5e437e903256c8dd17ee57bf4a2 SHA512 b13685f6523357b4c3705934cd2dbe1d97e541d978850a9478c66547d102497bae429be25ff3dfe963c203ae1fdf155eb4f756a7c0c1a0577c6ce04ad293a457
+EBUILD mtail-1.1.1-r3.ebuild 768 BLAKE2B 554d1b3065f0c96b69c380ed59ac0fcd06a2c3413665dc3839ff9a46cfcc5e512833524a046e43769f60a0fe18678a3853d29a8dbeee97cee65cc7940806180e SHA512 e95169c9057b2342eb9b14911f385a7a794e33c956a561b7d9be16254a602d9eb379e381eb2c4c39a2384b06b77abb9a817803ee8c4afd90e6d917a4c374de22
 EBUILD mtail-1.2.0.ebuild 751 BLAKE2B 33f2720d407a7e3d5e4838b9cc5790aff3cccb5d11fee3b4cbd9b4e14fd44cd743b7038dc14c8647162296e55756e4faa4dec6f244801493685e086f90c016b0 SHA512 a1123a941be4071be97b408ac4c4cd11d85d1041fbbc54d81c92bd8c4c34435dc22ffc0651228558acc1675397c77d6acbfcb34eac8b410f386309126fc49917
 MISC metadata.xml 642 BLAKE2B 405817cdcf7d643b775f88848ad91930dcf712d65f5c53582ac41656f7d92095bed83add109070888134c074118c54d7ff79359a20d97d0e1459095923e12185 SHA512 7de4bfd79c4dbd929950e191faf4ff6ab90426a0f604fddbdcbaf65d21d21d9a5ec7fb382dc95751ccda8e463bd189dbc07b4d29d92c9dab90e7eb955ace8e19
diff --git a/app-misc/mtail/mtail-1.1.1-r3.ebuild b/app-misc/mtail/mtail-1.1.1-r3.ebuild
index 74792b6f1948..b5d0a84025a1 100644
--- a/app-misc/mtail/mtail-1.1.1-r3.ebuild
+++ b/app-misc/mtail/mtail-1.1.1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://matt.immute.net/src/mtail/mtail-${PV}.tgz
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~mips ppc sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 RDEPEND=${PYTHON_DEPS}
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 1191fdef16ed..44171f57e488 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -2,6 +2,6 @@ AUX pax-utils-1.2.3-python-3.7.patch 899 BLAKE2B bc3037b78e7caea904b91c84d115cc7
 DIST pax-utils-1.2.3.tar.xz 661828 BLAKE2B 4764c47b7a31e7470a454127b9db3b5b27c703a96a66973a6248529a2d858ea38adb246a270a1f343a499515f55b25613bb20c46978e2e0dddc03e5ddb9a2aa7 SHA512 efcbce49aa7e5cd433f9b3fbc8fa82f6d7b0eb80ec40aafde453d6fe96e3565e066e5020f04d71537d8d4e820147f4203c0df2dd330ebb1358a26def3dd5484c
 DIST pax-utils-1.2.4.tar.xz 665648 BLAKE2B f0003f912e42a25c8b587764591f7c466aa4c7a24f38fe101d7b64ea5abca5511b2f9329fa5620d1b4ae1926c2272eb97d4ada0210d4e55d16c7766a055672f4 SHA512 03b84054c59e8ce64d2c07276c61245c8e9b3eca2fc430269531e2dafe120009b541ebb6adc4ff54c13a1da63caf0755fb026ba272cf17d04f75e06b893a3e95
 EBUILD pax-utils-1.2.3-r3.ebuild 1784 BLAKE2B 5047eef121278a753c477cff9f93c40fd5559aaa667bfc12408744eb2926a723bee8db2bf4a52c2846e22251a9cf9747b96a194897973849728206eaffb94675 SHA512 994945da1dfdcbb3c5a330ef34ad363776a9d2e0b80bdce1554fe97fe9520678f16e3e279b587563132e065fb5ef3f5685f0624da590735a2b01fdb8e80a2d46
-EBUILD pax-utils-1.2.3.ebuild 1455 BLAKE2B ab4d234e6513ea35fce6f8c6e57c4f8ff60dacaae4bbe03f5ab1b16a4bac139a7281559691d470285e6c0877b2d3058445fe5af2fb42ead23fc71ac7dbf9ef16 SHA512 d76be941d202b762d7d2adab5129dc95a25a1484d7f412dbde3c3b825ac75304fc3b1f3aa60b33dc0792d34b69e4a6d1ccc81ee9f839b4d77ff93d8a8d9cb258
+EBUILD pax-utils-1.2.3.ebuild 1456 BLAKE2B 102ef557c9ba2b21776da305f3773797906bc4b5a52417008b4675d1f03b30006f3df003766bc6a3d06358df2077d5392dc538ac408bd4a64b10df928d6442e7 SHA512 7819e495c975534ebafd3b7a260bfd9d5d26b022a6ce1d4c9097b0e2be9aae660ff47eb90058f069c8b51cdd6db0098a7e58bc3acb36a786c2163eaf9aa45ded
 EBUILD pax-utils-1.2.4.ebuild 1737 BLAKE2B ec003ef39f138afc07a6b02ec58cd44bd253c3131b03d32196580c848196aa4a318a3c817154d030845d27dbe9f371c8b38c0c353fd60097b8419645b70ee4ef SHA512 35904ea69012a08cd0d8dd28a0cfb56f181415f9883150c6378321eb719d956fff3972d7c037e9cbba12e529bc7c0f74f4fc83a41e1535158973fe27f9a1b555
 MISC metadata.xml 706 BLAKE2B 1660bd83c0164ecb4c187d6271cd1f27a8140906bef315bcfc4be37594f91a79cfa9da8fb9dfd1af66c6c7028ed4d40ef891b025fb12b9486b7ee366a3e5c354 SHA512 3691bf431cb24ad3498b137f0e264562451db583201e1cae327ed201f36d838f01dfe78e3569a2d24593c67f747dff17eec645bacf0855148c72354ebeaa26f1
diff --git a/app-misc/pax-utils/pax-utils-1.2.3.ebuild b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
index 25b7d7db0326..99f4ff6bff9c 100644
--- a/app-misc/pax-utils/pax-utils-1.2.3.ebuild
+++ b/app-misc/pax-utils/pax-utils-1.2.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="caps debug python seccomp"
 
 RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
diff --git a/app-misc/prog-express/Manifest b/app-misc/prog-express/Manifest
index 08962cdf04c0..0a28621ea7e9 100644
--- a/app-misc/prog-express/Manifest
+++ b/app-misc/prog-express/Manifest
@@ -1,8 +1,8 @@
 AUX pe.exe.config 102 BLAKE2B 8cbb33802ee55ed8a814b55372ecfed87b12e58ed4400554cb41e28204f42ecc3cb83f5d7bc23a4806a72b889deda6f451ab5538bcb882915811201c2907ce76 SHA512 282c302d4613f360e8d28cc0ab711ac4125768557d087d6ee46df75c1c7948503a26d46e1d0605b514335bd6626e7840d4886b2ce0ebab148284af166bc55a22
-DIST prog-express-3.7.8-1.amd64.deb 36468792 BLAKE2B 7edc5b4c9b7c145877298ac33db743960850d2fbd4cc33943612573277a32935dba15a531f13ad7d75309291cf74ca8f0b80b084dafd840f7831362315c6b8c5 SHA512 647549edd846330044bf34eb40436cc622c4e0871726a31049a93b032e5e1c4428231bee97a21cf75baeeade4e651f7d593ed0cdeb0698679582ff6a7f4293e2
-DIST prog-express-3.7.8-1.i386.deb 36468530 BLAKE2B 9e6e81546889a5892bce33168e26b067abe91ceecd9a77f8a0f4af788cbb9da3930e3c1fcf682d6b5aceda04bc84d7ddcf7f45ee4936be8833be4b5244f12541 SHA512 149ae0150d5f8cb99aec92485e4309973f425a87d5c46971b850c69263ea2cbf39df73025709327f80e8b01219114ef9b7219bad7647d947de3625e1bec4904b
 DIST prog-express-3.8.5-1.amd64.deb 37867724 BLAKE2B a460a4e7aad36c4a2d3054332d8e380a8b8d3639316aceb7c32053b679540e31a8398b609105f8f4169f7a1bcf114c9a793e7e9a46574a6f6bbe005222a368ad SHA512 b9246633d3d213616884f6f87bbbeb30bed9cc14d46428e284de1e47e4e0c9d9be386bca6194b880bc44f53f7b831e51e27b65905f7a75a065880666d0559951
 DIST prog-express-3.8.5-1.i386.deb 37867536 BLAKE2B 067873da13374cfc52e5ef01cd02ee5594415369269898dab6fcc651f23ae0e16f1a44414bc77125e431c1411e7bfc383c45f4b037146b18a8b727c3d8d08a26 SHA512 5be2e5292986768970f6afaa16cbdd1740a610221f2de3cc21dbf751201753a1064d26d0714e482f9c95a310063aec6e2b31a8fa8a020d1d80583c0b84e0115b
-EBUILD prog-express-3.7.8-r1.ebuild 1504 BLAKE2B 49e7d487e736e3029271fa30e750d400f8ee75b81b9e8995d0680f781847ce5b925dd0b348ac51b3db96a207ae6d1bb542e5dbfeaaf02b24695562ef480aa741 SHA512 6389367325a55a79d1ab443abab31d6efd9ab737534f579b5d56ce1a748f14641ba6fe7ff63419dcc41ede98d778847b8bc8658566f9c692a16c4be95e374b72
+DIST prog-express-3.8.8-1.amd64.deb 37892996 BLAKE2B bc1a7cb59d1e5b2f2dc83598a00c0714127f20a35ff7acc768c2a305459e7a362da2f86c283dbc049e5a9200b2aedd2b019444106ae387e2f4b8ed5fdeeebfa3 SHA512 60d5f7592df20b0fe3119cc4e8e8c9aa6168838c6636b90cda6b9068d4dccf7c025593ee977a370cfbf7ab1fc3bf8373e46bdd0cdb27337874142c9e9d0603a6
+DIST prog-express-3.8.8-1.i386.deb 37892672 BLAKE2B 0735385044db036185c1005622645182fc354d799d1c869cf6e52e4269ab44eecf7c8211eb794ae885332ae8a4ac4a43d7ccdf58548cf50fa82ee65c71138ed4 SHA512 fd91692b7da9992224a657bfc1c48dd07ef0b7813efb7ca640ba57c23ece04a5791e43c246820739ce045dae89aa2b02b0404a419b296f14cb5f703ea59c8ed4
 EBUILD prog-express-3.8.5.ebuild 1617 BLAKE2B 2d5c78601aed379cd65e6caf773046625fef92e38e81e951c00690d194b7f00907583091ac58de6e702cebd1e6b0bc8ce36fea0b4664d4ada594b7baa74b63d7 SHA512 1d639b8c80a359e97db9b4f76a8b051eec078ef8a1ffb51e4ed9da3e7558e3cfb0b0c817809d3403c495026bfa299429c5b8da0b06a361b7527778d4b6f813cb
+EBUILD prog-express-3.8.8.ebuild 1619 BLAKE2B 760175a47233f6499702e31758b2728f0359de50b85289ffff46452725eb4c35588f13e1e7369f49c98e88b29e9899859066c776fb71f24f546b6154edc192f6 SHA512 ac003fda207c3c1423959f92a8d63d8c39366841e70203fe049de95654a95f89a841b795e7e1b08e0f42306bf7cf00248545fb6d85184c9fc4360eea77ed3df8
 MISC metadata.xml 404 BLAKE2B e39e8e0bf53e344e95e80073ea8f88652831e8be20b801a403c83c401571e7b9ef68707a61354f0b15a7469b80f4da6fe460bec364fab6138fe9cee10cb08125 SHA512 59d4a3766eeaf1d963c48223a5b68a0d999d7aafde06bc7f671d08d6d8c0934516c17bf548560e1aa9f5394003cc54afa79e57c2d6b261aa1d81a3307fc93882
diff --git a/app-misc/prog-express/prog-express-3.7.8-r1.ebuild b/app-misc/prog-express/prog-express-3.8.8.ebuild
index 8fa9eb2a5465..899e0b637b5f 100644
--- a/app-misc/prog-express/prog-express-3.7.8-r1.ebuild
+++ b/app-misc/prog-express/prog-express-3.8.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=7
 
-inherit desktop udev unpacker
+inherit desktop udev unpacker xdg-utils
 
 DESCRIPTION="A modern and intuitive control software for the Batronix USB programming devices"
 HOMEPAGE="https://www.batronix.com"
@@ -12,7 +12,7 @@ SRC_URI="
 	x86? ( https://www.batronix.com/exe/Batronix/Prog-Express/deb/${P}-1.i386.deb )
 "
 
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 LICENSE="prog-express"
 SLOT="0"
 
@@ -28,7 +28,10 @@ RDEPEND="
 
 S="${WORKDIR}"
 
-DOCS=( "usr/share/doc/prog-express/changelog" "usr/share/doc/prog-express/manuals" )
+DOCS=(
+	"usr/share/doc/prog-express/changelog"
+	"usr/share/doc/prog-express/manuals"
+)
 
 QA_PREBUILT="
 	usr/bin/bxusb
@@ -42,14 +45,13 @@ src_unpack() {
 }
 
 src_prepare() {
-	gunzip usr/share/doc/prog-express/changelog.gz usr/share/man/man1/*.gz || die
-
 	default
+
+	gunzip usr/share/doc/prog-express/changelog.gz usr/share/man/man1/*.gz || die
 }
 
 src_install() {
 	dobin usr/bin/{bxusb,bxusb-gui,prog-express}
-
 	dosbin usr/sbin/bxfxload
 
 	insinto /usr/lib
@@ -60,17 +62,21 @@ src_install() {
 
 	udev_dorules lib/udev/rules.d/85-batronix-devices.rules
 
-	domenu usr/share/applications/prog-express.desktop
-
 	doicon usr/share/pixmaps/prog-express.png
 
+	domenu usr/share/applications/prog-express.desktop
+
 	doman usr/share/man/man1/{bxfxload,bxusb,bxusb-gui,prog-express}.1
 }
 
 pkg_postinst() {
 	udev_reload
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
 
 pkg_postrm() {
 	udev_reload
+	xdg_desktop_database_update
+	xdg_icon_cache_update
 }
diff --git a/app-misc/realpath/Manifest b/app-misc/realpath/Manifest
index 6c501928b72f..bea84a1754c0 100644
--- a/app-misc/realpath/Manifest
+++ b/app-misc/realpath/Manifest
@@ -6,6 +6,6 @@ DIST realpath_1.17.tar.gz 17800 BLAKE2B f2df9d9f3c73aaf6b4240518cc8ff361b97fa60c
 DIST realpath_1.17_i386.deb 16372 BLAKE2B c8d7c2eb410c8c8129d6847d7cfe13265136fedcb51eb4bdaf62dda0dace1b9c0383445c1f407b404085306d6deff1a196b26cb7bb68b225710054b6bea582fe SHA512 15704a27f3f140c4d69411bfd9c319e3205e7b70cccefdc5bec94ad10d6b6c6ad948c2fa51cf2ed69c8884928ba6dcb83a865185f3b010dc6eb343c2125c2118
 DIST realpath_1.18.tar.gz 17618 BLAKE2B c42cbade8022a0aaafbf012c5f4db899bdadac6d06743a64fa0cf58c0533e9574fe1389939d296986fc1307362399753f58650d9029bf240fc6dc980c17a59f4 SHA512 98daa53b7a6d4b40ea3ff9ea89b7cb97782dd53f031e41a228a5aa8d2a41ae7920cbc1e2213f568098496e5c25da1381f08fb939f8668733a3c391f744fd16ed
 DIST realpath_1.18_i386.deb 16426 BLAKE2B 934d4d61bda3ce069959f3cf818b8d0b206c95ef458487f12c8afa59014dc141dcdf0ebd18a9540dd3104358139ce7f9317aabd8027dca6883f55905cc198d83 SHA512 fb2062041f8089a5ff07f76a9833e9d8bbe9560d72d4d5803c9524aeb782f9f4a135921b9984432ccfa361edc785a0f33785377ddf031a07ed316861a00a6f37
-EBUILD realpath-1.17.ebuild 1922 BLAKE2B 47b234acc39bbe0d97ae1f540d6ceded6a4c7e41b192148b9579820ae5e28f6a60c78a71b33d0d711b52d338ae8c986d97d25d3e5d99cc5883c46f0056391b2b SHA512 579835cba0c03d19591f319471876b16e077b15a1992a58ff264fcc74d77633d889c04c6979a457300ea453b8053b102a415ad50af33aa019aaf9fae858af2a9
+EBUILD realpath-1.17.ebuild 1923 BLAKE2B 96064a59eaf6913ea78885fbae414c4f39251ea6a8bee61c4a7b08ef077abef4e71370c0d7170e094eaec8095419146d02b957497680948144ead5bb18646bfa SHA512 0d5546fef1d333a0f7d511a00cb387f4540f6575751405b105e7b0607deb58f7cb9ffdb84c819c0fc0a04ad43daa851f45e923925c70f203b6988f5ce122a39d
 EBUILD realpath-1.18.ebuild 1945 BLAKE2B 6e721f5da530f526de29477622142ea5cba0bf7b3ec9f6613887ff2de9eb12ddc101aae1209d5ba1336b71ac83db6fa183bcad924bf1bacf2ef9e8b56d729a79 SHA512 62490cc44d6c749d6e541ca5696bef17185c38453e24180ab992a16f2ff7000db492ee15309593dc27394ea7ed8e14e3d9ddaa65764b6c824e5124e4921d7ca0
 MISC metadata.xml 437 BLAKE2B 57ad5c49f2a37e30ac6d2f4e4a169f3fca789aa45169d0b9acfb16ab2bdf714c0b2c32cc2c609dc96e6ba516991b667884714d4bb7fb74b9fb519ae3d4b32c23 SHA512 db21930053e4af656fc8043dd5f60b8a78010aacb019435076db21c201fe0bafb4e742e347c430026991ff32819cb30c9e17819a302dc927c2b513301b5d06a1
diff --git a/app-misc/realpath/realpath-1.17.ebuild b/app-misc/realpath/realpath-1.17.ebuild
index 633e771f4bdf..386ee643b323 100644
--- a/app-misc/realpath/realpath-1.17.ebuild
+++ b/app-misc/realpath/realpath-1.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="!sys-freebsd/freebsd-bin
diff --git a/app-misc/remind/Manifest b/app-misc/remind/Manifest
index 4483536e6732..289106f2b906 100644
--- a/app-misc/remind/Manifest
+++ b/app-misc/remind/Manifest
@@ -1,7 +1,7 @@
 DIST remind-03.01.15.tar.gz 363101 BLAKE2B a5e27b83c20428991982c3cae22b32be6cc054bfd51a868ee3515f5ec4a37aa24f8ec476f566860ca0fbb6f29e7c9f3e6ed023714e52091ebca103162936877f SHA512 335f3ca88237f1ae53768b9ecdeb03f0bb1e706a8afd3ba36121ec76048a08fbc0d5ec72b05e552394b4cf2131be335c49533e1212b7e713ef16002a0621fc84
-DIST remind-03.01.17.tar.gz 355331 BLAKE2B c3c45b58763a02c951ff5b890ba7ee657894f54ac8b235c7c0f5bb83385b7ae867d660dc37ed71f5f35bd17a5668a8ac3a99bc76c22c000642419ddf90b3fd5b SHA512 e5d98c9e2b90a9d31f1298f252c12ff6be378e7d1501e4a8d3361eb349bf50e89aa1bc6b6543f052f3ffa4113241816117a83eb144b8cf452cf0af8b9d0c8a17
 DIST remind-03.02.00.tar.gz 365896 BLAKE2B 3ee47e5c0093c56a2ed95d41eff815ebac26523b64dc09b91ee46d66bac6b2b017d73902ffac61dd12c2088dac8d445fb41d832e22692f47e6e125162f0d436e SHA512 978ee2e6a45756e02bc2de0495d95c4b4377d9af76cb1ea5070f8e2438a451d2bf44245b93018bcbf6ea217520b7b4c8766d5eab354f9a0bc4982b25e90bd278
+DIST remind-03.03.00.tar.gz 390762 BLAKE2B efb17d51f9b71c175f8ff79d8d77cca44ddaa79c4837842673530ea130daea864bacd9139c27233a5846708b4162cdb0851ed57ccecce4b59b58d0acc79aca51 SHA512 0ddd751e42e01a841f46eb21a1392d353efa4e4d63c15b7ba6d7874becb16af537df4e41683db5b1bc3749d5e334c972f8b708b92bbe6f0a9e5bb6a80756486c
 EBUILD remind-03.01.15.ebuild 974 BLAKE2B 4abb01f3621af3f3ef79942c9e90963bc595e5c628a32c47511e2797a39bd6bd97f0f68916541dd2d542ef784730c6a26b0dfafa43cf1a1620a4ed5975b8adda SHA512 c03bfc1521f8ae9e33269de91879d8c66403b873a703f61667540e08299134f620ceb0ca01c4b90cef11ddd93d2076a479966612f15a2565570b8f63291590b2
-EBUILD remind-03.01.17.ebuild 1009 BLAKE2B 4963276ab6516b75b19c4ac6ac55c43e9a159c3edc67479a26787ddad1d3b250247c2eff2a4a412d0b63a0082f2488069eec524fbb7438b0c3411b25b5ad3452 SHA512 aea067292b56634e21c5241a3a1378df4a559b80f8dd0ba5b7068b9c9c9cfcc84657cb3a42b53944e2c034cdb61e41fcb2e39468e9ebedef3a0b3157cb524dd7
 EBUILD remind-03.02.00.ebuild 1009 BLAKE2B af4a4b54fdf38144e887112c655c1bd7f53a891a1596b47c3a55b743db1a173c20f58ab7dff65d80eba4df9cf10b20dc1f9cf683d8cbc38df9212812f86f00cd SHA512 2317c271d144481c8553a2b95eb8b886b6239fe5fd8d1090a72e8f4129d17b9339a1b026ccfaa599f2d54ec830bb2feb8ba8dff87dd967b3713ff4a2668110a0
+EBUILD remind-03.03.00.ebuild 1009 BLAKE2B af4a4b54fdf38144e887112c655c1bd7f53a891a1596b47c3a55b743db1a173c20f58ab7dff65d80eba4df9cf10b20dc1f9cf683d8cbc38df9212812f86f00cd SHA512 2317c271d144481c8553a2b95eb8b886b6239fe5fd8d1090a72e8f4129d17b9339a1b026ccfaa599f2d54ec830bb2feb8ba8dff87dd967b3713ff4a2668110a0
 MISC metadata.xml 282 BLAKE2B f175ac89f79f8ebbe3bc806c0c4a8169e2a4b88708d85928db9a23dacecd92a2acb1c5d1f6a49a2f8375288aa4b2db910af8c325557540ba665c37a17e773721 SHA512 06c94ffb49c985c4344b170b902427ca9ce0c23b6d68330af227ab1771794f8e8b6d0ef75b5f69293c8ef0d3264c8799e1389ccdf8dfbe7c665c6477c07479e4
diff --git a/app-misc/remind/remind-03.01.17.ebuild b/app-misc/remind/remind-03.03.00.ebuild
index b9b191eb4e14..775c66a900a6 100644
--- a/app-misc/remind/remind-03.01.17.ebuild
+++ b/app-misc/remind/remind-03.03.00.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
diff --git a/app-misc/rioutil/Manifest b/app-misc/rioutil/Manifest
index 7efa560efa22..c16dec9c344d 100644
--- a/app-misc/rioutil/Manifest
+++ b/app-misc/rioutil/Manifest
@@ -1,7 +1,4 @@
 AUX 75-rio.rules 1452 BLAKE2B d464d692123599291d590c82c872feb99c3c7c2f92ae92c93ef45be63533398167e140d64755da8d8382ba5297bfadb9bb33966c0ab60192982ed9dc9f450f3e SHA512 e9d953045cf4b587eb19f95ef0f429fefb1919d335662455e62334331c99ede3304952e18c52d41f0051eedd4f8148c469c75db9600c70ba954281620f760a65
-AUX rioutil-1.5.0-buffer-overflow.patch 515 BLAKE2B a5aef116bd7612489f2036b27dd5c2e7b576ef343be8551f584b672286eef37dc2b52ba1d3aa7eea868d20bff22bf9ffe30b51d5fe09fa4d70a5fa8a44141635 SHA512 6face8d7dba4f34034683a1a2bcf01c18b4feb104da2b9e15ecb57e2fc26717e4f952bd03ebdbabb92b0c63c540ca0a29f637879533dc964817744972d48edc2
-DIST rioutil-1.5.0.tar.gz 401244 BLAKE2B c7f317b0e995cbe61122891681d9756b06aacd624cbdcc75fc2111d19b0493645558e31090660bc4a4ad2ebc3b284bbff637984389c3a18bcd838e763aa4a2a8 SHA512 3e3bf1c053e2f0146c504c5015e33cd3281daad136f41d82100d6181b6720c7f1131615c663f821573d7aeb077efc1b59e8e23a8f15a851e332ad61ea0479f1d
 DIST rioutil-1.5.4.tar.gz 84592 BLAKE2B 8efb92c3f178960d425c0b4733d061f2aa72767513621e379ecdc6d69509fcd91e38a9becd857e695f534f40ac7eaa3871c582df843f3b7b47298d48c0c18803 SHA512 b64027089a7c0a3b712486e3b2549dae5a8ceff9687a183fd411f6b9d197a97ea22bd7294242b3f9e8522da9ebe7e87dc5bc980633632ce3d4884341ee085a62
-EBUILD rioutil-1.5.0-r2.ebuild 775 BLAKE2B 00ac259a075413e069b610b4bb2ccc59158c76ffe2f4d3a52ce72fa2c58da1c18f3f31b81f485d412cd4b8fae3e9ebe5ebc42e180071ee674a7af4cc3c2d82ac SHA512 4ddfbc0dc5a778630e3ee61343a4c9c5dc102e7ea8d46ff5575930761f41d82240e1035209e9cf9ee54d3650c2b790b58b0f9946b9d6695bbb5607f848c57134
 EBUILD rioutil-1.5.4.ebuild 842 BLAKE2B 9d27ebfeab4b502b450defe1aa8d3ef357123fa4dc17f0450d2984f63d202d38d2c5605dca289665227d6856982d913b4c528bbc142336362d2e1ebe8f62dc64 SHA512 8e11fe5223cf75d41ce160259340d9810c66788412d97619dceb1ad2e5ebbcfb348510551c9ef3f4d3fdfb18beba5f2adaf4eb6514e4fe3177407324cd1619e7
 MISC metadata.xml 878 BLAKE2B 90d6de8c3ef6a26b7823c2d6d03c24add333e4033c869c80776831387363f0a127e9a520425390d9081fd6537fd0a1c0b6cfbd2bf9dbb28d63722e54afa11483 SHA512 e087877391095c7883817a9123f3a3dadcfe1c0c4519bb42ec98c62093280fac8ec83011fe2ebf26b5dd8f6b5e460ed6df8db3dd612acd40f831d82a46c37463
diff --git a/app-misc/rioutil/files/rioutil-1.5.0-buffer-overflow.patch b/app-misc/rioutil/files/rioutil-1.5.0-buffer-overflow.patch
deleted file mode 100644
index 1739a146c485..000000000000
--- a/app-misc/rioutil/files/rioutil-1.5.0-buffer-overflow.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-flist->genre is defined as 'char genre[17]' so don't copy 22 into it
-
-Patch by Kevin McCarthy <signals42@gmail.com>
-
---- librioutil/file_list.c
-+++ librioutil/file_list.c
-@@ -241,7 +241,7 @@
-   strncpy(flist->title,  info.data->title, 64);
-   strncpy(flist->album,  info.data->album, 64);
-   strncpy(flist->name,   info.data->name, 64);
--  strncpy(flist->genre,  (char *)info.data->genre2, 22);
-+  strncpy(flist->genre,  (char *)info.data->genre2, 17);
- 
-   strncpy(flist->year,   (char *)info.data->year2, 4);
-   
diff --git a/app-misc/rioutil/rioutil-1.5.0-r2.ebuild b/app-misc/rioutil/rioutil-1.5.0-r2.ebuild
deleted file mode 100644
index 0250aa42cf18..000000000000
--- a/app-misc/rioutil/rioutil-1.5.0-r2.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit multilib eutils
-
-DESCRIPTION="Tool for transfering mp3s to and from a Rio 600, 800, Riot, and Nike PSA/Play"
-HOMEPAGE="http://rioutil.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rioutil/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="virtual/libusb:0"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-buffer-overflow.patch
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	emake DESTDIR="${D}" libdir="/usr/$(get_libdir)" install
-	find "${ED}" -name '*.la' -exec rm -f {} +
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/75-rio.rules
-}
diff --git a/app-misc/rpick/Manifest b/app-misc/rpick/Manifest
index 3da12c745bb3..54f48ebd4e88 100644
--- a/app-misc/rpick/Manifest
+++ b/app-misc/rpick/Manifest
@@ -91,5 +91,5 @@ DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f955297217
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
 EBUILD rpick-0.4.0.ebuild 1721 BLAKE2B 99bf4ac06651352a6566ca819f2affacf3fc5177931347d08205e0b6c0f1124564e378c5fbf7ac318310d16948b5c751d10f1268adc43878ea3eadb4fbf92d13 SHA512 f8c81a153fe04392b0c42556cb15b4e62046e50a96c20f9d6621d6c3b8f9589e4a26773a58b0d77eaf4e2b620c58e9f7ace3017f4af6705f1f1e8d1b60042afb
-EBUILD rpick-0.5.0.ebuild 1825 BLAKE2B f810db884970319868c6596050ee9716644aec45f36c81f842c54165b972e8febe3e23bf6308cd3cf7a73950b9c5506ddd4141bc02aa9119e6ee22af7581e671 SHA512 6489f9fdc9ca62bc47339ac18a3760576d0a50a4d2b46e425437dc870d7146b9cc5796165f41c02a20cd29fd950186cde9b2eefc1ef5621a4b81266173e2d2f8
+EBUILD rpick-0.5.0.ebuild 1828 BLAKE2B c24e1c4ee0cab50b58e1d7d7b36993e888bdc3c20fca7a00ab35d48eb006ae368fb68cf25a2b0cc7ccba8da7a9c4fab888cc49595c09a7734b44a1c262e90282 SHA512 8fb1124d11afef641088dd34f3b3bfe086e4abca40556776bbb998e4047e7ee8bc2e29d9cd0d6a068d7d8a5d74da5b5b9dcbfff223e7a4469fd4f06f77c7debc
 MISC metadata.xml 952 BLAKE2B 96e5353f41d21e7bf84e9519ce7fcfb39e2a06ef805751efdca7c85c5d7c121114a425c79b2d50c1eabd654b8519d4a51e66fd26e2ed55c821584ee9e6b821e2 SHA512 4da1e603b5f60c93f5d6a423a0306ee6132cfb2ad32b6acdf922e72d633d9a87abcefbb236011d63469a25247288cf2f618b4764cc43dfa8b21ed25bf2f7a2b3
diff --git a/app-misc/rpick/rpick-0.5.0.ebuild b/app-misc/rpick/rpick-0.5.0.ebuild
index d029e94e66d9..856fe73801fd 100644
--- a/app-misc/rpick/rpick-0.5.0.ebuild
+++ b/app-misc/rpick/rpick-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Auto-Generated by cargo-ebuild 0.2.0
@@ -83,7 +83,7 @@ SRC_URI="$(cargo_crate_uris ${CRATES})"
 # See https://github.com/onur/cargo-license/
 LICENSE="GPL-3 Apache-2.0 BSD-2 CC0-1.0 ISC MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 DOCS=( CHANGELOG.md README.md )
 
diff --git a/app-misc/scope/Manifest b/app-misc/scope/Manifest
index 09e69a8623f0..14adc5d02645 100644
--- a/app-misc/scope/Manifest
+++ b/app-misc/scope/Manifest
@@ -1,3 +1,3 @@
 DIST scope-0.04.tar.gz 69250 BLAKE2B 9c2f2455954e56188d6074d99c4636eca720863be04e35fe79a78741c5eea0d4421b1d1069f2e88337c024dde8ce8ba111551ee6901abd5b64b8da428efa4e26 SHA512 9067b7a870d6d409c2ee0406a7ba33e5a2bfb395de4ccf9b39b39f0ed49b9b4f7290844be7d375c7638e65715b4e1f4d80bfc6f333b9bbe1de5fe695eb164a03
 EBUILD scope-0.04-r1.ebuild 401 BLAKE2B 71961debf5921f846e2f3e3e58aa5c9fa8e35c1c0622df51131c1fc8f919d9e1e74d2e1e3566774f25e2811aa88ce149357b7725cb8628b2452c83e408a33d43 SHA512 be265fb79b08556326cf89714f4066c35d3840ab1aa7fbed42e6e996208589b0c414e11c50516d97dba7f2b623e554cddcc293b488822f529013a49d4650c1ec
-MISC metadata.xml 422 BLAKE2B f9eae1346fd4dc916a5e81e8bd1cccf58abaae403efa660b4e9de637ebf1a2076f383ce1126e3b29460cb00e37409405e5341e79f0ab33c4981eaf4658306319 SHA512 e8d34f2cc9529a902c6840c2873161099c432e04dcdbf08566fd0012641057ddb47fd5d67d42b924744dcc0c9a81ca6ef9d0be6127d9e9fe46be8791a77f602f
+MISC metadata.xml 355 BLAKE2B 907ae0fec9a4a2284f98737d79de3747882c83bf3dee2588056ab3baa2720b987eda2930a3b79dae83327363d13fa72b98cc04d7b3d477f0b53f26eb6e11396b SHA512 31b407791cd97b141997fff192ac75298957edee59fe3a9c46d7a08f839b99ca2e4f3536632beca933d74a8e22464dbd7fd34fa61c106829c62c8dc69b1b8231
diff --git a/app-misc/scope/metadata.xml b/app-misc/scope/metadata.xml
index 6cc19a839b73..2cb7edde3a31 100644
--- a/app-misc/scope/metadata.xml
+++ b/app-misc/scope/metadata.xml
@@ -9,5 +9,4 @@
 		<email>pinkbyte@gentoo.org</email>
 		<name>Sergey Popov</name>
 	</maintainer>
-	<longdescription lang="en">Serial Line Analyser</longdescription>
 </pkgmetadata>
diff --git a/app-misc/screen/Manifest b/app-misc/screen/Manifest
index 60331b18fcf0..ab95010ce9b0 100644
--- a/app-misc/screen/Manifest
+++ b/app-misc/screen/Manifest
@@ -9,10 +9,10 @@ DIST screen-4.6.0.tar.gz 849062 BLAKE2B e08915bb34d4e356eb33c479f1b2dc7a8f4a855e
 DIST screen-4.6.1.tar.gz 848979 BLAKE2B e78874b6d8723c52f827ab5e6b665102d7fd831f03a0006f9d31e000535ccce95ce08e2d302e34ba2d567167a917c8bd3b875843828d1951bcb38ab6ae4e0acf SHA512 e5d029400ed5b509ebddc1f55812c33536d6f5ce91119537c7d06e1fa7dee84939c43337df4638f61c818ce0412f4d08fe212202162a4483a9e84bbc4b3e4336
 DIST screen-4.6.2.tar.gz 845210 BLAKE2B feea244e2e0c8f638442a524cd7cac93c6c5e576541bf1321fb32bc9424abf53415d00ebcb4a13a9613788c1baad6e132f209bd0a017b100e0687b3658603aea SHA512 224bd16ad5ae501d1b8bb7d2ba9cc19e6a0743de5a5b320109c2f6bf3b1ca564cc7094ed9211be13733d9d769cde77d13fe236341d448cad0518038ab1e85c99
 DIST screen-4.7.0.tar.gz 854192 BLAKE2B f22ee3f3ad7591ee2641ba9667b131298f3cb9b7712b0f0db28516c60d0a0768893eda2f4ce35d9c641871247a638a03c2550328f1af1f85ab5ce8ffa9b77d54 SHA512 44c7a33e2ed772ce91998cdc07556ef7b972e5b100335e14702b273a234e437fe6415de459e7b6d34c6086282a432778629047424ef9159ac6fcf26d22b45745
-EBUILD screen-4.4.0.ebuild 3957 BLAKE2B c1de4c18ffbb612914c015b06b155576222638aefc103e27816b43589f4e993069ec72b18be7c1f9a1db3c95cc518286d611bd8dcbd4cb20fa21e8f4c5ec2bd5 SHA512 9560f54247cc9af7b76012cb0028142f9b6052bec5a78b0ff2488490760c68a4e7feb366963e9fc821efc85db5300630ad73295630523c7f89821eb696dffa2d
+EBUILD screen-4.4.0.ebuild 3958 BLAKE2B b101f209745fc0dcaa7a5cf5a768933d40844f120db3d2d112344d60b9afc9e5c5f8d40086ad90116acb70900f7130b25d8df37bbbf4855321c825c3c1b40cdc SHA512 fc1cd4b09c635c05263cc388725e2b5220a8e8826e2f34bf1e31d2535f2aa1796b97a6076895020be7b819058eca2ec6212c2ba892dc134cd375c378af12862e
 EBUILD screen-4.5.1.ebuild 4104 BLAKE2B 7315316224044a673dcf0d6c9d467e62d1cf2f729c5fbcea612f3a50096112141546506b020537e3a96ab766550d7cc65e73ad08cb6cb68d3a6064add9f65f9c SHA512 08f1eea6126c4f9b818a60e28139df7a7d16aa7fad52019d08e8e48be2c5d8ffc4a1e43347fe1881fa9953176f59ab95d510fafe94ffaf32385306b0abab2249
 EBUILD screen-4.6.0.ebuild 4052 BLAKE2B 9f071833c6e5f3b853fd1314df4ef82002c647444a724f99040f6730278fad5e86eadb7b79b6b1af7a9e4ab414e213525c59ba76d303238b170b370ed29a3d98 SHA512 d04600a469600dcfa8eb5f7bd4ddb6f0847bd84e3221743e36af22bb1d60246fecd51b74f06929442d47d28895260543a7fb6efca420ff1c22f95ea23eac0ef7
-EBUILD screen-4.6.1.ebuild 4158 BLAKE2B e5337959d9c8d2559e448071baf510e55eb1e2696aa18c4b4c7d79defd03cffab88fa8a7e567b6af770393f14d1c3df651e633d7905386a5583d5129c4cf8d50 SHA512 e5017e0e8d4bd1022e1783820d8ceea4e4d7b8e63f4be3753c4111d309a82ff4e1dc8e159916486ff45a449ece052ec9acc1c83d36828fd201b6a3e73780c788
+EBUILD screen-4.6.1.ebuild 4159 BLAKE2B c3ddce68a667605da2db821e98460f920d3491dc2970ee2658d603710fff6a8b571f0d0f578a0c975ef66004d8d8e9da08dba783201d128063cc177f3613d8f3 SHA512 9e0b51c6f370ab5cc7df84c4098fe31d1ed2fd2d05bf8831845c4f756542f1aaae1147f36d9f0126bd108a322f3a4a206d6cbb504f4675c092d9319342e4b0ea
 EBUILD screen-4.6.2-r1.ebuild 4206 BLAKE2B 48bcdba4bca6a817e9c5d71b0c87005d416ee93f4602a1fa2e37d60a47d78ae6e67095cc4d864095912c78390dce5faa3f265814f2dd767d962f717895caafbe SHA512 af3ae5c220238dce3cc52692d48b2703b0b94fa9cb48716e1f0731f7c10ef3e30ed4087ecace455ea4475cd1f69fe886928a46e2befb9d80a6fbb914f2e81fbf
 EBUILD screen-4.6.2.ebuild 4207 BLAKE2B d24b2a2007144231ae9a24b9a25575fb17b10648de3b9b0d1e71ec1e453fec1a4fd7aacd1bfbb3802b70c43d42903ce6f6f3ae0c05831fcd1687e508f299457c SHA512 2f2f3929d96a7c95a5fbd5cfb3feda6efad52311b7cd5a69bac5a67735a85afc91cb1e1515aa3f3a3580babdf8e826a7ec2f37a79c811152aa914a2e6ed62164
 EBUILD screen-4.7.0.ebuild 4206 BLAKE2B e3572233ea5865e0f4765e0ba51e7edd63e2c9ab77c4f5c44e2268a8be049156edca873ff00fb8ea1deb97b2e8525e64768fdbcb8c8ddc088e654d4f32010a98 SHA512 24bf75dcc7c41dba4508ef758bbd2af57126ddd53f87b9e254b18ae4bebb795adc9fdfecc0f3b7502db7a6a49ba845df28badd0efbc25e0d27f14569bde1c0da
diff --git a/app-misc/screen/screen-4.4.0.ebuild b/app-misc/screen/screen-4.4.0.ebuild
index b6023c4e5928..298af882cb83 100644
--- a/app-misc/screen/screen-4.4.0.ebuild
+++ b/app-misc/screen/screen-4.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nethack pam selinux multiuser"
 
 CDEPEND="
diff --git a/app-misc/screen/screen-4.6.1.ebuild b/app-misc/screen/screen-4.6.1.ebuild
index b4fad2505ebd..87c92ae5e352 100644
--- a/app-misc/screen/screen-4.6.1.ebuild
+++ b/app-misc/screen/screen-4.6.1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://www.gnu.org/software/screen/"
 
 if [[ "${PV}" != 9999 ]] ; then
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-	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 ~sparc64-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 else
 	EGIT_REPO_URI="git://git.savannah.gnu.org/screen.git"
 	EGIT_CHECKOUT_DIR="${WORKDIR}/${P}" # needed for setting S later on
diff --git a/app-misc/sl/Manifest b/app-misc/sl/Manifest
index 0102c0850b22..e9bc58f5baa5 100644
--- a/app-misc/sl/Manifest
+++ b/app-misc/sl/Manifest
@@ -1,3 +1,3 @@
 DIST sl-5.02.tar.gz 5353 BLAKE2B dd8513bf22cf209fe69e28b4f3de5b11db6cdb8afe375fd32ef40c7b21b2ec39dbf2d71a260c13fd440219fb1209957beb1026d065628af45f6f2ebd0437956e SHA512 a4d18bc79d7e0eca7748b10226a6b2a85a7a01d636e4e9215bf524a7849bc5cb250034326e5a69f7423d79e40b92182fddc0e56e25df616edae06369c782cb26
-EBUILD sl-5.02.ebuild 871 BLAKE2B d3d25fb93dd19037f652a7c1d6d873977e4f94fae0a77dbca31885d68028e4305f00636c190033e40cebf071d5b7681128df0484e0140db0645d4a87ff51ae71 SHA512 362fc09094f8f72b5bcbad651d9123b253a96a71c282c2c2c40bec5d94d622ef4db41857d2f4e65a09e145ed96bd6376ad521f8224a7e4ed9de8e188c6eecef5
+EBUILD sl-5.02.ebuild 872 BLAKE2B 949bbdd93eaf0edf9908ed8aef304498015dea48831fc9244f03290c76c1a5baa9c446cbfa59bfb5737dbc6df0bc69fe45aa502999d9bb64288bfec99bc0a723 SHA512 28445beb7158f9c1dc484e2b94beaa2fcf1019427250cee9c28e895f7609b4d839f353fbc537cfc1ee74d55afc78258b31ef9c8e8cf5d17da462ad36d33c20cd
 MISC metadata.xml 607 BLAKE2B 340be599aa5fc6dbf2f9848c0514b15dde7fa7daf94006c97b39fa693002157472b6b653fc40de67bd8e6fe0f1c2798769790f5a7ebaccff63e4035b7a8255eb SHA512 7f3cdb880453bbea4ae1cc7932e640331ec88693dfac15ab059e6579648834a958e20e8d1396c1beab386247c95724abad199ec7cd607e5fd66c4fd519bb4a5c
diff --git a/app-misc/sl/sl-5.02.ebuild b/app-misc/sl/sl-5.02.ebuild
index 6a44c8392318..1f47b75eaee9 100644
--- a/app-misc/sl/sl-5.02.ebuild
+++ b/app-misc/sl/sl-5.02.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/mtoyoda/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="Toyoda"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="l10n_ja"
 
 RDEPEND="sys-libs/ncurses:0="
diff --git a/app-misc/spacenavd/Manifest b/app-misc/spacenavd/Manifest
index 3221c4960b20..7708578e338a 100644
--- a/app-misc/spacenavd/Manifest
+++ b/app-misc/spacenavd/Manifest
@@ -4,11 +4,15 @@ AUX 99-space-navigator.rules-r2 461 BLAKE2B b97685a2c3c628bd5a52e66d044d2ef8123c
 AUX spacenavd-0.5-custom-flags.patch 2008 BLAKE2B 789dc350c1ef63c052e5ff298dcdd0c0ea4a2911153b51a01d3b933c855865d752e5cda72eb23fbdfa0c4170469b0858e205b724dc1cd4b52d497ea114748af1 SHA512 547d9f3098846901418acb71be996cec39bf18616e4a7eee5fc09bc201bfb2a534ff70f38d515b0f6c685330d002ea277c03b448ba70de4a3df65e6286780174
 AUX spacenavd-0.5-destdir.patch 649 BLAKE2B 7a3159e7820c03cc5d38ca54a732abc46c2436e277353283c0bd70fb3f0e3d60adc99f925b5c94d5873cb9a8234e12c86fa1dcf549f87c9fb008b6d46e18655e SHA512 4330ae7b49e661a60f01931716f9924c01cade4e169b3de48ec08039099ce10c6dfe5c8df9a3b01c1890ccb83b3c92d45ea06f5fd9465c3f1514902cc375e1f0
 AUX spacenavd-0.5-no-x11.patch 388 BLAKE2B 14c4cac74d5eb13d2c3619b5dde2296f934dfb6215dfe72538d2135eaddf39097100d6e048fe8dfe5e3acaddba02582d7195f7537a6e10b2bdd4e97864430a0a SHA512 d6cb2d6337b3e19ef56f5e0ccbfdc731b038009df852b3d1f7272001aa18e70a1701c3af2d1b4976cac7392a6176c0f4cee787d2c9b4b96ba029d1cc0db3d7ae
+AUX spacenavd-0.7-gcc10.patch 842 BLAKE2B f86fe95b3ac6936ca4be6712fd0712cc4c389502988739df6b06e6e5321d8420e6adb31befa373e647d1c10ee4fc9b8425d97a9677c85994eab09d05ebf06aac SHA512 72b27ba6731159fa795ddebe11f0bd2a212f3887909ca1af61d3d79fa55d3546ea31a5ced529a4558ea071d6fad3739270fcc4111282d7801ce59207fe5478b9
+AUX spacenavd-0.7-no-x11.patch 566 BLAKE2B a70e491277adce00ba0c42b088957a151bc5133abf75b52ed8c215eca5773b7ecdbe4ca8c0f17061b5e31b86066a75eb4e351aa84b43d23a9da9835736547eef SHA512 3ab741b594c5922221a34f4091665429da4735b0678c16ebc0d183c6317e1ee804e2b152e26042cb4981ff5487a49e283ce77c9a0232a13e38c87bb478f960a9
 AUX spacenavd.service 143 BLAKE2B 43621538a7362ccd655ed06517865b0b4f7b992aa6ded4765d8b4cba3a347e260c15d21792d4e0ee3d31cd7817a641cb2f8c42989bdc2a1f20d0fd4521fa2e20 SHA512 1f2fd8bf2bdffe3e52f5e2e53e0643e0d5ad5134bfd636ebc2c98f397da5c87bca3582fd76f9e987fb6ed3d17130196f4eee193998f97e388dc04877277c04d5
 AUX spnavd 580 BLAKE2B 948a29de5edffd17643ba2540b9a787e578e6114cef0d7536120f9a6f0b69e2dedb65a80cd8dc6827ae9f75500d1d13eadc83431927eda159cc3705f53f3bee5 SHA512 460ce173a1a68ab571fb39a0a00bdedcffaee5251037cc5787ecf90054f67333537087b3fabfd4a0e5b28acb5f72a7ef9b2bf50e9279336cdf95a18ecec13ce5
 DIST spacenavd-0.5.tar.gz 41746 BLAKE2B bd97cb9ad1ce684cbe0f39e03db0fe0a9cead9aa4a8142546632397fa923fc1067e2d33ea0270625b5bb06bc784c75f0e9ae49cfba7194d23537a7427abe1e68 SHA512 908f598e4ba5febbc1191cc32cd444817acd40c22e79b1f139c50787e1e25d4cd8328dc3fd6d9dde09bb80232b52f0e75ae429fb3345eb51fbe5a47577b038e2
 DIST spacenavd-0.6.tar.gz 54730 BLAKE2B 5d158ebb190359c6e6c2a20093f824f176e028c0d375ab4aadc635f7b26884df2ae58585e82dc3978892d04d139cc6c4704fedc300508f9314478f19d4ee11b6 SHA512 ff039e169805365ce8c1df1258eda6d263a0724c087b22a9e78269629455580817027d936e6bb7014b7654f48aa23232e8059585175003034e4bd3e0d6ed8200
+DIST spacenavd-0.7.tar.gz 55634 BLAKE2B a4257bc48e4b7973413cfc74fb4157cc93d27dd8e4c45142bfa0d8b30b94e517cff1e003c9b7216b498539a529bcfe623a5dfec48644a34c1bd300eb07d297a7 SHA512 241ed0ecf78fe683ae1ccda1e69afcee82f6ad55439516a5e02d3ff7eea1a4c5903e778e41f3e0d8b6f5dcbb8fec572a52e0be108a081bccb5a279af2277b615
 EBUILD spacenavd-0.5-r5.ebuild 2319 BLAKE2B 7f555ec38a828848ff3686def93a853a3a3b1c8af40274c7f040b3143f1d0f44c71d9931f0587db9c48a23aa8085fe3297c6d53fff4b9ffea23c4a894e362f4f SHA512 4fca63971153edfb5a69ca8cf40e543edcfd3f8c97ec729fc3afb550d00027566097f409a46c15bc2585dfe833e63208f709e3d713e58cdef2e730cd58c95444
 EBUILD spacenavd-0.5-r6.ebuild 2303 BLAKE2B 2acc81a1da275309f5fa0d9dd6931f9242107a7622467c23b37b0b0ff401bc6c560bae31a614c281527183e2464dd9ec09f95584a07a79b8b9e556f74cf6ebe0 SHA512 aeb2e1501a7a0c40f94c809994c29dc902a142362b5d5802d4a3354b62dd9c7880699eb2ba9c79a3f288cc301d453177e24ec9850c40b26758c2bfd82740d31b
-EBUILD spacenavd-0.6.ebuild 2230 BLAKE2B f536ec95b124cce754294a8e5664c0d3b23d907ef74d296ba910ef09a1e1fa12a4205719b9d72eadc07bed677e0ec0995cfea0c9f926cd819bdb01922b2cc413 SHA512 aa5c1d28e0f21c2a12abce33b32001df0b708d0424136694ca222b9016a701af08eadf7d78141483720c7b72871313389286abfd70bd3fbd573ab5d4d65be827
+EBUILD spacenavd-0.6.ebuild 2306 BLAKE2B 01eec5ed89107490cdd2bfe2072e20e158ba05496a3f0bf16df8c796c08273cbe0b049aa22bf4f926aad70c60ff24f5569dbd9f519478c6dae826b7846a6df18 SHA512 f7aba939a76ee95ebc349c9ede93f733465c2d18f82e3736a314633d196c9e54a0824327172682ae9523822f0e397937a98696ee92847269970ee6f29c47a5d2
+EBUILD spacenavd-0.7.ebuild 2318 BLAKE2B 65b96c40800e50e3843c3b0124680ab242352fd71f1577d97d325cc330e4077c69e37e62ccbbbf504eac189422c6c9b85eba9464166b5a56217499c89bf50367 SHA512 0c86a6419e8db433d1bab2fd78f88b7bb5e2b81b0dc42d6c3dbc8455e632ea4fff7747764b5b42eeedeb55a932842e24161e7d5b55240767efe3b994b1dc3a7e
 MISC metadata.xml 804 BLAKE2B 88ee8f585c24c42670e3e251bd751d712752c0e9566828c8f00dadfda7d732ec75cf970398cfe73d9e81c3f556d74c48b1845bce4230f2fe524f5a8d7cd7a70a SHA512 edc302270122ef31692806ec2fec3836cd51afcb9eabeaf5f1fb8d66e2ab703eb615efa431b3f78fe6427a6f976b90f769cbd001dfe2832bc2ce9986731e26b0
diff --git a/app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch b/app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch
new file mode 100644
index 000000000000..485aa6c59338
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.7-gcc10.patch
@@ -0,0 +1,24 @@
+From 081182f1675bb69eec58d92698f1ba2f23466d3f Mon Sep 17 00:00:00 2001
+From: John Tsiombikas <nuclear@member.fsf.org>
+Date: Sat, 1 Feb 2020 01:19:14 +0200
+Subject: [PATCH] GCC 10 changes the default from -fcommon to -fno-common, so
+ we need to set it explicitly now. Closes github bug #17.
+
+---
+ Makefile.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index 9eba102..abf62c9 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -7,7 +7,8 @@ ctl = spnavd_ctl
+ 
+ CC = gcc
+ INSTALL = install
+-CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -I$(srcdir)/src -I/usr/local/include $(add_cflags)
++CFLAGS = -pedantic -Wall $(dbg) $(opt) -fno-strict-aliasing -fcommon \
++		 -I$(srcdir)/src -I/usr/local/include $(add_cflags)
+ LDFLAGS = -L/usr/local/lib $(xlib) $(add_ldflags)
+ 
+ $(bin): $(obj)
diff --git a/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch b/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch
new file mode 100644
index 000000000000..8dbdb7df3151
--- /dev/null
+++ b/app-misc/spacenavd/files/spacenavd-0.7-no-x11.patch
@@ -0,0 +1,24 @@
+From 3168b1dedf88c9026683ed43ea337814003d6802 Mon Sep 17 00:00:00 2001
+From: John Tsiombikas <nuclear@member.fsf.org>
+Date: Sat, 1 Feb 2020 22:08:43 +0200
+Subject: [PATCH] add a USE_X11 ifdef around the call to drop_xinput in
+ src/dev.c to fix non-X11 build. This should fix github issue #19.
+
+---
+ src/dev.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/dev.c b/src/dev.c
+index 8b72932..2074895 100644
+--- a/src/dev.c
++++ b/src/dev.c
+@@ -88,7 +88,9 @@ int init_devices(void)
+ 		return -1;
+ 	}
+ 
++#ifdef USE_X11
+ 	drop_xinput();
++#endif
+ 	return 0;
+ }
+ 
diff --git a/app-misc/spacenavd/spacenavd-0.6.ebuild b/app-misc/spacenavd/spacenavd-0.6.ebuild
index 86b0c8ae3156..bbf5b9cf9e04 100644
--- a/app-misc/spacenavd/spacenavd-0.6.ebuild
+++ b/app-misc/spacenavd/spacenavd-0.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
-inherit linux-info systemd toolchain-funcs udev
+inherit epatch linux-info systemd toolchain-funcs udev
 
 MY_PN='spacenav'
 DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
@@ -23,6 +23,11 @@ pkg_setup() {
 	check_extra_config
 }
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.7-gcc10.patch
+	default
+}
+
 src_configure() {
 	econf \
 		--disable-debug \
diff --git a/app-misc/spacenavd/spacenavd-0.7.ebuild b/app-misc/spacenavd/spacenavd-0.7.ebuild
new file mode 100644
index 000000000000..4c5a57fdbfa3
--- /dev/null
+++ b/app-misc/spacenavd/spacenavd-0.7.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd toolchain-funcs udev
+
+MY_PN='spacenav'
+DESCRIPTION="The spacenavd daemon provides free alternative to the 3dxserv daemon"
+HOMEPAGE="http://spacenav.sourceforge.net/"
+SRC_URI="https://github.com/FreeSpacenav/spacenavd/releases/download/v${PV}/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="X"
+
+RDEPEND="X? ( x11-apps/xdpyinfo x11-libs/libXi )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc10.patch
+	"${FILESDIR}"/${P}-no-x11.patch
+)
+
+pkg_setup() {
+	CONFIG_CHECK="~INPUT_EVDEV"
+	ERROR_CFG="Your kernel needs INPUT_EVDEV for the spacenavd to work properly"
+	check_extra_config
+}
+
+src_configure() {
+	econf \
+		--disable-debug \
+		--enable-hotplug \
+		--disable-opt \
+		$(use_enable X x11)
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" \
+		add_cflags="${CFLAGS}" \
+		add_ldflags="${LDFLAGS}"
+}
+
+src_install() {
+	# Config file
+	insinto /etc
+	newins "${S}/doc/example-spnavrc" spnavrc.sample
+
+	# Init script
+	newinitd "${FILESDIR}/spnavd" spacenavd
+	systemd_dounit "${FILESDIR}/spacenavd.service"
+
+	# Install udev rule but leave activiation to the user
+	# since Xorg may be configured to grab the device already
+	udev_newrules "${FILESDIR}"/99-space-navigator.rules-r2 99-space-navigator.rules.ignored
+
+	# Daemon
+	dobin "${S}/spacenavd"
+	use X && dobin "${S}/spnavd_ctl"
+}
+
+pkg_postinst() {
+	elog "To start the Spacenav daemon system-wide by default"
+	elog "you should add it to the default runlevel :"
+	elog "\`rc-update add spacenavd default\` (for openRC)"
+	elog "\`systemctl enable spacenavd\` (for systemd)"
+	elog
+	if use X; then
+		elog "To start generating Spacenav X events by default"
+		elog "you should add this command in your user startup"
+		elog "scripts such as .gnomerc or .xinitrc :"
+		elog "\`spnavd_ctl x11 start\`"
+		elog
+	fi
+	elog
+	elog "If you want to auto-start the daemon when you plug in"
+	elog "a SpaceNavigator device, activate the related udev rule :"
+	elog "\`sudo ln -s $(get_udevdir)/rules.d/99-space-navigator.rules.ignored /etc/udev/rules.d\`"
+	ewarn "You must restart spnavd \`/etc/init.d/spacenavd restart\` to run"
+	ewarn "the new version of the daemon or \`systemctl restart spacenavd\`"
+	ewarn "if using systemd."
+}
diff --git a/app-misc/symlinks/Manifest b/app-misc/symlinks/Manifest
index 1004be903bea..2246af539f50 100644
--- a/app-misc/symlinks/Manifest
+++ b/app-misc/symlinks/Manifest
@@ -1,3 +1,3 @@
 DIST symlinks-1.4.tar.gz 4942 BLAKE2B 983c16bd5dedbca3f3544756a1e5de4939eb31e871c72110224f7e63821cec69289d9a1e152081d9895230670b96ed813ef0692ea0922d9a52d5050ade723893 SHA512 d1efb1ca553cc9eb95f1d113e453acd22c9f0964eacec985c85c125de23ae9d636b9ced182c2673f455e5d897ad15a978a424170fce767ccc492443eac7f972f
-EBUILD symlinks-1.4-r3.ebuild 830 BLAKE2B fb15c53e718c86e997ba8a793ef7183fea52e409b37afa5f3753cbe55c48d16ae504d6ee5ab0e20ab17167ded808cc94883046cdc618a03cfc929f745d28a161 SHA512 5350e9cac341906ae71e710fd1e588395f2c267dfcefe772a161ec07e512341837fc8a583d667c3ebc785695a41cb2abe497cbb6352a2d8dc622273469dd6602
+EBUILD symlinks-1.4-r3.ebuild 831 BLAKE2B 187afbd495543d2b702465ed885a7a3d5a96f022aeb110c0b31363cb63a0af004f5c4ea65df7b4fed2d4654651388c5d1c39021ae4e85c4e83334f46f61caee3 SHA512 dbb0ffc89d8b6badff524b4ef7b70d2b4070df9c528264cecc5b313c2c7018202bd7859cd913d62a64e2ea1525781aa5ade4cd07ef9955e359172f2be794298a
 MISC metadata.xml 631 BLAKE2B 426a6a4bb3909963d06f6e33a29a5944dc436f9951d77ba4e63f322b70d74243f317f3fd4fdfe35ee0d767f16448473177b2fa22edb8746f35786bfc988ff217 SHA512 69594f3511101cf9f9b3d172b0767a3b6de62a22157517ee8d55fd6dec41ff942c54563058eb0a3fd49f024ae331b143e177c026ab778dbc86f7081b6ab3051d
diff --git a/app-misc/symlinks/symlinks-1.4-r3.ebuild b/app-misc/symlinks/symlinks-1.4-r3.ebuild
index 30d018d3bce6..e91ecd782351 100644
--- a/app-misc/symlinks/symlinks-1.4-r3.ebuild
+++ b/app-misc/symlinks/symlinks-1.4-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
 
 LICENSE="symlinks"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="static"
 
 DOCS=( symlinks.lsm )
diff --git a/app-misc/tdfsb/Manifest b/app-misc/tdfsb/Manifest
index 62373c1f74a9..ce44fb91a681 100644
--- a/app-misc/tdfsb/Manifest
+++ b/app-misc/tdfsb/Manifest
@@ -2,5 +2,5 @@ AUX tdfsb-0.0.10-asneeded.patch 2009 BLAKE2B e4e496814fcd9aacbe4e51a14c8432d683f
 AUX tdfsb-0.0.10-debugging.patch 2106 BLAKE2B 27d00c7a5bfee66126417c336d43890c30b034530cc51fc38e57afbd5b3c0218d50a328cb1a8eac5a75c40f1c24c29afe555db06c96dfb9095e0a7b431666e5f SHA512 eda59ad82597f819ea6458c096dfdb2c27ae35be99961cd72135f98f189ee428aa5f198bc4098350cbd0690852f8693003a074fe73e904f16827be4b2ebe931a
 AUX tdfsb-0.0.10-format-security.patch 1398 BLAKE2B fc461e169ca717fa75b1220d606cf1bd6a2d8c7b15c928402ac1d9f1a37413beaec464b5da867d1ef9cfba35baf2b17f24a57c06b894c468b0e961481cb05e3b SHA512 17543c4edcc09adc21a1dd8787eef2c7e57803d2ea490e4d0f259275e40d8619009ca1f5bd22970d1461078f998d3334ce5af9667f00c31b40a7c41841b151ca
 DIST tdfsb-0.0.10.tar.gz 35630 BLAKE2B 6df88ac449c8c671921aabe0b429e9b5074328c6b5c47869e06001f2996583c483427f744ce64874c2f70705463d432e945e1946436ebee8300c33702a64dca1 SHA512 4bfde530761bbc8373f2a9cc8bc5a4ea721ac564e7440d67ebf0c8b019c553b2e1288db86e54aaf111253decdbd4df93ea812fd5a70fd95acf11ff702387a7eb
-EBUILD tdfsb-0.0.10-r1.ebuild 914 BLAKE2B 025a6278b386ccd288c72ea6a95c06958efd21fb01ae3076ef64319f9cd3f61c7337293944716d9f465b89f19192151c81147dc915a08e9f11bcef2e287c7723 SHA512 2307b4ea3739fdaad830787048da9f0d3eca7e5885486dfa18145038f42359fe4ef0bff574abadb9cb62a14991d2500181cf43401d8bfefc0811adbe6e0323a4
+EBUILD tdfsb-0.0.10-r1.ebuild 915 BLAKE2B 0a24c0345f81867c5253a22b007268d524c017b565482cb5a7792b5c74fae1321096d0a17e2b69892167acb3ef7e3d7a80a53b8ed6efd5793b537061aedfd1f1 SHA512 653e1426746d870924da30cebcac3cdcf932e38c462110f1c5904420b808e0c34d8a2de06c001fb9116a227b82e180347d20b53fe3bcf9c82faeedc24e1499d8
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
index 6810b67461f3..d9aa71c8f9f8 100644
--- a/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
+++ b/app-misc/tdfsb/tdfsb-0.0.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.determinate.net/webdata/data/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ppc ~sparc x86"
 IUSE=""
 
 DEPEND="media-libs/freeglut
diff --git a/app-misc/timew/Manifest b/app-misc/timew/Manifest
index dd2c0779b365..d558931f3714 100644
--- a/app-misc/timew/Manifest
+++ b/app-misc/timew/Manifest
@@ -1,5 +1,7 @@
 DIST timew-1.0.0.tar.gz 140539 BLAKE2B 486c1e99a587597a040e3fb45c15602e56798b5a13ce3f47fb8d73b3995ee270ef2601e49dc4efe3023d1179a111b55c50c92a3feece87d9bad6a26123dc9008 SHA512 0539ff93b2375c154d126c39aa84f21b57b62f51c220c80b2e323a4d6aefd2eda6f87c04112e096222102b019ee3683a78b9ee9d6fbf6736d4a34c529f6152f5
 DIST timew-1.1.1.tar.gz 166484 BLAKE2B 64b8560220550299c76207873184252b1100d146ac745e46f38790a90294c59e5da95852836433f1d5213a2f1272063a534c20b2963a88fbaa1bcb888e40b70b SHA512 d262227d6dc99994599252c9fc55d32e4caac9d5ff1f223b8637005ed9f4f7fa238bd5cb7392c8e42a468f6246a7afad9b6fdb02af636e53d3bd813cfc3ee110
+DIST timew-1.2.0.tar.gz 181477 BLAKE2B 03c815dddbcc1801bd5d6849b4a6b97291ccfcae98421a3c89582b97b0214e57886a2ed485b506aafd11e16e5e8444bcfe6f457289598eb1ac671ac85004b5df SHA512 e576aff06dde1e3d5d46f4a9a425991c91c8484aa8f2eeeb8dda7a4bd40716863432740e7810c2acb43adf223a090af4e95d77994ceba03c043c57bcab745c21
 EBUILD timew-1.0.0.ebuild 512 BLAKE2B 6050789317fa16dd7c5e9ff926cefef8778c2a5d06ff2e8fdce163ed8c1de33faab0a8fb77c80bdd223b4ec2602b7efc4139da62fbf5db832adbd3d97a72d85c SHA512 0029cd62f73134e30e313929dc41bb499a081054715f7ec16234b83affffedda3e958abcc0b417267002dcb80bcc35000b91c07bc66e2d4b015bb14be3cca890
 EBUILD timew-1.1.1.ebuild 512 BLAKE2B 15a91014bb2bea1ae3fa306129df3cff014be92a528db86c6ad2361a7de9153c95c2184001799c6204e7297accd6105d3a5cc7ae298c3d376151772f35805dc6 SHA512 d6b4128865a695302bab3bd14e2fafae27e437c3362663dff545485e61642b06c1aa4703aa4361de6c0878df1cee852595b8411ec4e04aff75d853798975ed9f
+EBUILD timew-1.2.0.ebuild 553 BLAKE2B e97ba552d3aededa5367e46dbd688f049d1ef9a7f0dcd3d01e76111b0017c8306e69be3074e9f7bef5b395cff432ac0e869eb0ad94111a33bff019f1ca0d2e7f SHA512 31eaa7c7cdd658e2f2b4524d8bfaf7f6f2bdff126d81fabd66d0cb96f4718bca4096b1b0aab193eb4ab2737253c2c563998308e0d1969ac7332ec140ee5b8bf2
 MISC metadata.xml 254 BLAKE2B a18499b4ce0a448cf0321b4c94f7e3d3499ba025e4a7a66fa6a67342470f163f988161a80c183443a7ad222894594ffa2a5a8452cbf39ac890b660ceb319019f SHA512 b3850bc7c75c11c1cd29ad3560299a281a67d1c39cfb052c1964422209446da77036d4072ad192a2bd9c793aab2f0878426ff9a3ac723ea18553a0564271225d
diff --git a/app-misc/timew/timew-1.2.0.ebuild b/app-misc/timew/timew-1.2.0.ebuild
new file mode 100644
index 000000000000..b5cc50bd8639
--- /dev/null
+++ b/app-misc/timew/timew-1.2.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Tracks your time from the command line, and generates reports"
+HOMEPAGE="https://taskwarrior.org/news/news.20160821.html"
+SRC_URI="https://github.com/GothenburgBitFactory/timewarrior/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	mycmakeargs=(
+		-DTIMEW_DOCDIR=share/doc/${PF}
+	)
+	cmake-utils_src_configure
+}
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 3071faa111ad..e1cc14bc6332 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -2,7 +2,7 @@ AUX tmux-2.4-flags.patch 456 BLAKE2B df85b32486894e8e3c5531937461ad46ca5effc5dd4
 DIST tmux-2.9a.tar.gz 510915 BLAKE2B 6a3dcdb66419fdd40818c18c3a16adf83fa67b3f5d4cc60953b64d62d2e3e139cad0612eef4233d3d5fa76aaae93e437c8394aa118791c87cb0670f1ddc65eae SHA512 aca6882688727c10c5647443fdd18bbd6c0f80b7a3bf9667903d1b89d523e604cd715f176f33f2e5673258f00e626a6dc273f80fe97ae4f91621814d89985713
 DIST tmux-3.0a.tar.gz 546377 BLAKE2B 1e784d98e1f18e7850e92d8d5f849ee1b8bcbf62b9323b6eb4007e038bd84480b3a171c93c88954701487ef228db8717bac886f51dd21efdf2766e676b0c16e3 SHA512 f326ee9c0e5e9a46ce9c99c76407b8cf35feea5f898c3c937fd8c5e488ff9a809272de19226d9d10f864e11051dcf633327820b7f8d86d85962da61174bbfb0b
 DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979
-EBUILD tmux-2.9a.ebuild 2302 BLAKE2B bd543d3fbe66e5b39de97b553ca0b1176de0b4864fe8a95fd1d2e8c25ad4845725f44dc38721972d77922e6e8a29348ea4d23fc9393a6548cf376a7d58470376 SHA512 892d8477f166923dae9baa8849e607828b9c2a3b42631931fdc264b57c87dbb8701c90557f35676d8768e6810d8535dc896312cefd17dc1e2d8eff40dfb4a5a8
+EBUILD tmux-2.9a.ebuild 2303 BLAKE2B 96e2d58bf5efed8525ef6bd24c45911af7c7821569d9931b89d3eb631254212f7fa05840cf36d0cbd494c0750a42f3f40a0aea22d81a520f5a75fbc42e8f7a50 SHA512 3ceacf201681ec27d1376c680ebc918f9853c380a135baeb366b86e280bc2e7d01a33893f5905aacd174a2be55633fbccafc0a67f1aa85207d6695f2be4b8aca
 EBUILD tmux-3.0a.ebuild 2322 BLAKE2B fefc176ff96de70ed1028c57b2fe03e43e76f8f36c0cf550dc2eeb127edc02de5ef3912f36ef28fdcf17ebd8ed01ed76e731cb45ee0e8c83be6728f826a45ef4 SHA512 237abb059a62382d5f1c6feb7eb30dcd4661a8960750c96c7506b4616053b7e9b79336633a3b30c88f456a5b1edd3ff67b8bbf923c6cc2e98d9f4293ad769240
 EBUILD tmux-9999.ebuild 2331 BLAKE2B e5ecd802cbbb6f878f92d93124c5b2a7bcfe3dbaec745c00b443a190152fe312f94ee1a68b9ba651b323ffb96a8ac4fda6427db2838812017c4d2e7c8c12ca89 SHA512 272452b6892f33474b06f0f1af6fc5a95870cb9c220724f51c7d3ecbb5e27b5aea235e97763c5c4c53407a2825ed65c1530cc807fb3d568fdc4fba2095c8e9aa
 MISC metadata.xml 708 BLAKE2B f89d9daf3de56b07d231b4fa3dec0179d8e32579a76142085b96611fd08db4c26af40d1ac92684f9d1e378ce624647bab26ddf877aceb86af4987aa4e555e045 SHA512 2d676e2d9a5427a287d7dbe0d73e6ea96b2eba3328c8380a503e814e263a5c6ea5b4bf33aef7c9e0840f37d75b40e5e4a4feca5cc07c38de50b35e9da497f8ce
diff --git a/app-misc/tmux/tmux-2.9a.ebuild b/app-misc/tmux/tmux-2.9a.ebuild
index 8845b92e22e2..d311f73111bb 100644
--- a/app-misc/tmux/tmux-2.9a.ebuild
+++ b/app-misc/tmux/tmux-2.9a.ebuild
@@ -14,7 +14,7 @@ if [[ "${PV}" == 9999 ]] ; then
 else
 	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
 	[[ "${PV}" == *_rc* ]] || \
-	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"
 	S="${WORKDIR}/${P/_/-}"
 fi
 
diff --git a/app-misc/ttyrec/Manifest b/app-misc/ttyrec/Manifest
index 2772de9aa2e2..b1e5923c83f0 100644
--- a/app-misc/ttyrec/Manifest
+++ b/app-misc/ttyrec/Manifest
@@ -1,4 +1,4 @@
 AUX ttyrec-1.0.8-flags.patch 591 BLAKE2B 25a29be68f318dcb0604c6b3bf982f24d806f889f86bfbbe3795e6999763951fca64f02d82ac0a82e720c380e8432eb7d9e0cd6f9e7d1b193699fb614867e3b0 SHA512 245a5e34611869d4b612a25922cde034ad3e54a3b7579850f2ddce3e0200726ed3707a518464c176044c9a9ab5f60737ded7941f1882d560d963c59e6221861c
 DIST ttyrec-1.0.8.tar.gz 8528 BLAKE2B 8b0218cb7fecdbcbaeee9da2b7982b880bb6f0092f65f2c730c5942eb3ab6dd9978b7168ff537b81503c697c5b948e7a0e2a267c35de1c0038d85277c6610a74 SHA512 b7f6f4c78c5148dacc7058534d89f13fcf333ee9e099d4475135e9c15a99a8aed72bf4bd5954652a6bb044d11ad35b4cb8d07208a5349c79c811f68fde7e8611
-EBUILD ttyrec-1.0.8-r2.ebuild 687 BLAKE2B 8283817ca58b4b79230360b6894944325ae092f85e9fd9d94dc27b0700b1328290ff852837ca52046f1182d8d42b830113a9df84502a20ed4ff2b584df08a99a SHA512 9917bed3418ac6638c3e3714f0452b3249afa277fbe39550928692cfe778f2e0bbe43424cafbb2096f5ca45b4c9b4513afdc5b8acc492ea62b918cc76fc99003
+EBUILD ttyrec-1.0.8-r2.ebuild 688 BLAKE2B 4ff5e7510f02d5e631a31d952f856fdf8b0b702b9bfa6b7146bf93b6da3e4250d413a49bab656e4f9f43f7bf4e964ef9335d77c17875e9bf0dbe55027a22ed2d SHA512 6779e62c1c98b80e077a9fa79c6e2d58ea596645a3cd38e035711b5f9a2c0f488b8067ff304cb1bb705be40f80799d033262614fc534db5d92be29258ae9f7a5
 MISC metadata.xml 575 BLAKE2B cbadaa7de1bd014a8b4d0fdce081ec4f078febf7a0884639762f714fadab3adbf6603475b331a2a07a17c0934ab0f5262bfd1191b5face6a252f7d4de8d06054 SHA512 57adba15d5ac7ae8f49445e81c7aefd99a840721b8636505908493e3e76ed12c24eb5ae87970de701395415c096ca360ad81fe27139fb4db79cfc3da1b7784fa
diff --git a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
index bd0fe694547e..b43fc2ee1b68 100644
--- a/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
+++ b/app-misc/ttyrec/ttyrec-1.0.8-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://0xcc.net/ttyrec/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
 PATCHES=( "${FILESDIR}/${P}-flags.patch" )
 
 src_compile() {
diff --git a/app-misc/uptimed/Manifest b/app-misc/uptimed/Manifest
index 0a7206d38432..d22ba749c435 100644
--- a/app-misc/uptimed/Manifest
+++ b/app-misc/uptimed/Manifest
@@ -2,7 +2,7 @@ AUX uptimed.init-r1 730 BLAKE2B 21d7b8f5fa4daee5a3807d35f749a467731b5e2ebc0e2b74
 AUX uptimed.service 209 BLAKE2B 9f763df7f903aa9a2563041acad553906e0a69faf93280bceee3bb7856e67c1010d067c06ae699f4dd0389228392d5828e1bf75636c69171e2d21509330f6baf SHA512 949baf12782d4b8a976d29ec44bd31323500de763b82601634eea3721ce9035bb9b7ca906384e2b8ebd57371a1116a95dd78c3610c27fa1d93e36b9f897bcd98
 DIST uptimed-0.4.1.tar.gz 55162 BLAKE2B c281f922ed4fcf4f55571f1f1177451bf9f2e0fecfc87566610e1d24055969cd61543fcb0fdae4d0e6dc7a082c1b9013a08b72641d572a2475e9c7f5fd56deae SHA512 5dfe79aebab8c8daca3a3ec88d54e312446fc7cf8b54ef1414cbfcb3fb25053ef31235de4b42cb14fc7352965b77ca2875c753b97b4d61178792a5484715e23a
 DIST uptimed-0.4.2.tar.gz 55339 BLAKE2B 120a3b1d6dc9518f7051af4d7e0f1bcf455f7dd989687fa8f5a40f160f2912c21d09298bbb9c676af5387d96890a98acf3f21b60e046a9548a735ca10dbc4006 SHA512 a18cc8580a4dc7db7f4d97d70e25d76e7b98b9d328a0fa4ece4176d40fc26589149d63ffc9d2638cc35003cf485b43ae6e115aa1821c662d77f234eb3c4c0a4f
-EBUILD uptimed-0.4.1-r1.ebuild 1571 BLAKE2B b0680217f7b8d0a2be15397f6983bfdf2b8c197f704e557de96d4c457f215990f25b64efd0a1a05e9e86297ab76de5c7a885c244f905e3a68648fad5eb3c7282 SHA512 f7abf1cf8d7204caeaca4749cb8c9afc8f8672ddf91f4d36521e5427eef663e9745e513532ae11bdca1daf73fe2e79555bd73902cfebe36bad999a3294664be1
+EBUILD uptimed-0.4.1-r1.ebuild 1572 BLAKE2B ab5c30c45114862d90ed0e1a11f40359241c42528a53d425a1c553550d21da548064db380f1eb7c15986bf22ec76ce10cf3f0db5f7d31969e2c5e2c36b856355 SHA512 d4e03bc86179a62a147fda63e1f086b656a555b4de28d8a4775d61ab6ddf6864f29c226e9da9fea8286be774cd2f3f2ca215aa276e196a2dc6db85de56e902e3
 EBUILD uptimed-0.4.1-r2.ebuild 1603 BLAKE2B 2fe5cb29ef9c1cc6c77898bc79ef14be68d90c8576bd2764cc939d4bbfb5d59dd9bc990618b7bcaa953335ccb3699d4558f3b96717b39886d107729fb01bb0be SHA512 c0a42a785ae77e3b4b79c0f7fef99696553294d5e54472b85b9990a6d562e76010f9903f46513899a103cd56edb6ba84345cc61f9bb621925da70e7ae6058e2b
 EBUILD uptimed-0.4.2.ebuild 1603 BLAKE2B 2fe5cb29ef9c1cc6c77898bc79ef14be68d90c8576bd2764cc939d4bbfb5d59dd9bc990618b7bcaa953335ccb3699d4558f3b96717b39886d107729fb01bb0be SHA512 c0a42a785ae77e3b4b79c0f7fef99696553294d5e54472b85b9990a6d562e76010f9903f46513899a103cd56edb6ba84345cc61f9bb621925da70e7ae6058e2b
 MISC metadata.xml 343 BLAKE2B c84e06dd0bdd9ae4d3b36bf4795c51e9037c38401f8d3fadeb9853190e8291f82f370ac45afab0f79326c89dcfb359d139a08a490ca4f7418738f61d8d0d1f02 SHA512 59bdf10b3845f10cfbb9441ccd3ac6d8a7a85791f57acc2148ad334d0b9883d4d98b388bc93eacdec8a77ac885339e2aea368a9755bbda483132ec69c68a430f
diff --git a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
index 6f480c82b6f4..8cb6f8cd42e1 100644
--- a/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
+++ b/app-misc/uptimed/uptimed-0.4.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/rpodgorny/uptimed/archive/v${PV}.tar.gz -> ${P}.tar.
 
 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="static-libs"
 
 pkg_setup() {
diff --git a/app-misc/vlock/Manifest b/app-misc/vlock/Manifest
index d38154118918..d0681b5d7213 100644
--- a/app-misc/vlock/Manifest
+++ b/app-misc/vlock/Manifest
@@ -1,5 +1,5 @@
 AUX vlock-2.2.2-asneeded.patch 393 BLAKE2B 1434b168d0f55c3a88e08f280d213850ed676343296f6a9244d6b8e2726aea1b67ef19a8813a402bb0d8e3257cc6478d9a8559d5a035d9413dfe3c9e1b966f25 SHA512 5fa18db0c5ce37d15ea1d1b0b1653b43cf33a2c0f8f56708973a6d5fc59f5357efa2e6cab7113893ebedb1eb3943c6a1c8a9649c7bb407ddf4c6cfaded6e52df
 AUX vlock-2.2.2-test_process.patch 905 BLAKE2B 89d80dddc8b13c23a9da34b3570d44984f66156a756027ae6787e1678973375dfdaaae449f771cf925411f17bd03f733ec2bdb94be9736a75a7f3be0da8c097b SHA512 5963bad2bbbaa639cc917adb594e47df156a12dd832bc252343416152934b9e78b3b0ed2f46d529fd7612fc2c8188340a84d249ea9b7e5e31638711428efa597
 DIST vlock-2.2.3.tar.gz 54860 BLAKE2B 140b38dda15dd5c269729db1fbc3cc36dfea035c79e7998adb7f6ec56806408748701b986a2a1509aab6118a796a13b96a1de24f2837f94c4cdf058df736f37c SHA512 7eba8fe4f7085be7ef9169843d0814e55840b823dfc061727db037d2420e8ff4b669a3b08e15f61cdd9d5048c1e088288a46acad341cbe97585e64da2b58c855
-EBUILD vlock-2.2.3-r1.ebuild 1283 BLAKE2B 8af47ae476818dc62669643c0bea2495dd4867ab71f0254f13adc3c6f54becf33d723e5ac368c891dd750e0978a3b4124a8d80fc03462c30dcdc7e86e8f68a09 SHA512 84338752564c866d07653eabb9eea1ca369639c4e4e178a7895ea18bc0c9f6eb73fb9a4fa33a9a91fc0411c478843bddac254101510463ddd1f68b768691836f
+EBUILD vlock-2.2.3-r1.ebuild 1284 BLAKE2B 090170dc7c57cc34d046c030ab39fa2fe6b5f30df48353bf3584d6733bfb867d874e914e8b09450cff762884ee54d3e0ed99aa010a817da91f1e632e6362d169 SHA512 cc14c4f80a25dbebbb1f4f076d4b7195fe06963b2160b349bfab1b8d4c1bc0c17a07123663500a62c7227e3fa125bd9f4593d281271fb658984ff8230a2ac5aa
 MISC metadata.xml 265 BLAKE2B 75452ad720a31a08fc0dcd02eec704c18b11bc0660686f9a320b85fc879f55a564ce9c3b6a8c710781b74c5e8eb3d0544c02a042fb35a0b62a5e1491f675296a SHA512 176f814d8c555e8726f36e012367b698e8a19a0662982621029a7f9190beecc5e6798e43c51698dc149364966cdeff7061121e54fa9d4cf2a3559a6ce4904e25
diff --git a/app-misc/vlock/vlock-2.2.3-r1.ebuild b/app-misc/vlock/vlock-2.2.3-r1.ebuild
index 30ed7ba38f73..24ff491947bb 100644
--- a/app-misc/vlock/vlock-2.2.3-r1.ebuild
+++ b/app-misc/vlock/vlock-2.2.3-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/WorMzy/vlock/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="pam test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-misc/yq/Manifest b/app-misc/yq/Manifest
index 77c210124115..705676d24df5 100644
--- a/app-misc/yq/Manifest
+++ b/app-misc/yq/Manifest
@@ -2,9 +2,9 @@ DIST yq-2.7.1.tar.gz 13794 BLAKE2B 87fe4961974ab41fc14efb7b85c3db5c13577593253eb
 DIST yq-2.7.2.tar.gz 14010 BLAKE2B ec01d25c5ad1ca5fb38b2a4b412306d0ddf157a6a6fdbf2b55452a487bade60ebdd1bddba231e8f0d8db60994c44322c85918221cc64ea346e36d38ca73c185f SHA512 0671d0f5d5dbd7eee42efef7b8469d2177c2459144afc679bcf1f04165ba1e4ae0e396d9a3fa9ecb3db373671152fa51c835ca6fd2622fa8a243b21bfa547e43
 DIST yq-2.8.0.tar.gz 14434 BLAKE2B 1389a4e5df3a5e23fb9d9fad17f7f62b7ce85af917b5a29169ccad71c47d856658ac2fe649df4e98a9980e2548b1170ef468d150d6d84b121f093bd374746e69 SHA512 aca4aea16d80947d030c4c98cfdb431bc8bb25cbbcd388decac84842f7107617b31ef5dd25f409b90094a28452e6623734f7293c16ed75f0e8758b2d53820a09
 DIST yq-2.9.2.tar.gz 19177 BLAKE2B 038d813679d3583eb863577f317d834f78f614d6be595c96601a06b40c3af5d9b04234381529012328a45984b183376e0647a6b09b8a87642f8e688e39ec7a7f SHA512 a526407f4f34e9c2a0acccaf38207bbe328468419450efaf30171493123b7715c2e6dd6799679220b07bfa7bc9081ac5f758f833ddf05dfb5e1fe14286baf45c
-EBUILD yq-2.7.1-r1.ebuild 1036 BLAKE2B 4c9b7d473284c809b1baffbb1dd4d5d3c8aa86e618ed40c4c44b65619cf4f5b2d3c60ef0d92c4c2befb6e6e9d4f05372f03140e47a3ca83e25916bbc98ca3e8a SHA512 9c199e5f6535247c378647fa580ddf1cd1034017b976df2f556be020388fd4116f9278398e212fdfc355c19dac36738bfa7ad84e8420fd2f56485b52f69bfe97
-EBUILD yq-2.7.2.ebuild 1040 BLAKE2B 4d6f4f3cce1af0f3e4a3bae615641234d9cb0e2de52a026b2668678659c02998a3f77072bd37b0130efdb6a985c6b2c718228c71eadc410a667b33c1b047f578 SHA512 e9aa2ddf947fa96d16e692b87379574bdeda3065b404541fdf0fabcbd58a2af155165b8e1cf882e3fe92c0ad42eb937d7ad9fdb74f3450513d31bad04c1b5ef9
-EBUILD yq-2.8.0.ebuild 1040 BLAKE2B 4d6f4f3cce1af0f3e4a3bae615641234d9cb0e2de52a026b2668678659c02998a3f77072bd37b0130efdb6a985c6b2c718228c71eadc410a667b33c1b047f578 SHA512 e9aa2ddf947fa96d16e692b87379574bdeda3065b404541fdf0fabcbd58a2af155165b8e1cf882e3fe92c0ad42eb937d7ad9fdb74f3450513d31bad04c1b5ef9
-EBUILD yq-2.9.2-r1.ebuild 1072 BLAKE2B 6595add89fb2404c9d4ebb627f7f80c2238da75f849e24c1470f40babc7f11444df847dfd734cb4abaf305ea66ca9fff30e36b7933ea2defab98488fc72471be SHA512 16fc20e194ba2c310b12cabad00ed88975f5fe90e93e68bb157d07de953caf157d47e4d75a69bb4a793a618cf6c3a6a20aab2f26aab0c1ce475b5bb45a31a7f3
-EBUILD yq-2.9.2.ebuild 1040 BLAKE2B 4d6f4f3cce1af0f3e4a3bae615641234d9cb0e2de52a026b2668678659c02998a3f77072bd37b0130efdb6a985c6b2c718228c71eadc410a667b33c1b047f578 SHA512 e9aa2ddf947fa96d16e692b87379574bdeda3065b404541fdf0fabcbd58a2af155165b8e1cf882e3fe92c0ad42eb937d7ad9fdb74f3450513d31bad04c1b5ef9
+EBUILD yq-2.7.1-r1.ebuild 1026 BLAKE2B f16a3350bb373c6d96728368e2014d235bf1ff49a6e69af4865efc19c283fcb003e8648bc13961797521726ee35e1824c151f084cdfce04f9e2a6a37be0d52b7 SHA512 5c647494bdd179aea7f1479d3ad53ced5050e7c17c1007094d0fb4b0dc46c99a2547f080b18f9eab0c0b4612b0bbac2230b4c3ded0589fa30614b297e68da01b
+EBUILD yq-2.7.2.ebuild 1030 BLAKE2B 896b5db720a2736274ddffcba9f25116b48209fcb31293b6bbbd6d154086997687bee16175d123c99a80697e9a4282aad0d2aa346b11eaf1512f073d636bec65 SHA512 40e43aa98b92860891c14cf05a0c4ac8ba7be6c02f83af4d844318cca93532eced9a90139e494db5c4ed535d656376335c6621afeec14222981ee7545a79e761
+EBUILD yq-2.8.0.ebuild 1030 BLAKE2B 896b5db720a2736274ddffcba9f25116b48209fcb31293b6bbbd6d154086997687bee16175d123c99a80697e9a4282aad0d2aa346b11eaf1512f073d636bec65 SHA512 40e43aa98b92860891c14cf05a0c4ac8ba7be6c02f83af4d844318cca93532eced9a90139e494db5c4ed535d656376335c6621afeec14222981ee7545a79e761
+EBUILD yq-2.9.2-r1.ebuild 1062 BLAKE2B 77585c8f4ebdaf14d54798abb7d85b7d9b6cf3570066fb86293d7a335607efbed9fec0fe22668fad9ccc401fc4214cd04f19a84341af9a2c2f9eef2caafcf104 SHA512 f3de65dbc4f86bb4b48ee106b92c5d5f6930ac20bf13319cb617aed51de36067ceec0421fc97080db301b5d82edf8fd77c46cad354894ebba328bd3826aa586d
+EBUILD yq-2.9.2.ebuild 1030 BLAKE2B 896b5db720a2736274ddffcba9f25116b48209fcb31293b6bbbd6d154086997687bee16175d123c99a80697e9a4282aad0d2aa346b11eaf1512f073d636bec65 SHA512 40e43aa98b92860891c14cf05a0c4ac8ba7be6c02f83af4d844318cca93532eced9a90139e494db5c4ed535d656376335c6621afeec14222981ee7545a79e761
 MISC metadata.xml 333 BLAKE2B 25cb1f46ef4320b5b01b23bec540f623f53be1ee4b0a1d3d9c20cdd90185b88d8f9d5fecefbd15abeca1a861e2863123d15e89e40aa3cdbbd1c56fefa71105f4 SHA512 2cb6c56e50e0d436f37c090549cdeb0c4b1fba34b8049c90ccf24f44aaefddd87bd8e6260a8e645df2c8e2bb1f28c305ae353f1a86e2992a2c987936c4caa416
diff --git a/app-misc/yq/yq-2.7.1-r1.ebuild b/app-misc/yq/yq-2.7.1-r1.ebuild
index 8146154e34dc..2559bf50e6bf 100644
--- a/app-misc/yq/yq-2.7.1-r1.ebuild
+++ b/app-misc/yq/yq-2.7.1-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python2_7 python3_6 )
+PYTHON_COMPAT=( python3_6 )
 
 inherit distutils-r1
 
diff --git a/app-misc/yq/yq-2.7.2.ebuild b/app-misc/yq/yq-2.7.2.ebuild
index 2c675de66fdd..f091efa90988 100644
--- a/app-misc/yq/yq-2.7.2.ebuild
+++ b/app-misc/yq/yq-2.7.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-misc/yq/yq-2.8.0.ebuild b/app-misc/yq/yq-2.8.0.ebuild
index 2c675de66fdd..f091efa90988 100644
--- a/app-misc/yq/yq-2.8.0.ebuild
+++ b/app-misc/yq/yq-2.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-misc/yq/yq-2.9.2-r1.ebuild b/app-misc/yq/yq-2.9.2-r1.ebuild
index a569a0b4e890..3853856388ac 100644
--- a/app-misc/yq/yq-2.9.2-r1.ebuild
+++ b/app-misc/yq/yq-2.9.2-r1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
+PYTHON_COMPAT=( python3_{6,7,8} pypy3 )
 
 inherit distutils-r1
 
diff --git a/app-misc/yq/yq-2.9.2.ebuild b/app-misc/yq/yq-2.9.2.ebuild
index 2c675de66fdd..f091efa90988 100644
--- a/app-misc/yq/yq-2.9.2.ebuild
+++ b/app-misc/yq/yq-2.9.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit distutils-r1
 
diff --git a/app-misc/zisofs-tools/Manifest b/app-misc/zisofs-tools/Manifest
index 6849d449acbc..7648845975ba 100644
--- a/app-misc/zisofs-tools/Manifest
+++ b/app-misc/zisofs-tools/Manifest
@@ -1,3 +1,3 @@
 DIST zisofs-tools-1.0.8.tar.bz2 52968 BLAKE2B 81224adfcf4309513ceec7c25f72d90e4dfbacc225c756b35f1ae2ce721709abd4f52559596632a121813bae2c14d259e7950e84cbed43a547e77bf3491f8fdb SHA512 2c50bb73428c065e02e95def81950e1f64aff3cec0a4d74ee91ddbf4c15b81a423d8a128a4abc2e11aeb866b9d5f67f55019f7ae884c9e1a8b013ed3133db50d
-EBUILD zisofs-tools-1.0.8.ebuild 629 BLAKE2B 9b8745467d2516b192f71748e537ffd26c49e30a3b86ef5fd075f51d338a09e666d7f70e72fb81d8317284390a9956290c4ad03c9b189f72b4d6e94fae6365b0 SHA512 ecf7a64f3d468e805b628ffc85492b6b351926552741c712470a01aa30cdd9d9155c5f41fc9340ef4f5ba2750b16e6644fb928c06ff224cf8d93bfc1dc071682
+EBUILD zisofs-tools-1.0.8.ebuild 630 BLAKE2B aace840988c3b325a3b82bb88144a1fb396f0a2bb476d71f23da3889d6584d8bfeb9d4f21826817adacba9b37672901aeef28fa4b323d33a7ce02c5c726b781f SHA512 5e581d071655a30f175839cdd9298209f4e20e8dae7adc1e9a425548beba85c464826c6ae70854c255711adf584562af46eee2b1fbea2aab1fc1268c5ce5dc13
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
index c2478e1281c7..0572cc05f54e 100644
--- a/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
+++ b/app-misc/zisofs-tools/zisofs-tools-1.0.8.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="static"
 
 RDEPEND=">=sys-libs/zlib-1.1.4:0="
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-misc
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)