gentoo resync 08.09.2018

32 files changed, 34 insertions, 170 deletions

diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index b3b79c698cb7..546ad1e0624d 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/eclass-manpages/Manifest b/app-portage/eclass-manpages/Manifest
index 4f4fbb924cd8..236ef2e48ffb 100644
--- a/app-portage/eclass-manpages/Manifest
+++ b/app-portage/eclass-manpages/Manifest
@@ -1,10 +1,6 @@
 AUX eclass-to-manpage.awk 10909 BLAKE2B e41b792f8316c612609da17c16ba41f01a4fc27c847bc380a26a570abef030d6e11a74673d703da77e17bb3db796ed3207d95cd9d8e7604551a6d0b10c6a3e07 SHA512 c37d502f66c31b2e5be8c27071ade6bfe7617d84bbca57ab3ac9d0f2d3403281d50fd8c6bada2c3dbe29041bcef4c0dafc76506a1ddca82fc26aa83d4785bae2
 AUX eclass-to-manpage.sh 780 BLAKE2B 74c9580dd603e036f8209107794d39eb6705333312a98f1c1fba86feb807792ba8ae52420b3ab4b5296c6dbd42af597e591ce928c19b26c5fc80be09202973c3 SHA512 266f15ac5d2efc42ce792d9e0c1d91e99502a5cd93ee1b915fe952cdd894bc4e773014c3f6731d2a11a2d82466676035cff21a1d88070fe85f1dca915dca203c
-DIST eclass-manpages-20180302.tar.xz 454568 BLAKE2B 2d09a44e33efe0a302d4bdfaa3189e6ca0d373c84518e58bfb62824c00f83e865660c42cb0df597902d253241d9cbdac468add16ad19f94edd925460701c9f4f SHA512 17878001c9d70c69b9260541ac87cf642da0f0c5adbb77b3df2f614331e29af6af90b64950c9d95a2bc76d4b24180b46575d02a602956b721e3b03b93ee251e0
-DIST eclass-manpages-20180607.tar.xz 435652 BLAKE2B 42070a7b09681c0337a223684a2d1993aa79f7ecf02fa06597780ea1cdfc00b591191d583e3f948a7b962a63b31841287c2a8078e045074ab6d7e1af9f999569 SHA512 4a002e7dfb0436efb661d929291ada0c0802f595637fd3b77d99a1d803cc24329a3793eaf13e74dc470c67168cdc5452316bea8f78a95c1a3ee608aa5eb8b0cf
 DIST eclass-manpages-20180812.tar.xz 419912 BLAKE2B 35659ac43e43e71c600fb4955267c9d57ed36f29e0607150a8e8c061b158b6135a4b91f4e4c05fa178a03aa3068726ac13cd54e4cd135fbe152c8bebf81659bb SHA512 6d01070c6113e5d5f4102d466abaa03ae824350285ca71a5a4f84d859f6c473e8e92d3f5387b76c4bb5dc8bcedcc6b36a63e074d70725c87233dea4fa6a6d0c6
-EBUILD eclass-manpages-20180302.ebuild 1094 BLAKE2B ebb62e20bab310089379baa86b0ba73af6286669917115817faa4f96269b37ec8a1052417686e5648c1667b429bf89d6cdc3089d63d6f327ec9e1585d28971fb SHA512 074e5e6c5111c14e6f7c86fcaae0f22bd3718e19a229d4978b03341cc9050c9e48cfc566cc0b7dbef6330f1566cdbee14320aac03d395786195d725eb07ec557
-EBUILD eclass-manpages-20180607.ebuild 1087 BLAKE2B f8e430423d389e06cfec6689539e28dbdcf61be418786df4aafd63314397c5b62383781fa8c2cfbd0b4bbeecf34ae401ecb092c8fd503f53e1513319abca6b4b SHA512 25b0db417330fb5c5caed47d9bafb7c0b4cc15c8c6d813db72ddd7264f201e246617305609e992f4d67dd130bd5f081cfdcb51438fc4370a9fec78a570e2b24d
 EBUILD eclass-manpages-20180812.ebuild 1087 BLAKE2B f8e430423d389e06cfec6689539e28dbdcf61be418786df4aafd63314397c5b62383781fa8c2cfbd0b4bbeecf34ae401ecb092c8fd503f53e1513319abca6b4b SHA512 25b0db417330fb5c5caed47d9bafb7c0b4cc15c8c6d813db72ddd7264f201e246617305609e992f4d67dd130bd5f081cfdcb51438fc4370a9fec78a570e2b24d
 EBUILD eclass-manpages-99999999.ebuild 954 BLAKE2B 654df18ee7a23338c3d87fbe1e545858aa8ef64bec0cc54e5795f7431e513776d1d40d136ffbd0061aedd63f956bb49e118f1f82de38acfdb80f3abc77125612 SHA512 ac8ecd64716f06e3130345e45b5d5ee2c5c339dac5429d0d765bfac0c50dcab433a6d210c5b425fd52c516ee2af8fb9cc47888b0a398da8fe0f85adb09409be9
 MISC metadata.xml 374 BLAKE2B 3f87ce1d875199a067b945d6c9f3b80bde36ec25714d7dd802a55b37895d6c1e9360e003c4e6066ffcf6338a7f04b46a181a8c49f7144866fd9547626a0378bb SHA512 3caedcecef2f388c833b9f7db0af743a71227288bb145ec8a56c2862c7f56571a860f7f961d0ab1565cc98a0d178e87e24a7321cf0b7d4c4d3ab95c120fb0cf9
diff --git a/app-portage/eclass-manpages/eclass-manpages-20180302.ebuild b/app-portage/eclass-manpages/eclass-manpages-20180302.ebuild
deleted file mode 100644
index ba2852161332..000000000000
--- a/app-portage/eclass-manpages/eclass-manpages-20180302.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Collection of Gentoo eclass manpages"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~ulm/distfiles/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# Keep the keywords stabled. No need to change to ~arch.
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-
-DEPEND="app-arch/xz-utils"
-
-# How to create a snapshot and upload it to your dev-space:
-#
-# mkdir eclass-manpages-$(date +%Y%m%d)
-# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
-# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
-# xz -e eclass-manpages-$(date +%Y%m%d).tar
-# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/distfiles/
-#
-# Then copy the ebuild and update your name in SRC_URI ;-).
-
-src_compile() {
-	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
-}
-
-src_install() {
-	doman *.5
-}
diff --git a/app-portage/eclass-manpages/eclass-manpages-20180607.ebuild b/app-portage/eclass-manpages/eclass-manpages-20180607.ebuild
deleted file mode 100644
index db10d2aba060..000000000000
--- a/app-portage/eclass-manpages/eclass-manpages-20180607.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Collection of Gentoo eclass manpages"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-# Keep the keywords stabled. No need to change to ~arch.
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-
-DEPEND="app-arch/xz-utils"
-
-# How to create a snapshot and upload it to your dev-space:
-#
-# mkdir eclass-manpages-$(date +%Y%m%d)
-# cp "$(portageq get_repo_path / gentoo)"/eclass/*.eclass eclass-manpages-$(date +%Y%m%d)/
-# tar -cf eclass-manpages-$(date +%Y%m%d).tar eclass-manpages-$(date +%Y%m%d)
-# xz -e eclass-manpages-$(date +%Y%m%d).tar
-# scp eclass-manpages-$(date +%Y%m%d).tar.xz dev.gentoo.org:public_html/dist/
-#
-# Then copy the ebuild and update your name in SRC_URI ;-).
-
-src_compile() {
-	env ECLASSDIR="${S}" bash "${FILESDIR}"/eclass-to-manpage.sh || die
-}
-
-src_install() {
-	doman *.5
-}
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index e124a433f9cb..4721674a74e4 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -2,8 +2,8 @@ DIST elt-patches-20170317.tar.xz 23356 BLAKE2B 8e402496e4c064a56a6bafbf369bf9771
 DIST elt-patches-20170422.tar.xz 27864 BLAKE2B 0b6a764a7030d78618139f2c2a51f33b224f38e9f117ce45d119375e20566df55266f9684b53d3d311f91570803f937922f93801ad5a3664dae70828ebbedd12 SHA512 90867925f797ec815cfd8f45655cbc0bdc5f46e1a84792988ca76aaed97489907a926acf8f50c0499c56f6e70ea7081732f71c74a8d49bf24a6d265a0a4202dc
 DIST elt-patches-20170815.tar.xz 27864 BLAKE2B ca699e3fc3f5903f660fba70aa424603d42ef3b3aaa5e8768cfad0561d423972b21e75e578faeaaa89d8b0932f5161079a57e5d0d4ab7b56d5a09b91fb0e8d46 SHA512 deba10767b6a8cb5e8139e6f47a30e6f8a4a9312adb1d3e0199df24321d89601915fc91003da2d14fda679e7cbd30a4d4cf39d94ba57bce06432eefc168650dd
 DIST elt-patches-20170826.1.tar.xz 27912 BLAKE2B 886644713651448784e040fbcde6ef11f98f12abffb347f2213b990c1f0ec2df3af6c729c18781235a393e6de907b4da6ec5d140f7fb856466de6e7cefd54b00 SHA512 30a1e8b77d2963b7c56eef3a7a0a576ea6d30f1133c7bf6ad3b5b57cbe3e2de5e8cfbc50a929fea589b42ca02802a7ed16ccf7adb868290a2cc3add5b4fc77d3
-EBUILD elt-patches-20170317.ebuild 702 BLAKE2B ca4ead87686d025391adf43d12006e9fdeef59d6089b4bd2599d28dc14ecad5c3f288482dd34ab1ba0336466bec381dade42028fa5d64128d73e5dc66c8c2b3e SHA512 71ff8eb6a19d1e8e785b753587e426e64baf56ca215e2011b66fe8455fc40e6f6c8df1e3d0b037da1552ca94724fb2f29b14ea674a4e6c9d647ea3b8f16bc9eb
-EBUILD elt-patches-20170422.ebuild 825 BLAKE2B d652e8bea87970f26c4db1e26d525c4cd9700f6069e5e48f89ef2478b005cb0e3a3142a4ce0799b19a202ab4e18b5453b7d61d731095ca89f04f971b16801db7 SHA512 8c1f168c3fc9088d6d3e24be3584c44068562d59ac7e9240ba0dcabc616355efcaa22bde1bc5ba689a12ef22b669731a78236c02b4bb4adc660d31979ba6e06d
-EBUILD elt-patches-20170815.ebuild 829 BLAKE2B d29398c793bdd1b2b14e22b5e653d47112e45aaaed9299f4c030e9a48a66417cc01ada1793b44e65d8007d525c0737c1aa7c328015b78354bd0bc6b230d6ead2 SHA512 6a67cd999de7ec8dd4efe89791fe81fa87d0156a7a061a2fc5fe347610deb18a431fff126bfc7262646cb10725d7cd6742abbd7407e4dcd0e1a687ddfe7f361d
-EBUILD elt-patches-20170826.1.ebuild 864 BLAKE2B 28c926ca9e9687616e8ba94527c5c86a33d96b1cf574a006fb6df5cf2c06b41c63a396431753b5fb3d1005a0762087307e3c949480a6d6e2d4049c958a8f3be7 SHA512 b7771ecff9120bd83a032f79ec9378971d97e9dfbc8c226d505a84dae14c823b60630a86f37b5011002f42cf9fa9da8fae9f959551f59020299ad7b0429c52dc
+EBUILD elt-patches-20170317.ebuild 691 BLAKE2B 26f6cb8c68fd31ff7f23b2bfe549e51e9c5bafbfec38f8bb2608d170928214e84b304000c28f0763e382d7f8ebc6936c6740e2a21d1584c764159bdaeaff882f SHA512 a91efd852fddbfc278d5ce742fd84a5a521cd5f76f9d1b3fe9439f69a5607b75d3b48c95f3ae5802b3342150dd170a2fce63eb33a6eee53a6da40f567a4279f2
+EBUILD elt-patches-20170422.ebuild 814 BLAKE2B 221ddfb6aa8b5a6eb314c3e9b1db5cabf24bf7ec4974a922bc558cebcf153a499b4cc73dbd43769bb622204253db90e4087987a4b928c50c7aa9bc072a634502 SHA512 ec6390491e7394758c5c9118747ff55f01d55167bf1c668ec8db3c19ddebd6de9f3f4890ed74e55bedcebf7f847e60995a1130a7e96ab31c03386adafa13d869
+EBUILD elt-patches-20170815.ebuild 818 BLAKE2B ab2a57cf007d5c4100988a707d8b843e7ce50e4458f96c8a36e69f696fa35de1707c0b3bf77fb1a6c5d90043febe166470b203f455199efefd5e7b4ab5ee72d4 SHA512 657cf851830c95bd12e72c148688fc1a356de969ba7edeeed3a82114528d9f0125a6e80971d93081c2f8fca00cd2795c9dfc6673506732a0c1d60173487a53c3
+EBUILD elt-patches-20170826.1.ebuild 853 BLAKE2B 385caaca5972c94aaa5f45dd5289476c4ee96096944afc2fcf92df8cb168a78f258afdbefaaa9906f33b258f988aa09a1099c5dbc11ccb0f74a73e032d42c005 SHA512 c3fa47bae8ec1f7ba80d4026c3e76ec83b91ad38d2a3584cd3a374754b97bc639060d2a4574e312dfe0f4896875bfdfc26a658a4fe86267031b23cb6adea50b2
 MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb
diff --git a/app-portage/elt-patches/elt-patches-20170317.ebuild b/app-portage/elt-patches/elt-patches-20170317.ebuild
index fbb181673f1a..caa6aeec9251 100644
--- a/app-portage/elt-patches/elt-patches-20170317.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170317.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt ~x64-cygwin ~x86-cygwin"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/app-portage/elt-patches/elt-patches-20170422.ebuild b/app-portage/elt-patches/elt-patches-20170422.ebuild
index ea7235f801ef..0b584e06a898 100644
--- a/app-portage/elt-patches/elt-patches-20170422.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170422.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt ~x64-cygwin ~x86-cygwin"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild
index 0911da2ad6ad..cb84f664c012 100644
--- a/app-portage/elt-patches/elt-patches-20170815.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170815.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-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 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/elt-patches/elt-patches-20170826.1.ebuild b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
index 8cf0f84e0634..3439c84d867f 100644
--- a/app-portage/elt-patches/elt-patches-20170826.1.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170826.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-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 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index b4e69d2707f7..1a2e5410c4f3 100644
--- a/app-portage/esearch/Manifest
+++ b/app-portage/esearch/Manifest
@@ -2,6 +2,6 @@ AUX 1.3-Fix-python-3-compatability.patch 1177 BLAKE2B 1b119e299c6a1ab3a55e6f9319
 AUX 1.3-Fix-setup.py.patch 792 BLAKE2B 1bbaa8f4499d48508c38c48e579849dd8b5cfae587e982b4bae1932d3c8a23d0c4ad43639710576a9b7dcc53a93d47f1965166b271e93c4cee5309be03a05bc9 SHA512 db741e6effca01b8e71810bd455d227c93df2ca86f5b77c69ba227cb1426dfeca548854b626d4d626e311faa6b8bb137c9f22b21322b6fa9f5ac2dec4786a5d2
 AUX eupdatedb.cron 659 BLAKE2B c0e820e59ba42f9caf2997f0042836c564283edc1edbcd8fbae4d1a79c9acfe9df344d945dd2ffb1d13d0aeb36f32dada366332517b728e2e5fedfe725788f0a SHA512 4ebaa0f8f73215aa497dc0adb922eae1ca42047b7069d2d0dd279edca8c4d9e782ccbfbc421ccd4cdbbffcc5cd8cffcf0c56ab66747043c5743c217c1e33df92
 DIST esearch-1.3.tar.gz 19383 BLAKE2B 308cb075eff0a592135e883913bab3709b64a785602250ae06bfcb50eca6f8dacfb047bb4326b4b9476553bc8bd993b69295373cced7a18786a7834378e860e9 SHA512 7fbc1c362a320a76a40c45ddf83a29223eaafd3cfed1d8a9410a380e2025fb515eea26e38ebf0f304d14230c6c5cfc83ef2116b774b1d50ee4f7f4bb0ac046c4
-EBUILD esearch-1.3-r2.ebuild 1576 BLAKE2B 98fe51c640d6830e8bfbad7c8fb45110a4642418def3facf8d7dd7b73c5106a90cce51aa037755946c18cf3ba3979a2ab365c13b1de328ae7c3b95895d9ceec3 SHA512 33db3a09d49e7a2de817797d35f0316a033bd6c6fb70af57321e0a0bf2372e1448de4abf29d78a5bdbbccde8518814756ac9ac8297aaa4a49a1c14f8998da70b
+EBUILD esearch-1.3-r2.ebuild 1565 BLAKE2B 09a20ccd02ba4a4b8995836881293fc4f11b71ce365203cec2afa7b8ae997575df16885dc7913a8a37b3c97fece63f9d9bc37cd37eaf24f4f309e7db629f30f9 SHA512 84c942ab92e21cae369365a0426f9eeb29b52adaa6121418fb185188a4bb9f9b402037b4460b3740c95c021a77411a809b04cff9919eb81a7469567c8f3354c0
 EBUILD esearch-9999.ebuild 1145 BLAKE2B 6cdb90bf72eb3f638fd11eab43bcd9b5f1d408b60d86397b4d47163fef0dd4dd0a641d38d2df762db04ef7a3c9d4b3bd5791de16fdeeb9e2d163adee2a8f66bd SHA512 af36069c02638fb83cdb9e5cdda3c76e3719526085449d823e17042da88b8414fbf285d0ffe9ba0458cf5e7ec170b20699c6391667b3b4287c5d2ee730a961f1
 MISC metadata.xml 357 BLAKE2B db12b57347ce8c8f1e41c64bf0a94c80509e27964353113c40d4c49aee85d3ab747d3ac2a05b1a1314b141feef9a014a3b475bad5101a077da803f55cc853098 SHA512 a84ae0adf855d68fc14b01d1583b0c264a27852df31397af387ee7d8948f413cd98d2fad937899a91387f23d70738a540522b393e2fdab21dc0f55014cf6557f
diff --git a/app-portage/esearch/esearch-1.3-r2.ebuild b/app-portage/esearch/esearch-1.3-r2.ebuild
index 3c8b1eac66e5..55244957de30 100644
--- a/app-portage/esearch/esearch-1.3-r2.ebuild
+++ b/app-portage/esearch/esearch-1.3-r2.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="l10n_fr l10n_it"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 
 DEPEND="
 	|| (
diff --git a/app-portage/gentoolkit-dev/Manifest b/app-portage/gentoolkit-dev/Manifest
index 7b1324d90531..8a568e052dec 100644
--- a/app-portage/gentoolkit-dev/Manifest
+++ b/app-portage/gentoolkit-dev/Manifest
@@ -2,7 +2,7 @@ AUX gentoolkit-dev-0.2.8.3-tests.patch 897 BLAKE2B 6d04857c29e4e5b53a3a4189b33ff
 DIST gentoolkit-dev-0.2.8.3.tar.gz 53322 BLAKE2B 65136a748a971688371245a5bc46d9d45689c14fdb0a772c0d2a94264cec4464c90345b9d089b855acae91db92b08b604400ada09ffb2c08f77bb3662ea952b3 SHA512 f55362e46928633598cb07640505202521e3f4bdaade1faecb4ac14ba1bee0489207cb7ab03531e06d7922446a57083365f51c63ceb8cf1e0badba9ac503c16e
 DIST gentoolkit-dev-0.3.0.tar.gz 58655 BLAKE2B 5784ed2b2c6f92f2b6bf4a0d3d4a61d2f9defe20c438d273c5a89ed7b980afec08dd70fabc787066acd2aeea4ee5fdd6127d42cc500aacd8dcbd690ff7124d63 SHA512 d15f6546cf88af0832c14eb003c72b5906bb9b9f078c903e1e444b12c2e432fd1a2fa077eda5496e222cb50cfd5a705e86044b9a1c0164ac6b4b38268461ced5
 DIST gentoolkit-dev-0.3.1.tar.gz 58472 BLAKE2B 33ad722d23abfa94fcc73dd505794cde935119aafa8ae6f2828b59e6f1e95c00dcbb751732f69327d2278751350fb2aa25e3f7c2a33cf35367b10edad5744193 SHA512 e47fa698710132914c2de6d25f7450b90383b9d6283e927221bec30be3a56de93c09e81c35e025dee2f01bd5c2f10cf231fc392c415849029529712cd81aea19
-EBUILD gentoolkit-dev-0.2.8.3-r1.ebuild 1542 BLAKE2B 66681886ff1dede7c1c0a90718c090ab08e039c5ddad48c20b82b31d318a4acfad34a89858bb414d6e4f5c8b8e165c75878d772baf1869cb1977ebb552e6078e SHA512 1657173f37fd6da8b9c32a0a726d4290162553fcfaf1e00315070195b12900744a1e45bf70d9fd0127ff769f20f108fee12fa83e0a5a075ddf8391ab3e4f80f7
-EBUILD gentoolkit-dev-0.3.0.ebuild 2327 BLAKE2B ca3b77ac4dc3d2fc8a2504fa0d04bad98cefbdece7c7b3ede55588b6968b119dfd39fc3416a6fde1943ed4474eda7b69fd6b3e81da7e23a528e30b1b8821b311 SHA512 205b765071102ca19233c391f0a869ad1fd8ce8efd658f9240081f64d89eb7013e4bd2ae189c722bdb815a870bb3c8726dd4f541030cd7352585c007fba549f7
-EBUILD gentoolkit-dev-0.3.1.ebuild 2402 BLAKE2B 0cf6b9bed7c0479e4fb8db446a03536affc95b8f1558130d52f42eb260379f7834294d05a57b6f43de11d4d2744f28b1dd920a9f43a78b9a1ee354eabd04ee30 SHA512 20c498a38090e3598b943774752d77030b669503311e8a327d0def7706381495b004abc6fb8701383a6abfc88c04c3a6ada98ae775968e2b0b830cfc4983a4c6
+EBUILD gentoolkit-dev-0.2.8.3-r1.ebuild 1531 BLAKE2B 1ee609aa149a676a04bb1662b6b247590e9243b1837a21cf900463f3e8c5fd390ff84c0f7407b77d42b9c4b1a37a4fb948dfdb29fbdfefa3443bfe14b4efc825 SHA512 67d350f38a7dec1029d5197cd9703edf4ae892a72d422cf0bffb3fc246f3347975657907f7303dbbc31277bf13b3087156c11d7f107eef7edeaf5cdd86dab774
+EBUILD gentoolkit-dev-0.3.0.ebuild 2316 BLAKE2B 4620f92a61532405e7b389b804dc469c4185e45686ea92c3fe4f765b528b498978aeec1d42d01077cf77ffe80e7dde5aa8ff0b0d9159641a10d504bf4935c7bd SHA512 69d866d1984d64bc3a01b3ccf6d16de02d813a40d3aa14aa1dd182ad34d7bae50cc015b4def07314d22dfc6e5eff9e05de7056641740a7e881c5f40176505406
+EBUILD gentoolkit-dev-0.3.1.ebuild 2391 BLAKE2B 01e65aa2f968af4db14fd5dfd0a369c75e4b68f88a42b9092db552418e60182ff153ee549e1792a7a1febdd8d8cb50b0d6f88d32835ad8471524d014b4272fd5 SHA512 44f42c010e08c753fa2ffb7733db82e38a9dabd89ece709ea97c8f25098ed0609563fc71fb3c6a3ec4b0058cf5b7791cb37fdf0d371752cf0fef90fd08ec4408
 MISC metadata.xml 386 BLAKE2B 5b0d8e65ae078df17212c8ab4d23f9448609d4c5caf9a9020cf94ee332c8caf8494e66ef72c1f25c93d21f379b984ff174a846160d2657f87d36835e83207363 SHA512 6ee5dcd5f54623999f208a01cedd3e9fce88efa45e82a0d18d77f4dffa4f0ad4dc105d52221ec3c31924c895298705a5c0ec974cd59d4bbc6fabac72e60b85f0
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
index c03ed4457a45..871c6d5c4255 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.2.8.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild
index 5c750d88b85f..c270ccd256be 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.0.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="gentoolkit-dev"
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of developer scripts for Gentoo"
diff --git a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild
index 3b4bf8aff4f1..bef715e4fdbf 100644
--- a/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild
+++ b/app-portage/gentoolkit-dev/gentoolkit-dev-0.3.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz
 		https://dev.gentoo.org/~vapier/dist/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Collection of developer scripts for Gentoo"
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 46056185a67a..1582e9aab5b0 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -2,9 +2,9 @@ DIST gentoolkit-0.3.3.tar.gz 3197037 BLAKE2B c2a45971f1f25e3008422b63b59042ca0f2
 DIST gentoolkit-0.4.0.tar.gz 3215377 BLAKE2B 404f81e2f5bce5da4df122156bc76d225497456ad8ec78a50c41e1183390f8e452a6ce8a3473b5371a6712ce1599be33034c5eed64a1852d116c745bc5a775f4 SHA512 6cf693c588d4a2f5bd06fff4e78ef98007e613348048ec993c5430e168baef6c1da01e1843903f3e87ca8e47dd1ffb207acccbc5c0e881fa3093a7880fec9a56
 DIST gentoolkit-0.4.1.tar.gz 3214527 BLAKE2B 1c6be826a099ba4d18ac8fa0bb38808cbf30ee1d93d26c26965d7fa332e6a87f8eee475126f56d68e2a1c0ff04f258f79f5684551b2fe5947d8ac6f6ff3e7079 SHA512 52b665e19dd8b871f4238d05d40a071d69ef114f36b589c29f46686b1439997e72f58896bb4f330ab256af6000a9559426c78cae08640e54b74db343b3b22945
 DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c51e2f74020e0fa2f1f4441c203c03a1269c8c55e1461c5780ebfb8234d364837073d582a52a99f2d40c92e6b77a7f0 SHA512 3a9eac2fd214bcfe39380193cb2118edcd759dbf3eb165e7240525ce1047aa984f1d1f1d3a15324218d9be1f0a1ec960ae08a63191392f1bb3422277a52697ff
-EBUILD gentoolkit-0.3.3.ebuild 2187 BLAKE2B 21cfa614cef616b3f6326cde3fb52d1cf0a21a0b1e1201d27ac358c3fda79d08cfa4857ecfcf0b5f70c3d152855cab59f131a14d1e6327299d74b23f3085819e SHA512 76d206fb0c32e075cd4fef87ff8c4497f1f566b8ee5de07bbc5608f32c42777308619d13fb179081726920a59480010e9b53c4bf178f4e335017bcbe0cd35885
-EBUILD gentoolkit-0.4.0.ebuild 2331 BLAKE2B e594f565ba0a7182665a191e8c39ec7acf107e784dba7da9df454922c13ad08265723ba7cbac310a9231fdba53292d41e6773f6b861255dd27b8ad3cb44e9b39 SHA512 745b8ced23a8fae9020e397b13ba5f8927a8e7d9fb52e19d6bf87b889e60ad808e46d810b4b9c03ad6030bea57987a973a797315417de013de6601d25a6fde18
-EBUILD gentoolkit-0.4.1.ebuild 2347 BLAKE2B 1087067cfd1684731970ddd2826341f43a7a9bfc4df8a918cbea41c930806957f349b25d901dbc3e841a5a32c69771af822dccf5d42beae014ddb9e25c8b204d SHA512 9b99a5f31dd05d2eed5ce6f842b17214f9ff9c43a7eb54ea4c40aa6b5e9acab0c7005f67c7d1c105048cae2ad892b2316fd37313a2f501ca93a24c5417087e60
-EBUILD gentoolkit-0.4.2-r1.ebuild 2379 BLAKE2B f23fe2cb372d5f02cbc71ce55962bf303f4267fd97c3ff9fe42fb38f74a01191aab6159c9e0cf5b1955fc8ec347adbc86fc65bb09c67c9f36274c09a7f77930d SHA512 fe17b9c389c5c13275651de5ffe23c07634bd4b6d809f167347264668ff7ce2eb673b4fb11d9ffaa0b1b357c675a24539133b2ffb767747c564c84950975c383
+EBUILD gentoolkit-0.3.3.ebuild 2176 BLAKE2B e3e6d87f3d51108e0e518c807e11e7d1e96c589564441fa8a0a89f38552b88e4f188f8d6b648b8bbaf1342b0388be711deaa01d87fbb81c35d4aca2bf82c7c23 SHA512 8c5776d2ba632f3b515c7a7bb9ef0763352cd46de88c54096c0f04a7cc4201082dddfb87e9ed02123b2f6ace4e78ee25d5c1240fcea910ce4d0be864275ea3d8
+EBUILD gentoolkit-0.4.0.ebuild 2320 BLAKE2B c0753030f51818281e0f72bb95bc50fc252e1a306b3ab1e9e2827fef65783c2216aef5096b24ad8ffe7f290ed126b2f9d177232415f648c0e2b352cbbbc1602d SHA512 f5e7f5599db824ad62955d9e4da2c393e92019e2e197395e1beef070393a82c0f6c74c03e5d92f47b996703718fbd2318e826bb462a18821103f8bb014c5c89d
+EBUILD gentoolkit-0.4.1.ebuild 2336 BLAKE2B e51c16d024693cf3e81c68c9518262937ac8d108a0f4d10254140f421ffa8e56583a174c1b16f4fd1c95ee9fe4b41f85bb24bbf6c6f3ce37dc2a87a5645a4a3e SHA512 24102deea29f41323640d60d3c6bf3a870b19e6e3949e9eeedec684649eb0dab061c300f147f4e2d45154261e01a2fc556f02b9093a40ca66086ddd24955a0a2
+EBUILD gentoolkit-0.4.2-r1.ebuild 2368 BLAKE2B 399595be69cf9173c1babb77803ddd88ae037de95d6e192bca4172ba32d093fc1e137028c28e44d3fb88174de19283e9ef884f2867131f42a508c58d478ff178 SHA512 e1e722d9fa45f5e0569349afe31a047a0d642371ce3b7edd04125e30d39ea55926913fa823c22c5b09219893dc45e70c98683d5c011511f7a1eeaa7ea47e4941
 EBUILD gentoolkit-9999.ebuild 2038 BLAKE2B b73ca2d3af0a6d7adf65e489cceb6bd4ff29c61e2e657dd28c0ab17e3050cc1031d0db237ff9467dc80f3c463ad0c1f3efdd9ec5d13f35ca0983a435c61329d0 SHA512 d0110f470a871858b3ffad3617714db71b1b015c72fc9f3c39921f3c4b6ab80192c1b060f2de3fdc673a8a8ccca7b5be92a43fb52b5dfe664d832ae093bec7f2
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild b/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
index 9ab493835d3f..98e625998ac8 100644
--- a/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.3.3.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
index 47665d99a84f..80c4ab0f86a0 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.0.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild
index 6722fbcda234..6a8d551c39d4 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.1.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
index 3ef6b39ef078..fadc14db84b9 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	|| (
diff --git a/app-portage/gentoopm/Manifest b/app-portage/gentoopm/Manifest
index 282f1914e555..06f9fe785742 100644
--- a/app-portage/gentoopm/Manifest
+++ b/app-portage/gentoopm/Manifest
@@ -1,6 +1,4 @@
-DIST gentoopm-0.2.9.tar.bz2 24652 BLAKE2B 1046d4cc5dca19d2cc72e8d8d54cd0d2172164aa5594666c89a4dde9dbd994654d07982a2381fa09038b29ebb011bdd410f60ac3c340bdbf533bcfc29f4c4796 SHA512 e7d1daa811eb6c0877c2bec98b72bce61380802fe704f271a4df6383506d62ba661eb83ac9afd432627e2f10bf38840796768a565b80b6489563cfc54ed81ae7
 DIST gentoopm-0.3.0.tar.gz 37614 BLAKE2B c848c08677c4ac5ab0fdc1499045ae418048ec35d4ef925d1fe09ab4b68ec90e4f6843511efc29184883f3b3582bd3de519212bea1997736378b01bdc13ebd14 SHA512 e2a82f37b9a42688b6dd7023accdbf537780069deb6ca6ec6d9e159baf774af17e2a405c9eb40105b73b165f1c8c2ccde3ed685e04a61c9cd6665d1677da61d3
-EBUILD gentoopm-0.2.9-r1.ebuild 949 BLAKE2B cddba8cbec01872603134552283f1893df14f877a5a31d855ef74a93939b354a85e988856d9163878e85fe21da8a192ea1bc61bfa0db20962c9443a13d422f5a SHA512 47f12ad7c000b293e07e8baa9a309f82014604aa37961b81328b9102df7dd98ba1ba55744029362048eb79db27e162b7ce8c336a16e89f7cb5c370e14b14eeed
 EBUILD gentoopm-0.3.0.ebuild 767 BLAKE2B 478ae7dfab0c27bf107b8d869c1b4b20df2bfc25739b6f229f2e4b4667ed97dc61c336a1c632769612541647dd60c4d59c23f868e387de06830ed6f86947cc8d SHA512 b57ace4db0f9f588a0c60295ffbba8aacfa0744b9c35347127cd92ee7e0a4ff8eae5cf739df577c073dd57a2e7784a00fa7a8d507a14e6b91e0b9427b7e32b01
 EBUILD gentoopm-9999.ebuild 717 BLAKE2B b28b02d967c8cedff079e2ba6acaf1f70ff00871fe63ed4c8e19efab75c080a6f2f6576cc914df1afd4e96292b5e7f8af3a7d6e88ef2cdc833b9902c46413a0b SHA512 2af22305cfb780d60b2d980f2b679f06396327e644579618667686aa03a0ab81a57c34606df7a43680cf3bf5d483f46e3b36ebf5051458b0b4f03614a708fd5c
 MISC metadata.xml 552 BLAKE2B 5298db30d81cc45ccec8b1320c204be68592246d280969045924d3142eec58cc6d050cfc919e4f30caf427e255ec968ff551e7338c97bb8ab77434a4d4a7aa68 SHA512 dc85516038135bda516f32d321375d814ce7f735d5169365beecc994b4d8936f646a580f1ea88dacff323a54e146423c99a0b6280af41aeb39f08cd9303ce677
diff --git a/app-portage/gentoopm/gentoopm-0.2.9-r1.ebuild b/app-portage/gentoopm/gentoopm-0.2.9-r1.ebuild
deleted file mode 100644
index 21be8599cc2d..000000000000
--- a/app-portage/gentoopm/gentoopm-0.2.9-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="A common interface to Gentoo package managers"
-HOMEPAGE="https://github.com/mgorny/gentoopm/"
-SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~mips x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc"
-
-RDEPEND="|| (
-		sys-apps/pkgcore
-		>=sys-apps/portage-2.1.10.3[${PYTHON_USEDEP}]
-		sys-apps/portage-mgorny[${PYTHON_USEDEP}]
-		>=sys-apps/paludis-0.64.2[python-bindings] )"
-DEPEND="doc? ( dev-python/epydoc )"
-PDEPEND="app-eselect/eselect-package-manager"
-
-python_compile_all() {
-	if use doc; then
-		"${PYTHON}" setup.py doc || die
-	fi
-}
-
-python_test() {
-	"${PYTHON}" setup.py test || die
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/* )
-
-	distutils-r1_python_install_all
-}
diff --git a/app-portage/gpyutils/Manifest b/app-portage/gpyutils/Manifest
index 696d0c26bfa1..68cc00c50f56 100644
--- a/app-portage/gpyutils/Manifest
+++ b/app-portage/gpyutils/Manifest
@@ -1,7 +1,5 @@
 AUX implementations.txt 809 BLAKE2B 64d5776621de4f6d522c2e07529f41f154c4253f35fff9f7dc6967ac2970a8911666644401cf657a05d500665680dc0b6cbaf120fc6bacb50fa2e058fcf2901c SHA512 e3b20f8cd0d34da4d506107a38b176a36960f97090d06de1475f12167ae28f95d5dd2d062baf31942f517d0e40b91fde485581736a40eaa9de838b28855bc62a
-DIST gpyutils-0.2.1.tar.bz2 15044 BLAKE2B 44a67a70c42b07523232f3e8d6db0b9155709100c4fede41e1f96c2d3fa396a1d4a67529c7e70fa75c2729c1a8f769cff35936606784a9ddc2a59cb3d163780a SHA512 58b796647bf614e4ad492fe97539bd11f0d5beeecb7fd903a81917bfaac54ced4fb14813f499010093884891eda9c43226bcf2cae7744e7290bf9b16928b6172
 DIST gpyutils-0.2.2.tar.gz 19646 BLAKE2B b5c24817b8a5ef3122d46330d2311a328ffa9c936878f494586ed62fd9fa9d54210c4edcbd9d07f61af7c27faf410e0abf60943188e8340ea52f06d95359c6b1 SHA512 28ca27b3688b593665037bd7a811014a11b3192bc0acc4568c3e70d13cf7a163b41ba3ffd9d8caaaaf4de2758e1cb68b7dcc255d9fb26ca8448a6bfd6416e66e
-EBUILD gpyutils-0.2.1.ebuild 519 BLAKE2B 1d1f4767c7f3ab0d2e5791ac1e3fa9bba0b6e93f091273a4bfb20260beef1febb5877e4e6b6c21bdd069e421719fe6fa997b93051bdf0fada7d9c796220889b5 SHA512 e19aa3fad32d70354d00b28ef019243cfaeb64cddb6ce7ede3397588b870b9f16bfe5901514a0df3982432432b254a94c5901e79bb73402ebed7bb3d05ffd42e
 EBUILD gpyutils-0.2.2.ebuild 522 BLAKE2B 3f440acf929c0c38d5aa70762d0aafb707b0a82f9a73f5024fc66b6434f3d81b6d6eb788aa20cf0d9bed57168de50e811a13f00f565f35ebd4d777a8c73611c5 SHA512 b017b43626941fa3a7f4eb8c13bb8eff088d5ecfbfe013dbf7400ae4d56e272ae8f9b2773353d10778538b437b48097b6ba470a3f3a793024cd0285b569697a3
 EBUILD gpyutils-9999.ebuild 502 BLAKE2B 599965a84ba580c312a53af148501bba76acdca1490a0c2643a97422eb87370d7905ae74b76446b1c067229155db73b98c23137b491f9b861b30ba71c0be3a8d SHA512 f4b5fd097b1cae93703c896cd846d097c300cfbfa2d3dd7d78f47be735245398bafdc23e255c1b8091e74de209b2f81efb2fddfc68b5215481fc3d0d8e725282
 MISC metadata.xml 527 BLAKE2B 14b3e5012c6b0543eb70b56132d289837eb9b5e355ea38f21c0fa5de841eb3dd9cc9d89f60136b523121648d8a94d62563b1f065fbe9f120f2e03cc7e6d84d0c SHA512 52f6670e1fd8b5b58a566226a20ea405aad364eb085a7f2d62485086e5d9ce2ceebfe9ab3c6321892fa775187cecfe8148cc25ed5256ebbe1ac3fba8d7d39ddc
diff --git a/app-portage/gpyutils/gpyutils-0.2.1.ebuild b/app-portage/gpyutils/gpyutils-0.2.1.ebuild
deleted file mode 100644
index 45dfe8370db8..000000000000
--- a/app-portage/gpyutils/gpyutils-0.2.1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Utitilies for maintaining Python packages"
-HOMEPAGE="https://github.com/mgorny/gpyutils/"
-SRC_URI="https://github.com/mgorny/gpyutils/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND=">=app-portage/gentoopm-0.2.9[${PYTHON_USEDEP}]"
-
-python_test() {
-	esetup.py test
-}
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index d705ff5d32cb..651e234480a0 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -5,7 +5,7 @@ DIST portage-utils-0.64.tar.xz 533124 BLAKE2B c3e0ecdc2d82af197dabb8434677d4c3bf
 DIST portage-utils-0.72.tar.xz 1585068 BLAKE2B 33aae0b59cd6f6b7a5503f0282d009c6516f00d14228461359e5124fa104b2ce89019ae5113bac2ed2c975c891d9d5371632ad3dd66572bd6e3ce890895e9ba7 SHA512 9248a1f0d7103f5a26cc01bb8abc5890a0b02b746e06312cd25f0223faa0b59ba7cc0708f272ce327c956086f9a4fcc994bf30b948131da0e63164bba35cf1f2
 DIST portage-utils-0.73.tar.xz 1585564 BLAKE2B b743f459770ebceaa86cc47b0a9d0172ee495bbe2930cd57c2909d3ac2d7c1672447e84240245e1b98922004f4f34418d75b39c7e1550a34a07b964b7ecbcc8d SHA512 d35af62e3b6551c5224a3afb89ebf2e08cf42de266389c3423782c19fcfe8934433a4554ea5ed629de495a66371f0220c479fa84f24d68655211b8538e18d105
 EBUILD portage-utils-0.62.ebuild 2014 BLAKE2B 58941548aecefed7c7a4bee3ec9e60de24ede0380c4a6cb4e3184ff457fb07c946e792d3e60e2a16bef4897b287fd19f9315fdaea4012bc19220379763418812 SHA512 3fc3be2e3e29821cd26cb7d8a9e7e6a026e17c839308039ef2011700677e3f05e2322e367e737e822ccbf1621221f7ff8ca929c6f60817dfdd295981745cda1d
-EBUILD portage-utils-0.64.ebuild 1307 BLAKE2B 19f158c23ac15aa0a9138d8f93d3c1bb6bd48ad9b89031f7e5faa4f643a026e87534857d8463db4aeda445566a1434092b0dbbf97ce96cea51d254f57b0c7549 SHA512 b5ec8a9d06cd50db047d5b758a328c7dbb31690de8f1b7368358bb700bca94f6b22bd32fa79a9f52d76f4a62182cd0cb148fa02418277f398e362b44e50ba7f1
-EBUILD portage-utils-0.72.ebuild 1092 BLAKE2B 1cadc306a2c0e0b5da2f767b4fbf1c1698d5d6ab33acf9408497a1f8e3bc6bb142c39a31336c99ac915102b10d50c047de6fa7ec0256bc3bfbd4c7a18af4a606 SHA512 94cfbbe0de0be8db8fefed2bb64778f754c7672f58b8f307b8a1fcbde1ab7f60224b626e915641a0166c9bc4de9b9f7c4dccbaf8170f78157af5e9084fc16253
-EBUILD portage-utils-0.73.ebuild 1092 BLAKE2B 1cadc306a2c0e0b5da2f767b4fbf1c1698d5d6ab33acf9408497a1f8e3bc6bb142c39a31336c99ac915102b10d50c047de6fa7ec0256bc3bfbd4c7a18af4a606 SHA512 94cfbbe0de0be8db8fefed2bb64778f754c7672f58b8f307b8a1fcbde1ab7f60224b626e915641a0166c9bc4de9b9f7c4dccbaf8170f78157af5e9084fc16253
+EBUILD portage-utils-0.64.ebuild 1296 BLAKE2B 32d3375e708bb4e55f2addce4366d88289b47d928e9c331ebbe559f7954f76bac2240a90adcbe1b9f6828b54a20765810ed3d663a4972b3aad6b7af65a2b2c1d SHA512 6ca693b29d59ef4b46cd2179f92fe200ed846611d785e6440d94beb62190a53507d88560bdb852b7a0661c3ccf1ad616c31706710f20a4769fd6d8a3c469fb7c
+EBUILD portage-utils-0.72.ebuild 1081 BLAKE2B 5e765d3f7e41b622fafd1424dde7541fcaa557832d26eb91b392d41401a1cf591be5498632eac2c83c217f0583a7c80507d86b343154e131b1eb74735f22fb45 SHA512 f0bdfd0b1ea3dd278ffaa8d66614b7750a15e5cf78f9ddca9c4c12ab40e58075c31639b02e1da58579140a25d23a2a8704f646cd3a9a4f96aa930bbe67062816
+EBUILD portage-utils-0.73.ebuild 1081 BLAKE2B 5e765d3f7e41b622fafd1424dde7541fcaa557832d26eb91b392d41401a1cf591be5498632eac2c83c217f0583a7c80507d86b343154e131b1eb74735f22fb45 SHA512 f0bdfd0b1ea3dd278ffaa8d66614b7750a15e5cf78f9ddca9c4c12ab40e58075c31639b02e1da58579140a25d23a2a8704f646cd3a9a4f96aa930bbe67062816
 MISC metadata.xml 248 BLAKE2B 60e4295b22f6f36039547e98305ae072755044f6516df2e29e65768732900ffc93dac9cbcf1da9e6c731403a62cf272f2f378d0641bd466974f8a234235c862a SHA512 f6fee7363592cb9dcd666011806321b791fb84bf0719fb2454d1f3ceb738650184286c17a13684c077bacd1a93581a71accfe9cef74adcaf40dfda7d8a167d13
diff --git a/app-portage/portage-utils/portage-utils-0.64.ebuild b/app-portage/portage-utils/portage-utils-0.64.ebuild
index c717ab078c5e..1a7cb5264db2 100644
--- a/app-portage/portage-utils/portage-utils-0.64.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.64.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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/portage-utils/portage-utils-0.72.ebuild b/app-portage/portage-utils/portage-utils-0.72.ebuild
index a8b0d9ea2d64..26bbfdf95355 100644
--- a/app-portage/portage-utils/portage-utils-0.72.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.72.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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/portage-utils/portage-utils-0.73.ebuild b/app-portage/portage-utils/portage-utils-0.73.ebuild
index a8b0d9ea2d64..26bbfdf95355 100644
--- a/app-portage/portage-utils/portage-utils-0.73.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.73.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 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/smart-live-rebuild/Manifest b/app-portage/smart-live-rebuild/Manifest
index 30625cf7714d..f12fa957f278 100644
--- a/app-portage/smart-live-rebuild/Manifest
+++ b/app-portage/smart-live-rebuild/Manifest
@@ -1,6 +1,6 @@
 DIST smart-live-rebuild-1.3.5.tar.bz2 16004 BLAKE2B fa1fcb13c739ef15b343de3460b029a311a4c08be3ec44ff5c0c89fef4d07fde7fa5558444b25ce234d64b03465b4a401593600f3fec5cbbfba76bdc76fcca34 SHA512 46933334c8c46a056c837e60a5d8aed30a35b1ddd20d7c0f03e813f6cac11cc2dc9469674b1e9c23d94c9ebc474e5eacc7aa0e8f82492554a7f49b438ed740d2
 DIST smart-live-rebuild-1.3.6.tar.gz 17194 BLAKE2B a1c4f07e66ce3328ae70f88d086c33875bed68aea645a180e68fbd997051c6d398c1133d8e9c72378741fe41c519e941e76dc25d9c3f9c61c36531fe6fbe8e79 SHA512 f9fe57269654d69c3b21d0b6e378dfa3d2c00e67dae44278b2b81d631e4645346ecaeb5c9f43b77d39312b97edee247ba8b05303be903d6a3573bc226159c40f
 EBUILD smart-live-rebuild-1.3.5.ebuild 832 BLAKE2B 6e2cdd282bb221449a6ad6b3b245e8c11afd52f34bf0a92a5e2029c03fb848bac6bc1989dd86fe103568fa3491c425786606272f473e89d2118ab4e31024e9bb SHA512 b64f511562e14cc338c5a3a1275b21874d7a4b8b16ff1b7d678327cd1d2f5677daec4377b23763b8a1b3401aac5c7f8319950133ad066ee76464f905585c3a28
-EBUILD smart-live-rebuild-1.3.6.ebuild 834 BLAKE2B 51475f3b8bed594ec4cda14e0ccbc212047bbe926b5e76c699075da1be182746f8e50fa04c113bd45d760a773743c95f73624e266b996490d764d3df1bde2249 SHA512 607ce34040450a962ce31a971496d689da6c1e066337c318de8ccd4e8878a5970c5ca6e74781df0706db94028ad5616e024bede53c87572c917ccb7742837d1b
+EBUILD smart-live-rebuild-1.3.6.ebuild 831 BLAKE2B 8263c19ce90fe63dce8ace4f0624e1c7987edb86f14bf87d0e0e689420d9ef2fb6375f2cad4c0974f66b308770ecbc7361c3beffd10edabe87711a50ecb7b6d7 SHA512 282615a33ae2d7356cdaaa54c75c98f9a26d52cf54794e661b16848522a7f5f5d11ee8c9dcd8d88d484b949e1048efeee6926a73c3254349d54f2c19ba9f8420
 EBUILD smart-live-rebuild-9999.ebuild 740 BLAKE2B 6fee19f8e59b7da874e9edafbbb794285c11a7338e531062d30deb73dd51f1e2e8287ed1887fb4146e54665b083b419fac14214c0d5104d934c2fdf1aa2c56f9 SHA512 87bef6aa7cb90ab260b8eab9dcaae46b2d2a3ec92c2117fbb53535e3841b8f903a706bc972cf5db7196459878330ad5caefe8bfc6b13ad57b57d2e29595e257a
 MISC metadata.xml 769 BLAKE2B 5aaad83253d55d1096c19aeb6a980e31456ca20a1ecfdb45e93dfd2f72cff7cce61124bf546932266d24d0c9fd0493ae4c61089ab291028360834c2f6d237e5a SHA512 d11c942868f0166c646922088dfecf3047f8ca017b85965382bec8fc794e11d6ffdea27a9156a41faec10a79a13836b13d8b9213a44e57672e1355fbd6bfd0da
diff --git a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
index 9e516f44532a..127e5c6c0513 100644
--- a/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
+++ b/app-portage/smart-live-rebuild/smart-live-rebuild-1.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/smart-live-rebuild/archive/v${PV}.tar.gz -> $
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86 ~x86-fbsd"
+KEYWORDS="amd64 arm ~mips x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=app-portage/gentoopm-0.2.1[${PYTHON_USEDEP}]"
diff --git a/app-portage/unsymlink-lib/Manifest b/app-portage/unsymlink-lib/Manifest
index 8d346a18bfcf..286cb2ef40c0 100644
--- a/app-portage/unsymlink-lib/Manifest
+++ b/app-portage/unsymlink-lib/Manifest
@@ -1,6 +1,6 @@
 DIST unsymlink-lib-12.tar.gz 8689 BLAKE2B 3c170886bfa3980ef0d51be1e3636afcd700aad94514a2783a1bf221970022fb4812640ac0c2f54e6b0d3b93244a64221b092768425faa1ddcfdc21ba76d9cd1 SHA512 e964cf8dae4107cbe0f5a304e693794d50316b914cca6cdf068ac3e715c8a6fab44d96ec38bd34e5c4f65dd169629bcaca3a0b6ce3256c3d40dbff69dac56fe5
 DIST unsymlink-lib-13.tar.gz 8736 BLAKE2B 5b44112299232185f3f7a5d88057caa7e9161ca03a3e79bebd9dbf70a61ddde255d3a24679b9004cc572fedcfc24ffeb42693319e5dfa1f8371f8fed1408b15d SHA512 c87676b80259f2a20fde257e2b090380c3b04be1542a5a92832487327b8d1eb737059a6e6898f713fa378b792e23d2896280b94cb00d7961a0beba81cd6b3bd2
 EBUILD unsymlink-lib-12-r1.ebuild 641 BLAKE2B f967256636c88afa1d80c73359cedec7f29f73403796ddeceb4b1ebf98f5b30d0dc968cc1633ced1ee3a922715f06a565359dc05f7e5f320e9a787d7432a5861 SHA512 29232685faf31b790a027e2ea862de4b309d9a9423585bf1d12d63cdf298a20b2e6fd68f8a1917fbac14b7ffd3e6a287d1c358c2744e597ccaeaa32cba279b75
-EBUILD unsymlink-lib-13.ebuild 642 BLAKE2B e1ce43723f37bf64282ead110a404ef10757dc7f992a9a496e8e0369c6e1d031703cfe100bfefd0ff6c6ad25bd6f9ad0761c07067a9fdf303f241c91d86413ff SHA512 44f67eae9ba735173d9fd0312ced7154134cfb0b31109578a8fc5329687cc4b43c65be01b8788423e576b28a0dbf506145fe2f2a3fe04fc8eaae78482a39df52
+EBUILD unsymlink-lib-13.ebuild 641 BLAKE2B f967256636c88afa1d80c73359cedec7f29f73403796ddeceb4b1ebf98f5b30d0dc968cc1633ced1ee3a922715f06a565359dc05f7e5f320e9a787d7432a5861 SHA512 29232685faf31b790a027e2ea862de4b309d9a9423585bf1d12d63cdf298a20b2e6fd68f8a1917fbac14b7ffd3e6a287d1c358c2744e597ccaeaa32cba279b75
 EBUILD unsymlink-lib-9999.ebuild 627 BLAKE2B 4ebcd4f34b4326174f4c32cbc5c23572e8ca57a5bdaa3f170c60ca5bb2d4a9ac31b9a8203093bd7891eb78fb62642a4b9cb9f0e5fb16aa276e9561d4b0ff1a96 SHA512 e8a09ca9ebc84eb8702334de9c72f508bbe168961d0eba7f113c24f6e08e477d63ffde2f79927d7c1b6b0f2056e4ea6fb42c5c60156e92700088e70429b108d4
 MISC metadata.xml 401 BLAKE2B f16ce51083f8054e7190c2d5fc193808898071af155cc8442a9ef7064cb4d46e6639d8724f85a4a0f551477c6f7ae0f81434c6bef8bd88b2077ea7b7e1f2133b SHA512 dbd79971b54d9027956c46586b547f8308404e273e91dd7ff84d3fbbd50936b8f19dd1dacde5e16a22ca2ef17924f19f66ec83e64c9f145f29322150db9e00a6
diff --git a/app-portage/unsymlink-lib/unsymlink-lib-13.ebuild b/app-portage/unsymlink-lib/unsymlink-lib-13.ebuild
index 44bf45283e34..2fcdf5eb3a90 100644
--- a/app-portage/unsymlink-lib/unsymlink-lib-13.ebuild
+++ b/app-portage/unsymlink-lib/unsymlink-lib-13.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mgorny/unsymlink-lib/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"