gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sys-apps
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
470 files changed, 4207 insertions, 4136 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 2fcfd32341ed..cfc3e7934bd3 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/acl/Manifest b/sys-apps/acl/Manifest
index 4ba2c72bb2ec..e34410babf9f 100644
--- a/sys-apps/acl/Manifest
+++ b/sys-apps/acl/Manifest
@@ -1,3 +1,3 @@
 DIST acl-2.2.53.tar.gz 524300 BLAKE2B a4c602b18ab1a7932dce38c8dacf3a3026a3100a8a7e61f0740886ec7154a7738ca641953dc1253b5574580815d7f547a99bdd0cc0ee87238a1995abe97eb9d8 SHA512 176b7957fe0e7618e0b7bf2ac5071f7fa29417df718cce977661a576fa184e4af9d303b591c9d556b6ba8923e799457343afa401f5a9f7ecd9022185a4e06716
-EBUILD acl-2.2.53.ebuild 1231 BLAKE2B df03923adbf61b3045f7e39a0532d6b1737cd03536569d3159e70a9b0492472477aecdad41df6ace54c3aa7271aebb9d2928c71ee5f37c1e926c00b49efc713b SHA512 ec95273dbd152e1218e27169a6d4974ab1f347107527bf8e2c713de58394f079e3cdfa9baf47d5d265667a6c1b41a7096529f22eda65801f89ba1e39e9438343
+EBUILD acl-2.2.53.ebuild 1229 BLAKE2B 34624ebafb54dc26cddc71742042134fe7fb8eebeb5df9e5189439fabd6fb484ff6e122e2d9cac729bef97e30c970e84070a973242bc27069eedf944a22a618c SHA512 caf7540e4e28b627d0e1dd5504ce5aa068d6f032e8b9a2cf68b100794254eb12c40b60aa9cde08e83fd39a657a7765d31e777898c508e335263858f7b2ba64da
 MISC metadata.xml 293 BLAKE2B 2b8092a768f4f905c414e9bde92180e659085a60fd6ec13cecb29b6a88471941e7c8e2ad86f2864f44fa4f74589b20433ce64c3e89c3e210838b9d997deda136 SHA512 1e61b3f2d76e95eca037de073678326400b069526c8a308ca4169ce67d3e47c8cd199cca59f83fa245bb5fcbaa9efe7f31e34cf8588d69383ed0da78ab54cfaa
diff --git a/sys-apps/acl/acl-2.2.53.ebuild b/sys-apps/acl/acl-2.2.53.ebuild
index 04d9190a8f86..21928a8cc716 100644
--- a/sys-apps/acl/acl-2.2.53.ebuild
+++ b/sys-apps/acl/acl-2.2.53.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="nls static-libs"
 
 RDEPEND="
diff --git a/sys-apps/agedu/Manifest b/sys-apps/agedu/Manifest
index 786aba0a206c..6eb796332949 100644
--- a/sys-apps/agedu/Manifest
+++ b/sys-apps/agedu/Manifest
@@ -1,8 +1,6 @@
 AUX agedu-r9671-fix-automagic.patch 1684 BLAKE2B ab7d2d33a7577251fa65e222914a25e621c68f6bdedbe3c9e62b43f2d8b51e29bbdbc08560fbcd76beab98e115ddf43e76e4cd290f1ce751c0452318ad8ee9e1 SHA512 61f11c624ebd5fa632f24ecc46230146f999a68ffbd9c2ce73f6319a527cd9c37d634ecec9a6b2a7fd1dcc792ab3d23a6c8a599499bab54194f36acb262a201b
-DIST agedu-20180329.af641e6.tar.gz 178860 BLAKE2B a3b17bb708edb530ad56644314969b069577b6663cb3f6ccdc72345ac666c18f80b1eae14c5146be46c9f9692d820104111ccca586e3d5a564bb34a4938aff6a SHA512 66fcaf1f4ee6a66fa68cce88f5a5edbfbc919978513370821de4e01f0fdb499beb7642333b459adb705934dcba2f4a14a8c28edc1045a8fd1b42a4a317061707
-DIST agedu-20180522.5b12791.tar.gz 178887 BLAKE2B f9c669d9b5e24bc40f59274626939713632bd16a4a3a6804665f35844603e88524a800da1dea6b311957284348014a87e9b513e934f178dbd07abea42b73095b SHA512 89774e3cd0cce8a1a9c8d6415076a7b8b8109642bbb58a126707a651ab3da348886a4cb15fa975502a6bf4fdddb78aff16e5a7059c7ede89017e0c7a3cbf9618
 DIST agedu-20190630.66cb14d.tar.gz 180129 BLAKE2B e37e11afdf6d4e7b4169b65d547ed0fb672015118668d108081fd45728bd91cabb9774a586cdb2a44121bb7a8457cc59e2fbbc649d8585b1bb3b25207e48a3c2 SHA512 9a18f62eba86b71d54eee540ff194bb6d4292fca08ca2fc6f31e631d97e2cc7e9c63d1c796b05b0ebc529bdfe9ba9d0b34f1fd8b84c016d0ccfd9934394a7821
-EBUILD agedu-20180329.ebuild 820 BLAKE2B 980c34c4804a0d081a281367b1d846e805a2a48dcad0c55e0e5b42b78026efb23bf97462ad88dcf413b206b41bc569d48b44d0de86f7f132b08d34620395a077 SHA512 3a4f336ec030a5091dd5e45c851b61ef08b18ed5f667062f7177e461ec5984eec945eafb21c8f389b38502079e60e822f6640263bd8f1bbd1fe9a93707afc230
-EBUILD agedu-20180522.ebuild 820 BLAKE2B 6c4b0519f380b03374ee067d934c8182b49681f970b819684fef4ba71d4b2db36e9efd94a62f4867c1cdab8476ac94f755b14203df8a10f62010bb1d259f1663 SHA512 def2b615a879bc3fb735300e8572a91328ca1d1ebb26fc028363ce3c07d9be565970e5dfbe4c7f3c5733345ff2eb8314ca9186bc6bbb251e59575638215beffa
+DIST agedu-20200206.963bc9d.tar.gz 181308 BLAKE2B 44cdf607813153ee2a9f58f62a5f94215048eb2b2c3103f5a19fadd0aeaa4658a535e4c30f27cf2832dcdc77de0a2b3709c9cef98c0cfc13aaa70272bd8bc29c SHA512 7e2b1e909d6f16ef939bab9759880581a40f7aeb28b5ca92992f035f0dfaf2ad480498ae355239f2db0c5dfed93ee5ce732708520c5d661ebc3b019989117cec
 EBUILD agedu-20190630.ebuild 817 BLAKE2B b4c2b9dc444e2dd2ba72330f9120b087870886aa6063a29fae3c85d08d438582149ea93aae1e68caf069477c992a773b2a7ccf6ce2e4662caad5f8e4dabbad33 SHA512 abda070387b4c5c403d2ed9ebeb94c391f77216e907661c7f887c80a360a429c9c3eeb0707b63496798e202ab01b059aaac562afc58a5a323eb5b5486bab8939
+EBUILD agedu-20200206.ebuild 817 BLAKE2B 036ff5fd3fd840aff6511fe908dc0ef0b926e5702acb7daa8e55db556967ae7a106449260a7874308f1b83f06f3a32d0983a6cd32df3ea7e4e689b5acca46173 SHA512 5a735912a8d5db41d99269843e25d2926ef9ef373521fc9b6e8f1a97c896c52ef7a568bced0838a388a112bb0bf9fbdeafef630321420b7646f1a1dbde3beae4
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/sys-apps/agedu/agedu-20180522.ebuild b/sys-apps/agedu/agedu-20180522.ebuild
deleted file mode 100644
index bf79051e2ba8..000000000000
--- a/sys-apps/agedu/agedu-20180522.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools eutils
-
-# agedu-20151213.59b0ed3.ebuild is not a legitimate name
-# so we'll drop versionator and just set MY_P manually.
-MY_P="${PN}"-20180522.5b12791
-
-DESCRIPTION="A utility for tracking down wasted disk space"
-HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/agedu/"
-SRC_URI="https://www.chiark.greenend.org.uk/~sgtatham/agedu/${MY_P}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc ipv6"
-
-DEPEND="doc? ( app-doc/halibut )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-r9671-fix-automagic.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf --enable-ipv4 \
-		$(use_enable doc halibut) \
-		$(use_enable ipv6)
-}
diff --git a/sys-apps/agedu/agedu-20180329.ebuild b/sys-apps/agedu/agedu-20200206.ebuild
index 24322243c5c3..d15f135f3af0 100644
--- a/sys-apps/agedu/agedu-20180329.ebuild
+++ b/sys-apps/agedu/agedu-20200206.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools eutils
 
 # agedu-20151213.59b0ed3.ebuild is not a legitimate name
 # so we'll drop versionator and just set MY_P manually.
-MY_P="${PN}"-20180329.af641e6
+MY_P="${PN}"-20200206.963bc9d
 
 DESCRIPTION="A utility for tracking down wasted disk space"
 HOMEPAGE="https://www.chiark.greenend.org.uk/~sgtatham/agedu/"
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index 42dc8443e11b..563ac463686c 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,3 +1,5 @@
 DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141
+DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
 EBUILD apparmor-utils-2.13.3.ebuild 2177 BLAKE2B f10d2efe345af36b4a3d3381656e2c33b13cbeeefc87e8bfc5ca2767f3b1aa3a1e29e918619bba8f9eb3da7bdd31c485384fd1481067717caf643707f403b76b SHA512 659a333209bb02524d15e4abee505ada256e5a3f6b5c5786518ea842438448a0b5d3aca3dbca8e2d41884d9f2d9fd4ccee9b90465612f051c19608abeb055ee4
+EBUILD apparmor-utils-2.13.4.ebuild 2177 BLAKE2B f10d2efe345af36b4a3d3381656e2c33b13cbeeefc87e8bfc5ca2767f3b1aa3a1e29e918619bba8f9eb3da7bdd31c485384fd1481067717caf643707f403b76b SHA512 659a333209bb02524d15e4abee505ada256e5a3f6b5c5786518ea842438448a0b5d3aca3dbca8e2d41884d9f2d9fd4ccee9b90465612f051c19608abeb055ee4
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor-utils/apparmor-utils-2.13.4.ebuild b/sys-apps/apparmor-utils/apparmor-utils-2.13.4.ebuild
new file mode 100644
index 000000000000..4a6c7fe814c4
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-2.13.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 )
+inherit eapi7-ver perl-module python-r1 toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Additional userspace utils to assist with AppArmor profile management"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/apparmor/${MY_PV}/${PV}/+download/apparmor-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-lang/perl
+	~sys-libs/libapparmor-${PV}
+	${PYTHON_DEPS}"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	~sys-libs/libapparmor-${PV}[perl,python]
+	~sys-apps/apparmor-${PV}
+	dev-perl/Locale-gettext
+	dev-perl/RPC-XML
+	dev-perl/TermReadKey
+	virtual/perl-Data-Dumper
+	virtual/perl-Getopt-Long"
+
+S=${WORKDIR}/apparmor-${PV}
+
+src_prepare() {
+	default
+
+	sed -i binutils/Makefile \
+		-e 's/Bstatic/Bdynamic/g' || die
+
+	sed -i utils/aa-remove-unknown \
+		-e 's#^\(APPARMOR_FUNCTIONS=\).*#\1/usr/libexec/rc.apparmor.functions#' || die
+}
+
+src_compile() {
+	python_setup
+
+	pushd utils > /dev/null || die
+	# launches non-make subprocesses causing "make jobserver unavailable"
+	# error messages to appear in generated code
+	emake -j1
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	export EXTRA_CFLAGS="${CFLAGS}"
+	emake CC="$(tc-getCC)" USE_SYSTEM=1
+	popd > /dev/null || die
+}
+
+src_install() {
+	pushd utils > /dev/null || die
+	perl_set_version
+	emake DESTDIR="${D}" PERLDIR="${D}/${VENDOR_LIB}/Immunix" \
+		VIM_INSTALL_PATH="${D}/usr/share/vim/vimfiles/syntax" install
+
+	install_python() {
+		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
+			--root="${D}" --version="${PV}"
+	}
+
+	python_foreach_impl install_python
+	python_replicate_script "${D}"/usr/bin/aa-easyprof "${D}"/usr/sbin/apparmor_status \
+		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,status,unconfined}
+	popd > /dev/null || die
+
+	pushd binutils > /dev/null || die
+	emake install DESTDIR="${D}" USE_SYSTEM=1
+	popd > /dev/null || die
+}
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index d1c5bbc1f646..64590127658c 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -5,5 +5,7 @@ AUX apparmor.service 281 BLAKE2B 3d1ecfdc96ee2491e75e92dc3aae7c2aeeeef3bf6a7ae86
 AUX apparmor_load.sh 84 BLAKE2B 05195286287d5cdf56a7f67e18073f75625cbfb1c9283a22c72ff60aa4a3fe4129b81702801ddd4045629558a022f084906464f8bb5325f31d43680c626a5ede SHA512 72bd10fdd32879854ee044941636d530453488596bab7aa6785b109f6cd7e2f822e9ff04b43c7c4265b2f42de13ec7f6649f9a58fed3d93b51dd1a2b541be3d7
 AUX apparmor_unload.sh 85 BLAKE2B 1559999897e288f452850080166dcdf67d15bd3cfa57f30aeddeba29bce2e1896126e8e4c82b41dd403f94d3f8ae9128448b0c5431c418ff82fd65df370653b5 SHA512 18a46176d043511af33fc77917e85dce5cb5deb30d2d86ea5261313a72c385b96c87fcd1fece9e555b6c424305d420876430a0a8fb11a5ec5edfef30f80dfd8d
 DIST apparmor-2.13.3.tar.gz 7384974 BLAKE2B fd519f7b845db3203c8f47ff5abc7d9f20a7947fe86799b6fffcfaabaf5130fe0aa6589314f201c1df59cfd0fb22b80a12d364e9ca1279b14ba89ec469e3b346 SHA512 137b2bf026ec655b662e9c264d7d48d878db474a3f1cc5a38bfd7df2f85b682bddb77b091ab5595178231a0a262c9ae9cdd61409461cd889bdee156906ef1141
+DIST apparmor-2.13.4.tar.gz 7390179 BLAKE2B 49818a010d5e5757dd43710f2af925fbb62a9f8f9be74556ff31a9a8834bebac010762fc6bef3da8d295e487b65d0e0135f4be25bcb01a834846c5e5d65d92a4 SHA512 d42748bf36ae66849f79653a62d499e9d17a97c4d680fb653eb1c379d0593aaa09f7ddfc6f2fa0d2fb468bce05fb25444976f60a5ec24778fdd7ec20d1c13651
 EBUILD apparmor-2.13.3.ebuild 1501 BLAKE2B d71174bf84d654ec83b524f29a3b07005a0f635a26b39310c88a1d5a224f87bd51caa9ef6c3464a0ec5efc7fcaaef0501fbf35351995c27c4719285ce3b3dafd SHA512 3f6dc75808586ef5b50a62ac3a77aae2675b7551934b8909443246e41373a231212f6da8e34756b08da88a57deb9162f2bd141fc16d27a34fd7f94819558f919
+EBUILD apparmor-2.13.4.ebuild 1501 BLAKE2B d71174bf84d654ec83b524f29a3b07005a0f635a26b39310c88a1d5a224f87bd51caa9ef6c3464a0ec5efc7fcaaef0501fbf35351995c27c4719285ce3b3dafd SHA512 3f6dc75808586ef5b50a62ac3a77aae2675b7551934b8909443246e41373a231212f6da8e34756b08da88a57deb9162f2bd141fc16d27a34fd7f94819558f919
 MISC metadata.xml 409 BLAKE2B 63cb1726a015cf118e8ffcc8cf9d49795a75d367e36b0332fbf23faad8b3eed41e2ae090cc92757e12248d831e0ea1782b6f275ef02b7d2d2022bf2b79f69042 SHA512 a66647c5e40f2593017942c12786dc30995e7980fdb58c1de0b9ae34069434cb5a4c70b2bd268a239df82edfcc1e7288e8033bf57609f757a321639afd5e78b8
diff --git a/sys-apps/apparmor/apparmor-2.13.4.ebuild b/sys-apps/apparmor/apparmor-2.13.4.ebuild
new file mode 100644
index 000000000000..a4c693e37c5c
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-2.13.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit systemd toolchain-funcs
+
+MY_PV="$(ver_cut 1-2)"
+
+DESCRIPTION="Userspace utils and init scripts for the AppArmor application security system"
+HOMEPAGE="https://gitlab.com/apparmor/apparmor/wikis/home"
+SRC_URI="https://launchpad.net/${PN}/${MY_PV}/${PV}/+download/${PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc"
+
+RESTRICT="test" # bug 675854
+
+RDEPEND="~sys-libs/libapparmor-${PV}"
+DEPEND="${RDEPEND}
+	dev-lang/perl
+	sys-devel/bison
+	sys-devel/gettext
+	sys-devel/flex
+	doc? ( dev-tex/latex2html )
+"
+
+S=${WORKDIR}/apparmor-${PV}/parser
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.13.1-makefile.patch"
+	"${FILESDIR}/${PN}-2.11.1-dynamic-link.patch"
+)
+
+src_prepare() {
+	default
+
+	# remove warning about missing file that controls features
+	# we don't currently support
+	sed -e "/installation problem/ctrue" -i rc.apparmor.functions || die
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" USE_SYSTEM=1 arch manpages
+	use doc && emake pdf
+}
+
+src_test() {
+	emake CXX="$(tc-getCXX)" USE_SYSTEM=1 check
+}
+
+src_install() {
+	emake DESTDIR="${D}" DISTRO="unknown" USE_SYSTEM=1 install
+
+	dodir /etc/apparmor.d/disable
+
+	newinitd "${FILESDIR}/${PN}-init" ${PN}
+	systemd_newunit "${FILESDIR}/apparmor.service" apparmor.service
+
+	use doc && dodoc techdoc.pdf
+
+	exeinto /usr/share/apparmor
+	doexe "${FILESDIR}/apparmor_load.sh"
+	doexe "${FILESDIR}/apparmor_unload.sh"
+}
diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 86a9d5f87239..42fe26b84e35 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -2,6 +2,6 @@ AUX attr-2.4.48-perl-5.26.patch 785 BLAKE2B 307e652d83c5d623415ae389f01df918c552
 AUX attr-2.4.48-switch-back-to-syscall.patch 3889 BLAKE2B bc308b40781abd79e8a45bcd7509bbc7924d44e0109b521f52d07d705bdfed9f80badeb8ba2aae44fd5350c36f54ebb31ec7273abc5f388ca91cd60dcf148c2b SHA512 e0e8c6bb89a42e91ff0daf3bb2aa7e75bb26ebd6f59d549cc037db8d156e03cef195fa7ac813f8cd22325583cf9e81d6782ec06a8f5e5f8b4eeadc104a6c5492
 AUX xattr-shim.h 253 BLAKE2B 2e9a549f208b7eab0871daeebafd1ef9924102e60f68353a04f3c26cda5df6c7bedf592df5c3d6f3163a6c7b7c9785c69111fe2e7f3d061bf64dcdcdf92e183a SHA512 cd8af81c90da01d2f7716d2fd5f9f6a81cfc36aa35b4d03cb04651cac0494def88a81bf8b862a3aeabf45e940ab1488aa49c97001ec09e0df289a7c4552802f8
 DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
-EBUILD attr-2.4.48-r3.ebuild 2342 BLAKE2B 5645bb61bbb54ae72cbac653a17c58026136ae2f1fedf82c6cf50f2391ccdfdb692dd7844dad33826a3ed98227843ee0654eaf6cf213b01c460ed8fe7cdc114e SHA512 f790eab47aeeca87f3546bcbeac6e7325069543d3edb00f801e5b47569959bc3b1e375d067125275b4a99f2b4b8571ef52534e2583a3f957f6f61c9852722da0
-EBUILD attr-9999.ebuild 2429 BLAKE2B f16c4ba17c02ed42375dee63c127563d07a9bd5adb78540286fe456320dc1f6baa504ddc009bf532c1637c4248cdc860b38eb0421585347036585bbf366d963e SHA512 684a88ca8ae815581d240f63a785ae59dc4963ca0bda32c36256204937f0e92bf1e878b9db5484d3e842d453f0f56603bd4a07b24320d2f3c8ef180605a668bf
+EBUILD attr-2.4.48-r3.ebuild 2340 BLAKE2B a2fe495780196ad3bc87c3c650555d22a8fcd351f1f6a9bfb6fc59b078dd426d32dd0d87374e50b82cee658c458ee6e0681814956e3a58a033db6c77443c6687 SHA512 64c000cedb5a0ec0761ab2fe15ed7a5e4b27cd2a7632ec3f9b47ce7b919f88002c030f971b6464a2050fed807c1c7dec66298df2a5e7b4254329f9d215057b3c
+EBUILD attr-9999.ebuild 2425 BLAKE2B c4e6c28ab0b533b7d1eee76a73654c633e9910a0324c4a0a8cf919e6271acd072467c4160d9b44571edfd6df4e5c7442757f661b1f34c93adfb8f9128bac4df3 SHA512 2f19c8c200e3bb43928bf24935a3ddd5f0c19a0fedb7d777da82fa95175a677d8309ead800506a0ec194c711a750276b2d16bbf9a4254f575d9bab0156d29dfd
 MISC metadata.xml 336 BLAKE2B 228b1ca58194e3cb6b68721379b55f53c2676973b7fb626600ae4f1d5da4899d7d4dd6e5211704ff6f64f601fc456b4335c4f01233768d2512058ee63af60668 SHA512 0e68e3406c4e54082edd2b2be1fe8b5a2a73457331b133635c5b5ed9e0afb0fbeea2101ff17a0fae0be47c4e535af9cd084f1abc9c85fda05c18e2879a72d0bc
diff --git a/sys-apps/attr/attr-2.4.48-r3.ebuild b/sys-apps/attr/attr-2.4.48-r3.ebuild
index 038c0676914e..d70b2e0f528e 100644
--- a/sys-apps/attr/attr-2.4.48-r3.ebuild
+++ b/sys-apps/attr/attr-2.4.48-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="debug nls static-libs"
 
 DEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index 98b154406a36..72f0547d9c0f 100644
--- a/sys-apps/attr/attr-9999.ebuild
+++ b/sys-apps/attr/attr-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 
 	inherit autotools git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/audio-entropyd/Manifest b/sys-apps/audio-entropyd/Manifest
index 890cb405bd47..a4e139464fca 100644
--- a/sys-apps/audio-entropyd/Manifest
+++ b/sys-apps/audio-entropyd/Manifest
@@ -4,5 +4,5 @@ AUX audio-entropyd.conf-2 340 BLAKE2B bc392532820685f9195865b061dccde9869db03024
 AUX audio-entropyd.init-2 651 BLAKE2B f60cbbd9da6ab7ef56697fff5bab221e51b250a65e2095f2ef7c1b50e968fac1cc5c615d45355d2d51545c2f7af7f82598584b3c459b1cb936542f7cd88abcd3 SHA512 61ff99fca907c555f45312c0250511a7c0f7bb757ea7da3d7c6c33932884d9bfdc2148dac466d96fb023ab10bb0d78c3134f488a8486bc38da3743ec2200df57
 AUX audio-entropyd.service 127 BLAKE2B b0e3f4efdfeca0c9dae7b71ee78c7a87dcced1e71db874999fdfcf4e903ff3f201bdf7ebbeec59370085ac58a182aa42aa69d69ae17ef6e1c0bd9a3b5787e470 SHA512 991948b7638f90a7f909492374b70a0f6964a3406df1f5794c25b46523e3c09b2a1d89dfd3c08e6f2925fe5d94a59b5645c0a9bee4746e7d670bacb5831f4001
 DIST audio-entropyd-2.0.3.tgz 16681 BLAKE2B 36f9d7942f718af8e828ce6598ab8ea35945de1c60959e7bc2314b2440037f8bb661085a4cad12e62627d935797842616e486180945ff283937b499de163f068 SHA512 d21c2d547235accdd460bcaf1ff5f5696db2988d385c3c52aad0d651865386409682f8747d1823765f0c0925bf28f38abdfc0b114d239f494c7eb699c5ed3ebf
-EBUILD audio-entropyd-2.0.3-r1.ebuild 950 BLAKE2B 07ba723f506e0b7c0adf260aa44d66f91dc282c38d114a7565f0f5a14e709ab44bb9541cca1c8bd2d2c2fcfe96e4c4019a75669577c5114fc07372cd5458775b SHA512 6b39d24475311b0df75f9f6587d941c0623175d67e6d7a7edfe1f8771c2303fa8d1da6f7491a719cbc34494ca62bb966a92abd8462256d7fd0569b6797151cc0
+EBUILD audio-entropyd-2.0.3-r1.ebuild 947 BLAKE2B 67017e31e12d00b50fcea139f9b9930fc7ba7ceddba85b9c2dfffd840c8120f8a7688a55ec98a10f8b3842a707a0ff3fcc0944c21fc742f0e63935bac6da87be SHA512 760fbc5342f16e493284fb4fa5be1c330aed760eb5a3a8711d799926a8d27c53f4eed033d844ee32dbc84f3b79c9d2db8881fb16dc4ab1e628dbcc7ec8e01139
 MISC metadata.xml 266 BLAKE2B a15e0ba576ca622d025b00ad90837f3e975c4a2cfee5ca560507b5dc25bd80d412b97f4b85d1770a9b2187ecbc3ac1c5ee905b11f920cb1338e76602cafd09ec SHA512 7fc844e1d5523b9131034eb1e43e56f03963042752ddaa7c67be9f5477b1682c2ee17f735d8be2e8b1da5f45c139e9593b84bdc9e4943e1631ea6fedca0dcc95
diff --git a/sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild b/sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild
index cab08ef38cf8..1f7451848ea1 100644
--- a/sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.ebuild
+++ b/sys-apps/audio-entropyd/audio-entropyd-2.0.3-r1.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
@@ -27,7 +27,7 @@ PATCHES=(
 src_prepare() {
 	default
 
-	sed -i -e "s:^OPT_FLAGS=.*:OPT_FLAGS=${CFLAGS}:" \
+	sed -i -e "s|^OPT_FLAGS=.*|OPT_FLAGS=${CFLAGS}|" \
 		-e "/^WARNFLAGS/s: -g::" Makefile || die
 }
 
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index cc02623060a3..f99422f047be 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,3 +1,3 @@
 DIST baobab-3.34.0.tar.xz 454960 BLAKE2B c9e695074711442418bfd9c9c1453feeaf573429f1d9a03ef6c542d581d39c5bf1cb14d98025cc522705b1f8649150f418d39c05cf06f77f5900780eb058f67e SHA512 e821ba445c65742e92580e12be9b82ff352c6a2a8a58bab7fba97b01a120a948b06e35459196f16e9eef347cc6c5aeacfd563e86d78c758099fbab2ecfc4aa0e
-EBUILD baobab-3.34.0.ebuild 745 BLAKE2B e665f3ffcfb7ddde241158137489380c020266c0bcff06e95177ecfbe0c116c2488ec45425ccc83ac5b05f3da73b0c835d6dda88f5149b74db03a611757c635e SHA512 cdd6edbba9f034572bfffaeba76d7ad1117ccd0cb4fb98bd43315f58131b0c501f6626a5bfb8bbd5042406733cb6f22f625c8acef761b377936a7b3b297f90e2
+EBUILD baobab-3.34.0.ebuild 741 BLAKE2B 10803eba1cddb0f50d6520faa8b966e7a97461f99b0187782aa2c02f2ee559348bf0c43bd2b87f41a62e0cab128a5e66ae69a28cba4504294b4ce831c7b1dce5 SHA512 6aa9a9e559875b149d3872f884c9d0bd60cd0ed6287da38804211fa14e2a2567cce76cc22be364cb70e157157ade86519f02a415fdf60c456ddaabe16eb00b40
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/baobab/baobab-3.34.0.ebuild b/sys-apps/baobab/baobab-3.34.0.ebuild
index bc167557c800..0202a6950ad9 100644
--- a/sys-apps/baobab/baobab-3.34.0.ebuild
+++ b/sys-apps/baobab/baobab-3.34.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
 LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE=""
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	>=dev-libs/glib-2.44:2
diff --git a/sys-apps/baselayout/Manifest b/sys-apps/baselayout/Manifest
index 5f9c10e6340b..9ab2611213d9 100644
--- a/sys-apps/baselayout/Manifest
+++ b/sys-apps/baselayout/Manifest
@@ -1,8 +1,8 @@
 DIST baselayout-2.4.1.tar.bz2 31307 BLAKE2B da26f7fbeefa5efecb6e5d9ded6c2bf3148cd1fcfc6ebb86535f5a9c086c4bb55f6a8420a3c0d0f7008251637f3e4653db875ec427745d039f753008d2f21be2 SHA512 e505ad81834aafb574ffee9bc1fce216c1c8c7fa11b0095580f87a37e4b9efb057ee78db7cd5affc64f05d5dd0592c671304414c119b37d86dfaa1e7b84ce7c1
 DIST baselayout-2.6.tar.bz2 31871 BLAKE2B 4a51d173dc5a2837f78cd1247b5eadd89e7d0b5f2dbc72e75f027b0c23a5db9a386c53e756e80240f36ad4d63e3fe421bf9510c18321d7a31fda140ad47b2860 SHA512 5cad5faf56871ae951120643e29db0c39fea6dc845b4755382bd469eca32639ec6cd0cd046d3c439a7cc607b18770036f9c256260d35beaffb094e23cb13740b
 DIST baselayout-2.7.tar.bz2 30317 BLAKE2B 7b7c284b7d0a9608a0d03dbde0d62d793829b61d5361f5062fdeb8880a2f792c142e20acf7fa92e713e2ebb0bd1609ca65bc8a4191f2bf2c5df4f474eaeef1ee SHA512 8b28d2dc20fd5887db5c0e6b67a4217c4d0730529023fc57fb1ee95a431e1f492fb21e3e66980bef766819e9f542dc7e4ad3ae25465390194bbf970c3653c88e
-EBUILD baselayout-2.4.1-r2.ebuild 8568 BLAKE2B 7358ffffccf270d7eb7d6cfc9ca181c8fdc11d748924cfa9cbc7e2f14a1f41f288a129a00798661ba1696800ea17b105401efac2b919a6769f39a9e3fc45f729 SHA512 97a2052691a9356ff26dfeafe0a2be01837924337e58af45915980eff87c5161377875983820e38ef0b61c085f8be91dbc82a17e5d853478e2fd37e2390af0eb
-EBUILD baselayout-2.6-r1.ebuild 9563 BLAKE2B 771900841b46825e7f5234aa996777e68aa230cbb40a13f54f29a688de215dec43c26f26135f6337e547b420bc3b3b85bae13b8a2fe718e458d1b54fab73688e SHA512 46146647432f3debb02a302958ca104edb46da99c2bb9c7e0515cc9a0f337138510aad409beabeec82020ff150a8d5c1a547a1b6c849f290225de6e6a4614a2f
-EBUILD baselayout-2.7.ebuild 9886 BLAKE2B 12b73b84df2f6aeafb3563dccf2c84c19c57cce9afaf0c35a6eeb4d73a6a9ba0b1a4535164aa9bc59a124e2a0bd52fdacc5814c24a2197c93422dcf9728608f8 SHA512 749a8f50930a88a92f5f6e00d49e20f1238f7fadf982298ee324ac6d08fd103a75b1699e26c4c0d0245fe7827ccb182cd15bbf90ed38010f0dd71a5621643a4b
-EBUILD baselayout-9999.ebuild 9854 BLAKE2B ccaa74394d00bd251a300d5e2fe7a068eee41efda841e1e5d3f20652f4cea60e41befe929ce48c1b748b8368e6b06b86075ad7f195bee8923153fa80a3b501ce SHA512 8e434b0144d46b835491c0b98a88f2b8dcbd046e5aca2c287a4134f525dfa08333b13d2ce36af6a2966dbf270195fff9fa47f97afe9a14d432504a1d157d7bbc
+EBUILD baselayout-2.4.1-r2.ebuild 8566 BLAKE2B af725f76b66eb7fb2bc8731bb99cac470176a3def28a2e1cf9ddf7fdef8dcedcc7f79e24654a8cd6763b31b0df893cbee801d3111c2b2cd14c150036c80e40b1 SHA512 af9c089043e9dd655ec14a6fe7b84ec5d32ca17f215b4c84b2afa1f3abe52d8cec330ec98483ba26a700e1d0e1ae61dd79356694e4fce6cbd226e13d9d9084c9
+EBUILD baselayout-2.6-r1.ebuild 9560 BLAKE2B 03f1513752235adeffe7274004ab9e6e3f11ce38c4715c3db4a5619571c11764385fc8e3bbf1b57120ac9b19efafaf6d2bb006c4be884eaf9d8db00ceceae2b7 SHA512 446b72d50abb3624e0e73590a903054b227b47d2ef6d65f1ca5e268fc0177d7f04139944afdc5b8cef1952d64c5d12067c00565c1ca84e904a29a4ac45515657
+EBUILD baselayout-2.7.ebuild 9882 BLAKE2B 9cbff5c47f5215f359209f3900bbe7e0c111097fbad692ff4bb13faf7cd6383ee04c13de51ce4067a6a54287297850e0982aa5c2ccf456d65b0092f5cb81258f SHA512 7190579f6a50ac164662853ed7978fd8c0bf3435a01b9fb87b0fba59e8d164fa748dd5c1bf36737f5eaec980d9b694281e95e7e0d60516b16a0b80ae6cdf00ed
+EBUILD baselayout-9999.ebuild 9850 BLAKE2B d45df5ac9f261fd4ce6a8aeee007f80a6e6eb75986344469c75890473f8c129e20041bbc5e2ff7817cd57ae562750a4190b9f65dde42c1b892d76503a8cfdf7b SHA512 040e90d0cbbe037ec71d5ed938a2a925833b80e03138224e865e2773e27b082941d16123b54ea3ab47d329cdcc1c9392c3529fe327c48e5b3fda30a54f5e4a71
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
index 5a90c2522077..60a2e9a7f513 100644
--- a/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
+++ b/sys-apps/baselayout/baselayout-2.4.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://gitweb.gentoo.org/proj/baselayout.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="build kernel_linux"
 
 pkg_setup() {
diff --git a/sys-apps/baselayout/baselayout-2.6-r1.ebuild b/sys-apps/baselayout/baselayout-2.6-r1.ebuild
index 1ec17ae2c42e..5471a444eb25 100644
--- a/sys-apps/baselayout/baselayout-2.6-r1.ebuild
+++ b/sys-apps/baselayout/baselayout-2.6-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/baselayout/baselayout-2.7.ebuild b/sys-apps/baselayout/baselayout-2.7.ebuild
index ea29ca415bdf..104cf105212f 100644
--- a/sys-apps/baselayout/baselayout-2.7.ebuild
+++ b/sys-apps/baselayout/baselayout-2.7.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/baselayout/baselayout-9999.ebuild b/sys-apps/baselayout/baselayout-9999.ebuild
index a4b8ca535ac9..a94078654b83 100644
--- a/sys-apps/baselayout/baselayout-9999.ebuild
+++ b/sys-apps/baselayout/baselayout-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/sys-apps/bat/Manifest b/sys-apps/bat/Manifest
index ca952c827d85..4cc4a2a5a84b 100644
--- a/sys-apps/bat/Manifest
+++ b/sys-apps/bat/Manifest
@@ -1,37 +1,69 @@
 DIST adler32-1.0.3.crate 5734 BLAKE2B 31cd43d1e13b5e854a195824084dc34a157ef59cccabaa335cfba2de532096046bbb66a9fce2430979b243509d608bfef752c46d80bdcc7e420e039269d575a3 SHA512 2128cc34abc74a363b18eec5abf414b95e4d84bfd99b6508ac807e13c026ad0e37e67b5a8c429212b85e78071f03e0df24ee70db5995772c4bc78acfb0234459
+DIST adler32-1.0.4.crate 5105 BLAKE2B 344a5258e77328a24a545e32f9bc653fa25b7ea43803ed7861db261bce227aa1599520a42acea3de1f2acebb8fa9fad251e2688413b752eafe2401ca1a2ee34a SHA512 5990e1e277a1c3aae5adef5e4601b807a756a40e88578bb91f1c70d70babfa97fb3f2c1b963482ec8e18c16d5e722bf90fb42f9646c8dd840373f28965a2d123
+DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST ansi_colours-1.0.1.crate 9937 BLAKE2B 04d86fb964138cadeab0cb708e99d198189efe6ad871b9cea43967f610922234f371befe7b25c8ef824f94daef5b6c52e47a5d86f7966b82ff100ae5a4e38281 SHA512 16d9470385c55eb28be0fd3ea0bf5d8832676282636edb71f670c629a77884f590bf4ea13f2bf1002031a5a014cf1bfb32bb7a09da27af3c1d85e4a0f524af23
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
+DIST anymap-0.12.1.crate 14298 BLAKE2B a4f5f4f18263e0a6d5b67ac8fbb56cf410534a0fc3e670d57a3275d0efe318c98b9b594f0be44dd7ac9fd08cda1d05733489290884af25f76ea981e0ae61ad60 SHA512 88fbca9ff7482ecd338f9cd9a025499ed98b47eaa89ca8dcd1ccfb013b6c9ebe7a8eca5d7c873eb716c320af7ccda01f6d4c26bb333c8ff434416416ee64a774
 DIST arrayref-0.3.5.crate 7644 BLAKE2B d1dae7b54208b842155dc77c226236bfa3fd671fad39a101246f4b1496d28608e657fcb96fc8447ba5b0835260484b46ff35e2fdac8e092a0b5b79646ff39d18 SHA512 6417e092a896e118a69e219f4e40f94756748986769e24ac233ea33a3a0a6e15fbebec5f4d6dc3592da7eb5b2e572cb28ad330838875323c6e925275b5a3f5b8
+DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
 DIST arrayvec-0.4.11.crate 26439 BLAKE2B 5ea27434d57f37f7ea3e7d94acc1a3450ec464bd62e2d377cd378f4faa13078244afc53284bf2838ea0f62802801961d6915f202eea951a8792e9fe825424be9 SHA512 6919f07fce0aa834b75ecc722476d05580a7dd58e8119b0ead5077d6501ee69ffef71016b6e63ed0617ce2d29a6fa1a4f5431d7aa20340c9f3f2e4c9c93d49c4
+DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST assert_cmd-0.11.1.crate 20524 BLAKE2B 1b9443fbe9bd677f03e4711091390697f5f7db575d02738a7911bcd80d9872922f7ab2c605507f49547b69fb34d150a6043e47aa44027e476e08b1c06cecb8b9 SHA512 146d3088d90bd22aff24ee37598298d45fb6775aa4f7eaf95d4bdb9c2e5cb5c5da31039ffe2a3833866c191de0ffd60ca9ba94757096bc1c24d17fd72f962c55
+DIST assert_cmd-0.12.0.crate 23584 BLAKE2B a503187f26beb99252c17798144cb9601b721d888d066a48989e2db71127ce271cdd989ee70d478dee925bd227e55f805fd506ecb408d52b11106c3bd8940c33 SHA512 e46c69f2f6bf5d7425106efd65ab5d5f4dff5b97ceadd092dfa484af6a4557595386df8a8080ef16bee02d2b1cc45d39eef3ce0b2c1a768098a489324dcb34ed
 DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST autocfg-0.1.6.crate 11439 BLAKE2B e0eb7a3176bb5ac27b8de466c5fcdfedb9ad32f4d2b52c0385550902d59d01c716a53179708bdeb250a91690edeb70ab81d91090ff0fd89a731dd365621aa496 SHA512 ac7dd73b7c6b8b54c4fc98c3e75210eb59d46ab3447fca533763bfebfa87dba5e947829e3ba56a8eb3403f6d317065b7d674da883741e619f3866b12267801fe
+DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST backtrace-0.3.35.crate 60047 BLAKE2B 716fc69b2a7999371d52792fae45fede5c3dc72c0522c0dacb275025cb97353aa0f8569ab8bad66105671babcd4e675fdf6f0d65153a83c5a0de9262cd275480 SHA512 bb4d50c57bda52b9f48772c1cdb1fb30c003a5c6d69cb5ae740115020600693b00aca7c89e8c76a5e3e0deb6e54a2ec4d68edcdebb85e3f35b8dbbaf23f88926
+DIST backtrace-0.3.45.crate 68112 BLAKE2B 83d959faba3382095184ab143240750c745f71aeaca2f2a8ef32596eb7e550362cc1891c881630697e5cd574a4669ccde6555898fe32e2e4f56e094af4239758 SHA512 ec816ebdf45df1dedaa35c774514d06a5dc429c8054c80d294f4888d376b6600d8febec1a4b4283b1dc61ab0cc51af0d9f674c41c4ae31642b3b5ea1c15523af
 DIST backtrace-sys-0.1.31.crate 518877 BLAKE2B 397f3c4053eeabd7216c4373e6457637e22ee124d8a864c2587a78ebd8d619745dece654357cb9cd970ee20d7c41d53c84ecb3ed92beefaacbcfddfaca804ce5 SHA512 6aa8c7a2694f4e953a0e9bbd07dc8b7e218719de5aef2adaecfae81beb919deffde6f184675dc6b6c1a330bb81dc9611c256f7f63caef5e301101dbe3bbaafe0
+DIST backtrace-sys-0.1.34.crate 522957 BLAKE2B c59d43bb484592ac114809f5bc07f2da0ba481c95c2a6268e2fe809272190e6d9119bd5a3c6adfc8c17151178c3894395e87203ab2a6755ae5db4580ed109927 SHA512 2482d852c3fcfa62f270b99ce323c8ad0b41fbaea4ac0ca191fdbdcb7a913b72333217eeeb7ed01756599e608a757410f3fc306af659baeee519ffc1e035411f
 DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
+DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST bat-0.12.1.crate 767343 BLAKE2B 5a79089076cad292c6ce74ee3014e74e736920e71a61379534181f74febc78ebf9a60e950658db901f67518a2681a502ace19cce53a1c0db5796441415d0845d SHA512 4577fe8fdbee2378c7efd178a53a0d247d8506adc7683999f6ce08034003b42d8ee3fcf5ae3dc88b1dd38dd4e717b1c3b265fefd639af0f0b6db7af33b6540df
+DIST bat-0.13.0.crate 865606 BLAKE2B 35c2d9b47cacbdc35af07be0085001565831bd145f0080650706680bd5ed35a140b0de33168d366bf7c1747f23cc9b32a7bbd9a4e45a620be4d1ae50b52f523e SHA512 950a54f8fcc8f8ef5f63e4ec4897e9dc32f39aa8965a3afba4501f1f58ad7d84d8aa34a8af3615c30112658e2fe59a3ccffbc6d1142ad2de24b650894e908c10
 DIST bincode-1.1.4.crate 14412 BLAKE2B e1ccc8e9954893c3f4efec56522281050b9567090fc37f6bcdd28804eccaf4e619892b1d64c9da6b555ffe10c9c47414414bcfff589cfa80e3fba5b086b513cb SHA512 31f32a3dfcb76f113b2e993938b4c708d98d3c75efa9414d74168b2ef8af544bfe64fe39dbc4ea556842ec11100c56f14bbad15aaab919c67a7c5be1aa584f28
+DIST bincode-1.2.1.crate 15489 BLAKE2B 98d8a7b3653dc75aed07a637707a8a0d7b574c9a7e9ab8aa39d6f235d003ee15dc4abdd76e3ba171b10aafc98dc16f9ef8413f4154c30848ca0c12d4972f527e SHA512 b86915db2079128d6abe52c8f3fa0ec21815faa988bf678a162c2caaeb0d2ecf2f5df496d5dab08f399578b4f0258f252e890d9ab9e8347c50e5d7a2ab374db7
 DIST bindgen-0.50.0.crate 180902 BLAKE2B 05c7697397c96ba8a089c0ec8c3cfdc78c9ec7d60502ad57aed0865551871850c7fc6d903a8dbe10917eff736f3f457bc420a3305f92910200d0120055cf3800 SHA512 3c1102ac91dd434bba7fe88c6a3463f62bac5d090cd828a6efc29a71125f6750133861d8bf128dbc5005bd5593e1a22c3b0371d30f38712fefbff23130ae5942
+DIST bindgen-0.50.1.crate 185398 BLAKE2B 14f472b3d385153b549fa4f213d411390e4e47706ae84753a2fa95e5a27926f729f12a550333bcf34e0d30699df1b1ba51677b48fd5552401ff0a1d0ac2b604b SHA512 acd9723ee7fd4ac6a20d1f9a7943c2130bd9ce7f72b12afb3ed848d02d28b08281ed2c9c16f70e35565b140eecac1cb82b2e820604a223110a1989a27f85e5f3
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
 DIST blake2b_simd-0.5.7.crate 33562 BLAKE2B f735cc9e462c5618329f65b6b60f756d9f29b082f81e5615935cfbe79e19cf26739d75e891f4e48339b2e7cd6cf12c8b360b977f09d25446f1b6a276c415f5a3 SHA512 3f624d8d6f10461701484ffe6087ce6a0c98f7b0f4173556035940dd069f89bc913f65aa23ecd7b0d08e53cfc5d9d129b0d6a9ccd18577613d7bfce20860e946
+DIST block-buffer-0.7.3.crate 7179 BLAKE2B 549e8532358f9a77fdfbd5ef7a06d60f20f034fcf69072757811cb4a95f5cee5589bebd40fe87af36127254ec42ef3240cc7542828085f590fb774faab8f0e21 SHA512 74c8b89777a006bd72511b32df94f8bd78e2b53c30d85d39ea3c52acf199c357140fb6181f7f7ab5e30dd80d37181582cad740c95b89328a7a4b0f84f77ad6bf
+DIST block-padding-0.1.5.crate 7342 BLAKE2B 876421fa89251d011a455163baa49e0931e0692ed928fad71357fc93b87493eeab4cfcf8fc4aa94638a90a8dce8ec1ad95e9ba91da9557008e5fc19c1f618ab4 SHA512 acf5369cdae38b6b1a5c1561a9df18b8a39c8fd434fa50c49a8f73d2654a835269b7b22876354c903514c49c77aa860c68cd84d3c1efcb36bdfa8b01af300a9a
+DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
+DIST byte-tools-0.3.1.crate 5526 BLAKE2B e87163b1f2abde9c6ad5002c37b21308a98a879dc7af14059839be7b5a019d2487ef03867f3f5cd436b7081cb78a930abce79b5cce23eb95cc60e05067e1b1df SHA512 18e0f248a1e9780706e3a184d63558f03f30002646abc6d46ef49db9d5f6768af3d24d210b688aa4ad33d41248429e4df46bc3926f27851f90c92d260e5c4baa
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
+DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST cc-1.0.41.crate 48185 BLAKE2B 7fb7eba2079aed5bc7775e9e8585f9b1267066bf51cf7aa9f5ad25789f7b57021a457d2811f705d4e6bd0f38d033cea1c6be23894929df8df9f3bf1b2dcb6a20 SHA512 3a39bd28e16c3e7715e0588fb9eaef6b83075e68c1ad7aa0969d89baac1e2753f9e68b56492bf5df5b1a4882fd1b6a1df97ce559149873efacd5aa209a0bf352
+DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
 DIST cexpr-0.3.5.crate 16938 BLAKE2B b799530e5b7ad4bee6d72708b410b0f67a344bfe26f9ce66024029db4bec554a696484b3fd367fa8582c3b5b71e99ac9131eb70f48e622b026fd3acd60e66795 SHA512 a6998959c48045cca2795e28e0bec8ba37214d498b75f5b608cce9b2d94f6ad69009adaca250320c7dc22f05af8cc3f7b9777dce90384575d25bc75b0696d93d
+DIST cexpr-0.3.6.crate 16904 BLAKE2B c809e953b1df2ff915c901fb0ca57cd9d1e023b4e933e1f929956f1ad81d921b04cc412e7d00605a39e33e9b7623bf1d7d0d05d8d22b04d7abf1a5cfe883ce5a SHA512 1f8a6dfe97b70844526ed95f42a38c460ec9056345c4c0fd62c42dc9a52e4a317cab11fc3620419cdb4d0b8eba5d7d225c7b211939a47d4a6019a0518e8c738f
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
+DIST chrono-0.4.11.crate 139811 BLAKE2B d327f6be0a890ed74f2a2330777dcefbcf87e0291e47ef9c63aea46050f38c89a9b2e7a4716ac92202fab66aedc98ae81e090f1921a1aa51fa7ba18cb1cf24a9 SHA512 bedb698ae2994fc6fcf858b86a122cdaccd150996eb3e4313f876599cfa2180c2f687cca78ba30860365e04b75911fcdb19b5930fc155d1c17f06ec8197d3da9
 DIST clang-sys-0.28.1.crate 34180 BLAKE2B e4428b8e15ac70e08b9b804b838fb1f71503564d57359ffbda9de3c3c8c1d1c9b52ab490bf35cd8448ad9031fa951ed9eb7f3c0eed63bb48f68c1dbecb137760 SHA512 56818d67a45e807e651ce2426b61b8c5e026087d5709cc0cfbef26eb162177746ecb13bf07126615bf41ce0b95b515a5e29aad3b65058f714d37979fe6582a98
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST clicolors-control-1.0.1.crate 4634 BLAKE2B 77feb227a2d05d82201d9b52398715674eb1da4962fc0dad9cf373e661ac416afbdda450e0cc570a0de76203313bd27495ed6d6683b1949b12080ddb66c22635 SHA512 e20e3edec7ff39c32821d9c46c9bffb0224e017a6020f91c142c50d7ebe55f11bba235239a4b48d801d815306af50c20edbd5a973105083561fceb98cc32ac0d
 DIST cloudabi-0.0.3.crate 22156 BLAKE2B e12054fd474754031f8f5038d5e2829e1586db974d38230cfd8774db591a58dfdcaea9fb61fc0b35366889d348b2c73ceaabbb462f1abeeffeaab167013c986f SHA512 691ed793e9b35ba382f03897f4c0efc31a528394862a27b814ba8993ad30bbe0ebc9808484baf580e8b69d9c13ad1612776a1efd0f6981545b420139ff83592c
+DIST console-0.10.0.crate 19275 BLAKE2B a6f40f6add192280a0ae26ade306cbcae48e8e1fc83d10de2d9766a1ab5be695a4b9ccbd3ca57208ff20d5f278d438d2d5363a25d34c4135596ac5497d81765f SHA512 5eeac47191e37912bf325ad7a92e140e48f9d363e7c637f2ff99325eb7b0ea55ad1d094eb7c4c03e55e9903a2479845aba0af8afd224ef258314a85ca59a2dd6
 DIST console-0.8.0.crate 17401 BLAKE2B ae632aafdfd2bcb4e0719e7ad99b35a32f7a7f2ff49f1d816ce547607bc715366ea0e1e5e24d1ccd55856a73c2e91652d3e5845d78063b938843e0dd04847c9f SHA512 4b156adae9dad637e129d5fac26295e9f0cc528677b7b39ce33220b14a2b9e95da2a74236343ad534ef65c38bea55c116cb0f7e5e9abaf7915c6aad99e27f1c6
 DIST constant_time_eq-0.1.4.crate 4654 BLAKE2B fbceff4653396f9ee4c6d184d60fe78b77acd9b90986e83183b25acbf44d92b6d936df8ccbb1e7aef5c7487703058b93078fd90cee5eab4d14796886e3c6a863 SHA512 65b72c522f7ff0abfe0e562476bbbcbeb1271bc9cf61f9663ea5c08730787242b30df472e7b74a2ea9979466c251030c35f36c916d20e0c6b99826fbecbd8f96
+DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
 DIST content_inspector-0.2.4.crate 11386 BLAKE2B 2393cf83b2dd338ded7f5acd695e05a4a08fa639a52a8042dd0692be5e959cd1cc670472e25ca696a151d161c821eb899b2a950c74f4cb5b880bc42bc53d1d57 SHA512 1acb8b4f12ce3479f5a60b7b6a0c05b86548591e488e7be529c4a2f9aaa60a76ed07e7ce1e557664d31ddd9964e7f73415ad667cd14ada919f61511bf486ed6f
 DIST crc32fast-1.2.0.crate 39161 BLAKE2B f71c85801f945602d53f93ce251c978c91f63fcd92fecba5083fff0f06738697e99d92c17a824605d5d56b3224db224ff32e4b147b6f6af47ae714dcd511e7cd SHA512 2ee73e0642f83e28034c1baca65156e65d751214e83f2a4ce94b6add5ba11f74ffc80832a3348ece1c099367be2b11e820dfb349fae89fbced1b68bd6b0466f0
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
+DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
+DIST deunicode-1.1.0.crate 110552 BLAKE2B 5347a3695679c013a6040ddcbf82aac60869f8947458c5b27dd7fe7f167857b9d6a31aebbc6de61c59fa65b79da7aa29fcd54dca4a6f75928d341e5d0f07bf24 SHA512 aaddfe76163c5262c7b778f1e307410bf254638f815dcdc58986b8941873e842b01c4bbb9e6ef4bf47cff583081c7875517603f212efa8e8ce2d4327eedfabd8
 DIST difference-2.0.0.crate 147616 BLAKE2B d720202ba8d73fb9b3cc6a982208e4fbe22eda4b3e296f4238a7b2d8ed0339827ca5a3d93a983396901614a9eabe36a0baf55ecc5f55075ebf7fa1e4c0699eb2 SHA512 cc9956757770ecf237d8f46abef25ce219193c877be6cf83163e87c494956cca3202951ac01bba0728e7202fcde2261009c1b4599f389cf979858f25936a5482
+DIST digest-0.8.1.crate 9449 BLAKE2B a610eb0144fdd49dbd846a86e88781b69ccb6a4f918b09fb4562ee9e3d535d12a1e499e36e5eb894d1d81f7a06ca00296b3aa35063f434fdcf22ff202890650c SHA512 186c3ddc01fefff6a134ea0be633a9fe8067b8db34f31e9991069e7a9b82ed595a1105283a87e3021af2337ad332faf1b85a6bb513a4482df7d24e3e7a5ba055
 DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
 DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
+DIST doc-comment-0.3.3.crate 4123 BLAKE2B a82d1c1a7a90af6e111b5e684a1298d7eac5fd8e4bf7d5baf6c7403d26b609958716d57e51122fe7ad7626fe00a2d824dcfef3cc2fd7679fdb7b5099603de1cd SHA512 e98ff9646a3612bd41bb6f278e7b6e9a0c58747f8b82524da814cf51b7f06c76ad4d65b502ac5740e818744abb295f78f15f8262d0b50ced1523f6d1a26939ba
+DIST either-1.5.3.crate 12278 BLAKE2B ffbe3878098daadcef9a554b60b2904d8d4814ea38cb915ee0003d3cd11243e04813dfb41384545e7b180f7d542c7aa2c0a351b736d4f449e70fa11d0a09cca1 SHA512 5e283412597bc3a1341d42c6cfe824606e056aaac82cbf3f662e7074ab74f1f80befe9de1b1011ce2dc970a0ec159ade5ed5b3e71c9984facee6314eac20d0f2
 DIST encode_unicode-0.3.6.crate 45741 BLAKE2B e1e3792bc2bf9db7df33a516d0d755eef5eff1249aa9b2fd7f0dfcb155786c566fb619c9b2d73425a8625c8593988b117e9676c341f65e8795ddc838bf9881c4 SHA512 64193d6ac75f66d58ed864169b5d6228ede36dcf100614395e086bc8e847a3ddd287734d88e8ed50f38c679a99c80ec68449175a67d8ee03b02ec1cfa9d55e77
 DIST encoding-0.2.33.crate 88798 BLAKE2B 4163e26e6f38f7fc1d7424f1135fec1dddd2af3d6dd5f5bc6a5edc3eb3fd56af56858cc0fa5ed6a241b55882807f72f2e5d2940c9a7e5c4c6700ef905727044a SHA512 10c186e0f6ffcffeacb11a66fa39960454955b4827dba03e13d9ab5294bf14e77faa8e64956d5c3756fbb7e930081b7b301db8ad6873a6e8d44a7f9d98566e4e
 DIST encoding-index-japanese-1.20141219.5.crate 91495 BLAKE2B 4deb91b0b2dd1b33bc4b43ac2ec31df0552344b1177c9e504481d62a706b1c187eb3f4e8dd78c62871aa58c86ab6e309494b1b7937843de6056f3d1a0120160c SHA512 879fa0b9a294f3a73a4b224318ce5e44bc1ad0496763a518cb9ee251a4cadeb08885df97eb72f27a1e331f36d46a96824f98b7d128d879c0639405a10e08b8e2
@@ -42,49 +74,90 @@ DIST encoding-index-tradchinese-1.20141219.5.crate 120862 BLAKE2B 727a26b32f2bde
 DIST encoding_index_tests-0.1.4.crate 1631 BLAKE2B 65151672aaa863b169b6139c8e68065ecd6ab602e8fbf8b0f68a5e2af3f34858d363e5f0602f58e4ad3169ddea83d02a0f19a6d635584521397bee63587c9fd9 SHA512 0635e6a879d59aa3373e1c0cae6f61b9bd11138691a1113f3639a1d16ba894c1554f29a6d347353f02395508be4da8a4b16b17db3339cf970a62267874fe93a6
 DIST env_logger-0.6.2.crate 31078 BLAKE2B c799e1be558ce1c2800aa6d2ca8f6de21b3fba48742495cea56baa16463e598feb200cba39d6725b7f447d4610135f6393f5c7f835a520d423f30f21e812686c SHA512 ec90dc0cee99a743d4cdc772fa66a9c4e81793e452000bc1432fb47436b62c6a02c36c40ea48550db493df65c4eb37e8a6d6d3b4011f00648294d745a200dafa
 DIST error-chain-0.12.1.crate 27906 BLAKE2B 66c54c3448b8968a70395861469d7b80aa101210a3c96d2f28b0933fce6d77ec28f4ee18d7666402abc8162f567029fe93f7dc80b93644ef6e488ad4062832bf SHA512 1a8baeac9f4d96214a878b5c80ec2c5753c2232a166515c96ad6a42424bbe32410f2acd3aefa70d9dda7036e1965d83aeb9fd1a393b11464fed751aaebc9bbdc
+DIST error-chain-0.12.2.crate 29761 BLAKE2B 2de434a42d2c62845b0d0801cdbaac09b70bf3a7d940b91814efb203aa686a31a77bb36fe12170dbf392cf0fd6df75b46eb0937214cd8c280cafde721e6535ad SHA512 1a64c6813f07d23b091fe3fb69b745711ffcacceffc2ad5e1bf76917ff15d48ba370d63c886441a96a8a88cf645224db46a279152ce6b76878bf8699fbcb43f4
 DIST escargot-0.4.0.crate 17410 BLAKE2B bfed9c7ac31903c23342d6e7d438ba509f7e4dddf2f4dbb7b6110b0af0e4d83eb49d989ee8dead0758f22aa4de7eb4d7ce4401308c8ccd73db0fcb28482ecf43 SHA512 0b1b62b2a34c8d180f9312b3fb8fd788390af2231e0cd28acbea8ef6847e9c654361cc3c244aa70a4ab98b726f74ea1e7a45312a4b6b225cf767aaf451475df3
 DIST escargot-0.5.0.crate 19936 BLAKE2B 54ad5f55816b0bf154b21d043ba5e4992334a2a05cfd542af088fbcf3ed983ebd5eef42c65ea162d078c5072f02010609ee71f9bc023c8f3b7f5f39bb9fd9035 SHA512 7904cbff5f57b4731fad85f45cbe61916593668afddd32834da98d15dccfaa5b25ae20a280d676557b1c797c316929a04ed861d343bc89d35cadba38d984799e
 DIST failure-0.1.5.crate 36749 BLAKE2B 97fb948770c3325862f449d5eafc07cfb170924b4a0efdf4e6d8902411eae6cade898c953a6b51a955838c359c670c1778b3a189c3e70152fe97e687df38a805 SHA512 8dcfff3b9f7ed03070cdd890e051bcd425535a4e18aec21d5a48383d2826528157ad51893cbaf320953d31752efb22f554ce974f8516706d87343537589433dc
+DIST failure-0.1.7.crate 37416 BLAKE2B 0a7371a6d22b485716b21ba8c9fed5517b7c7b75c63f10a398be46be77c4284cc43d1007615d61784b477e373eb57eccb8ef93dfb5ab90d2c8a009e05b371c47 SHA512 b088365f05c32343af04a4e0cdc73ba066d7173be0b3fafdeef6185c43466c0fe018fc26165c802c25d666028f77a2b8ce26d4317d7bbb02c873165541ec1286
 DIST failure_derive-0.1.5.crate 4884 BLAKE2B f09bc82f9fb489950d886ed1276ffefe06e916389d034aa3b82521445829e7fcee102e1c03030df9cc55e4b1f14c933ab83faee8be910037d33f15d15ef9c86e SHA512 c1a6896d986c126c35045c40a85b8cb8dd8842b9bd06918246205f2e79349e1df5dcdbe408024a0f9693d628e17bbd750a733a0a5cc24de4162b08790222729a
+DIST fake-simd-0.1.2.crate 5398 BLAKE2B 40437b18ca7b77258577f518232dcf67e2bf09b64234dc3f02b9eba0c5c1fede8f8d1dc7cbc112ce80e4f0bf317387d1b8046d41a4f83a7c54981fd2b71fc8e2 SHA512 d57242c54ea3283185eaecbf8d96a4c9decbada3ae3aceb516a79710be9bf038a6e06a29b9ba4ebcd41b8f42943a3024a983ea23e36b17edc445a8c4980f2893
 DIST flate2-1.0.11.crate 68628 BLAKE2B a375952ec5ad14050e741fab7d62a56413bf50961c2c4e174bdc978b2e17681d4ae0398cdceeb5d4500e60c6b0a7d8b4c3692545bd2305d73a20d50874fcb7b6 SHA512 d2d67be2fa687d4a4e2f4486a14e95d2d73704e862940b9cf0072378916d8e41b70081d30ada2184827740450f5f73edd35ba3d960931e3edb4da8ffb4e35a4a
+DIST flate2-1.0.14.crate 74183 BLAKE2B d3ef991f13e063deec70e782c07d064b033c50bebe2d92fe648cc21ff45e1716e7c50eff84f3805d3b11d7ea3510cd97d96b75b531c8f03b56e06889867dae08 SHA512 d70ee34d21b345529149b95000692e2dc590e14924d862cefdf926e77bb6e2572a99d0cea76fc0661d1149730cb3914598c1f500bd09661338713894b9a19152
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST fxhash-0.2.1.crate 4102 BLAKE2B efade6722efed1cff0bcf307ababd9c9031af297baf410367212758411a21d61a473456c7f9b5cb15e444d115a62120f140c082e70dd360a3ae83f2f71bec9e6 SHA512 638e1c0a4e7f365483a329e715afbc2e57e47c03b32e0e1818c879baa96996e81dce8ab39320e24a3e1633f73dec1e5f18a06c37f3ad38043002fc99b55efc38
+DIST generic-array-0.12.3.crate 18017 BLAKE2B 0d24e12365b31ba77cff37db6841428abf7f37f9722d629c168fd96a3a88390999a95e27adbb6aae697ca99bb9ecb4728af49d4166ea2bf89ad5ee09bf2c943d SHA512 75f3c19d3aa9db42909298b207564b2df40e7e8b8d54ad18972a833748942b5293a0edb881de894b58b5210c870ad546752c200710c5549144d11a4a0d7417d8
+DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
 DIST git2-0.10.0.crate 157274 BLAKE2B c0ca85d649f19ac1623576632fe2efca7bad190d770188fcdcdf4192074d7d41a288600dee06c9fbc34cecc7d1baa04a1b1cb10f40da59dc9f0090990446d0bd SHA512 bb603b465735ff8567f11ae0e93b2b86d3769877c8119404fcaa55e5c456d62836e5ea7ccc5a1439c8e0a7c4450a4eb4437111a03a9723fadb9dc693ee1262dc
+DIST git2-0.13.0.crate 160810 BLAKE2B 7c9e0522c52f8aa25453f9f6872cd97d0521e432ad7b2393600fab85620d30a43c925802745be498f3b9231542698d989f3a003cfe3b3648165e8f3be606e2cb SHA512 a38945fa2ebd8998dfcf52603122ae556bc08ef2585dc02cee83dae6189e80011c969f6cbfa0063baa5c92345ac014929c423c399502730974ad7e1f6848a126
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
+DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
+DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
 DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
+DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST idna-0.1.5.crate 258735 BLAKE2B 31f2506f76e9bbab68c0da6222db214865dc37994851d91eab8c6e7f0220e6bcebe50ce3a571866bc03f3ad1b337f25c3a02c7e7f1494553d91e85c1bf042950 SHA512 217bc49f667242bd89eff708fef395fd46cfe3d24440bfb76869086fb93805c4f49d718251fb1c35ac40d5588ec98cf8b8b516fda53d6d7fd3da1ab04b0d173a
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
+DIST itertools-0.8.2.crate 89203 BLAKE2B bcf8c00da5033f36cc205708324fd8eff083d46313ee84f567e4f333d8ac1ebe44474d89835a312a5357a48659e2f51d34d2194d548256118943999a3da8ebaf SHA512 325d87a80c0b217469762ae958c46925d284b37ddd987c3ab977c864f426dc6e4515701864f12fafbe49289b45b1910906f0e7d884ba8aea217cac521c3d1ff3
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
+DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST lazycell-1.2.1.crate 11691 BLAKE2B 9b1d6e9ced918aa94dd5dddcd3ffba59116dae922d264180ac36c288d8a6dd9244324a7c3050c5991b216a241e482ee17b2e6d27527b88339b606586128df1f5 SHA512 de74ccd6a3c32c360a12a51ba1d51d6530130396b37d63350a960956ae0ba13e9ac31e2bb70b61ddf055fdfbe7e559b20a38415cac3906839684905a01256ff2
 DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
+DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
+DIST libgit2-sys-0.12.0+0.99.0.crate 1547501 BLAKE2B fcbec97ad31e858be16bff3af2ac5f483831e9bdeb730c2a616ce7a794c8c62159f30cdf2ed36eaa85f8dde0ea272b3ed25e4676bdda49be3e2921149fe0dd4b SHA512 a622b2345e6dc3d291690938d91a1defd47a711b203d12d356ebc836a8def29a1d39ccf4991bc02af8ede3448bc29a00cf9d74164ae1f9149f8586e5de5cc130
 DIST libgit2-sys-0.9.0.crate 1521698 BLAKE2B e6e40345bf12bcf2908d3222b965e95596960e4fbae60c7dd2b4aaa54e11bf8a7c725fffd1dd0b00b13c2487577a3bcb34cd12462e9228655b4665ead0e5b121 SHA512 d3c7553636150c3780c075d55411224ec2072589edb614717c6e5bad404fc1be0b4052b73830cf9f4417b4105a89fabbdc40912cbfe91f1e6254856b6cf3977c
 DIST libloading-0.5.2.crate 16420 BLAKE2B 1b73f3294830cdd97b7ad42f0458bbdc95f641a182352095c26f835ba4fdc71cf9a0fa85244511b07bb79dd1c4e913625fc69b4b1e2ec28306dada1aaec2750f SHA512 d04cb1bb220c9364c02da4f360593907c875951fc0f6de5da1455bac4e96a470128409f77b21194fd6a87550f3ba00abe3b7a3426e7637acb62b80d61da46be4
 DIST libz-sys-1.0.25.crate 650151 BLAKE2B dc11dc65c95f6c1f409ffbd0c9b12a809eaca5899da1073d8f302a752f9bb538b419cdf2f540b34b6f72c7ac36719e8fe21a1480533829cee305019304523520 SHA512 3c1d0754230c327876fadbaf3770f52282fedc6b373c92fba386a80261c577f6bea2983db7d3a40a231fbcfee40e560d8f738d25b634d270e2132b3162497547
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
 DIST linked-hash-map-0.5.2.crate 16109 BLAKE2B e65a12161dd8b4c0ca49d25e20d0e5b68c411c349c00c6a1faa01f4db4b3f4c811bf9b64947922b8ab900a6bcc90db30e8a6d58ba9e384201879556408803e5e SHA512 74861f70ed09b119c6db1b0dc7f7c8c3483c2824955bf88ee892b3a3fa1a54e9bfcaf7fae0cbc4792762e330584dd347532532e1a0e8a8bca222b5cdb2c7cf94
+DIST liquid-0.19.0.crate 86707 BLAKE2B c227c92be2a02066c74ce5af378841d7d37b49311eaba03b084953d4ef87b9678c87d4741cfe98ad239a76af326110a598db484c250ac7561543ab10070a986f SHA512 2822da93e54729250024ae8dba1c7ec4e7b8f0d2faf881ed267ea6cb7340a425954935edf2367cd913becda36f585be101367363dd972f4e1f6cd7af024e9808
+DIST liquid-compiler-0.19.0.crate 16226 BLAKE2B adb649c20a9149a96410a053b5b0b784c57daf111b316bdb56f238bb0937bf67a84eb540274cd50c880da7487573c42a6b101726699fc8376af796794445a095 SHA512 a203b89d8bc392d04b3ea14e86f0d7ce977f3fd1a68cea9afea3e4e2c1ec0d84e8bb20d43e6e5f3c1734ed37c7b0a8e920de43530198ed244dbf19d7b87954c4
+DIST liquid-derive-0.19.0.crate 14029 BLAKE2B 25a2173a5d2b565e8a49f527d99e41d5dfc41549bf0cb9295336bdf1d71235180e2ecce5e47ceb9f16c04f3d28d9784421ee4f9b98854f996ec7c48b35e46d29 SHA512 9aa6241f669003a0fd446b5c06f57838a68f59584b2a2a24f53a91fd091dd195ae792619521cddc7b4369b8e3c10162e88ae74e8b0000bd0b8f5c038180ca653
+DIST liquid-error-0.19.0.crate 5015 BLAKE2B d152da211e85ca3c24f6b70241e74d28e608ad5a7087a8e21c350f35c484da8e2f628e77621485327823d4464b8f92caaf6f61b51f49fa1923369936be96409e SHA512 c8d1516b70c8cbb484d242c914bf2840f0d7231a02362b648f6fb64aeec2d94d340e9c2052c6ad4d9da765f378e7bf2f08c247ab58f7ef61d2f0c8e5d311abbe
+DIST liquid-interpreter-0.19.0.crate 8325 BLAKE2B 3581bf7addb98591e4801f187de7749488fce395a05ce16436febea701820210b2b3b4818895b0bee65b936a17ba85975e3a253d06c17adfc6656bec620cb064 SHA512 0f9fa5d2c243446ceb01a51b31511da8a8dfaf76670e6b79b6289449a234ee84ed565ed671a7c6402f2655a7ab3d0e70561b4b4e7efaf39d8cab27ecc5d3a6e4
+DIST liquid-value-0.19.1.crate 16729 BLAKE2B 695064633f91389f6721fe081099fd6cfbeeb3d489c663b5c2cfaf4d8c1572e107ab2e1711bc3518ace4096923588fc7cd4c23d1e3866c98e2486d503596ca8b SHA512 e90acb9f3a658147698d4a51aafaf8719b28c1d1a129ecb9412f4325e77012cd3523af50a2e22048840484d8db83274a5367b14f482ff2152a74796dc6e8dd54
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST maplit-1.0.2.crate 8871 BLAKE2B 3cf975d35de2d2fbd50227a6d2c5e72227e99197b620c8f29be97bd3666ec162deeef0d9e6bd327a063f175201beeb73c4ed27272449b1df0b78238b2d36ca22 SHA512 917b5cf665e12b687035c895b60b2ae05622963f495f5693515fd24d56f49e95a06ffced68606d061bd20822c655100035930673fd4b0d4790168763b6961a9f
 DIST matches-0.1.8.crate 2216 BLAKE2B f18176110921b1cf6e58d52d12f1d1a3455ce2dc04421fbf1b392f66cdd81a88e924571fa27e307a06301d83b04f3b8a0ca3ae40d2da6f2decb8aac4e2801fbb SHA512 98b58f6a2694b03a7dd1be69ebf7e3ad14483fc8e4cb6e6c26a4937e4e660e843efb4dd04a7312dd9659ca02acd3775678f73b8faac44a76ffafaf873c22f590
 DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST miniz-sys-0.1.12.crate 78209 BLAKE2B bd6aea3b23382b754a926e8f6f4ba4b1684ea86987100c16556d0567278297e6e5bcfed2ca8a114831f75814692f38ae147f6c1951d218cd5ddfd81231fde86c SHA512 e00ab08d024806ffe68f8d9d0404bf83e62c58d04398bd8b0f8993a6c60a38fcc3a50189cef7a699ad7a93682d9f2353a31f5596d62a72c5f6560d12cf0c0a02
 DIST miniz_oxide-0.3.2.crate 54536 BLAKE2B c804e4a261ef2444ae539ced683af5d0358baf625d7e8a16979b7ae2f10549d08ed97cd1d3ccc2ab4b96867326775b769b451e5dbac168cc9494be627eda9e6d SHA512 ea5eb9236a8797892f0f4bdda07c37cb8a6e48cd2fa8e81e2a07c13961675688307f77533e79cda65a72312451ff46b31cf167507456e4186e2b19a86cf14b95
+DIST miniz_oxide-0.3.6.crate 44717 BLAKE2B 49d69fee6911ada1effe8ed73072d7815ed94a2705276698a178fc77ebf8c9e92eb286d7d71727a894f46e605afacd620d48d6aecf8975d2366e46e2c8c8bfb8 SHA512 d041b41617ae0e614f85bcfeca31d0c9d031c24942f786f43166e34ebc37bd67e3b9a44779e74b119e3d95d288d0842736ba709dd2faa3cb418415e2c86ccc93
 DIST nodrop-0.1.13.crate 7508 BLAKE2B 6918c8ea7f2b84d1a30e8159ac6cf9d061270bf8cf60fb2ee7c96f9d8a5566f1922a3222f80c769fceedd65637d6ee76a4d45b533d5b02aa0decb8114f6cb11a SHA512 2648c0aec970c99f001dbd8169939731610ccff6433acba8c71c669bea5078613b2a785d3ac5ce5a839fcec714b5bc55f2cc83522ab4cc09560c846f4cf8023e
 DIST nom-4.2.3.crate 115343 BLAKE2B 03c0d1cf97a0d34adab29d6e21add3da7d8eb78ee6b7987ed11b136db7fc6afeca6a8eb91e00aadc1f6047eb7bff55bc288faa8c481e6a4677e0c43512a68f72 SHA512 663567dcc6310ecd6446bab1eb700f4ebe834a3b25bc2a0054edf14bcf205a95128de5f5dfaab04adb95e1a2241d487d59c0e23c957934a0d656e4c51932bd54
+DIST num-integer-0.1.42.crate 19463 BLAKE2B 91ea6900dba5a38bc7ac4de0db8706f5335baab636937e9efdb1b82ff0e8ece4451503de3ac9e473a4dd7c70d599066f14840789fa88aeedafa585f0f98ed61a SHA512 8c7e0529888e18b872a634e8983034b0357143aa72914b45c02ee87447204296970e9b1ed078d9436ecc779f25360b1a1cfaae5a9bf7c8ffc68793d7c25593b2
+DIST num-traits-0.2.11.crate 42000 BLAKE2B 78584a3e8011391b47c7ce45c5a63da5fee88aebc2ee7ae8d788e22b1d6cf46e31e70b7bf6ae094d35ed8dd5ea4f91472e6050c526acff3f181ee383fee139a1 SHA512 12d73656db34456a30de7538daa1efb6e6f61353a0e274aca388bf184732402d8eb8ca19282fbf51975e0541b5c8d764a0148abe346061dc81922d5eb12592e9
 DIST onig-5.0.0.crate 26969 BLAKE2B 4d21a18e078c19993fc5d2998d23cfb4168ecf2b80aa10491241093f531373a84ce8adcbbbe1c73753be34090dca151ab39d8a4d8dc32fffa599a8ebe78c7c92 SHA512 eaecbc1dced5c684173c0e37e775b251a6cc6bd3fcd447495cb9e116a679c67314268dcdd226b8cfb287cf6900ee97fb32e7b62e05c4e9b01cb156542fe4ee36
 DIST onig_sys-69.2.0.crate 561540 BLAKE2B 1bbbf953d74958aad6dd28bdb43d0e5d638d5db12d35aa0c93ea50f35f237902652a319d3b59624be02ade2fe072521efbd7b4524da98b541df3d0c606c88e10 SHA512 279d08cbb6169f34f836812b44179a2efe12b7676ae424c27fee624d2b8d609c8015608c09e2d4adeaffe66308822263d9d0399ab2169dfa749ec73233eafdbc
+DIST opaque-debug-0.2.3.crate 5643 BLAKE2B fc0cf1ca373f2eef8a37f6d7eb02acc7cbe4d71f7844e01453c036c7595121272c207023f43ae5287b343756ca0a8bddc53c5e0186e95c75c019268a5f716087 SHA512 7aa44aedd3fa5a6ed3d60239c23dce4cb7b27693e110140e6b332579bf1c1b773244f12271ced975e53caf68f3f381a7edaada573efb982d2e13d638a3a6dd40
 DIST peeking_take_while-0.1.2.crate 6697 BLAKE2B 31571604d00872900abcb677a483da93654de523bbdb0331c326dc9a3e531f246e571bebcb983e79dc46e33ed6dd32b978be509841ec0d9f1e7209c06289c22a SHA512 7bf8721987c3e2e1986683dd897746592a909382f02b840b777effec7d8b0a864c1a83b03c73d555e359f22c423168a54b75448a7e7b996b739527ce8c88b721
+DIST percent-encoding-1.0.1.crate 10057 BLAKE2B 6dbfea557cb7a604a99b6fa694ed24b1555fec34bfed54503d98fa4b285a91aab1405b7156bd00be0001b10bf15706878b7bfb4f73cc34560166e0e8f004d944 SHA512 6e884d7172e8cadcf6e39056c9f92b70252f56a8062af0e792179dcf990344f47553c04e2fce84841f20f5c28557d7768727f60c862b9876d29cabffd4ad19e9
 DIST percent-encoding-2.1.0.crate 9748 BLAKE2B f3ff35ac683724b15e40c85e0fb8ececb07b61beeea82b7020f02d27df05a8a3535f157b3cd688533e414d6541de7de8640ef4756706d8061af0fec94ba04ab3 SHA512 98af4dfa7c6a3cf0d5aa929c436f9eb1ba1b576a944513f1284e6df2ad06be7cab9eba145d888d50af88f8c970bacc702b323041bec6d4fa1dc34095186c628a
+DIST pest-2.1.3.crate 77986 BLAKE2B 210638cdc2cc5e389d2248fbc06b8163dd5ddd77974a04d32f674e7f959acb3c5efc7f26100b6ceb7c346ee06a39db0e11ad5b793a1bc09dba679e6a5a4aa2f1 SHA512 08a36d4571cc0e912ae87e1f2116424b3d4139b653dd9a446fec8ff39cd9a691e8305c86cf75d227b5349197ada4ce79912ac25f0726b98a0642981ac4673c83
+DIST pest_derive-2.1.0.crate 14049 BLAKE2B b85c5a625579e9bddf22ceda1ff808e33989d259f07ddfacaf833ee313029e1a8a01f824da915cfd3d57de57394608a9b506589d642be30e8d5e6a3afcac6a9e SHA512 4d554921b35b6c2491f56b859d389e93459552807df6ff989f9913a9314171e5b6eba93cf7e03528973d6025b663cde7b841d38fabd8197c33beddafaf83fbba
+DIST pest_generator-2.1.3.crate 14227 BLAKE2B 2fba3732d71e6036a911e6455d12ec7f4a1a14331b50f762fda1d6dd244269106130b72025d21e684bdadc0b5971c4b19ccf1f113067c26aa5f1ac71c78def8d SHA512 8be05ef3fd59dc4ccb7871388f8e3cb24cbc2f64eacf7a32fb887f1d8911b528ec545fe78bdd7beb03e2c04eb7fc0ad98ac9fce8579f95ea71cc280912f07c3b
+DIST pest_meta-2.1.3.crate 27818 BLAKE2B bd96b36d47e39d6f8cc6f07ab373d1bf8b8f9907afb8b3774f62677c800914f40a0b44531f50b065ae9d11ec77a940da865b5a574d0cb0d2dc51059f718fa826 SHA512 f31492b452b58c632c0c5c3e357ba2b41ae2b5816d0ec432c1a281dfc681c5b5c2ab4f194c1049938e671ac232d85667aab91323e986df4edf6093a4e2d47ac3
 DIST pkg-config-0.3.15.crate 14087 BLAKE2B 39ef9b5d573b8eaf15cfa779ecf877b7de785bf8adf9b3fa20e5bedebb958f950da7b69e69b0e135f46379ba370f51a2bb951d5959553f878ff6f5c4505d5e79 SHA512 645aed8e24ce99085e4f152eac511df50646f17705d57bd8566e70e17c18bd6b05001479c94b2425e45c67d4f84797784053a8299957a1492289853755a7867d
+DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
 DIST plist-0.4.2.crate 21132 BLAKE2B c9afab6368357dc906c2a069c63e75708baba6c5762c138385b9ff5976dc377ff5279826607808161e24f12be73f8e2ec24ff7d62be578720443119ec8174e9b SHA512 667de29732a76dd6d7b9768c3e58edd8c21e62fe5dbbfe9a64a37de5488640aa42c04a8683596eee9a58b02dde1cb0f10e3edb9fc48b3d93e61dda0122357162
 DIST predicates-1.0.1.crate 24714 BLAKE2B 678e393fd1f6d8a4d7a6d0e0473f8f7ff6f0da3b612bd4f661fe3ba3b070409837fd3b19dc294e68af3b643eb04f9cf9020d76b4aff8360b0a1c4b4d8bc614ae SHA512 871465df78f22decadba2d797239c465cfc37033084197dc5f2bb047d5e7bada047300f331902b4e2c79036ad512544789932506b1031fe471b9d5ab918c2391
+DIST predicates-1.0.4.crate 26239 BLAKE2B 12ca05a2d98f9a4b6ad5442cdd8c5f5bd90a691d5f9c61389d710a7dcc88998b251252b9dcee4f4d8f742e1e4c00b25ceda57e39fc23b431fa7f04b2d7e64bfb SHA512 20f2ae6853e665b262651d4a2bf1fb70f4ee8e536f4fef2de79225fae44a4f32b4680f06f06523675e5af23e301ff58b0cde3e61c0e58c27e412d2eeec96fc35
 DIST predicates-core-1.0.0.crate 8066 BLAKE2B 71e70aec3adfae302287a1cd3d7d19eff8a697659d61ced33b89caa8a2a3359ab7251db012d973dd574abecec82acc010c5169d0670096af06e325761363c34d SHA512 024f997976ae618e3b82d59613f8b6c41b3c0b3b595b6cf38d10d2d27a11388e9511ca38c06d46b52a12fc19d3cec36a69ca14e1e21f316a719539e41c86d6f4
 DIST predicates-tree-1.0.0.crate 6251 BLAKE2B 00da28f7de9a7abb386c6a4425d8a2285d1ef22032476b0ac1bab4b8d34d2af69948f80d8f0498e2356caea3fe92ce352b58539413a8f0f052e9dbc26c96cc12 SHA512 29e1818b7cbcb7195dedc78e6a1436e8e8c88b61d43469952c4bba5bef7dbfd5b7f0dfbd9fd31f71e71cefe7c7b8c44ef361bff1a86f40c945caf48cbd87cf05
+DIST proc-macro-hack-0.5.14.crate 12781 BLAKE2B b7364e29c091008e1f62096ffe5cda8d319c8a519c938f24184da00a595689faab3df8283c290569b92ebbf48dfdc51d1e50bddafa0b4ce4c9b227b4211ac8f9 SHA512 bb710f6a2e87a5fc4b7854d9c8d6621b78dc02ceafa2e363422f66360f052be9edcb8a7d3a1a87a0054b27e308c1298d3fcce9dcc62db5504f0cc84275a739b9
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
 DIST proc-macro2-1.0.2.crate 34779 BLAKE2B c99119a8c2158712f16524c568a03d60f0f4a72f79ea310c823c7bbf809f91f5836f4bc3388e2add1e202207fa91c24b64be438c7ee6d0eb0f27175b739382f8 SHA512 012ef53dd8f5abffa10490c95197bd0d303c681fe0da54adee75a9328a194cf827acaddc286b2237a6665a0bf9dd4c94250bce7919994412185c9de3828f733c
+DIST proc-macro2-1.0.9.crate 35576 BLAKE2B 16c687cfd21bc3b97113f32293c1e06ca5811df6c8f279e1c5661a501c230b430f1e8bc983a2ba30d097acd01df8701a5a90ed02a93feff83a1f6f33ffa1e8d6 SHA512 005d1d31ec62a25fcf3cb0e62063d5fb53a3b15fce8fa597ab09cac5ac404a7eb441ae44c2d3acc295e24e814a413d0664a3d142155495674c4713f489ec79dc
+DIST proc-quote-0.2.2.crate 18051 BLAKE2B b06780b180e1f5160b5676709a2092dd498f0b86f1a27c26b5722c7fe47ad793416875a708e17f4a7b52f934ed5ba685522eae0450df10c27a48e16a6810572c SHA512 4a8b0f17afd6067382013dc41ed80d894c144a3cf9f7ee616710fc0021fd1c0cb580e01377c954fdd82affc5e86516dca681de7befcb56c766b0ace93c3f8813
+DIST proc-quote-impl-0.2.2.crate 4766 BLAKE2B 674aeca3c8ea4f30a0bf130d57ca8567f916a0d3c6dcfa1a6fbbbdcfcc224c6bfd53c3bae1aef8a03eae60ea1b883ac87328e705de04222315f9308e3ebcb039 SHA512 feb2805df07d5a46e43b19e296ee712e7380ece301a0425c87e6b9a5004013466fddec621c511c7b23e254fc43a1232958c6c0e0262d87b6e2e472969e6a82e6
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
+DIST quick-error-1.2.3.crate 15066 BLAKE2B 1c61525d383f3588c1c5017f016f60b484bbf2035e7f63c553bd9a49b638ab0c6106ac3676a41072b24da4e13dde78706e0f99fd1ec9ee329d5be81d45a85866 SHA512 f8aaf9024d20ccd42b706c756eed8320aee339f8776392b47a41cc82ca06b03df1a5b1f00854cea96689c5af261b4d8c5d2b1a242d10f2755e7e33dc41be35b9
 DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
 DIST quote-1.0.2.crate 23023 BLAKE2B 4091809b4fc9b8d0b56be814b127d6ffd7c1507becba85dc905606cbe85f46233dc4b429c1e865e7c7de336cb936d956169ceb5dd45b489b7722022ccf818a3a SHA512 67778dff9dc5c4edcdd6454b74ad9353bb6c0c4e51c16cb82f2e393a7d7a0cde084d3c93279b718a8398c40af0a9377ebfae5321e69e635efd8390c125b75ce4
+DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0feee77ee9a0bcd4dd42174b1e650f2a19f1f3b39fde937e58c17afaabf7231e2aabf214c2eb22edf3f85b73f6eec SHA512 f7ae3b690e2cc1fbf2707ee04b752bc5472433f737ab581f9872f7c5660966bc6be45f0c5d2cd8771105df6d4a9d206c55f5cc6ffc1693b46e1ae03a2883b028
@@ -92,42 +165,70 @@ DIST rand_os-0.1.3.crate 18965 BLAKE2B 3cd93b10a46a70e0e3ccaf1fb8ee52230d74b7d79
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST redox_users-0.3.1.crate 12557 BLAKE2B 42810692ff093b9ce056e5b539834ec3fcecdd5cea6a1ec750fa456c4293ce483a9de6105eeddc6b6f41c591c7f292b744b4f12de65eb634ac4b855e6fb450a6 SHA512 086a01e32fa5b5fbccd2d84e23141e3ee5a50e5ddd6135b579c75db5a0eb7df676dfaa8e2582038ef19c09d123fc68e9d0e99667d4ea46f5011d4e7fcf5692a5
+DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
 DIST regex-1.2.1.crate 227824 BLAKE2B 982772c03ab9c22f31e80f1c0e585887a1c1dbf74d289779186cd9c3a7e62eb7068b01ff3492d8b11f770933efdfc14d64005aa1f0e0d528682ea26d2c576220 SHA512 8eebd914fac9ea0f5c879614acbdfc6dd5de651ebe4f38c886e9e7e14c26a11220df36997fdb6d3fb95aa28ddb77ac416d92cd0e98a18a1996ad4fa0cfb3a986
+DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7
 DIST regex-syntax-0.6.11.crate 283238 BLAKE2B 37a535b47f90449f6d41d1a5a3de69ff21e74fd5268961ff9f7cffd620080fbb212a1bd315db9b25b20aaaaa4ecd4b1afbb88a45a96b7e23d4b9e4742c081aec SHA512 619e1118aaaab60dcfc653cdae8fe2a8dcf49f2b06e718710f30179b4c95f1e31c04b2289f1d05d0c88b1996a3d8a327180ccf13bbd1d0259a70af7c7f449651
+DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST rust-argon2-0.5.1.crate 27795 BLAKE2B ee178d0009a4c367d813e3e4a6c6f765334a0c366b8f0d98f40d55c6fdcfb64284cc7c490c6185d419430f702a4cd051971463c7994ea3323f331eb6c6eb0132 SHA512 80c1c48db1463e1506bbc8147c147c8e37a8cf26d6297399a8e645c8fe81b6ed9be9048a3b3dda67cbdbd505085e9ae79d50faa2a846021ba65f959160465f4c
+DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
 DIST rustc-demangle-0.1.16.crate 19137 BLAKE2B 04226ff97786b81c90130b48cf6542ea448661af9ea7afed179e71d04abf52cfd3c53fab26d4d35bdf2c1d5a735882da7703527aa48ba7b77f337599c2324150 SHA512 36a63a28a72c710d08524adbb7d11def37db23fe123fb6ea848623b4207c7f80d8415bbbe951488ceccfb8f4f1cdb66a8edfc4c0eecdaa62c87df9e032f4c063
 DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
+DIST ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414
 DIST safemem-0.3.2.crate 6858 BLAKE2B f5a1b44da1289775e380b109bd458b7bbb17cc04ed718434cf05fbb7d75387c70b51c5d8f9078aebeae7e98d1873b972a70d65a345f632f42f5c67cbe9a421c0 SHA512 6d886d8b96ada623436586ebbbb84d9eea34329bab3164d915a47e3e4de00b724928c6dc224c88541aeb0715de633d129949e7bcedcc2393b348a2692451ddda
+DIST safemem-0.3.3.crate 7778 BLAKE2B 6ebc0e234054919687e8a369bc30ca6b007d0e4f8147157ba1a90c290b7f0b490e5c21a6d4406671e26ac073f9e4e06a2bc9b1f21eb152b05c4022a3a4ef3793 SHA512 2e4852ca91160f9f1e764b75145d794726a5f6c162cc99ecbf9cae20474a06cb3a0dfc245b895c51342240f6875423010b33e36d038b8b419a37e4820a9caf72
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST serde-1.0.105.crate 73358 BLAKE2B ef75efaa654a5980648e8418553af18508f95b29fa1441f0804c78d9f8fe91764a3565ee1138c96c9245c28ed2ed8082d08c50f8ff36b9d40b12456a758ee289 SHA512 e8b471769b696b0c7f3b673879dfd056279fb49dad0228bc2ec459a2aa8bd26073d40ac1809a42c0b5ab3e9abfd32252f812c6493d17979c10796e7ab78a795f
 DIST serde-1.0.99.crate 72436 BLAKE2B 564e206ea5363898300af959efda372115de54812553853679af173fa91562562f1508d4cb570d801ea657af3aabcf8c3bdb40b762d6dc1e6a24c4a02cb09021 SHA512 9e6e55fd38777ef238d7b6c0f9f74da1e0cdc204e4735f70e6644d81e615d90c5b245bb8f2edb88751d126b3d1ca3c1e9f6922dddb645b9a1bb40bb4a8c11a0d
+DIST serde_derive-1.0.105.crate 49700 BLAKE2B bbbb3a54b7eb4ca87b667c75dab007745a1e163b90c793258aa9f78b9bacd067262e3443d27c4d941b6c4ae0ad217779a4fe5ff79aaa84bb30fbac06252c5289 SHA512 1a39820708a609b3941ce6ff669068f67d65d446e208c904ffc59808ff7bb1d82148357515056fd4856e10cfdb2cfffbd968dbfba870ed23fddf1076e3f6e543
 DIST serde_derive-1.0.99.crate 49786 BLAKE2B 1a8502b8c22053c54cae207dd283402a85a7eec630883de36df85d46bed4519d04c3b82baf660d4863324a3db9875ae62b9486383596487e9648533e05e685d2 SHA512 6b1b17207fb1e593bafc1162d84c6ced08e799aca9c07c32c399fb3c78662fab920ee35e99ea9462b21515b7c3d35e4e2a457cc0577dada51138f5e8a905dd9e
 DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
+DIST serde_json-1.0.48.crate 72113 BLAKE2B bc522d0924044b41548b5c0ca63ed3e1fe70b7632b9e04ca6b01a63245deeae0e7154b0d913b3edfeaecfc816c1edfebfb666734c2a5371b416aaab9c1880f3c SHA512 544dd844330a26fbdaeb5246825f143cf06110065089c8be3dc44f8437f797ac083d7dcc5181656ed3d78428fcddc44e6802544ae304466eebdcd625a5a5fef9
+DIST sha-1-0.8.2.crate 12338 BLAKE2B 90702eff48c15b49195b547d797976837b0fc9028f76da626e094b80d5d630bedee637053dc57274c27d68b8b6f3c443f1aef37c06b7aad895630bd9d73039b2 SHA512 65ddb7bd8f0157d134e70f7c6d6abf7aea198cb97da17b418a265642c5930b8cbd9c8e0b97b557102787cc842cddc93213d669345c2aaac6a1e7146765b2d5cd
 DIST shell-words-0.1.0.crate 9750 BLAKE2B c7a613ba7d66d991f994ce339e86706d9b273d878a7b9f5f3611c2175e6749a6bc4038523ff63d395582bc4f41c5913c28ebe0420ce62f4aa30752ce51ad8ff5 SHA512 5a62a625866b04bbc3df8f89dc2bead16ab83691caafd140a8e4df4f7f2dd3e5d61218b447b15f3253173067ec070fdae004f2869aef9ea03c1a1ead5b180731
 DIST shlex-0.1.1.crate 5687 BLAKE2B 8e2942051c783369a8161b667f8f5b73b2081f766db26d685b4d3060f8faeecf78e8763ab927149d4cb08a29af756105f7ec3c3408ad6be2e7618053329fbed2 SHA512 a4d202897861ca7955a3561dc1b0fd0307d77948c9b97aa0f8b9caff2b9721d2836a08760d308675973b0e9c7bae92e4d5fbd2a2497cba9e5aeefbe31075e069
 DIST smallvec-0.6.10.crate 22064 BLAKE2B 41a7ccd12c9b7e1dfaf43a9cee22c60d160b35a08024554cf8d68b59498a6e3fcd0e8146815bb61a6e1727b209ec85813127ab8520f8ef47716913a6ce6cd952 SHA512 802b96283ac27ffa71ba17e8676c23f721cc1bd3b61df6f78a1c8ca9150d07e6d5db55651ba070f9202460019f59636871c1160e31038c6bf7ee21cdba8c5be4
+DIST smallvec-1.2.0.crate 23658 BLAKE2B 7e662c79fb35e6965b409a63128da6ae6d8183992ab12f09ca7b97f15b2c7c29b1844c35cf4ff72d02d934481bebe5b2353a9c70d17d9f44a11bdcd496f2c201 SHA512 ad89826c1e999c63feb6d481e7ca3110831a08491ff8fc66825e92ad003a06b40033b365ba628c4707df06a3ac2c0d3b71e327c1caa4dc86f48150515031e52f
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST syn-0.15.44.crate 184212 BLAKE2B b735040d69d10b30c94de2e8f776d25ff5ec427e79a7371345a9bb694d50c4f3ab848ed30166c683aa88f5f73f7361dda2a74880d21882975485fabe5bf65d33 SHA512 c6c9b5887425e1e5fab905e477fcea41bba191693c471cf26922a9dfdd59ed957155a399406cc3723933a869565e7295183dabedfc34e3e2a20874ba94c7ead7
+DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
 DIST syn-1.0.5.crate 190286 BLAKE2B 7d5c813bb4cebbc104978181532a050b0a7f79963a539d69a253ebdb15a83c275a5d5b04dfbb66a426afec2c90a450ed7be595619a2b5a31b0725d904f5adb92 SHA512 4cc18966040b1f86916876aa5ad8029a126f7ab8db55408b3f4bc343dd82dc357899dd4a7afc514c65fd269245f8850f8f2834b08bc2ee6cf6774282f75feadc
 DIST synstructure-0.10.2.crate 17988 BLAKE2B 62bdc896819ba1f0820286dda3596e265dc7ebeda83595d89ad6baf584046242f774141b25ee4cd9b120bd7c392973a99d307abbe956b50eddbd05e9b7b7ce72 SHA512 48da0daf778cd18547e51a080f1e86149534527f20026601b21423c9f89cf6adb7a121b01dd9bb0b680403eb728a92e75242e5ae31a725ea5b1f19c5f47f0458
 DIST syntect-3.2.1.crate 733622 BLAKE2B 97533fcd36ba96049e5ee5eb15275a8a152d38741a664a4c64270595d0c2d2ab8431b2aafdb72dee75d989c6a91ae6dd43ba1010a1ca81ea7ca9e5ea8a6a76cc SHA512 87d9f45c141dc20e6949580c7336aaba0d0ab440845e4240be68cb6a91531fbad68fc7f0d6b0c8798bf69c068e3bb58f54f6af91aab305a8b97427b00d2d72f6
+DIST syntect-3.3.0.crate 735117 BLAKE2B cbb822601cf7544db6dd0ea6d07324a73742c5952a2f42d1624d9d7b66260026d5186d145149e1e7aec7f6b77c3a197066a034c7759eba4f07c5d46f734d4cff SHA512 d0907fc89250312907e3f81bb4954fbb63193b7a96280ba54a0254f232b175bd8399be124f2c40ad61aaff759f5d799b17213da7aeeec6dd56e6244f64ec0220
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
 DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
+DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
 DIST termios-0.3.1.crate 9541 BLAKE2B fb2862550920607bf7ab65157b25392ad67c486227a0298ad2b0b58ef2f2f240ed1b0a6b02bcb905078cd4721b2e56b76a9c1ace1fecdf15643f76d3c39da2c0 SHA512 5f4f423f7aa0ca7e25f1fb0727029e47fbae9024aae6e168b911ee036bd217084332707ae809b2713d0ae35fe6a7fd1d866fbd1f06bebead32c0c2534671b311
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
+DIST time-0.1.42.crate 30005 BLAKE2B 6d85ae2e56612b5c6955921b671ac62ad10c174fa9fd382e2d76018fc2789253836397b980f8e6d0db4f1b19da244c64d3bffb4fa6c25ac0b66e7ba9876590d4 SHA512 4df662212377093b0fd8fcd88ddc30b20a8af7d989c2e100c0cf64f9741e88eea6e858e1aa4220be6b76b0cf8b62c8116b492010d74d1ebef197c66aa130aa83
 DIST treeline-0.1.0.crate 3855 BLAKE2B 3347bee24c686a6b6890f85b60429d36b14f2738e6a5e5adcd493d099b097a8087f7c61f4c155fd8b3af3982a97da31740353b4d036ae451ed8944a9b0feaf75 SHA512 37a7c7e95855fdf0fafe5b529eed6c6cfc641da799bc6738a5649a9a0c3db2ef3e63d692862a987bc19263f33b6df2e8ae71b49fe30160d6d470cbb804511824
+DIST typenum-1.11.2.crate 31853 BLAKE2B 1781840c29726a8df614fdcd620924b4cb5a11ad8b5af7c633e70b459b4cdcb9d6a7ccb02b08b78a0cfb3f73382d3ce9d93c56296f93ad588546aeb81a74540c SHA512 c301bc123421e47d39b50e39c42c04e35c7f12a549283d51e1942d1a8d54aa3e49e6177ba4610659d8e68a1d30fb1b2aa5af57c7bb652ab3f70ab7a28ef8b59a
+DIST ucd-trie-0.1.3.crate 44615 BLAKE2B 491f604d63446dbccf5176333edd159ac56261a9aa76efecf57e9a11ae017a6cba975658a4ffdd310561704fb0831686fb7770b1142b4ac495f01e26de51b099 SHA512 54d43b3824669aa20b725c7747f4fb65bd24e620670c968c1bb0094a0503773acda921b50a0b200c1ea0f84e1e059883c1704bfa5a856d2e2ccda116fb8c3e2b
 DIST unicode-bidi-0.3.4.crate 32228 BLAKE2B 853a85b29d1ac2025b7a28af64ead9387e3b4b1e790ad719d4374e349c1853ddbb5959a2890d9d6c94a5c28e4523fc3324deb6b1ed1aeb5e917f21b0e2516f6c SHA512 170ce083fa82bed13ecc62d85cb882fdd6491ae721e1633d3c1a5d3cee69422153afcf6695765c0e8fc7035440d0370d34afac9e978cb27f7506c07cba300e1e
+DIST unicode-normalization-0.1.12.crate 91057 BLAKE2B d5b8354990e1911e093d63d9b3b3adeacb38142ac68637fbfe59c0822f34c743e348cae9f535421c12cc6a56db2112dd5ec75f96c173b1f34a68db66c8ad8dd7 SHA512 0e095a59ff965499a5d2c79bfd4826b793103bebb4d2666c09e675110a50f79d985eb29565e4c40bd8fddc30237f874324d8a24786ead697ee0698ef8f79a1b6
 DIST unicode-normalization-0.1.8.crate 71158 BLAKE2B c548a2bc537abc6d86bffb0828a366ff82b143dcb0ee01e2c21b3b7134fd5f818f3775db391d358f4ebcb906ff256e3d2228ab042066a3de9a6747be05b8effa SHA512 4e3245689d6162a21cedb42e07b179e3aad03728a37b005c2e6bff644a6efd06b6bd26a20a255861a01441a9d15c4318575db3016248b96a03436212aa414547
+DIST unicode-segmentation-1.6.0.crate 90703 BLAKE2B b7d63bb8b62cabc604084957aaff021df24a1291f0ebdcddc424cceefe10ad399ed53152211c3e7557e39e21255166f922256f9f8e1fb488d3bae368b49a378e SHA512 80c6f92d9b39602a05809dc63a7cb05a305441689b6056801097a882a36c9795aabd660f884f707daa7e7fe6ad4983f6e245c226962cc982dbfeea2ddfddf41e
 DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
+DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
 DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
+DIST url-1.7.2.crate 68597 BLAKE2B d8d7a4b05e956a956c745dbb536ff94abbe81af22e53af3d7baccf01ed7e556cc4f1f8e0a0d97c258c1f1a23209e1ae494079948de9f0d402901c0b6cdafc373 SHA512 c53d7c397416cb1f3c9f7654a8a0653f350c28d41880859f29f681cd6269848890c1396b7ccdf571ec84212a8f3959138f47193ac0595a97bf98972b58e1ed04
 DIST url-2.1.0.crate 64776 BLAKE2B aefc8cd2be90818c757312c354a0bd39ae08a52fb7d5a2a4552ffac3488a4bbc60c3f502ea5cd861aefbab02b0748e4bf35c49592b8fba4377cc17207c666d0c SHA512 1736f512039771b4a365df84937f039e1a0a3c90b827614af47403934ccc4af60077ae13ab585bfb1dc5bd88222edfc890b4ac2ab31872adca2e31bdf5ae45c3
+DIST url-2.1.1.crate 70383 BLAKE2B c4096cb1bd50e9ca97fcdae0ee8b58957e21507607eafa8d84ff71c3df1ba52c68299609776f7baa45c93b971f8b61162fd8afd4174a5c7b66f36dc673707fa0 SHA512 a16c3a625fa85be9305f8150d5711c3e3aaa1f33753e7ecb8368b176cf3ea96f51fde74598c8ea3a5db2effc338589fd2834b297a1fba4bed967fa39e670fabb
 DIST vcpkg-0.2.7.crate 11012 BLAKE2B 3d97c24c3ddafc4c5c56d54e682c828782d6900a10caa48552892c174e897c6b92d0477a2515df889c25297e43dc57538684cd761b8ff9f6855f6a6b748f4446 SHA512 d298d8a3de58138a4be622b3038949d29e92b83941765fc3e25539a3779451cb9deadceda9bdf46186700c01eb65bb1b5c03e3b3cf7a5fe1c48c06e1b1591a1b
+DIST vcpkg-0.2.8.crate 11209 BLAKE2B e393dfbaabf1e47bc74fd89dc05e09f2dd9fd8b965a84f638edafcb2f5cf062005224d0c1b229394b40a3ecdf0fb34bfb3bf2c62a5d5b1016663e02d08bbcc8c SHA512 a239e969a02c8d8670178cc2be654bd12d6e6bb18be9eb70ec547212289fd2ef98859e6b3592aa6fbaf3178e0f2c27e2c8598d82990077a74896e739ae1374b9
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
+DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
 DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
+DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
+DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
 DIST which-2.0.1.crate 6953 BLAKE2B 866b1ff726cdefd9b3c201ac5e0649b7b6ea1a8ce42ea26ef5afa3f557326d327728fdb50fb4955476934b0623d3cb2bdab7c57f2c0063d2dae6a7e88748fe27 SHA512 30fffa533f50031b1f0d8cf5b1d7648ee3f0f1dd3e498ab1712fc272983ed415a30198222196cd87c8c0a2a6d342a6927cdf79191f0d81a8390b054169d98a76
 DIST wild-2.0.2.crate 7714 BLAKE2B c55c016fd6e784492d419c11f43eeff1ca7ea6e5598770188a56db1fbd6c8732769041abc36f76ad720dd9a3780806bec943e74333b4f8f36dd9b9f6a3d94a9b SHA512 31f9169b77127c1fb20dcb29cd6b0eeeaa5654086d65db2eae5ffe744e3ffec8de98927caea21f699ec79a1f040d6891070ef7f2e99aba5fee79c13e77ca9f80
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
@@ -135,9 +236,11 @@ DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
+DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.2.crate 4821 BLAKE2B 14fec69f86d72f6664f7ada8dfa34cbb603f5ebd0de098db69c0bd0d193f49b4bb2ebdec40a962a44e9111f656f62d9d67135ae94147ada48440dd8cd7e615ee SHA512 b902c8985b3e341cd4728fa597528740bb3d95bdd3cdc4fd70867a41ab4d95cb64c4f20efa9a9a911c1905ac9e0adb4fadd13c126ae6a808caaafa23f47d7f10
 DIST xml-rs-0.8.0.crate 50974 BLAKE2B 47f5c663e0982b0ca6caa7aceb7029f2bdff948395ffe07da50fe021d7014ecee7c1d45ea9bf370da8ddbbac637bdbf39b9b829769041406958f069ce884e5e2 SHA512 94f0bc729d58564d63b4708518313e3dc7fe7c6ff9ac94019df1507d7ce7bd6428f2bc16fb116a9d676415a94812ce1e54e30b469a2a9b5fe29dc82486c536cd
 DIST yaml-rust-0.4.3.crate 45768 BLAKE2B 6af7374439000dc5e8795b26fccb1bc691040846f844e10765fe5df06237f5cf52752b0f9d25ed7c6f62337f628ee7be2e024f8aeb6b55a7c76f0d3b2ad0489c SHA512 31b0236fe041706befa938cdeb9c74940daccd2f80bdbd4e0e890901c868ecffc39367a41914c8bb98373d1002904f18b18ff13a08bbecd19dec634c08b7a7a3
 EBUILD bat-0.12.1-r1.ebuild 3217 BLAKE2B 5add9f62c1b0b4944bfc328f2714587e90f7ce72ba3790f5afaf39316ae4485af58d2aed4856909488fe59eb75fb13ec7b20c2097a0f063c217d62696bd5b022 SHA512 53c5266366e49971d526fb7138dc83151760a39f710d16a129c4a178f91f3a86d28ac1e3240b06908d933d1aa15de6fb9fd9f4c808323c98b8b78fff8697fa10
+EBUILD bat-0.13.0.ebuild 3960 BLAKE2B 1c13e4512ed2beced35d9a988565a879b9925142035d16fc0096a0ad19f1d2a97897d52118281119d6c05c3e1bc795fa428cec838199b984845a505b0988108a SHA512 8757dfd0dea76f70fd72ea192fbb7c9d00b72f2a6d347c635aa315f1df11f1663d5d6c387ae9f03180903a44fb628d0cd29a5be1a0333643097c412399eafd02
 MISC metadata.xml 709 BLAKE2B 5d8265e6f27b8b650024dd6298773ef8b3afaa63b5f210467bff6b35df4b14112fc5b144d73d5074e97d47200c4cc03d6048359f9df4110a18a75d841083c6bd SHA512 779c6d9b6cc09f8f6d06bc256f83aff716ac4638d0ee0be84420b6ea52bb6fae7bec0dd4e672cacbec4d27a537c27c1dcd6d6a49c44be0670c45dc75ca97c0b3
diff --git a/sys-apps/bat/bat-0.13.0.ebuild b/sys-apps/bat/bat-0.13.0.ebuild
new file mode 100644
index 000000000000..7287fe876c75
--- /dev/null
+++ b/sys-apps/bat/bat-0.13.0.ebuild
@@ -0,0 +1,216 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler32-1.0.4
+aho-corasick-0.7.10
+ansi_colours-1.0.1
+ansi_term-0.11.0
+ansi_term-0.12.1
+anymap-0.12.1
+arrayref-0.3.6
+arrayvec-0.5.1
+assert_cmd-0.12.0
+atty-0.2.14
+autocfg-1.0.0
+backtrace-0.3.45
+backtrace-sys-0.1.34
+base64-0.10.1
+base64-0.11.0
+bat-0.13.0
+bincode-1.2.1
+bindgen-0.50.1
+bitflags-1.2.1
+blake2b_simd-0.5.10
+block-buffer-0.7.3
+block-padding-0.1.5
+bstr-0.2.12
+byte-tools-0.3.1
+byteorder-1.3.4
+cc-1.0.50
+cexpr-0.3.6
+cfg-if-0.1.10
+chrono-0.4.11
+clang-sys-0.28.1
+clap-2.33.0
+clicolors-control-1.0.1
+console-0.10.0
+constant_time_eq-0.1.5
+content_inspector-0.2.4
+crc32fast-1.2.0
+crossbeam-utils-0.7.2
+deunicode-1.1.0
+difference-2.0.0
+digest-0.8.1
+dirs-2.0.2
+dirs-sys-0.3.4
+doc-comment-0.3.3
+either-1.5.3
+encode_unicode-0.3.6
+encoding-0.2.33
+encoding-index-japanese-1.20141219.5
+encoding-index-korean-1.20141219.5
+encoding-index-simpchinese-1.20141219.5
+encoding-index-singlebyte-1.20141219.5
+encoding-index-tradchinese-1.20141219.5
+encoding_index_tests-0.1.4
+env_logger-0.6.2
+error-chain-0.12.2
+escargot-0.5.0
+failure-0.1.7
+fake-simd-0.1.2
+flate2-1.0.14
+fnv-1.0.6
+fuchsia-cprng-0.1.1
+fxhash-0.2.1
+generic-array-0.12.3
+getrandom-0.1.14
+git2-0.13.0
+glob-0.3.0
+globset-0.4.5
+hermit-abi-0.1.8
+humantime-1.3.0
+idna-0.1.5
+idna-0.2.0
+itertools-0.8.2
+itoa-0.4.5
+jobserver-0.1.21
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+lazycell-1.2.1
+libc-0.2.68
+libgit2-sys-0.12.0+0.99.0
+libloading-0.5.2
+libz-sys-1.0.25
+line-wrap-0.1.1
+linked-hash-map-0.5.2
+liquid-0.19.0
+liquid-compiler-0.19.0
+liquid-derive-0.19.0
+liquid-error-0.19.0
+liquid-interpreter-0.19.0
+liquid-value-0.19.1
+log-0.4.8
+maplit-1.0.2
+matches-0.1.8
+memchr-2.3.3
+miniz_oxide-0.3.6
+nom-4.2.3
+num-integer-0.1.42
+num-traits-0.2.11
+onig-5.0.0
+onig_sys-69.2.0
+opaque-debug-0.2.3
+peeking_take_while-0.1.2
+percent-encoding-1.0.1
+percent-encoding-2.1.0
+pest-2.1.3
+pest_derive-2.1.0
+pest_generator-2.1.3
+pest_meta-2.1.3
+pkg-config-0.3.17
+plist-0.4.2
+predicates-1.0.4
+predicates-core-1.0.0
+predicates-tree-1.0.0
+proc-macro-hack-0.5.14
+proc-macro2-0.4.30
+proc-macro2-1.0.9
+proc-quote-0.2.2
+proc-quote-impl-0.2.2
+quick-error-1.2.3
+quote-0.6.13
+quote-1.0.3
+rand-0.4.6
+rand_core-0.3.1
+rand_core-0.4.2
+rdrand-0.4.0
+redox_syscall-0.1.56
+redox_users-0.3.4
+regex-1.3.5
+regex-syntax-0.6.17
+remove_dir_all-0.5.2
+rust-argon2-0.7.0
+rustc-demangle-0.1.16
+ryu-1.0.3
+safemem-0.3.3
+same-file-1.0.6
+serde-1.0.105
+serde_derive-1.0.105
+serde_json-1.0.48
+sha-1-0.8.2
+shell-words-0.1.0
+shlex-0.1.1
+smallvec-1.2.0
+strsim-0.8.0
+syn-0.15.44
+syn-1.0.17
+syntect-3.3.0
+tempdir-0.3.7
+term_size-0.3.1
+termcolor-1.1.0
+termios-0.3.1
+textwrap-0.11.0
+thread_local-1.0.1
+time-0.1.42
+treeline-0.1.0
+typenum-1.11.2
+ucd-trie-0.1.3
+unicode-bidi-0.3.4
+unicode-normalization-0.1.12
+unicode-segmentation-1.6.0
+unicode-width-0.1.7
+unicode-xid-0.1.0
+unicode-xid-0.2.0
+url-1.7.2
+url-2.1.1
+vcpkg-0.2.8
+vec_map-0.8.1
+version_check-0.1.5
+version_check-0.9.1
+walkdir-2.3.1
+wasi-0.9.0+wasi-snapshot-preview1
+which-2.0.1
+wild-2.0.2
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.3
+winapi-x86_64-pc-windows-gnu-0.4.0
+xml-rs-0.8.0
+yaml-rust-0.4.3
+"
+
+inherit cargo
+
+DESCRIPTION="cat(1) clone with syntax highlighting and Git integration"
+HOMEPAGE="https://github.com/sharkdp/bat"
+SRC_URI="$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 CC0-1.0 ISC LGPL-3+ MIT Apache-2.0 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+
+DEPEND="sys-libs/zlib"
+
+# >app-backup/bacula-9.2[qt5] has file collisions, #686118
+RDEPEND="${DEPEND}
+	!>app-backup/bacula-9.2[qt5]
+"
+
+BDEPEND="sys-devel/clang"
+
+DOCS=( README.md doc/alternatives.md )
+
+QA_FLAGS_IGNORED="/usr/bin/bat"
+
+src_install() {
+	cargo_src_install
+	doman target/release/build/bat-*/out/assets/manual/bat.1
+	einstalldocs
+	insinto /usr/share/fish/vendor_completions.d/
+	doins target/release/build/bat-*/out/assets/completions/bat.fish
+}
diff --git a/sys-apps/bleachbit/Manifest b/sys-apps/bleachbit/Manifest
index 37ff142bcf0e..504620b5332b 100644
--- a/sys-apps/bleachbit/Manifest
+++ b/sys-apps/bleachbit/Manifest
@@ -1,3 +1,5 @@
 DIST bleachbit-3.0.tar.bz2 562646 BLAKE2B 4acdd5469ac1b36ff149231ad0b1b2e4e85a54a81c24c7751ceeed569526b905c1cc6be5201c4fb6929eb48e0553f0b27016de2584ee2f702492cc3fe659c2f9 SHA512 0d61f0b183c0d453275913741020c54c2915be9df45be706203e2278b125f4a02c75865117a7a2d587a034caa9bf109b2f498a4d522cc103c3879cc4a5d4854d
+DIST bleachbit-3.9.0.tar.bz2 578754 BLAKE2B cafce09ccc45e2a1b058730597571f4ef94672376e067b2b8f5fb6df674bac48ee7ad40cb52165b38afee0513e8b687f46d27264c562f863fe29d80d08093264 SHA512 bb93825b8dffdb62058315683fc3d3c77e0b0aa9adc2901be73abeae07667e15b91a4266c6ca7cecdfcf10cef8c179d8796b39dd76866ccddc0cd50e5e097bdc
 EBUILD bleachbit-3.0.ebuild 1188 BLAKE2B 80de495f6744ef7fe7f4003e095b5bc42909dc4e415702f95d49ebdec3296e8d3fe3238ae521938875e49f1bc2e3fcef0a39c1226a95ecffff0664c7c57ceb1c SHA512 d3dc01d9679e378cc4c4e4b4b782be0a367b67a19a6dc130944bdadcb6995a9244cf7eed9d180b7a9e9f32ab32996bc6f3a8326c22e5886431e9a22824aed846
+EBUILD bleachbit-3.9.0.ebuild 1603 BLAKE2B eb568731d44c72f9260519f4073ce63a9acd7c58c20abdf21f0ef3197e93f4cd756042fe579ee8320673277d8f283d2dfb9b716f794efcf059bb6c324bc0a8a2 SHA512 994911f4ecad0a24d686ba5208f5f8bebd0c4f471a0880ed04c781abfcc879e79e5d91faffbdd4fc0f10a918a873c1fee88d27ca62a561095929bcaffcbeeb58
 MISC metadata.xml 526 BLAKE2B f55f30792d579d5fc57553b3aa8a8f97d450778a1813c53e82a0fea4cc01fe3039d249ed89c8097a973c1bd923390e3bd1b85ae1a1d2386ab3373a9baae08623 SHA512 d2179dee28e6bacaa540039b726eb5ab47b87abc73a5c86621de3230f3d6355d082e8189c9e167871fb8c15975815341ce02bbef80195b984728c3b1b0652bf1
diff --git a/sys-apps/bleachbit/bleachbit-3.9.0.ebuild b/sys-apps/bleachbit/bleachbit-3.9.0.ebuild
new file mode 100644
index 000000000000..b5898e187fe2
--- /dev/null
+++ b/sys-apps/bleachbit/bleachbit-3.9.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_REQ_USE="sqlite(+)"
+
+inherit desktop distutils-r1 virtualx
+
+DESCRIPTION="Clean junk to free disk space and to maintain privacy"
+HOMEPAGE="https://www.bleachbit.org"
+SRC_URI="https://download.bleachbit.org/beta/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[$PYTHON_USEDEP]
+	dev-python/pygobject:3[$PYTHON_USEDEP]
+"
+BDEPEND="
+	sys-devel/gettext
+	test? ( dev-python/mock[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests unittest
+
+# tests fail under FEATURES=usersandbox
+RESTRICT="test"
+
+python_prepare_all() {
+	if use test; then
+		# avoid tests requiring internet access
+		rm tests/Test{Chaff,Update}.py || die
+
+		# fails due to non-existent $HOME/.profile
+		rm tests/TestInit.py || die
+
+		# permission error on $PORTAGE_TMPDIR
+		sed -e "s/test_encoding(self)/_&/" \
+			-i tests/TestCLI.py || die
+
+		# fails on upstream Travis CI as well as on Gentoo
+		sed -e "s/test_get_proc_swaps(self)/_&/" \
+			-i tests/TestMemory.py || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+	emake -C po local
+}
+
+python_install() {
+	distutils-r1_python_install
+	python_newscript ${PN}.py ${PN}
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	emake -C po DESTDIR="${D}" install
+
+	insinto /usr/share/bleachbit/cleaners
+	doins cleaners/*.xml
+
+	insinto /usr/share/bleachbit
+	doins data/app-menu.ui
+
+	doicon ${PN}.png
+	domenu org.${PN}.BleachBit.desktop
+}
+
+python_test() {
+	virtx emake tests
+}
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 277492b60302..6d91abbf1542 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -14,9 +14,7 @@ AUX syslogd.confd 234 BLAKE2B a1601c31dab14e5c2712f49133758479914bcf37e0d9704fe7
 AUX syslogd.initd 267 BLAKE2B 1daf252138bfb5904feb04dcc2127b8e8058d9d43652474e7594d60bb9adfbbb631eede30f375cf38370606c93d10e8fba05f50e88ede6709ee30b6ae6aec7a7 SHA512 856dd97ed46b08fdd13e497737f1eb192594e33bfc5d395d7ca6eed2e6bc212cf0cf33518b36a6f9a18d6962d462430c7b50c07e9dc08e85606ef68b240b1211
 AUX watchdog.confd 232 BLAKE2B 14ff3813297bc987e98bf3cabee2e7b150e23d8aa9f016303396569ffca3633b3e048497f85649c20d769233baa430a4cb54d2d5e5d63646db8113761960552d SHA512 8fd7121075535195f3e5d43ec773713c883fb7865cd5e5927b3b20c2605c50acb81d50461bd1a246c1282006ce74b11932ac1cec67ddc2be15da2f9aa8674232
 AUX watchdog.initd 219 BLAKE2B 3726fec4551962d6e20859c52e18582fbf127e2fc2807379afe9d490ad32b19a6d10d456155fdeb0468c67816f061b1cac166db7f104dbadadf0d175082efdb4 SHA512 d329fb72ce078a95a1fb77b72321dee56d19c76b45cb78a7a57a46d9fa385b982a114be49dd8696c2d4fc2b2dd90a17ee728ef2938172cc2f8b12b5a9ebd62f5
-DIST busybox-1.30.1.tar.bz2 7793781 BLAKE2B 429f6bd48cb6ede81f956d450cf05b799dce9dbd61593b6dd787f353c2de3734d576ddfec644fa5ab6c61895400c32e3cb28c939b06eaa33eef105c8f8f13d8f SHA512 c18b3d06356d4708b4b0e89d23500d2fe494da9f6aac09c0c19a2e5145ba2bfe8261088eae6562c900996b50c5a9c20459f908069267898c8f86fe3b0b7bd80b
 DIST busybox-1.31.1.tar.bz2 2430221 BLAKE2B 95c2345bc715eb7a1f08816a40add9b7a6176ef509a84069343ec2caddec58d8d57a07676ca2b03c209734169321433e27ba963b4c8b98dbfda4e409dcc347b4 SHA512 0d1197c25d963d7f95ef21e08c06c0d6124ac7b59c99989e891f744ffee4878a3b1fe44a247241a9da39fa5de0ba87f1b6d862401b591f277e66e89c02764bbf
-EBUILD busybox-1.30.1.ebuild 9430 BLAKE2B 2e2b46d85b2d303030a18a279e6ec7ac0b222fe3c7923713e0b7ca97dde640062383ba5e035d9cb019c99a70e6a1ca077c513edb68757ae8706c0258e44ccfcb SHA512 26855a1a31377a7a3cbdab2b376f8775fc114d24f17ff908123b7bc71daf3318973e5f5ec6572e9cf0048596574046448a03289fd7e9bdae37d3741aa470c257
-EBUILD busybox-1.31.1-r2.ebuild 9544 BLAKE2B 7f944890b532ab46bcab0c9e4e7078edfdf28609c65607372803118561b63359c37f5803e6f89649fe79f02d3bd88978e76ff3c2985bfc504e64204c27221065 SHA512 55487ac65ce9ad279d2a591768426ebaff7ab2c73095e6120bde729051f6bd886ebe4aa31fabb6c0d779d8243fdd9b410e7916f853e8839d7967272e344e0215
-EBUILD busybox-9999.ebuild 9442 BLAKE2B 2d0dcd797f9ae9284aa3ab381e1e3037ebc71731775178d41ad49ce06b2bac7206c3cd87f9a6ae830b0e48166e477781571f626febf14271f444d2744cca09b3 SHA512 934dc489157fb9677006834caebca79edc23b0af5241c1d5c16234717b2685b1f90e1046a7f57c0233e35c83e858ca55bddc4c87c1c0a6468c4a00217889d7f8
+EBUILD busybox-1.31.1-r2.ebuild 9530 BLAKE2B 02d2265672ff64f5afc8d44d002711d01672f7d4a599ecf044fa164497a404970f9515a3f0a473ff3f8a9932dd67697a54bf0b07333c79c7e95a6db44eb01349 SHA512 b733567889cd943463a37a82856bf715b43196ba9a89b3df3b4ebe6e3e0a6d885c90227185be190b24f7efef31fba643ca34ff346d8481dc87631099100916be
+EBUILD busybox-9999.ebuild 9438 BLAKE2B fdfb82402864e50f294dffc3b93f06d1fec142734918ccf9042d520098e803deb4c14095fbe4f6b2c536e8a3b58066ce217e78ff277adecd1535d90fb20713ca SHA512 b718d6272b43efa50d38064cffed0a284c4d70e351642da996ed759bbe4e9de1119b645c0adb1349782635661aa5bcb76f1f71ae85bbf52c9730a6967d4a28fd
 MISC metadata.xml 872 BLAKE2B e42037070f8473e11bcf693727c7f4649348afce6cd14aec53b2ebf5f683c32ceb3218d83e8efd3ec34f5c55ece4cc83b24725bc133669bd03825bbe2fd62396 SHA512 c0b3f8b9348553d8a4db25c1c51ef5a82bcd14a09251568c0709b392e2dea9bc35dced96377d11a32ad53ba09052603781caebf754428debf7acb0aaedafbf07
diff --git a/sys-apps/busybox/busybox-1.30.1.ebuild b/sys-apps/busybox/busybox-1.30.1.ebuild
deleted file mode 100644
index 8da9c3219826..000000000000
--- a/sys-apps/busybox/busybox-1.30.1.ebuild
+++ /dev/null
@@ -1,333 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# See `man savedconfig.eclass` for info on how to use USE=savedconfig.
-
-EAPI=6
-
-inherit flag-o-matic savedconfig toolchain-funcs
-
-DESCRIPTION="Utilities for rescue and embedded systems"
-HOMEPAGE="https://www.busybox.net/"
-if [[ ${PV} == "9999" ]] ; then
-	MY_P=${P}
-	EGIT_REPO_URI="https://git.busybox.net/busybox"
-	inherit git-r3
-else
-	MY_P=${PN}-${PV/_/-}
-	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="GPL-2" # GPL-2 only
-SLOT="0"
-IUSE="debug ipv6 livecd make-symlinks math mdev pam selinux sep-usr static syslog systemd"
-REQUIRED_USE="pam? ( !static )"
-RESTRICT="test"
-
-COMMON_DEPEND="!static? ( selinux? ( sys-libs/libselinux ) )
-	pam? ( sys-libs/pam )"
-DEPEND="${COMMON_DEPEND}
-	static? ( selinux? ( sys-libs/libselinux[static-libs(+)] ) )
-	>=sys-kernel/linux-headers-2.6.39"
-RDEPEND="${COMMON_DEPEND}
-	mdev? ( !<sys-apps/openrc-0.13 )"
-
-S=${WORKDIR}/${MY_P}
-
-busybox_config_option() {
-	local flag=$1 ; shift
-	if [[ ${flag} != [yn] && ${flag} != \"* ]] ; then
-		busybox_config_option $(usex ${flag} y n) "$@"
-		return
-	fi
-	local expr
-	while [[ $# -gt 0 ]] ; do
-		case ${flag} in
-		y) expr="s:.*\<CONFIG_$1\>.*set:CONFIG_$1=y:g" ;;
-		n) expr="s:CONFIG_$1=y:# CONFIG_$1 is not set:g" ;;
-		*) expr="s:.*\<CONFIG_$1\>.*:CONFIG_$1=${flag}:g" ;;
-		esac
-		sed -i -e "${expr}" .config || die
-		einfo "$(grep "CONFIG_$1[= ]" .config || echo "Could not find CONFIG_$1 ...")"
-		shift
-	done
-}
-
-busybox_config_enabled() {
-	local val=$(sed -n "/^CONFIG_$1=/s:^[^=]*=::p" .config)
-	case ${val} in
-	"") return 1 ;;
-	y)  return 0 ;;
-	*)  echo "${val}" | sed -r 's:^"(.*)"$:\1:' ;;
-	esac
-}
-
-# patches go here!
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.26.2-bb.patch
-	# "${FILESDIR}"/${P}-*.patch
-)
-
-src_prepare() {
-	default
-	unset KBUILD_OUTPUT #88088
-	append-flags -fno-strict-aliasing #310413
-	use ppc64 && append-flags -mminimal-toc #130943
-
-	cp "${FILESDIR}"/ginit.c init/ || die
-
-	# flag cleanup
-	sed -i -r \
-		-e 's:[[:space:]]?-(Werror|Os|falign-(functions|jumps|loops|labels)=1|fomit-frame-pointer)\>::g' \
-		Makefile.flags || die
-	#sed -i '/bbsh/s:^//::' include/applets.h
-	sed -i '/^#error Aborting compilation./d' applets/applets.c || die
-	use elibc_glibc && sed -i 's:-Wl,--gc-sections::' Makefile
-	sed -i \
-		-e "/^CROSS_COMPILE/s:=.*:= ${CHOST}-:" \
-		-e "/^AR\>/s:=.*:= $(tc-getAR):" \
-		-e "/^CC\>/s:=.*:= $(tc-getCC):" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^PKG_CONFIG\>/s:=.*:= $(tc-getPKG_CONFIG):" \
-		Makefile || die
-	sed -i \
-		-e 's:-static-libgcc::' \
-		Makefile.flags || die
-}
-
-src_configure() {
-	# check for a busybox config before making one of our own.
-	# if one exist lets return and use it.
-
-	restore_config .config
-	if [ -f .config ]; then
-		yes "" | emake -j1 -s oldconfig >/dev/null
-		return 0
-	else
-		ewarn "Could not locate user configfile, so we will save a default one"
-	fi
-
-	# setup the config file
-	emake -j1 -s allyesconfig >/dev/null
-	# nommu forces a bunch of things off which we want on #387555
-	busybox_config_option n NOMMU
-	sed -i '/^#/d' .config
-	yes "" | emake -j1 -s oldconfig >/dev/null
-
-	# now turn off stuff we really don't want
-	busybox_config_option n DMALLOC
-	busybox_config_option n FEATURE_2_4_MODULES #607548
-	busybox_config_option n FEATURE_SUID_CONFIG
-	busybox_config_option n BUILD_AT_ONCE
-	busybox_config_option n BUILD_LIBBUSYBOX
-	busybox_config_option n FEATURE_CLEAN_UP
-	busybox_config_option n MONOTONIC_SYSCALL
-	busybox_config_option n USE_PORTABLE_CODE
-	busybox_config_option n WERROR
-	# triming the BSS size may be dangerous
-	busybox_config_option n FEATURE_USE_BSS_TAIL
-
-	# These cause trouble with musl.
-	if use elibc_musl; then
-		busybox_config_option n FEATURE_UTMP
-		busybox_config_option n EXTRA_COMPAT
-		busybox_config_option n FEATURE_VI_REGEX_SEARCH
-	fi
-
-	# If these are not set and we are using a uclibc/busybox setup
-	# all calls to system() will fail.
-	busybox_config_option y ASH
-	busybox_config_option y SH_IS_ASH
-	busybox_config_option n HUSH
-	busybox_config_option n SH_IS_HUSH
-
-	busybox_config_option '"/run"' PID_FILE_PATH
-	busybox_config_option '"/run/ifstate"' IFUPDOWN_IFSTATE_PATH
-
-	# disable ipv6 applets
-	if ! use ipv6; then
-		busybox_config_option n FEATURE_IPV6
-		busybox_config_option n TRACEROUTE6
-		busybox_config_option n PING6
-		busybox_config_option n UDHCPC6
-	fi
-
-	busybox_config_option pam PAM
-	busybox_config_option static STATIC
-	busybox_config_option syslog {K,SYS}LOGD LOGGER
-	busybox_config_option systemd FEATURE_SYSTEMD
-	busybox_config_option math FEATURE_AWK_LIBM
-
-	# disable features that uClibc doesn't (yet?) provide.
-	if use elibc_uclibc; then
-		busybox_config_option n FEATURE_SYNC_FANCY #567598
-		busybox_config_option n NSENTER
-	fi
-
-	# all the debug options are compiler related, so punt them
-	busybox_config_option n DEBUG_SANITIZE
-	busybox_config_option n DEBUG
-	busybox_config_option y NO_DEBUG_LIB
-	busybox_config_option n DMALLOC
-	busybox_config_option n EFENCE
-	busybox_config_option $(usex debug y n) TFTP_DEBUG
-
-	busybox_config_option selinux SELINUX
-
-	# this opt only controls mounting with <linux-2.6.23
-	busybox_config_option n FEATURE_MOUNT_NFS
-
-	# glibc-2.26 and later does not ship RPC implientation
-	busybox_config_option n FEATURE_HAVE_RPC
-	busybox_config_option n FEATURE_INETD_RPC
-
-	# default a bunch of uncommon options to off
-	local opt
-	for opt in \
-		ADD_SHELL \
-		BEEP BOOTCHARTD \
-		CRONTAB \
-		DC DEVFSD DNSD DPKG{,_DEB} \
-		FAKEIDENTD FBSPLASH FOLD FSCK_MINIX FTP{GET,PUT} \
-		FEATURE_DEVFS \
-		HOSTID HUSH \
-		INETD INOTIFYD IPCALC \
-		LOCALE_SUPPORT LOGNAME LPD \
-		MAKEMIME MKFS_MINIX MSH \
-		OD \
-		RDEV READPROFILE REFORMIME REMOVE_SHELL RFKILL RUN_PARTS RUNSV{,DIR} \
-		SLATTACH SMEMCAP SULOGIN SV{,LOGD} \
-		TASKSET TCPSVD \
-		RPM RPM2CPIO \
-		UDPSVD UUDECODE UUENCODE
-	do
-		busybox_config_option n ${opt}
-	done
-
-	emake -j1 oldconfig > /dev/null
-}
-
-src_compile() {
-	unset KBUILD_OUTPUT #88088
-	export SKIP_STRIP=y
-
-	emake V=1 busybox
-}
-
-src_install() {
-	unset KBUILD_OUTPUT #88088
-	save_config .config
-
-	into /
-	dodir /bin
-	if use sep-usr ; then
-		# install /ginit to take care of mounting stuff
-		exeinto /
-		newexe busybox_unstripped ginit
-		dosym /ginit /bin/bb
-		dosym bb /bin/busybox
-	else
-		newbin busybox_unstripped busybox
-		dosym busybox /bin/bb
-	fi
-	if use mdev ; then
-		dodir /$(get_libdir)/mdev/
-		use make-symlinks || dosym /bin/bb /sbin/mdev
-		cp "${S}"/examples/mdev_fat.conf "${ED}"/etc/mdev.conf
-
-		exeinto /$(get_libdir)/mdev/
-		doexe "${FILESDIR}"/mdev/*
-
-		newinitd "${FILESDIR}"/mdev.initd mdev
-	fi
-	if use livecd ; then
-		dosym busybox /bin/vi
-	fi
-
-	# add busybox daemon's, bug #444718
-	if busybox_config_enabled FEATURE_NTPD_SERVER; then
-		newconfd "${FILESDIR}/ntpd.confd" "busybox-ntpd"
-		newinitd "${FILESDIR}/ntpd.initd" "busybox-ntpd"
-	fi
-	if busybox_config_enabled SYSLOGD; then
-		newconfd "${FILESDIR}/syslogd.confd" "busybox-syslogd"
-		newinitd "${FILESDIR}/syslogd.initd" "busybox-syslogd"
-	fi
-	if busybox_config_enabled KLOGD; then
-		newconfd "${FILESDIR}/klogd.confd" "busybox-klogd"
-		newinitd "${FILESDIR}/klogd.initd" "busybox-klogd"
-	fi
-	if busybox_config_enabled WATCHDOG; then
-		newconfd "${FILESDIR}/watchdog.confd" "busybox-watchdog"
-		newinitd "${FILESDIR}/watchdog.initd" "busybox-watchdog"
-	fi
-	if busybox_config_enabled UDHCPC; then
-		local path=$(busybox_config_enabled UDHCPC_DEFAULT_SCRIPT)
-		exeinto "${path%/*}"
-		newexe examples/udhcp/simple.script "${path##*/}"
-	fi
-	if busybox_config_enabled UDHCPD; then
-		insinto /etc
-		doins examples/udhcp/udhcpd.conf
-	fi
-
-	# bundle up the symlink files for use later
-	emake DESTDIR="${ED}" install
-	rm _install/bin/busybox
-	# for compatibility, provide /usr/bin/env
-	mkdir -p _install/usr/bin
-	ln -s /bin/env _install/usr/bin/env
-	tar cf busybox-links.tar -C _install . || : #;die
-	insinto /usr/share/${PN}
-	use make-symlinks && doins busybox-links.tar
-
-	dodoc AUTHORS README TODO
-
-	cd docs
-	docinto txt
-	dodoc *.txt
-	docinto pod
-	dodoc *.pod
-	docinto html
-	dodoc *.html
-
-	cd ../examples
-	docinto examples
-	dodoc inittab depmod.pl *.conf *.script undeb unrpm
-}
-
-pkg_preinst() {
-	if use make-symlinks && [[ ! ${VERY_BRAVE_OR_VERY_DUMB} == "yes" ]] && [[ ${ROOT} == "/" ]] ; then
-		ewarn "setting USE=make-symlinks and emerging to / is very dangerous."
-		ewarn "it WILL overwrite lots of system programs like: ls bash awk grep (bug 60805 for full list)."
-		ewarn "If you are creating a binary only and not merging this is probably ok."
-		ewarn "set env VERY_BRAVE_OR_VERY_DUMB=yes if this is really what you want."
-		die "silly options will destroy your system"
-	fi
-
-	if use make-symlinks ; then
-		mv "${ED}"/usr/share/${PN}/busybox-links.tar "${T}"/ || die
-	fi
-}
-
-pkg_postinst() {
-	savedconfig_pkg_postinst
-
-	if use make-symlinks ; then
-		cd "${T}" || die
-		mkdir _install
-		tar xf busybox-links.tar -C _install || die
-		cp -vpPR _install/* "${ROOT}"/ || die "copying links for ${x} failed"
-	fi
-
-	if use sep-usr ; then
-		elog "In order to use the sep-usr support, you have to update your"
-		elog "kernel command line.  Add the option:"
-		elog "     init=/ginit"
-		elog "To launch a different init than /sbin/init, use:"
-		elog "     init=/ginit /sbin/yourinit"
-		elog "To get a rescue shell, you may boot with:"
-		elog "     init=/ginit bb"
-	fi
-}
diff --git a/sys-apps/busybox/busybox-1.31.1-r2.ebuild b/sys-apps/busybox/busybox-1.31.1-r2.ebuild
index 658d7e2576e8..14440fc05fa4 100644
--- a/sys-apps/busybox/busybox-1.31.1-r2.ebuild
+++ b/sys-apps/busybox/busybox-1.31.1-r2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/busybox/busybox-9999.ebuild b/sys-apps/busybox/busybox-9999.ebuild
index c15fa90610c7..bf29c9fb1d87 100644
--- a/sys-apps/busybox/busybox-9999.ebuild
+++ b/sys-apps/busybox/busybox-9999.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
 
 # See `man savedconfig.eclass` for info on how to use USE=savedconfig.
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P=${PN}-${PV/_/-}
 	SRC_URI="https://www.busybox.net/downloads/${MY_P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-2" # GPL-2 only
diff --git a/sys-apps/cciss_vol_status/Manifest b/sys-apps/cciss_vol_status/Manifest
index 7d1cdec9ceaa..83a801bc7799 100644
--- a/sys-apps/cciss_vol_status/Manifest
+++ b/sys-apps/cciss_vol_status/Manifest
@@ -1,5 +1,5 @@
 AUX cciss_vol_status.cron 646 BLAKE2B a35f73a527e21c62e9b1214d2b962f115f64cb0f385fec04eab60aaef6ccb16cd5d8dcdef32d8a93c11f35a45b8e2891c3946da40b406645e757763db90f5d5f SHA512 658004668f6d1914c1526e07113eaee9a24e8d1945ab378a27537e9fd421e5b39eeb5f56610d59bebcbc6d7b2addfce65fee697b6877d164775b696930591a56
 AUX cciss_vol_status.cron2 1611 BLAKE2B db62a46e933357537132405e862b96fe0d3a8fe9f078982e797be8897d09f2c6310abbd6de1472d8401ebeb33b7ec9cd3f13a060933539816d051115df52df42 SHA512 b0ca78c96dad516abe49be96a1ca0956a5dcc5f721bd5088422da9327a783e5483798f96d2f4eb9bd8484fd07c94e86305be7a88ba0b503f5771634b31a7ac68
 DIST cciss_vol_status-1.12.tar.gz 120346 BLAKE2B 8094f7b421c8c3f003f38cef380eb14c6778b750a62a5b8b94df955f87c0a77b1b7dfa9df16d6bb10f4955b6961b022b871fc39d143717b8024ec40fdb3b819f SHA512 f9fa8b98bd42810932f03f514b4b8c6cea690378f065a6c9788ddb78612c7ca2aa9a7fefa8a40634cfe247600fb6d3f11f0b687fba77d1423087a2b319773d69
-EBUILD cciss_vol_status-1.12.ebuild 555 BLAKE2B a3e2182d2c187caa1786e6f26552a4cd201a665cde8df998f262d370f8e4c763b766a16de8169b2f9f7a4ace13d666aa2645e54e92d15fa17a2b3198abdd937d SHA512 3140528e61bdee1aa6cf7b78f9d16936a0114d18e223cb607ffbd5161daef8742fd164318bbf82db6e67e88f9bfa5e3eec717e21ec38aa9993eb19398e7d3c63
+EBUILD cciss_vol_status-1.12.ebuild 556 BLAKE2B 8e7ba5a01040520ff8a22be5a8f12df84817fd00099976cd81de3ab3adc632f570a17d7ee0960d64876e0c706a842e630240ba03385bb03ba6ec4347ba558154 SHA512 f619ff586271493d57aae42c28874ae1dc7ad8262c18429ce42cb1966aaaa1f188706d6883b3c5d299a6ff7aa631826b356dfe6f53b21b64d61bde7dc2b391c8
 MISC metadata.xml 402 BLAKE2B e69409b303a34d9e6ac1f7ddf96eb9cda2a9d233adf718ec546f723714d78a0960ad4b43eb1945a56aba6af12b5934f0a45693b23a8914c491a67fb2f2c2eb00 SHA512 346a18ccc25fd45f14252b81a275cc1d3b18568d9a2b8404a7b80c53f05a36d8af0926ef50fca2b92b693d38deec31419f1a1d284a8f4b8506ea8f8cc149062d
diff --git a/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild b/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild
index 4aa99c221aa3..8c5f27b95379 100644
--- a/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild
+++ b/sys-apps/cciss_vol_status/cciss_vol_status-1.12.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Shows status of logical drives attached to HP SmartArray controller
 HOMEPAGE="http://cciss.sourceforge.net/#cciss_utils"
 LICENSE="GPL-2"
 SRC_URI="mirror://sourceforge/cciss/${P}.tar.gz"
-KEYWORDS="amd64 ia64 x86"
+KEYWORDS="amd64 ~ia64 x86"
 SLOT="0"
 RDEPEND=""
 DEPEND=""
diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest
index fc998ea9314e..1eb104fa4581 100644
--- a/sys-apps/collectl/Manifest
+++ b/sys-apps/collectl/Manifest
@@ -1,4 +1,4 @@
 AUX collectl.initd-2 348 BLAKE2B df64bad334058680e3b78469120f44d99d38eda84ce5eacf3cb0650d64674b1c0fd0a92efd8974f73fdbb1a706ce48d61b37417b75c1a8d59ca13685af8b1b4c SHA512 441c5c90baa194dead6c764317ca4e10f864e82c1ee1f0c0d99f301ecf0baf197349df13fc155ac8e42366c56d13478d6004d6648e1131deea3a002c5e89ab66
 DIST collectl-4.3.1.src.tar.gz 620693 BLAKE2B bcf8c41e0f6b51daa32fa9752dfd603230321718de190a8a9d71bf71e2c5f65e3b170bc85fbdcc78d2ab131bf5a5bfdfebf49225151ecf2cc444d2ca4ef0faaf SHA512 6f2df8a3da37f7ccb9d7f34a20e63b0601e5da7126bb3a9a11af7ee4959b682d59f44a1885bfb5882410e9de0191093ea4d5d43c8f2fa0f0904fd2ca4a3c5a90
-EBUILD collectl-4.3.1.ebuild 837 BLAKE2B cbdbd4405f27f831101b168801e187184fad40d0c6e89e1236b8cd89043234c094607934670f7336d1bd61a15f54d404e962d987bfb8ea78110c4ea6df51b6d5 SHA512 5a5e1fcce580a89f841c36a09a0597df77fc45a3f49b88e5b889bddd81bfef34328320703c60701adf5ea5e7821d61282775322b2d5dde2f42a345860d8d1732
+EBUILD collectl-4.3.1.ebuild 838 BLAKE2B a2bd226521ea75de4b9ff31e77f4de0970bf820906580922350e28988ea9836bf2ce0c50f41aa42cd0ca8fd1c409537c3dd893e3443c1a2a2c6de4c5a35e2769 SHA512 94feb59492482fae8f0117f41fb1aca70a8f2c0a6958d158fac5360ad28ab69e22ba45b8f77b5caf7ab49e94c79a3f4302c5a6643fef5a980cd366f62f7462bf
 MISC metadata.xml 328 BLAKE2B 88e0f5bbcfc780806551d88a862ff5c86b82f874f77f5c2f7e90fca7dc2c1b177f9c1c11174cb67b48ccf4cf3a3467ac61e56dc4e462cde9bca217ab071da363 SHA512 2eb88e764d55e93183e030d0e4e2e99a53d4e26855e234f47077e812e1108aaca4b44bb7af18f04cebf9b366a2a991e844234c0af9c719399f1c836b091b8622
diff --git a/sys-apps/collectl/collectl-4.3.1.ebuild b/sys-apps/collectl/collectl-4.3.1.ebuild
index 8bf4202ec52a..d9b81f3dd223 100644
--- a/sys-apps/collectl/collectl-4.3.1.ebuild
+++ b/sys-apps/collectl/collectl-4.3.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
 
 LICENSE="GPL-2 Artistic"
 SLOT="0"
-KEYWORDS="~alpha amd64 ia64 x86"
+KEYWORDS="~alpha amd64 ~ia64 x86"
 IUSE=""
 
 RDEPEND=">=dev-lang/perl-5.8.8
diff --git a/sys-apps/colorized-logs/Manifest b/sys-apps/colorized-logs/Manifest
index 6387fa1adfb7..b9948c78a156 100644
--- a/sys-apps/colorized-logs/Manifest
+++ b/sys-apps/colorized-logs/Manifest
@@ -1,5 +1,5 @@
 DIST colorized-logs-2.4.tar.gz 10918 BLAKE2B 767d635155ebb66e212888c8e61e2ab65be665497a84c8820aa8183a5d94d30c9f2b653c16131916a907cb369d3b88a004573ae9eeaa1fda954cee239fa6da05 SHA512 5ac5734409f06262ad470a87e215c305f805a5701a604f1fc744632a25e4a1b8dd9c878897f72ad434b71ebe300c6d676cd53760a34f48b8202a62c765dcbe3f
 DIST colorized-logs-2.5.tar.gz 12331 BLAKE2B 79ee9d5a7d2e683ebba044a8b75666fe5824a087be3b41e9e1c4bb3b52d1d2a57b6dd5f3cc64a48fa6705b9074daa6cfaec61a730223bc3deb21835033fc3adb SHA512 a4849db1124bbf65a54285a121aa723a44b7270498858d0ac5f50892d3d8eb38c8109c3bb457cdf6ffe336e77703ba454217047ed819a0d61f415c5b8882cc28
-EBUILD colorized-logs-2.4.ebuild 651 BLAKE2B 4d089afa28f4db7169f37e9cfd82bb275ef88939ef83d68d2e1448c16d3319701219af3e60d137279aac1b76bc8b5755e00cbd7fa27c536729cdbcb03a26812f SHA512 88c9b0cd17393496e6f735fbb228e8c44643ab7c3949b969fbef06cd52955ab0e9969a5f26e995e3fb11bf9731392feb071230c5f199f878b269d9fa6dc34200
-EBUILD colorized-logs-2.5.ebuild 653 BLAKE2B d3a019cfd33ccad41e76dd96d4581853a1d9320340c71231ce8e645ec08372cb98c6824b8732eb3be1fa263a840a836e8fad7460628c935dd2fc822a0d10eb09 SHA512 1d0d4d72928311208ddb3bd8887d0938ff5ad0744f552cfa55bb0f8bbe33f62af8291e86eba0f5ea6d60d12f8f921f62906af52014e0d7c994a5fbbd606effae
+EBUILD colorized-logs-2.4.ebuild 658 BLAKE2B e815db4c00a458000eb7a9ecd3e02c67965d543a6bf0085d822fc1ad28427c10f090fa86a74e54ad747a636bd790d960fa3866f3f535102f354f86a0982590a9 SHA512 4d53be42d675a20bde974f630c342b47c718132cbfba6bebff8123c0d1faaeb0a25566c4e83c670daf6ce6a4c784fae4fba9f1e2b72ffe861f7bf5a51736936e
+EBUILD colorized-logs-2.5.ebuild 660 BLAKE2B 01f12e3c49b1a6ae9988b548ac9ded3f07b4c87ccda98ae2e318ed77d029e3ce370193f43ae30436a79539bde1bf374369d605879f00f7c5915e8d0ba303889f SHA512 512b334f3fb757fb529990c9588ee51c8bdc1173e883a02ed753da3bd1ade8a7b7ad85e7fd635f95c9bd7ec9729f5b93fc0c31b631a58983ebe70f943a45ceb8
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/sys-apps/colorized-logs/colorized-logs-2.4.ebuild b/sys-apps/colorized-logs/colorized-logs-2.4.ebuild
index b80be8cc806c..c21dd88d5a8a 100644
--- a/sys-apps/colorized-logs/colorized-logs-2.4.ebuild
+++ b/sys-apps/colorized-logs/colorized-logs-2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/colorized-logs/colorized-logs-2.5.ebuild b/sys-apps/colorized-logs/colorized-logs-2.5.ebuild
index 36e9589ea6be..7ad619ed52bc 100644
--- a/sys-apps/colorized-logs/colorized-logs-2.5.ebuild
+++ b/sys-apps/colorized-logs/colorized-logs-2.5.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index 325f6e62a82d..ba227e8f9ded 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -1,7 +1,10 @@
+AUX coreutils-8.32-ls-restore-8.31-behavior.patch 2824 BLAKE2B 7df44f4e330225a429678b3d5f20736d7c5c4f7d09f51f71d7e1111c3181d494aa12796c823244473063f7905aef35b74703860343c5e30f38520ee340690ede SHA512 6d55806aa16e0f654b15bfefb20f2c16193c7e9fcf7c087309b3254272d20467dea69ac53fff345b510751e165c33197c3053b7308578f79492afba0a1eeb6e5
 DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125eebef92217469a9490808719fa0665f5e5c0adb96fbd02c4bac4d280d1502295669575790a81dbc01afe2ca3a9d384cbefb0 SHA512 b1e1933637de4581d5f8c6ede4e80a012435d13f0cf5550a76ab5bbe9441e3c15ce19ef3f78a7ea3b8368d5e9a3bb17c1207c471d26171b59786f38adeba0454
 DIST coreutils-8.30.tar.xz 5359532 BLAKE2B b66ccd112a6c2c8b90e58ff1c3371e7f5827937035769329885e5bdae197466189f3715720b8f8cf0b5047fe16d6c86984dcee994117c2d3c7b8dbd597027255 SHA512 25bc132c0d89ce71c33e417f04649c9fcfce6c5ef8b19f093b2e9e2851bfde9b5a31e20499d9c427332228ba54b88d445ddb445551e1944bb8f5cbff5ffa4eda
 DIST coreutils-8.31.tar.xz 5410140 BLAKE2B e3ae6be8edbe9df9164b4c9ac8bf14dc23b147fa665f20669e18ac4c6e45ba839dc0dc99e05670eb006d22133475a4a717a5f40b00ebaedfd6e1fbab887674d5 SHA512 ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af
-EBUILD coreutils-8.30.ebuild 6249 BLAKE2B 3677e01cbf708355f2541ee61a996d7cfe40eda012b2dce2d2e11f6a5ad7d7ab3f51dad599a3a1a7c52c24908b7cbb3b9b7224f8b7666bb885f0b5aa89230941 SHA512 25bf004085f0e1fa64a5445fe4325bd95ecf5ed803e1b1a76a612c55aab332c056195b718256b567576552216f3228da86851efd4afb9ebdc9baeb5ce55c682c
-EBUILD coreutils-8.31-r1.ebuild 5797 BLAKE2B b6b9766aa8e3322d7cfda9735fbbf0ac721e14f05baabae8485c3eecdf4b91a83fe5da948e29bdffb95b074cca3280d94f521ec5af4a3cff4de51f157b425f1a SHA512 b2e92fc8e6f6584cddf66b87386ab659a5fd8c5f214eddfe4fef8b2151d120be9d5efefcd4f05b1322fafd89e7aee8b2447c8ff61f32f87a241839941fd0f591
-EBUILD coreutils-8.31.ebuild 6266 BLAKE2B 4120a189f397e054dd8903a5d4a8afe1631ad684ea1593ee59df956a1bb1145614ab98085a63b540ce81c89fda83769f4e9f3bc70160ad634f0e9000481f2be4 SHA512 df9e520ed5d78925b798886bd59a58f760bbfd5c34fe35acb7a330f888d4d4fdab261366db6885d0703777653646ab0f736951a13c6d67ddff4cd67c2a3ba2fb
+DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
+EBUILD coreutils-8.30.ebuild 6247 BLAKE2B 843058c21cf4012ffd643c596e4c7d7aec9a524f73bee3a0d0c7e7b4f43a0fa2cca1d8565e55ab894f3990195fef886399cfe2c22a9cc7d50f6e90f502e0d9b5 SHA512 0374c472ebd5b02fb6a3c3f0929f6526d4ab5f531fcd74c7c9e988b55f89059393ed414b9a46a9dba9233ace497b2d3d029e150f6c1d885c6faba25db4a48157
+EBUILD coreutils-8.31-r1.ebuild 5629 BLAKE2B 97ef23bfc240eb7b046e68f1473cad314364c94ad598638e0d3e4295d9b3445a36212a731d82564fb5064be4b98a329dfc34c6a6fa7fad5a8110bf2401a06b18 SHA512 2fc66a6e9a5755906ba9947879a3fdc759152c5bc89d8ba4ebabd115b20a168056005e8e81e314aaf4c6524b0b752ce93f72a1477c966d0d3b9e355ee41c3ccb
+EBUILD coreutils-8.31.ebuild 6262 BLAKE2B b6cd1194c4df9fe6bbd013528dc961cc050adaa934b2aa4b86abe66cffcfce2994c78edb9b7b23f73790451a4c868e2cb895fa4442f5a1ea898e26d4e3ef2bd7 SHA512 e7b17c3bebf2e28dfb9c84a820d8eb7996f7662768dfcf8b4615fef54ba38691e56925c09da33a40eb480bf91519a23fd432310041d9c3b3635aacde7a5feed2
+EBUILD coreutils-8.32-r1.ebuild 5746 BLAKE2B b73104e81ecae8458931e4f70ee763b7012a2ca02572378519ea10b2ebcdc6080ad8949b982747619862a2fa70a05794de28d91bfe6aedcf66d46dffacdae60a SHA512 afda0c6207324dddbe3d296dc9f9d41d66ecf929d2e4d6b2b340330315a9da80fcf3da147518f4362c36075ee66aeb3af052cb9c924dc663c0541e8bedf051e0
 MISC metadata.xml 958 BLAKE2B f66e780b413255fcde84ab0114e0be6d285963be305cf67bf170243d491e2677dae0e6d33eee5660dfcd6672b55cae383651f878feceffea5085aab31c83b7b6 SHA512 3e4c60dc34a3b6a74392e45bee5a075126728ccc278d61985124780f24b387ef75934c0c0bb4f647e96916d289a5f0c3eccd5411546758c67d703638af87c044
diff --git a/sys-apps/coreutils/coreutils-8.30.ebuild b/sys-apps/coreutils/coreutils-8.30.ebuild
index 99156b6acf85..5c61329ef93c 100644
--- a/sys-apps/coreutils/coreutils-8.30.ebuild
+++ b/sys-apps/coreutils/coreutils-8.30.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/coreutils/coreutils-8.31-r1.ebuild b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
index 60949e9d236e..48911f369827 100644
--- a/sys-apps/coreutils/coreutils-8.31-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
 RESTRICT="!test? ( test )"
 
@@ -35,7 +35,6 @@ DEPEND="${RDEPEND}
 		dev-perl/Expect
 		dev-util/strace
 		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/pyinotify[${PYTHON_USEDEP}]')
 	)"
 RDEPEND+="
 	hostname? ( !sys-apps/net-tools[hostname] )
@@ -52,10 +51,6 @@ RDEPEND+="
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4"
 
-python_check_deps() {
-	has_version --host-root "dev-python/pyinotify[${PYTHON_USEDEP}]"
-}
-
 pkg_setup() {
 	if use test ; then
 		python-any-r1_pkg_setup
diff --git a/sys-apps/coreutils/coreutils-8.31.ebuild b/sys-apps/coreutils/coreutils-8.31.ebuild
index 6cb35ca90f17..bfb7b35dce76 100644
--- a/sys-apps/coreutils/coreutils-8.31.ebuild
+++ b/sys-apps/coreutils/coreutils-8.31.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test userland_BSD vanilla xattr"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/coreutils/coreutils-8.32-r1.ebuild b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
new file mode 100644
index 000000000000..d63be698dccf
--- /dev/null
+++ b/sys-apps/coreutils/coreutils-8.32-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit eutils flag-o-matic python-any-r1 toolchain-funcs
+
+PATCH="${PN}-8.30-patches-01"
+DESCRIPTION="Standard GNU utilities (chmod, cp, dd, ls, sort, tr, head, wc, who,...)"
+HOMEPAGE="https://www.gnu.org/software/coreutils/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
+	!vanilla? (
+		mirror://gentoo/${PATCH}.tar.xz
+		https://dev.gentoo.org/~polynomial-c/dist/${PATCH}.tar.xz
+	)
+"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
+IUSE="acl caps gmp hostname kill multicall nls selinux +split-usr static test vanilla xattr"
+RESTRICT="!test? ( test )"
+
+LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
+	caps? ( sys-libs/libcap )
+	gmp? ( dev-libs/gmp:=[static-libs] )
+	xattr? ( sys-apps/attr[static-libs] )"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
+	selinux? ( sys-libs/libselinux )
+	nls? ( virtual/libintl )"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+BDEPEND="
+	app-arch/xz-utils
+	test? (
+		dev-lang/perl
+		dev-perl/Expect
+		dev-util/strace
+		${PYTHON_DEPS}
+	)
+"
+RDEPEND+="
+	hostname? ( !sys-apps/net-tools[hostname] )
+	kill? (
+		!sys-apps/util-linux[kill]
+		!sys-process/procps[kill]
+	)
+	!app-misc/realpath
+	!<sys-apps/util-linux-2.13
+	!<sys-apps/sandbox-2.10-r4
+	!sys-apps/stat
+	!net-mail/base64
+	!sys-apps/mktemp
+	!<app-forensics/tct-1.18-r1
+	!<net-fs/netatalk-2.0.3-r4"
+
+pkg_setup() {
+	if use test ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}"/coreutils-8.32-ls-restore-8.31-behavior.patch
+	)
+
+	if ! use vanilla ; then
+		PATCHES+=( "${WORKDIR}"/patch )
+	fi
+
+	default
+
+	# Since we've patched many .c files, the make process will try to
+	# re-build the manpages by running `./bin --help`.  When doing a
+	# cross-compile, we can't do that since 'bin' isn't a native bin.
+	# Also, it's not like we changed the usage on any of these things,
+	# so let's just update the timestamps and skip the help2man step.
+	set -- man/*.x
+	touch ${@/%x/1}
+
+	# Avoid perl dep for compiled in dircolors default #348642
+	if ! has_version dev-lang/perl ; then
+		touch src/dircolors.h
+		touch ${@/%x/1}
+	fi
+}
+
+src_configure() {
+	local myconf=(
+		--with-packager="Gentoo"
+		--with-packager-version="${PVR} (p${PATCH_VER:-0})"
+		--with-packager-bug-reports="https://bugs.gentoo.org/"
+		--enable-install-program="arch,$(usev hostname),$(usev kill)"
+		--enable-no-install-program="groups,$(usev !hostname),$(usev !kill),su,uptime"
+		--enable-largefile
+		$(usex caps '' --disable-libcap)
+		$(use_enable nls)
+		$(use_enable acl)
+		$(use_enable multicall single-binary)
+		$(use_enable xattr)
+		$(use_with gmp)
+	)
+	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
+		export fu_cv_sys_stat_statfs2_bsize=yes #311569
+		export gl_cv_func_realpath_works=yes #416629
+	fi
+
+	export gl_cv_func_mknod_works=yes #409919
+	use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
+	use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
+	# kill/uptime - procps
+	# groups/su   - shadow
+	# hostname    - net-tools
+	econf "${myconf[@]}"
+}
+
+src_test() {
+	# Known to fail with FEATURES=usersandbox (bug #439574):
+	#   -  tests/du/long-from-unreadable.sh} (bug #413621)
+	#   -  tests/rm/deep-2.sh (bug #413621)
+	#   -  tests/dd/no-allocate.sh (bug #629660)
+	if has usersandbox ${FEATURES} ; then
+		ewarn "You are emerging ${P} with 'usersandbox' enabled." \
+			"Expect some test failures or emerge with 'FEATURES=-usersandbox'!"
+	fi
+
+	# Non-root tests will fail if the full path isn't
+	# accessible to non-root users
+	chmod -R go-w "${WORKDIR}"
+	chmod a+rx "${WORKDIR}"
+
+	# coreutils tests like to do `mount` and such with temp dirs
+	# so make sure /etc/mtab is writable #265725
+	# make sure /dev/loop* can be mounted #269758
+	mkdir -p "${T}"/mount-wrappers || die
+	mkwrap() {
+		local w ww
+		for w in "${@}" ; do
+			ww="${T}/mount-wrappers/${w}"
+			cat <<-EOF > "${ww}"
+				#!${EPREFIX}/bin/sh
+				exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P ${w}) "\$@"
+			EOF
+			chmod a+rx "${ww}"
+		done
+	}
+	mkwrap mount umount
+
+	addwrite /dev/full
+	#export RUN_EXPENSIVE_TESTS="yes"
+	#export FETISH_GROUPS="portage wheel"
+	env PATH="${T}/mount-wrappers:${PATH}" \
+	emake -j1 -k check
+}
+
+src_install() {
+	default
+
+	insinto /etc
+	newins src/dircolors.hin DIR_COLORS
+
+	if use split-usr ; then
+		cd "${ED}"/usr/bin || die
+		dodir /bin
+		# move critical binaries into /bin (required by FHS)
+		local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
+		           mkdir mknod mv pwd rm rmdir stty sync true uname"
+		mv ${fhs} ../../bin/ || die "could not move fhs bins"
+		if use hostname; then
+			mv hostname ../../bin/ || die
+		fi
+		if use kill; then
+			mv kill ../../bin/ || die
+		fi
+		# move critical binaries into /bin (common scripts)
+		# Why are these required for booting?
+		local com="basename chroot cut dir dirname du env expr head mkfifo
+		           mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
+		mv ${com} ../../bin/ || die "could not move common bins"
+		# create a symlink for uname in /usr/bin/ since autotools require it
+		# Other than uname, we need to figure out why we are
+		# creating symlinks for these in /usr/bin instead of leaving
+		# the files there in the first place.
+		local x
+		for x in ${com} uname ; do
+			dosym ../../bin/${x} /usr/bin/${x}
+		done
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Make sure you run 'hash -r' in your active shells."
+	ewarn "You should also re-source your shell settings for LS_COLORS"
+	ewarn "  changes, such as: source /etc/profile"
+}
diff --git a/sys-apps/coreutils/files/coreutils-8.32-ls-restore-8.31-behavior.patch b/sys-apps/coreutils/files/coreutils-8.32-ls-restore-8.31-behavior.patch
new file mode 100644
index 000000000000..62a35cd85ad1
--- /dev/null
+++ b/sys-apps/coreutils/files/coreutils-8.32-ls-restore-8.31-behavior.patch
@@ -0,0 +1,94 @@
+From 10fcb97bd728f09d4a027eddf8ad2900f0819b0a Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Thu, 5 Mar 2020 17:25:29 -0800
+Subject: ls: restore 8.31 behavior on removed directories
+
+* src/ls.c: Do not include <sys/sycall.h>
+(print_dir): Don't worry about whether the directory is removed.
+* tests/ls/removed-directory.sh: Adjust to match new (i.e., old)
+behavior.
+ 
+diff --git a/src/ls.c b/src/ls.c
+index 24b983287..4acf5f44d 100644
+--- a/src/ls.c
++++ b/src/ls.c
+@@ -49,10 +49,6 @@
+ # include <sys/ptem.h>
+ #endif
+ 
+-#ifdef __linux__
+-# include <sys/syscall.h>
+-#endif
+-
+ #include <stdio.h>
+ #include <assert.h>
+ #include <setjmp.h>
+@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+   struct dirent *next;
+   uintmax_t total_blocks = 0;
+   static bool first = true;
+-  bool found_any_entries = false;
+ 
+   errno = 0;
+   dirp = opendir (name);
+@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+       next = readdir (dirp);
+       if (next)
+         {
+-          found_any_entries = true;
+           if (! file_ignored (next->d_name))
+             {
+               enum filetype type = unknown;
+@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg)
+           if (errno != EOVERFLOW)
+             break;
+         }
+-#ifdef __linux__
+-      else if (! found_any_entries)
+-        {
+-          /* If readdir finds no directory entries at all, not even "." or
+-             "..", then double check that the directory exists.  */
+-          if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1
+-              && errno != EINVAL)
+-            {
+-              /* We exclude EINVAL as that pertains to buffer handling,
+-                 and we've passed NULL as the buffer for simplicity.
+-                 ENOENT is returned if appropriate before buffer handling.  */
+-              file_failure (command_line_arg, _("reading directory %s"), name);
+-            }
+-          break;
+-        }
+-#endif
+       else
+         break;
+ 
+diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh
+index e8c835dab..fe8f929a1 100755
+--- a/tests/ls/removed-directory.sh
++++ b/tests/ls/removed-directory.sh
+@@ -26,20 +26,14 @@ case $host_triplet in
+   *) skip_ 'non linux kernel' ;;
+ esac
+ 
+-LS_FAILURE=2
+-
+-cat <<\EOF >exp-err || framework_failure_
+-ls: reading directory '.': No such file or directory
+-EOF
+-
+ cwd=$(pwd)
+ mkdir d || framework_failure_
+ cd d || framework_failure_
+ rmdir ../d || framework_failure_
+ 
+-returns_ $LS_FAILURE ls >../out 2>../err || fail=1
++ls >../out 2>../err || fail=1
+ cd "$cwd" || framework_failure_
+ compare /dev/null out || fail=1
+-compare exp-err err || fail=1
++compare /dev/null err || fail=1
+ 
+ Exit $fail
+-- 
+cgit v1.2.1
+
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index 9bc5e4d12504..fc85d4d616ee 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -2,7 +2,7 @@ AUX cpuid-20180519-add-spec-ctrl-output.patch 516 BLAKE2B f6c3a5c42afe5a97fd3712
 AUX cpuid-20180519-makefile.patch 1618 BLAKE2B ee25815c8f60b77b0e8866100d90767416414ef07e818892e4c552741bb0001b040c2e6ccdbb470fc7eefaa5f428f611d9d8feb03675d91ec603c6794e0262b5 SHA512 272391a70c4b6b31769f6ae4c4c39b942fd0fc7130729c93abd977a5d82f655e3e7513747fdf4abb238bd1ddebb11eb7925e8ebbed393a0704ad9bbef52b6da4
 AUX cpuid-20200203-makefile.patch 1341 BLAKE2B 54d2d82710d88d4f095f712b19488bdc44376aeeeb9395e7d9061ea4f8b33e4a38818937e29dbcf4f48455aca568c3d362b2898fadbfd0ba9b11edfee78878c6 SHA512 ced9f8b91c67b0a9a7aeb7f581cd101a1161810a1de0d876b417e55a56f13c775005f3879c576fed318b2f4809a40db3347dc456d73d9e529d10ff8ab51e1e79
 DIST cpuid-20180519.src.tar.gz 84784 BLAKE2B 87098145a378081d296f0473f9106e7c5b6654c2bd63d385dc27e293079adf3a527801fa644000ede53228e087e9e9afdf807a3c8d9cc8eb93826f01a5a89e9a SHA512 565738c41777669e750a2ef2e122ed0568de5ac8cc2584fa5047ba66d42eb5c3324b283bda25605e055d85402a4e2d109bc6d033ccd34243caab728465792669
-DIST cpuid-20200203.src.tar.gz 113144 BLAKE2B fea8a51559e77bac779cda096e694992090d5b6e4f6efbee3b67f66727267028da062c317ca045155b668292c5f3f6c2d027a59f74d27f138c8ebb529f8df820 SHA512 ae80275fba522688161d08b58d4df6437bad66853a7fce9591b5ca10ecd649ce712616f46d6c9f47a36ff3a1f09c65a10dc70fb409bc58c5e30ae413cfd92aa0
+DIST cpuid-20200211.src.tar.gz 114939 BLAKE2B c03d703fe6cdf131886e83e31ccafdb80e435e5183d033886d1d737905667fc359d0117951d76d9c6475a7138173cba7d94f5580d5e3d4a8c0c1ec571d5fec51 SHA512 5a5bf3a57f6af3f88b234c9f2cedbb9f8b7e1fd87923da140de01ee4212bac78513cbc006471f3aacc563fb2893c66bc236e2bb27f606e22c07bd9acf612c8e4
 EBUILD cpuid-20180519.ebuild 640 BLAKE2B c4800406ac7f031a9206013f968a945a5625a53523b9abe577d76189dd5cb4e2dff85f77af7142594c49fdd35c51450f4c65c806c11c05578f3393dfe419458e SHA512 ac7f070dc1f1df53607a705d193897312af921b61a3d9358420996ecbc112e0ecf533d3d11ecce5bbb247b1d9090d0592dcf2bf22031e86ba624e490913a9469
-EBUILD cpuid-20200203.ebuild 594 BLAKE2B f391a3db08514209d90a19d9d6a3b54bc2928fc7241c14da550577bc6382c0cdb8c33f00f98c4f9aace9232e48cd16af108ab8c2d30a27bc1fcf631035218864 SHA512 b3ab37445b5b638abb3548d4eab3c5194650a03c73a04085f2a503e8d184728977c57eee529ca9d23c99d4575c4b325a3a833fd3c92fa8a3bef250a79f8ac9da
+EBUILD cpuid-20200211.ebuild 604 BLAKE2B 8e34b2c78d88273d214fa6df847b6db84d2dc8dcf26514f779e61a9bde540fc3b42946a5bf2b3aa51a238824d2169a08510ce942bdd21e5b0a5b7e112265bf83 SHA512 f68fc7a76850491a58891043465849feb1c71e8f79c0f8ac978dc86289d1e03c964af93cc80d08d2ba4e5ed695f51a3b5d42352a191b48bebad2bf1c93577623
 MISC metadata.xml 637 BLAKE2B ffd825f4b6e67bff67d861d85f26fe2c3054fe7e8d0433c82faa5f5e8a1c2b75b24284b33ff4cbb9ef4ca97061077f04ef968652ff08adbfa97fa479a0cd6105 SHA512 e7b082eb434cc930af77168e31cc83c1aedc1de4d8e5f431e84325aa7c52cdd180f60aec2487b11c3c31ea6596f9caab32a44a6eb60845a5b0fc64e71c1aa799
diff --git a/sys-apps/cpuid/cpuid-20200203.ebuild b/sys-apps/cpuid/cpuid-20200211.ebuild
index 60a214f3c409..c48d21a156d2 100644
--- a/sys-apps/cpuid/cpuid-20200203.ebuild
+++ b/sys-apps/cpuid/cpuid-20200211.ebuild
@@ -18,7 +18,7 @@ DEPEND="app-arch/gzip"
 
 DOCS=( "ChangeLog" "FUTURE" )
 
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+PATCHES=( "${FILESDIR}/${PN}-20200203-makefile.patch" )
 
 src_prepare() {
 	default
diff --git a/sys-apps/cracklib-words/Manifest b/sys-apps/cracklib-words/Manifest
index 9dbcd2708115..7b2c65612fcf 100644
--- a/sys-apps/cracklib-words/Manifest
+++ b/sys-apps/cracklib-words/Manifest
@@ -1,3 +1,3 @@
 DIST cracklib-words-2.9.6.gz 5536645 BLAKE2B b0ac23e8777cb094cec565e9728ca8dd37359cd19c2e2d4cd215635f462e464fb27fc5a9e560895804df4e519c465845b381a8cd47fb4d6f9b9c62109ff661e6 SHA512 fc5bbe7699c9c9e3f39f5c82f53ec8a4ea85e08d5513188a2f6423f92779008b87d85cfcf87a9a5d13a49b04c30f73890cd4d3fa7cd4a6bdac5c1ebc18e18bc3
-EBUILD cracklib-words-2.9.6.ebuild 700 BLAKE2B fc499584fb24472d45479d6846b388f3fe13caffd196e4766393db74172051c4b5741fa7bc7c814a72144a67ff04238cfd77bc67f5be18914ae15dbb34716e6f SHA512 8c6a52cbf8527c3673ec53e9ad59cc03d05ec70d16b5dc1fb24bddb916a2b54e721f8577e4587fc6cfb8e38da94947f32b3ec92a2459774416d64a12b234f1c4
+EBUILD cracklib-words-2.9.6.ebuild 698 BLAKE2B 14098b472441684c31e7ce6ef5de133f65dc6e103826f733edce40c5c6e68bcaa87fad5722578933020b7acd31fc71ab418b1575960fdf3ca118a48ecb8ce456 SHA512 dcc684e63bb80c6700889b65ee264d8d9f65e5e44e3b9a2ecf596d7c2e82a7c3c4e9a3241e3933ddc61428b947118a565e971a616c15e7c1de19b862707fa0e1
 MISC metadata.xml 384 BLAKE2B 68827917aeea5af1cc1b3c9badfc420c3e9652f3c79fa22b925f4e317c722bf43420c5cb7e4060ed63d5b5319aad1d4cbe3b09f47422a1be06d07c598ea1cff5 SHA512 773287176f56f1a0f11edc6cd1ca85453f998ad8e58b1e608562335f814aab18124bfb850063dd4fa35aba525b776bf2c202d8afa6d4b51e354276678f324bd1
diff --git a/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild b/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
index 9c9830ccf553..8f87aee00d3a 100644
--- a/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
+++ b/sys-apps/cracklib-words/cracklib-words-2.9.6.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/cracklib/cracklib/releases/download/${P/-words}/${P}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/sys-apps/crazydiskinfo/Manifest b/sys-apps/crazydiskinfo/Manifest
index aadaccb082bf..322400148838 100644
--- a/sys-apps/crazydiskinfo/Manifest
+++ b/sys-apps/crazydiskinfo/Manifest
@@ -1,3 +1,5 @@
 DIST crazydiskinfo-1.0.2.tar.gz 4675 BLAKE2B ea36ec1c50c9253e222ef842bb771db5f7a9653c3ea81e61dc25cfec6e1d119940e78cc909b2dc3450a7c539a6b84a06598b869180226bda5729731a574d8923 SHA512 7ba835aa970a9247ea8dc4339d3d28ffaf24e4e5150d3c6b4e5b9236d905807d3a3970a3951bdb3c6736285259cbe35360821488a6997ff800115767065d3864
+DIST crazydiskinfo-1.1.0.tar.gz 5372 BLAKE2B f00c989b33cff303066b76d8da0bdb8ca12d94598a26f6990706637c0f430d18c3ae9344fcd7ad3e5ff301dac9651c29002548190d06dd16ea99132dbd94c50c SHA512 57e9ea4f8abec18355806da35225132f06a5562b1717e6dca1515043b2a0f2a51b47a2bcda31f1e64d6b2e9c8c6de5445d835f59eed79fd0911e06fd32296803
 EBUILD crazydiskinfo-1.0.2.ebuild 446 BLAKE2B f4ae163f4ba9f49ea9e06adec9558d359dfe8bef90cec76ffde7921558cce43abb6706921ff807d290bda7628722d1c01f07bb264b165b54dee2aa36ae689ca1 SHA512 fe540a2d70746747db85dee95af6eaf2f76492dfbf6ce450d2467a53119c2b9bea1fe4041f193b0229f5284fb7f5a83f2d82a94fa3f4308e2dada4648e040b31
+EBUILD crazydiskinfo-1.1.0.ebuild 443 BLAKE2B 88916c7dc95fe1ecd15e09dc9fe95c0a3c47f20243315e097205de34feeaaa24e57ab8f69204e2b1ab744e4781ec2f56c67332a2432681e776b48a59efb4da6f SHA512 590e91f26d1165dd609328d76c1fc7008b03c1059f96a0f68fd5fb9f35aa32c6aa1fd268a60dcdce18713a44a47f6935cad438711962b0c80f128a351cb212cc
 MISC metadata.xml 337 BLAKE2B f419cc18fce7059f2d34451cda69ba7679511de53c756544a4180a66882503f7b2b7686e4ef14c533fcb5481bb774e0b7f4ac50849b11bf8bd5bfaa121caa3fd SHA512 ab01ee7de306762e116bc7ca43f4b229b0b1ab28e608a4cb7a1b866f167025aebb9455e90ebce01120bbd6254eb372d3e0df2a783c4378da488a769ed1a64650
diff --git a/sys-apps/crazydiskinfo/crazydiskinfo-1.1.0.ebuild b/sys-apps/crazydiskinfo/crazydiskinfo-1.1.0.ebuild
new file mode 100644
index 000000000000..a1866e19f637
--- /dev/null
+++ b/sys-apps/crazydiskinfo/crazydiskinfo-1.1.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Interactive TUI S.M.A.R.T viewer"
+HOMEPAGE="https://github.com/otakuto/crazydiskinfo"
+SRC_URI="https://github.com/otakuto/crazydiskinfo/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	dev-libs/libatasmart:0=
+	sys-libs/ncurses:0="
+
+RDEPEND="$DEPEND"
diff --git a/sys-apps/daisydog/Manifest b/sys-apps/daisydog/Manifest
index 44cb72310915..41a0ef0932f2 100644
--- a/sys-apps/daisydog/Manifest
+++ b/sys-apps/daisydog/Manifest
@@ -1,5 +1,5 @@
 AUX daisydog.conf.d 115 BLAKE2B 55fa6089b54a2f5b4b56a5957020d6bab3dea492551bc84170d1cedbb17cba7e8063de08bee7d18cfa39388097073193b824a68c2b8e9f51c5d52b12c84074f8 SHA512 81d9f238f4240d452e6316e0a94c489fc88eb3c8fe189958292a02dd0ce669bf957e614cd2864b7ccada8a174c94c6ee1cda7216e4fe96582a5cc266657710ea
 AUX daisydog.init.d 359 BLAKE2B 3509768ccd75d680f15e1b9487ec4714bf40ef1f6c19d92e78e53fccc0da1546dade7b3f8b3db4d1426433e482f85fc960f9c64cbedfa3cb32a370f220c8b563 SHA512 ecb063e6fec9a463ac03977ac1a1d4f8ddb2864c6bd3ed3f041af70a797ca7bd3134c45aab99d42c136ffca4f00ce87f55df1fd42826fa92c1da75264d4389b1
 DIST daisydog-3182aa85c087446e4358370549adc45db21ec124.tar.gz 10395 BLAKE2B e172c8cf9172e69b3c88586a6a96ec69573500101bfef981f2c2090aaf9def8f9cbafa991ef68c1e03c1c7d607f0534f92bad0b06d944f85859223b3f62ff926 SHA512 0a7312a3d9459487da8d20a80568187f51d4ae786939afbf38b8b89747831b2f7e0e32a3414b5d60863e33bcdebad9e457ff9a8f75143a7b60bf68fc9de17cd5
-EBUILD daisydog-2014.05.30.ebuild 878 BLAKE2B dd2d8592ca5f163f961ecafd261c9b49b2fba2a376de6f96e20976a0e2c0cf50710362ff4922add5e250c849e1f1cffdc8647243e54091b8cc1b71f9466ef749 SHA512 30cf1370bd21bca1ae5d687f5ace4fccf1e45c5ef2e2c9c706e0d411abd2e858058d52f2b0e935954267194ac77f7158fff99b2e700f73fde4873a597f28f00c
+EBUILD daisydog-2014.05.30.ebuild 876 BLAKE2B 8559aaa8dc2542d19e198ce3fe74ff95da117f838a4489d545a28ce756a217e3dcfbd134583c59894a34550090092f0123087e6ca912eaf944eb7c64945eca25 SHA512 d9511ebc9d14acc1e5d19275ad20b1f45070ffd183ba290263f359f28a6244bf7ae3fcdad5667f756aedae143231943c7514b04abe3be60b1f2874bb613035b8
 MISC metadata.xml 220 BLAKE2B 8ead86e7c2e2a8ecb0068c4ebcf5322f3ccce91c48fb2bc0b62bc6400609f57b3d5c37f92351f748da0e603129fe3e7be8dfcdb6294e003bf33e3ac0ca30eb48 SHA512 c262561324e85dc1fe18ceede654af3ae9f494b36233a807944dbbc7ac9764c93654d1faf958ef4c98c1fb370c71f5073443294289f43ddee0c76e606a703d32
diff --git a/sys-apps/daisydog/daisydog-2014.05.30.ebuild b/sys-apps/daisydog/daisydog-2014.05.30.ebuild
index e1f8092e35f1..bd678c5d8b9e 100644
--- a/sys-apps/daisydog/daisydog-2014.05.30.ebuild
+++ b/sys-apps/daisydog/daisydog-2014.05.30.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="static"
 
 S=${WORKDIR}
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 42314cf23eea..71adc20fe9ad 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,11 +1,20 @@
 DIST c-dvar-7c0833f9cae446163077b204b2296287bbee7c67.tar.gz 24727 BLAKE2B e18de53ac8014e77cffbcd9c71230847db0055e43e54b5cdfc3f48367570878b34d6fc7c299e4312708455ef2fa4ddff9fa5b48b603a05d6fbe28ce84e5e5906 SHA512 a006bdfc8a5a8e9a803ffa29f152858cb699cbf0e59d4f0550a4736ad29f85cfdef6bd8ef3cfbe8770045c76ed092db00c7338d62a8b0cd54ae5bd03f1c8b422
+DIST c-dvar-9e1a5b4363aaece7169df2b2852944a1434b2df5.tar.gz 24719 BLAKE2B 3688d10d8295bf608d091cbc808dd2a22a535a94d40fcad46735a4f9e6e58ac06f969cd4ae7e65a04dd5719d00b424d902d904553e3e83bd0b93eebf6aed0cc0 SHA512 07e5d8b0b110ae4eab34024cfef05474b6a59a931ce61632bba3d96ed6bf042edf5b21238e2045cde92f1ab91ed45b1d78e2f8fe79f527f0ab6d018dc205608e
+DIST c-ini-43f379396a320940d0661c15780f618f84d29348.tar.gz 14081 BLAKE2B 4d2b63eb5c068505cfddaa1511b95b1a3c646b7325e9efd55b4b5be85312081c148671e40157c757c45ab0128f0a486102267dddf1c3adbc8f91bb7da363a67a SHA512 bdc9412f2e43446f4dcc36f3447047c68f2bbd3c5b278671e3fb5b3d4a09d9724f362bc5d2fae44d5f899d0fe9978c559e3da57ec2eb36ee2d847bbf6af44014
 DIST c-ini-847c55f5b3d33baa47af9a1286175d58b34f91d5.tar.gz 14094 BLAKE2B 49ac949d4fc46ec63f253d48921be0acd585b3d301d56144e9477baaf81a0cfb3fb5f0706d1673c921962d1bbbeb89b2d83e07dba9265dff7b1f57da6059eaef SHA512 eec3a4d2a3e1a4d9d65385b2e3cfd87dfb482b365731bc15f989faa59fb7f2c6e88abcef6612f3718817b1d1953f12fcc9981fc36b01fa82d3146305e24eaa16
 DIST c-list-2e4b605c6217cd3c8a1ef773f82f5cc329ba650d.tar.gz 9383 BLAKE2B 70f8ed083a784a08da3b5d5fe75709cf9dcbaaee523ab9b1cd3b36931f5bb0c1e920cc38561c002f4de2efeda7b4edaf9b5fb9411f0fcd8aa1055ab966066789 SHA512 4db91e8af837d6739b9becbc2b405300e2006a82e39c01ade015eabf39ba550dc38879e800fd415bc5fa4ac220090cfdfa3a13d4f748a1278e51544c4a6183be
+DIST c-list-b1cd4dbf967d73b24dfe6cc56aaf3fdd668692e3.tar.gz 9362 BLAKE2B 04a1bca5166ad8b868ebac679e4a1c1f244bfc04ea617030a7cd9ea3765793d21cc2b1ab6c102a1e0fec65860b4d029f398ab6f9815f8fbec82608da59eb7794 SHA512 e1a852fa8e57f1fbe81f2fdc186079d6e4be9d729bb23d3d1f8450fd867dd2c04db3229fc96a80379c7199568c14df472e92a83d0925e2b2692eccc49a35b84d
 DIST c-rbtree-b46392d25de7a7bab67d48ef18bf8350b429cff5.tar.gz 26065 BLAKE2B ec5486b2e1b9b835a3aac42b9f87275bbdbc73cdb0698304db01a80f0d52bf542b8df56d6e58bd98cbceccee9418d7115e90605c8077ac8670b6326304806c9e SHA512 8177c111390f8491a3b535ec5a3b8de13a3b9d0358166494e503d68bd5748dae0cd2b092b0311258be885ecbeee2bb83a2389d9734bc28e4f78e85de3ed9b3f5
+DIST c-rbtree-fa97402c3faa18c2ddd8325eb66e2bd58a224477.tar.gz 26050 BLAKE2B 2e295550f455185eb97d1f3212d626bc7df94999fc065e814fdaa8c8d3cd14eb288f840e9cee04842cf1dc4b541a88a043d1f70eee36b77fa82f15430335372f SHA512 1fcafde26da46511dd7141280d14d96d7dd08fb7f62f71c2703c8fdb32783f9e6eac883a4adbdfb0b85139d26f89ce99291a28e789a4ec8c31e4a4560c584418
+DIST c-shquote-1d171fe52c23944c3c0be1f2603595f2488a9ff8.tar.gz 10758 BLAKE2B 1f78587e667b74cdb0dcaf82f54fc891840b75b4fff478bf315b5a45b421875ea43b07504330c35cc31c68956899d5c8e1768dcaf863ef6ece23ac56734b8479 SHA512 a0788dcbd7cdab95577564b499cca3ca1039d2b22bb05f277e84ff3868f1f80796ef26236b5aa082057169d8a9f69781f06792f9a3ae8e869d5d721931f3c882
 DIST c-shquote-34e1e25299fb82ab9fd0c8bfd8a66010ead1497b.tar.gz 10824 BLAKE2B e2cc32acdb83a9d2c759d5068ef69feb4b0fbcdf908bbce08c9229c26dc1d1d421e522b844232328b62af851ebb93cbdc282be04b26ec04e327eb59e9e5173c7 SHA512 8f5ae3554239d42ec50b093f81b13715a55215b406a2000853da5a8581a11650ba1020f06eb8f7551d0ec372e786ea6cc56c2c803d0fc86d016db69895b391eb
 DIST c-stdaux-11930d259212605a15430523472ef54e0c7654ee.tar.gz 13215 BLAKE2B f8022583c224e911ecf65f10f1ada2ae631f0dca1c0306c113a2ad1b6a996ff4fa45eba14fafa5146feabebef0ae9e275a46fa0bb78af454fc37e49c465c7e3f SHA512 7c0a5d1266462482674f9fc98ba19af65566d638e7a407969de9ccb66d5884692e0562c16b37e64269919e5c0d0c2a8ffd147e88159b9226f1bb738d460b78b8
+DIST c-stdaux-d6ecce8afbb7703e1469cc5e7a59a8bd32e2d4a4.tar.gz 13142 BLAKE2B 771c79666d4758e37204aec1149186af8b1b29979ae604b335d3b5e0f78ee934c5fa97e81aa7e4cd19f8eb88f463c2f4a507b93309ae263fae827ee5138c7ac6 SHA512 c486bdddf76522e8242da46b8057a5ee9c9f5f152962a46bb50e0e2e35be5060b8b93d0b2a0d0bcd800abdf8de6e835e68d17d83dc47c6c99e7e0b2f4d91db23
+DIST c-utf8-1f7e2ff1164bd2161cb480532b2b34cb2074bde1.tar.gz 9462 BLAKE2B 3e1429da756f82123c3aec84c2abdf02af3e131e9004a59434bf6743173082fa4a0c6d43def625da03bf0de1b3c5cfd6f00719dcfb5baced783b3d9dbbc407e6 SHA512 4221c3d366d3cb8bd61a612fcadafbc48ae817cd4770c2710a39b5bdb916a31b8ba17ca55ccac5e54ed88ee9bbcc4a9bbb3ce5b836ccfc570db28d35816cee27
 DIST c-utf8-34f5df0f4b28fc7ea6747680a432e666047082e4.tar.gz 9480 BLAKE2B 206d1b74a187e56cc1dbc6a657eb0935cbc4bf5344d4567b5aa99f0f3c559eb442e6ba2f05647f6fff1244874d64aca36062ddd290e368c4ca933802046165d8 SHA512 5b6c0de7d5b3f2a563442ca139ee1ca788a137cb0f5eede6c6e190e748dbe39b3489a2446682e1049dd6c91fdafff7743c819113eaedf370f4c3b1a28e97b22a
 DIST dbus-broker-21.tar.gz 203390 BLAKE2B 9024c5545b4a09ce43ef44f7bc78ceb52407047f88f73575c60b5ddd6f4fa188c0f65c23d787c91679d1ab2a07f8e19fa06b8a1b60b327a0cc8d79a6006ba50e SHA512 527a8b5f27458a6443c7a5ad33ac39e4e31b32348a3b4cfd6679acd9de635add272f182fe8f72b493e0812ff6e07523a35e53507f3656d05b56705ed8a00e643
-EBUILD dbus-broker-21.ebuild 1844 BLAKE2B 09306a2563bb18aab2b8376962198397f1ea450235c05db49c928f4aa844c6685cbb48ad434c71299411c4a67cdea0cb02868731e7daef673c08ceae778f4751 SHA512 6400d4d07978c6ccfd57dd87098ee969b534b3b4f2e5b495e091f8b9e2a667f81104815cd62812fced0360b49812bdafe14e6124497faa8048d372278e4bf606
-EBUILD dbus-broker-9999.ebuild 1844 BLAKE2B 09306a2563bb18aab2b8376962198397f1ea450235c05db49c928f4aa844c6685cbb48ad434c71299411c4a67cdea0cb02868731e7daef673c08ceae778f4751 SHA512 6400d4d07978c6ccfd57dd87098ee969b534b3b4f2e5b495e091f8b9e2a667f81104815cd62812fced0360b49812bdafe14e6124497faa8048d372278e4bf606
+DIST dbus-broker-22.tar.gz 208274 BLAKE2B af55b906c4e6aea55717bc4bc8de13daa26ef360f6599911b7442442eb4173c3fa2c4e4058846b0202e9f45f638cc91b3a3f8c9818fec13ae09ed7b3111d1e3d SHA512 385fe58a52f3a67832c420288ef96c8ca204b5ee362eb29b38434c92483f968f76402e321fdba65cdc3d876d3e18a428d142264e5692758209be66b9d41b8e07
+EBUILD dbus-broker-21.ebuild 1823 BLAKE2B 75e72464f136f42d1d44fa982da37bc2f30fa7b8de02404800390ed5a6348259cde6be034a7510e194d7c7303f7988ef0dc191ff8eee43fbd90385a196b115a3 SHA512 9d72fd5d4f4119e713fe5a8ab0995032811d6f1a9f8a403959321b4b34ae5fe5ad83a892f70b2bb8db5cab236b4e85ca8231ccb92e43a371d2a5f3bd33c722f0
+EBUILD dbus-broker-22.ebuild 1823 BLAKE2B ae6df0b2f8b24395d2a48db5fda5d67d46a978581e9bf65fefb885c2bd4a8db1b3197cf82d089163943cbff9ca4b8c9442ef43055ae1c0223a917d525390b294 SHA512 240acf605d165c9ba33e031f62ace69bb63b1a2c0ecacfbdf9a0e90ab6cceb35e7f368f29aaccba4ff2221322e954f5742f3baa647eff821875f976d4e3458a3
+EBUILD dbus-broker-9999.ebuild 1823 BLAKE2B ae6df0b2f8b24395d2a48db5fda5d67d46a978581e9bf65fefb885c2bd4a8db1b3197cf82d089163943cbff9ca4b8c9442ef43055ae1c0223a917d525390b294 SHA512 240acf605d165c9ba33e031f62ace69bb63b1a2c0ecacfbdf9a0e90ab6cceb35e7f368f29aaccba4ff2221322e954f5742f3baa647eff821875f976d4e3458a3
 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1
diff --git a/sys-apps/dbus-broker/dbus-broker-21.ebuild b/sys-apps/dbus-broker/dbus-broker-21.ebuild
index b54197dd4535..4d1e237eae1f 100644
--- a/sys-apps/dbus-broker/dbus-broker-21.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-21.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2019 Gentoo Authors
+# Copyright 2017-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,7 +49,6 @@ RDEPEND="${DEPEND}
 	launcher? ( sys-apps/dbus )"
 BDEPEND="
 	doc? ( dev-python/docutils )
-	dev-python/docutils
 	virtual/pkgconfig
 "
 
diff --git a/sys-apps/dbus-broker/dbus-broker-22.ebuild b/sys-apps/dbus-broker/dbus-broker-22.ebuild
new file mode 100644
index 000000000000..509831015999
--- /dev/null
+++ b/sys-apps/dbus-broker/dbus-broker-22.ebuild
@@ -0,0 +1,75 @@
+# Copyright 2017-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
+else
+	KEYWORDS="~amd64"
+	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
+	declare -Ag SUBPROJECTS=(
+		[c-dvar]=9e1a5b4363aaece7169df2b2852944a1434b2df5
+		[c-ini]=43f379396a320940d0661c15780f618f84d29348
+		[c-list]=b1cd4dbf967d73b24dfe6cc56aaf3fdd668692e3
+		[c-rbtree]=fa97402c3faa18c2ddd8325eb66e2bd58a224477
+		[c-shquote]=1d171fe52c23944c3c0be1f2603595f2488a9ff8
+		[c-stdaux]=d6ecce8afbb7703e1469cc5e7a59a8bd32e2d4a4
+		[c-utf8]=1f7e2ff1164bd2161cb480532b2b34cb2074bde1
+	)
+	for sp in "${!SUBPROJECTS[@]}"; do
+		commit=${SUBPROJECTS[${sp}]}
+		SRC_URI+=" https://github.com/c-util/${sp}/archive/${commit}/${sp}-${commit}.tar.gz"
+	done
+	unset sp commit
+fi
+
+DESCRIPTION="Linux D-Bus Message Broker"
+HOMEPAGE="https://github.com/bus1/dbus-broker/wiki"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="audit doc +launcher selinux"
+
+DEPEND="
+	audit? (
+		>=sys-process/audit-2.7
+		>=sys-libs/libcap-ng-0.6
+	)
+	launcher? (
+		>=dev-libs/expat-2.2
+		>=sys-apps/systemd-230:0=
+	)
+	selinux? ( sys-libs/libselinux )
+"
+RDEPEND="${DEPEND}
+	launcher? ( sys-apps/dbus )"
+BDEPEND="
+	doc? ( dev-python/docutils )
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	if [[ ${PV} != 9999 ]]; then
+		local sp commit
+		for sp in "${!SUBPROJECTS[@]}"; do
+			commit=${SUBPROJECTS[${sp}]}
+			rmdir "subprojects/${sp}" || die
+			mv "${WORKDIR}/${sp}-${commit}" "subprojects/${sp}" || die
+		done
+	fi
+	default
+}
+
+src_configure() {
+	local emesonargs=(
+		-Daudit=$(usex audit true false)
+		-Ddocs=$(usex doc true false)
+		-Dlauncher=$(usex launcher true false)
+		-Dselinux=$(usex selinux true false)
+	)
+	meson_src_configure
+}
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index b54197dd4535..509831015999 100644
--- a/sys-apps/dbus-broker/dbus-broker-9999.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2019 Gentoo Authors
+# Copyright 2017-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,13 +12,13 @@ else
 	KEYWORDS="~amd64"
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
 	declare -Ag SUBPROJECTS=(
-		[c-dvar]=7c0833f9cae446163077b204b2296287bbee7c67
-		[c-ini]=847c55f5b3d33baa47af9a1286175d58b34f91d5
-		[c-list]=2e4b605c6217cd3c8a1ef773f82f5cc329ba650d
-		[c-rbtree]=b46392d25de7a7bab67d48ef18bf8350b429cff5
-		[c-shquote]=34e1e25299fb82ab9fd0c8bfd8a66010ead1497b
-		[c-stdaux]=11930d259212605a15430523472ef54e0c7654ee
-		[c-utf8]=34f5df0f4b28fc7ea6747680a432e666047082e4
+		[c-dvar]=9e1a5b4363aaece7169df2b2852944a1434b2df5
+		[c-ini]=43f379396a320940d0661c15780f618f84d29348
+		[c-list]=b1cd4dbf967d73b24dfe6cc56aaf3fdd668692e3
+		[c-rbtree]=fa97402c3faa18c2ddd8325eb66e2bd58a224477
+		[c-shquote]=1d171fe52c23944c3c0be1f2603595f2488a9ff8
+		[c-stdaux]=d6ecce8afbb7703e1469cc5e7a59a8bd32e2d4a4
+		[c-utf8]=1f7e2ff1164bd2161cb480532b2b34cb2074bde1
 	)
 	for sp in "${!SUBPROJECTS[@]}"; do
 		commit=${SUBPROJECTS[${sp}]}
@@ -49,7 +49,6 @@ RDEPEND="${DEPEND}
 	launcher? ( sys-apps/dbus )"
 BDEPEND="
 	doc? ( dev-python/docutils )
-	dev-python/docutils
 	virtual/pkgconfig
 "
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 7c3d78399ad1..ad6822cc29da 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -4,5 +4,5 @@ AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2
 AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.16.tar.gz 2093296 BLAKE2B 46c4f0d384d76dffd31c18a2d2df03d0658479d8f5b2d14b1db2bf0941fecdc023307ec035e3f977fde570a9f6493bbabd020ac2cd81b0577597e355f5a72522 SHA512 27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb
-EBUILD dbus-1.12.16.ebuild 7241 BLAKE2B 3cbcb110cfdac2d6fce35531ce9321fbf807ef61020f9abe4359e997f3c29ee19609b9eb75e73438498c50a4fa34b94e9cee8949b1096087d79205ca99c625a3 SHA512 f7ecdaa6bbaccd96cec63257ce6fa3f9c1a3bc07a6534ccb9b779e4012fc7161dcfd735e68fa8ac7524639de6cef1dd911961114ac26371703a77ec580a80886
+EBUILD dbus-1.12.16.ebuild 7239 BLAKE2B 23b3cbdf703d8afda87a03a8ef88d4ceff4f2d3544ec78174db9e1d0b8ee78ca52dd0aa687b830973842dcdc6b3c1362391c256d9acf5008b557969f9efe4a1c SHA512 ef8d1065d99cb9750b0d4145440d65d461794a448c35eaf2325bceffcf590a47783c89b7c65983c2ee66d05632a269dd7e1a580601df9c19128b30d3dfab5b71
 MISC metadata.xml 595 BLAKE2B 1bc3c70bf906909e3ee7a0ecb260cada26deedc78cdcd0ae981ea96e7360ac067ce9ee464dc3a82ee54add8b2c3b9f8895944d48885cae4b6caeb45ab177f1d0 SHA512 90db9348853e41c206a0277fc21917fa88253a7d85b18c611fb1b31a9b6cfd6421d02a9298672a27d89d8969e365a4eb82ddcbf008244e66f8f37668269b6738
diff --git a/sys-apps/dbus/dbus-1.12.16.ebuild b/sys-apps/dbus/dbus-1.12.16.ebuild
index 66161f460be6..d1e89fbefe96 100644
--- a/sys-apps/dbus/dbus-1.12.16.ebuild
+++ b/sys-apps/dbus/dbus-1.12.16.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dbus.freedesktop.org/releases/dbus/${P}.tar.gz"
 
 LICENSE="|| ( AFL-2.1 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 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc elogind kernel_linux selinux static-libs systemd test user-session X"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest
index 1f1f3462c4fe..eca109f7331d 100644
--- a/sys-apps/debianutils/Manifest
+++ b/sys-apps/debianutils/Manifest
@@ -3,8 +3,8 @@ DIST debianutils_4.8.3.tar.xz 159292 BLAKE2B e655741f42594ff12b4f349331da57ec090
 DIST debianutils_4.8.6.3.tar.xz 156672 BLAKE2B bb87e04ca80a04c8841f04c877acedb0b953d815193069bb601d17907101bb6faf11bea99251a13a7c3b9ea6fa5d27daba264ea6924e542d9b574c87b3ffbebe SHA512 c38d1d351de69f270924f05755501d90cb7245c8a3154f91ea8e38978052ffe2ec016d4400c55e2f7d31358cfe134a40c5843a33836900d7e69cce9ee8ace98e
 DIST debianutils_4.9.1.tar.xz 157516 BLAKE2B b2c8927e37448f4e45f19b4a7d2977198d2c610a203a2c8692a0592c8c8319c5dc42050b83435cb7381e30cc653911083b76717a53ac908113cc7388a4155167 SHA512 b442950febe6df9e15ec04a6fec0ee8be12d3eac38dc3f9331438d871e3382f4e0f599da0eaeff0e7e9ba0fa5136ce3c3b51c6718e4d7f11c1675f745052a9b1
 DIST debianutils_4.9.tar.xz 157104 BLAKE2B 885f37b17eba7d20b2d76a0fb1afc6ccc2d9d4926754b9ce15928f3675eba4a38fec2e9b718d61684122f3c0dc17eba0aa06677e41ac641870ffc87442353951 SHA512 4e8726cf5744dca144535883c473a04884714afd50e501a140197fee9a9a78bd9596fcc1763e71b2baf6367bc38a8111016ab5ed35f4d4e98ccc78be697ca963
-EBUILD debianutils-4.8.3.ebuild 911 BLAKE2B 5f979d855c52c2734f049679ed0cc1e707e9497334a53b7fde4454b4b10ad06d970ef98b7e336175a5f6e349cdd519c2efa96c82345cb0526dc35da1501c2489 SHA512 0ac4a78ab17a71a0d1babaf52a510a344d535d396647c680f4a41f9579e980ca966939497a7c21bdb7a529b07d94059b28c39ae0cf7600b36edbca737fe85bd0
-EBUILD debianutils-4.8.6.3.ebuild 910 BLAKE2B f970cfd3eb80c408487267b30546519495a55d9235a425b6515e77106c23cb993fa57846c7c255490b386e79ea64338d69cb943c1da4a3caf77517d359bac13a SHA512 8a31f8442f6bd38b0a2826c031d72d79df22e3a9b5228e71deae5495eed27895284e751ec322e5492a79db081bb487253985306a0593b86061ec5bb0297480f4
-EBUILD debianutils-4.9.1.ebuild 898 BLAKE2B 4bfa4e9ffdd8553d61774d73fe19a06c4d29e073ab3e907a92ff93eabbf8290187241eb788ddcc91c97f27c2151ba2361a4284579b70f70c6f2f1c5e89473ea0 SHA512 d5c25f98f3c07c757285d34f869a9057b487d1aa070768cde2289ede5e05dfcb54687f6b3e91552861263854ea0a2b58d5babe4265af56f71ef2ef56485bebce
-EBUILD debianutils-4.9.ebuild 910 BLAKE2B f970cfd3eb80c408487267b30546519495a55d9235a425b6515e77106c23cb993fa57846c7c255490b386e79ea64338d69cb943c1da4a3caf77517d359bac13a SHA512 8a31f8442f6bd38b0a2826c031d72d79df22e3a9b5228e71deae5495eed27895284e751ec322e5492a79db081bb487253985306a0593b86061ec5bb0297480f4
+EBUILD debianutils-4.8.3.ebuild 909 BLAKE2B a955776ab4ce901217a39cddec56c6f9162f741f5e73804e5e7e1a297ed26b1fe3180a240e55a196413b2fa0bee412c6617ffbf45478bc4f96df10ffd4997035 SHA512 e8e5dd19e0acd0cbb830562bf514589b18cd5da08fc11c2e7b7f401d8a8621ae40af1ffb116ba72cbb80c2f4510f614155e039e4ec25cca94bd62f4a37d39276
+EBUILD debianutils-4.8.6.3.ebuild 906 BLAKE2B 5ffffc47ccc815289b1a70ee02ffe57528f0b97c91352c574724649be671634738ec97b76cc490661434699748f74294c250e2af1e4a1b86a4dc972e05c58f8c SHA512 44e24d8f4caf83a4687159251bd021cdbc268e4be77b99f66e5fde8d3debfbde0ffb0d05a6dfac22def89f7b27cb175e02bc4ff7921919f942e245c9bd18fc5b
+EBUILD debianutils-4.9.1.ebuild 894 BLAKE2B db8e60a98dadebaa33dc13337efc238efdc18109efcc526cb3238e5d3d4e5edf45cf8eb7aa301a8b02016f7f5844fbaf7d079e35b2797d0b30ce9e3fd5759c8d SHA512 bc951cf7489e9b5e90af6528babc3aff159756a41c64aa12d71500dcd00b97aced962c905493849e0a867c3747d4d8e775799c56e8e9bec59115959c1c8f4156
+EBUILD debianutils-4.9.ebuild 906 BLAKE2B 5ffffc47ccc815289b1a70ee02ffe57528f0b97c91352c574724649be671634738ec97b76cc490661434699748f74294c250e2af1e4a1b86a4dc972e05c58f8c SHA512 44e24d8f4caf83a4687159251bd021cdbc268e4be77b99f66e5fde8d3debfbde0ffb0d05a6dfac22def89f7b27cb175e02bc4ff7921919f942e245c9bd18fc5b
 MISC metadata.xml 445 BLAKE2B e074fb05a82e69de19cfca5e102bd6577060cd6bbd3b5b6b7e4c8f24d8715b50abe3e7444eb04827d41f73777ab2588807b708636287271c39e14b2bcd7c90ef SHA512 b07bcaaba5700fa08a6dbd84c514ff720efd155fe442cc35a7c62b5c0b64802ca286c991f20f0d6d56b15bb6ecc097804bcee83b0d924b868e8c9106effa1db0
diff --git a/sys-apps/debianutils/debianutils-4.8.3.ebuild b/sys-apps/debianutils/debianutils-4.8.3.ebuild
index d35eed7065f3..ac711ce0c6d5 100644
--- a/sys-apps/debianutils/debianutils-4.8.3.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~x86-linux"
 IUSE="kernel_linux static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/debianutils/debianutils-4.8.6.3.ebuild b/sys-apps/debianutils/debianutils-4.8.6.3.ebuild
index 70b2be0d742d..45100517a242 100644
--- a/sys-apps/debianutils/debianutils-4.8.6.3.ebuild
+++ b/sys-apps/debianutils/debianutils-4.8.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="+installkernel static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/debianutils/debianutils-4.9.1.ebuild b/sys-apps/debianutils/debianutils-4.9.1.ebuild
index bebf1792cc3a..31a787b0af61 100644
--- a/sys-apps/debianutils/debianutils-4.9.1.ebuild
+++ b/sys-apps/debianutils/debianutils-4.9.1.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
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="+installkernel static"
 
 PDEPEND="
diff --git a/sys-apps/debianutils/debianutils-4.9.ebuild b/sys-apps/debianutils/debianutils-4.9.ebuild
index 70b2be0d742d..45100517a242 100644
--- a/sys-apps/debianutils/debianutils-4.9.ebuild
+++ b/sys-apps/debianutils/debianutils-4.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=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2 SMAIL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x86-linux"
 IUSE="+installkernel static"
 
 PATCHES=( "${FILESDIR}"/${PN}-3.4.2-no-bs-namespace.patch )
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index 7998eb19e4ca..9be406c35976 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,5 +1,5 @@
 DIST diffutils-3.6.tar.xz 1398296 BLAKE2B 1b0a1443f676a1c09d25ad0be4c2d936156da8e690fade9d39d94be3850c502db24c3f508178a51e817437069db2d110fb4577cd67b2cf645c11a1f26a043e3d SHA512 3c159ff1cb7c901b0a57518483566b5740ca3c45aeb8d3004089f052975481db52994cc18592c502c68b0d2a1e22f1f7830f0d8dd9a9ed86de96e28cce9f70c1
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
-EBUILD diffutils-3.6-r1.ebuild 1221 BLAKE2B 8a894cd68f8dc1d3090ce7e7abfb87af5d0355be7321a85a6a8f28d976f93faf652dc33c82d73ae38cf47fdd883896b981811f78522874f094f36e7fb5179815 SHA512 c0767667663ec24869a657bf6f8bed5cefda56135208ffa80bf0124f958c66658411899726b7944913580fe9f8b3553adc055bb40c4eea3e72bedec43daff253
-EBUILD diffutils-3.7.ebuild 1233 BLAKE2B 1f885c4e61677384b9261e78336883e84dfdd71c162ff87b41d863f5ba7e8a3bcaf8f0b6edef4d97e12bf3bf9c8987b093933cd520bb29a1a88a65f0524be3a9 SHA512 c19966933b4bd073004f1cdc5cd5b3476b881e76ec2362cce1b33e83e4306b00c4ec931b22e348e3af5034c7297c9e89aa20cecaf9afd2ec442649c768b8cdb3
+EBUILD diffutils-3.6-r1.ebuild 1219 BLAKE2B 9aa4793b47518bdf19cad17dc253509c838123ab70c130293ead866b8cc4a4aedcb36b802717228c2096ebf3e9158731b885cb025f1c6fa777b173339f1ebe71 SHA512 561fc793ad6c7438f6ab02f58dd73b1b73c995441b7e28b79d0a054e09c41043439f1146ceb61b33b13f98ed25aa252b46556e53e572666b01bbfc10142e632a
+EBUILD diffutils-3.7.ebuild 1229 BLAKE2B 442caa51227891b565ae2144de1f2379cc9719c27f6187c27173b96bd8686ed3dc432f3fb94b20ddd0c6ff5b69bca1a7c103617c427e484baf1b1a4c134cf052 SHA512 84cad36a0595d24fbc5625dd4eccd072c6a6db6bcf2ea929f09a9e1bb3abdcce02f7732dfd312ed4095193089bfe3bcb2b34d20e00c4ff8bc8a1f75031200383
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/diffutils/diffutils-3.6-r1.ebuild b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
index 9abd1fbe45e7..df85e16a6b21 100644
--- a/sys-apps/diffutils/diffutils-3.6-r1.ebuild
+++ b/sys-apps/diffutils/diffutils-3.6-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 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="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/diffutils/diffutils-3.7.ebuild b/sys-apps/diffutils/diffutils-3.7.ebuild
index 21455d5ea622..d67de2ba9472 100644
--- a/sys-apps/diffutils/diffutils-3.7.ebuild
+++ b/sys-apps/diffutils/diffutils-3.7.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/diffutils/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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="nls static"
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/dmapi/Manifest b/sys-apps/dmapi/Manifest
index 20e8da1834ea..62614bf7f913 100644
--- a/sys-apps/dmapi/Manifest
+++ b/sys-apps/dmapi/Manifest
@@ -1,4 +1,4 @@
 AUX dmapi-2.2.12-headers.patch 354 BLAKE2B 83a2e4de5882c30a1ead955768c8033099c461ee955fba2021808a288e552ab0c97f3b13198270e367cc7c2e035094a631c7bd1b1454b13c82b9d0b1737c15cd SHA512 b087227085d3e068323f2a01c1c7044e1885e47b04caa1050e8552ced50dddfab871608bdf67a027989c359f2852cbcedcffeb6708e182d6d5dc3bfc9609489e
 DIST dmapi-2.2.12.tar.gz 367318 BLAKE2B 7d74f3081f8430c43d3ea961bd4ad2743a3ab65a016b0653a68074353ed60fa0c1a01a77aa470326aa1b10e731a5058355ab887cae00d21196958563ae6c4ee8 SHA512 aa44c0c7857158fed198deb9d1e00abaab549e3c22a7ce0e24e6088146bde56ecf967405b1b61a589460981ddcfaffbb1e9a2e677088efec317e3a7cb44abe4f
-EBUILD dmapi-2.2.12-r1.ebuild 1097 BLAKE2B 1f1dcd2ad0e605d45a532824528fea961316e1600111988c9279bd110d37e2454b94a1b1a5c7af9b6529b4517a16fcdd0cc8ec698a563e55e9402076d9a29c5a SHA512 5de1e6313a56bbb7e218821894dc0dc2d0dc980877dca46caaead61a05204443e84e0c7f7664962da676702b476f908f7e3fbfcf4fa39c65d50316353bf75c98
+EBUILD dmapi-2.2.12-r1.ebuild 1095 BLAKE2B bbd7fb176c610543a7a027f33f2db48db04121e7e9047ea3a013c6cfe004871e1b359f037d830c4044159e3e6b3349fc13d09617beeaebb965e2b40f36260e6e SHA512 a83a18f449dab9c361f43d16f31ef4a2f4af09f92c60edbb15322bfea10379af4bb1a9411dd7135273035b1f16639e2c81cfada0c9e4e5641206a2bd58a6460d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
index b8ba4f299096..9150f009d58a 100644
--- a/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
+++ b/sys-apps/dmapi/dmapi-2.2.12-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://oss.sgi.com/projects/xfs/cmd_tars/${P}.tar.gz
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="sys-fs/xfsprogs"
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 4131ec625962..4476b4c592af 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,5 +1,5 @@
 DIST dmidecode-3.1.tar.xz 61204 BLAKE2B 439e265dd3f7b225d61b5d4228c0a77b25dd44b5d3672fdd9bbe432f5ae59ac23d2abd80e40621cda934643c9819b05f34d4f5befc8a75b93ae1840caf717cea SHA512 226557ad5747a2a2eb54a938543373b9ddcff032d330ca3b9a066cc81c0e137028f606ffedc042e0220b523346e2f2f7abb0e4b8b34a8bd173719aa858519de9
 DIST dmidecode-3.2.tar.xz 54440 BLAKE2B ff5b891b28231bc50657e6fe1fa1345171109ce9baf7fa4558ced482a0616be4206ef69dcf3909611475d543b12691cc2bfe4849d8e3d35b34d1bfffe600af21 SHA512 b080c73fbda756109f0f29935c641e0b32ea9ffe90f0a8254164c9c1ff5617d042347298e6bac31e5463e94fa56efe2b2743238156d878254fc77120e6dc1a18
-EBUILD dmidecode-3.1.ebuild 1122 BLAKE2B 7deae46bbf6f486c4fd669ed863cd67eea593246ef7952aef7f4eca78451c956491cc772f6eca5d6025d7a90ab22ed780e4b888b5c9f950cd0065fe67f34baf7 SHA512 46e617bc545361696347f9716e2b5a15b741116db4264f0f8cb9b6752626b8f17cd9f7a7f57f644a63b70011ad7ed86bd03ea82507e42dc3809ff0a6c5abd247
-EBUILD dmidecode-3.2.ebuild 1134 BLAKE2B bedc7517a1f45a3a98c496eb863c92da00ef524fc2b6945b07347c3205cb9615fa2b6cd8d88448fcbe6f54589aa313a527a85d7c2aa9b2ad7ee7972f5ce370f4 SHA512 cc27c86b5fc9e8a4194692caf4eb18f2c9bccf6193597e8878bff1179e19ccae31796c9489e64721cc2afded731f003d4d066ddb7d959cebc3c1f5453309402d
+EBUILD dmidecode-3.1.ebuild 1123 BLAKE2B e6dcec8395a95552a6a7d3b1e9af23f9a527883aa462050abf3bdd465148257bbab5bacfc694a6b7293564841aeb60bcfcbaca5b3a9e0ed912e23eb57d0bde07 SHA512 90324550580716ad2cc27da60d9db274a187b94420bf7fbeef2e016456150ac0ae0d5262448991ed7bd91b28aa39b61bb844779cfef932cf19011e0655c6af86
+EBUILD dmidecode-3.2.ebuild 1135 BLAKE2B f5fce2a0d646b150d84aa77ce87c3066f2b754e512af1fad908c83ab2aa079f0fe9c42de45824201c0856efc4b1d99b14b14c98a91bfec2c2088aa4242a4455d SHA512 e31c84ae9806bcaf8564bb98441540d801eb910378d063275e30070b91cf73057c1b8568abe1aa9e5856c3985724590bafaed9d116c7b24fa50cc740358a631e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/dmidecode/dmidecode-3.1.ebuild b/sys-apps/dmidecode/dmidecode-3.1.ebuild
index 0e7d21ebd820..72de933a806a 100644
--- a/sys-apps/dmidecode/dmidecode-3.1.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* amd64 arm ~arm64 ia64 ppc ppc64 sparc x86 ~x86-solaris"
+KEYWORDS="-* amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/dmidecode/dmidecode-3.2.ebuild b/sys-apps/dmidecode/dmidecode-3.2.ebuild
index c31eb0cfaaa6..8fa87962ef52 100644
--- a/sys-apps/dmidecode/dmidecode-3.2.ebuild
+++ b/sys-apps/dmidecode/dmidecode-3.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* ~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~x86-solaris"
+KEYWORDS="-* ~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~x86-solaris"
 IUSE="selinux"
 
 RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
diff --git a/sys-apps/dstat/Manifest b/sys-apps/dstat/Manifest
index dce7c5f47aba..23d89dc2fc36 100644
--- a/sys-apps/dstat/Manifest
+++ b/sys-apps/dstat/Manifest
@@ -4,5 +4,6 @@ AUX fix-collections-deprecation-warning.patch 899 BLAKE2B ec02bf38b8c40f8f018ba6
 DIST dstat-0.7.3.tar.gz 135583 BLAKE2B c846a06b6039e49944d43cc36178fed74fd4e0e3a1a4418dbe0e5987763995eb36dff0245cfa7107d446b8ac2ea500e13980f87e97aa8e5b8d566ee188be1639 SHA512 db37cc8bb7afd235ae9088e76c4defaa4d76651b111fbfdcd0980bc96376de20d57964912799a413397a79651730503bdeb8fea5cb97ab4d6d81632f528aefd2
 DIST dstat-0.7.4.tar.gz 139992 BLAKE2B c8226358956687a4f64e248ef539b431b9e394e87986366f9941df2e86f0dac3032261ec2ca9c816d3bc89afabc352bc8bc80f9ad3eaa6118fd16bd7b0f1e68e SHA512 d100223887ebd83d0fd1259436f39419a85df9002556abcfc8e4195aa63be73d85707dcd5c4fb56a979b29131485dce6e97c177fbfca08dc50bd0f92b15cc6f5
 EBUILD dstat-0.7.3.ebuild 865 BLAKE2B 60f79ac34d777a864ad9aaa154346323b7818e219833ff152597cf1f148f60439e19430e303b0ca3fc66c69538fde1d3744d91246fe5779644a73c77558fe52a SHA512 b4462000fcd9ff5554f6e3c5571997e0db595613efb13eaf7fe2a722a79e5115046039fd09ecac7578b661c6aec15a4180ff53f87dee51e17b3b9e11f95cfbe0
+EBUILD dstat-0.7.4-r1.ebuild 1275 BLAKE2B 51870a9cc5553793b931271e93fd3abe9cb46f61d02fe416b2a6edbf62b6b84fb991009311127082fc429c888ff4d3b34d123633528026a8bc2144dcf3628b79 SHA512 00dcb52acf1cab2a0c2550e8b6b713c85cef0283dcfb77f975101928eaf02a6ae438d4a0bea6c279e42f2a7e06724e9087c90085567135591fdd3ebf595a9b01
 EBUILD dstat-0.7.4.ebuild 1166 BLAKE2B b5978c06f2ca4e89f6966fb4454c221519b15c8f35630b4e456e8696d4c2d50e4a1f58da7760d78cf03890c548c9367193e78eaf44681ccd5725121aed61afd3 SHA512 af9c40ee325c6907eecc4dc3b46071fe21f3e142addd05920ed9c8d4d9c1772228a190319f6414b6b209a395e9d972d3df2c7a1459cb3845de050178e1a4dfcb
 MISC metadata.xml 867 BLAKE2B 11beeb2f2c4f397a0be3f5c97351be3d0ad6a3d54132c8a354ee405ca429d99b0d8983ca844e4d07d4d25d3be2642f6b1c4cd47068d91bebf89b5637ea86a7ef SHA512 751ac86ff9b2aa7435743d9fff4d44a1c34a9e6bbd568c3637f2f32564723c45d8de84840b90372cd809a6d9edf7ddd706927e24d6611583ea33d7be17eef1f9
diff --git a/sys-apps/dstat/dstat-0.7.4-r1.ebuild b/sys-apps/dstat/dstat-0.7.4-r1.ebuild
new file mode 100644
index 000000000000..b2f209299e75
--- /dev/null
+++ b/sys-apps/dstat/dstat-0.7.4-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
+
+inherit python-r1
+
+DESCRIPTION="Versatile replacement for vmstat, iostat and ifstat"
+HOMEPAGE="http://dag.wieers.com/home-made/dstat/"
+SRC_URI="https://github.com/dagwieers/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples wifi"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/six[${PYTHON_USEDEP}]
+	wifi? (
+		net-wireless/python-wifi
+	)"
+DEPEND="${RDEPEND}"
+
+PATCHES=( \
+	"${FILESDIR}/dstat-${PV}-skip-non-sandbox-tests.patch" \
+	"${FILESDIR}/fix-collections-deprecation-warning.patch" \
+)
+
+src_prepare() {
+
+	# bug fix: allow delay to be specified
+	# backport from: https://github.com/dagwieers/dstat/pull/167/files
+	sed -i -e 's; / op\.delay; // op.delay;' "dstat" || die
+
+	default
+}
+
+src_install() {
+	python_foreach_impl python_doscript dstat
+
+	insinto /usr/share/dstat
+	newins dstat dstat.py
+	doins plugins/dstat_*.py
+
+	doman docs/dstat.1
+
+	einstalldocs
+
+	if use examples; then
+		dodoc examples/{mstat,read}.py
+	fi
+	if use doc; then
+		dodoc docs/*.html
+	fi
+}
diff --git a/sys-apps/dtc/Manifest b/sys-apps/dtc/Manifest
index d8c5b9fb4b4d..25235fdeffdd 100644
--- a/sys-apps/dtc/Manifest
+++ b/sys-apps/dtc/Manifest
@@ -2,19 +2,14 @@ AUX dtc-1.4.1-echo-n.patch 2169 BLAKE2B 3426ecc1043fbc0f9f475664d61efce2746d091b
 AUX dtc-1.4.1-missing-syms.patch 851 BLAKE2B f846a06b2af8ab8879cc1f34e1b2132467c8e09f107db79e1d98523146cc4760b7c79ff6d9f795154953dce6206d5c1cbca2f08136f11069def6154b59b73aa0 SHA512 8217b73ea88f5e48ab4192074f6ce6dc21eebd1cef362fabee32fdd7a50951a2c55ea8d738e43d140763b93821b8f84dbe35c8871c6018a4d56191bb3f3e9ecb
 AUX dtc-1.4.4-posix-shell.patch 1232 BLAKE2B eadb56c06e7ff7699d462e3c4c50d1f2c6eda2024443ea24970e7b7c1f9ed1dc8ec5d097aa2a6ae9cad7f934142a9fd9d13d75e6262acc26ddbed8e32a4ffbf2 SHA512 f8d21d1fc4d9c441f1214cd122303efd6aba6f87f2130486be154fa5a94599a94033361481be75bec6b19e9c7ef73986d2ac35cab1af199f390d8a0969d89185
 AUX dtc-1.5.0-fdt_check_full-visibility.patch 259 BLAKE2B db9ba9d714c16c07d3b138e1cb50d39dcb991f98bdb8b1c819018827f143e9554621c7eb2dc42b746076a39cce6f66246f8e1d304a45b91c5ee42c3b04d6b596 SHA512 49d11a3b85342ecc81f7af167439c216dcd9b94621ac2ceb8ffcb96775164b65a11047dce7b19352d73621c587c1d0c242179542c98d87a1772e7b6e3424d9a0
+AUX dtc-1.5.0-gcc-10.patch 1693 BLAKE2B 4887f0fc548343605930dc434a1a426435446d0c1d44cbf633218aa3cf90001bb97142b4a6851d5a163b893f138bd282f18d47278a1d782647c4ba1fae46be50 SHA512 2b0cf9e111b461684da7900f7f13062514c46be4c071f39ae7895be56456d80fa6a73a3798f533017a14d769194eca5458504fdebc1c9740eab149c5a2f29811
 DIST dtc-1.4.1.tar.xz 107920 BLAKE2B 523173f0adf812f2d4789b1891ad34d10dcc9f3189c9aed1903b1851d8922f116bb9c79b7ea3087ea8c43c82ccb21883893b22004187d693fdb79f3f0ca881f9 SHA512 63df730e65f62b8c9648cfee5461809188f4198cbf98de25fbe5cb7f2f43c405266abb740501740f59847dc6faf0588bcbc734d08ae5430b05c2601e070d6d05
-DIST dtc-1.4.2.tar.xz 112480 BLAKE2B 922e4924bd9672b7b5a28fbe6a02a685bcb87909356130788f72dd029a3abd075a45e9cc28bea1db5c793422e4ce093433c597f753d6fa6f7183d51d6b132e73 SHA512 af536fda543a2516e10c45b80bd1b5797a33ab43e08fab6953ec861fc98a73ee232cdd3f5053e889f6e760d238a5a221c2716b8a6fd22b627cd01efac99915b2
-DIST dtc-1.4.3.tar.xz 122732 BLAKE2B 94fe96dc846937ff8e405c4be36a32f0f320bdc6c608e95845227b6e9ab3e4c02643dd1169fd0c8c64777fa2ead8dd1cf0fc1cd2173450c23af124645f2c8b10 SHA512 ce9f39cef11f3e7048e8491f01844071bf54911ec36a0d2f2e1ed6c736b7e1a67be83cd2527895a686882d895142db020bf5131a282e0d68d1f4d32dc772db42
 DIST dtc-1.4.4.tar.xz 122748 BLAKE2B efef8ae46033bb2012aabc414ca4af78a44b1d2534be23c58004d970245a219d7d0d86c1c44cfb834f07410240dc5b8c8f926654cf73d018e5e1d625045f4d2f SHA512 20689f7b0489fa945c4df4e27084dfd46fd5512a8dff9b28d60e0cd0e9e79bbd9944e4d70a1aba86a026481b35bb5441ed6b63d306a4a8f7581517f7359fa9bf
 DIST dtc-1.4.6.tar.xz 137868 BLAKE2B a2c7e5bf1afa70f827ed5b7dadc2dba58d7b67ebf3334386ff782c46688a9ffdc9c969523225de2c32fbcaa5db0ebaf157bbf8a0be182b13cfbcafdd981b04d9 SHA512 b52862159cbf9e6e8e1ecb5844e16c81a0b9c4df255366f8a48b15cb7e080754c142da7432de2542485fce70bb2a4fa76df6d1f93cbf0118e8dbe677153b9da8
 DIST dtc-1.5.0.tar.xz 152936 BLAKE2B 4ad9cf8f8fd0ccde0c7b8b66c0039eb9b012ed26e51387c06c03fa7950ca194878bbb23b50be5b80c4d4e18140d6316092a9f0eea87e5d713856635dcfc1b0ec SHA512 fd1e692a1b7bf7987f921ad17d9be6719f7b3aa7915873b45fa86f4ecb1398a0a62cdf53c1fddf98a0f7fed9bf34a79f684018bd01a2b5e88746b50879bf7102
-EBUILD dtc-1.4.1-r1.ebuild 1137 BLAKE2B 25651c160a421cab8b6320e181ca3176629ef13243bc6a1ad818cbb75e8accfe55fe71f2bba0be787e133feaa98885488955be5c93aed7d7e99a08b59e4b937d SHA512 77794eebcfa23d0c1b81326ac48e11121e9cbcbc1a82e7b617de660b67a4ef0245048c2052783c9ae223d033d1cad5043fc8977995e78bb336f641ea05ee9c44
 EBUILD dtc-1.4.1.ebuild 1041 BLAKE2B fec3e4acafdb8bd17f7a6606cfd741f1d77215c24e55d92aca665a9fa6338d57514745c264bd6e348d6cefee4cdf767b50a8c471db527f535095a87f60b63fcd SHA512 b419004675fa24fcc520ac0a300224ed12c013d76dd25391cf41136c20cd02e3797f3dbda8f7a155c7ae85cc5bfeff0a680fa3c7b40c6c69d06a84dbc8745b30
-EBUILD dtc-1.4.2.ebuild 1066 BLAKE2B 7ee12cdbb00330dd7727d7cb008c6039a1dfc93ea3f4f1ca0e9888ec95791cac90f167947e604a9debac37cbbaeb679180a7e3efa6bcc336cb4ae58e3795bad3 SHA512 2bc122eb0350afa71fa1632b479ea48e6c498f7d4a0ec734dbac8fb936fc742659bdfde4d4478536a50c01328deec3859aa9abc275f173632390abc557995ee7
-EBUILD dtc-1.4.3.ebuild 1134 BLAKE2B db62903cf0707d92b34e0d30a26610e679a42d2ea3e8e8460b58af82114819726fa16b101cd084a7fee363b7458f2ad57a6839d605e8365f1bf5548395e1d105 SHA512 f8abf09d8c0360889eff9c21da85e473a742303f06d8c754280a4de1464dcf26a60c0e03ec27e27983a0eeb3c21706eaccfde7a3af850a4a067763b1d54dc78d
-EBUILD dtc-1.4.4-r1.ebuild 1192 BLAKE2B 5e707d4de4cb949eedea36372c432d15dc73a8e063856a092a97cecee9f1fcabfe42cd095cfbb626d12a62f6a8b5debf5334c01eb061f50d52e240a29114e780 SHA512 a6892d04e90d882681a778d48da0b411fb8aebbb9dde197b986f0243918a5d00dc92fbeb9943ca834fad06a0284691e28a11c75fe5406ec7f6409913e0f90055
-EBUILD dtc-1.4.4.ebuild 1132 BLAKE2B 6c651e39662884822cf8a8107788fbc9e4cfd097725ba79355958fcc49bfbd9ee1a611253a39618cc56ab9715f3379a4d59dddd37e4752590dd5b17bcfb8c3ba SHA512 6dc4d0eada0150c3e0507aeb7ac94a94d562858e22a73c2ae0574046eb7e25da778f9d9c28b612c04e2d7858dd39aa8ff3b76ff3d94f91af26e198ed086759ad
-EBUILD dtc-1.4.6.ebuild 1232 BLAKE2B 465ce3b8a7d1a431f302680e5dc43e3ef49c8ae0e601a29bdcc91ff69bd62f7f36e33b3c1448464f90cc1ce1b2e6bf2328e7427de8b67e476f995d55a55caeff SHA512 d2b42d2f1d9e14e046c6d7dff45e060d6438b72dac896fd5aea07d5eef055c807380b1f794a97c84588b6c2cfe5b57ee85730badc3a677c2ba29896bb932cfc1
-EBUILD dtc-1.5.0.ebuild 1253 BLAKE2B 811f6aab514460ed68595eeb7d6a94fc40d30c4757efca7597a02a882b77fc1d4f91d92066de1854bc11fee18a522aaa65a719cc8db5bcead7584fee4dc7bf84 SHA512 0433fb3ef0e2efcd933311dfc70ac2ffa9cd4fed6697d4acf06fd0b7854643368117c8978e2345a6a1ae1c4ca6c4fe909134d7bb8a41479f89f60127e3f65f01
-EBUILD dtc-9999.ebuild 1192 BLAKE2B 5e707d4de4cb949eedea36372c432d15dc73a8e063856a092a97cecee9f1fcabfe42cd095cfbb626d12a62f6a8b5debf5334c01eb061f50d52e240a29114e780 SHA512 a6892d04e90d882681a778d48da0b411fb8aebbb9dde197b986f0243918a5d00dc92fbeb9943ca834fad06a0284691e28a11c75fe5406ec7f6409913e0f90055
+EBUILD dtc-1.4.4.ebuild 1125 BLAKE2B 1ab743a8312a6fa51eb2b5bf9b4a6b2a932fa96de13990390fc1cfed3216589feb172451f09ff6b77d0f81b3bed1429d672bee419487d7a79a8d7dc39edf0549 SHA512 1e25fafcfcefd1af266b415ae780fc24361b6b4f182849b13cb7bff4479eb25c860a6b48d89404c143766ba99c5fd4670d320b4de6eab32050910b393111edf7
+EBUILD dtc-1.4.6.ebuild 1228 BLAKE2B 176476be17cba1b6e1c0847e9686f50e7bf8ec2552ac049b50db9e637130ca5060240d3fc2e10ecef266d64181859a58b13a7a8aee1bdbb797bd78f176841a8c SHA512 af09b2def31be5f54de17cd25af4c5b313154776515ba7bfe9c485b4b882a8b77add6264e73f201acb1c4bafb082a9ed7880b9f415d11b3cd09fd747f3f8a844
+EBUILD dtc-1.5.0.ebuild 1286 BLAKE2B 6e0ce034cbbc4934a2d05a74a7cdbc4928fa08364883a00d20e916e9b41b96be27db8c423d92af519bff28115980b0d3417c0c574a6bba60cebc54cf41eb3080 SHA512 66fe6ccf274a83d98595fc952eec76732dfb6ea935b398aef92a056a87e8f6e828b1eab7600c909303681bd854611d0d74d5a716ca8487954c2658e6fcbf92cb
+EBUILD dtc-9999.ebuild 1185 BLAKE2B 0acd0e3949624defcb575043ab9fca611ed7a0aa382e1f29634a5fa1c9b1e343b378e3e3c8519fb46d716ab5053d5c588742f92fcc4eae2600aa4586aa712c0f SHA512 4e82ae7cd17e6c3f02c759165945f5499f989e8385f4a9a0ce04ad96222b16763ee31ce491f309227f05c99c979319b65e86e4c39eac60ce2bae0a72006435c0
 MISC metadata.xml 416 BLAKE2B 550a9af835cd395d8cc77230f5ee6e7dcd0ff70c3290af7771bb04e5c5c6a9b5508c634555a4444e6bdac9ad007ff2bed10a05dfee57db432eb1fcf15ef57022 SHA512 7d9e26636a6fb8c5bd06cc06c837b42643313be040b2a36ff09056d81a0e75608a4593f37bb7fb2471d5e4eec5db3bd12cb8f3ddce49a8036122c2c1d8fe5187
diff --git a/sys-apps/dtc/dtc-1.4.1-r1.ebuild b/sys-apps/dtc/dtc-1.4.1-r1.ebuild
deleted file mode 100644
index 883585cd216e..000000000000
--- a/sys-apps/dtc/dtc-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit multilib toolchain-funcs eutils
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
-	inherit git-2
-else
-	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Open Firmware device tree compiler"
-HOMEPAGE="http://devicetree.org/Device_Tree_Compiler"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-RDEPEND=""
-DEPEND="app-arch/xz-utils
-	sys-devel/flex
-	sys-devel/bison"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-missing-syms.patch
-	epatch "${FILESDIR}"/${P}-echo-n.patch
-	sed -i \
-		-e '/^CFLAGS =/s:=:+=:' \
-		-e '/^CPPFLAGS =/s:=:+=:' \
-		-e 's:-Werror::' \
-		-e 's:-g -Os::' \
-		-e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
-		-e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
-		Makefile || die
-	tc-export AR CC
-	export V=1
-}
-
-src_install() {
-	default
-	use static-libs || find "${ED}" -name '*.a' -delete
-	dodoc Documentation/manual.txt
-}
diff --git a/sys-apps/dtc/dtc-1.4.2.ebuild b/sys-apps/dtc/dtc-1.4.2.ebuild
deleted file mode 100644
index 6f97719ed38c..000000000000
--- a/sys-apps/dtc/dtc-1.4.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib toolchain-funcs eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Open Firmware device tree compiler"
-HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-DEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-DOCS="
-	Documentation/manual.txt
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CFLAGS =/s:=:+=:' \
-		-e '/^CPPFLAGS =/s:=:+=:' \
-		-e 's:-Werror::' \
-		-e 's:-g -Os::' \
-		-e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
-		-e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
-		Makefile || die
-
-	tc-export AR CC
-	export V=1
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git a/sys-apps/dtc/dtc-1.4.3.ebuild b/sys-apps/dtc/dtc-1.4.3.ebuild
deleted file mode 100644
index e2eb970a0fc8..000000000000
--- a/sys-apps/dtc/dtc-1.4.3.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib toolchain-funcs eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Open Firmware device tree compiler"
-HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-DEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-DOCS="
-	Documentation/dt-object-internal.txt
-	Documentation/dts-format.txt
-	Documentation/manual.txt
-"
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CFLAGS =/s:=:+=:' \
-		-e '/^CPPFLAGS =/s:=:+=:' \
-		-e 's:-Werror::' \
-		-e 's:-g -Os::' \
-		-e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
-		-e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
-		Makefile || die
-
-	tc-export AR CC
-	export V=1
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git a/sys-apps/dtc/dtc-1.4.4-r1.ebuild b/sys-apps/dtc/dtc-1.4.4-r1.ebuild
deleted file mode 100644
index ba8b6a02661c..000000000000
--- a/sys-apps/dtc/dtc-1.4.4-r1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib toolchain-funcs eutils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/dtc/dtc.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="Open Firmware device tree compiler"
-HOMEPAGE="https://devicetree.org/ https://git.kernel.org/cgit/utils/dtc/dtc.git/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="static-libs"
-
-DEPEND="
-	sys-devel/bison
-	sys-devel/flex
-"
-DOCS="
-	Documentation/dt-object-internal.txt
-	Documentation/dts-format.txt
-	Documentation/manual.txt
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e '/^CFLAGS =/s:=:+=:' \
-		-e '/^CPPFLAGS =/s:=:+=:' \
-		-e 's:-Werror::' \
-		-e 's:-g -Os::' \
-		-e "/^PREFIX =/s:=.*:= ${EPREFIX}/usr:" \
-		-e "/^LIBDIR =/s:=.*:= \$(PREFIX)/$(get_libdir):" \
-		Makefile || die
-
-	tc-export AR CC
-	export V=1
-}
-
-src_install() {
-	default
-
-	use static-libs || find "${ED}" -name '*.a' -delete
-}
diff --git a/sys-apps/dtc/dtc-1.4.4.ebuild b/sys-apps/dtc/dtc-1.4.4.ebuild
index 1c399e8ac9c0..cd85d987078b 100644
--- a/sys-apps/dtc/dtc-1.4.4.ebuild
+++ b/sys-apps/dtc/dtc-1.4.4.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
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/dtc/dtc-1.4.6.ebuild b/sys-apps/dtc/dtc-1.4.6.ebuild
index 993c494b9b1d..14d8b75bd049 100644
--- a/sys-apps/dtc/dtc-1.4.6.ebuild
+++ b/sys-apps/dtc/dtc-1.4.6.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
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/dtc/dtc-1.5.0.ebuild b/sys-apps/dtc/dtc-1.5.0.ebuild
index d0d47ebca8e7..7abe2f748886 100644
--- a/sys-apps/dtc/dtc-1.5.0.ebuild
+++ b/sys-apps/dtc/dtc-1.5.0.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
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
@@ -32,6 +32,7 @@ DOCS="
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.4.4-posix-shell.patch
 	"${FILESDIR}"/${PN}-1.5.0-fdt_check_full-visibility.patch
+	"${FILESDIR}"/${PN}-1.5.0-gcc-10.patch
 )
 
 src_prepare() {
diff --git a/sys-apps/dtc/dtc-9999.ebuild b/sys-apps/dtc/dtc-9999.ebuild
index ba8b6a02661c..d60b43b0b331 100644
--- a/sys-apps/dtc/dtc-9999.ebuild
+++ b/sys-apps/dtc/dtc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Open Firmware device tree compiler"
diff --git a/sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch b/sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch
new file mode 100644
index 000000000000..80773bfaebbc
--- /dev/null
+++ b/sys-apps/dtc/files/dtc-1.5.0-gcc-10.patch
@@ -0,0 +1,50 @@
+https://bugs.gentoo.org/706660
+https://git.kernel.org/pub/scm/utils/dtc/dtc.git/patch/?id=0e9225eb0dfec51def612b928d2f1836b092bc7e
+
+From 0e9225eb0dfec51def612b928d2f1836b092bc7e Mon Sep 17 00:00:00 2001
+From: Dirk Mueller <dmueller@suse.com>
+Date: Tue, 14 Jan 2020 18:53:41 +0100
+Subject: Remove redundant YYLOC global declaration
+
+gcc 10 will default to -fno-common, which causes this error at link
+time:
+
+  (.text+0x0): multiple definition of `yylloc'; dtc-lexer.lex.o (symbol from plugin):(.text+0x0): first defined here
+
+This is because both dtc-lexer as well as dtc-parser define the same
+global symbol yyloc. Before with -fcommon those were merged into one
+defintion. The proper solution would be to to mark this as "extern",
+however that leads to:
+
+  dtc-lexer.l:26:16: error: redundant redeclaration of 'yylloc' [-Werror=redundant-decls]
+   26 | extern YYLTYPE yylloc;
+      |                ^~~~~~
+In file included from dtc-lexer.l:24:
+dtc-parser.tab.h:127:16: note: previous declaration of 'yylloc' was here
+  127 | extern YYLTYPE yylloc;
+      |                ^~~~~~
+cc1: all warnings being treated as errors
+
+which means the declaration is completely redundant and can just be
+dropped.
+
+Signed-off-by: Dirk Mueller <dmueller@suse.com>
+Message-Id: <20200114175341.2994-1-dmueller@suse.com>
+Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
+---
+ dtc-lexer.l | 1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/dtc-lexer.l
++++ b/dtc-lexer.l
+@@ -23,7 +23,6 @@ LINECOMMENT	"//".*\n
+ #include "srcpos.h"
+ #include "dtc-parser.tab.h"
+ 
+-YYLTYPE yylloc;
+ extern bool treesource_error;
+ 
+ /* CAUTION: this will stop working if we ever use yyless() or yyunput() */
+-- 
+cgit 1.2-0.3.lf.el7
+
diff --git a/sys-apps/ed/Manifest b/sys-apps/ed/Manifest
index a8b1dab8ec4a..3baab9780cd9 100644
--- a/sys-apps/ed/Manifest
+++ b/sys-apps/ed/Manifest
@@ -1,5 +1,5 @@
 DIST ed-1.15.tar.xz 67924 BLAKE2B 89a5614e528f974853d8c23060b77a872ae34675f6898b713543109d3a21d0d42b4d07fea5e86e842a34619617d342058ebb82655088320764295422f700fdc4 SHA512 b723353d4f2a1e719b79cb210750596c723be87c282ab96285524eb707d5ae15c242b2d7b0a282ce2ebd0aaf221cd2be41897e79f8fc17f10e9e318a9be487a0
 DIST ed-1.16.tar.xz 68432 BLAKE2B 222ab30f72fb466372cd7ced75807e9324a916ca5962c6829d562476ae1d9ae9c01235a130e58f952bd6029b931f6362d2a695b35963ca32bb3cfa539dceab0d SHA512 45b29fb86c7e7d8569c02c8177a9c7f7e691e08e913bc07b301b34210b6dc27377858ce60dd695feb950ef436c86d7059ade90396364c95aefa3c1e7a9d3a2a4
-EBUILD ed-1.15-r1.ebuild 943 BLAKE2B 25a1ce803d7295c01cfab080b7d085b3d8dcc1ea2c7027d294ce0ba688c553d2db3a5e1b61082ce94d21e3bfbbd61800b4a2b9f35bfcd78fe2f25b75d299b428 SHA512 412948185b0fbe7a7ab57045a12564e78927fbecd58c4533d8dba218783d63a33cd9435afd595345c272b9d350497e0c37fa8f6b54b2eeb0ae054aad72441c2d
-EBUILD ed-1.16.ebuild 1032 BLAKE2B 0e8bb63172581a67ada181fa66e692ab8e6e0c0a730978748f426cfa32fba8f6a17a124eda56d2ff9bd29f7f4fb8ba1c09ec601b1279bc77920ae845fc6da69c SHA512 730155bf6bfe87d8455d999df10b1ac5f39445d423fcd97fb33a6995f6600b09b1e327c548759dc14a2269c505758a57f31bd510da2d6edef64764d2c14b8104
+EBUILD ed-1.15-r1.ebuild 940 BLAKE2B fc9db3e1436b6b2029b9975b325af87e4a55361b6b359b4342e5d6f13251d21c4903e6dbbb8f45f7629f8507f4ee1f222b20b2c3f47b8919bd53484614fcba4d SHA512 4a1f7a922a10f9e3c6278f3cc633fd5ceb61409247ff39cbb6adf9aeb125ebf71c66466093be701bba4a6b1d0b478c00f22a820ccbde5753c17f935eac15c85b
+EBUILD ed-1.16.ebuild 1028 BLAKE2B fdcf538eabc2ae84db780bbc212e874fed26a1d627755de9e9cc668d56d8046c61d8e69cd2f3bc0214cfeb260e13924e6087b1e8f8dd731df5a2b7fec7569efd SHA512 1bb48e14e9905a989f3c1e3df2b1622a40ed727d2e3b962276e2da567e8732bbc3b1a8b1363e302b678b8ad9ac3e462ed6e7cc6257fc202d290b88238652c5e1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/ed/ed-1.15-r1.ebuild b/sys-apps/ed/ed-1.15-r1.ebuild
index 80f051ad728d..14abe1230a48 100644
--- a/sys-apps/ed/ed-1.15-r1.ebuild
+++ b/sys-apps/ed/ed-1.15-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${P}.tar.xz"
 
 LICENSE="GPL-3"
 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 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="sys-apps/texinfo"
diff --git a/sys-apps/ed/ed-1.16.ebuild b/sys-apps/ed/ed-1.16.ebuild
index 52585afedc81..d558c52fa98a 100644
--- a/sys-apps/ed/ed-1.16.ebuild
+++ b/sys-apps/ed/ed-1.16.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-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 ~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="sys-apps/texinfo"
diff --git a/sys-apps/edid-decode/Manifest b/sys-apps/edid-decode/Manifest
index 17a6861c09fc..767d949ba5ba 100644
--- a/sys-apps/edid-decode/Manifest
+++ b/sys-apps/edid-decode/Manifest
@@ -1,6 +1,6 @@
 DIST edid-decode-0_pre20191209.tar.gz 57651 BLAKE2B 2a8717547939b7ff25482edc00a158c1cb3ff162b6e450549a274a10b10678fabf20529c9e97a455f6d4bfaf6dcb1db54c38cea3908761432bcd4d15e58271d1 SHA512 8d4c6a15538da1720f0e6c8fc4f9f3f64e6ade0e217a6860016167eb14f752e60bbfe69979f25189979fbc6405b417e8f1a9bf9f2a75a299b4914ce1827b680f
-DIST edid-decode-0_pre20200203.tar.gz 80075 BLAKE2B 8450f7e702dba03a16bd8febe7bd97263d946538ad3bf9bc3d22b76729341b784f02b49d7e2f0e0c86c1d38e79635494e7e3f99d0c56c530a4bbef09408c7e72 SHA512 aad6a0bdb94531e2147c009950be6214c654e0a8dcb381c5154626cb0681b7273163b5422100ffb440b8c4d207affb854bfed33b797d0de6d112d7254a45003e
+DIST edid-decode-0_pre20200310.tar.gz 87818 BLAKE2B e346d19285b6a7d15a863830d0e8d53df51f88e1914a7cb130cced06f30ebb42d83dd71fe054b8f98842ca98973aeb65fb76375014c9dcecde946e6805a02b82 SHA512 7ab26216ccf42065fba022fb5415601dbc338e8c70ff039d25c2a6066e5bd9f171893b4ba52fba248d295b9ac72bce5bd0f0397ea6721799d8a7357eb6b41a6f
 EBUILD edid-decode-0_pre20191209.ebuild 688 BLAKE2B d31ea5d6c5a720c5bf49e497ad4c67e55ea680e8a709bcef4f50852064f6804362db50f160ff98c9586d4d6a6f60cddfc469484e7483121bc60000872e6d733c SHA512 8441172b6ff136a915d31affe79ffed15a1a14f904aa253966690d7813790d45311326f1a85b9fb8299963b88a838b8eb985287478d4f27162eee0953f517a3b
-EBUILD edid-decode-0_pre20200203.ebuild 690 BLAKE2B 065956c2377d847a6cdcf9d61878c80259a02662f513f85a70ac18b18b1348601420e5eb32a4e18a2edc6bec2a5d90f20abdeb3ef22b569d908d1ce2ae807a12 SHA512 18724b4c516ea70e32e340c777ab9f3818ece828462851e55389717d632786eb36dbced80ead1ae6f37bf12d636882c92e3b13ec5978a8a281380772e84ea2a9
+EBUILD edid-decode-0_pre20200310.ebuild 690 BLAKE2B b2d4af5a1fb641e5ef8b7c9241acafca14f30eaf3dab3002b2ae12469f9680e091271ed17e5d2f4c6286658803bcf1d0648eca9122c561b7c88f45c3469a2611 SHA512 0f887da62924165e3245c323a619b3d0926100119ee7a337487287463749e2569a21a6a1614bf8a8a468a968f1a7078d45408de503bc54cabe4ee327b47e55b2
 EBUILD edid-decode-9999.ebuild 550 BLAKE2B 6e79eb700ebfe891bcd2f5451ecb80a27bcbb29af23d0126f5105f984372986c23527e7781b5f5db1737fd1c6c3efe8688e2de6c84e1515f7ad6cbaf7b783739 SHA512 c913ea25760f4ef10d56c1467f3de2a9c79bac6f0f25768989207aab8354dc0fa8903d100773fb81cfdc0118d8ae6762ab9436db11c0cfba7e270fbd17bc3d76
 MISC metadata.xml 646 BLAKE2B 37a3db350195905c7a4b420d0d2d2d4741cca1b3954d42620a9a411696a734702e145bde400c4d68997aedd0de45d418faacb1d132ab385f8454f7f5c0039260 SHA512 95293d61feeeca16b0341a5c5fad464db4fca0d2dcfc9b7f51cb3d2984f3ff4530d2938d80ecdf658fc2c784368166bc5fbd220787de6564938ee2171f1816e2
diff --git a/sys-apps/edid-decode/edid-decode-0_pre20200203.ebuild b/sys-apps/edid-decode/edid-decode-0_pre20200310.ebuild
index dcd5ec78591e..1b5705aa4e70 100644
--- a/sys-apps/edid-decode/edid-decode-0_pre20200203.ebuild
+++ b/sys-apps/edid-decode/edid-decode-0_pre20200310.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 inherit toolchain-funcs
 
-EGIT_COMMIT="c29b9433af16d4b31453b000e39bb1ce64aac065"
+EGIT_COMMIT="24f1eb8acb4bf9365a66326a0b5d01eff23ba32e"
 MY_P="${PN}-${EGIT_COMMIT}"
 
 DESCRIPTION="Decode EDID data in a human-readable format"
diff --git a/sys-apps/elfix/Manifest b/sys-apps/elfix/Manifest
index da9eb5fad180..1ddaec91c310 100644
--- a/sys-apps/elfix/Manifest
+++ b/sys-apps/elfix/Manifest
@@ -1,4 +1,4 @@
 DIST elfix-0.9.5.tar.gz 401722 BLAKE2B 184f8944c62412675819ca86f13bcf23039ebcf069df528267f3e4272859e6cc442a1e05a7a121d88987c282d7e2f513d02f28ce41a8e3c0c226b456fa256aa6 SHA512 e15ab664357796f3a63ac54912eb43ae659947088a10ef16aafcbdd713cc3670fb0319cb2b95a2d29092866d322ef69df1d63847dfc0c4ab2cdd49e6eaa4635e
-EBUILD elfix-0.9.5.ebuild 1128 BLAKE2B 855bee48b874bd45e1243610f0625207116306a0399af2f1285e7959834b2d7504a2efc941826ca92a9feec86e085886354f236dd9dba314ec32ef7ed5b3ad44 SHA512 4324786653e5382859f1ad4aa3fd7ad50643de6304c21d917372d9511a1e7b6cb0370757aae012e8b3c143af239b8836348763f884cb5f87033ea67128f8ba17
+EBUILD elfix-0.9.5.ebuild 1129 BLAKE2B 9ecd048a890bdc21d9d68bfa55254617c8314d16f738c8f2551b364a2182e6ed2784b2fc9b1f2ed662f6f369c496bf8071b8b58a06bb475049dd462cad2d8ec8 SHA512 10ac672081f2364e9449d9e45aa00d45f3148269a2aa8a4fc8ba435ce0b22e64d932c9836dad34052d8aa00f06afda61c4d37537baae704832b8cb02cc0cdf49
 EBUILD elfix-9999.ebuild 1137 BLAKE2B bdd63adab9dfcbcef879b4eb35b15168533315f85de4098dc4477c6836615261e7c6a508c987a460c16836590ec26212fec6142b6b7f16985408c335314e8847 SHA512 00f937ff54b0e32255a6e59a3979340d70665b818a363d7c953c8b6aa7d79c6d55731ba23ee8b3e0a3ccb2f32f6eee2993df0879c5c51b60bfd77d740b5439f7
 MISC metadata.xml 496 BLAKE2B a26ee20b4388a77bf12e032c2091b534653874b6f0880775298da89286487d07709511d64e52b0240206d661f8874c55d4d87ce3bdc73e60e9a1432a232cf219 SHA512 b934fa247d4d5bb1d188de8bead5980aba83abe50423dd1e56c534b762b535faa242dbab58021e91bea43951542dc4f5885aff3754cc0957f01e86832bdd2c5e
diff --git a/sys-apps/elfix/elfix-0.9.5.ebuild b/sys-apps/elfix/elfix-0.9.5.ebuild
index b2ef5d33843d..519175458f3f 100644
--- a/sys-apps/elfix/elfix-0.9.5.ebuild
+++ b/sys-apps/elfix/elfix-0.9.5.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999* ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/elfix/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 DESCRIPTION="A suite of tools to work with ELF objects on Hardened Gentoo"
diff --git a/sys-apps/elivepatch-client/Manifest b/sys-apps/elivepatch-client/Manifest
index df43eb597121..b84aad3e16c5 100644
--- a/sys-apps/elivepatch-client/Manifest
+++ b/sys-apps/elivepatch-client/Manifest
@@ -1,4 +1,4 @@
 DIST elivepatch-client-0.1.tar.gz 88031 BLAKE2B 6d60bc5539e9c2bd174dc77f34f061f0a351c7ae8026659dcdcab463d2b5fc8dafa35c0ca76ed2e591f6d49c1e58b66766898e7ce774297d053bd6def4378edc SHA512 c2e324f2be6d75ffe4b2f329875f6f81ba3e4657aa1c4e6514188d5269fd68f7d50b7d823281b1bb585804f84fda639931fcd349d168c169f736ee8613f9f451
-EBUILD elivepatch-client-0.1.ebuild 603 BLAKE2B cac1e7642e2f371da189cd57d26cb410cb126ed14da1612fd3947a3a95bb8718814f1e6d5dd6abeb241b2a566787c57985321405646a724dcde4cb1e6e4fb8b5 SHA512 05ec390184f77c9a8bb41fb30d902d91444cdbb6f243bc058d6920e8d0e322b4a7d53f0ef890f35eed046b8dc396aa7c9aa74b9dc98b1bb76435b9e3a8eb1842
-EBUILD elivepatch-client-9999.ebuild 725 BLAKE2B 0721c2bd3c4331515ae60b438a33c55dfeb35b3b96490fb3a826c0661e4cc961d366d7cabcc3082fb2a5eb4308a8d5b5a94441ffebbf9969c545fa4864999a80 SHA512 a7e25cb7430f48bccf0768bb06c8592bb013ba0dddc04ec727290ea9c1c8832c28ba48a853e7e2d0bd1a80dafd73973713a9f0e9402ed18c01aa5933d7cf61ea
+EBUILD elivepatch-client-0.1.ebuild 602 BLAKE2B 541656140dd4af75e8548a9e54f662ab31f812ef97cef393e10e82ac483f25673f2ded1c775eb2bdf552f881be4375c62d6fc84f18908d1c9307f892821b7d68 SHA512 595dd8556d01fae5fbd08088aec5c009263382995b3ffea79107db2890e5681555b740c384efccac74d287c7f3bacb0f846869ef475a6e0c9c7f28aba580148d
+EBUILD elivepatch-client-9999.ebuild 724 BLAKE2B 6712ade650b4e09f0fb97b51adfe0672439b4d5aa16163e96e4c9b653d5149023bfcd2e4498148578d62967777b651bb07941fe8ebad6330b3fc8c175d7f22e6 SHA512 1107df34889e9d8a1f8b9a00f144ad7f9f80cf26dea50a0cb757f800eb23c39f1ad8212f9291317336c6d5df47c62335e5e559466787e2a7494ad2d0ed1dc35f
 MISC metadata.xml 311 BLAKE2B e6ea1b04433934bf6df08628f644783f8fd80234e06fc8d1c692dd1ad1ba1c66ce1465c2871291ef7b18dd02e3803fefd31ce1615fc790c22295da47f3b42d88 SHA512 d53e458f4c2a4844c50d65b8c75f18cf637992dbe78b17dcf20a8a0f15113df8b89c197d2f11f6160fcca7db23669db009028deec039cbf32911e966e6210e98
diff --git a/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild b/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
index b8302c17b2c9..342b201d82a7 100644
--- a/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
+++ b/sys-apps/elivepatch-client/elivepatch-client-0.1.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
 	app-admin/sudo
-	dev-python/git-python[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
index ef9800d25dac..70cc99090d40 100644
--- a/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
+++ b/sys-apps/elivepatch-client/elivepatch-client-9999.ebuild
@@ -22,7 +22,7 @@ SLOT="0"
 
 RDEPEND="
 	app-admin/sudo
-	dev-python/git-python[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
 	dev-python/requests[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sys-apps/entropy-server/Manifest b/sys-apps/entropy-server/Manifest
deleted file mode 100644
index 644e4818bfd7..000000000000
--- a/sys-apps/entropy-server/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
-EBUILD entropy-server-302-r1.ebuild 780 BLAKE2B b8ea59ae9bae844dc5ad3c2c289cf14993483c5d9911b3794f64eac75f87971f9c4146a796274647b40eba1e32a8ba5e887959bd742a534b5654155e6f4ef72a SHA512 b5d8142aa59aa0baa33530b700760bdedbd98e60d5ecd911000ba101c73477e408de4848950c6360d6f215211458d54c2ae3680677f9a1d9a2fb130f6ffc0fc2
-MISC metadata.xml 320 BLAKE2B ca21ea36322c6397cc3a57f84d8392006a14261a39c4cfe15da3434916deb3f44c087514f1f2e6658979daf1fa5593f50b920fe3b433e18ed74564cc34df1819 SHA512 a04e6b7dd069d705503948c17b83da870d918959a1a82cb67efcdb21df45bf8b3e3e43213ae2dbd584cb99516b99585a792d6d022d8fa2577fdc0b2f82ca0fea
diff --git a/sys-apps/entropy-server/entropy-server-302-r1.ebuild b/sys-apps/entropy-server/entropy-server-302-r1.ebuild
deleted file mode 100644
index a3fb4d6d958a..000000000000
--- a/sys-apps/entropy-server/entropy-server-302-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1 bash-completion-r1
-
-DESCRIPTION="Entropy Package Manager server-side tools"
-HOMEPAGE="http://www.sabayon.org"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+matter"
-
-SRC_URI="mirror://sabayon/sys-apps/entropy-${PV}.tar.bz2"
-
-S="${WORKDIR}/entropy-${PV}/server"
-
-RDEPEND="~sys-apps/entropy-${PV}[${PYTHON_SINGLE_USEDEP}]
-	matter? ( ~app-admin/matter-${PV}[entropy] )
-	${PYTHON_DEPS}
-	"
-DEPEND="app-text/asciidoc"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newbashcomp "${S}/eit-completion.bash" eit
-
-	python_optimize "${D}/usr/lib/entropy/server"
-}
diff --git a/sys-apps/entropy-server/metadata.xml b/sys-apps/entropy-server/metadata.xml
deleted file mode 100644
index 96469c72571a..000000000000
--- a/sys-apps/entropy-server/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
-	<use>
-		<flag name="matter">Pull in app-admin/matter</flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-apps/entropy/Manifest b/sys-apps/entropy/Manifest
deleted file mode 100644
index 35cc083e7914..000000000000
--- a/sys-apps/entropy/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST entropy-302.tar.bz2 1701434 BLAKE2B 6e95c000921ddcbf2dd360b841245b9d1ea3e0b14aa5c3d9c532cfb0c56ab9746549d39ec5f27a22d3fed3e1e1fa809fc8e443c212403c4c22fe87af8a4b5955 SHA512 9c3e577b9d3d94ec8491fc10012aec1347bfe440c8bdc473df73e424ae4e3eb89bf96e31c444e8d6ff7574848a6ac44f5ed114bc90d2e6b03e4a00f9873c027e
-EBUILD entropy-302-r2.ebuild 3169 BLAKE2B 9df21299499d377f283bb9f4d2ee371980a024fc8e616fabb7ba7522dfc28382878e420c044a2affb8c17c66b54b3f00883328205a308fd9bd5299258d4d76d9 SHA512 3570bb9b15653539e01792ca95626bb83fd3f86b03aa1088d0122bd50003ca66d2a3337a1b247893b454f7436558be1014425973b258755cb51ab466ece7fa36
-MISC metadata.xml 251 BLAKE2B 6092e9d1541af183e24d9f6d2eadb7e9dcac2ce623e0f0487448129cc529e6e824d327243cf04f7f4d32f39cf883b7918b3eb2e5d056e7568fbf6b52aea58bde SHA512 bb292278e0e82efd7370aa9e67eab1ec2c2779afbadf10c74fc4e909ea87cdd1ac1ae284c49ca8b910124010237bd19407338bf9290f718637b1a9a7c311a174
diff --git a/sys-apps/entropy/entropy-302-r2.ebuild b/sys-apps/entropy/entropy-302-r2.ebuild
deleted file mode 100644
index 60d514f0e66c..000000000000
--- a/sys-apps/entropy/entropy-302-r2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit eutils python-single-r1 user
-
-DESCRIPTION="Entropy Package Manager foundation library"
-HOMEPAGE="http://www.sabayon.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
-
-IUSE=""
-SRC_URI="mirror://sabayon/${CATEGORY}/${P}.tar.bz2"
-
-RDEPEND=">=app-misc/pax-utils-0.7
-	dev-db/sqlite:3[soundex(+)]
-	net-misc/rsync
-	sys-apps/diffutils
-	sys-apps/sandbox
-	$(python_gen_cond_dep '
-		>=sys-apps/portage-2.1.9[${PYTHON_MULTI_USEDEP}]
-	')
-	sys-devel/gettext
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	dev-util/intltool"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${S}/lib"
-
-REPO_CONFPATH="${ROOT}/etc/entropy/repositories.conf"
-REPO_D_CONFPATH="${ROOT}/etc/entropy/repositories.conf.d"
-ENTROPY_CACHEDIR="${ROOT}/var/lib/entropy/caches"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	# Can:
-	# - update repos
-	# - update security advisories
-	# - handle on-disk cache (atm)
-	enewgroup entropy || die "failed to create entropy group"
-	# Create unprivileged entropy user
-	enewgroup entropy-nopriv || die "failed to create entropy-nopriv group"
-	enewuser entropy-nopriv -1 -1 -1 entropy-nopriv || die "failed to create entropy-nopriv user"
-}
-
-src_install() {
-	emake DESTDIR="${D}" LIBDIR="usr/lib" install
-
-	python_optimize "${D}/usr/lib/entropy/lib/entropy"
-}
-
-pkg_postinst() {
-	for ex_conf in "${REPO_D_CONFPATH}"/_entropy_sabayon-limbo.example; do
-		real_conf="${ex_conf%.example}"
-		if [ -f "${real_conf}" ] || [ -f "${real_conf/_}" ]; then
-			# skip installation then
-			continue
-		fi
-		elog "Installing: ${real_conf}"
-		cp "${ex_conf}" "${real_conf}" -p
-	done
-
-	# Copy config file over
-	if [ -f "${REPO_CONFPATH}.example" ] && [ ! -f "${REPO_CONFPATH}" ]; then
-		elog "Copying ${REPO_CONFPATH}.example over to ${REPO_CONFPATH}"
-		cp "${REPO_CONFPATH}.example" "${REPO_CONFPATH}" -p
-	fi
-
-	if [ -d "${ENTROPY_CACHEDIR}" ]; then
-		einfo "Purging current Entropy cache"
-		rm -rf "${ENTROPY_CACHEDIR}"/*
-	fi
-
-	# Fixup Entropy Resources Lock, and /etc/entropy/packages
-	# files permissions. This fixes unprivileged Entropy Library usage
-	local res_file="${ROOT}"/var/lib/entropy/client/database/*/.using_resources
-	if [ -f "${res_file}" ]; then
-		chown root:entropy "${res_file}"
-		chmod g+rw "${res_file}"
-		chmod o+r "${res_file}"
-	fi
-	local pkg_files="package.mask package.unmask package.mask.d package.unmask.d"
-	local pkg_file
-	for pkg_file in ${pkg_files}; do
-		pkg_file="${ROOT}/etc/entropy/packages/${pkg_file}"
-		recursive=""
-		if [ -d "${pkg_file}" ]; then
-			recursive="-R"
-		fi
-		if [ -e "${pkg_file}" ]; then
-			chown ${recursive} root:entropy "${pkg_file}"
-			chmod ${recursive} go+r "${pkg_file}"
-		fi
-	done
-
-	# Setup Entropy Library directories ownership
-	chown root:entropy "${ROOT}/var/lib/entropy" # no recursion
-	chown root:entropy "${ROOT}/var/lib/entropy/client/packages" # no recursion
-	chown root:entropy "${ROOT}/var/log/entropy" # no recursion
-
-	echo
-	elog "If you want to enable Entropy packages delta download support, please"
-	elog "install dev-util/bsdiff."
-	echo
-}
diff --git a/sys-apps/etckeeper/Manifest b/sys-apps/etckeeper/Manifest
index 3ad5693edca2..25f37aaf88ec 100644
--- a/sys-apps/etckeeper/Manifest
+++ b/sys-apps/etckeeper/Manifest
@@ -1,12 +1,7 @@
 AUX 99etckeeper 60 BLAKE2B 65268cf8095ebe7e59f4986e44f5a4170bc66f70cbeb6ffc2b1ff4bc9dc89665c0747ca62de89ab604d394663615fd2f0b20e9a219439d0159ecf5a38dcee51f SHA512 b2c49d5a1fe2fb8e59d6b4d85b6e2176a8bf8486cb120698050c84e067c3ec47cbd681a7b1fd1739730380f95e9c7c9092462e1f8e4bb6b9c9986b03da83443f
 AUX bashrc-r1 114 BLAKE2B 9988db1b04fe28ed01d5303a524387d5ebac81568f20b3fc3f74fb5cc3d42a2b5365be292a3b674945e69cd1f4db2a63a362f6aa7fdec0f3a6cbb9187d40d143 SHA512 2c3e068413dec16e14b196a1c3eb945af5cbc0be99c9705dce18a7c6d3f70d625aedd2799cad085236923bbeaeafa0edbf7a1f97736ca548b4269257ffbeb01c
 AUX etckeeper-1.18.14-gentoo.patch 2836 BLAKE2B ddc957ac78997859f4f5b629b6d1e2d8a661bf55f3c5b5969f6d3fc0e09bea9dffb343a31e062aaf45d3f7d5bbcd39395165141c41aad56a4e60efdd76d6ba99 SHA512 d0389b8d2018f22af75d18781f6c166c50189e51604f341fb4eb259d58741b984a58a80e9db8ab979c4b6867d349655bc19787aabd0f932657e311d2a315f25c
-AUX etckeeper-1.18.6-gentoo.patch 2588 BLAKE2B 38f0b3cf6ecc2b47b59d6eee3d081f47e79cd0ebd4b3d0099a893257275fa8f7803da6b3aea7a90232632aa4106a2a8b9477bb9a78e200635958de7c8b3db93b SHA512 eb2d8f7eca7d5731518aec24c931aebe8a70f22a049d88f002d7649809762d82619b4c0bbc47a6207f2e018fc35bc497c30308adbfa7b62b4191f105cf5aeb40
 AUX etckeeper.tmpfilesd 40 BLAKE2B 870679a3ef88348765025038a64480002c014ecad6e6b6f3db09935716a75cd9c315c13857db81e305e65c47da70ad3367dbf0f0a43dbe88c376ca659697497d SHA512 057871c3c0e416dd52a9879a3dba96347359d98ee884098f55351920c5275e4bfe984f68e13662e4e06f876a8c7cb2d4f0dc1f204e3bcdd74601c1e420861280
 DIST etckeeper-1.18.14.tar.gz 93528 BLAKE2B b36316b4a92ae7f885a1c0c0974fa69a3c1cee06ab9eb0bbee8c025f76b1dffcd19ac2f92fed49372873f54234ec1e8da023cab98097562d3eecd862ca4d98c7 SHA512 1bc01845d47ce3af1ef56474745843e8be6e005da90a21bed302fe73476fbf1f64b84fae7dac73139c394ca698bd146e1609fa34ebbc6737ba73a6f61e670948
-DIST etckeeper-1.18.6.tar.gz 73487 BLAKE2B 2ec0a0ff2d87879586328de638212cbbf3bc0c87d9b1869beb6509f6b445996411d0116ecb2c4d407b3329a7b1a555f00077d20630fbbd45b2d75527d9d4c6ca SHA512 a5a3a4677f31cf1d010ab40ed37ce602c71c2e8ebf2273bf8be6dc8209f603ae0fc6a2c0d5d60d9a9d9aa4f3e7b7c0037534890cbc67b38132e5f654abcda04c
-DIST etckeeper-1.18.8.tar.gz 84964 BLAKE2B 0429efb61e3d23a897413e472a66216051324381c670cc4842526539d9d173ed1918822d31a04e7e3fa2da7a5a6c805781227677316b8802a770ddb19f576b31 SHA512 35607622d7533d9acb28af2320a571b66ac5a5e2dd44703ec542e0a95622b11a7709134f26d6dba6741b99247c00481172c2601109dc501630f02c25530a516c
-EBUILD etckeeper-1.18.14.ebuild 1708 BLAKE2B 8d2787ec9c1993c898e0a8b80be0c3f277b6db0fba1bb98dbeb492b5d09100da3215049777fa3dd1a8872cc696386043d5fd061ecca6e21b481802c72a84f5c1 SHA512 306adb935e2c86de47060119a23a4cd072190e800f779a1b94bae81724b8efe73684c1dc33ecbca9e84046ad9ad142dccd9d1cff10937f53d492e515c6182978
-EBUILD etckeeper-1.18.6.ebuild 1717 BLAKE2B bcc5ee6c6a4d0a90db29322045c2fd803da154a1f667b2c5c2772c775aa57810ad287e49819b638109298d20f125be0f9d215669eaf6030a020da7a03a44d938 SHA512 7b3e7cc6fb32a9690c717ee6a4771594104bc0208c2b19ad804774ccbd3c0fd7def7192836fd877b183efe6bfe3b42a4c6842430d1228b7213f1fd28eaeb4a5e
-EBUILD etckeeper-1.18.8.ebuild 1865 BLAKE2B ab0dc448bd4e4a4b66ec5f6a9f3138d23639a7c54966075f3d61533e9751b49d7f88ef73fe9d866cdec0e1b0f3d4df4fc37e9a7702426e2b3dba4c2218b946d2 SHA512 95f6501675893a560b58906553567fec84164d6965671cbd528733d5f83d7cc8d775bd0a35d4d093d3bbe6e43c95d08a1b857a698aa2fb2e0f904cc6f17b9221
-MISC metadata.xml 864 BLAKE2B 0c772a7199527cbbd5dad94b7ad84bda0c95c9213f2b767c3d4b7ee6a9f97f5f2abf7814730427c8792e37b93534e86401026e1bbd2e4cdd5562f038c9be1e7c SHA512 eb19c5aae26f92d59e6bfb12f823dcade3e63ff6bbc9b8d363b5c76de128fb049ff815e7bb5b10d9ffb7d24b3d165969fcd01a6b1151f041192a09be1fdf1663
+EBUILD etckeeper-1.18.14.ebuild 1705 BLAKE2B 6e4b27820a9de14ea5e1e0f6a588589983e3326a23ec968b0a53e3b486749e31de39cc230a0568bb32e889aea159effd15bb11a9002498c10a2091b196d7cc05 SHA512 d31598fc22846eaef27c8a653b72964de28ef944de6b627032b74cce5e5dce2ad220f56fd34581cf47d9e6bfae0b4c9e146f42758daaead79656995276999a41
+MISC metadata.xml 784 BLAKE2B c9e0c9c6193bc006043882ca31347e796f8e6669d4ae6121bf4334b24209a69a128ea87fe797711a7bfd3238981017dbc889793eae8f3cdf4271542abe938fd6 SHA512 b896905b4940b22136b9f5a83db6d0625cd99ffbb8e586c2b1c29d8b780db1cd59a9eebaf72bea13a4e134f2014948fcf3c3247d38da06a49f952fd456d13181
diff --git a/sys-apps/etckeeper/etckeeper-1.18.14.ebuild b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
index 7ba7193c63e8..19e82426b9ea 100644
--- a/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
+++ b/sys-apps/etckeeper/etckeeper-1.18.14.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://etckeeper.branchable.com/"
 SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc64 x86"
 SLOT="0"
 IUSE="cron test"
 
diff --git a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild b/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
deleted file mode 100644
index 6ac5a4243660..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.6.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils prefix python-r1
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://github.com/joeyh/etckeeper/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm ~ppc64 x86"
-SLOT="0"
-IUSE="bazaar cron"
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
-
-VCS_DEPEND="dev-vcs/git
-	dev-vcs/mercurial
-	dev-vcs/darcs"
-DEPEND="bazaar? ( dev-vcs/bzr )"
-RDEPEND="${DEPEND}
-	app-portage/portage-utils
-	cron? ( virtual/cron )
-	bazaar? ( ${PYTHON_DEPS} )
-	!bazaar? ( || ( ${VCS_DEPEND} ) )"
-
-PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
-
-src_compile() {
-	:
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	bzr_install() {
-		${PYTHON} ./${PN}-bzr/__init__.py install --root="${ED}" ||
-			die "bzr support installation failed!"
-	}
-	use bazaar && python_foreach_impl bzr_install
-
-	if use prefix; then
-		doenvd "${FILESDIR}"/99${PN}
-		eprefixify "${ED%/}"/etc/env.d/99${PN}
-	fi
-
-	dodoc doc/README.mdwn
-	docinto examples
-	newdoc "${FILESDIR}"/bashrc-r1 bashrc
-
-	if use cron ; then
-		exeinto /etc/cron.daily
-		newexe debian/cron.daily etckeeper
-	fi
-}
-
-pkg_postinst() {
-	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
-	elog "	dev-vcs/bzr"
-	elog "This ebuild just ensures at least one is installed!"
-	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
-	elog
-	elog "You may want to adjust your /etc/portage/bashrc"
-	elog "see the example file in /usr/share/doc/${PF}/examples"
-	elog
-	elog "To initialise your etc-dir as a repository run:"
-	elog "${PN} init -d /etc"
-}
diff --git a/sys-apps/etckeeper/etckeeper-1.18.8.ebuild b/sys-apps/etckeeper/etckeeper-1.18.8.ebuild
deleted file mode 100644
index 7c5d60b113f6..000000000000
--- a/sys-apps/etckeeper/etckeeper-1.18.8.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit bash-completion-r1 prefix python-r1
-
-DESCRIPTION="A collection of tools to let /etc be stored in a repository"
-HOMEPAGE="https://etckeeper.branchable.com/"
-SRC_URI="https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
-SLOT="0"
-IUSE="bazaar cron test"
-REQUIRED_USE="bazaar? ( ${PYTHON_REQUIRED_USE} )"
-
-VCS_DEPEND="dev-vcs/git
-	dev-vcs/mercurial
-	dev-vcs/darcs"
-DEPEND="bazaar? ( dev-vcs/bzr[${PYTHON_USEDEP}] )"
-RDEPEND="${DEPEND}
-	app-portage/portage-utils
-	cron? ( virtual/cron )
-	bazaar? ( ${PYTHON_DEPS} )
-	!bazaar? ( || ( ${VCS_DEPEND} ) )"
-DEPEND="${DEPEND}
-	test? ( dev-util/bats )"
-RESTRICT="!test? ( test )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.18.6-gentoo.patch )
-
-src_prepare() {
-	default
-	hprefixify *.d/* etckeeper
-}
-
-src_compile() {
-	:
-}
-
-src_install() {
-	emake DESTDIR="${ED}" install
-
-	bzr_install() {
-		"${EPYTHON}" ./${PN}-bzr/__init__.py install --root="${ED}" ||
-			die "bzr support installation failed!"
-	}
-	use bazaar && python_foreach_impl bzr_install
-
-	doenvd "$(prefixify_ro "${FILESDIR}"/99${PN})"
-
-	newbashcomp bash_completion ${PN}
-	dodoc doc/README.mdwn
-	newdoc "${FILESDIR}"/bashrc-r1 bashrc.example
-
-	if use cron ; then
-		exeinto /etc/cron.daily
-		newexe debian/cron.daily etckeeper
-	fi
-}
-
-pkg_postinst() {
-	elog "${PN} supports the following VCS: ${VCS_DEPEND}"
-	elog "	dev-vcs/bzr"
-	elog "This ebuild just ensures at least one is installed!"
-	elog "For dev-vcs/bzr you need to enable 'bazaar' useflag."
-	elog
-	elog "You may want to adjust your /etc/portage/bashrc"
-	elog "see the example file in /usr/share/doc/${PF}/examples"
-	elog
-	elog "To initialise your etc-dir as a repository run:"
-	elog "${PN} init -d /etc"
-}
diff --git a/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch b/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch
deleted file mode 100644
index 247f98ede828..000000000000
--- a/sys-apps/etckeeper/files/etckeeper-1.18.6-gentoo.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 026fa7c012a8c44cadfa56f605c0671639a6b04c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Manuel=20R=C3=BCger?= <manuel@rueg.eu>
-Date: Tue, 16 Feb 2016 00:19:07 +0100
-Subject: [PATCH] Support Gentoo's package managers
-
-
-diff --git a/Makefile b/Makefile
-index 70bddfa..6090a4e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -58,7 +58,6 @@ ifeq ($(HIGHLEVEL_PACKAGE_MANAGER),zypper)
- 	mkdir -p $(DESTDIR)$(prefix)/lib/zypp/plugins/commit
- 	$(INSTALL) zypper-etckeeper.py $(DESTDIR)$(prefix)/lib/zypp/plugins/commit/zypper-etckeeper.py
- endif
--	-$(PYTHON) ./etckeeper-bzr/__init__.py install --root=$(DESTDIR) ${PYTHON_INSTALL_OPTS} || echo "** bzr support not installed"
- 	echo "** installation successful"
- 
- clean: etckeeper.spec etckeeper.version
-diff --git a/etckeeper.conf b/etckeeper.conf
-index 0d268bd..81214c7 100644
---- a/etckeeper.conf
-+++ b/etckeeper.conf
-@@ -31,11 +31,21 @@ DARCS_COMMIT_OPTIONS="-a"
- 
- # The high-level package manager that's being used.
- # (apt, pacman, pacman-g2, yum, dnf, zypper, apk etc)
--HIGHLEVEL_PACKAGE_MANAGER=apt
-+#HIGHLEVEL_PACKAGE_MANAGER=apt
-+
-+# Gentoo specific:
-+# For portage this is emerge
-+# For paludis this is cave
-+HIGHLEVEL_PACKAGE_MANAGER=emerge
- 
- # The low-level package manager that's being used.
- # (dpkg, rpm, pacman, pacmatic, pacman-g2, apk etc)
--LOWLEVEL_PACKAGE_MANAGER=dpkg
-+#LOWLEVEL_PACKAGE_MANAGER=dpkg
-+
-+# Gentoo specific:
-+# For portage this is qlist
-+# For paludis this is cave
-+LOWLEVEL_PACKAGE_MANAGER=qlist
- 
- # To push each commit to a remote, put the name of the remote here.
- # (eg, "origin" for git). Space-separated lists of multiple remotes
-diff --git a/list-installed.d/50list-installed b/list-installed.d/50list-installed
-index 129447f..79d67f2 100755
---- a/list-installed.d/50list-installed
-+++ b/list-installed.d/50list-installed
-@@ -21,5 +21,9 @@ else
- 		pkg info -E "*"
- 	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = apk ]; then
- 		apk info -v | sort
-+	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = qlist ]; then
-+		qlist -ICv
-+	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = cave ]; then
-+		cave print-packages -r installed
- 	fi
- fi
-diff --git a/update-ignore.d/01update-ignore b/update-ignore.d/01update-ignore
-index 7347287..5dbb398 100755
---- a/update-ignore.d/01update-ignore
-+++ b/update-ignore.d/01update-ignore
-@@ -99,6 +99,10 @@ writefile () {
- 		ignore "*.pacorig"
- 		ignore "*.pacsave"
- 		nl
-+	elif [ "$LOWLEVEL_PACKAGE_MANAGER" = "qlist" -o "$LOWLEVEL_PACKAGE_MANAGER" = "cave" ]; then
-+		comment "new and old versions of conffiles, stored by emerge"
-+		ignore "._cfg*"
-+		nl
- 	fi
- 	
- 	comment "old versions of files"
--- 
-2.7.1
-
diff --git a/sys-apps/etckeeper/metadata.xml b/sys-apps/etckeeper/metadata.xml
index 3005ddb12475..affe25c2e34c 100644
--- a/sys-apps/etckeeper/metadata.xml
+++ b/sys-apps/etckeeper/metadata.xml
@@ -6,8 +6,6 @@
 		<name>Georgy Yakovlev</name>
 	</maintainer>
 	<use>
-		<flag name="bazaar">Support <pkg>dev-vcs/bzr</pkg> based repository
-		</flag>
 		<flag name="cron">Install cron script</flag>
 	</use>
 	<longdescription>etckeeper is a collection of tools to let /etc be stored in
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index 1dbb67c51474..e2fabb1cefbb 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,7 +1,7 @@
 DIST ethtool-4.19.tar.xz 221932 BLAKE2B 5a44d30b5b426ad89f41545617d9b36133fff8aa6c6bb0d5adacc4f5fef4e81f693ab620403a5d107d6abad177492b7adc406dc4b082c343938c228562f46f67 SHA512 5b0b83e09799a04e401563e34c4c784029803ecf83d5ba4f3a9cc92bfc7c2bc9cb0d86cb76ac9a7ffbfb379f6a0fc4bc3e0cf9b7826971e46504052e40156abd
 DIST ethtool-5.3.tar.xz 237952 BLAKE2B fc8e1f1219c967d52ba19ea6c8baa0f18e1d9045a9f0b72f5991328e523dcbdcb6fa6f6c601b7637bcd268c374389d8a6ef65d7034abf68ecf83e73c2ec7149f SHA512 ad3651f74850e6773489baec27c51d077e3c080eb1d536a585ae05c618304880caf7598df5c9b1416c47ae9c4eac301032f6ea65fe47650dd9ecb7603c1857b0
 DIST ethtool-5.4.tar.xz 239288 BLAKE2B 8c8b2bee53fe3e71510684ca7c6f64153cb6f1c5ebe44cd4d1dc351885d2d9957eb206a96bda9efadb5faa0e15a3f0ba07923d7e29b27694e3e3f605151a940d SHA512 c7bfe7eae2ba207d710716274e9f5ae275c57d0bebc0a9acb95677125e64f1b42ef610032011fb59894aab46973988bad40fddbc5ccc238893e7da66f913255b
-EBUILD ethtool-4.19.ebuild 460 BLAKE2B d1f8b33a47aafcf2546eefd291621fae51df19c9fde4de66bcc53ae09f173cde0a75cd8cb4032726e233979ed1aa07d43515c81b7c6e734ccd4883530f3e6f5d SHA512 c2b98223e59d19a649fa793a8133f35b8992d03904a590a3b8fe7d0d2e412c78e06c6e1cc915bc48baec9bd95bcd1252a87ee13b5f890a2b2dd1e6c38a246b0a
-EBUILD ethtool-5.3.ebuild 469 BLAKE2B 61babc043d3d2d2090d0c2fc8a84983ffc575eb1ac48e52c820df0427d738344513b5e288997282c5da3d1938ab3cb6339920a451955731053d51768aad9a736 SHA512 02084259644ff34357677a8410778db88bbd44ff82f3a514b4cde30c41593251399df7fc9e8c84b2df766b47708a24b98421273d1f6c817d019c9527015bac44
-EBUILD ethtool-5.4.ebuild 469 BLAKE2B 8ca106ff0e0d753670fce61f09d9378b239c590bb95f5f20d087b2da6a40628898f5df455eaca9765ab1459bab5234fdaa5bb79799e876dc8796c9e4e2afb686 SHA512 92f13ef570ad9f7eea9b5e01f16e207cf07aa9e38830c5b93517fb89d3b37c469860f03530fab8fcd15957e31ed10cf458d8da0485d43057ad03254b6abc0f95
+EBUILD ethtool-4.19.ebuild 457 BLAKE2B 30ef8577bd69c976e7ebd73f02bbcab300cdde178baee0a4dedb43289070f0adfc7ebab9b9c9c5b2040519fc0cd609a072fa94a3f4231718124f62a38fd34e3a SHA512 bea8e41a09aa1e06d4897b009948a536ac301db04283d739064135a6a622c1856be44c3af301bf0684c47e83777b9255baff7ff09a7625f992ebc08d5f6a64a1
+EBUILD ethtool-5.3.ebuild 465 BLAKE2B b3a0abf2d14ebf4317cd56e27d9d12c320e94e7b55993dcbc79a593a480a10bb14454ced45802415fb44792aa2c64bcc6ff36c37fea941db2f04d2020c94c155 SHA512 b3a5466fb06a497a1809e25514379d058f16cdb9bf71454b92d172803686a243cf297736d4bd0070f9729860ec442b5aa25cf1f973627abdbc971bee4d1df118
+EBUILD ethtool-5.4.ebuild 465 BLAKE2B b3a0abf2d14ebf4317cd56e27d9d12c320e94e7b55993dcbc79a593a480a10bb14454ced45802415fb44792aa2c64bcc6ff36c37fea941db2f04d2020c94c155 SHA512 b3a5466fb06a497a1809e25514379d058f16cdb9bf71454b92d172803686a243cf297736d4bd0070f9729860ec442b5aa25cf1f973627abdbc971bee4d1df118
 MISC metadata.xml 894 BLAKE2B f0d189f1c840c3f91e13aef4e6dff25c6ef17ab1b0f7f81f6c3ca4cf3d2fe650567689439050767f872cfdd10fbfce404a580dec5aec38676385851c5c613d6f SHA512 36ede687351bab379829a3872343eb73bb50a438465c0c951fbd172efcb8cc20e349b5b0ec8859f96effa7194b7c043424e4de56af1951a225fb393aefecd715
diff --git a/sys-apps/ethtool/ethtool-4.19.ebuild b/sys-apps/ethtool/ethtool-4.19.ebuild
index 8e3d87bbb1e5..bec240035385 100644
--- a/sys-apps/ethtool/ethtool-4.19.ebuild
+++ b/sys-apps/ethtool/ethtool-4.19.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-5.3.ebuild b/sys-apps/ethtool/ethtool-5.3.ebuild
index 7a20a1bbc622..11b54c899686 100644
--- a/sys-apps/ethtool/ethtool-5.3.ebuild
+++ b/sys-apps/ethtool/ethtool-5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,6 +9,6 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/ethtool/ethtool-5.4.ebuild b/sys-apps/ethtool/ethtool-5.4.ebuild
index ae3e22f3417f..11b54c899686 100644
--- a/sys-apps/ethtool/ethtool-5.4.ebuild
+++ b/sys-apps/ethtool/ethtool-5.4.ebuild
@@ -9,6 +9,6 @@ SRC_URI="https://www.kernel.org/pub/software/network/ethtool/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 
 DEPEND="app-arch/xz-utils"
diff --git a/sys-apps/fakeroot/Manifest b/sys-apps/fakeroot/Manifest
index 7cff7d533390..5e05add497a2 100644
--- a/sys-apps/fakeroot/Manifest
+++ b/sys-apps/fakeroot/Manifest
@@ -3,7 +3,7 @@ AUX fakeroot-1.20.2-glibc-2.24.patch 1021 BLAKE2B 1f907d709be9819d4d7a9113fe17d7
 DIST fakeroot_1.22.orig.tar.bz2 338238 BLAKE2B b6cee7483ea7ec17747e638cbfefa565f26b3b00517f3ec90280f8ce556ce8efa3833accc07885365e20f80967a67291fadc27cd80766548cc86e2aa70c74c33 SHA512 193478d9ff88ca2ae69fe47b73b6c61aeb2ba3f2a9e7ed5d455022705857c6f34cdcbe2d3f614c4c4c9509368dc78b9a7b7aa56fb3b50bb3309448140abd796a
 DIST fakeroot_1.23.orig.tar.xz 298080 BLAKE2B eac3da8486d57266f0f6af0479f0fcec5aaf82f4707ad8f810f954373a31cf5f390ef57dcc71ba630a1d4a578df95ac9beda9c93b3c75adffcbc89860f442b69 SHA512 0984679207e6e340abf715d4b26a213f85420cd8c58f21e65eb069337a3bd67436c6f80168412c10b28701689ec63290f122a5ff5d44a57b2b166aa72799d036
 DIST fakeroot_1.24.orig.tar.gz 522497 BLAKE2B fb08ed6512a3e26538662ceb28a197b85fd4a05c37b543529df6880e01c64bd774037bed1230bf7d7fe0bde798364c2fd0fcfab257fff4d3e6ae9800c076a5b0 SHA512 b15db7bbfb03264f294fb3b42813e17758b43ef7f121e55a24af9ec30ff3f4ec8eb0392db88133e56f9728b3828f6c1432d1e5d2e881a69d083ad444b9177487
-EBUILD fakeroot-1.22.ebuild 1066 BLAKE2B be5316bdb3495eb2bf5bf374a7ff536f780367488990858c0327d85b8b70f35154e2da8ad102c89d3e9ffc23882fdf64f9f982869d4353453022c3d64e19e6c5 SHA512 6246dd7a9c414ff72f7880af35232be7062d251a65668352111c8613cbf279e9115fb81f56d1a313df99d5721827d783071a3925d82a7f6a009cd35501b76332
+EBUILD fakeroot-1.22.ebuild 1067 BLAKE2B 12d38863a89eb5c073633b02fcf04845d48959821ad1a744b3329e98175164392dfa6cc14f006beefc3a07bb5df9b3944b016b59ad7755b8f3514e5bd7dd0d87 SHA512 5ef0839952eb6c3894faa97c9f0ca5e4676767b34c450d6375551301dc4d775188db6248d36d4abd0bf77e80176a7dc6701ecc79dd08a1ffda33d6d879d94d9d
 EBUILD fakeroot-1.23.ebuild 1074 BLAKE2B e0f810e84eae6eea778b7b23b8bd6e8cf9c83db4f9b58cd9e6705bb1811f8ac2f626959507865cd8b234577434a4e2aef6b77082b0422eac481e1e63a2907722 SHA512 76fe90adcfa947f794365bd641beb1d63ab76295bc6d5dc2541800c856594d61fe3c34aa1bb9c62e7463ed73986c59461cd8bbb5b421d493336ed313c2632904
 EBUILD fakeroot-1.24.ebuild 1074 BLAKE2B 5fed05940ea6f9b96e9c55d358339d01b5277d7e349399706d57f6c32cc431afa5395dbb6b84a415eb6bf82395615316ca5cd4d43eaaa6a9e846b0753727e764 SHA512 4cdf4722f803337aa923edbee68230ec2badde0c0cee46a5319c10c5141a3f771ecef4d5c7c089dca8cbcc55f5d2dc026325fd1ff737fe1f01036a4655e314c8
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-apps/fakeroot/fakeroot-1.22.ebuild b/sys-apps/fakeroot/fakeroot-1.22.ebuild
index f8c9d0df5ad9..81e7e7047e5a 100644
--- a/sys-apps/fakeroot/fakeroot-1.22.ebuild
+++ b/sys-apps/fakeroot/fakeroot-1.22.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${P/-/_}.orig.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/fbset/Manifest b/sys-apps/fbset/Manifest
index 56d7a6cccc1b..f152a6c52856 100644
--- a/sys-apps/fbset/Manifest
+++ b/sys-apps/fbset/Manifest
@@ -1,5 +1,5 @@
 AUX fbset-2.1-add-linux-types-h.patch 275 BLAKE2B 177b56c3989bf360609d3f4541537b279e6a57e3f83420c2f55edb472a5b685602dc73b852626232784afb044a79e0532cee0107ee2a4204b42cf68fbb820b2a SHA512 fb13052aed519da65e1197d81b1c583cae0c6528c362966caa3c65b324a115345745550e2589a92e0c8bab49215dd99252c14704dff71a2950332281ae83749c
 AUX fbset-2.1-build.patch 458 BLAKE2B 93340436783aed64145832fd491223a085a4497adfcfe44a7d3ed100171e0f4dfc608beda73e2659fe93dc9a965d0df47eaf0018a4e91087cabcd5482fbffdaa SHA512 97d8df2776c634ccdcf49433bb45e8e7d944e5d7cc34fe0f55085f76f0f5dfc216323a0f4e58d256767e83987dd73e96be3393bd727d791edd12f0b63ebed819
 DIST fbset-2.1.tar.gz 27721 BLAKE2B 3d078a41d178ed5347d3e8907fa4ff55c1971ccfcca3ac07ec251f7f2949b7133b4589628e349eb29c344e9a5969844b8bb3c423b329f99943a5a5f93e152d65 SHA512 7e0380760f77b0db7dcc128f6375a3ed8da4b8521d1926faba27812c5cb20e6f1a62f3a539591a81a6b7e7986940db4cd83e03d6de487e0ab7f0760ed1d21b28
-EBUILD fbset-2.1.ebuild 785 BLAKE2B 820ab3744b5d2c2849161693154ec9d8a4dafd2837537b6898aaa19d2c03b1ab27a2cc9558babbca37e1875fdfa39ce0526790eae2129fc202cf8dfb4a33f542 SHA512 1351c3a52b9fc185f4cb766e36d40b7fecbfa3de3c7760a30e9b874370c7455b998cbf5a7534dbfe877bdb3a3c94866fc886bb489d86865c1299886d171c939a
+EBUILD fbset-2.1.ebuild 783 BLAKE2B eb3a24253c02bd3be7aabc1672091bc537d2d675679ec67dd29bdd66af270fae63f8dc8056205e76f376a65df9bf95ec0fa6e79bee776d58b7b1e3ae4a885adc SHA512 f9648ec31f061fb2cd79eb096b81ffb3cb11ff5f196dcfde09eca97b4439d3d186d4a7ce64fdfe66c062681b6302f6d5fd7f8be396f8d788f5ef641746d6cf4d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/fbset/fbset-2.1.ebuild b/sys-apps/fbset/fbset-2.1.ebuild
index 6c9480f461fd..941cc93c11a6 100644
--- a/sys-apps/fbset/fbset-2.1.ebuild
+++ b/sys-apps/fbset/fbset-2.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://users.telenet.be/geertu/Linux/fbdev/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 s390 sparc x86"
 IUSE="static"
 
 DEPEND="sys-devel/bison
diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest
index 41501d0a8a5f..24d114b825cb 100644
--- a/sys-apps/fd/Manifest
+++ b/sys-apps/fd/Manifest
@@ -1,34 +1,57 @@
+DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 DIST aho-corasick-0.7.6.crate 108953 BLAKE2B d713366d0783e1ffbe65408e4d38ef9f12276f61043c768265de5d47e446a378306096a70252c9a49a6e7d3b97a09f30405a3d8df6b40dc2dfeb7407ed574c95 SHA512 120aa28e72279f561d7f51657aa0800dd46504cd92f758f848284e5f3695be6f5e24056a66b0f2d971c527277e92ae938e2357ade37b5cbe1c93913a5dc308b1
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
 DIST bstr-0.2.8.crate 337654 BLAKE2B 50c5a639ec2912bd20be83a8b017e60c7b5f75f6cbe93839f8f46a4815537e47261593d17380a38aae45445d611c9fb28135e0424184958edfcc1c06e941e4aa SHA512 9e8786b68c03f059e4182046e7650b6f90431927c26c49fcdd4af3cb464092108fb2f64fdc2da1fe1d1121705ac8a21c68485b0517f3dd32040aab754f88944d
 DIST cc-1.0.45.crate 49112 BLAKE2B f24cd4aba8f84be490ee89f95c666e35156a9dfd745ba4b28a61130ec0c2ff2b8e7ebbb7363cbebe8e9fadcfcd8c1f7f72bbbcf834b146395840c5569e66bfcf SHA512 cd521fa11c0390cb7c71300ef77c5e27f10739345ff9c2d81c693191d602e8b54717237d1cfc325a39220f721df356e771c7a96885f77f43626d4e24d317434e
+DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST crossbeam-channel-0.3.9.crate 86771 BLAKE2B d0898ecfa5aaccd03ed714b657aee7a3279f4242516c2943073e75d23f23437f34bf63b465bdfef6567030c998e7b3c6bd4f5fe2e0ee4b50a03d8a15396a2090 SHA512 4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919
+DIST crossbeam-channel-0.4.2.crate 87419 BLAKE2B 721013134069abc8f01ae5e98e1e6f10981d4892881339d3bf87f1bcb58b362348dad92e702a6b2367075dd41d860d62cca0ac8b3691954c454ca70bb5158000 SHA512 19b0ed2b5ed0fb1fe7c809e08483152fc36cf46f465c8571ca0fb9ebb1cb4b2b8f5860a303c932f336f434dafa9776ce6026ea2e64457147fb540766dc6da2ce
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
+DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST ctrlc-3.1.3.crate 11792 BLAKE2B eada522e42753c751bae996f2e6af5cf9fd685c1e724c8c111ed7e74117be8e4053cd678c25a735578adc309d0a87cbc6e9d175406b8225d8c2edd2d4c7ce229 SHA512 b77b0ccfe31110c514795b390b0500cb7349d4dfa2367f6d6b9612cce3d9dfa4cbbf96018da71ff4488258a0aeb2911e0436df35ea52c3e6a464bcbe027f12e8
+DIST ctrlc-3.1.4.crate 12702 BLAKE2B 96437ca96cc75eac980623a7ae15e9ecd224f7d6373744f39b16ff0fdac708bc2761829c1d8de2bc4c66a0f6e7fcf7791831044447e9d0ac6521e4da4d566d98 SHA512 1a5101d11b57c4000edfe3cec6367d59c4a59d4db3b0c39fb50a86f175dc89bee3494950c301317e6137250499cc39aa9b30bf94042caf08cc185152743a5b2f
 DIST diff-0.1.11.crate 8165 BLAKE2B 6c651d00120b190b55b334c780ce7724e91f554cf3d85f99d8ae5f745bf4ced2e5b7d7aa307c6d0c2a6082534d238eb213868d3b528ea57a08a5e37ddc7051b8 SHA512 9c31d38bc29c9372984339b8d289317981ba483eee4430e936252b0fc44b1f500305082b19e6dc20b7d7fc81906f1c0d5c3f375b6db9f2c266e41c7015597073
+DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
 DIST fd-7.4.0.tar.gz 60366 BLAKE2B 70cfaea591ed7d58ab068fba1cba20432e70d52ddab9b0dcc48570452b97abaa9881074312114483b2280ef0fdec8f4e9ec170cf48ffc7dc2986a68bc68ca80e SHA512 abe42ffedc8bb4ac5ddff9ccfe0d38dc70604ab0184b6e300a3800735d82d25f48b7b01d3cf94a5b661810d66f706517549dcb636b01fd41cf6d8b5b31eaef31
+DIST fd-7.5.0.tar.gz 62622 BLAKE2B 97ba0e5d61f4f20a73dd19c7a37856415607913ac96ad0fb18d2b84ffd1a2c3b9ca8ee001bcf3678f47bd4126003b57d94b7624e3d10fc9a1e65d80a5da89625 SHA512 bfaacd14ab48594eb1ef751673a0301590a7301d80040fc2dbc05506cf92d1f0fdc59786aa09af3e37112aaa12bbbb85492b96a017e85495e640569257d42ad3
+DIST fd-find-7.5.0.crate 62505 BLAKE2B 4cc4aa4a75ba34c26df03c1ba14e48c80365beecb6bd73087a01a6f50cba8866ccc4a5a3b22501e8a603e659ba69f5c04f1e55599e3d0b923e39da297c7fe99a SHA512 873ef1d4134a78833cf5f09dd7131c3083c1d2ed5330dbe9735a1d52edf9c2e014cc8d4e441333e7b8fc3c11717db4588c2434cc2f98c8ee0a10fdcdadf0080d
 DIST filetime-0.2.7.crate 13469 BLAKE2B 6ec71f64de621b86c0ea46856fd9a7f364820916922f88611bc324696d5d34c73600ddaa204bd2119e29b0b38cdbbabc55aee669d87e9d77408dfdd844200a8d SHA512 410d45d9ad4d657da1d2cd16de58963f3096cf6e1978ffa4579b3696f0f4926cda303df7c4d02cfa8d71560518032750729a4184160a31229d590cbbec471d6a
+DIST filetime-0.2.8.crate 13527 BLAKE2B 49b9f7a786e3920fd0d457e8ef09fb729dcf557483e17940091ea7079d3bf331e28b7d9029b3840608c8abd6ef1ecd559644826bf5f9bec66881022da9ff72e4 SHA512 c94d3c3926972f3105be52a48654afe3ebc7822d2ef77a2000113c3a85e7f0084b3598c6845a09e8e530d68f50637c3c0b9a058fdfb68052117af3ddcee89d2a
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fs_extra-1.1.0.crate 29292 BLAKE2B ea1b787484218733a2c107ff059f3e89357afc51c510da0f5f30e4c9289c722a7c810a0a08138673aa454445dfcb08caa986ac64165ac27476d9b709d819308f SHA512 c001a37a23a614f1752a45fbf392694911c8d06bb5af8b8a40f2dcba9c80c67ab634de0dd4fa951007072204b162430fed2c89bbb11ac2fca62dfa5cd4cbd46a
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
 DIST globset-0.4.4.crate 22369 BLAKE2B 7265cf19e3f7a8e710be40760098242fe156ddfa974a59aa29018c2c317876049dec21e70f8b416ea9a0d16c33754118c7f070dd0e50de70cf8cc10e484a6030 SHA512 b9da7f4d67d4269b0b3564d65904c9cca0db7df6d33255f6022eee614f0ad03f3dc6f9e52e52fca7461308d9f01dac1f3588baf87aef735c266561b1119f9985
+DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
+DIST hermit-abi-0.1.8.crate 7581 BLAKE2B 90fef564dd39973c5ff8ee3d4a9b129f1ca00800ca459c644ee08df1542c5adbc06881a7a59d37fe6e03a72a2df21917e38544759a2833dd8f8c065261cc1512 SHA512 25f7806834ea007174001284200201895f4536d5a447dea6c165b43c30b30871f78da5f3ef0d79579e3195951e6fd7ee5e21ec80811c515fd096f2e7b3bf7b9b
 DIST humantime-1.3.0.crate 17020 BLAKE2B 37efaacedac293197ff7acc8b0446a73243a2d90ed8dbdcecd9cb0af6e901f135e1d92aa1a642460f531a6811a5f08075f8aabaa9941e96eddef301e205fdbe1 SHA512 2589bfdac96108951882b7ee497528b9084ddd344a67914810ea9961a1e319167d5cab959c66cbb26e398e75ca50d488a251694fff35f3c2f69a88b6f22844da
+DIST humantime-2.0.0.crate 17374 BLAKE2B 35f36b30d8fe3cb26f666dd57e31ab93924cf9d1c40d6c83cbf800f141c951634fcd641634a8f552baabf858303570bf8d1207e5455d5129f433d0c95b138c35 SHA512 5686246351af000cc38d10f65bd6cf3fe446dbedd75867f9bfc7a68c4b8183ccfc9e0cf14b7fa149d912acbfd9ff917d8ed5be3b5eab7832d23bf573a8e024e2
 DIST ignore-0.4.10.crate 49022 BLAKE2B 4e1fef531f800bf95bf1a601cb8f64d93ed46623217392368cd1f59fe6e353dae8e8e6d2a017c5b3bc89acf2a964eb682d30803f2d4ac3744935c4567d2675d1 SHA512 ef4b3f58bbdc3b5317a14244494ba9cad8e3d062f0c8e137dd2d33572dc8a06b20f59860aabafccb729dc682134aa4e2bdaea8c07b351aa73a8ebb00e361ceeb
+DIST ignore-0.4.12.crate 51983 BLAKE2B bc0e8c263b8f128ce53761bd225249f08cc81c4301eb496c8503e468832f5dd8d93f5e0ffaa5b5590cda3ba94c3b861cbe96afc4d3cd309d1aa3030224bfebd1 SHA512 5e0afb4094ba87051dc5c545aa673bfe86fbed4dc33462f444992177d114b18400936a2a018c44fc19503951645667f16504144548753a52df3a9ebb167c0c72
 DIST jemalloc-sys-0.3.2.crate 1344660 BLAKE2B c530eed197673dd515b41d504127c6c7abf75bb2dd0063b0a693be9502e3b5ae9db6d97dbf7fdd4bbab626ba1f788bf6b8e6804a476e109f22737bd2a79dcdff SHA512 b718dd98474d16fa5448bba62ac5e18a9e9798f31fce19dbeb4a12526c63e78f306454e0d9e2c6c5a3fd95660bfe82bb5fb09e4091cd8b43706eca2c4872b647
 DIST jemallocator-0.3.2.crate 16393 BLAKE2B 03c190b2f4c6cf01957a4e11d13a230dd55593e1845ae4179b60c62fa28eaed4dd27efb3113039ddab1e66a28c102d4d9c64169d0c10a1945bac162d2f613a79 SHA512 e3fd9d377d6465519e73a91d5639d47bfd6cdf5898d551c49e3efd3269d14a75bb9163980e13ff429e7dc637b8430cdfdb1f5d6ec52993fcf7b6247a69850ac6
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.62.crate 433193 BLAKE2B cb6c3f6def6c33f0723ec3dcea2ec4b96f2a7a2e0bbe5ba0ed6a6cb69a43e64016bd05569c6d8e4701592a9d69f7b8a92213a25b5889f833f03bf2f7de9cf184 SHA512 93c178429a099606d4d61576d74204e87c042c4591b8472eb56eb3ddee883b135e28be09ff48e2718c4cdadbfc641e3a313665fe493d64b1820a7e6018f79d1e
+DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
 DIST lscolors-0.6.0.crate 17577 BLAKE2B 163fbb3b212af633d73a3ff73808ef13cb687e66afff5d3a15cef992ce6c4af8960baf826abfd098ce1a2d4fdb90178b780dd81404859be2ce748027f6a5448a SHA512 245e5d9fca5355d7135d089f9b1f66e4863b38829f52625366c6bf6eb7f1837d7b57ca30967843e2a6219b602618bd2048ab2a31912110083d177b7939f39e81
+DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
 DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST nix-0.14.1.crate 185227 BLAKE2B ecd12ae7580879c960cd828a22109e5a7f209a24c4208bc04d4392f36726886b66b147dbd3a1f3705edd35e53187553c125dfd47589a326c032aab0a3d3c9ba2 SHA512 c6393f47cdff2134cd51ca3d6becf0309697a11ac9956e3979a2d6cd00a86545d1af4efd63f6d5e417a80b2d9b247a7416b7182156d9966e00c6da25a3bfdcb3
+DIST nix-0.17.0.crate 195654 BLAKE2B 6857f84b3deb5800fe3167efd226f042bbcbbc61a4153ce59f69fb544616842c3f6d4566444201c669c6235d1d7577302e5404399f4937f1c0bbbd17fd47ef71 SHA512 3f2bc4f0e9dcb9753535aec9d626ad8126f0a9ea18f73760ba72be0f35d82542c659b4c443783010de133a318f423a16f71cd1f1dd5b5a1f4f71ff7bda247b63
 DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
+DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
 DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
@@ -36,24 +59,32 @@ DIST rand_core-0.4.2.crate 20243 BLAKE2B 22fee5e44127eee047ad8abcd9dd828befd0fee
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST regex-1.3.1.crate 234662 BLAKE2B 41643af1321748db717b37bd4985916afae3a84e19f628ce5d5c194de42620e6b02221083c7e4b35bea5a6749c265575b2c0318dd58ea26b8bcf8d01768e1a27 SHA512 6530767ca2896db30599e5b3e2bf46a785d9c95bda3e530e82c659e5a98345effe5424738fec7545fa5edad12729a396938a9c1dd3a680c0405dab6000fc19f7
+DIST regex-1.3.5.crate 235308 BLAKE2B 66548c392ff921815d3be3cc196c6b1ca1ddb3f1dc178935f8159335ea9b85ab7264bfca468a3c63c242c522095fc6faeb7da19b0968a40b30ad55b6536f8201 SHA512 c37c28141a9ed35250f830d1d4b84dc527cb880d6093f1e95b348aab7ecd2d2e949fe7cc23bafde217a4f704eb828bef1651854ef4ab9593e7b4ac006d2a5ef7
 DIST regex-syntax-0.6.12.crate 289531 BLAKE2B c1736b335844d8695e2795a869b538300a9bcfc92ca41e4e9840fc90c133553da4f2929b0f39fdbc7488551a8477b2adb20b83e728a3d847171579e20c925acf SHA512 671e4ecd9dbe58ab5938e0b55890ef0ab2c033221bf549ae0df3b6e831b57099b4c16f8577ca134a758999a1bfc0840aff49be138fb6a19e0b081089f66fa0ec
+DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST tempdir-0.3.7.crate 11468 BLAKE2B 65850a69a07c5c7e5c25d77bfc9881c994b1fe8466b1712b904d9758b234f8d12db6e1b740d461a48b13667bdeca8178e75c956fd6eaa0c0d5aca5aa1ac7523b SHA512 e5b02f7d260ff594fc2dbbd441eb8adfa36ede937f32c8c812b458167c0e49f5cf493c6ebf83ce8007a0aeb97016169fda7f5d2996fecc72f9409d6f463d9bbe
 DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a91b6ecd3a8f7a4e55b45910597738fd68c568b5c66feb2cf9d38ba62da705624b52ff01d30bb452c7eca8f6e8 SHA512 fb43e0519cc3371b23b3d4c52d25c59c3e45afc550ba081e8cb832a48d9dbd50cbb69bb154ae7926fe869eb2c35b72b95238cdb8822910bd68b4f65927ca6a5f
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST unicode-width-0.1.6.crate 16394 BLAKE2B 8a4bd3dbe264635cbfe42c131f20a0e8f32989211434fbcc085abeb8b7fac841908e99c6130d626af363edf9b07fb82f6ddbc494812273521941d553980142c9 SHA512 d6c2e5a99ea359d866393a6b00e0e21e5d80e4e665e457c0f2f0bbebda53afeab75b1d9b6b79102339ee621bac5050e7d41621703a8fd9ffe1e74a5a4301aa05
+DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
 DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
+DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
 DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
+DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 EBUILD fd-7.4.0.ebuild 2055 BLAKE2B 8b22369803867d82eea3f124823206d9b4a54a4330dabd41a965c7946b89eda8a98e15b897b09a91c02dd5e8c3917e6a96d44d86346048924e06fdbca0ad8e3d SHA512 9d8a6b7684e702d7e8710e4f6a6dd1fe995545e20fb8eed749150ec7246cec47d29f22f59f75582c88a61043f0d004e4d13c8730a57ef74e9dfd201d85d68241
+EBUILD fd-7.5.0.ebuild 2106 BLAKE2B 174f7c2a780ea44343e5029ad249a458baaa150c4b3c4725545473523fe414eeba6902cc931910f41334cda323347400e9162b5045bd61d16dfe448cc3937b5b SHA512 0d6c19b6108163cf3d70c39a00939f85108a71dab2df92f266370ddd562d81a810f412d948db742fb59c613ab54492a3f81f55a5e3a736ecd4cf1cf20986c279
 MISC metadata.xml 574 BLAKE2B cd747fc4e172f68394809255369afc79c95ce0667115fdda99bb38635a267be76880a75d781d1988f1ec3a0ca4b139e74c9f97c7faf65ac240c40ee9f4f92e6f SHA512 4be62b10ffe12ecb6d4284ff29006f9d884590dac7f67658eb985906ac1bce609230f1385e388061111cfeae70de4df999d55e834b987b69f24bdb878548f758
diff --git a/sys-apps/fd/fd-7.5.0.ebuild b/sys-apps/fd/fd-7.5.0.ebuild
new file mode 100644
index 000000000000..10dc60efbbe5
--- /dev/null
+++ b/sys-apps/fd/fd-7.5.0.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+CRATES="
+aho-corasick-0.7.10
+ansi_term-0.11.0
+ansi_term-0.12.1
+atty-0.2.14
+autocfg-1.0.0
+bitflags-1.2.1
+bstr-0.2.12
+cc-1.0.50
+cfg-if-0.1.10
+clap-2.33.0
+crossbeam-channel-0.4.2
+crossbeam-utils-0.7.2
+ctrlc-3.1.4
+diff-0.1.12
+fd-find-7.5.0
+filetime-0.2.8
+fnv-1.0.6
+fs_extra-1.1.0
+fuchsia-cprng-0.1.1
+globset-0.4.5
+hermit-abi-0.1.8
+humantime-2.0.0
+ignore-0.4.12
+jemalloc-sys-0.3.2
+jemallocator-0.3.2
+kernel32-sys-0.2.2
+lazy_static-1.4.0
+libc-0.2.68
+log-0.4.8
+lscolors-0.6.0
+maybe-uninit-2.0.0
+memchr-2.3.3
+nix-0.17.0
+num_cpus-1.12.0
+rand-0.4.6
+rand_core-0.3.1
+rand_core-0.4.2
+rdrand-0.4.0
+redox_syscall-0.1.56
+regex-1.3.5
+regex-syntax-0.6.17
+remove_dir_all-0.5.2
+same-file-1.0.6
+strsim-0.8.0
+tempdir-0.3.7
+term_size-0.3.1
+textwrap-0.11.0
+thread_local-1.0.1
+unicode-width-0.1.7
+vec_map-0.8.1
+version_check-0.9.1
+void-1.0.2
+walkdir-2.3.1
+winapi-0.2.8
+winapi-0.3.8
+winapi-build-0.1.1
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.3
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="Alternative to find that provides sensible defaults for 80% of the use cases"
+HOMEPAGE="https://github.com/sharkdp/fd"
+SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 BSD-2 ISC MIT Unlicense"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND="!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )"
+RDEPEND="${DEPEND}"
+
+QA_FLAGS_IGNORED="/usr/bin/fd"
+
+src_compile() {
+	export SHELL_COMPLETIONS_DIR="${T}/shell_completions"
+	# this enables to build with system jemallloc, but musl targets do not use it at all
+	use elibc_musl || export JEMALLOC_OVERRIDE="${ESYSROOT}/usr/$(get_libdir)/libjemalloc.so"
+	cargo_src_compile
+}
+
+src_install() {
+	cargo_src_install
+
+	newbashcomp "${T}"/shell_completions/fd.bash fd
+	insinto /usr/share/zsh/site-functions
+	doins "${T}"/shell_completions/_fd
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${T}"/shell_completions/fd.fish
+	dodoc README.md
+	doman doc/*.1
+}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index c802e74c6093..b6472c6a7b21 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -1,9 +1,7 @@
 AUX file-5.37-CVE-2019-18218.patch 1038 BLAKE2B 30622d39fb4006b07fabab70dfe6fc3f574aac769c7728bada7b622fd670616efc12d42cabf95b32a8a98c811e171059af2e127c170c1935dc00def4a1fc05b6 SHA512 3517e35db03944bcca6da28ddac9f0d08ce052b03d1508d26851fd6691bedc89f3974822a1559576987c8c10a0343bc8788cc7df52406d66a591ddcd39b23a5c
-DIST file-5.36.tar.gz 875792 BLAKE2B ce1d98148e26c243982bb85357d440ab774fc42c526bca4dbff15c05247d2c15b54b030671a5590020fa5383c436204116f7817ec4dd33aa4387b059e4d7fe21 SHA512 3ec5e51ffb7a82defa74845a90fbc983f6e169fc116606049bc01ff6e720d340c8abf6eb7a08b9ac1099162a5c02deac3633b07b039d486344c8abd9052ca751
 DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
 DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
-EBUILD file-5.36.ebuild 3134 BLAKE2B 26a70c49651e9c35432ae466491d502237f977aaf8919693b68c101d2650fbd082bd14e9709b7f27fbccec71b514d6203f0224addedb19d1db5063481f5fa64d SHA512 964b8ebf50b6985ca3e05ba71d965c5634894b6d21111ea4e16913fc51be7e81cbbe76d124ae88d4277477ecec65d9d833263a108c05bad8a033e2c472115353
-EBUILD file-5.37-r1.ebuild 3199 BLAKE2B 071b3e4c7d045f0cd698c442c649fb639265be6ba2dd469297efd2449646eb47c63dacd46a7cf16b9c44c1d79db3ed0dd8fb56f841e5649082b2caff673c3335 SHA512 9731ac229e2ea10cab84d30b81c9f87c2342b9666bc3a0af1b50ce5bf15d7f972c8b8561b1de38abcf6d7282e1dab59034334b1fc0fb25f6384fb34562a06360
-EBUILD file-5.38.ebuild 3181 BLAKE2B ff3210e7613373ef2c6724afadee0c719f1e0a12fc4b95627f504f829eddda0e74fe8c7468cbba651ce977158672e5b44582f897041458963cf8bcfccc6f8f36 SHA512 e6e00a2a98cc6a5a09aafe7f16d02bd3f37035c6469493074c0072abd0de0e65f11d66a5a1312493a35ba838a5d893978a8502bc3344eaa9b6638f5342ad2631
-EBUILD file-9999.ebuild 3255 BLAKE2B a122a89172ec84d405f851dc868a46fe015ecdfeb4769bdad8336df94c13d28b81ed19707380a52caa3557ce4b89ef63d211db1056a21caa20ddba10bebad059 SHA512 5b439e74d3871f7d955a5c3b162a980f0d702604e2ce94d67eb394c37e2fb0841a302eb4618169cb169f58176a047a7006add53bb22a22c141981cbd5f3274da
+EBUILD file-5.37-r1.ebuild 3195 BLAKE2B 5df6a8ae357a37c141a628edec150a6ae0c7780eef35011e21c677c84b0e52166a4b536ca25bbfb5aab42d9a03be382a2d761571e8542bc1f991d9b2ae1f4efb SHA512 f62b0c4a564e166eba4f1f3dbf315057acbd801c308d6cd8d52b5114d43a3dcb80a4c644e8eae64f0c85cea035dac25b10350433f2607e3d9fb881db158fecd0
+EBUILD file-5.38.ebuild 3177 BLAKE2B a6901e580c6551934775041b33b9aea80074a143713ef066378cce5b45904ff772c9b521bae79b083dd8015aa92e0b93aa9c7f0e08144a2546f85750fbd11ecc SHA512 8c019cf0084126c99f2106a64c7ecb17fb68ad82ca88f5174db359a409d31f5e1726631072b4da4491cf02dc2dce2a0e9d57fb28d46a221508f524f2b7983e4c
+EBUILD file-9999.ebuild 3251 BLAKE2B 8eff7461b8b76cc8f7cb8b20af8a894682ccf755dcf2314a6511346600ad62505568ab3e462f8c0efcf8c065e4983ac0edd1feec5cf67d1e9ac17e4f93a7c2a0 SHA512 7dc9131ffcc3fd30b988e5d97a08a382b9e9bf2f120d697f1ea39ab01701ef318a8fec688079bc67fec2b4006697093c212d417a188f312762a5e2f655f1f520
 MISC metadata.xml 316 BLAKE2B 475092518eaf152f7e153e84a12c7089e665a5fc089045b6fa2d452eaf726566cade92c65ef19ba5cb205e586d161e90e514b60c8587699ca5c9885565ca3b60 SHA512 8b334ba7a606600ad0548ef0ab7aa809a8fda040104d1663bfe179828a831e621128145325aba158fccf94a7f9a3ca1c9164db979a85e639403a079f0deb622a
diff --git a/sys-apps/file/file-5.36.ebuild b/sys-apps/file/file-5.36.ebuild
deleted file mode 100644
index bab24deaf9ca..000000000000
--- a/sys-apps/file/file-5.36.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-DISTUTILS_OPTIONAL=1
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit autotools git-r3
-else
-	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	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"
-fi
-
-DESCRIPTION="identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="python static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )"
-
-src_prepare() {
-	default
-
-	[[ ${PV} == "9999" ]] && eautoreconf
-	elibtoolize
-
-	# don't let python README kill main README #60043
-	mv python/README.md python/README.python.md || die
-	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--disable-libseccomp
-		--enable-fsect-man5
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-src_configure() {
-	# when cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions #362941
-	if tc-is-cross-compiler && ! ROOT=/ has_version ~${CATEGORY}/${P} ; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		tc-export_build_env BUILD_C{C,XX}
-		ECONF_SOURCE="${S}" \
-		ac_cv_header_zlib_h=no \
-		ac_cv_lib_z_gzopen=no \
-		CHOST=${CBUILD} \
-		CFLAGS=${BUILD_CFLAGS} \
-		CXXFLAGS=${BUILD_CXXFLAGS} \
-		CPPFLAGS=${BUILD_CPPFLAGS} \
-		LDFLAGS="${BUILD_LDFLAGS} -static" \
-		CC=${BUILD_CC} \
-		CXX=${BUILD_CXX} \
-		econf --disable-shared --disable-libseccomp
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		cd src || die
-		emake magic.h #586444
-		emake libmagic.la
-	fi
-}
-
-src_compile() {
-	if tc-is-cross-compiler && ! ROOT=/ has_version "~${CATEGORY}/${P}" ; then
-		emake -C "${WORKDIR}"/build/src magic.h #586444
-		emake -C "${WORKDIR}"/build/src file
-		PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT README
-
-	# Required for `file -C`
-	dodir /usr/share/misc/magic
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-	find "${ED}" -name "*.la" -delete || die
-}
diff --git a/sys-apps/file/file-5.37-r1.ebuild b/sys-apps/file/file-5.37-r1.ebuild
index 9269832c6a8c..074a9c05f917 100644
--- a/sys-apps/file/file-5.37-r1.ebuild
+++ b/sys-apps/file/file-5.37-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	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 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"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/file/file-5.38.ebuild b/sys-apps/file/file-5.38.ebuild
index ed9e8dbc5bbb..db7ed0b820b3 100644
--- a/sys-apps/file/file-5.38.ebuild
+++ b/sys-apps/file/file-5.38.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	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 ~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"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 18f5920b53c1..b092e57eb186 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit autotools git-r3
 else
 	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	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 ~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"
 fi
 
 DESCRIPTION="identify a file's format by scanning binary data for patterns"
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index c00ec210f44e..8f78ab916986 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -3,6 +3,6 @@ AUX findutils-4.6.0-gnulib-S_MAGIC_NFS.patch 2098 BLAKE2B fcc3687a42fe8b891718ac
 AUX findutils-4.6.0-gnulib-mb.patch 1005 BLAKE2B 0e08a1c35c8e66b2dcade10b33b53905d727186d2c9c13775b7364da9864e3bde74ee76eb060af5762eac5529754da84a094c4b570cdefce2275462b5a9f35bc SHA512 2bb4f15159e70c8bc9b6a7b36b290bd1c6d6e8b0ab484bd0b0127425efd27fb4a23585b0d43b437a8fb8b311e201c5cae5ef12f0142489b97fe63844145aabd6
 DIST findutils-4.6.0.tar.gz 3780154 BLAKE2B cae93c4e6bac93fa374ffba18ada95b783335fa7f9f9491cdd1848cd9bb6781a98e7b0ae3677c88bb3052afca2e90e066e072ee0f67c407cb7b087b49831d799 SHA512 41fcd4197c1efbd77f7420e5754e2cf9332dfef19f90c65a8fa1844bb4bc5d529c8393ee0ff979a054e9ac65ff71d7fe3921ea079f9960843412fc9a71f8afd4
 DIST findutils-4.7.0.tar.xz 1895048 BLAKE2B 5d9f1f2f6bc47415057f9139af3d28abae7be9f812a15bce6016a4478eb3206f35c9329f281fda892f614d017f4f5615003ad60b6a74996ebfad81b1f4b54bf0 SHA512 650a24507f8f4ebff83ad28dd27daa4785b4038dcaadc4fe00823b976e848527074cce3f9ec34065b7f037436d2aa6e9ec099bc05d7472c29864ac2c69de7f2e
-EBUILD findutils-4.6.0-r1.ebuild 1959 BLAKE2B 4fb5c4d83a95cd5d06f228c1a678c92755a084a33c16caefacd2a134b53672d2a7c1a89104434b4634eb4a4a4f4473a77cf86f6c2234c1b57a2afa03165ab67f SHA512 1f0a54ddd86a8c6ea39e9515311beb3ddcdcd3b2d371bcfcfbf1a9cb45b4f86ffe9e8220df2d14593ac9f64d3d2333287eec9f9a4727271dcc53b4e0e3958d3e
-EBUILD findutils-4.7.0.ebuild 1681 BLAKE2B d4c3776cf0e5be2fb9c32e8bee3ae2bdc9c9b323ed39f76dd398492da4a6bdaa0525c2ed7a0870577b473285723bc0b009ab50a90c8e43c1ef0e42885969e853 SHA512 c91e42db1f676b2ab1375bd632271fc0794320a6d5a1458e743a0b2650e3b481bb58a12c1223138e85171dd138ab9526f48ceea2bee18a80f7799e483aa84d2a
+EBUILD findutils-4.6.0-r1.ebuild 1957 BLAKE2B baa9aceddebfefa046bd65fdab752cfe667e58b4656896421987c7d63c8402e00fdbe008685e61d363c3006038d88e76817696edfbd441659623d5eddec00e93 SHA512 cb9db174f094f9b2f5c6967be7e5f6ab0c285c97c93df8ec45d46863eb30a52df42af0fcbc5094a14e4ffebc6e133b1374178ac98109ce92860bed496c875e0d
+EBUILD findutils-4.7.0.ebuild 1676 BLAKE2B 54482e487f70ff164cbee012787fd0c8ddd9a62fa705d8909f056f2b70a7d1e08c9bf072304bd5f6c134557498ede3d17b7eef32b86e7927dd1dc83472bcc26e SHA512 cf265f04b860872bd48db1b40bf3116899eed8e8ba9e6d27609ea884c731f1902fb20a086fdb01529e8708102203451f164e7c2188c931ab6577e3845c0987c4
 MISC metadata.xml 332 BLAKE2B 80d4fb8b79e20a96fe0b5f718c3ee4028ce08811b5cb935b77e526edc576c15c292a048424b55b1198d7848b4500e4195912e5044025a234e83b6ae858d7d031 SHA512 35951bfca173276d17ced243bd870ca62804bf3db766f964cad94f8b100ab33bc0a3b157547527451bae42fc9ea4d414e56ef06f424638e9ab4b5319c6ee8b00
diff --git a/sys-apps/findutils/findutils-4.6.0-r1.ebuild b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
index bec6913975ce..79fbd64961f9 100644
--- a/sys-apps/findutils/findutils-4.6.0-r1.ebuild
+++ b/sys-apps/findutils/findutils-4.6.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 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 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="nls selinux static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/findutils/findutils-4.7.0.ebuild b/sys-apps/findutils/findutils-4.7.0.ebuild
index f295892cc090..c52ff404f16c 100644
--- a/sys-apps/findutils/findutils-4.7.0.ebuild
+++ b/sys-apps/findutils/findutils-4.7.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 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 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="nls selinux static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/firejail-lts/Manifest b/sys-apps/firejail-lts/Manifest
index 93f41b6785cf..8984ba16e316 100644
--- a/sys-apps/firejail-lts/Manifest
+++ b/sys-apps/firejail-lts/Manifest
@@ -1,9 +1,4 @@
 AUX firejail-lts-fix-compressed-manpages.patch 604 BLAKE2B 64888a91da1b6c512cfe7923e6db1bad7b414054c1c83842a23cf56b4f3b51878bfbd37cb8bdbbf8c1890a72e37082d834a4d9b51539045030df97a94edf05fa SHA512 c43f5872a50d73febbfba0daeb815b42796ca241faeb3c9262c861b02e5952e5f3c65d84c041275172d87ff831f44dd47c2cd0031901c020090a84e1654ef983
-DIST firejail-0.9.38.10.tar.bz2 159476 BLAKE2B e0ae02cd2b3feaf5d9e3e799d720f5a635ed4e3b6fca7041d0795ea09a3563bfece1cc42c391df65f05cf55199b97ae354092c2c2bb48f108ed2e2be4513fb3b SHA512 61a41655a46031c34f44f7f24e3c5369e3187edc10cb091b0d429ead8d367e79acdaa4bb41573cdf733111ce353fc91efe51cb95e331ad7c2fdb639a60e194fb
-DIST firejail-0.9.38.12.tar.bz2 164962 BLAKE2B c89252548c70e347c6a841a8460501622fb6aa1f264e0458918bf903c94d84f6a9dc5eaaa2ea678e2754c277a3074cfdc3df7c9602ab0a4f4f867348a8c5cc92 SHA512 d0d6e81d9dbf404c653914bbbdad95caa3ce69ee6d5082cd30c60c0ddad02a2f0c2535bf15b6fcf68a0e4a5a738806fdd738407adbd5dd57eb289827f4cc487d
 DIST firejail-lts-0.9.56.2.tar.gz 934289 BLAKE2B ff8b27f57da90cd94d3ec9b83c8398b7c569b09008f61094bd9aca15e996cd7a4d559e87168228271ccba4c9fe8e1ce97fa5045596f950f3ac2d8593b9ea5838 SHA512 75edc0405fa3fd7f2f5d7831f7f4e838ed63bacadd7f9a869a1611908c716a333251b602ff0bd70e3f98627418e84541b26790d34e644f60d97e84e9c33f873a
-EBUILD firejail-lts-0.9.38.10.ebuild 734 BLAKE2B 2d3797be4ba77f171452cc2c8b13f4eb1e3a9ddda7461349c863342d9fbe51dcc6ac4a8118676a311bdd59b6ba34b080ae8fe7d17699713fd607c47ba321ff6c SHA512 182d12ca0dcb10a125f7feebe5ecb3d18887bdac555dd470aef6e11bd60a01a6ff3c33a00b6e4ca1adf5ca3de1e062eab59cb802b8ff6dac8e6726e117401ec4
-EBUILD firejail-lts-0.9.38.12.ebuild 735 BLAKE2B 9cc47a2b6a6538f8b61a3d5b6c4cbf9f4c6f4b505b04a8a7567006a8d54b84cd0288b1801aee72fbef0ab63cab90a6aeb7c92a9e5fe1a8bba738399e5cc77b26 SHA512 e0b340593f6b0afe5e04e4af2c1e7984f145dde6b363edd81c01e21fcaddba4b05165c35226ea3a65b938981ad898c977596652816f40541f871606134224ab9
-EBUILD firejail-lts-0.9.56.2-r1.ebuild 1218 BLAKE2B 1abff91b6673411d50c1344ae9322cbb06c2c49af9a23d8bf824f87a6c72d95b4f698bab52098d4258323e344ad066a187e58b59e03a9db06db5dfeb7dfce558 SHA512 e690e2611af4e206c2286b0358d1d6fcb74ebcc98c5e80257ce8f280a5f996c4f91988777ae43362e7b51b0e4d17889b970a122435b70ea971b8206f1d3c8303
-EBUILD firejail-lts-0.9.56.2.ebuild 1156 BLAKE2B fcaa32557d4c1b69ac17c0856ff91c258a46ab9b814ac543fa37c8780bacdad80495310088a69da449e0a273de2f7f861f505bd2c27b13b74e863e957524b45b SHA512 9db40765f01cdbcd428df57deb8972ec8a3b257a956ae3ee8bafd2f5e5390de3ed6224e9b318df48a61c846c69d524c1a6e145b958fc15bdb1fc96c1de6af21e
+EBUILD firejail-lts-0.9.56.2-r1.ebuild 1217 BLAKE2B 1d7dcd7ebfee4c51d441a80dd59c1043b4accd6acdc95c7aaab747f79f4ded5ccd6bd7dbd7a687e09d8920b80f0cb179d56a6e9701d6839425051e3bd2080251 SHA512 d71262d24137f1f7f9f31e5f9a163c95a94b8680958d74e1729a7171197d6459e9e359994591201a469b110dd1da7ad51f9453296cb461534cdb5138bebe491a
 MISC metadata.xml 1400 BLAKE2B 437e79721042570066912df3b69a81848ec3fa969eacf8a9b82140faef658b0607a97114426ec426c68cb26e7e76acd1c4be09c81f8f9e96bc67987f9a637302 SHA512 51128fc3ef400e9f80e2bf2ae87420c8187c33b4944827ed35fcb15d81c2213bde726902e77396f1d93331456e8bc94ab7b1386c80f46385c2a9553ae6a970c1
diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.38.10.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.38.10.ebuild
deleted file mode 100644
index 7faa279ae1ee..000000000000
--- a/sys-apps/firejail-lts/firejail-lts-0.9.38.10.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-MY_PN=firejail
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Security sandbox for any type of processes; LTS branch"
-HOMEPAGE="https://firejail.wordpress.com/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+seccomp"
-
-DEPEND="!sys-apps/firejail"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	find -name Makefile.in -exec sed -i -r \
-			-e '/^\tinstall .*COPYING /d' \
-			-e '/CFLAGS/s: (-O2|-ggdb) : :g' \
-			-e '1iCC=@CC@' {} + || die
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable seccomp)
-}
diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.38.12.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.38.12.ebuild
deleted file mode 100644
index ebcbef645a54..000000000000
--- a/sys-apps/firejail-lts/firejail-lts-0.9.38.12.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-MY_PN=firejail
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Security sandbox for any type of processes; LTS branch"
-HOMEPAGE="https://firejail.wordpress.com/"
-SRC_URI="mirror://sourceforge/${MY_PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="+seccomp"
-
-DEPEND="!sys-apps/firejail"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	find -name Makefile.in -exec sed -i -r \
-			-e '/^\tinstall .*COPYING /d' \
-			-e '/CFLAGS/s: (-O2|-ggdb) : :g' \
-			-e '1iCC=@CC@' {} + || die
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_enable seccomp)
-}
diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
index b1aae3c00dae..736d806a8f6f 100644
--- a/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
+++ b/sys-apps/firejail-lts/firejail-lts-0.9.56.2-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/netblue30/${MY_PN}/archive/${PV}-LTS.tar.gz -> ${P}.
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="apparmor +globalcfg +network +seccomp +suid +userns test +whitelist"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild b/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild
deleted file mode 100644
index b2a3e4c3d744..000000000000
--- a/sys-apps/firejail-lts/firejail-lts-0.9.56.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Security sandbox for any type of processes; LTS version"
-HOMEPAGE="https://firejail.wordpress.com/"
-
-MY_PN=firejail
-
-SRC_URI="https://github.com/netblue30/${MY_PN}/archive/${PV}-LTS.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="apparmor +globalcfg +network +seccomp +suid +userns test +whitelist"
-RESTRICT="!test? ( test )"
-
-DEPEND="!sys-apps/firejail
-		apparmor? ( sys-libs/libapparmor )
-		test? ( dev-tcltk/expect )"
-
-RDEPEND="apparmor? ( sys-libs/libapparmor )"
-
-S="${WORKDIR}/${MY_PN}-${PV}-LTS"
-
-src_prepare() {
-	default
-
-	find -type f -name Makefile.in | xargs sed --in-place --regexp-extended \
-		--expression='/^\tinstall .*COPYING /d' \
-		--expression='/CFLAGS/s: (-O2|-ggdb) : :g' || die
-
-	sed --in-place --regexp-extended '/CFLAGS/s: (-O2|-ggdb) : :g' ./src/common.mk.in || die
-}
-
-src_configure() {
-	econf \
-		$(use_enable apparmor) \
-		$(use_enable globalcfg) \
-		$(use_enable network) \
-		$(use_enable seccomp) \
-		$(use_enable suid) \
-		$(use_enable userns) \
-		$(use_enable whitelist)
-
-}
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 26956f71a63a..bf55eb2277df 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,8 +1,6 @@
 DIST flashrom-0.9.8.tar.bz2 473902 BLAKE2B c127a41c2857ae2e1564777b49b1eff17e2e931c8a2417e738e8188871a6ce4e0fe6a0380c2139aaa906f299ca833563df895aa5fd1af333b24bf7467de0dc8f SHA512 1a1c4513bac7cdf91326ab68b822034101e688bfab0dc0b5698f664fc766027229128c55eed94f302cac05d949647cdec6a103a423c3861b047cf0ff7cc0b509
-DIST flashrom-1.0.tar.bz2 321693 BLAKE2B 7e3e021cdf639083717ca30d5268ac9e02eb8b68e54bbcd5caf9de4352f332ba0ab23cf22253f0627fa9c9a0472404fff44cda17e8c306fe4f93b2b1f0563718 SHA512 355ac1322421b2fd699deb0ceff8555c9e89062e639de674c62f1fdacad9ed9351fe89e4c14e22f07a6d4e2e2f070fd4d2ed1cd347a20069f2505966b5c29e0e
-DIST flashrom-v1.1.tar.bz2 348458 BLAKE2B cee1b8e4f680739e794239c3d777ef9cf0af1f734fe4d8f4b122d26316cdb8d45d53f92054937c7cde1737364ba8ed80410561bfbb7f304b0371942be144859b SHA512 8cb75a7223490fa9dbd65a85d24a87beab68ee03120891a3d8ebf4e8bc3d2a2ee640e254ccff657eaf5175e6c2477288337369fa1b1dac110a0903b0c95c1e56
+DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
 EBUILD flashrom-0.9.8.ebuild 4186 BLAKE2B 16f9f031ff5e2e6509ac875fecff28765b6887cc215a59af53297b75cbf724f988f22981c669ae7e196bd37644d123bca7924f3f271c33718279074c6c073a39 SHA512 060e93fc378994d2168b0deb196ef9f7c4fc8af52ffed9210742539eaff8a656e8eb97b28b8fc708256231b1077433ac381c097b0966c5b64573a054d088894a
-EBUILD flashrom-1.0.ebuild 4213 BLAKE2B 57c64441746478610f4bdc4ebc9708c6021fba8241aff21c226e06efc7c0d03f5d6c7165222b882003e9df153abb3222a3c7e2fdbb37bc9a7c4911828c7ed72d SHA512 c92ca23bb21bc1e5cd71359f1876f6577050766f4d03b443a9b9dc63c89e49d8add999410c3b9736ac266ae315ec2cd2165f4efb685326658fb9ee840914f51c
-EBUILD flashrom-1.1.ebuild 4483 BLAKE2B 6011c9743d8e1aee24a873a18a1a837882fd360d2e8066f277d23e77b59c0f8b2797bddbf0738503fa586dcc0cd596ce9e0cc68f0fc09c53ff15ba871d22dac8 SHA512 d033ad0b5013802eec89860959d388a012c835f9c8217f294c8ebb5673bcbb490330ce9ec90e53bc4a75fb7b843dfdfd7dc0b13f1bea0b4c90fd5bcef0a39e68
-EBUILD flashrom-9999.ebuild 4575 BLAKE2B 48819fdadf803ac9428b300ed4ebcfe6cbf9e181095116cf46f9bcadca220204eabfcc3d43e02a59c768930da793effba5e511cebad87d6670ebb1462ad478fe SHA512 37ee887746e789d47a67f042c2343f5e39a2ef0b7fdb3bfb545de147ae31985e58d77aad58b9ab977ef96687ee60ca6de745e6ec9a438c7686d07e159b74d7db
-MISC metadata.xml 4633 BLAKE2B 2a4703209896ba0e5e35992a8a0b5779bc077f9314a84d499ccf4445b54e925d25eac13844c6397ccea45391647b4afc31ab6406fa046017ee89a155935659b9 SHA512 f6172421b2a8fd98c5cad433de26e9d301f11f7f2264b47b90b07da304d72a29dc0239b17a951eca5593b53fb5265fd8b699cda62a2218f05e60588b217b838a
+EBUILD flashrom-1.2.ebuild 4423 BLAKE2B fc758295685fea683f2b7bdc07dc307525571b00745ced19910a95117a033964d037da53b86ddca9482c96b8dcb6f54e46eb6401e17e5268f2b565ed89bf6ee6 SHA512 b2ef614c5bee6c83a510306823ae34b2e32e8d03726479b6ceb89f29e51c2f9d6a91f7e6c1f24166fe572094299b3bbc49047ae4c865d3ca994be233cfa7d90e
+EBUILD flashrom-9999.ebuild 4423 BLAKE2B fc758295685fea683f2b7bdc07dc307525571b00745ced19910a95117a033964d037da53b86ddca9482c96b8dcb6f54e46eb6401e17e5268f2b565ed89bf6ee6 SHA512 b2ef614c5bee6c83a510306823ae34b2e32e8d03726479b6ceb89f29e51c2f9d6a91f7e6c1f24166fe572094299b3bbc49047ae4c865d3ca994be233cfa7d90e
+MISC metadata.xml 4595 BLAKE2B 0a7c4f212c57dccca72a7da1172b8eb36a7027703fea6137be5eefbadf5592abaa6e9841befa3e8f8ef65b1b5057af3c0f162584f0db65addd362a0a8880e648 SHA512 25b118e1150b405d34081add86fa02c04094ada970ea2a121bf21a3047d1df2566383549df7d0138883bcfed31c2574a420e9357dccce993c93179e3e769b8ef
diff --git a/sys-apps/flashrom/flashrom-1.0.ebuild b/sys-apps/flashrom/flashrom-1.0.ebuild
deleted file mode 100644
index 766fefcc7255..000000000000
--- a/sys-apps/flashrom/flashrom-1.0.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://review.coreboot.org/flashrom.git"
-	inherit git-r3
-else
-	SRC_URI="https://download.flashrom.org/releases/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-DESCRIPTION="Utility for reading, writing, erasing and verifying flash ROM chips"
-HOMEPAGE="https://flashrom.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-# The defaults match the upstream Makefile.
-# Note: Do not list bitbang_spi as it is not a programmer; it's a backend used
-# by some other spi programmers.
-IUSE_PROGRAMMERS="
-	atahpt
-	+atapromise
-	+atavia
-	+buspirate-spi
-	+ch341a-spi
-	+dediprog
-	+drkaiser
-	+dummy
-	+ft2232-spi
-	+gfxnvidia
-	+internal
-	+it8212
-	+linux-spi
-	mstarddc-spi
-	+nic3com
-	+nicintel
-	+nicintel-eeprom
-	+nicintel-spi
-	nicnatsemi
-	+nicrealtek
-	+ogp-spi
-	+pickit2-spi
-	+pony-spi
-	+rayer-spi
-	+satamv
-	+satasii
-	+serprog
-	+usbblaster-spi
-"
-IUSE="${IUSE_PROGRAMMERS} +internal-dmi static tools +wiki"
-
-LIB_DEPEND="
-	atahpt? ( sys-apps/pciutils[static-libs(+)] )
-	atapromise? ( sys-apps/pciutils[static-libs(+)] )
-	atavia? ( sys-apps/pciutils[static-libs(+)] )
-	ch341a-spi? ( virtual/libusb:1[static-libs(+)] )
-	dediprog? ( virtual/libusb:1[static-libs(+)] )
-	drkaiser? ( sys-apps/pciutils[static-libs(+)] )
-	ft2232-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
-	gfxnvidia? ( sys-apps/pciutils[static-libs(+)] )
-	internal? ( sys-apps/pciutils[static-libs(+)] )
-	it8212? ( sys-apps/pciutils[static-libs(+)] )
-	nic3com? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel-eeprom? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel-spi? ( sys-apps/pciutils[static-libs(+)] )
-	nicintel? ( sys-apps/pciutils[static-libs(+)] )
-	nicnatsemi? ( sys-apps/pciutils[static-libs(+)] )
-	nicrealtek? ( sys-apps/pciutils[static-libs(+)] )
-	ogp-spi? ( sys-apps/pciutils[static-libs(+)] )
-	pickit2-spi? ( virtual/libusb:0[static-libs(+)] )
-	rayer-spi? ( sys-apps/pciutils[static-libs(+)] )
-	satamv? ( sys-apps/pciutils[static-libs(+)] )
-	satasii? ( sys-apps/pciutils[static-libs(+)] )
-	usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-	sys-apps/diffutils"
-RDEPEND+=" !internal-dmi? ( sys-apps/dmidecode )"
-
-_flashrom_enable() {
-	local c="CONFIG_${2:-$(echo "$1" | tr '[:lower:]-' '[:upper:]_')}"
-	args+=( "${c}=$(usex $1 yes no)" )
-}
-flashrom_enable() {
-	local u
-	for u ; do _flashrom_enable "${u}" ; done
-}
-
-src_compile() {
-	# Help keep things in sync.
-	local sprogs=$(echo $(
-		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
-			LC_ALL=C sort -u | \
-			sed 's:^CONFIG_::' | \
-			tr '[:upper:]_' '[:lower:]-'))
-	local eprogs=$(echo ${IUSE_PROGRAMMERS} | sed -E 's/\B[-+]\b//g')
-	if [[ ${sprogs} != "${eprogs}" ]] ; then
-		eerror "The ebuild needs to be kept in sync."
-		eerror "IUSE set to: ${eprogs}"
-		eerror "flashrom.c : ${sprogs}"
-		die "sync IUSE to the list of source programmers"
-	fi
-
-	# Turn USE flags into CONFIG_xxx settings.
-	local args=()
-	flashrom_enable ${eprogs}
-	_flashrom_enable wiki PRINT_WIKI
-	_flashrom_enable static STATIC
-
-	# You have to specify at least one programmer, and if you specify more than
-	# one programmer you have to include either dummy or internal in the list.
-	# We pick dummy as the default because internal requires libpci.
-	if ! use internal && ! use dummy ; then
-		if [[ ${#args[@]} -ne 1 ]] ; then
-			ewarn "You have to specify at least one programmer, and if you specify"
-			ewarn "more than one programmer, you have to enable either dummy or"
-			ewarn "internal as well.  'dummy' will be the default now."
-			args+=( CONFIG_DUMMY=yes )
-		fi
-	fi
-
-	tc-export AR CC PKG_CONFIG RANLIB
-	emake WARNERROR=no "${args[@]}"
-}
-
-src_test() {
-	if [[ -d tests ]] ; then
-		pushd tests >/dev/null
-		./tests.py || die
-		popd >/dev/null
-	fi
-}
-
-src_install() {
-	dosbin flashrom
-	doman flashrom.8
-	dodoc README Documentation/*.txt
-
-	if use tools ; then
-		if use amd64 ; then
-			dosbin util/ich_descriptors_tool/ich_descriptors_tool
-		elif use x86 ; then
-			dosbin util/ich_descriptors_tool/ich_descriptors_tool
-		fi
-	fi
-}
diff --git a/sys-apps/flashrom/flashrom-1.1.ebuild b/sys-apps/flashrom/flashrom-1.2.ebuild
index 210c82d3c759..b51635e3ad80 100644
--- a/sys-apps/flashrom/flashrom-1.1.ebuild
+++ b/sys-apps/flashrom/flashrom-1.2.ebuild
@@ -54,6 +54,7 @@ IUSE_PROGRAMMERS="
 	+satamv
 	+satasii
 	+serprog
+	stlinkv3-spi
 	+usbblaster-spi
 "
 
@@ -84,6 +85,7 @@ LIB_DEPEND="
 	rayer-spi? ( sys-apps/pciutils[static-libs(+)] )
 	satamv? ( sys-apps/pciutils[static-libs(+)] )
 	satasii? ( sys-apps/pciutils[static-libs(+)] )
+	stlinkv3-spi? ( virtual/libusb:1[static-libs(+)] )
 	usbblaster-spi? ( dev-embedded/libftdi:=[static-libs(+)] )
 "
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
@@ -107,7 +109,8 @@ src_compile() {
 		grep -o 'CONFIG_[A-Z0-9_]*' flashrom.c | \
 			LC_ALL=C sort -u | \
 			sed 's:^CONFIG_::' | \
-			tr '[:upper:]_' '[:lower:]-'))
+			tr '[:upper:]_' '[:lower:]-' | \
+			grep -v ni845x-spi))
 	local eprogs=$(echo ${IUSE_PROGRAMMERS} | sed -E 's/\B[-+]\b//g')
 	if [[ ${sprogs} != "${eprogs}" ]] ; then
 		eerror "The ebuild needs to be kept in sync."
@@ -135,27 +138,17 @@ src_compile() {
 	fi
 
 	tc-export AR CC PKG_CONFIG RANLIB
-	emake WARNERROR=no "${args[@]}"
-}
-
-src_test() {
-	if [[ -d tests ]] ; then
-		pushd tests >/dev/null
-		./tests.py || die
-		popd >/dev/null
-	fi
+	emake WARNERROR=no "${args[@]}" all libflashrom.a
 }
 
 src_install() {
 	dosbin flashrom
 	doman flashrom.8
 	dodoc README Documentation/*.txt
+	dolib.a libflashrom.a
+	doheader libflashrom.h
 
-	if use tools ; then
-		if use amd64 ; then
-			dosbin util/ich_descriptors_tool/ich_descriptors_tool
-		elif use x86 ; then
-			dosbin util/ich_descriptors_tool/ich_descriptors_tool
-		fi
+	if use tools; then
+		dosbin util/ich_descriptors_tool/ich_descriptors_tool
 	fi
 }
diff --git a/sys-apps/flashrom/flashrom-9999.ebuild b/sys-apps/flashrom/flashrom-9999.ebuild
index 44446c7c4e17..b51635e3ad80 100644
--- a/sys-apps/flashrom/flashrom-9999.ebuild
+++ b/sys-apps/flashrom/flashrom-9999.ebuild
@@ -138,27 +138,17 @@ src_compile() {
 	fi
 
 	tc-export AR CC PKG_CONFIG RANLIB
-	emake WARNERROR=no "${args[@]}"
-}
-
-src_test() {
-	if [[ -d tests ]] ; then
-		pushd tests >/dev/null
-		./tests.py || die
-		popd >/dev/null
-	fi
+	emake WARNERROR=no "${args[@]}" all libflashrom.a
 }
 
 src_install() {
 	dosbin flashrom
 	doman flashrom.8
 	dodoc README Documentation/*.txt
+	dolib.a libflashrom.a
+	doheader libflashrom.h
 
-	if use tools ; then
-		if use amd64 ; then
-			dosbin util/ich_descriptors_tool/ich_descriptors_tool
-		elif use x86 ; then
-			dosbin util/ich_descriptors_tool/ich_descriptors_tool
-		fi
+	if use tools; then
+		dosbin util/ich_descriptors_tool/ich_descriptors_tool
 	fi
 }
diff --git a/sys-apps/flashrom/metadata.xml b/sys-apps/flashrom/metadata.xml
index cb68ee1711d9..e013e68e7b82 100644
--- a/sys-apps/flashrom/metadata.xml
+++ b/sys-apps/flashrom/metadata.xml
@@ -2,12 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>peter@stuge.se</email>
-		<name>Peter Stuge</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
+		<email>marecki@gentoo.org</email>
+		<name>Marek Szuba</name>
 	</maintainer>
 	<use>
 		<flag name="atahpt">Highpoint (HPT) ATA/RAID controller support</flag>
@@ -43,7 +39,7 @@
 		<flag name="satamv">Enable programmer for Marvell SATA controllers</flag>
 		<flag name="stlinkv3-spi">Enable SPI programmer using STLINK-V3</flag>
 		<flag name="serprog">Enable Serial Flasher programmer</flag>
-		<flag name="tools">Install additional tools</flag>
+		<flag name="tools">Install ich_descriptor_tool, a tool for reading descriptor-mode SPI-flash images for Intel chipsets</flag>
 		<flag name="usbblaster-spi">Enable support for Altera USB-Blaster dongles</flag>
 		<flag name="wiki">Enable wiki informations, like supported devices etc.</flag>
 	</use>
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index deea970a727a..f2fdb36c6f98 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,11 +1,12 @@
 AUX fwupd-1.3.8-report_uploading.patch 875 BLAKE2B 460db033bdb0ea865402ce938b586221c3543e9b4e0dc4e09504f1364a4cfff81e59cf38eb9732b89075eec8000f9afdb3ccf26002f829a4ae4ecf21ce92a723 SHA512 f89718b2aa695b44a2f382e6c5f5e0114f4086710d112d33c764f8450d8c2cfc4d3b14ee87c9f76c9c155d8fd2f70c5701a267487476bae190825978080a0879
+AUX fwupd-1.3.9-fwupdtool_path.patch 673 BLAKE2B cd77da5466d8e4bfaff10f89ed983b8b25ace977644f6f93035ad61ef0178fb4324e631648fa6433af3d3219659e5c084670e6153b3c4a42d8509fbb05bebbfb SHA512 814225d098030dfabff8bd15fa7a68bc929e3f8288c8411f844c9b9994d7f539d77bdf3ef06c7079972a8905eb29dc0f7856733ac6649112a911eddb1d884d3b
+AUX fwupd-1.3.9-logind_plugin.patch 281 BLAKE2B 237c6d6f8a43408186c6707f1c373b2600bae6ad6ef750c579b7d51023615fc7f0569011aa88e73cb72030c4112f1d26e924676bc6fd1cb9e9c9a7fef76f8800 SHA512 148a5af93d2c3554239c5529d63e5f85ed70192856ca375ce0126c183babda7d7de5cf345e875f7cd88c6cce52f409f05f1689625ea6dde14bf330c9e11d98b9
+AUX fwupd-1.3.9-optional_agent_man_page.patch 1705 BLAKE2B b53e843f8495b6b5bfaef76ec3fa05b834c5989b9cf52a5e18a2dc5893dd9d87fae494d1965f71ff8007994f329c368694e9c3ae746e03e3d45bc0bef09e9e5a SHA512 b537288ff6ec860cb6d958c34b29ca4eeaa6212654c3306aba031eec944667ca3522448a77e1cba9bb9a8e65555868c291deb12adf21cc390d0f992f3fd8c08b
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
 DIST fwupd-1.2.11.tar.gz 1945646 BLAKE2B 4eb6d5008d0e515880147a94b2632ed70b5f7ab1891775ac121347653c06bf4403ab7f4a1fe160000a6195d360fe06d64c8971dd53c1538aeac40d155f59979a SHA512 a8d6a76ac59937547c6866d414e95a67779574901b0a15ecfde763f49b434b284be2ade1194179225785006e5f93836667469d08f32d4c87fc85927aa0bfe9de
-DIST fwupd-1.3.6.tar.gz 2207849 BLAKE2B 465055d90576d4c0a7812f2554d2bc3298a12030816a2469ce653d28f9ea81e363c401355191d41b200975a615cfc64b954e0cced6b6f6bbfbbf26f63163a25e SHA512 20a5f346563b1cb8296f31ea448f336d8b54df2e5296524e2fa040a31001838b0de4a88f0d4aad9f5eeaeb4acc46919c0effb254ce681556db00cec5a4a1bc78
-DIST fwupd-1.3.7.tar.gz 2223704 BLAKE2B e86603542dc76ec355912fae86721b8e60cea8bef34224cf5f157d3a91058deafc2804761ece472f0264ef42d7fa2b77d935a1638c9db3a6c0722c0659ce6a59 SHA512 6734533193be40051a565609905097c76d9f53c53075e37f560408be698774be0867383877b2acbcd2e5a92c817afdd30532f3d94465b27311b31c825a38481e
 DIST fwupd-1.3.8.tar.gz 2246170 BLAKE2B b55df322c64947bcccc7bf05daaec2c5b2f646a4e53d757482dcd4d33e94d725315e6456bf69d5dbca3ef870437e1cc2a861537fc7af9b059497f119f08477de SHA512 0f0aa380adc5e167e49db4261b50bee9c905786afcd44b5fe221f42a77306219d40888989e0b16448535eaf077baed12de56b6cca42f91fca09c4a8384f243e4
-EBUILD fwupd-1.2.11.ebuild 3841 BLAKE2B e4e3bc8c24019820ab5e2ac4afc84385fd97743b6c7f13564947010504a2ab548a9e593e922c3e7a98d2a86c90e05f4c46c70508903280e5937dd025a6441c19 SHA512 36921af2092640f1da1eaf0bf5fd52d5116f33e9218eb0355767a5b2590620942a74ee8d28c0351015d25e725c106783b10904f66aec84579f69a3ec2b1867a5
-EBUILD fwupd-1.3.6.ebuild 4074 BLAKE2B e0a15aca14f956e4f07c008114d3ea26437bc5a2e2220fe4e6296f596306cc4b43bbf6107f26c9e4ddd980b31b2806fb2b74fa98223aae00349da4b68aa54c0f SHA512 d118e5801846d35da86aa1c0b47f1bc217665e4c7356210587c9ed217416fe9c530e4df1f8942f8356b342ad288524acf8a84a1110fec35acba30a584dfcb343
-EBUILD fwupd-1.3.7.ebuild 4107 BLAKE2B e4dbfb28be95ac707c8fbd29fa5336415f4864dac394b75e5458489444c8fb66bceea72ca074825729d716e6625608f5a898053ac23d425c5e5e0bf9def958a2 SHA512 10bebe2bb2d346fcb10f140d8483fd649b184f5ecbd467b279e708db3de7395f847d2b8fc3babad9294d63c6233a40ce3fe8c477d44af0c72b51bee22549915f
-EBUILD fwupd-1.3.8.ebuild 4209 BLAKE2B de17002a4e62e9ebabb9e96a7e119be7ec2415f9fdf22a1e3396b9f8af2b63fe47047d6cf071e1a8011434b9183f6ef0718f4a2add45f85349da4389367e7791 SHA512 8d1c1a2c84ac2c6ae675e81b87bf9270cb8c583735f42fba57518d402171666e8b0ee676bc6bdedc67bd5a2b11115e867f3b5cf2f838186c35d52cc625a00fe9
+DIST fwupd-1.3.9.tar.gz 2254260 BLAKE2B ead64be3eca00fd2d045fb6c5ccd42d8913fa056736e6ae039feef70b6edababe50fb0552db39bf057750d3f0d2224b18b7ecf5a5a408a1f1ac3023d89687f68 SHA512 b81ef1f683082e4c49ab8acd8848118fed1383d4e3e73967daaa68927e553a5bc4973004d3dd26b268b901c5deb1f9238a98537d24cfd957162f508c9622e1e4
+EBUILD fwupd-1.2.11.ebuild 3782 BLAKE2B f71c26237f656c291c63a2c7e46f220fbb56751ad0b2742acaf65672acd8060850f654962a26b52210a05e638ec408ff780488d83b1e23f8333b8c81a6f08417 SHA512 3b3a7897e737afc5a7bef4e8743a5a3abd67ca9d6b0a75fa1f7af65879188d1f72b5bdfdf8c46f945a8bf7b0189efec169cd3547cf9253df74d6ca6e7dba07bd
+EBUILD fwupd-1.3.8.ebuild 4147 BLAKE2B aba1f982b217a437d855cad900206a45509e2f6a1c102b24a1401aa8aedc113a8df1332ff13bdd052c21d5eebe1b62512a7dcbac2a135a0cea0d6daba29157a1 SHA512 d41f3455527b8bb26ae8ccbbef163269e774791c80a023ea3ac07cb3864582aedeec15448e53341430374bde74fe346cd06f23bab0cc5f793aab6337cad24eaf
+EBUILD fwupd-1.3.9-r1.ebuild 4196 BLAKE2B 40c1921df28ed69702666f33793937b6aeac82d02067423ec95076c92ebe10f7a2842a4c85a85b13d8e14e914b2106e9c4e1f50cf711d33d873933b84322d0ee SHA512 dc7d75a074887c8bdb9fa9536846d0d578ea1e4d3416eabbe97a3cb68a10be343909ef142a7d93c90fcc4506cc2ca716cc64b33a194c59e6f2b7ec778f67f6fd
 MISC metadata.xml 1400 BLAKE2B e2baf5dbca095abc30bc3f59774d8bae41439077869ece11807d87843227d44b4d6aaa28c82809dc179a1d620b0de8fa49d23a95461658f9f4fa392e2c75e5c6 SHA512 13fe991997037e814131b4c7d5089b8aa11b43029e2a13d6708060d7c4b7c3cf8ec696eb777546242d87ede48362ddd54fe022735787b9fc7e6d31517321384d
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch b/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch
new file mode 100644
index 000000000000..a01e5fbe570d
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.3.9-fwupdtool_path.patch
@@ -0,0 +1,20 @@
+From 4e381f2a61c6ea4eb7438c14f76b8301762a800c Mon Sep 17 00:00:00 2001
+From: Dennis Kadioglu <dkadioglu@web.de>
+Date: Thu, 5 Mar 2020 09:37:56 +0100
+Subject: [PATCH] fix fwupd.shutdown.in according to the movement of fwupdtool
+ to bindir
+
+---
+ data/fwupd.shutdown.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/fwupd.shutdown.in b/data/fwupd.shutdown.in
+index 4c027e7ab..53b334555 100755
+--- a/data/fwupd.shutdown.in
++++ b/data/fwupd.shutdown.in
+@@ -4,4 +4,4 @@
+ [ -f @localstatedir@/lib/fwupd/pending.db ] || exit 0
+ 
+ # activate firmware when we have a read-only filesysten
+-@libexecdir@/fwupd/fwupdtool activate
++@bindir@/fwupdtool activate
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-logind_plugin.patch b/sys-apps/fwupd/files/fwupd-1.3.9-logind_plugin.patch
new file mode 100644
index 000000000000..526fe7700ed0
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.3.9-logind_plugin.patch
@@ -0,0 +1,13 @@
+Enable logind plugin when -Delogind=true is set as well
+
+--- fwupd-1.3.9/plugins/meson.build
++++ fwupd-1.3.9/plugins/meson.build
+@@ -27,7 +27,7 @@
+ subdir('wacom-raw')
+ endif
+ 
+-if get_option('systemd')
++if get_option('systemd') or get_option('elogind')
+ subdir('logind')
+ endif
+ 
diff --git a/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch b/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch
new file mode 100644
index 000000000000..6c9898557ffd
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.3.9-optional_agent_man_page.patch
@@ -0,0 +1,57 @@
+From bacd3a44fe6f06ddd8bb65a3a56eb1738a65ed8c Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Fri, 6 Mar 2020 16:00:23 +0100
+Subject: [PATCH] Don't build/install fwupdagent man page if agent build is not
+ requested
+
+Otherwise build fails with:
+
+  src/meson.build:196:2: ERROR: Unknown variable "fwupdagent".
+
+Gentoo-bug: https://bugs.gentoo.org/711682
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/meson.build | 30 ++++++++++++++++--------------
+ 1 file changed, 16 insertions(+), 14 deletions(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 46a9c4ded..e9aac607e 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -193,20 +193,22 @@ if build_daemon and get_option('man')
+     install : true,
+     install_dir : join_paths(mandir, 'man1'),
+   )
+-  custom_target('fwupdagent-man',
+-    input : fwupdagent,
+-    output : 'fwupdagent.1',
+-    command : [
+-      help2man, '@INPUT@',
+-      '--no-info',
+-      '--output', '@OUTPUT@',
+-      '--name', 'Firmware updating agent',
+-      '--manual', 'User Commands',
+-      '--version-string', fwupd_version,
+-    ],
+-    install : true,
+-    install_dir : join_paths(mandir, 'man1'),
+-  )
++  if get_option('agent')
++    custom_target('fwupdagent-man',
++      input : fwupdagent,
++      output : 'fwupdagent.1',
++      command : [
++        help2man, '@INPUT@',
++        '--no-info',
++        '--output', '@OUTPUT@',
++        '--name', 'Firmware updating agent',
++        '--manual', 'User Commands',
++        '--version-string', fwupd_version,
++      ],
++      install : true,
++      install_dir : join_paths(mandir, 'man1'),
++    )
++  endif
+ endif
+ if get_option('man')
+   custom_target('fwupdtool-man',
diff --git a/sys-apps/fwupd/fwupd-1.2.11.ebuild b/sys-apps/fwupd/fwupd-1.2.11.ebuild
index 345dba19aaac..7239b28afeae 100644
--- a/sys-apps/fwupd/fwupd-1.2.11.ebuild
+++ b/sys-apps/fwupd/fwupd-1.2.11.ebuild
@@ -55,7 +55,6 @@ RDEPEND="${PYTHON_DEPS}
 	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
 	redfish? ( sys-libs/efivar )
 	systemd? ( >=sys-apps/systemd-211 )
-	thunderbolt? ( sys-apps/thunderbolt-software-user-space )
 	uefi? (
 		media-libs/fontconfig
 		media-libs/freetype
diff --git a/sys-apps/fwupd/fwupd-1.3.6.ebuild b/sys-apps/fwupd/fwupd-1.3.6.ebuild
deleted file mode 100644
index a9c5006ef34e..000000000000
--- a/sys-apps/fwupd/fwupd-1.3.6.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{6,7,8} )
-
-inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( consolekit elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-"
-RESTRICT="!test? ( test )"
-
-BDEPEND="$(vala_depend)
-	virtual/pkgconfig
-	gtk-doc? ( dev-util/gtk-doc )
-	introspection? ( dev-libs/gobject-introspection )
-	man? (
-		app-text/docbook-sgml-utils
-		sys-apps/help2man
-	)
-	test? (
-		thunderbolt? ( dev-util/umockdev )
-		net-libs/gnutls[tools]
-	)
-"
-DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	app-arch/libarchive:=
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.2.9[introspection?]
-	>=dev-libs/libxmlb-0.1.13
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pycairo[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_MULTI_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	virtual/libelf:0=
-	virtual/udev
-	consolekit? ( >=sys-auth/consolekit-1.0.0 )
-	dell? (
-		sys-libs/efivar
-		>=sys-libs/libsmbios-2.4.0
-	)
-	elogind? ( sys-auth/elogind )
-	gpg? (
-		app-crypt/gpgme
-		dev-libs/libgpg-error
-	)
-	!minimal? (
-		>=sys-auth/polkit-0.103
-	)
-	nvme? ( sys-libs/efivar )
-	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
-	redfish? ( sys-libs/efivar )
-	systemd? ( >=sys-apps/systemd-211 )
-	thunderbolt? (
-		sys-apps/thunderbolt-software-user-space
-	)
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		app-crypt/tpm2-tss
-		media-libs/fontconfig
-		media-libs/freetype
-		sys-boot/gnu-efi
-		sys-boot/efibootmgr
-		>=sys-libs/efivar-33
-		x11-libs/cairo
-	)
-"
-RDEPEND="
-	${DEPEND}
-	sys-apps/dbus
-"
-
-pkg_setup() {
-	tc-ld-disable-gold # bug https://github.com/fwupd/fwupd/issues/1530
-
-	python-single-r1_pkg_setup
-	if use nvme; then
-		kernel_is -ge 4 4 || die "NVMe support requires kernel >= 4.4"
-	fi
-}
-
-src_prepare() {
-	default
-	# c.f. https://github.com/fwupd/fwupd/issues/1414
-	sed -e "/test('thunderbolt-self-test', e, env: test_env, timeout : 120)/d" \
-		-i plugins/thunderbolt/meson.build || die
-	vala_src_prepare
-}
-
-src_configure() {
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		$(meson_use agent)
-		$(meson_use amt plugin_amt)
-		$(meson_use consolekit)
-		$(meson_use dell plugin_dell)
-		$(meson_use elogind)
-		$(meson_use gpg)
-		$(meson_use gtk-doc gtkdoc)
-		$(meson_use man)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use pkcs7)
-		$(meson_use redfish plugin_redfish)
-		$(meson_use synaptics plugin_synaptics)
-		$(meson_use systemd)
-		$(meson_use test tests)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi)
-		# Requires libflashrom which our sys-apps/flashrom
-		# package does not provide
-		-Dplugin_flashrom="false"
-		# Dependencies are not available (yet?)
-		-Dplugin_modem_manager="false"
-	)
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		sed "s@%SEAT_MANAGER%@$(usex elogind elogind consolekit)@" \
-			"${FILESDIR}"/${PN}-r1 \
-			> "${T}"/${PN} || die
-		doinitd "${T}"/${PN}
-
-		if ! use systemd ; then
-			# Don't timeout when fwupd is running (#673140)
-			sed '/^IdleTimeout=/s@=[[:digit:]]\+@=0@' \
-				-i "${ED}"/etc/${PN}/daemon.conf || die
-		fi
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "In case you are using openrc as init system"
-	elog "and you're upgrading from <fwupd-1.1.0, you"
-	elog "need to start the fwupd daemon via the openrc"
-	elog "init script that comes with this package."
-}
diff --git a/sys-apps/fwupd/fwupd-1.3.8.ebuild b/sys-apps/fwupd/fwupd-1.3.8.ebuild
index ca087051eeb6..52570fdd06bb 100644
--- a/sys-apps/fwupd/fwupd-1.3.8.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.8.ebuild
@@ -70,9 +70,6 @@ DEPEND="${PYTHON_DEPS}
 	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
 	redfish? ( sys-libs/efivar )
 	systemd? ( >=sys-apps/systemd-211 )
-	thunderbolt? (
-		sys-apps/thunderbolt-software-user-space
-	)
 	tpm? ( app-crypt/tpm2-tss )
 	uefi? (
 		app-crypt/tpm2-tss
diff --git a/sys-apps/fwupd/fwupd-1.3.7.ebuild b/sys-apps/fwupd/fwupd-1.3.9-r1.ebuild
index becbfc3095f6..9e00025905ca 100644
--- a/sys-apps/fwupd/fwupd-1.3.7.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.9-r1.ebuild
@@ -70,9 +70,6 @@ DEPEND="${PYTHON_DEPS}
 	pkcs7? ( >=net-libs/gnutls-3.4.4.1:= )
 	redfish? ( sys-libs/efivar )
 	systemd? ( >=sys-apps/systemd-211 )
-	thunderbolt? (
-		sys-apps/thunderbolt-software-user-space
-	)
 	tpm? ( app-crypt/tpm2-tss )
 	uefi? (
 		app-crypt/tpm2-tss
@@ -91,6 +88,12 @@ RDEPEND="
 	sys-apps/dbus
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+	"${FILESDIR}/${P}-optional_agent_man_page.patch"
+	"${FILESDIR}/${P}-fwupdtool_path.patch"
+)
+
 pkg_setup() {
 	python-single-r1_pkg_setup
 	if use nvme; then
diff --git a/sys-apps/fxload/Manifest b/sys-apps/fxload/Manifest
index 1579339381ef..3e7f9bb57bce 100644
--- a/sys-apps/fxload/Manifest
+++ b/sys-apps/fxload/Manifest
@@ -1,3 +1,3 @@
 DIST fxload-2008_10_13.tar.gz 23926 BLAKE2B 61401b6ea11bfafe8bdb4128dd1658123cac83c1e2b7995a1554b5c9dfa9cf25c2f261bb76a2fc0946940c64ec69fce021e187c383201f4f7a3561a68c3f8ac8 SHA512 f8a654c51a392ac95672a24962ac3b83ea4e0cb62d51a0696f6bdfdefbc7b5cfb033aa9cd80ee676a6bb00061bd635d7eb3920769f982188d8733c862838bc32
-EBUILD fxload-20081013-r1.ebuild 734 BLAKE2B 23184d6a2ae506bb8537048da18d90aaada747c5d1b1c40e14b28c0f5d408b5bbedafb0f03247dccd6d011351afb9ff8b70367cd74392e044d5680eec4ac6c2f SHA512 7813d25b99849b021c98397f29ebb2b029a60ea5894b813437b686fe5e545c600f9d5dd46e5727870766e1e7bd73ac1d3cd37026b741daac8dfa1f34af5ba1db
+EBUILD fxload-20081013-r1.ebuild 735 BLAKE2B c5c7f3875e441db3555dccb78abc062e67598bcfcd9dcec759c20b6798416bd4f1ed20cdc49979d7759ca13d0c8c475836b2e27ff959fdbb848d65478d3baba4 SHA512 13e8e5b5b7c049f509a2ad804b5b9006e6945d1148d18c66dbbfa0a7b7daf204eac145ad2cd33f3e27ebaecc384abeb863f4378771838772fd0c54effc1c0a23
 MISC metadata.xml 250 BLAKE2B 78bfa62c2b315a16f4c255dae1c32ed1c9184c0638658cb5a8a83641deb97c079b73789e020c754731d6d3153d397df00f546c59781855b7d3f8e01933b626a2 SHA512 bc48eb750cab3e4f45a71b1ccea94faabf8dc43826df2b701320cc03318700234bfea551ab12963356f775932fb62d22fb1182d5ac083c3eafd63b3feeb1b0fe
diff --git a/sys-apps/fxload/fxload-20081013-r1.ebuild b/sys-apps/fxload/fxload-20081013-r1.ebuild
index 03fdaa5ed9e9..be8b180ba2c6 100644
--- a/sys-apps/fxload/fxload-20081013-r1.ebuild
+++ b/sys-apps/fxload/fxload-20081013-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 S=${WORKDIR}/${MY_P}
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index 13dd694f47f8..9bf604f09255 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,7 +1,7 @@
 DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
 DIST gawk-5.0.0.tar.xz 3000432 BLAKE2B d7885442c615e2b7986d6cb617db3ac376a5e572ab2aca3c6b2bd0f43feca4374f310bbf2e2a875b617df97cfebf98cb983d169468d51db39058b83eb9771afa SHA512 9eb663bbcad53165b7ddb7d72cfb8377252b68004733a9eb8c191b2ddddaff857e48ba811280311384243eb67574fbe7ac9edf4e507f9a82d67b4b2adff8ef6e
 DIST gawk-5.0.1.tar.xz 3136004 BLAKE2B 1dd8a9bca2488f2d3c946406b01fcbdce0487922ece49fe2121c39d6d10bcfcb6a056edbbf88ba6c22772ef88a250fc8ffcba33ead399c0d7c8f5d19d0e896d3 SHA512 ff9842a91035f843482d93eac8a35cddf2ce16acaa43a0112c1efff08802aebf705ee70d47eff74a190dca7be330c31f7204ad27cb63bdee65333f9b9c984212
-EBUILD gawk-4.2.1-r1.ebuild 2165 BLAKE2B a68c0ebf95fae1538172fce497021d18065ad1fc571808d00e17f72439692de4bcad997e5208a855a5759118b580f67b0486c80e3d74e33a5b273bd3b1626453 SHA512 e06b4b51098de3a08a2e6103f59689d753474874dec7241baef0e5672216bb6e5d80d3fa0f9e312eb0f998a0cc276dd93668a81ccf35ae45ca4364848c1a4957
-EBUILD gawk-5.0.0.ebuild 2177 BLAKE2B ba3033bf44fe5f2fdd506eb633ea5dd4d8541ea6303095e847ea003bbdf7712f25c740fab5829f4833dd2be5ab3a6dbcd56b491c793b7de3f3c14d81b4a1e329 SHA512 d542138bffa5826d736a1e0421485d9d795aad49aed29e1990f8b72d527b75fbc2a7da07ccd22579b93079097b935068be15bb4b02c82fbe84077cf0b6bb3b02
-EBUILD gawk-5.0.1.ebuild 2235 BLAKE2B df3b4d97a21028080d3be390c071e3955ffbc66e2ebda2df2a96b99def1a6dbd12b024cb8ece247786e005185716ebff4f93ffa71866e4173dd0271b23b938cc SHA512 c37f3e0f9205e7dfe3bfd70e5dea043eaa3644e4c447a1c5d6e15863fef178ed8a177c9c7efed392fdc2a129cf0888ef3cbd7fadce6d0c3b0a269e22c01d3abb
+EBUILD gawk-4.2.1-r1.ebuild 2163 BLAKE2B a4fe42c804df36f72fe71dcc52117b23695ede14ff72688d3191955264060ea3ce902ea9413e18b2ec990e5d430a51aa5b7e9f9cdc7c86bf25f91b791af926e2 SHA512 6c917331dfb5fa04d6be878f08e06a27f34a5cea2aadcd1c0bb737258a5b8d34b722b42b3219109e03d320620fd39ebee0bd0ccfbc5d4106732a21d4cc4a897f
+EBUILD gawk-5.0.0.ebuild 2173 BLAKE2B 65cd7d75669a250b9591a94f59afcd9fd6883d15a840166985ed2b8de28c6af212748353414e2f1c5e92d26393d7147bc7e3a5789aa4d905495b083233a26a35 SHA512 9a25342ba1cd13711c88d3deea98ffdd066ac65565439a0aacee948860721766f07668f73a01025671e4c2b8d6f7d5d3317a0212cf0c87fe330da3f4ecb3b29e
+EBUILD gawk-5.0.1.ebuild 2231 BLAKE2B 337e5fc22b6eb3e0854df63663a1a1f3127af4b2ee9b4ef88e75ab32a6eaacc6575606e46ee3549e64f859e442f3934a1479b2e3774835787108fc96a6ef8549 SHA512 6f2c3d50656d342de6fb543f256764b43ee9217e99ca94c4378e312a5202ee3138104cbc509045b593c6acdc8e2eca6d735480c7e9ef5f1fb7c9b8e55addfda1
 MISC metadata.xml 347 BLAKE2B 3b0515d5ca37d12fbced19fc573e31fee27137e618aea3db03395a6bdecd8ad89d0d231fd3bb566ee993704a57b090a32697016885456e386b2c33ec37761b64 SHA512 1150e37d64393f26ef81056ff25e9720a4bc82dd28c9cffd164d144bb6d2f660f802a31d5ebf4fd121a01b36a4a5073893ebec6b735d3eb570da36705d5f446e
diff --git a/sys-apps/gawk/gawk-4.2.1-r1.ebuild b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
index 811ba6d753de..757e8a64e805 100644
--- a/sys-apps/gawk/gawk-4.2.1-r1.ebuild
+++ b/sys-apps/gawk/gawk-4.2.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 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="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gawk/gawk-5.0.0.ebuild b/sys-apps/gawk/gawk-5.0.0.ebuild
index 403c0d5ab7e9..1a1bc35f4c0c 100644
--- a/sys-apps/gawk/gawk-5.0.0.ebuild
+++ b/sys-apps/gawk/gawk-5.0.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gawk/gawk-5.0.1.ebuild b/sys-apps/gawk/gawk-5.0.1.ebuild
index d07f70d6d8ec..6ee180218e5e 100644
--- a/sys-apps/gawk/gawk-5.0.1.ebuild
+++ b/sys-apps/gawk/gawk-5.0.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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="mpfr nls readline"
 
 RDEPEND="
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index d355733ae805..a6b365496c3f 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-functions-0.12.tar.gz 11514 BLAKE2B 88f626a977b6f7b7cde2df452b91ef9570d29f3e6488d23859077b4d31a441dd0eb9cc473263e06a67dd90b714e24cbcfc09d4c4003f9cd29c8b7aeb0f3c91f9 SHA512 181e09216e1ed78f590e0bb50c60cfb0295bfeef335ed6c957ea7f2a1d6145d91c0a6dc4377bd6cd538fb4e5871e9a5ef8332d91bc91931792d5f05f62bc4705
 DIST gentoo-functions-0.13.tar.gz 11334 BLAKE2B 740e6d950b62b777e533d16b707cbf6f9ab0e9de4c92c5e755af186571539949017aadcd7d428b1e635f43052a575f89787b3e92087675b600a6b7350fda24a6 SHA512 61185197e1eb4155d0db9ba024dcb1b9eb0d272e3369f986668634012e35b57c3cdcd7beecd4714b9b48a0e44e8bb73472713949e16827aa05c055ec83d537dd
-EBUILD gentoo-functions-0.12.ebuild 836 BLAKE2B 1bda7498bc1b76bcb26cad4700aa7d8c8aa0b51565f479d05bb0925b22ede5234990f3ff588d33bdf3fc79d2554ecf2e96d3023cc15dae0c25458f0aa47611ba SHA512 8819c2e123091c3ba25e4829e7abb751d2af23a1b3961d81fbd26b28c8e01c734b346426b07979d36eb0e83cbd31a074dfae9d6b76636537815817cd09c42ec0
-EBUILD gentoo-functions-0.13.ebuild 899 BLAKE2B 1256dab5f5ebf046ab031c07d4dda60f782eb99a9f72effc8d9da97812fd0526deca40c243712ca3e3782ec65976085e88ed4e70d3223dbaff440510ba73328d SHA512 1ce0351be883fe63019dd4a4f30bcd567a3605aaaea79ed620ac8cfa1541665678e2c80ea78c126c7064b909b48865d29267464eae4042e18a929dab0a29871f
-EBUILD gentoo-functions-9999.ebuild 899 BLAKE2B 1256dab5f5ebf046ab031c07d4dda60f782eb99a9f72effc8d9da97812fd0526deca40c243712ca3e3782ec65976085e88ed4e70d3223dbaff440510ba73328d SHA512 1ce0351be883fe63019dd4a4f30bcd567a3605aaaea79ed620ac8cfa1541665678e2c80ea78c126c7064b909b48865d29267464eae4042e18a929dab0a29871f
+EBUILD gentoo-functions-0.12.ebuild 834 BLAKE2B 669d72ac34a0971e3d119afa7e9be3a44c56db77ea96960e58e79025581a42e562d5606a42c781497db9f90e8a1b25a30a5876095b98478fe75fd1b91cfb82ec SHA512 4a559684ee4229a6acc570991b9b94fa588b9083a30528e1a094b435bb8a16c698aa6f914f6ab33926536a2318be64a68bb51affffa68259825a9fb5e64dbe55
+EBUILD gentoo-functions-0.13.ebuild 895 BLAKE2B 0e9cb57058a2d4141cd57c169ced43ee6f9afd33c0214e3303e01572b3667df7b5634a40ef78087b3e2333ada242f010f33042abd7e030848a3044a85a83d792 SHA512 dad2d0c9786786eca6dd55156599f1c2db030a15556ede83d03a170317f3f25d9226bba805575d82e46041759763e7972de05a6c34808e2b2e0ee6f8853701f2
+EBUILD gentoo-functions-9999.ebuild 895 BLAKE2B 0e9cb57058a2d4141cd57c169ced43ee6f9afd33c0214e3303e01572b3667df7b5634a40ef78087b3e2333ada242f010f33042abd7e030848a3044a85a83d792 SHA512 dad2d0c9786786eca6dd55156599f1c2db030a15556ede83d03a170317f3f25d9226bba805575d82e46041759763e7972de05a6c34808e2b2e0ee6f8853701f2
 MISC metadata.xml 626 BLAKE2B 1ce5e077ad0857f9a7bd975429c8964dde8a340ed31d345439f8e1d8769873e8f36a5ce3fd9d611ae67478dacf2f9b6451e6bd93219532e32dc9a5840e1c03b9 SHA512 c63b4d51b0cd8ae662f66870ca15a26300005fd683a4a16643aa553128b2ded5ee0542a8185ae09b989040f602f2f42f79e02574e44bb1ce63457b5c0d8b4dd2
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
index f4946e19d143..a0691d0359a7 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.12.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/${PN}.git"
 else
 	SRC_URI="https://github.com/gentoo/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	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 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"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
index c06e9afa8388..04f1a329e9ec 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-0.13.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
-	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 ~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"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
index c06e9afa8388..04f1a329e9ec 100644
--- a/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
+++ b/sys-apps/gentoo-functions/gentoo-functions-9999.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
-	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 ~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"
 fi
 
 inherit toolchain-funcs flag-o-matic
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index 20e0d73a3239..b8b6c9bbe570 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-systemd-integration-7.tar.gz 64243 BLAKE2B 389c6627af6eca9b4a0854d35751a8cb45cdb2795c7b621e96e9d5bcc13a80fe1cb109c0cb2bfd9d33f7642fd08198a0afbd5b4e5956ea6ba8dc89cf4635d9c0 SHA512 cd47caa01d73da57998b6b37d89cbeb53fa722c7f4a31bb03d03762350490cde1db3ce06090df6b6ff25c1cafb40f6c2186efbd52156ebc6d078b4a59d6fef52
 DIST gentoo-systemd-integration-8.tar.bz2 53734 BLAKE2B 711f1f6603fa40e81fe32809a32f61486ab068b1f636502ac36d58e4c204b5f0d46f51a6624f134a457f246b520614213cf45cc5397de769b315e01e32720bcf SHA512 373892ca9ae8845673f9ddad74e0be0b71af944e109adf0d2ce8e54a9c24ffff5e90cfa92e74b7abc1e7d7b1598404258b90b549697bde28a1025a2d974e991f
-EBUILD gentoo-systemd-integration-7.ebuild 793 BLAKE2B d627431d1435b646d63f9950774373717bc7edb93c3572415ec093887a7f8d701d3f8223f858e4ede2e6c3bc4db24717c07f560ee818bf330656852c5df5188b SHA512 6a6f279c10995766ccd09c6ab63655aab4b0409d65eec8452cdc712a745dfeef0368ce64877ad51a61701a9a2112d7003463287068a1fb67f5a563df28be11f0
+EBUILD gentoo-systemd-integration-7.ebuild 794 BLAKE2B 7f33bc671174599f5a855a93522f7888f2a818a2a45f47742ed61f05f05708b976ee566625df20cfd422dd6f9f9ba4ebd21fcefd51e9bbb2059d48b542e795cc SHA512 fdef060281bf6c98ac0236a6e111bf8f36746fe80c335b4b2fec453502f903effd7ff261593a60a836beb1e333812102061165c9e1f86a340c9bf3db3729bf1c
 EBUILD gentoo-systemd-integration-8.ebuild 735 BLAKE2B a1d3366124cc457a5537ae08cde3d0005a9d5cf47f0015743b759e9f0f5cf550f31f6380d4b6f515a3f28812acf2d8a64a3f47ebad413a2609326c58757e1130 SHA512 8045e9fe159ccbb4640c69a0986cb46094bb7358e0b0ed6b6b1d262ccd01f6a9e4be9862fd0213cb1b26fcab005aaa5ebb30df80f47424ccc76d2001e2f6939a
 EBUILD gentoo-systemd-integration-9999.ebuild 729 BLAKE2B 24adcb67d253b61a09eee0df7ee78cbcafc01c3e60f5d114351204f456cdd4c138f5c27c311e72ef80e976458424266c2b9d979aa1c8022887e7b01936975841 SHA512 bd37d55941397bf4aefda23375d58892a480d4348548a543d5a0d5139acfba677082e4c14eb839a9e9b77952fb86dd32623e0b9f255a36cc32ad9327d32ce345
 MISC metadata.xml 355 BLAKE2B e2e7d95fe4d4f671d0b8a24bee9db8c458232ceed374b7ed902f724ca5971cebb81acc19fe62a6d53bf98cff4c7b999d3dbcf674426e46accda3d591d6009545 SHA512 b590b927b555441da6f665dbf637ffaa27651f074a62d1738959c5913f45ee648146f9054e07ade42d5f28f93cb350b43c94299a50506d01d446de22ebacdbc0
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild
index de400c2d47b9..cf3c9066f0cd 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 inherit systemd
diff --git a/sys-apps/gnome-disk-utility/Manifest b/sys-apps/gnome-disk-utility/Manifest
index 6a50dee937d9..c9e3425c1cd1 100644
--- a/sys-apps/gnome-disk-utility/Manifest
+++ b/sys-apps/gnome-disk-utility/Manifest
@@ -1,4 +1,6 @@
 AUX elogind-support.patch 4363 BLAKE2B 060db5cb921d8b51d7eb3acd76186649b3d3887ebd72aaca79dfcdc44a602591d3d9ee11047af1655678e6a9f5c2fd445e67cb66b65cc1ac0a244db22b8f9c1d SHA512 1f7ec2af9e2764f338d5d903ce506a8416d21cf03be6c2dc927d3fde67420c5a9066244db0e3837468fa2bea0527643bfb55dc6db8524e8122467d13e19db418
 DIST gnome-disk-utility-3.32.1.tar.xz 1370900 BLAKE2B 4986169bff7f438b4a9dc9fe10ea69521c41afaa268bfebdf195ff3fedc14e0d8204e66b258c71f599867c0279c781ca5ceb175381dcc8004c41d97be92ebf46 SHA512 80c4e2fb1ca6136579203c3df73da4c8ef7d496ab73166096768d72b3473d11e9ae199d4aa1878c49ec4280ea98d2136e084a03bba50c2728be4c5e4d508967c
-EBUILD gnome-disk-utility-3.32.1.ebuild 1632 BLAKE2B f36dafb6a302d27b8e21a5f63206ef2cdece04c8c1545a55eeabc94bf1654db154db91be27775735d1539abfd7218d9c6d05ac4795ed1cef73995a00282108a7 SHA512 6328bb987abe301bddd1a08230345893a9b48a5092e89db5d1349007fdd7adc9c6d251025f2166a2d55b92f63dade7960d1671bbcb0152ec5482cb6a247263c7
+DIST gnome-disk-utility-3.34.5.tar.xz 1385256 BLAKE2B d13202abf77c62cdbf483486d7ed8204016111042f29fc810f0a55a9cd3dd48553d523523348e73a5d3dc3c3133939577b14227f2f5122471076cd93482dde15 SHA512 04c1ba0865b3947cfc332e479faae7b404f70907d04446bfe471d8fa2f8f5c921b1d59ab0f82fad13f4183401dacf3a516ee7ec439e94dc3e073a8dd62021a51
+EBUILD gnome-disk-utility-3.32.1.ebuild 1628 BLAKE2B 93d66bb65cde741ff9516b2f988dbc4969bf062f69f9641b2986d4cf19e239b9c497039ea2664f0bee4acc5c6a7b565ef0b77e7bd82b6a8144e95e01d83dccf0 SHA512 6405ec7f54dbe3f6ff8272c7fd529369052bbbe5ded1cae4a2f48f8ef74067e7aa768cb63d86043cd87ad24ce176728722303075ef82e089f3721b9135fcedc4
+EBUILD gnome-disk-utility-3.34.5.ebuild 1386 BLAKE2B 42ca1790d80525ac95924c17301247fd26471628fcaf92402510268b6fa5adbb85023ee440784b1ddab167462e8fa893ecbece2279d98aff97715ad21ae61c03 SHA512 0cf9e3572d9587c8ec4f5483670a7c2494c9b4043e759340e08ea513204b89023e10e365b4b5146b7d602570dfc7fef1e8e957a3db2efd3008cc1cc71fdc9cee
 MISC metadata.xml 597 BLAKE2B 6a1f81b2d7758158e8469a0544ce2ca45af42d24379391870b55fd97fd6dd963228136329af658851ecead1c14bf5a92658e6fde18223842451a9d85ccd628de SHA512 40904280037c0754d3481458bf024f83382e65122188f8fece8cd361cab57e01dfbc7b85da631b4265aaa6107567e376f4291e9f6e60e5e89bc747908c8e496c
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild
index a5810d668f9c..cba48c95092d 100644
--- a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.ebuild
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.32.1.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
@@ -12,7 +12,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 IUSE="fat elogind gnome systemd"
 REQUIRED_USE="?? ( elogind systemd )"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 COMMON_DEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/sys-apps/gnome-disk-utility/gnome-disk-utility-3.34.5.ebuild b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.34.5.ebuild
new file mode 100644
index 000000000000..6f3bb0f36d10
--- /dev/null
+++ b/sys-apps/gnome-disk-utility/gnome-disk-utility-3.34.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome.org gnome2-utils meson xdg
+
+DESCRIPTION="Disk Utility for GNOME using udisks"
+HOMEPAGE="https://wiki.gnome.org/Apps/Disks"
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="fat elogind gnome systemd"
+REQUIRED_USE="?? ( elogind systemd )"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+DEPEND="
+	>=media-libs/libdvdread-4.2.0:0=
+	>=dev-libs/glib-2.31:2
+	>=x11-libs/gtk+-3.16.0:3
+	>=media-libs/libcanberra-0.1[gtk3]
+	>=app-arch/xz-utils-5.0.5
+	>=x11-libs/libnotify-0.7:=
+	>=app-crypt/libsecret-0.7
+	>=dev-libs/libpwquality-1.0.0
+	>=sys-fs/udisks-2.7.6:2
+	elogind? ( >=sys-auth/elogind-209 )
+	systemd? ( >=sys-apps/systemd-209:0= )
+"
+RDEPEND="${DEPEND}
+	x11-themes/adwaita-icon-theme
+	fat? ( sys-fs/dosfstools )
+	gnome? ( >=gnome-base/gnome-settings-daemon-3.8 )
+"
+# libxml2 for xml-stripblanks in gresource
+BDEPEND="
+	dev-libs/libxml2:2
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	dev-util/glib-utils
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_configure() {
+	local emesonargs=(
+		-Dlogind=$(usex systemd libsystemd $(usex elogind libelogind none))
+		$(meson_use gnome gsd_plugin)
+		-Dman=true
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index a76e3d26b4fe..2fd9790ac772 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,7 +1,5 @@
-DIST gptfdisk-1.0.3.tar.gz 199924 BLAKE2B f664398cb58d081ad19e267a370a4a7363e1060358aac394d87cd5874efe558fbd7bea4a33da871287c144b664c60e283d3338ca88d7d494503afe9a0b652e7a SHA512 80d437bfa2365abfffbd4812ea928fcebd52c5421de321cf190d395549e32c5ebdbb2d060cc4b95f77fe13cdd719f4d2bb3d0ed5d97792b100325f92d7c852d7
 DIST gptfdisk-1.0.4.tar.gz 204075 BLAKE2B 45be16bd4e8312e4797a70c07447702a7f966edec94a9e9e17cff89eee51bf33cb9418dcac2a103e68ea2ebb8df4e7a997fd006bfa4109cfd774838bd4bd7d19 SHA512 2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf
 DIST gptfdisk-1.0.5.tar.gz 205973 BLAKE2B e026dd4b4f2b63ca660feef34a1fdfb14034d0d64e4828fddf4a0c63756cbc840b3292231838f0c016256be2358069bde8a17ef0e33dec355c48406a9a930e75 SHA512 3d3a59e3488dd3d6bda5d103b9ad8b7936752210346b9787ddc936681498fba90577b6ae950c471d09a01bf6405fce32038ff1777c52db0b21e5277737fe3703
-EBUILD gptfdisk-1.0.3.ebuild 1242 BLAKE2B fc2f462366344366fffcda0e083869cc414757dea23890e44b2b350095346c1dbd22caf559f911563cd2671313f4db8cedc7fe87c998de155afb75f2b5389f21 SHA512 29a75dbd8eca9d740238cf3990385aa7d93a9095c0ecdc778a2a09e755eb2e8ab42ba5f70a928bc678f0f8439d79eb64519711aebf0e126092dd930e9c4e2a49
-EBUILD gptfdisk-1.0.4.ebuild 1243 BLAKE2B aed2cc611c225eeb33e7fd3072232c9341bd1d750ac6cf195cb3f75fa5d591247e33e2c5ad656a301fc904fff6ca41c9c1886dbeaa71604f2bf398972f7f44d8 SHA512 6a9aea49f29bc906d834d22c9d91a35e7112c0543d39960c0c3dda89b4ed363b1dc5e42766b480eba0311e36b83c3bd7ff5450e336740bc073bd8781a158bd12
+EBUILD gptfdisk-1.0.4.ebuild 1243 BLAKE2B 198548c9d00163469c4f9e820688cc742d4fc2ead642247551db4ce6a99a9da56b60590f99dbb9cf540aca1023a3e6c8eec94b7885d8506ae4dcc01a1c152763 SHA512 4fa284664b07d789de29bc32e8e7be90c26a81fd9f216d24aca4c76950612b665f357826f96abcd11c08bc7dae949182376edd3cb4334bd03d047bdc7adb00af
 EBUILD gptfdisk-1.0.5.ebuild 1251 BLAKE2B 47a900ddfdf051e80f28f9c0ed3cb4649e7d1c8009aa978aba5f31c38565388249b5aa192173a8409fbd868a5a568f9a8b78c577b4f726e1f353516eac232dd8 SHA512 54a7a0f1ed2ca43c78261925be662a8ed46502a6e8f457aaed42da151e2b2804a92b0ef73db1a167e83cc9f8edd199b22e9bbae93c8167ab0bc7f2b52acb59f3
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
deleted file mode 100644
index 5f3412b9c217..000000000000
--- a/sys-apps/gptfdisk/gptfdisk-1.0.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="GPT partition table manipulator for Linux"
-HOMEPAGE="https://www.rodsbooks.com/gdisk/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="kernel_linux ncurses static"
-
-# libuuid from util-linux is required.
-RDEPEND="!static? (
-		dev-libs/popt
-		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
-		kernel_linux? ( sys-apps/util-linux )
-	)"
-DEPEND="
-	${RDEPEND}
-	static? (
-		dev-libs/popt[static-libs(+)]
-		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
-		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
-	)
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-
-	tc-export CXX PKG_CONFIG
-
-	if ! use ncurses ; then
-		sed -i \
-			-e '/^all:/s:cgdisk::' \
-			Makefile || die
-	fi
-
-	sed \
-		-e '/g++/s:=:?=:g' \
-		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
-		-i Makefile || die
-
-	use static && append-ldflags -static
-}
-
-src_install() {
-	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
-	doman *.8
-	dodoc NEWS README
-}
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
index 382c4ff6df1a..9850f5dda92e 100644
--- a/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="kernel_linux ncurses static"
 
 # libuuid from util-linux is required.
diff --git a/sys-apps/grep/Manifest b/sys-apps/grep/Manifest
index 3d053c7a0e49..6c4d50144e6f 100644
--- a/sys-apps/grep/Manifest
+++ b/sys-apps/grep/Manifest
@@ -1,7 +1,7 @@
 DIST grep-3.1.tar.xz 1370880 BLAKE2B d71a09d8bfd2c15b6d393d3ca4e22a2b2724632034a6d35d6e269a3c639d76ecaa5ae989a3d8466ee4bcf45e5d08862b0ef19194d6ec7ac6c250e6f60fc61031 SHA512 05494381c7dd8aad7e2ee4c17450de8d7b969a99dcfe17747db60df3475bf02d5323d091e896e8343e4f3251c29dc7f0b7a9f93c575c9d58ee2a57014c2c9d26
 DIST grep-3.3.tar.xz 1473056 BLAKE2B e1592b623d1f32d1b21d127b0d28f8f6501d4b854ff2de810d12d43292c00e6af887b038f22d0c4c45c314b6e9d73a82dec6d737519c674bb139c2ef70511aa0 SHA512 e4805dbddf7cd0f0faf412557d408509650c1ccf703bc450f10a3f727c690dbfaa1235aa81939a0e4b7ac6190f88c15ea1fcc562b343d4b4c7550f967aeb15db
 DIST grep-3.4.tar.xz 1555820 BLAKE2B 4e1924d6d5eb66faca93b405cce9784d726a476f26a384c3b44375cb09f817008aeedaa701a30b6c1f21c030902d603a80ec80105b2d5d76eadf09b910d573a7 SHA512 0f1506bd19971fbdcb47a111277ca63e8ad045456f096980852fd0a61c860f29f4b369bbaaa5cbce4b0a81718e3e3274d9a078b491f2109baa9a02ce600ee206
-EBUILD grep-3.1-r1.ebuild 1461 BLAKE2B 4dd9927658c7446eab9d5019bf90ab1fe273738783a797d04bc425e9ea74256725695c853a879431023be00ded429dc3c89b954d1ac04e51218fff1f2b0eeb05 SHA512 3931e6fa4d4af96b5b8739fe1bb00e5a798e70e200856e7292edaf54eb7da3bc39e1f13a4bcfd116545aa0733478b9e0249afe5294c990692d632784d00f0b50
-EBUILD grep-3.3-r1.ebuild 1466 BLAKE2B 3d5ec0b7bf29bfbabfc3d666dc0e22668ae9ab935afe8cd06c379b43d03eb6b1bb32456a6937665591ec52bf5dc291c3c46c43edcffefa3fab9200fed48d486d SHA512 fae062a766dac5f974d44058d309668546bfd3db9890674370cce386556620d7857f402ae64f76f47d1e2a738eea551b8228e8f836fb7c53db64930e44842fd6
-EBUILD grep-3.4.ebuild 1526 BLAKE2B 729d08acfe1da73ff627821e2ff50ddb90ccd3828506f7da7937cf3f73677f0b860a6923e731439ec9443e4641f7cfcc99b189ef8c7d8e2832f1598713daf573 SHA512 341197e89816a0a466d92dc078f233cdd2c76b5e998f84ed1b9feac500caf9e9857589c423649f2665e89a7468ab43bcaf31071f50fecaad070b89390adc7db7
+EBUILD grep-3.1-r1.ebuild 1459 BLAKE2B 17f8c65efc0eb18e533bbe4ff1794f9fdb2133dbd19ce92245b26717a1cd7286e5cfb379c7720fa01b985143f46c0bfd0d97d87dd616789dbc04b24142cf33af SHA512 c26daacdcad5e8c1fdba3f8e3d2c75bc173bb648ec2908c96fd9145402cc990a709802fb620fb1f89f9bd9fc65b8ad3c5bfee690ec6a1c1a41bde7364efdb3d8
+EBUILD grep-3.3-r1.ebuild 1463 BLAKE2B 2592d406868784921685aa21b321caf12126627c935d729a8827048532779e7deeee21598f699ea6f9d238d945dfbca59b72555064a5ac32d5ab7fb93720bc47 SHA512 86392996c511087c09c2822dd861d6c223482ebe97b7c77a53673f003447b393cfee09647a302a939ca98cf5e7b123012323ff0dad00e9df0563d86f575f9693
+EBUILD grep-3.4.ebuild 1522 BLAKE2B bcfd24d3219eb4daa64894084e592d277dae2cbebda55ed2c7cc71688cf4630766e5529ef9c04cd2ca4a57af7ad9cf49c88a0e04c7ec72a5ea76ab4e5da1cb40 SHA512 e2654150a88cb90c194e9cc20828ababa8290fbfabe98ab93c95c41fc80c0b29800b93bb415c0b5a9194705f1a7b518ff77b33cc16489057311435742cb9db69
 MISC metadata.xml 327 BLAKE2B 4b377e001da15ee2ba05c41866d06eb3e9833f46b6985c38adb405842fb434bdfb49d944557787f4ed68d8e7194036d298b662973c480043ac841ff628a57f53 SHA512 394c0bd736594ec5ef916f1bd0b4b1d8b5547132bb375fe04f67da49fd0cdaec184206e8255f054b8cb5656dc5426e92a51781758cc1b6373200f31bd3152d6f
diff --git a/sys-apps/grep/grep-3.1-r1.ebuild b/sys-apps/grep/grep-3.1-r1.ebuild
index 00b81c08d758..772a9e2d2822 100644
--- a/sys-apps/grep/grep-3.1-r1.ebuild
+++ b/sys-apps/grep/grep-3.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 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 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="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/grep/grep-3.3-r1.ebuild b/sys-apps/grep/grep-3.3-r1.ebuild
index ba46ad9774f0..f8c15a4f4d62 100644
--- a/sys-apps/grep/grep-3.3-r1.ebuild
+++ b/sys-apps/grep/grep-3.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 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 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="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/grep/grep-3.4.ebuild b/sys-apps/grep/grep-3.4.ebuild
index db80d522f833..a581969446e1 100644
--- a/sys-apps/grep/grep-3.4.ebuild
+++ b/sys-apps/grep/grep-3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 
 LICENSE="GPL-3"
 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 ~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="nls pcre static"
 
 LIB_DEPEND="pcre? ( >=dev-libs/libpcre-7.8-r1[static-libs(+)] )"
diff --git a/sys-apps/groff/Manifest b/sys-apps/groff/Manifest
index 42791908ccb1..eaa9d2aae5ac 100644
--- a/sys-apps/groff/Manifest
+++ b/sys-apps/groff/Manifest
@@ -5,7 +5,7 @@ DIST groff-1.22.1-japanese.patch.bz2 52968 BLAKE2B 8064ff973c9507536c4e6edb6146c
 DIST groff-1.22.2.tar.gz 4019913 BLAKE2B 904a2a6064cc70cf088224d6f608389eb56842142802636b94fef30f5e20b5c62db03087878d0e04e22c65754e0fd253aa7cfd23c1354057862f70e17db43366 SHA512 ea34db53f075b6816827b07ac3d6a19ed50529c939044337eb3124575ac3b41363e1d81bbd5bf552a7a10f6b1dd233d6e7acaf646e18cfe94464c59dc20ffe80
 DIST groff-1.22.3.tar.gz 4188772 BLAKE2B 28c380d33719f4eb0c91a9761e76beb9a2f1f6fb632c731bb6b26f76fee1857e7340d62a2239b360e049351e2e291c420db18a4f6bf8f50221bf249457872693 SHA512 c526ab203d13a9c9d110bcd3149fe50d1cd0d309437e9e2731a7ce90d890507ebc0a2331899ecf4dba2938daa756b6094cf76fd347a0ded59797c70ccfd0c95c
 DIST groff-1.22.4.tar.gz 4137480 BLAKE2B cdda8a7e8e42b8d8991656ecfbffe0cd0ed5d8932467cab2f3c1eecb3365f4a5c03321b6ed929d451c3dfb00a46046a781303a1c55c4aa65eb7d178fb36b1cbc SHA512 1c42d3cd71efaf067b5850945d9097fa1f0fadd5e2b6ba7446bd9d4f439fe1ad058e4ddb0d4e0f503682137dfc7c822944ce1e3e5cf981673f8ba197ea77126d
-EBUILD groff-1.22.2.ebuild 2793 BLAKE2B 16d90454aecb189a518e64b143301f426699cb28edde27d201101498b2a38ee87a83cc3ed529ce04228384d078ca7374246d5279f9fc5f2ee93a8a395b226930 SHA512 8c8a436641cd9d2a098394ec44e61fdb05c3c1f698c8e8d2e5ed9d6cafa95e76428f9b5f57d08deae23c98f71f90d223472e2c26fb83e856631cca8c1dcf3579
-EBUILD groff-1.22.3.ebuild 2507 BLAKE2B 0ac014b9545eb3eda7e257e3e60d1455ccdd43d26db91e38367515c42da16a041b82accdaa3d87ce5e0a79735ca12f10319aeb6628fe38d4a6493b723ebefd84 SHA512 45d0b2145e25e6587872600630b4caaccd5706d7b16d2487d5bdeead5402aa746a78c13b4b8256294f9f63dd1321f0b1134c2d5168069df848dbba728bef4b21
-EBUILD groff-1.22.4.ebuild 2567 BLAKE2B 17fd06470dfc4c570b9ce6317a1e0d8ae769e641b04175a007d99415be3087cb61aa844990a48c5f15237ec193369b87f4609fc6399c232e473491b18ae79f85 SHA512 54b293ec1b51516c8a5299a7ff2db34c07d18ab8873bb172063cac2c1815aa381917cd7341c4462ac4c85e6fb927be7c33aa4f2301044b99a86ffa8eabbf540a
+EBUILD groff-1.22.2.ebuild 2791 BLAKE2B 40147235c978f950d9cbf985b416f18d474c694d9321006ae0625fadfa561ae83bda300660b1897c4d505a2ecf85fc2bd0f6f9dd94ec5a56a7c0d488fb4dc1ed SHA512 c07d444c9e3af2c962acc2a6b3d64ab90740f71bbb42f84acac2fa8942e5b460c19949019a9b470d39b6c8f72b601bce386f5d6d1b1f0af81715614d64cae412
+EBUILD groff-1.22.3.ebuild 2505 BLAKE2B f1692877df1e406fe16bb1a18bcb6b2f814888cee854698f0bd95acf5d611a22adff926c760bd657e3e8c2cf7f3c9d01b9471d9fec644468b371a76499ee51dc SHA512 6e0004b8b07827cfe39ced9050e8077c8cca392fac84e21e0aae9b225676298f12df4d853b65a00dc56efb6fd1d3a89f744e117f496f3438fd9b51d4255639f4
+EBUILD groff-1.22.4.ebuild 2563 BLAKE2B 6dca932b9639506937cf72efd663980e88fef36e8ff3c2fc643ab4c08c763d2699fbce431a2c5ceadb704d26ad9d55ef485c54b675fce93eea64e74c76a92e97 SHA512 91b41919c01e17dac55dfea6d40d818cab1d674f9cf927a24393c0c77dbe050b69f23375aba16a57d2f07d2b80e12956673084a56e60b19df8faa45bfd26482e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/groff/groff-1.22.2.ebuild b/sys-apps/groff/groff-1.22.2.ebuild
index 159d8fc62c2e..7f8e96418062 100644
--- a/sys-apps/groff/groff-1.22.2.ebuild
+++ b/sys-apps/groff/groff-1.22.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/groff/${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-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples X l10n_ja"
 
 RDEPEND="
diff --git a/sys-apps/groff/groff-1.22.3.ebuild b/sys-apps/groff/groff-1.22.3.ebuild
index 6930f36949c5..13cec7573a5e 100644
--- a/sys-apps/groff/groff-1.22.3.ebuild
+++ b/sys-apps/groff/groff-1.22.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/groff/${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 ~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 s390 sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="examples X"
 
 RDEPEND="
diff --git a/sys-apps/groff/groff-1.22.4.ebuild b/sys-apps/groff/groff-1.22.4.ebuild
index 0dc67cae3b7f..79613e8cf453 100644
--- a/sys-apps/groff/groff-1.22.4.ebuild
+++ b/sys-apps/groff/groff-1.22.4.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/groff/${MY_P}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *_rc* ]] || \
-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 ~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="examples X"
 
 RDEPEND="
diff --git a/sys-apps/hardened-shadow/Manifest b/sys-apps/hardened-shadow/Manifest
deleted file mode 100644
index f883c80b5e4f..000000000000
--- a/sys-apps/hardened-shadow/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST hardened-shadow-0.9.2.tar.gz 393648 BLAKE2B 8d5d87019ddc3b3bb5b16aa554e2a41c5777ead16e4c78ea0940c4f8776c039b3ce07fd308e56c631a4dadd18be81a260de29a7a3eeb289841adc73faa502de9 SHA512 896e25e906beb69c2da4906be8e5228ae4b49b6acdfa5da73e1a61e1b09e45ef75fc936d9bcc0b9b3880b210c77d5a354d6f4f7e04a7618adf0a7ea648b3db67
-EBUILD hardened-shadow-0.9.2.ebuild 792 BLAKE2B ab2118370f81d246b015ba36296609652b317595411f1c4892158c40d3446abad96c51bd1ec0f5ecb05fe06a88ddcb1eb3045c919546af9b8905621e5a5cc00f SHA512 8e163d9dc1304dd3a9a4641ffbcd3d5151b0431e4a4d1b9359f68edd681e5da105780d9e1afda91357cdbe0d97383782133acf7b7a345d7449aed36ff13290ec
-MISC metadata.xml 252 BLAKE2B 21b719c8ac90d77e3465049ebca9f820f4dd53fb1393a010bec7957c6a38df014d32a66030917888b125bb5fdf7575d39aa526b0255c23bbbe05ae3c0f2514cc SHA512 42998f3ed757a2aeeeb617eb3fae6789d11b867ef7b77ea5998beff08070f31bda0bf24031d6521de22655494d9d09d3ab6da985829409d2caf9a1ffc0534348
diff --git a/sys-apps/hardened-shadow/hardened-shadow-0.9.2.ebuild b/sys-apps/hardened-shadow/hardened-shadow-0.9.2.ebuild
deleted file mode 100644
index f8f37d1bdd86..000000000000
--- a/sys-apps/hardened-shadow/hardened-shadow-0.9.2.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit autotools-utils eutils multilib user
-
-DESCRIPTION="Hardened implementation of user account utilities"
-HOMEPAGE="https://code.google.com/p/hardened-shadow/"
-SRC_URI="https://hardened-shadow.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND="sys-libs/pam
-	!sys-apps/shadow"
-RDEPEND="${DEPEND}
-	>=sys-auth/pambase-20120417"
-
-DOCS=( README )
-
-pkg_setup() {
-	# The hardened-shadow group is needed at src_install time,
-	# so the only place we can create the group is pkg_setup.
-	enewgroup hardened-shadow
-}
-
-src_install() {
-	autotools-utils_src_install
-
-	# Remove pam.d files colliding with pambase.
-	rm -r "${ED}"/etc/pam.d || die
-}
diff --git a/sys-apps/hardened-shadow/metadata.xml b/sys-apps/hardened-shadow/metadata.xml
deleted file mode 100644
index 598eb1944a88..000000000000
--- a/sys-apps/hardened-shadow/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<remote-id type="google-code">hardened-shadow</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 5fb0a28c3c80..2bbb89845bcb 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -5,8 +5,10 @@ AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b
 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
 DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
 DIST haveged-1.9.4.tar.gz 493215 BLAKE2B e1a8bbda36c35523c7a0c72a1377d7006440742961f9be4527d52b7e05b176334529ee032f5bdf902e729fcfe045a7a0558dfea7c50a95019747d1158f1e4a19 SHA512 20017c7637779c0cfa414233bb67efb2976f92c08e4eb1b7ea41ccd483dad755629d8e05fb8560a2db811fc2ded7d05fa081ab10c59341cb4c206595a964641d
+DIST haveged-1.9.8.tar.gz 494473 BLAKE2B 3c656221ffc896a1c57cfcfa17524c1e40de04fc5cffa94ce71e0bf11a78b578b9f11f8e7683f2be7150d5ccfeba9eb2f553d9379006f2624bf78d5ed152da74 SHA512 6a4012c7ab0ad7df77ae61dd3aca072a7aeca942c180d37c8495009fad13a4c9c0e7bf64a3ffce00e50c06679d4b948c3930a960789a06edf074076cf68d37db
 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
 EBUILD haveged-1.9.2-r1.ebuild 960 BLAKE2B ca6650ea624b8ca6a372ace436bdef5c2a956fc627a16a2ccf8083a0ea3e147f5cec9571b560a5e423e1a4abd36337d632d74ac4365aa7c141a8fe81d214d79b SHA512 e18f627765762c3b64f34319bd3756bda5963cb861f6fd04a3d2e31a736bd19d99d9ab4dc3690563dbf9fbd11b750431cc808c9252c5f043c6dda4b0654c2a28
 EBUILD haveged-1.9.4.ebuild 977 BLAKE2B 9f9328f7fb42a1d625c5ca0413d11d8dd18d4ae4e9e6d3cffaab2b9969ce63359d30678cff3287f8bcbb36fca724e47af5167b6d21e5b08b8f18004b515ce299 SHA512 01517dfcaa91e879e18e9a330f4d7750e9e1a2d9fdf6f1ae6bd11cc44b4dc0a978363576fce2342feaab489ca5e335ac1fe2df31105f09388d261a7727c32930
-EBUILD haveged-1.9.8c.ebuild 1010 BLAKE2B 2ffc22aeef509ffcbebccb1d25b81a630e626661b1b8a5f6cf3c802877ce7f352c154e5d2fb2d38dbb9885d49b60a86e251299f56a995b920e3f3d16fd9cec5a SHA512 ebdc6f7c007b3fd51de97a98da0c97ecdcd176dc6625dc201f372ee44745c68f569821c5e526998e05eded82cadf55a8b55443ccad268cfce07b2fee6db57f62
+EBUILD haveged-1.9.8.ebuild 1010 BLAKE2B 6cf51da54096328fa8c4cf7f10c7be6b3c8e40eca18bd94111f0d13bf81d1fcb78d6ec99b0b60f4944befa185d15664777656cbc1952c95f27d7aa5cd9541669 SHA512 ee5fc0487504822b832479f216c703a95af2f02fc2768cb2aaaaf0c51b4791cb73b9379390db4244227bcc22a6ba03be84e7df6b028bda2ad94e2d90357d2ec5
+EBUILD haveged-1.9.8c.ebuild 1008 BLAKE2B 435edd879e650a94f2689d53e53d21f3dea60d4515d2606918a157c3b25b611dc2c6c030e9e0391b494e001c72a0f7839a2aaadbed3610cf95d2e7a2298a22d3 SHA512 a6b3bd8398f3b5e40c93195270e1d54f6944a3d8e5754ef251503e48a181810ff6c81078c250dc6e65abc79fa85f05288995413b0d281485f7db152577b90e86
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.8.ebuild b/sys-apps/haveged/haveged-1.9.8.ebuild
new file mode 100644
index 000000000000..c792e4bd61fa
--- /dev/null
+++ b/sys-apps/haveged/haveged-1.9.8.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit systemd
+
+DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
+HOMEPAGE="http://www.issihosts.com/haveged/"
+SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+IUSE="selinux static-libs threads"
+
+RDEPEND="
+	!<sys-apps/openrc-0.11.8
+	selinux? ( sec-policy/selinux-entropyd )
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.9.8c-threads_build_fix.patch"
+)
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		--bindir=/usr/sbin
+		--enable-nistest
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	# Install gentoo ones instead
+	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
+	newconfd "${FILESDIR}"/haveged-conf.d haveged
+
+	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
+	insinto /etc
+	doins "${FILESDIR}"/haveged.conf
+}
diff --git a/sys-apps/haveged/haveged-1.9.8c.ebuild b/sys-apps/haveged/haveged-1.9.8c.ebuild
index b9926925e523..9054d5f0026d 100644
--- a/sys-apps/haveged/haveged-1.9.8c.ebuild
+++ b/sys-apps/haveged/haveged-1.9.8c.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
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE="selinux static-libs threads"
 
 RDEPEND="
diff --git a/sys-apps/hbaapi/Manifest b/sys-apps/hbaapi/Manifest
deleted file mode 100644
index 8e6760fd8fab..000000000000
--- a/sys-apps/hbaapi/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX hba.conf 1215 BLAKE2B f97ef437d523a3376c9e0966020d2c4c20fed7ac06639b55f2cc80d133597d4bebd3544cdcc7b4073f45849ba7991904f9065d5fafc7b5397d8e5863ae090681 SHA512 5877c3a461b3d8f717d30b8ff706d31b9b607b94d9a7bfed0fabdd103400e6c0a3b2a26418f948a79d72f5ad1303123cb1af55bbc62dcc47ccc245260168a490
-AUX hbaapi-2.2-qa.patch 1040 BLAKE2B a9c1314e02af8632e1f6f6ff4d11ff32bb756183ecb1312a72ef512840f54821fc47818055a0fe504fd33f31a7afa26b752f969d79211547c43615d83e1ae1d6 SHA512 d920073a442e2421911eaa5cb67459f642f8c9cae0ceb987f68327614d4d6377771d2c57614cebe117abcd82c30a5bd61d3de9fb7dbd14b876e6b563fc9bafce
-DIST hbaapi-2.2.Makefile.gz 1356 BLAKE2B f1015d32da1fdf1caf32085d9470dbea3729cef66f9e8bbe7ed851d210408897aa9af2c0eecd6f97b3318bc8bcbbe1241b5e3771a09522060920a666054bb434 SHA512 1d02546c0dc9143baf1538f3b57e23da4a6b9e685e125c279afac252ae6b4dcd4c8890ed888f8177b5e86c3f76dfabcc9a8d489102c6c68a5d80bf5399118545
-DIST hbaapi_src_2.2.tgz 30232 BLAKE2B 250c720b9f6e1f601991393ac16411e278290d64db1d4677fae44b34d75815fa97aff711ba9b5d4762fb00096fcd7d99e1ac24b520095fd7f3fd67c2e82eb654 SHA512 83d8d3df0208f632016acac65bc03b9610eb47d98e99565e2bdbe543382b141c0b6d148272dffc421a36f16ee511027899ee2b70a04435a6ef221e0bc559e511
-EBUILD hbaapi-2.2.ebuild 896 BLAKE2B b6ae5dab4a2cadab8e5c4cad1071fed3b410c7fffb6fc770176dd5d0351384362d5d4b71016aa04de5ac1a5f96273d855660874fe4066c00dba337450ca50ede SHA512 0088492e31bb30d3943c9166b9e3b284ad5fbdce52fe46e3cef1ad3990ea5c31f8b76c8ca38db9e30f206617a12c61af5429a940a2986293ab8d49328e928279
-MISC metadata.xml 326 BLAKE2B d34e337bbbafd6e47f5e40b3782ec70d118c2b2419a44af13166523610efe24920425e916ce54f1d372c25af43dcb6e35d7f4d48422c3ffa83a24e4518e8753a SHA512 e50b86ac61e46085fad0a5d2e921438fffebfcf06181088e011e16da04d4f024d6c55c1d551d20446ff20a4b639dbfb07315999b6959ae53ce3a97395761eb3e
diff --git a/sys-apps/hbaapi/files/hba.conf b/sys-apps/hbaapi/files/hba.conf
deleted file mode 100644
index 347c24b80e36..000000000000
--- a/sys-apps/hbaapi/files/hba.conf
+++ /dev/null
@@ -1,43 +0,0 @@
-# 
-# This file contains names and references to HBA libraries
-#
-# Format:
-#
-# <library name>  <library pathname>
-#
-# The library name should be prepended with the domain of
-# the manufacturer or driver author.
-#
-# 32bit/64bit implementation note:
-#   If a 32bit implementation tries to load a 64 bit library,
-#   the load will fail with the result that the 64 bit vendor
-#   library is ignored.
-#   Likewise, if a 64bit implementation tries to load a 32 bit library,
-#   the load will fail with the result that the 32 bit vendor
-#   library is ignored.
-
-#org.snia.sample32	/usr/lib/libsample.so	          
-#com.qlogic.qla32	/usr/lib/libhbaapiqla.so
-#com.emulex.lightpulse32 /usr/lib/libhbaapiemu.so
-#com.emulex.lightpulse64	/usr/lib/sparcv9/libhbaapiemu.so
-#JniHbaLib		/opt/JNIsnia/Solaris/Jni/32bit/JniHbaLib.so
-#JniHbaLib		/opt/JNIsnia/Solaris/Jni/64bit/JniHbaLib.so
-
-#INSERT_LIB_MARKER - Do not edit this line - Gentoo will insert items after this
-
-
-# Set a debug level (depends on compilation switches)
-#
-# Format:
-#
-# "debuglevel"    <debug level>
-#
-# 0 is default, 1 show vendor library opens,
-# 2 shows function calls, 3 shows callback events
-#
-# Uncomment the next line to specify a level
-#debuglevel 3
-
-
-
-
diff --git a/sys-apps/hbaapi/files/hbaapi-2.2-qa.patch b/sys-apps/hbaapi/files/hbaapi-2.2-qa.patch
deleted file mode 100644
index 240cc1d2d473..000000000000
--- a/sys-apps/hbaapi/files/hbaapi-2.2-qa.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- hbaapi_src_2.2.orig/HBAAPILIB.c
-+++ hbaapi_src_2.2/HBAAPILIB.c
-@@ -30,7 +30,6 @@
- 
- #ifdef WIN32
- #include <windows.h>
--#include <string.h>
- /*
-  * Next define forces entry points in the dll to be exported
-  * See hbaapi.h to see what it does.
-@@ -40,6 +39,7 @@
- #include <dlfcn.h>
- #include <strings.h>
- #endif
-+#include <string.h>
- #include <stdio.h>
- #include <time.h>
- #include "hbaapi.h"
-@@ -395,7 +395,7 @@
-     GRAB_MUTEX(&_hbaapi_APSE_mutex);
-     GRAB_MUTEX(&_hbaapi_TE_mutex);
-     GRAB_MUTEX(&_hbaapi_LE_mutex);
--    for(listp = cb_lists_array, found = 0; found == 0, *listp != NULL; listp++) {
-+    for(listp = cb_lists_array, found = 0; found == 0 && *listp != NULL; listp++) {
- 	lastp = *listp;
- 	for(cbp=**listp; cbp != NULL; cbp = cbp->next) {
- 	    if(cbhandle != (HBA_CALLBACKHANDLE)cbp) {
---- hbaapi_src_2.2.orig/hbaapitest.c
-+++ hbaapi_src_2.2/hbaapitest.c
-@@ -28,6 +28,7 @@
- 
- 
- #include <stdio.h>
-+#include <stdlib.h>
- #ifndef WIN32
- #include <dlfcn.h> /* Dynamic library support for Solaris */
- #include <time.h>
diff --git a/sys-apps/hbaapi/hbaapi-2.2.ebuild b/sys-apps/hbaapi/hbaapi-2.2.ebuild
deleted file mode 100644
index 9086d5cb1f00..000000000000
--- a/sys-apps/hbaapi/hbaapi-2.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-MY_PN="${PN}_src"
-MY_P="${MY_PN}_${PV}"
-DESCRIPTION="The Host Bus Adapter API for managing Fibre Channel Host Bus Adapters"
-HOMEPAGE="http://hbaapi.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tgz
-	mirror://gentoo/${P}.Makefile.gz"
-
-LICENSE="SNIA"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RESTRICT="test"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	mv "${WORKDIR}"/${P}.Makefile "${S}"/Makefile
-
-	sed -i -e "s/-g -c/${CFLAGS} -c/" \
-		-e "s/-shared/\0 ${LDFLAGS}/" \
-		Makefile || die
-
-	epatch "${FILESDIR}"/${P}-qa.patch
-}
-
-src_compile() {
-	# not parallel safe!
-	emake -j1 CC="$(tc-getCC)" all
-}
-
-src_install() {
-	into /usr
-	dolib.so libHBAAPI.so
-	dosbin hbaapitest
-	insinto /etc
-	doins "${FILESDIR}"/hba.conf
-	dodoc readme.txt
-}
diff --git a/sys-apps/hbaapi/metadata.xml b/sys-apps/hbaapi/metadata.xml
deleted file mode 100644
index 4ca0373a86f9..000000000000
--- a/sys-apps/hbaapi/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<upstream>
-	<remote-id type="sourceforge">hbaapi</remote-id>
-</upstream>
-</pkgmetadata>
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 5757b728a32e..afab76197be2 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -3,6 +3,6 @@ AUX hdparm-conf.d.3 872 BLAKE2B 15376fc6f37624e6a57c97b11101b190512db4493e4f7f0c
 AUX hdparm-init-8 1360 BLAKE2B 779329470a9980621d6d25e44ecb9a830565f3501fa51a10d78f1134214b9a8e5cc88148e9d7536ade6af2b88aee9a1e2e40b8c8b38cd2c409d23b1ad673cf7d SHA512 0417168cf540d2385c5edc4e199c9c2318f97c397d4bbb8b0ac6d4dcadf153564a51a9a5da172442c75a670f79fdec84da5db777a1400cf3c8d8cf6a7066fcc8
 DIST hdparm-9.56.tar.gz 137213 BLAKE2B ffea04fb2cb14fd9ee01f0583c5fbe8d0c24d3dcecaa68750653e0475d97b86f1a39bde43ca1feb68f393606613c6a4cc8090e714eb60b1a30e223929b1fcadd SHA512 5dee7211a2528920bd197d45217a7b58df933c2500d224d39a8bb89c4d3f340962953e17b7b5f66fd52205a3a3b225d5bc0b75fc7af0f064f8ea092b55090b03
 DIST hdparm-9.58.tar.gz 138845 BLAKE2B 29e2697afaedcfbb1d7dea2238f9477afd932d553166437abbf068b8b3f3a5445a0b8542714d8a15e3c64f42a794c2603fe626ed936b4dbdeb8e4fe63afc5f46 SHA512 42fb70f494aae4cc205ca68c3e883e1f4fc33e8ced1914e280e9f3faa7233d3f839e59178ec09ddb9d32e9d2bca122ce324645ecb5ac73defa284030ac7d3cea
-EBUILD hdparm-9.56.ebuild 983 BLAKE2B e7959669bd4e06c2c1907d862c98b1624d9eb08a8a9f14735da311fc36f0450182b0d74c87b397ec164f742841206e7b8402048d3e0cee8ad7fd9dbd0b21fbf4 SHA512 533f344c775e22845b84f016de1792d5387d34ef2c725a83657bce4b83384e1c3a8156af95543e8b4436e4a1dd964c75d6810f50d6a8a42a529995c537adbf97
-EBUILD hdparm-9.58.ebuild 992 BLAKE2B 8447286f9f0b65a89e091a37d4b875c9153965c72a6727db1d330b3fbeea6269d759b69f49b3e26413011e7874e62e0eddca60f74ca4a907d042d2557a4c3bf7 SHA512 b808f3d1685042b2663e5e73cd2eba2b7a920cb2fa7eface0f48740a998ffa0a90b75b24e72e0038b51bcce5140d21b16c97cabec618586a3fe6a58a6234721c
+EBUILD hdparm-9.56.ebuild 980 BLAKE2B 9810a7181ee3c0a55dd77ff5816f1c4b268692c006159a878cc9536a152dee8b5be5392376fe2e4d4ccb17064bffa9cc13c05d89c878057316777e0ce5f77371 SHA512 0456e15903ecf41f4e141e6f151cb798ecd7a58386fed4cc474608033743564f3b30cb044aaa6b90d7d0d7cbff6ca4dceeba115292b306e28ea78f2c45fbd498
+EBUILD hdparm-9.58.ebuild 988 BLAKE2B 8344b19230040f785a60a55f9518ba27e1cdb7719758a8a74baa7a1a1082bbd2925479183b0d87b1124fe9129ff7a574040d383ae3bf32094946ad86b5326cbb SHA512 2272f6eba817a278211451dc66a8e9a0f47b6f095e46b489f443c80449cd3a2f8c8a8c8c3344384d5a09cf375fd4c9d27a62cea742937b79cfe43fceb4985bc9
 MISC metadata.xml 326 BLAKE2B 503d13af2b352e0b8d864559489f80ae98d7420c0a98ea46847126e792a93ffcbce3b524da7f6c3551702e07641cef62449c0c7f2ae6188d79df3f7e5a6b8685 SHA512 39219fcef0756910c51e804cf94170408208840e7b88d99b4583f8fcfb02e1664358f9d4bf4c3f1a1a619b6a87852bc4831c93f10215500842023132a85c2287
diff --git a/sys-apps/hdparm/hdparm-9.56.ebuild b/sys-apps/hdparm/hdparm-9.56.ebuild
index 2bde55c045aa..acb642f6568a 100644
--- a/sys-apps/hdparm/hdparm-9.56.ebuild
+++ b/sys-apps/hdparm/hdparm-9.56.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/hdparm/hdparm-9.58.ebuild b/sys-apps/hdparm/hdparm-9.58.ebuild
index 71243dbbf090..f84377ef9818 100644
--- a/sys-apps/hdparm/hdparm-9.58.ebuild
+++ b/sys-apps/hdparm/hdparm-9.58.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
 
 LICENSE="BSD GPL-2" # GPL-2 only
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="static"
 
 PATCHES=(
diff --git a/sys-apps/heirloom-tools/Manifest b/sys-apps/heirloom-tools/Manifest
index 44efd1399599..69fdf499dff2 100644
--- a/sys-apps/heirloom-tools/Manifest
+++ b/sys-apps/heirloom-tools/Manifest
@@ -1,5 +1,8 @@
-AUX heirloom-tools-070715-major.patch 464 BLAKE2B 7fa6c9feee0bdbda9199791369ab3565250960f08e42b4a7b8b3e9afbe0af8bf08b1c3766cb69a3f822435e1d691036899419f3cfccf8e1657483adf0197fd51 SHA512 65659c579f99c85187b001be0fea5b04e4e0b319a1791e9219127b2fdab7bb0e390d15b4f76a43d32c37695a6255e1e30ebb5274eb824535a50c6d2b429b856c
+AUX heirloom-tools-070715-gcc-10.patch 7828 BLAKE2B aa08af9904aa1ef031f7b89fa527dee975295d59534bcb98e5db5ea4affd8c022f988caad8a502c332489fda102d17b7bbc7f6df766d8c515f9a1be984fcf977 SHA512 64b75e38585a24c4c854967b0e21bfedbd23d90218ff524f371c74d94e3d05038b140dda4aa23fdbbce64d99b63b80fa4e9895a3aa902903de75d66ca98dfc54
+AUX heirloom-tools-070715-glibc-2.30.patch 376 BLAKE2B 195c37e1d707d05ac85825a51ded198112bd0595d61697c32eed2912a1208c951d5a68ea14a9fcf033aef0a9b7c63ea8efd519d69fd777c81d9bdb8d29a60e28 SHA512 f39a6cc84060e462aa54c2492346b376a42158391bd57c66ee7a5a9922aa8b419ad9bb77f970840cf6b84055500f0f84c3420edd48bbd4ffc49ff747609caceb
+AUX heirloom-tools-070715-glibc-2.31.patch 964 BLAKE2B c235d9c4d035c19617a1bdd403b325e72e692873ee6615b68349d3d6306394dc6783525e7f08f27399876185102a76643c82fec50e5abb16c597a7e391751b00 SHA512 41f651804735fc0992ac07bd549f9a895cfc35ae4de5ff1580826f71ba3e9b1467a9f694edeb6377a2fd4d59c5223b38cfa435279e510a790e6a37cce3f4b307
+AUX heirloom-tools-070715-major.patch 2104 BLAKE2B 88a602e587dc8376e8eb8198308e64a05db642b596e89b8087b30a2d6d16102b18f0b033cce4c1a4711a8ebcbd4a508139a7fb098b1cdcc292ef63d183bbc576 SHA512 7cee022491768031d413a8854a05a34cdbb6061fe30fa8514072efd0056614218e989c3e03fe771ae79a022085460f8bcdbb147fac0dcc6d97ab49703eaa98de
+AUX heirloom-tools-070715-makefile.patch 581 BLAKE2B a74613af222aff0ec7e6e3e1c012bd444a0a1d74e9caa9ac6ee7b3175641f81966527d24dd2d67b88921943579b591e9f2f735bc427f0c8bfa66977078b2d537 SHA512 ab45b3feca27ad855e535ebae77537572b9d1b6b00bd7f973521d477e962691e56ec67ce5d900980b084758643d85db5af790447411374b488f6c440852cdf71
 DIST heirloom-070715.tar.bz2 1000080 BLAKE2B 8719e38b7e260b0ecb9d055672e0097954eee31acd6cde8c582f82055a3b7f66511bf3c876309d0e74a8c29ac334b58ed81c56df26d1b9c065994bd353affd20 SHA512 0b30b0f4c4c92a10ee2da263ea44666f445d96bac86ca4afb7bbb50d8278986e4145a7bcdf3ed9f75611bb956e93e16fc0e19874498ce3ae1a00e6fbb4f910c9
-EBUILD heirloom-tools-070715-r1.ebuild 1362 BLAKE2B 5f101f00c501378b7d30f57805bf86a26e796059570754d21995d166a329927fd4ff6ef87b8c08dc395dfd74058697841b481667846858e2d8db5b4037ccf1b6 SHA512 04db878021350370f7f92dc55a954aa3568a3b5087d1e1ac52ff79d55f05373c7c651e9cfb8bb13ea3a0dcbe305bc4fc3fc58a2fa08260583a181c106d8eee5c
-EBUILD heirloom-tools-070715.ebuild 1007 BLAKE2B fde4796592e2929ab553f88dd1df6aa3a79dc0d7a75a3d4f15d89ddf8f863332d72576b08b20e9af808595c80718fa6720bded25e94db43716e6cab9744417e6 SHA512 bddb8d5891fb50001b78aeb80174bba71a17b772dcbf29e30cf2c05f9d74cea72bd529f8cfc740a2e7df3af21675b15df096186c4112a7291067b988e7fbe131
-MISC metadata.xml 325 BLAKE2B 083bcce163b0fba94ccbabdf2eedf1e9681c26d079438db220c0af26ba3a36169302476853bb42165e436bd8466678ce9f46f95d01df39e6e541d6c65d13d969 SHA512 54940bbe65218aceba90442526963ae60b9132d253d71d672d6e7fbef47de99b50249925b39702d0a1f1283cc57ccf91dfe9dd1dcfb88930176752ad46742d62
+EBUILD heirloom-tools-070715-r3.ebuild 2108 BLAKE2B 226a4dd961a0c3661bfef0da002d04ed9702aac249a1730aa0da5a1452a7a5a40b536fcc69acd090c4f1fa86e4a85581bfa7e4a74a2874e81d817c9cf4fe9b8f SHA512 70f403b00bfffacd55750569f3fb23eaa41d8a43c8e3b0373106bdc1f6a5e0cb190f18fc8955893dba4db1271f9467991b6040bb23d1faa89b4338762d53d881
+MISC metadata.xml 245 BLAKE2B 47a82b79d52e71358e03914aba8d070a655449fec0e7a7285c93eae422f8b5f0e76cabd1decbf65192e4a3e4b97b677fe91d3ba89f26722a626b3f1927b91669 SHA512 33eb3d3f6130c2ddc9f443f89eea14440472c13e005e97ed283db7e365875d2b911b3e1d62f65f63eff15eade03d35f0874f123bdbd54ff4cd7df606a990639c
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-10.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-10.patch
new file mode 100644
index 000000000000..ce0c2bdc5be5
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-gcc-10.patch
@@ -0,0 +1,278 @@
+--- a/cpio/cpio.c
++++ b/cpio/cpio.c
+@@ -748,6 +748,7 @@ static struct stat	globst;
+  */
+ #define			SANELIMIT	0177777
+ 
++enum fmttype            fmttype;
+ char			*progname;	/* argv[0] to main() */
+ static struct dslot	*devices;	/* devices table */
+ static struct dslot	*markeddevs;	/* unusable device numbers */
+@@ -826,6 +827,9 @@ static int		compressed_bar;	/* this is a compressed bar archive */
+ static int		formatforced;	/* -k -i -Hfmt forces a format */
+ static long long	lineno;		/* input line number */
+ 
++enum pax                pax;
++enum pax_preserve       pax_preserve;
++
+ int			pax_dflag;	/* directory matches only itself */
+ int			pax_kflag;	/* do not overwrite files */
+ int			pax_nflag;	/* select first archive member only */
+--- a/cpio/cpio.h
++++ b/cpio/cpio.h
+@@ -31,7 +31,7 @@
+ #include <sys/stat.h>
+ #include <inttypes.h>
+ 
+-enum	{
++enum fmttype {
+ 	FMT_NONE	= 00000000,	/* no format chosen yet */
+ 
+ 	TYP_PAX		= 00000010,	/* uses pax-like extended headers */
+@@ -70,7 +70,8 @@ enum	{
+ 	FMT_BAR		= 00400001,	/* bar format type */
+ 
+ 	FMT_ZIP		= 01000000	/* zip format */
+-} fmttype;
++};
++extern enum fmttype fmttype;
+ 
+ /*
+  * Zip compression method.
+@@ -173,11 +174,12 @@ extern int		printsev;
+ extern char		*progname;
+ extern struct glist	*patterns;
+ 
+-enum {			/* type of pax command this is */
++enum pax {			/* type of pax command this is */
+ 	PAX_TYPE_CPIO		= 0,	/* not a pax command */
+ 	PAX_TYPE_PAX1992	= 1,	/* POSIX.2 pax command */
+ 	PAX_TYPE_PAX2001	= 2	/* POSIX.1-2001 pax command */
+-} pax;
++};
++extern enum pax         pax;
+ extern int		pax_dflag;
+ extern int		pax_kflag;
+ extern int		pax_nflag;
+@@ -185,14 +187,15 @@ extern int		pax_sflag;
+ extern int		pax_uflag;
+ extern int		pax_Xflag;
+ 
+-enum {
++enum pax_preserve {
+ 	PAX_P_NONE	= 0000,
+ 	PAX_P_ATIME	= 0001,
+ 	PAX_P_MTIME	= 0004,
+ 	PAX_P_OWNER	= 0010,
+ 	PAX_P_MODE	= 0020,
+ 	PAX_P_EVERY	= 0400
+-} pax_preserve;
++};
++extern enum pax_preserve pax_preserve;
+ 
+ extern size_t		(*ofiles)(char **, size_t *);
+ extern void		(*prtime)(time_t);
+--- a/tabs/tabspec.c
++++ b/tabs/tabspec.c
+@@ -36,6 +36,8 @@
+ #include	<blank.h>
+ #include	"tabspec.h"
+ 
++enum taberrno taberrno;
++
+ static const struct {
+ 	const char	*c_nam;
+ 	const char	*c_str;
+--- a/tabs/tabspec.h
++++ b/tabs/tabspec.h
+@@ -34,14 +34,15 @@ struct	tabulator {
+ 	int	t_rep;			/* repetitive tab count */
+ };
+ 
+-enum {
++enum taberrno {
+ 	TABERR_NONE,
+ 	TABERR_CANTOP,	/* can't open */
+ 	TABERR_FILIND,	/* file indirection */
+ 	TABERR_UNKTAB,	/* unknown tab code */
+ 	TABERR_ILLINC,	/* illegal increment */
+ 	TABERR_ILLTAB	/* illegal tabs */
+-} taberrno;
++};
++extern enum taberrno taberrno;
+ 
+ extern void		*scalloc(size_t nmemb, size_t size);
+ extern struct tabulator	*tabstops(const char *s, int cols);
+--- a/diff/diff.c
++++ b/diff/diff.c
+@@ -92,6 +92,23 @@ static void	usage(void);
+ static void	xadd(const char *);
+ static void	Xadd(const char *);
+ 
++char *ifdef1;
++char *ifdef2;
++int   wantelses;
++char *file1, *file2;
++char *tempfile1, *tempfile2;
++char **diffargv;
++struct stat stb1, stb2;
++jmp_buf recenv;
++const char *start;
++struct xclusion *xflag;
++struct stackblk *curstack;
++int hflag,tflag,aflag,lflag,Nflag,sflag,rflag,Bflag,iflag,wflag,bflag,pflag;
++int mb_cur_max;
++int opt;
++int context;
++int status;
++
+ int
+ main(int argc, char **argv)
+ {
+--- a/diff/diff.h
++++ b/diff/diff.h
+@@ -106,7 +106,7 @@
+ /*
+  * Output format options
+  */
+-int	opt;
++extern int	opt;
+ 
+ #define	D_NORMAL	0	/* Normal output */
+ #define	D_EDIT		-1	/* Editor script out */
+@@ -117,66 +117,66 @@ int	opt;
+ 				   lines and no trailing . */
+ #define	D_UNIFIED	5	/* Unified diff */
+ 
+-int	aflag;			/* diff binary files */
+-int	tflag;			/* expand tabs on output */
+-int	pflag;			/* show surrounding C function */
++extern int	aflag;			/* diff binary files */
++extern int	tflag;			/* expand tabs on output */
++extern int	pflag;			/* show surrounding C function */
+ 
+ /*
+  * Algorithm related options
+  */
+-int	hflag;			/* -h, use halfhearted DIFFH */
+-int	bflag;			/* ignore blanks in comparisons */
+-int	wflag;			/* totally ignore blanks in comparisons */
+-int	iflag;			/* ignore case in comparisons */
+-int	Bflag;			/* ignore changes that consist of blank lines */
++extern int	hflag;			/* -h, use halfhearted DIFFH */
++extern int	bflag;			/* ignore blanks in comparisons */
++extern int	wflag;			/* totally ignore blanks in comparisons */
++extern int	iflag;			/* ignore case in comparisons */
++extern int	Bflag;			/* ignore changes that consist of blank lines */
+ 
+ /*
+  * Options on hierarchical diffs.
+  */
+-int	lflag;			/* long output format with header */
+-int	rflag;			/* recursively trace directories */
+-int	sflag;			/* announce files which are same */
+-int	Nflag;			/* write text of nonexistant files */
+-const char	*start;		/* do file only if name >= this */
++extern int	lflag;			/* long output format with header */
++extern int	rflag;			/* recursively trace directories */
++extern int	sflag;			/* announce files which are same */
++extern int	Nflag;			/* write text of nonexistant files */
++extern const char	*start;		/* do file only if name >= this */
+ 
+ struct xclusion {
+ 	struct xclusion	*x_nxt;
+ 	const char	*x_pat;
+-}	*xflag;			/* patterns to exclude from comparison */
++};
++extern struct xclusion	*xflag;			/* patterns to exclude from comparison */
+ 
+ /*
+  * Variables for -I D_IFDEF option.
+  */
+-int	wantelses;		/* -E */
+-char	*ifdef1;		/* String for -1 */
+-char	*ifdef2;		/* String for -2 */
+-char	*endifname;		/* What we will print on next #endif */
+-int	inifdef;
++extern int	wantelses;		/* -E */
++extern char	*ifdef1;		/* String for -1 */
++extern char	*ifdef2;		/* String for -2 */
+ 
+ /*
+  * Variables for -c context option.
+  */
+-int	context;		/* lines of context to be printed */
++extern int	context;		/* lines of context to be printed */
+ 
+ /*
+  * State for exit status.
+  */
+-int	status;
+-int	anychange;
+-char	*tempfile1;		/* used when comparing against std input */
+-char	*tempfile2;		/* used when comparing against std input */
++extern int	status;
++extern int	anychange;
++extern char	*tempfile1;		/* used when comparing against std input */
++extern char	*tempfile2;		/* used when comparing against std input */
+ 
+ /*
+  * Variables for diffdir.
+  */
+-char	**diffargv;		/* option list to pass to recursive diffs */
+-int	recdepth;		/* recursion depth */
+-jmp_buf	recenv;			/* jump stack on error */
++extern char	**diffargv;		/* option list to pass to recursive diffs */
++extern int	recdepth;		/* recursion depth */
++extern jmp_buf	recenv;			/* jump stack on error */
+ 
+ struct stackblk {
+ 	struct stackblk	*s_prev;
+ 	struct stackblk	*s_next;
+-} *curstack;
++};
++extern struct stackblk *curstack;
+ 
+ /*
+  * Input file names.
+@@ -184,13 +184,13 @@ struct stackblk {
+  * and padded with a '/', and then efile0 and efile1 point after
+  * the '/'.
+  */
+-char	*file1, *file2, *efile1, *efile2;
+-struct	stat stb1, stb2;
++extern char	*file1, *file2;
++extern struct	stat stb1, stb2;
+ 
+ extern	const char diffh[], diff[], pr[];
+ extern	const char *argv0;
+ extern	const char *progname;
+-int	mb_cur_max;
++extern int	mb_cur_max;
+ extern int	sysv3;
+ 
+ /* diff.c */
+--- a/diff/diffdir.c
++++ b/diff/diffdir.c
+@@ -142,6 +142,10 @@ static char	*mkpath(const char *, const char *);
+ static void	mktitle(void);
+ static int	xclude(const char *);
+ 
++int anychange;
++int recdepth;
++static char *efile1, *efile2;
++
+ void
+ diffdir(char **argv)
+ {
+--- a/diff/diffreg.c
++++ b/diff/diffreg.c
+@@ -186,6 +186,8 @@ static int	(*chrtran)(int);/* translation for case-folding */
+ static long	pstart;		/* start of last search for -p */
+ static long	plast;		/* match of last search for -p */
+ static long	*saveJ;		/* saved J for -p */
++static char	*endifname;	/* What we will print on next #endif */
++static int	inifdef;
+ 
+ /* chrtran points to one of 3 translation functions:
+  *	cup2low if folding upper to lower case
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.30.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.30.patch
new file mode 100644
index 000000000000..19b90cea6d2a
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.30.patch
@@ -0,0 +1,13 @@
+diff --git a/shl/shl.c b/shl/shl.c
+index 6f5c2df..30d296c 100644
+--- a/shl/shl.c
++++ b/shl/shl.c
+@@ -86,7 +86,7 @@ extern int	sysv3;
+ #include	<libgen.h>
+ #include	<limits.h>
+ #include	<stdarg.h>
+-#if !defined (__dietlibc__) && !defined (__UCLIBC__)
++#if !defined (__dietlibc__) && !defined (__UCLIBC__) && !defined(__linux__)
+ #include	<stropts.h>
+ #endif
+ #include	<poll.h>
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.31.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.31.patch
new file mode 100644
index 000000000000..5186aa1cc2e1
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-glibc-2.31.patch
@@ -0,0 +1,41 @@
+--- a/date/date.c
++++ b/date/date.c
+@@ -134,26 +134,13 @@ badtime:
+ 	return (time_t)-1;
+ }
+ 
+-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || \
+-	defined (__DragonFly__) || defined (__APPLE__)
+-static int
+-stime(time_t *t)
+-{
+-	struct timeval	tv;
+-
+-	tv.tv_sec = *t;
+-	tv.tv_usec = 0;
+-
+-	return settimeofday(&tv, NULL);
+-}
+-#endif	/* __FreeBSD__, __NetBSD__, __OpenBSD__, __DragonFly__, __APPLE__ */
+-
+ static void
+ settime(char *op)
+ {
+ 	struct utmpx before, after;
+ 	const char wtmpxfile[] = "/var/log/wtmp";
+ 	time_t newtime;
++	struct timeval	tv;
+ 
+ 	memset(&before, 0, sizeof before);
+ 	memset(&after, 0, sizeof after);
+@@ -164,7 +151,9 @@ settime(char *op)
+ 	if ((newtime = timeop(op)) == (time_t)-1)
+ 		badconv();
+ 	gettimeofday(&before.ut_tv, NULL);
+-	if (stime(&newtime) < 0) {
++	tv.tv_sec = newtime;
++	tv.tv_usec = 0;
++	if (settimeofday(&tv, NULL) < 0) {
+ 		fprintf(stderr, "%s: no permission\n", progname);
+ 		exit(1);
+ 	}
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch
index 82d32315d819..81e6755e7e32 100644
--- a/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-major.patch
@@ -1,6 +1,8 @@
+diff --git a/cpio/cpio.c b/cpio/cpio.c
+index 89c5cbc..210287b 100644
 --- a/cpio/cpio.c
 +++ b/cpio/cpio.c
-@@ -91,9 +91,9 @@
+@@ -91,11 +91,12 @@
  #include <sfile.h>
  #include <atoll.h>
  
@@ -10,11 +12,45 @@
 -#endif	/* _AIX */
 +#endif	/* _AIX || __GLIBC__ */
  
- #ifndef	major
+-#ifndef	major
++#include <sys/sysmacros.h>
++#if 0
  #include <sys/mkdev.h>
+ #endif	/* !major */
+ 
+diff --git a/file/file.c b/file/file.c
+index 6609734..d90af86 100644
+--- a/file/file.c
++++ b/file/file.c
+@@ -66,7 +66,8 @@ static const char sccsid[] USED = "@(#)file.sl	1.33 (gritter) 4/14/06";
+ #include <fcntl.h>
+ #include <libgen.h>
+ #include <inttypes.h>
+-#ifndef	major
++#include <sys/sysmacros.h>
++#if 0
+ #include <sys/mkdev.h>
+ #endif
+ #include "iblok.h"
+diff --git a/find/find.c b/find/find.c
+index fac70f0..28e1b7f 100644
+--- a/find/find.c
++++ b/find/find.c
+@@ -83,7 +83,8 @@ static const char sccsid[] USED = "@(#)find.sl	1.45 (gritter) 5/8/06";
+ #ifdef	_AIX
+ #include <sys/sysmacros.h>
+ #endif
+-#ifndef	major
++#include <sys/sysmacros.h>
++#if 0
+ #include <sys/mkdev.h>
+ #endif
+ #if __NetBSD_Version__>= 300000000
+diff --git a/ls/ls.c b/ls/ls.c
+index e4480d0..17186ba 100644
 --- a/ls/ls.c
 +++ b/ls/ls.c
-@@ -119,7 +119,7 @@
+@@ -119,7 +119,7 @@ static char ifmt_c[] = "-pc-d-b--nl-SD--";
  #include <termcap.h>
  #endif	/* USE_TERMCAP */
  
@@ -23,3 +59,31 @@
  #include <sys/sysmacros.h>
  #endif
  
+diff --git a/mknod/mknod.c b/mknod/mknod.c
+index b772b88..f465883 100644
+--- a/mknod/mknod.c
++++ b/mknod/mknod.c
+@@ -45,7 +45,8 @@ static const char sccsid[] USED = "@(#)mknod.sl	1.8 (gritter) 5/29/05";
+ #include	<string.h>
+ #include	<limits.h>
+ #include	<unistd.h>
+-#ifndef	major
++#include <sys/sysmacros.h>
++#if 0
+ #include	<sys/mkdev.h>
+ #endif	/* !major */
+ 
+diff --git a/tar/tar.c b/tar/tar.c
+index 2d3dada..a8f1ccb 100644
+--- a/tar/tar.c
++++ b/tar/tar.c
+@@ -98,7 +98,8 @@ static const char sccsid[] USED = "@(#)tar.sl	1.177 (gritter) 4/14/07";
+ #include <sys/sysmacros.h>
+ #endif
+ 
+-#ifndef	major
++#include <sys/sysmacros.h>
++#if 0
+ #include <sys/mkdev.h>
+ #endif	/* !major */
+ 
diff --git a/sys-apps/heirloom-tools/files/heirloom-tools-070715-makefile.patch b/sys-apps/heirloom-tools/files/heirloom-tools-070715-makefile.patch
new file mode 100644
index 000000000000..a4ce2970589d
--- /dev/null
+++ b/sys-apps/heirloom-tools/files/heirloom-tools-070715-makefile.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile.mk b/Makefile.mk
+index 28a20f1..1cf36b8 100644
+--- a/Makefile.mk
++++ b/Makefile.mk
+@@ -73,11 +73,6 @@ links:
+ 	sh build/crossln $(ROOT)$(SV3BIN)/more $(ROOT)$(UCBBIN)/more $(ROOT)
+ 	rm -f $(ROOT)$(UCBBIN)/catman
+ 	sh build/crossln $(ROOT)$(DEFSBIN)/catman $(ROOT)$(UCBBIN)/catman $(ROOT)
+-	for i in sccs prt; \
+-	do \
+-		rm -f $(ROOT)$(UCBBIN)/$$i; \
+-		sh build/crossln $(ROOT)$(CCSBIN)/$$i $(ROOT)$(UCBBIN)/$$i $(ROOT); \
+-	done
+ 	rm -f $(ROOT)$(SV3BIN)/awk
+ 	sh build/crossln $(ROOT)$(DEFBIN)/oawk $(ROOT)$(SV3BIN)/awk $(ROOT)
+ 	rm -f $(ROOT)$(S42BIN)/awk
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
deleted file mode 100644
index 9d55edab0b49..000000000000
--- a/sys-apps/heirloom-tools/heirloom-tools-070715-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Heirloom toolchest - original Unix tools"
-HOMEPAGE="http://heirloom.sourceforge.net/tools.html"
-SRC_URI="http://downloads.sourceforge.net/project/heirloom/heirloom/${PV}/heirloom-${PV}.tar.bz2"
-
-LICENSE="CDDL GPL-2 LGPL-2.1 9base ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	sys-libs/zlib
-"
-DEPEND="
-	${RDEPEND}
-	sys-apps/ed
-	virtual/pkgconfig
-"
-S="${WORKDIR}/heirloom-${PV}"
-PATCHES=(
-	"${FILESDIR}"/${P}-major.patch
-)
-
-# slightly broken
-RESTRICT="test"
-
-src_prepare() {
-	find . -name '*.c' -exec sed -i -e 's|#ifndef[[:space:]]*major|#include <sys/sysmacros.h>\n#if 0|g' {} + || die
-
-	default
-}
-src_compile() {
-	append-cppflags -D_GNU_SOURCE
-	emake -j1 \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		CPPFLAGS="${CPPFLAGS}" \
-		LCURS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
-		LDFLAGS="${LDFLAGS}" \
-		LIBZ=-lz
-}
-
-src_install() {
-	# we don't want to strip here, so use "true" as noop
-	emake STRIP="true" ROOT="${D}" -j1 install
-}
-
-pkg_postinst() {
-	elog "You may want to add /usr/5bin or /usr/ucb to \$PATH"
-	elog "to enable using the apps of heirloom toolchest by default."
-	elog "Man pages are installed in /usr/share/man/5man/"
-	elog "You may need to set \$MANPATH to access them."
-}
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
new file mode 100644
index 000000000000..34e2e70756e4
--- /dev/null
+++ b/sys-apps/heirloom-tools/heirloom-tools-070715-r3.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Heirloom toolchest - original Unix tools"
+HOMEPAGE="http://heirloom.sourceforge.net/tools.html"
+SRC_URI="http://downloads.sourceforge.net/project/heirloom/heirloom/${PV}/heirloom-${PV}.tar.bz2"
+
+LICENSE="CDDL GPL-2 LGPL-2.1 9base ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	sys-libs/zlib
+"
+DEPEND=${RDEPEND}
+BDEPEND="
+	sys-apps/ed
+	sys-devel/bc
+	virtual/pkgconfig
+"
+S="${WORKDIR}/heirloom-${PV}"
+PATCHES=(
+	"${FILESDIR}"/${P}-major.patch
+	"${FILESDIR}"/${P}-makefile.patch
+	"${FILESDIR}"/${P}-glibc-2.30.patch
+	"${FILESDIR}"/${P}-glibc-2.31.patch
+	"${FILESDIR}"/${P}-gcc-10.patch
+)
+
+# slightly broken
+RESTRICT="test"
+
+src_compile() {
+	append-cppflags -D_GNU_SOURCE
+	emake -j1 \
+		CC="$(tc-getCC)" \
+		CFLAGS="${CFLAGS}" \
+		CFLAGS2="${CFLAGS}" \
+		CFLAGSS="${CFLAGS}" \
+		CFLAGSU="${CFLAGS}" \
+		CPPFLAGS="${CPPFLAGS}" \
+		LCURS="$( $(tc-getPKG_CONFIG) --libs ncurses)" \
+		LDFLAGS="${LDFLAGS}" \
+		ROOT="${ED}" \
+		DEFBIN="/usr/bin/${PN}/5bin" \
+		DEFSBIN="/usr/bin/${PN}/5bin" \
+		SV3BIN="/usr/bin/${PN}/5bin" \
+		S42BIN="/usr/bin/${PN}/5bin/s42" \
+		SUSBIN="/usr/bin/${PN}/5bin/posix" \
+		UCBBIN="/usr/bin/${PN}/ucb" \
+		CCSBIN="/usr/bin/${PN}/ccs/bin" \
+		SU3BIN="/usr/bin/${PN}/5bin/posix2001" \
+		DEFLIB="/usr/bin/${PN}/5lib" \
+		LIBZ=-lz
+}
+
+src_install() {
+	# we don't want to strip here, so use "true" as noop
+	emake -j1 \
+		STRIP="true" \
+		ROOT="${ED}" \
+		DEFBIN="/usr/bin/${PN}/5bin" \
+		DEFSBIN="/usr/bin/${PN}/5bin" \
+		SV3BIN="/usr/bin/${PN}/5bin" \
+		S42BIN="/usr/bin/${PN}/5bin/s42" \
+		SUSBIN="/usr/bin/${PN}/5bin/posix" \
+		UCBBIN="/usr/bin/${PN}/ucb" \
+		CCSBIN="/usr/bin/${PN}/ccs/bin" \
+		SU3BIN="/usr/bin/${PN}/5bin/posix2001" \
+		DEFLIB="/usr/bin/${PN}/5lib" \
+		install
+}
+
+pkg_postinst() {
+	elog "You may want to adjust your \$PATH, to enable "
+	elog "using the apps of heirloom toolchest by default."
+	elog "Man pages are installed in /usr/share/man/5man/"
+	elog "You may need to set \$MANPATH to access them."
+}
diff --git a/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild b/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild
deleted file mode 100644
index 00037ab30d24..000000000000
--- a/sys-apps/heirloom-tools/heirloom-tools-070715.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic toolchain-funcs
-
-# slightly broken
-RESTRICT="test"
-
-DESCRIPTION="Heirloom toolchest - original Unix tools"
-HOMEPAGE="http://heirloom.sourceforge.net/tools.html"
-SRC_URI="http://downloads.sourceforge.net/project/heirloom/heirloom/${PV}/heirloom-${PV}.tar.bz2"
-
-LICENSE="CDDL GPL-2 LGPL-2.1 9base ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/ed
-	sys-libs/zlib[static-libs]"
-RDEPEND=""
-
-S="${WORKDIR}/heirloom-${PV}"
-
-src_compile() {
-	append-cppflags -D_GNU_SOURCE
-	emake -j1
-}
-
-src_install() {
-	# we don't want to strip here, so use "true" as noop
-	emake STRIP="true" ROOT="${D}" -j1 install
-}
-
-pkg_postinst() {
-	elog "You may want to add /usr/5bin or /usr/ucb to \$PATH"
-	elog "to enable using the apps of heirloom toolchest by default."
-	elog "Man pages are installed in /usr/share/man/5man/"
-	elog "You may need to set \$MANPATH to access them."
-}
diff --git a/sys-apps/heirloom-tools/metadata.xml b/sys-apps/heirloom-tools/metadata.xml
index 104a871f1a1a..b6887e34071b 100644
--- a/sys-apps/heirloom-tools/metadata.xml
+++ b/sys-apps/heirloom-tools/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>patrick@gentoo.org</email>
-		<name>Patrick Lauer</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">heirloom</remote-id>
 	</upstream>
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index a8c1a3ab60f9..b20faaa2eecf 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -1,8 +1,8 @@
 AUX help2man-1.46.1-linguas.patch 2352 BLAKE2B c79cf163fc358f08192517527ee59df2ac429fdf8b8bcc4e387ed686d44b3aceebcd517578cbf6348d751ce2fb62f1b7580d6a645a4f912c7fa374eb165b2600 SHA512 5907aed1745b199b0cad44f6e7669c663761b308b2bb1b669be8ba118d990481c37d1da5477df2cfa9cba30ecffe99c3863215779d683f056fe0c41241a0049b
 DIST help2man-1.47.10.tar.xz 202176 BLAKE2B 57c19072b1fb696b8ae1fc269d4c44672e692b45f1afe91871621dbed008298154d94813711b8ab89a9ad2e9fffa5ba1e738a613e5e50681b0abea4bfcc92677 SHA512 071383f38fb5264137200439a460e70298fc23d88069a96f150bf50a4e2a08d1d5d29555053b0ea36c809eec8484c4432b55d7d0bddd68f33b07b1abb97556ff
-DIST help2man-1.47.11.tar.xz 202312 BLAKE2B 6baba7fb28f2b28aba8a05eb5df0a8596918767cf43d730052e0bae9293a4a27f207136c22cad246ca7220fb639fabce3bb135edf4e84f866f1ea9b0af26f41d SHA512 786a6bd4336c591cfeb0b4f2dc1429f6545e36514e7b238453c91368b8f531c46db2be025f02dc52e6dd8b971d6edbb4ff1a8e1b519f9253a3957ad7157790be
 DIST help2man-1.47.12.tar.xz 202252 BLAKE2B 6a474d62999b2fe6750a0ec7662b9b33546d82ce72edd628f41008243cd3467cad783516d5ad06edb37f471a2aaefd837bd9957a7fd10b6e3c3b6dd33398b79b SHA512 fb71e48e4a7a0f4316148295ea539b667a131149f4467da0f3e283389c9d9f2a5f1e9124ca8d64d6c3250d332a713d4e8de204ca9e7088840e74f316fa5221be
-EBUILD help2man-1.47.10.ebuild 1024 BLAKE2B 205c063695daef4cfb0731b551d01d3e11be06eb32c441e9a2fac64b9ed616956a589c67012265e0805e47a200d074e3f90a56916109382f0cdd6ecea2271b3b SHA512 a17c21ba92aa3dedf4f38f7ee392d24b6e6c4f98a1d3ef8d11c3f1372ff3e41998dd900be60d78f1042241d03d1f7c2c9290ea78d87ba22e4f1b40ae7688cd1d
-EBUILD help2man-1.47.11.ebuild 1078 BLAKE2B 89dad80b2687605be2a944d77d03df3b041a1f5f01d75d6d66352a80fe83142e19e1b1474ac2ee7228d4eb7842310b1dee871c2768c4319c8a73dca3988582a5 SHA512 d5688282e2994c9eeecb6bb54f03193c85f4b7e550bc62ff1ada161c5cf4363d631459d000133a3eb517652e5d01b3d391b912da7d14b9014a1e2b3299efc047
-EBUILD help2man-1.47.12.ebuild 1078 BLAKE2B 8bf114bf8ef0f3bc986482328918d9488d9d7d7ebecdddc01c2bc51dbcfe87d1e7890b28629d1ffa31908ea96ad26b134fe73ef14d5179f6ef8ae2fcaf29d8b5 SHA512 841b57cdd2ce1de39dea017bc911fa6cacb624155c2696c20c7d983d80304fa3e68a89fa00577652e97f37923a6f124dc11b2dcbcc879ae1c7873bcdd54f2c3d
+DIST help2man-1.47.13.tar.xz 202480 BLAKE2B 0c9e854a29ab563b7bc86d4873b2669c82bbd9226d3940ddf60fcbf8bfc48197013c7cde5b55e47e6463d26e1b3512a24bb9591a77009f47992b2a3df9bde198 SHA512 7bf4c75a42c103dd8413a94505f383c6e2b215f9a4cc506e11935acc7f108caad01a5fa489ee157ebef5fa02299145592f65cc828fc016417af557382975d57a
+EBUILD help2man-1.47.10.ebuild 1022 BLAKE2B f01f7f66adab500bdf8b7d029b59d696e20e869ffd1e81a47cf5c80ad7679845c293c7f1cc0a9ba143dc8b30bf9e339013aa79b8aa4f354bacba1c4b0b34f03d SHA512 3cb0b2fe8308cd39233debda5547c51f99ba95ad9d01beab11d11cb7fa1613369c0e58586fa047f26cc486c5969465d5049dc11bd2841f3f7ac88ac40bbb2d62
+EBUILD help2man-1.47.12.ebuild 1074 BLAKE2B 3d3642c022ccc23972017a3a7427b04c25de4c8082381c293ac2e3da6eaa1f057cad1efa203836f680b8cdd24c6c5f46b859e51dc2b4451acb411d045b023e02 SHA512 78e07687855df5c806cf74bd7c230f2e487f27d0585f9976861e2d385ba9fd8a2e25b0d4969cc7e1bd1b345fad2dbf715a030d4ab0fc810d1a95c90af057b326
+EBUILD help2man-1.47.13.ebuild 1074 BLAKE2B 3d3642c022ccc23972017a3a7427b04c25de4c8082381c293ac2e3da6eaa1f057cad1efa203836f680b8cdd24c6c5f46b859e51dc2b4451acb411d045b023e02 SHA512 78e07687855df5c806cf74bd7c230f2e487f27d0585f9976861e2d385ba9fd8a2e25b0d4969cc7e1bd1b345fad2dbf715a030d4ab0fc810d1a95c90af057b326
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.10.ebuild b/sys-apps/help2man/help2man-1.47.10.ebuild
index eeef70f29660..8fe5e926a250 100644
--- a/sys-apps/help2man/help2man-1.47.10.ebuild
+++ b/sys-apps/help2man/help2man-1.47.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.47.12.ebuild b/sys-apps/help2man/help2man-1.47.12.ebuild
index a2e138b9d74e..79ed067d1855 100644
--- a/sys-apps/help2man/help2man-1.47.12.ebuild
+++ b/sys-apps/help2man/help2man-1.47.12.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/help2man/help2man-1.47.11.ebuild b/sys-apps/help2man/help2man-1.47.13.ebuild
index 884bee09c350..79ed067d1855 100644
--- a/sys-apps/help2man/help2man-1.47.11.ebuild
+++ b/sys-apps/help2man/help2man-1.47.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~ppc-aix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/hwdata-gentoo/Manifest b/sys-apps/hwdata-gentoo/Manifest
index ff4e18d35589..00a85142276b 100644
--- a/sys-apps/hwdata-gentoo/Manifest
+++ b/sys-apps/hwdata-gentoo/Manifest
@@ -1,4 +1,4 @@
 AUX 0.4-openchrome.patch 781 BLAKE2B 9df96192f6c6be5502d32d35acd1853e3de0c5660a0022c0ede0f14d6a7b0847a2ade3fa3501d6cc658a03312f764a07d4f56e06b70508020ca69c4dda1e924b SHA512 0fa8effbb7a9ee05780bab67583c9da7b11b38498eaf2b447b5be3190d1b9d924476e07b27bee51b2d6298579a8a07340fc90a2634a579f177f024be0029c9a6
 DIST hwdata-gentoo-0.4.tar.bz2 149060 BLAKE2B 77534979aa9605836ce52906413b994a71d96636a3a39c65456a4899d839cb2f91ad101bfba884869c43795268c7fb13c7fa8ffab6f097f40dfd071712c4582b SHA512 dd62c51986c83ff5a9338fa20d98827cd44d86e808c9a2a52ff327dcdd941d0faed0ea4f85058485e8fc2f78e0c2fa18d3030e27fded8ed1777832ee789c189a
-EBUILD hwdata-gentoo-0.4.ebuild 849 BLAKE2B b8ffbbffbd8610ff7d82713766b022927d77604102b9933704720cbf0b30d7e312386a93b11a63449dac24990cf3f22330c8b74738cd9bcfd7a3f0ceea9149f0 SHA512 9c54bddf1a18134194e1c32a668ca9a7d54e6c36c81e3adabf23bf0722af198c35399c1c4624d947ad027179c2a1721c247f3be02c0660ab4aa2e54b39ab4009
+EBUILD hwdata-gentoo-0.4.ebuild 850 BLAKE2B fbcf1affdc8cc8f8787118d11d5e4dae4397e55eb7bcc44baf061e229f3e513225e297016d1d12ef26914edf46965e7fe0edc4e0dbf61b494cfeb215c4ff3e1a SHA512 1adcc802837db000aebd3fa76739c5af52f1b8ff9963e5701c1a027dc1b6e475f01bc6f8f884c420bd64da91ba7b23d73649f0f7d821fb46213986c255fc18b9
 MISC metadata.xml 345 BLAKE2B 2492803d43b2d0669f2a6996c75f0f2053622f8a07d4a337e9e8cb9e81b661ba01990ea7f1b8dc130213251e5ab852c4abb637166693ac10e65f3ef18035fc0a SHA512 0d8a0b6099b83e5d54e235442a361a1eceaf6606522aee190382fc03a8b672c1c2559cdd585942b278e7c48acab7c3e9f7021e7faf9e2775e92eea32ecc2c223
diff --git a/sys-apps/hwdata-gentoo/hwdata-gentoo-0.4.ebuild b/sys-apps/hwdata-gentoo/hwdata-gentoo-0.4.ebuild
index 6501f2697951..caf609cc8650 100644
--- a/sys-apps/hwdata-gentoo/hwdata-gentoo-0.4.ebuild
+++ b/sys-apps/hwdata-gentoo/hwdata-gentoo-0.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2
 HOMEPAGE="http://wolf31o2.org"
 
 IUSE="opengl binary-drivers"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 SLOT="0"
 LICENSE="GPL-2"
 
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 74d2f0843f4b..6ebb94f6f16a 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -2,9 +2,11 @@ DIST hwids-20190316.tar.gz 3312959 BLAKE2B d9f4c7170979c404a69ca0b51903af34db01a
 DIST hwids-20190818.tar.gz 3407208 BLAKE2B c2a0098cba4a34210461a2781f325a95f18696c1917ff3a1c26a2f56383e9edd087ab6b3a1a173a92df829fc250cf460d915a98298f9c38a71396bf232916245 SHA512 74086f96152482af3c9caabc729f34d193cc619aae88d44aa0472d674b7533ab806b13243c95bfa04417bdd40e3bb7069b766c2c0824f19d0c62385b043a01c2
 DIST hwids-20191025.tar.gz 3443988 BLAKE2B 0352f1568d7ceeb2c599d789f96a3175703f3c86240188beb9a080eabb6e7659aeeadf193f15050519fb64c58ee8d8832919cf6922b5017861b32be543235a03 SHA512 6f637ca8c4d6b1261c5c2eccd8d1a64ab750f4c36f3d435b50b75949c15e571d83bc61dd6a14e777b53d383d7d02c34f616cc6a62d005db3d965b33b4121deca
 DIST hwids-20200204.tar.gz 3495191 BLAKE2B 23075b6728d9b0e020be45729d0df4cef95cac5e912e646b612266337d1add59c87a1031e6672c5b6eb23e13c26e6299b62a5886aa25017242a86fd474c1e9ae SHA512 1d2a9baaa7ab64575a3d9b98ae4df9060cb8593ae752365296dd53b18bc5996170bbfe1c5b4b1ffc24b28e3dbaa7c321c4fa333bbf91449a6ca7b187cbe23741
-EBUILD hwids-20190316.ebuild 1753 BLAKE2B 3a101993bf2d5fad2ca2098b24791ce035854f7b56c153c328bdea1cbec4b4b149c6596f032200954cb29e20355974190b822c1c5d505e2667bac1bbc5bd559f SHA512 0182eec334fc4746dfde1fbb224617c728ec2c5cd61f43a60ce2abc8a74cca800abc6d0a09ddcea95c3b8bb548f77a89f2883249a87311e677b407adabb67ace
-EBUILD hwids-20190818.ebuild 1728 BLAKE2B 90757cbcbef641262913b192fb0408cf434a665ad565cbe13c9966a344750c815a60b500499b75b5b5aeb6ad6dce12f484e5a6bfac77f07454d68d4804f911a7 SHA512 301f5167ec818ad25861080a8f8be6e286d34321c8d0ae31f1743eed7bc88db046ab7815e695eec96bf890b7237611100bfbef9e7197318200ac62df0f4a06b1
-EBUILD hwids-20191025.ebuild 1740 BLAKE2B b31cb1ff565dfc6d111864102a93cdff1a38a50ec13933698a73a08c9492a57970abb5c9db3c19e742945ac6809b6eadd86ca46af4a33a8fd0032813309ca07a SHA512 5bbda909cf7b896804d1b5a80474dd0b52369da193dd68e4ba303325987330a257c8ca4aecb97bcade3ad1b8e71b8cb662e0536e984d16740692de963fc8bdea
-EBUILD hwids-20200204.ebuild 1740 BLAKE2B b31cb1ff565dfc6d111864102a93cdff1a38a50ec13933698a73a08c9492a57970abb5c9db3c19e742945ac6809b6eadd86ca46af4a33a8fd0032813309ca07a SHA512 5bbda909cf7b896804d1b5a80474dd0b52369da193dd68e4ba303325987330a257c8ca4aecb97bcade3ad1b8e71b8cb662e0536e984d16740692de963fc8bdea
-EBUILD hwids-99999999.ebuild 1740 BLAKE2B b31cb1ff565dfc6d111864102a93cdff1a38a50ec13933698a73a08c9492a57970abb5c9db3c19e742945ac6809b6eadd86ca46af4a33a8fd0032813309ca07a SHA512 5bbda909cf7b896804d1b5a80474dd0b52369da193dd68e4ba303325987330a257c8ca4aecb97bcade3ad1b8e71b8cb662e0536e984d16740692de963fc8bdea
+DIST hwids-20200306.tar.gz 3512152 BLAKE2B 6a6ee48598e72f97a90bff8f45aacb699218570ede5b60ed119ebae78de6cd4b92e02f96cf57c83710da699be9a7dcdfdef8d404539e04b664298874b35e54ce SHA512 eff1d2783925ca459b387fbaa5cf68a98aa4209ab8509ad92a902b4d02cc7f4a47e5506c2beed4c792d24a8ab636ad77b376a92b59ae4f605d1b5258350ff250
+EBUILD hwids-20190316.ebuild 1751 BLAKE2B 32fabfc9789927fbc428fa3578515ef84143df6fab5925a6a35438f833064783a3f15827c7b7c9b75b3a2357218a0a279e19f6824901f0161442131488e25754 SHA512 f35a9fdc075e2bdbb1bbf5ffaca44ae482a0c251f22b9c8235dd37c313f6a6d29b9c3851c9bd02b290faff6dcf62797a1a3c29dcc2505b48c1bca17953f53364
+EBUILD hwids-20190818.ebuild 1726 BLAKE2B 7e63317546839f8bd5df6d612587e38581a8777a804c7b2d56616dd1719eed335a8c4a3e91b28c9dc6744ea322633be3564d8d3d1543d09f7647a92e3e8329e4 SHA512 008f1a172d94706bdc9445363ba89a6bc07cfe5c1072ea153c339e0ee068a7a3de4336c854edcc4d2ef43dc78346a34473ee46147ae89b2c38005637b41a9bb7
+EBUILD hwids-20191025.ebuild 1736 BLAKE2B 9c6790f94021cde5b51edb9add5a4a798d9957cdfbd8bc71f6ead04e9a9556221101faa0fd22b5f01155475df118a680b8a0c2704dae7fa17baa680a6fe1d299 SHA512 15a575949a9bf95bb61a24d987d87604de643507fe6560f7ca6860985643615282781771b1d878103d1ca8c8c9a006fdfea374b24c955544382c963be72fff21
+EBUILD hwids-20200204.ebuild 1726 BLAKE2B 7e63317546839f8bd5df6d612587e38581a8777a804c7b2d56616dd1719eed335a8c4a3e91b28c9dc6744ea322633be3564d8d3d1543d09f7647a92e3e8329e4 SHA512 008f1a172d94706bdc9445363ba89a6bc07cfe5c1072ea153c339e0ee068a7a3de4336c854edcc4d2ef43dc78346a34473ee46147ae89b2c38005637b41a9bb7
+EBUILD hwids-20200306.ebuild 1736 BLAKE2B 9c6790f94021cde5b51edb9add5a4a798d9957cdfbd8bc71f6ead04e9a9556221101faa0fd22b5f01155475df118a680b8a0c2704dae7fa17baa680a6fe1d299 SHA512 15a575949a9bf95bb61a24d987d87604de643507fe6560f7ca6860985643615282781771b1d878103d1ca8c8c9a006fdfea374b24c955544382c963be72fff21
+EBUILD hwids-99999999.ebuild 1736 BLAKE2B 9c6790f94021cde5b51edb9add5a4a798d9957cdfbd8bc71f6ead04e9a9556221101faa0fd22b5f01155475df118a680b8a0c2704dae7fa17baa680a6fe1d299 SHA512 15a575949a9bf95bb61a24d987d87604de643507fe6560f7ca6860985643615282781771b1d878103d1ca8c8c9a006fdfea374b24c955544382c963be72fff21
 MISC metadata.xml 647 BLAKE2B 88b205060dbd1c22edb25b740b5b84d0b36e8746a8bfd5793ab385afa2afd34e54626c2b09e59dc2cf91d838ae44dea878be26cd9cab83a98054a3d0b4bfbd52 SHA512 b05dbd41c2a839d2ac8baaf8ee2352ee999d48deb123c54e048da44cccb06f64729620983848a6b16ada8af50e6fb68adf15323ff362f230b7213f485b1ec27c
diff --git a/sys-apps/hwids/hwids-20190316.ebuild b/sys-apps/hwids/hwids-20190316.ebuild
index db2449e5385d..bb781842bf0c 100644
--- a/sys-apps/hwids/hwids-20190316.ebuild
+++ b/sys-apps/hwids/hwids-20190316.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "99999999" ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
 	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-20190818.ebuild b/sys-apps/hwids/hwids-20190818.ebuild
index c3ee9793f0cd..46bbc5f64650 100644
--- a/sys-apps/hwids/hwids-20190818.ebuild
+++ b/sys-apps/hwids/hwids-20190818.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 99999999 ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
 	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-20191025.ebuild b/sys-apps/hwids/hwids-20191025.ebuild
index bca039bc1899..bbe6c639f9b4 100644
--- a/sys-apps/hwids/hwids-20191025.ebuild
+++ b/sys-apps/hwids/hwids-20191025.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 99999999 ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
 	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-20200204.ebuild b/sys-apps/hwids/hwids-20200204.ebuild
index bca039bc1899..46bbc5f64650 100644
--- a/sys-apps/hwids/hwids-20200204.ebuild
+++ b/sys-apps/hwids/hwids-20200204.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 99999999 ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
 	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwids/hwids-20200306.ebuild b/sys-apps/hwids/hwids-20200306.ebuild
new file mode 100644
index 000000000000..bbe6c639f9b4
--- /dev/null
+++ b/sys-apps/hwids/hwids-20200306.ebuild
@@ -0,0 +1,91 @@
+# Copyright 2012-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
+HOMEPAGE="https://github.com/gentoo/hwids"
+if [[ ${PV} == 99999999 ]]; then
+	PYTHON_COMPAT=( python3_{6,7} )
+	inherit git-r3 python-any-r1
+	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
+else
+	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="|| ( GPL-2 BSD ) public-domain"
+SLOT="0"
+IUSE="+net +pci +udev +usb"
+
+RDEPEND="
+	udev? ( virtual/udev )
+	!<sys-apps/pciutils-3.1.9-r2
+	!<sys-apps/usbutils-005-r1
+"
+
+if [[ ${PV} == 99999999 ]]; then
+	BDEPEND="
+		net-misc/curl
+		udev? ( $(python_gen_any_dep 'dev-python/pyparsing[${PYTHON_USEDEP}]') )
+	"
+	python_check_deps() {
+		if use udev; then
+			has_version -b "dev-python/pyparsing[${PYTHON_USEDEP}]"
+		fi
+	}
+else
+	S=${WORKDIR}/hwids-${P}
+fi
+
+pkg_setup() {
+	:
+}
+
+src_unpack() {
+	if [[ ${PV} == 99999999 ]]; then
+		git-r3_src_unpack
+		cd "${S}" || die
+		emake fetch
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+	sed -i -e '/udevadm hwdb/d' Makefile || die
+}
+
+_emake() {
+	emake \
+		NET=$(usex net) \
+		PCI=$(usex pci) \
+		UDEV=$(usex udev) \
+		USB=$(usex usb) \
+		"$@"
+}
+
+src_compile() {
+	if [[ ${PV} == 99999999 ]] && use udev; then
+		python_setup
+		_emake udev-hwdb
+	fi
+	_emake
+}
+
+src_install() {
+	_emake install \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		MISCDIR="${EPREFIX}/usr/share/misc" \
+		HWDBDIR="${EPREFIX}$(get_udevdir)/hwdb.d" \
+		DESTDIR="${D}"
+}
+
+pkg_postinst() {
+	if use udev; then
+		udevadm hwdb --update --root="${ROOT}"
+	fi
+}
diff --git a/sys-apps/hwids/hwids-99999999.ebuild b/sys-apps/hwids/hwids-99999999.ebuild
index bca039bc1899..bbe6c639f9b4 100644
--- a/sys-apps/hwids/hwids-99999999.ebuild
+++ b/sys-apps/hwids/hwids-99999999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 99999999 ]]; then
 	EGIT_REPO_URI="https://github.com/gentoo/hwids.git"
 else
 	SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="|| ( GPL-2 BSD ) public-domain"
diff --git a/sys-apps/hwloc/Manifest b/sys-apps/hwloc/Manifest
index fb83033832e0..2de8fa85f5a5 100644
--- a/sys-apps/hwloc/Manifest
+++ b/sys-apps/hwloc/Manifest
@@ -5,6 +5,6 @@ DIST hwloc-1.11.2.tar.bz2 4019136 BLAKE2B 29a959c48b3be347b5816333c3f9948ddafc6c
 DIST hwloc-2.0.4.tar.bz2 6057001 BLAKE2B 0d73c2ec544263bb36404d8112412b6b308935b9b8b4ba37cac05d8bdc525763fa862c63d387545cb0e02e1bd8f1c931e034381dede83b7119f30928f4e54bf4 SHA512 c7bb69f0e536188921138d003f3854a12f942a4f625e665d5ce6d32c1c4a884e0a91f9125de33dd292f522032b759e6240df3f3e53534033567ea0d829feefce
 EBUILD hwloc-1.11.10.ebuild 2195 BLAKE2B 4cfd04182449a5d01d3ba48d029bba8a514e6b559c829681d63c303a8dae91ebd628df48e8db4c4a33ed1ad8654d16a1122848a9d6f579fd90ae6e6660e21c19 SHA512 ee00586fe98f049ce09ab15a4b97644982c9630c44cc569717682eb76451ff558592ae7fb6b5908ca8957e655fd949a8969977b8845932f10f825032eccc2b73
 EBUILD hwloc-1.11.13.ebuild 2176 BLAKE2B 5492e4cc844737ffd61a07791e83494c0b9061c3e0c261c23c812b3b35b9708d91138fce18e85dbf0883795454259292877b762debb8ed0066a7be14947b5af6 SHA512 2a61fd7b84d9686a84236f8aea65e3f2f00536a2cbcf32accbb62d67b73627fbb70035e929a757420f5099b773bbaee3e74984e93796c61bf3f0180d7a6bb599
-EBUILD hwloc-1.11.2-r1.ebuild 2139 BLAKE2B aaaf6e038f4e6fc8b33ba4701a48d656d2aab92b90dfe1ae9ff04f0097ac9819b2c20437dd0919b5e07bcd2418eab78e8eeacd93d045b6df1c4ba682305baff2 SHA512 64cb97511d438f8cee0e979ad232c4f663bc82391347f12b915a94d28a684e27d2405e4b7e08c519e8f34edd7fb98e49dc70953dcbba00acdff32c79cb6c3c18
+EBUILD hwloc-1.11.2-r1.ebuild 2140 BLAKE2B c316557e57e307aa899230ca27014e65bf51c858781c7e8962993c3f6178f3773afcb630e2fa32add96ccb75799709845729ae6a75b29ea347b6ac74958b82eb SHA512 e495310756420847db75334266cd8d3cb247f5922bc66cfeb1f947cc5dc029a7879b00746fd0da84298c8710eea4e7384bfae282e1987e28d7e0fbb256b1832a
 EBUILD hwloc-2.0.4.ebuild 2047 BLAKE2B fdabf052b4b9ac1c5f4c3f7192eb12894f6eb2ff1a48baaf7c652df7840bfbcbc01c99225e3b600516e26f1b4a63d0fe84f59eed9deb5d7bbe06f666f916bd1b SHA512 e4e6d67475fcd51e569571c0cab0bc678d79e75825dff3e511bf26bd43ff4b7b757f0038aaf248bebfd6d6cef1a6c5f0b098d5736d8590c18ae5271d1bd61e79
 MISC metadata.xml 1263 BLAKE2B 31a2da3a73430d956f12a029941ee5439ab374be53be55a505f9de83735eab843cd60ca48230bdefa0e8dd3f53b8276dccb62df847364bb79e737f8770fa2553 SHA512 9c21fd25ba0f5046ab051e58884c67d3627040bf66b58d114fa504e411aefe3411c591e356a419e955269e74cafba06ac9fe335b1bb9c43253c029accef1d166
diff --git a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
index d4be5c943bbe..acb852ae7cd2 100644
--- a/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
+++ b/sys-apps/hwloc/hwloc-1.11.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.open-mpi.org/software/${PN}/${MY_PV}/downloads/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0/5"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="cairo cuda debug gl +numa +pci plugins svg static-libs xml X"
 
 # opencl support dropped with x11-drivers/ati-drivers being removed (#582406).
diff --git a/sys-apps/hwsetup/Manifest b/sys-apps/hwsetup/Manifest
index e917cd79a8fb..e9df0638b052 100644
--- a/sys-apps/hwsetup/Manifest
+++ b/sys-apps/hwsetup/Manifest
@@ -4,5 +4,5 @@ AUX 1.2-7-gentoo.patch 560 BLAKE2B fd025d5ea34118ba1be46c3038594e62b2178c1d96de6
 AUX 1.2-7-openchrome.patch 520 BLAKE2B ef6da2b6edfdb1c9abea047f08ecdeea259ea80bd68d35ab534b3b3ce665fd6f0d6b0362ed46caa1a0b9488480c5f2ec9c6771d46ab645f2edb03b87b7873eec SHA512 f8a301d7e2d6508e5a25ba0099a808b1494cd992f2f6066912504b077a26c3fe01772e689a25f80acce59c5eff8369e2e1e33c06a7ea935e9a50d79f6fbfa25d
 AUX 1.2-strip.patch 209 BLAKE2B 0ddb29fcc59a841fef9bd08eb996cb84047a282ca7107636e222021d2da355b532f839b03eac6ee8cc3fdbcebdce30056eac049166f113e510197b9e92428c0d SHA512 93033d62d6328dab7bef0f42f6f41352c60081523d86388cd5823181483cf9245dd55c163d1e78ab51e20187cdca4017c815ae86f6de14394fb6cd2724dda98b
 DIST hwsetup_1.2-7.tar.gz 10706 BLAKE2B 2d0e005629f631aa3ef22f44122cf934d23929c89ee4ca7240dcdd9c2898e622a78e494a057b9eed96045e8b1a7b54252f402311360e84d57007876cd9a5f630 SHA512 ef252c748ecf1fc17d107fa413a76df5d9daab84b10eb1ca2c5c320207e0be522c4ae6204c1c85c613403e40312c9c876bcab04eeaa1a2e1724b7bb1c6d41a1e
-EBUILD hwsetup-1.2-r3.ebuild 1727 BLAKE2B 91ef37b4477cb458df553d25dcbf9a9c16223fb6c8c1135bf845cefe3f0f343c36866eb958c4a9d41f567bcb7acbe26af0f8b550bcb730bcaf06c49aa2b51d92 SHA512 54583af4468d293c8664f8a4944a4b60dae333e0785a3f1fde1283000904bae9e306e7dffd8df2393fc777678483d1adabc100fb2b4381912d0a902bae2f80ef
+EBUILD hwsetup-1.2-r3.ebuild 1728 BLAKE2B 1bfee065d8b6ae15f3580760ba6e64c2015490e6064107e45e95b95ccd29f3cf535e3d05a3054667bb0d0d4bdd5b41dc30710fcff679155b7e1f48c6fe99a49b SHA512 ef67068f9189ae8bd925177d0f9a29555eeec274eef3ed4b3be092a05ba014fe6da32c16055763207d42533a6d917648190056b58cd2d6f15d242a695ac6f691
 MISC metadata.xml 251 BLAKE2B 914f6ce3b97ef33310dd17c219739df48b081adb06e58d6a38a10cf4368eea50a9096c7b274077b6ca67d17ab9601b7c46995bbc89479d2842705dcc3ba75461 SHA512 2da7a6b2b1b7153b8803cc52201fa006313bf75a25f7d917f26eadd7a6426529e4b30a57c3c24cca20865d9dc4f3d56fdfa14b10254158bea2dfeb2c64fcc18c
diff --git a/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild b/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild
index 3cffdb57ad99..c535829a9ffa 100644
--- a/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild
+++ b/sys-apps/hwsetup/hwsetup-1.2-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://debian-knoppix.alioth.debian.org/sources/${PN}_${MY_PV}.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="zlib"
 
 COMMON_DEPEND="
diff --git a/sys-apps/i2c-tools/Manifest b/sys-apps/i2c-tools/Manifest
index c0594b9b41d8..1d67c1e8ea78 100644
--- a/sys-apps/i2c-tools/Manifest
+++ b/sys-apps/i2c-tools/Manifest
@@ -1,5 +1,3 @@
-DIST i2c-tools-4.0.tar.xz 79972 BLAKE2B 982e4139ed0e2111f9e082d0690fcc0f86f97a433e292e9464b41991f14a1f90147a3612172bad6880f0df6896612e1dea0ae7bf6f459758b2cff45fb35a5dc7 SHA512 ddf86c357c101388193581bc40285089e6ab5e8d870f8aa5d594acc7ecb8596fbd30501e147b88bdea0200b1be88bc0a374356c188d1bcb067bf8e254e3dc51e
 DIST i2c-tools-4.1.tar.xz 83576 BLAKE2B 0a9ed3bb335b61f6c17a6b6c705502ff008b4fb8bab6a5fde63163a32528b5214d92affc4b8d6cca29676dc7ba82dfa84be5f14943b7e81c8612a7d9419ac628 SHA512 83262bcfd94c2adf74517cc50095dd78221fa4d16a62397245d4a538de7463272abf4f6727024be8ab1ca8ecbfe647af85ba2a553e5b5e68a53e50dfcad20248
-EBUILD i2c-tools-4.0.ebuild 1425 BLAKE2B 21a2d77671dd508aab6864fc098db09fd1f9ef05b28fe2152953d148ca3bb90dc5c7e83619ecaacf820963e75c8e50e8fd22b6decba95cfdab25ba7aca05daef SHA512 6a7c090744f5b3acba3828895c127f3ae61c05c1b90e511366c28022d3d772a8fe4a968b560b7bd42e4441ef0e9ed49311c64d178f92e348fe0ae7299d0d1f88
-EBUILD i2c-tools-4.1-r1.ebuild 1957 BLAKE2B 1c7b609865842eb913df717d3c77350d96e23a8200f493110f455951d621dfc6ff1939a3620391a99b8a5a26c6aee7f741746be330db56c7bbb4fb97c5c59b8d SHA512 63843a3e99878ae9769920000b8110e2d4925350122100abd27d996b6459d9e83b2a46d687e0eee7c603461161bcc9d23cff19975ba9db4ff8e277fc7d6105fc
+EBUILD i2c-tools-4.1-r1.ebuild 1954 BLAKE2B 6dd8ba51d6948c9736c2ddd3e13efc7ef39a9d914a17d5ee7fc325639f6d734e95b4d6e12ed58f54b06cc3e140875b2de55756c77d228ca73c158661b2ac2850 SHA512 5d852e226406e78bb57ce21544b02dfc987cc64abea22cc22eb6f7558db2a79e6ee0134800082ddd549e30ae604d7c12892d9352655c3ba04100c71229248536
 MISC metadata.xml 243 BLAKE2B f7576f14be2c0aa21ca2c7147133e4a4132d6559cca1519745dd2f4ea912b3856950c7645e13d2317f38c80ba93b13d47370260920241a5ab60a4eae59f2cf33 SHA512 0dc1f228861badffd9c4175af734b72435dc7c60d369a3d9ff946c5b98b3f2f49af7d433f7ec5fc2afee7015b8f75259e8debe150b1bcffa0cb66425bed10d8d
diff --git a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild b/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
deleted file mode 100644
index f0132804d21a..000000000000
--- a/sys-apps/i2c-tools/i2c-tools-4.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-DISTUTILS_OPTIONAL="1"
-
-inherit distutils-r1 flag-o-matic toolchain-funcs
-
-DESCRIPTION="I2C tools for bus probing, chip dumping, EEPROM decoding, and more"
-HOMEPAGE="https://www.kernel.org/pub/software/utils/i2c-tools"
-SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
-IUSE="python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	use python && distutils-r1_src_prepare
-}
-
-src_configure() {
-	use python && distutils-r1_src_configure
-}
-
-src_compile() {
-	emake all-lib AR=$(tc-getAR) CC=$(tc-getCC) # parallel make
-	emake CC=$(tc-getCC)
-	emake -C eepromer CC=$(tc-getCC) CFLAGS="${CFLAGS}"
-	if use python ; then
-		cd py-smbus || die
-		append-cppflags -I../include
-		distutils-r1_src_compile
-	fi
-}
-
-src_install() {
-	emake install-lib install libdir="${D}"/usr/$(get_libdir) prefix="${D}"/usr
-	dosbin eepromer/eeprom{,er}
-	rm -rf "${D}"/usr/include || die # part of linux-headers
-	dodoc CHANGES README
-	local d
-	for d in eeprom eepromer ; do
-		docinto ${d}
-		dodoc ${d}/README*
-	done
-
-	if use python ; then
-		cd py-smbus || die
-		docinto py-smbus
-		dodoc README*
-		distutils-r1_src_install
-	fi
-}
diff --git a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
index 142b885d3d95..5514e78e808e 100644
--- a/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
+++ b/sys-apps/i2c-tools/i2c-tools-4.1-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/software/utils/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ~ppc ~ppc64 ~sparc x86"
 IUSE="perl python static-libs"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/init-system-helpers/Manifest b/sys-apps/init-system-helpers/Manifest
index 0ed786ea7820..7cc293b4d9f7 100644
--- a/sys-apps/init-system-helpers/Manifest
+++ b/sys-apps/init-system-helpers/Manifest
@@ -1,4 +1,4 @@
 AUX revert-openrc-management.patch 798 BLAKE2B 1e04e2f9c361eb0c125e5b23d0b18c58198ad968fec5965f43e6a5e8b8201d29c7ad2c05431d7107d99acc75ab397cfd90121f7f0618f9bb440a8d6687039c20 SHA512 8d8cc8886b5d731b7538425e6be10b4fa8d0c8b8eb946a64e885a0f9dc19c02d596a803716a8a6d681fb9e408650993b9c81ef23d2d0ab53485d65b15863ace7
 DIST init-system-helpers_1.49.tar.xz 42660 BLAKE2B 548711283b04e3df13e9287154e2648b99ac80c2cdc71a428b4496220cd7c319f8f7afccb1e611c07b9d801837ef8799a3295a0490aa62812d47b728ba5ddba9 SHA512 bd612207e51e18a44f9c90e1e5b069ab39e06c776b8a0d6c9ecb367890d4a44ff02b3028418ac10a688782745331f39bb9299ba836f333b712e6fdd7ddc8da16
-EBUILD init-system-helpers-1.49-r1.ebuild 871 BLAKE2B 9aa4416cf2f852f12715312bc8c5005eee75121fef2c69d03ca76cc19fdbe48fef0158d2079881b1ecf63793187dac59be7cf92a3ae61f873641fb7fe8aa6b67 SHA512 b59afe98c4951c39d7a0afdd869e200fc74b2991a52f5509cd836fc45b26993c6bae411e6fa08352e6ab829b0cdf0c455dae9717c767ddb032d2a8502e2d9d6c
+EBUILD init-system-helpers-1.49-r1.ebuild 872 BLAKE2B 1401d9d4a4aa3e196618fa8ab0952ebc19054eb59ff9773bec1d4cbc6152252f7704f493fac58d182492784a931c4e74c7f5d80b7b1a5830d301d59f96af2031 SHA512 719a3c90e1e5abe4baef18f4ee0f1cce4b6f57a832612e48e567f86b0a9f68a94fbab84370e65237ff1fcca3e83d9eee6722209d115f9c03f09bd61c1b3102fb
 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33
diff --git a/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild b/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
index 789b8e31d734..ede540985543 100644
--- a/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
+++ b/sys-apps/init-system-helpers/init-system-helpers-1.49-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://http.debian.net/debian/pool/main/i/${PN}/${PN}_${PV}.tar.xz"
 
 LICENSE="BSD GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/install-xattr/Manifest b/sys-apps/install-xattr/Manifest
index e4f560685066..c651aa88e57f 100644
--- a/sys-apps/install-xattr/Manifest
+++ b/sys-apps/install-xattr/Manifest
@@ -1,8 +1,8 @@
 DIST install-xattr-0.5.tar.bz2 16136 BLAKE2B 8973584d4819b9f500dcfb76ed0eaddce725b78e72dfa73ccff52c745e6f041926f8f930e5c5035fa888402c6b530207546098864266268dee2c897404bf7c74 SHA512 0bbde3a548fc5062041b38f90ac09c402f3cb0aebf4f0c331552fc44d39dd3d5e4d73bca0811de36c53af8afa5d22e543a7c90107d272f2a1b97c819b244eb7c
 DIST install-xattr-0.7.tar.bz2 16200 BLAKE2B bdddd4610e5fbb6f6ccfcdfb37abacff00ada5ca5fa18a6a4ad254b623ebe6dc9d0a2c8931f919f8623ed8f64e9c09584d6beabffbf3c72088f80383b198a2d7 SHA512 1cb4a4e72a9c5820081e032bd0d681ef985a228ad9bb025d5eb31c7b57678348d772f270def803376f2d9d4f8e6ebcede9629ce65eef917b3e8a06d6f40eec44
 DIST install-xattr-0.8.tar.bz2 16359 BLAKE2B 25c483211ea6d01f46d9739fd3f1327e543e8b986a252d97e8b012ff6169a9b6430dc0ab7c184bf04c6665182c242eb37f7059d2d23cecececea723bde74cb56 SHA512 3af95a724d95286854767fe28679b024de8d257ce2d21addecbd40906e10bf48cfd4263609c6c2f436c6a807e91d24118110fda041091fadbefd848c892af778
-EBUILD install-xattr-0.5.ebuild 908 BLAKE2B 718c94e8b899fd333545b29f019b8399197dd22cf3bf1ef82de0cd620a11ab149050162d4082128f41926b81973b98113e942eb3bd2773efb89c15d30aa8455e SHA512 ce7dcf26c42ae21ead3f1e9df092149a321d528ee4484df3859f937897bb00c90e694965ac3a2f41a362f417e47cf1984f5a0337a388049b1f91735c061bcc5f
-EBUILD install-xattr-0.7.ebuild 1011 BLAKE2B a594ec3eadb5d7077d7205f6cbba45f82717a7fb5a292e5af42398b9a316e222ed5700a0b5ff7c6078badbbb313081c0b7120894de271eb01eead4cf9facdf77 SHA512 f619bf65db059c10b32de8423e845632f0133bd62ba4580172c83758024a44d6f8e9d9289fb1a8c2c93c5f50e7ea63932f8a50289a043e9750a0cf54927f5a4b
-EBUILD install-xattr-0.8.ebuild 1011 BLAKE2B a594ec3eadb5d7077d7205f6cbba45f82717a7fb5a292e5af42398b9a316e222ed5700a0b5ff7c6078badbbb313081c0b7120894de271eb01eead4cf9facdf77 SHA512 f619bf65db059c10b32de8423e845632f0133bd62ba4580172c83758024a44d6f8e9d9289fb1a8c2c93c5f50e7ea63932f8a50289a043e9750a0cf54927f5a4b
-EBUILD install-xattr-9999.ebuild 1011 BLAKE2B a594ec3eadb5d7077d7205f6cbba45f82717a7fb5a292e5af42398b9a316e222ed5700a0b5ff7c6078badbbb313081c0b7120894de271eb01eead4cf9facdf77 SHA512 f619bf65db059c10b32de8423e845632f0133bd62ba4580172c83758024a44d6f8e9d9289fb1a8c2c93c5f50e7ea63932f8a50289a043e9750a0cf54927f5a4b
+EBUILD install-xattr-0.5.ebuild 906 BLAKE2B f870cc035163fb8abb96513bc5f59d03d3e59c63d816ca014861767bc43166698216aaa9012a7687d5a6edfeef853ee72fd924c82d0e742fbc990bb76e32c790 SHA512 d90f6e3b66e3b1d4fed108716e9270902c8f46371abab676bfb8a7049298f29dc2da1d22b64fae06956757b5dc6636a42cf92a76bc1b2264edf47723589dbc69
+EBUILD install-xattr-0.7.ebuild 1007 BLAKE2B ad60a837a7388bb01f7c0e7af39ff536973143c9f75281952e45629345e11690d63cd1649032ce1f55448e6dbe56ba506ddb489175f1265cbf41fca55eeba589 SHA512 ce4545fee470b395c9d7b6df65f9bfdccff526e1de3a64976f45717713b6053c5bcf93fd9661642ac6ca294dcc49ba5d2a82e41b731f9faf93949964e2c57025
+EBUILD install-xattr-0.8.ebuild 1007 BLAKE2B ad60a837a7388bb01f7c0e7af39ff536973143c9f75281952e45629345e11690d63cd1649032ce1f55448e6dbe56ba506ddb489175f1265cbf41fca55eeba589 SHA512 ce4545fee470b395c9d7b6df65f9bfdccff526e1de3a64976f45717713b6053c5bcf93fd9661642ac6ca294dcc49ba5d2a82e41b731f9faf93949964e2c57025
+EBUILD install-xattr-9999.ebuild 1007 BLAKE2B ad60a837a7388bb01f7c0e7af39ff536973143c9f75281952e45629345e11690d63cd1649032ce1f55448e6dbe56ba506ddb489175f1265cbf41fca55eeba589 SHA512 ce4545fee470b395c9d7b6df65f9bfdccff526e1de3a64976f45717713b6053c5bcf93fd9661642ac6ca294dcc49ba5d2a82e41b731f9faf93949964e2c57025
 MISC metadata.xml 330 BLAKE2B c6c9d215cd38a95f824fac1761bc4e6048ac50688318fa33a94d6d97739e726efaff57e4e0814d16b5336cf4481498580d4e2743404a619cad0d81c052880b6f SHA512 6bca1bac9701b2dde509f25dd18dd819d769cda23669faf680800747a37369002eb3954606fc6541dec324473eb13a78bc0c8a97085436072ee076d85e7a2345
diff --git a/sys-apps/install-xattr/install-xattr-0.5.ebuild b/sys-apps/install-xattr/install-xattr-0.5.ebuild
index 75f8e73a7274..10ac21186e35 100644
--- a/sys-apps/install-xattr/install-xattr-0.5.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.5.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 	S=${WORKDIR}/${PN}
 fi
 
diff --git a/sys-apps/install-xattr/install-xattr-0.7.ebuild b/sys-apps/install-xattr/install-xattr-0.7.ebuild
index 484fbb669765..44b01b811bb3 100644
--- a/sys-apps/install-xattr/install-xattr-0.7.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S=${WORKDIR}/${PN}
 fi
 
diff --git a/sys-apps/install-xattr/install-xattr-0.8.ebuild b/sys-apps/install-xattr/install-xattr-0.8.ebuild
index 484fbb669765..44b01b811bb3 100644
--- a/sys-apps/install-xattr/install-xattr-0.8.ebuild
+++ b/sys-apps/install-xattr/install-xattr-0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S=${WORKDIR}/${PN}
 fi
 
diff --git a/sys-apps/install-xattr/install-xattr-9999.ebuild b/sys-apps/install-xattr/install-xattr-9999.ebuild
index 484fbb669765..44b01b811bb3 100644
--- a/sys-apps/install-xattr/install-xattr-9999.ebuild
+++ b/sys-apps/install-xattr/install-xattr-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/install-xattr/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	S=${WORKDIR}/${PN}
 fi
 
diff --git a/sys-apps/ipmicfg/Manifest b/sys-apps/ipmicfg/Manifest
index f952a83faba9..98767597fa09 100644
--- a/sys-apps/ipmicfg/Manifest
+++ b/sys-apps/ipmicfg/Manifest
@@ -1,3 +1,3 @@
-DIST IPMICFG_1.30.0_build.190710.zip 1886457 BLAKE2B 5a303ccedda2ffab8d599e68feb1e23faeba0cca7d2fdb224c29440a11a12114cdf536e3f9e5544c1f929fdf8aab0846db51ff2935b20b70b7c3cf7a0fa82bfc SHA512 bad76fd5bc07a9bafecbc02c9a0fc26310b4894c6c365f3c53f1a900244b634317bf59f43d8fa230af866ce6e7f537c7f902b38bb1d4ff5a8546de4fe94043f4
-EBUILD ipmicfg-1.30.0.190710.ebuild 1329 BLAKE2B 8ec41b98a6392ba47f17bb2feeb9bbd89625e58c0fb03959819233885302ba0cf60cd6648b21df0f44144d94747d1af979cf67c77e6f01e39b95e52ef285c7ff SHA512 9dd9da61b0f4a35e9ae22509dcce8ea581a478437c4d4d92ead540748528b2a40d24bd9eb1bea3f633168f20967314003a20cf1d28c40f7c7d85ba37d59f2618
+DIST IPMICFG_1.31.0_build.200205.zip 1972548 BLAKE2B e6d16907bad2c85618087f770621bf8335bbe38eb5b1a2466ee5b998ab13613aa96dd44e395a05e5b183597d4e5d5f775685bc810cd7d904f57eccecc8474ba1 SHA512 c46414b3504fe357f3b7df0f0c5f8cd4ada5ffa0541a1e49f282a187b8257d6c278cda099cce034eb9a25ad47bfd531255ec88ef6e2495a80f281888374441eb
+EBUILD ipmicfg-1.31.0.200205.ebuild 957 BLAKE2B e8e2d344e033730a1ab3b9baed2286af44d786df695f05651e96d0a3c92cbc96005575cf25cce9ba81f8dba9719df53bccb0aced7012651906e13df5afce7bb5 SHA512 d668cbb32b804a2ba0ae80e747802a063b823c9d1b594a074c18a3a28d57b3a43a6f0633bd8eb7cf1f7c493a649a870bf248dcceaf68b2c5f6ae56e90f66a865
 MISC metadata.xml 250 BLAKE2B d57634b040c498296655940e3ee580c8580075a4190e2600113cee5548ff44a2025568380f3d5d9f3ca0fcd1ea5d41c9871395ffbcf4bd32d8df6a494852a885 SHA512 c225bdf339347a1768b255d905f3831904cdc375f3d4e90e41c68645b8bcfe2dfdf8e6aa4c67063103f459808a387c8edd9b35b073b8be175f7a3bd490fe3dca
diff --git a/sys-apps/ipmicfg/ipmicfg-1.30.0.190710.ebuild b/sys-apps/ipmicfg/ipmicfg-1.31.0.200205.ebuild
index c8ffc2689fba..6c3e2af0a83a 100644
--- a/sys-apps/ipmicfg/ipmicfg-1.30.0.190710.ebuild
+++ b/sys-apps/ipmicfg/ipmicfg-1.31.0.200205.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
@@ -15,16 +15,13 @@ KEYWORDS="-* ~amd64 ~x86"
 LICENSE="supermicro"
 SLOT="0"
 
-DEPEND="app-arch/unzip"
+BDEPEND="app-arch/unzip"
 
 RESTRICT="bindist fetch mirror"
 
 S="${WORKDIR}/${MY_PN}_${MY_PV}_build.${MY_DATE}"
 
-QA_PREBUILT="
-	opt/ipmicfg/IPMICFG-Linux.x86
-	opt/ipmicfg/IPMICFG-Linux.x86_64
-"
+QA_PREBUILT="usr/bin/ipmicfg"
 
 pkg_nofetch() {
 	elog "Please download ${A} from"
@@ -33,21 +30,7 @@ pkg_nofetch() {
 }
 
 src_install() {
-	# Choose ARCH
-	local my_arch_binary="$(usex amd64 'x86_64' 'x86')"
-	local my_arch_folder="$(usex amd64 '64bit' '32bit')"
-
-	# Install files
-	insinto /opt/ipmicfg
-	doins Linux/"${my_arch_folder}"/*.dat
-
-	# Install binary
-	exeinto /opt/ipmicfg
-	doexe Linux/"${my_arch_folder}"/IPMICFG-Linux."${my_arch_binary}"
-
-	# Install symlink
-	dodir /opt/bin
-	dosym ../ipmicfg/IPMICFG-Linux."${my_arch_binary}" /opt/bin/ipmicfg
+	newbin Linux/$(usex amd64 '64bit' '32bit')/IPMICFG-Linux.x86$(usex amd64 '_64' '') ipmicfg
 
 	# Install docs
 	local DOCS=(
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index d7da095bef89..374c8ff119b9 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -9,9 +9,11 @@ DIST iproute2-4.19.0.tar.xz 720408 BLAKE2B 2d0ece5dd8f1beb7912d025c269a9edd2ecd8
 DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1
 DIST iproute2-5.4.0.tar.xz 741328 BLAKE2B 8c7b74aa64526180e793165eb3d0f1ee07d4589fa982aa91e4e0775595c096d73677e85bb7f073cbe14e6de6b166d31efba94554f8c7df3320b168341818fcba SHA512 26d1230e10d9ba4466edd3fe95cb6f595df691eeb27b87ae845ceb9da09fe11c2e0daa8d67187121320413f9ee7131fd426182055eb285be7c4de558d9e47051
 DIST iproute2-5.5.0.tar.xz 747756 BLAKE2B b9cf368bd0a082c1d613b8089ed425d50525d886a56b2353439ba3fa5c7fedcb40deb090b78c23e14d61cbffebb5ad7de13c08afb2b18841000a3b8e08861b63 SHA512 a59fb6d620206aa17a4ff7d4510b99322e39b6cf34a00953a7d4cd4d62ca85de16d2e28e33cafa7b026edd4f63c81f3f337954aafe963b964ca0cd2d5c54ac78
-EBUILD iproute2-4.19.0-r1.ebuild 4373 BLAKE2B 97dc91ea9fff1b4d8c5ee5db380c48fa0b010e04d0cdf4c28c7042168110f98018d6c4aa88969c57f37b3bebed283a960248f5217a3ffe99c71af71805988e13 SHA512 bf6ebc57b247ae907b29aaae2a2710fec655eee9b6618578f019f1b3775af7a584781f77c90b6d80cfe7f16112ef3808615271834f6094c20621d673ca2f108d
-EBUILD iproute2-5.2.0-r1.ebuild 4481 BLAKE2B 1465a17b5245e71e9f9b457d935e3bf8d60d63dd9a67d85af8b9024323465b0be8e22f1a813e3e4f7f117e6f7f98096579d43f784d2c7617786ba5b079333d9b SHA512 6128cb7db0ecacaedf3d4cbb09d2f453978dafa8bc51ca6b75834bd50e72f23a6969e4097cd49c080996f0b8819e0deb9a3324077e77545570dd47722a4d63bb
-EBUILD iproute2-5.4.0.ebuild 4436 BLAKE2B 020def1d432958b593d7086707c8ab70b517731cbda5ecea7d276cca68168831b2f7d1f9e10426d790d30a0f7c4631a7b56f9e0b8e6b3f994576be6b01139607 SHA512 b095e0ae75f06ac4cbe3af525d9756d6dfc5c54b1b662bdd23803ade0d9754702af616a646b41fb92cd5f9f46c1149eac56706d889204b7181fdb64173b5506c
-EBUILD iproute2-5.5.0.ebuild 4436 BLAKE2B 94c362ae57a596e69c689332a249ea4afea060cbed87ce8a55cccbee21486112b150716762c462f65a025c41607c151d9123176c631dd402efdd528ed3023865 SHA512 bcf437aca85d661ad08061d533dc934e14c802bb8c498ba88700e016935c1221f379bd055c954cc2dbe1427ae86a3d638ca43fc8d8731ae0df5426689cd06e0e
-EBUILD iproute2-9999.ebuild 4436 BLAKE2B 020def1d432958b593d7086707c8ab70b517731cbda5ecea7d276cca68168831b2f7d1f9e10426d790d30a0f7c4631a7b56f9e0b8e6b3f994576be6b01139607 SHA512 b095e0ae75f06ac4cbe3af525d9756d6dfc5c54b1b662bdd23803ade0d9754702af616a646b41fb92cd5f9f46c1149eac56706d889204b7181fdb64173b5506c
+DIST iproute2-5.6.0.tar.xz 754812 BLAKE2B 5232c206052dcbc489284cb5a4169bf2555f9bdf7c122e23be07f7a5a18e0c828f5b4f3bb4afb6d33919919d211c67a20626ad10556e4ae41f90619d6eed445f SHA512 e52c6c8b676ab79401ae815fe3f80268c1edb490c0a00826e0f7181a816e9bf6549df9e77a40b0d56855db8ad312179b3a40002a2dd6f66c807039cff0cdfb6c
+EBUILD iproute2-4.19.0-r1.ebuild 4371 BLAKE2B 027b69ee48f88af98e6bed243cc1f0a0af81ab477b02c16f36e7864870cb6d71d01abd9242f809fa5f133653f3b1f481cfcfa3ccc7fb42f854e503f3d6d2c5c0 SHA512 32e7063669995713a6c0263070bdd2ecc38306f65e1948dedff0c151d1e73cd9bf3406de235f4a3e30ae43748ac28f65a435f59efb2369a8f3ae90f1d0bdc498
+EBUILD iproute2-5.2.0-r1.ebuild 4479 BLAKE2B 4e0f44d1c08d417c30978fe2db9599d14bb74562d7fda33b0bc04f1282458c11f4611029a64b23c09c2c92d7d627b1c22a0c11f2ea7d0be3b24424c3d192b35b SHA512 626f8d61476b451440509d429fe986393f9c9ce735336335a7ff7a9eb9f6f5eba965962615212d224d6174cb4b03779114b7fb80aeace3fe954fa56f47bc8706
+EBUILD iproute2-5.4.0.ebuild 4432 BLAKE2B 7b3509b2afeedcaae170f1743b98524e981bb672b561015a695cca4fa6b5cb3a6d5216a0bfb682b0a33549612e2b8104c7358d91eac2359b6a82a3b7337bb535 SHA512 9ff145e53f7fa7bfb49066d9ba7bf686c3954bcc023e3f6af9e8b06258d7546a3895024ddf79d3d64b75417ab44e7764a4005773a3a8dd05451e8bfa64c6ea32
+EBUILD iproute2-5.5.0.ebuild 4432 BLAKE2B 7b3509b2afeedcaae170f1743b98524e981bb672b561015a695cca4fa6b5cb3a6d5216a0bfb682b0a33549612e2b8104c7358d91eac2359b6a82a3b7337bb535 SHA512 9ff145e53f7fa7bfb49066d9ba7bf686c3954bcc023e3f6af9e8b06258d7546a3895024ddf79d3d64b75417ab44e7764a4005773a3a8dd05451e8bfa64c6ea32
+EBUILD iproute2-5.6.0.ebuild 4432 BLAKE2B 7b3509b2afeedcaae170f1743b98524e981bb672b561015a695cca4fa6b5cb3a6d5216a0bfb682b0a33549612e2b8104c7358d91eac2359b6a82a3b7337bb535 SHA512 9ff145e53f7fa7bfb49066d9ba7bf686c3954bcc023e3f6af9e8b06258d7546a3895024ddf79d3d64b75417ab44e7764a4005773a3a8dd05451e8bfa64c6ea32
+EBUILD iproute2-9999.ebuild 4432 BLAKE2B 7b3509b2afeedcaae170f1743b98524e981bb672b561015a695cca4fa6b5cb3a6d5216a0bfb682b0a33549612e2b8104c7358d91eac2359b6a82a3b7337bb535 SHA512 9ff145e53f7fa7bfb49066d9ba7bf686c3954bcc023e3f6af9e8b06258d7546a3895024ddf79d3d64b75417ab44e7764a4005773a3a8dd05451e8bfa64c6ea32
 MISC metadata.xml 672 BLAKE2B d27b6af84b177e8b12f64470dbac0e8fdcf45091681ced6d5ebd02414849c221e608a6a4bb8ce6aae305475e086cf140836b943a9e5380f10c368ac359397a98 SHA512 d71c5077fcf769520048a46b0fdd3563b974b65afdc68eb73fc0816d2c87dd9a73bca72e25d7e8f3c9f2ceb23c473bb92a1a92d8d5f43a7e15f965669226f0a2
diff --git a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
index 6e21a2e8bf42..5e8765599f7d 100644
--- a/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-4.19.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
index 281a05dd99bf..b5a9b12c68b6 100644
--- a/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-5.2.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-5.4.0.ebuild b/sys-apps/iproute2/iproute2-5.4.0.ebuild
index 9d1acf39062b..9e2e1f7f4e54 100644
--- a/sys-apps/iproute2/iproute2-5.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.4.0.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
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-5.5.0.ebuild b/sys-apps/iproute2/iproute2-5.5.0.ebuild
index e40c1b857cee..9e2e1f7f4e54 100644
--- a/sys-apps/iproute2/iproute2-5.5.0.ebuild
+++ b/sys-apps/iproute2/iproute2-5.5.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/iproute2/iproute2-5.6.0.ebuild b/sys-apps/iproute2/iproute2-5.6.0.ebuild
new file mode 100644
index 000000000000..9e2e1f7f4e54
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-5.6.0.ebuild
@@ -0,0 +1,162 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	dev-libs/libbsd
+	!minimal? ( net-libs/libmnl )
+	caps? ( sys-libs/libcap )
+	elf? ( virtual/libelf )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	berkdb? ( sys-libs/db:= )
+	atm? ( net-dialup/linux-atm )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="
+	${RDEPEND}
+	>=sys-kernel/linux-headers-3.16
+"
+BDEPEND="
+	app-arch/xz-utils
+	>=sys-devel/bison-2.4
+	sys-devel/flex
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
+	"${FILESDIR}"/${PN}-5.1.0-portability.patch
+)
+
+src_prepare() {
+	if ! use ipv6 ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
+		)
+	fi
+
+	default
+
+	# echo -n is not POSIX compliant
+	sed 's@echo -n@printf@' -i configure || die
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Use /run instead of /var/run.
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		include/namespace.h \
+		man/man8/ip-netns.8 || die
+
+	# build against system headers
+	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	if use minimal ; then
+		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
+	fi
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'int main(){return 0;}' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	# run "configure" script first which will create "config.mk"...
+	econf
+
+	# ...now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_CAP      := $(usex caps y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex elf y n)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR="${EPREFIX}"/$(get_libdir) \
+		SBINDIR="${EPREFIX}"/sbin \
+		CONFDIR="${EPREFIX}"/etc/iproute2 \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		ARPDDIR="${EPREFIX}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		keepdir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+	fi
+}
diff --git a/sys-apps/iproute2/iproute2-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index 9d1acf39062b..9e2e1f7f4e54 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.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
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index aedfed987eb8..3ea0696f20f4 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -3,8 +3,8 @@ AUX kbd-2.2.0-cflags.patch 990 BLAKE2B 2512eccfd4e2eea843e176951f6e6fa1f74d2fd28
 AUX kbd-2.2.0-kbdfile-dont_stop_on_first_error.patch 982 BLAKE2B 6a52de79d927cb67420a257d5becbe50027c838878e1baecf860e30feb59a1913101e1f650974c5bca08f579c1dd4312cc60f77c12a6c860281b3fcb0fdbf072 SHA512 caeef9531f8bd926c655a7002b4b96b9d49aa94b7d7e063347d920bc869751059fbcf4578338bbb9e910f936b62485bbe51713d4956577dcd6828ad075b4f6ed
 DIST kbd-2.0.4.tar.xz 1031864 BLAKE2B 10c2bded89befda1f1d7ab199796e082a4e3b2333cf29a2abbbe843191dce41a7289d5bc3b7e55d8b25c7144ae4b4977e4321b38896917d0083af8ddd4924a3e SHA512 5e264b3695b0af0bc85e0a4fa2c43e13648d8ea82102f3b051c28da2abfc52977577c470bce48f30cec9b0d215297e48c9b05e00561c990e3770fb68f6544e0f
 DIST kbd-2.2.0.tar.xz 1115220 BLAKE2B d4218f3a8f9212d16e8a14011f0e136f6aebd18f13f8d5da2bd63296e0aa857fc5e7fe927200345fca3b723bc879f87511b02c152824a73ae5743cc8175991e6 SHA512 5f407c20739487e423e8390e429d30838a1a69a0a50db083803ce56da919e25ce480b63fd1bcfac9eb362095f17e575783b09eaa55e26b442bfa3ed838e04f13
-EBUILD kbd-2.0.4-r1.ebuild 1540 BLAKE2B 9e41eef250e5ffd8889c06bcb20d8e1c70c34bb4926661a590fadbdf7ee4de88183260655d3af27e517ffaaed94f156fc1ff3567240231c976d0f0d3e95d7f30 SHA512 0944c535ff19384acb55f70f8a6ef56dca4e49438466215ac17024228708ec0f6e9dc950dfa236889dc83c2c750e40de73a011a63d2f9922dc18bb3823155955
-EBUILD kbd-2.0.4.ebuild 1375 BLAKE2B 9593c2568a2f263989304f2a142f56bd65e6d4ccdd27a2a6b93c09abc241cdf0666d3b1794a93ba24733e75f8fd602cae8f96d801301f5e166712414f187300b SHA512 65eb1b19bf9dfe12338fac2a61e2973f8de251108d264b290649c04c30988e58d979a19cdb1620f891af092696c932291e64586c1c68972def04b94bfecf1681
-EBUILD kbd-2.2.0-r2.ebuild 1609 BLAKE2B c59f2bbdb279c7bea12c76e49f0ba814028a11f53810b254ec4c5984dc1109705c229ac72e3e9273d9437ddd1f99885aaf9bad66e44fa09d727db55ea48a5092 SHA512 031ef06c5c216a8300c482b168f65490e9204477a4a696f60d8909cafc796fe908bd718bb4a0d64b4f491be26cce3544f8a522d70089ae63b7e56936d1b20225
-EBUILD kbd-9999.ebuild 1524 BLAKE2B c3b992ed95e88346f0bc09fe3dcc31136e010b81d15beca23d68edd1a10a487a6189a5ca0f74a810aed7a89a208eddab5253763ac8cb797c7d6d045df7c68311 SHA512 04456ab7511de30f511e61cd491a101b17342f5f68527510cc89bdc57e55017841c8f8ddca9179b57ff940eaed9d26091f8d87a067c060400d79f165a5a04e7d
+EBUILD kbd-2.0.4-r1.ebuild 1536 BLAKE2B 3bf3fb6e985557b4ac62a75fc64d9e9608716e5914ff151ab11af68bf16f499e06216bb26da494b39f93d032d57fc8b9a74680196659d76d48b8ff5460f26d7f SHA512 a0e5b222f7321d5094a3dc67737b09d6ac1e3881029bbc402feeb58a4e269d3dfb103cff0fddd5c962b0c0cbe8345e986ead373b1592b1a1a82c7e2520f34257
+EBUILD kbd-2.0.4.ebuild 1373 BLAKE2B 74760455c618f9bf86b7e6c07fbea37e051cfe0b7a29de01e765e74846d13ff4464d65bffba0ac2ead4e8955c69927d7c911456dea88d85163b5162cd692d525 SHA512 33e145a414d23aaaf86b17f6b08c8c8a34d3f2b910e8f966731f95ea5f0bba99a8f942918b21a5f201491cd230b84a0a2bd3a7dddd5bafe973cbe108815eb4e2
+EBUILD kbd-2.2.0-r2.ebuild 1605 BLAKE2B 33879b720bddc4db56de69d29f1804fd753e495b73494692fccd51713ea28223464b59345c1fa1c73cdcaa9dcbb04faae7d5bc8b19807a380467caf0a10a5d7d SHA512 f1646d8ed11228505018f5b768bb5e03193b617de589f22b7f75761a682422523b3708956601ba328a15257668a14db80f2f633b5f3f6b2319418a75885cda4f
+EBUILD kbd-9999.ebuild 1520 BLAKE2B c6a8e6d3af2c8405246c1e78c30e0038c8c1eb577e784f21013cff3a05d95cb933f03de14b1a00185a5d5ba67c45959d9309535cb89dabb49e0a2441839f64dc SHA512 b529efa980ea07b9a72db12bc564dfa9eb2e5eaa02b18cdbfb649148cda7054923e39a5125b6f0786c38527067aa25dd633658d6bbf370755675747ebf53bf0a
 MISC metadata.xml 321 BLAKE2B 608f4a02a31f6c1590d7c237516a00cefa06f641febb7b479b7b0a276e9b59c0b7a88bbc6f4bdaca942ae83b85ebad6c6e84097916315eb985ebc2d98a70b171 SHA512 f00b80d88f4647f210c28f95f8dc81fc8ff3bcbe74e6429e9d5dd92e57588297aafee968b8a3cad2db3b2010fd9ebc400975ca59ffcd62370afa799745dda641
diff --git a/sys-apps/kbd/kbd-2.0.4-r1.ebuild b/sys-apps/kbd/kbd-2.0.4-r1.ebuild
index 58d6b6dfff53..aeabdfc9bae0 100644
--- a/sys-apps/kbd/kbd-2.0.4-r1.ebuild
+++ b/sys-apps/kbd/kbd-2.0.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Keyboard and console utilities"
diff --git a/sys-apps/kbd/kbd-2.0.4.ebuild b/sys-apps/kbd/kbd-2.0.4.ebuild
index a6ae0a3ff354..62a8f32b957d 100644
--- a/sys-apps/kbd/kbd-2.0.4.ebuild
+++ b/sys-apps/kbd/kbd-2.0.4.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 inherit eutils ${SCM}
diff --git a/sys-apps/kbd/kbd-2.2.0-r2.ebuild b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
index 19c32fde0fff..465bc5b881e6 100644
--- a/sys-apps/kbd/kbd-2.2.0-r2.ebuild
+++ b/sys-apps/kbd/kbd-2.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Keyboard and console utilities"
diff --git a/sys-apps/kbd/kbd-9999.ebuild b/sys-apps/kbd/kbd-9999.ebuild
index 85d244167140..faad110fb541 100644
--- a/sys-apps/kbd/kbd-9999.ebuild
+++ b/sys-apps/kbd/kbd-9999.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
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 DESCRIPTION="Keyboard and console utilities"
diff --git a/sys-apps/keyutils/Manifest b/sys-apps/keyutils/Manifest
index 44b9179e52bd..cb68dc6b5601 100644
--- a/sys-apps/keyutils/Manifest
+++ b/sys-apps/keyutils/Manifest
@@ -4,5 +4,5 @@ AUX keyutils-1.6-endian-check-1.patch 1152 BLAKE2B 7614e1b72ae012f1d3126a2edfd26
 AUX keyutils-1.6-makefile-fixup.patch 756 BLAKE2B 8e4e187859933ca4359adff5307bba833cae1a5e4b7c6975fc88e6848ba76ee30e0c59a42ee2110b9874da5db8e60880265f93798abe55f6a12e71346a6b01de SHA512 4becdbc7b1a68b3e6e8e32b2d08005e435f838d02a3406757216717ec82712f181ff0a32397c995b36264469e29cf39fe9311a762e62427f4507f94418c9400b
 AUX keyutils-1.6.1-silence-rpm-check.patch 594 BLAKE2B b2c44db4cd57f07eb2450bcd8ff4c259ff9ef8ce775f350765cc20bd9b990a2eadedd60745e1c3c31e682b12af0d945b9422f8c2a989f72ccdc56b67b60f8244 SHA512 cd6b0472475089e522c796a33eb1dffe8a6fcf4e3a515d4e379e46b4a82c8b92216ec00fe9a6f4c88e318f6e397aca625040537eed83e0ce30278b9e810fedc9
 DIST keyutils-1.6.1.tar.gz 119065 BLAKE2B b0c65d8a1ee8cab1ac712820a8bf073777eacd558ddd007fa0fd50467d1de86cff238c1c0e6b33b5ff4da7dfd7e2fd673ce5706c39780e1a4fbee7d9653f3bc9 SHA512 a717d9bc6142edefc02da9e92242db352e0bc835483c303629c236e6d9cc51fb495b03fdf9e0e9f0864d7e755c92b7a67f018e806a5de1944673e60e317134a2
-EBUILD keyutils-1.6.1.ebuild 3879 BLAKE2B 2fc23066c8a7f14b95943814ad2fc1a207f95787a074dded0543e1e62ae899e38b8e223b39d91aca2a766aa56f67236518caaf8f0e57d5a9f88aca6af5639d18 SHA512 53c025fd671440fdc2deb2794e2fc4624b7da3a021840035abb04560647a84eef6191a20e870d6e9f41c5ecfb19cd94d5a30d08bfe27971c2316ee488856d877
+EBUILD keyutils-1.6.1.ebuild 3877 BLAKE2B fcc53933c2643542b84762596f546ec58601cf750515c0d43b24b511e87ba8fc84a64e3b72e991fa8303d32386a71604f5045cc109f3a022e2d29f8732c0f1d2 SHA512 85ed91477fb30701c2bbac9531736510bb5743717f3223c9796adc20d0a176eaf926754d0de251d2b6ed55220057f0e58bdd5fe9683c1cf4cee512d4a427cab9
 MISC metadata.xml 424 BLAKE2B f4eb452bb90bf6b62f39d726bae137111c6fca619076888bb475bd2fb042e23db8f5d94240901d36a0c2f15a5774728429e2db2689dbad9ef4bb6d54b0a19b1f SHA512 211515865fbe17798b072bde0c699b67ec10e0716bad11224a3f1e00a729feea67b015cec4e8d870fa708179884176ee0799aee6d237cb4f2798f54a28c8042e
diff --git a/sys-apps/keyutils/keyutils-1.6.1.ebuild b/sys-apps/keyutils/keyutils-1.6.1.ebuild
index 408c30fa7216..75dea7f0b5dc 100644
--- a/sys-apps/keyutils/keyutils-1.6.1.ebuild
+++ b/sys-apps/keyutils/keyutils-1.6.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/s
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0/1.9"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static static-libs test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index f9857a9c1805..cd442be5f1ba 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,10 +1,8 @@
 AUX kmod-26-libressl.patch 4014 BLAKE2B db7a2ce3206210cd0358d136c8d0568dae077399075164320ff608ca6ba5f1bca16d206ca975d8f5f9977ec80fcfed5b81146f9649d61e8e88f5f8589368ab1e SHA512 b5d26fda11398d4877821cbe8bd36967bec095d6e6c2489ec8aa4ef968795f0e238a74e2a9c4db8435fc176dc046920a365771a387a25cb1d0ea763210a92483
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
-DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
 DIST kmod-26.tar.xz 552032 BLAKE2B 3e596d06b48599bf4919346475a036b058fb18a7b19d39953e24fa943b95fdbe34a29a5062f6b4fe3510e667ae873d3b9ae03b72350fa85ddbb40ca6a7730b34 SHA512 3ca276c6fc13c2dd2220ec528b8dc4ab4edee5d2b22e16b6f945c552e51f74342c01c33a53740e6af8c893d42bd4d6f629cd8fa6e15ef8bd8da30cb003ef0865
 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
-EBUILD kmod-25.ebuild 4915 BLAKE2B 3b833bea7471c9b0c531b33164091214b24da4aa3045b66ac9067d35b8ab67503565f147e6104fa3c10e270e40e583b98091c470d40a858aef1e48b63306064e SHA512 d6495c1f1a1315b4ba7b45ba667860e70024a9dadfdff39d36793e2bf8bb58b2aef41f6937537e3ac84aed123aaa8f0a90b841de3d7343f270a1f459fed8ec70
-EBUILD kmod-26-r3.ebuild 5092 BLAKE2B 42cce75d72692d8dfc5ea4543486edbe7d760aaaaa9589ec16a41c18753f6bba588e0edd0aa64b77cfaced3138b88c1d09e0b25e0c230069cc0fd80100c9f418 SHA512 daa95f1e52df65a2da90cc1d816420825c2588685f466c9d204855ff39f3a9e18d6b523c344d61d7bbe5ec105f41e3658d4f1bf5bb52623f17979ed613d85aa8
-EBUILD kmod-27.ebuild 5150 BLAKE2B 880134642d59e4640e21e83a15babc4c09200bd53afdaef9c96f5fb620d37b612f8edffd5bf2f416fb342a206f215fda0a7ebb02aa2796905aa4b202439980f2 SHA512 2a77e044815e00b615616609f26912c1a910bedade0bc07d43631112bfa4c473afcc54564f67d21b625eeeab34840eb5a49b3652632d1ae7e103d19085621f28
-EBUILD kmod-9999.ebuild 5150 BLAKE2B 880134642d59e4640e21e83a15babc4c09200bd53afdaef9c96f5fb620d37b612f8edffd5bf2f416fb342a206f215fda0a7ebb02aa2796905aa4b202439980f2 SHA512 2a77e044815e00b615616609f26912c1a910bedade0bc07d43631112bfa4c473afcc54564f67d21b625eeeab34840eb5a49b3652632d1ae7e103d19085621f28
+EBUILD kmod-26-r5.ebuild 5109 BLAKE2B a80a2fd826088827da1fc731052644e761093d166c9a40c2dbdb188779b20491fbaf35599c9af3f3d47e898fd3883e5eb570ef7d5f3f4d85492fe9e1f2d426cc SHA512 cfc37c4255599870a80564a9532c14fc62b675c1ee30ccda3db7beffa4788d5e23c31047de0c3ee82343ee85aeadf753fc4b6628a407ad021f0bea05820753df
+EBUILD kmod-27-r1.ebuild 5165 BLAKE2B 0a3e691b6869c2cc05cddb19d1e3aa6dbfb6b7b0341e56d2679cab2905484978d3e8cc088354c00b339f22f13af98af645bbf390657119d2617a34deaa69fc71 SHA512 2e6e14eb5a4442e2509a5d63c9cb16a65687bae5f0e6189597358436cc5e12c3d9f6e70885d1f544a71ace56f9ad2231e61e116358e9f5063772adbdfb755f8d
+EBUILD kmod-9999.ebuild 5165 BLAKE2B 0a3e691b6869c2cc05cddb19d1e3aa6dbfb6b7b0341e56d2679cab2905484978d3e8cc088354c00b339f22f13af98af645bbf390657119d2617a34deaa69fc71 SHA512 2e6e14eb5a4442e2509a5d63c9cb16a65687bae5f0e6189597358436cc5e12c3d9f6e70885d1f544a71ace56f9ad2231e61e116358e9f5063772adbdfb755f8d
 MISC metadata.xml 612 BLAKE2B 9459d066baed069ea60ef5fb72dd5a63a9980f041573aa24d67995a69539b468c31be12c96cc2dc396183c8b98064f8d30dbcc7cca346318c1f2356cb3037879 SHA512 4cce069924c603b69f08c37d83379af6889678106df5d4aa62d758138973277ab6b79ed021939bd8cfafefd27173404b7c155ba8ffa89efb9bebf458327be36f
diff --git a/sys-apps/kmod/kmod-25.ebuild b/sys-apps/kmod/kmod-25.ebuild
deleted file mode 100644
index ca101dc3423d..000000000000
--- a/sys-apps/kmod/kmod-25.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit bash-completion-r1 ltprune multilib python-r1
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-	inherit libtool
-fi
-
-DESCRIPTION="library and tools for managing linux kernel modules"
-HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug doc lzma python static-libs +tools zlib"
-
-# Upstream does not support running the test suite with custom configure flags.
-# I was also told that the test suite is intended for kmod developers.
-# So we have to restrict it.
-# See bug #408915.
-RESTRICT="test"
-
-# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
-RDEPEND="!sys-apps/module-init-tools
-	!sys-apps/modutils
-	!<sys-apps/openrc-0.13.8
-	!<sys-apps/systemd-216-r3
-	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
-	python? ( ${PYTHON_DEPS} )
-	zlib? ( >=sys-libs/zlib-1.2.6 )" #427130
-DEPEND="${RDEPEND}
-	doc? ( dev-util/gtk-doc )
-	lzma? ( virtual/pkgconfig )
-	python? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		virtual/pkgconfig
-		)
-	zlib? ( virtual/pkgconfig )"
-if [[ ${PV} == 9999* ]]; then
-	DEPEND="${DEPEND}
-		dev-libs/libxslt"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS="NEWS README TODO"
-
-src_prepare() {
-	default
-
-	if [ ! -e configure ]; then
-		if use doc; then
-			gtkdocize --copy --docdir libkmod/docs || die
-		else
-			touch libkmod/docs/gtk-doc.make
-		fi
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	# Restore possibility of running --enable-static wrt #472608
-	sed -i \
-		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
-		$(use_enable debug)
-		$(use_enable doc gtk-doc)
-		$(use_enable static-libs static)
-		$(use_enable tools)
-		$(use_with lzma xz)
-		$(use_with zlib)
-	)
-
-	local ECONF_SOURCE="${S}"
-
-	kmod_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		run_in_build_dir econf "${myeconfargs[@]}" "$@"
-	}
-
-	BUILD_DIR="${WORKDIR}/build"
-	kmod_configure --disable-python
-
-	if use python; then
-		python_foreach_impl kmod_configure --enable-python
-	fi
-}
-
-src_compile() {
-	emake -C "${BUILD_DIR}"
-
-	if use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_compile() {
-			emake -C "${BUILD_DIR}" -f Makefile -f - python \
-				VPATH="${native_builddir}:${S}" \
-				native_builddir="${native_builddir}" \
-				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
-				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
-		}
-
-		python_foreach_impl python_compile
-	fi
-}
-
-src_install() {
-	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
-	einstalldocs
-
-	if use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_install() {
-			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
-				VPATH="${native_builddir}:${S}" \
-				install-pkgpyexecLTLIBRARIES \
-				install-dist_pkgpyexecPYTHON
-		}
-
-		python_foreach_impl python_install
-	fi
-
-	prune_libtool_files --modules
-
-	if use tools; then
-		local bincmd sbincmd
-		for sbincmd in depmod insmod lsmod modinfo modprobe rmmod; do
-			dosym ../bin/kmod /sbin/${sbincmd}
-		done
-
-		# These are also usable as normal user
-		for bincmd in lsmod modinfo; do
-			dosym kmod /bin/${bincmd}
-		done
-	fi
-
-	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
-	softdep uhci_hcd pre: ehci_hcd
-	softdep ohci_hcd pre: ehci_hcd
-	EOF
-
-	insinto /lib/modprobe.d
-	doins "${T}"/usb-load-ehci-first.conf #260139
-
-	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
-}
-
-pkg_postinst() {
-	if [[ -L ${EROOT%/}/etc/runlevels/boot/static-nodes ]]; then
-		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${EROOT%/}"/etc/runlevels/boot/static-nodes
-	fi
-
-	# Add kmod to the runlevel automatically if this is the first install of this package.
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${EROOT%/}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${EROOT%/}"/etc/runlevels/sysinit
-		fi
-		if [[ -x ${EROOT%/}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${EROOT%/}"/etc/runlevels/sysinit/kmod-static-nodes
-		fi
-	fi
-
-	if [[ -e ${EROOT%/}/etc/runlevels/sysinit ]]; then
-		if [[ ! -e ${EROOT%/}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
-			ewarn
-			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
-			ewarn "kernel modules to have required static nodes!"
-			ewarn "Run this command:"
-			ewarn "\trc-update add kmod-static-nodes sysinit"
-		fi
-	fi
-}
diff --git a/sys-apps/kmod/kmod-26-r3.ebuild b/sys-apps/kmod/kmod-26-r5.ebuild
index 11caee768c34..06707d359d08 100644
--- a/sys-apps/kmod/kmod-26-r3.ebuild
+++ b/sys-apps/kmod/kmod-26-r5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 	inherit libtool
 fi
 
@@ -142,6 +142,7 @@ src_install() {
 				VPATH="${native_builddir}:${S}" \
 				install-pkgpyexecLTLIBRARIES \
 				install-dist_pkgpyexecPYTHON
+			python_optimize
 		}
 
 		python_foreach_impl python_install
diff --git a/sys-apps/kmod/kmod-27.ebuild b/sys-apps/kmod/kmod-27-r1.ebuild
index e0a5eee807df..c9e60cdc33f1 100644
--- a/sys-apps/kmod/kmod-27.ebuild
+++ b/sys-apps/kmod/kmod-27-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	#inherit libtool
 fi
 
@@ -144,6 +144,7 @@ src_install() {
 				VPATH="${native_builddir}:${S}" \
 				install-pkgpyexecLTLIBRARIES \
 				install-dist_pkgpyexecPYTHON
+			python_optimize
 		}
 
 		python_foreach_impl python_install
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index e0a5eee807df..c9e60cdc33f1 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	#inherit libtool
 fi
 
@@ -144,6 +144,7 @@ src_install() {
 				VPATH="${native_builddir}:${S}" \
 				install-pkgpyexecLTLIBRARIES \
 				install-dist_pkgpyexecPYTHON
+			python_optimize
 		}
 
 		python_foreach_impl python_install
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index da7b22bdbd10..f78f372fdb8b 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,13 +1,9 @@
 AUX less.envd 47 BLAKE2B 4ebc9242c96918c6942b05f67a9be541c6c535c23072e89e36c376e690cb7df9528e1734514092a6afdd3d4f47db45c6186a8cce5d9eb18ca7c73a01800f35fc SHA512 261b25887b08b3255e412b36130d014fc37ffc7de75dce3b5ba2521d94a1b0be4c584808b9698c30a8dafea70c62fae2cd0642d0983f96cdb418c3c501433674
 AUX lesspipe.sh 8044 BLAKE2B 9ea7f314c852dee57f9745ee04f4d0779c2e22a138ee9ef479199cc5838cc5edfb08a1a1408ce12f1cf668e4b563abba24fa4ea2ea4abaa1c85a2d3cc3ed608a SHA512 e8b406127f3af3a4c3f9f37c4f165e334311a8da251c5a686b6bfbc24c2cbb202f27aaca5c7b426cc29036b48d944e6be5cbec2839e6e2712aaeb16c5d4522e6
-DIST less-530.tar.gz 339723 BLAKE2B 9321548b06330c0b1b5b5a36147f5b9348619ff15d907808744b89581edeb4d8c2118ba455d024a23850902cac4d2c34d1e7b9897e02769584315c0e67ef667e SHA512 8d83a18b5648c4fe85921a563aa2c40bcf495aeb611098c83cd167b1e2f706649846cdf457c8506ae2683ab362ad970a0b261747349673020894bccdb9acbc10
-DIST less-531.tar.gz 340466 BLAKE2B 6ac75b623fce478114d18cff429659499fedf4ef1a7bb067465ace91c28a7968efb224a4994a1e376a8cf40b110492f10ecda634628029107b38187044a0cd1e SHA512 180b665f194d7cc40d4bbb37bd64b10be463c0705e81795bef84b20dbba1c61825bb3e3da8bcd79f9176bb3af7b1f4e4c3dfe0829a5a2195a11f5b42294daca1
-DIST less-550.tar.gz 347026 BLAKE2B b033cb09d1bb9624c56db14084c73e5154e36cebd3f757dd2cb1b012b8797e7647d152bb67ce4ea9c2d188b1252fd7ddfd8a113656af5ec9a1e688145d4d9265 SHA512 a3d2769d90589a8e6afbfc9ac10cd1b544e0b0bbe28884e5ad980a71c541a37545c11d3450984b346b516fe082dfc0cf89d246c5a2d6002a7a2b4a4296a15494
 DIST less-551.tar.gz 347007 BLAKE2B 033a043340f888616c8342703597b9232ae1c8e62775d3ee0187599c3d9d9824fdbc7543ca90cdc535b2077a8bcbefe322887ad29289620191d8cf6ff86ddd04 SHA512 ef5296b9ebd72f83c05cad8a0f7a5eec2290e9b358ee725e09e8541bd95f94c0e14ea22aa04b287a0654079338eaeae813f2235b8e9f819fbbc9040dd65a9585
-DIST less-554.tar.gz 334708 BLAKE2B 3d7bd6376eb21060f16f52848b3ba96cdec4d5229c390ef24871eac91e4f35634e159e58c8c6db06072b5e943456deff49a25e99264e9283643966daef687bf8 SHA512 c37c645d1fa59d64414ebcded1b7faccd339a4d67654b14ec5862b2fe795dbd052ba9b65aaafd06f83a5c276d11e9cef5be4fb49329d14955bf2533dfcffd540
-EBUILD less-530.ebuild 1359 BLAKE2B 2ae5d8ef5ebed36e66049dcbce63d6c97e49705e7f48fbf0addf164dca6d1f796e93350096a0acb03cacfb85b2ea331bdb989606c1bf325cb8a0e5fa4243f839 SHA512 3d7c390e687b4d6e053e614e21c8f4ed345014473f5c8dc2a9b0145dea7b06835b28daa46de5008e7fc4241c73c03d67c0ef970b6560ec6aa8fc47a300684b23
-EBUILD less-531.ebuild 1384 BLAKE2B c29c785a182e6dd01755818f5ff719e141275f208da11167a502a85141b8097bcf99b999fd5ad3cc7c7d9675d082c82834ade9309b32ce4ae8809ef96d1dc17b SHA512 e90e648930211d8df1e07e9d85950f7bd33028f76e9f317f13366839ccf4a5031e6e98aa59124457f357dcabc96f93723094b71ea47905bfa0db53d10706d476
-EBUILD less-550.ebuild 1405 BLAKE2B 68bbf34c52d0072d8f57f6cd1eb7db308fc7499d1df618757c1d0c6ecb33e7c52bd2ab2aec4720b7be8a773b7626a5fcf4a96809de7a004dfb882ae7bac5cf44 SHA512 ff4df04a75a108c25d485e337c186a28a84361aabcfa57ee74b80dbdf1bc60ee666ed747290a204840f1cdeaa8c155c6789fa8186a320718d2aea4307b1cef2e
-EBUILD less-551.ebuild 1396 BLAKE2B 7e7153c066b9187c62b8ba45cbf018e017b617d1078ad06524a7258d1c00b72c0706136521c0fc3d53d09c1bc20379de7b6aaa25ef4e3cb91992ebc2b05104f7 SHA512 4eb62ac1585458b656cff7a84242596d08d840acfa10fbb9d632a307b4a2f7425026f7230d492f084fed6b8bda44148ff80221cd6a9bda3ba4379859025de5b3
-EBUILD less-554.ebuild 1405 BLAKE2B 77345efbac9171945e68394d2d6cef5b1ca7bdbda8507d190cb3696791c7e09d2431ce66c68b98643d3ab99e729a6d62941ad73a68178d479c29db0736c632e6 SHA512 8bb5ec18b63b0ec4ffc0b7d2426f771ab3413952a1e75a5e3b9889ebd3e71d7590ea6a7e283d6fc8ad554cedabdc42526b4cb0511e98709b7671812d9848c4e8
+DIST less-556.tar.gz 335019 BLAKE2B 7e0152c96751451626b3ff614b40f3c4d4e8ecd4b01e4a47ae443c3e7d83a1fc3fae8c21946626eda596631b0c6ca965113272fbea40389f20109e3125fa93e3 SHA512 a7235fae97414c7acb287b334dd071232d682e01627eb9a25f6a7ea72c58914f141657e067944f9672aa9f614012848e134e8d02dfb34892d20384f5e596bd21
+DIST less-557.tar.gz 335142 BLAKE2B 1c8645d70b1eb6d6d7f88c62ae77cce64e39262b32608cc4a27c0c8a79a2f84506ae41f76bd8eceeac8d294192f8d9006b7ab503482b2a4cdd6a2837ab187851 SHA512 5d82942d90c098fe81bf070e77c5d388eef83eaf4f4c48bc1ea6c0f718b04d09cc1071448e0f4cdf443872842d8ace9339036e77ee8a0baf6f4d02e91e87848b
+EBUILD less-551.ebuild 1392 BLAKE2B a81cb5c09b972404d6893a020f18c6f6ed592d28423d7ddb691dfdda3b7f241bb520a420e45e6557c374695cad57ab52c3193f9098c4a9a4b67e80911c3dbf35 SHA512 68e995a4a03c032ee2d1a183326050610e56f081cf7a7f2e71921caa149449f2f1eaafc3319dbd9ca71a0e22f589101c8bbcb9aa317c928c5457e3ae86514d46
+EBUILD less-556.ebuild 1401 BLAKE2B dc555529a16a3abdf81482324950c93c3c2d579e9d2a4dfc1028433907aae1f9357e18305a1f7635bf6ababe6724fda7fb635a78325378a3ae27c8cec6b65329 SHA512 fffe1e1e80aaa34aa91c2657302a46ff5ce0f95e6b418d64b61c34ebdd28c958e9b981a084ad8aebedbf9c02160a07fb2f1034eb3693c005e59c22b09f229878
+EBUILD less-557.ebuild 1401 BLAKE2B dc555529a16a3abdf81482324950c93c3c2d579e9d2a4dfc1028433907aae1f9357e18305a1f7635bf6ababe6724fda7fb635a78325378a3ae27c8cec6b65329 SHA512 fffe1e1e80aaa34aa91c2657302a46ff5ce0f95e6b418d64b61c34ebdd28c958e9b981a084ad8aebedbf9c02160a07fb2f1034eb3693c005e59c22b09f229878
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/less/less-530.ebuild b/sys-apps/less/less-530.ebuild
deleted file mode 100644
index c116c181b9a3..000000000000
--- a/sys-apps/less/less-530.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="http://www.greenwoodsoftware.com/less/"
-SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 BSD-2 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~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="pcre unicode"
-
-DEPEND=">=app-misc/editor-wrapper-3
-	>=sys-libs/ncurses-5.2:0=
-	pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
-	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
-	econf \
-		--with-regex=$(usex pcre pcre posix) \
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-}
-
-src_install() {
-	default
-
-	newbin "${FILESDIR}"/lesspipe.sh lesspipe
-	newenvd "${FILESDIR}"/less.envd 70less
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
-		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
-		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
-		elog "Colorization support has been dropped.  If you want that, check out"
-		elog "the new app-text/lesspipe package."
-	fi
-}
diff --git a/sys-apps/less/less-531.ebuild b/sys-apps/less/less-531.ebuild
deleted file mode 100644
index 6b7e2924c6fd..000000000000
--- a/sys-apps/less/less-531.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Excellent text file viewer"
-HOMEPAGE="http://www.greenwoodsoftware.com/less/"
-SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
-
-LICENSE="|| ( GPL-3 BSD-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 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="pcre unicode"
-
-DEPEND=">=app-misc/editor-wrapper-3
-	>=sys-libs/ncurses-5.2:0=
-	pcre? ( dev-libs/libpcre )"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	export ac_cv_lib_ncursesw_initscr=$(usex unicode)
-	export ac_cv_lib_ncurses_initscr=$(usex !unicode)
-	local myeconfargs=(
-		--with-regex=$(usex pcre pcre posix)
-		--with-editor="${EPREFIX}"/usr/libexec/editor
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newbin "${FILESDIR}"/lesspipe.sh lesspipe
-	newenvd "${FILESDIR}"/less.envd 70less
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-483-r1" ; then
-		elog "The lesspipe.sh symlink has been dropped.  If you are still setting"
-		elog "LESSOPEN to that, you will need to update it to '|lesspipe %s'."
-		elog "Colorization support has been dropped.  If you want that, check out"
-		elog "the new app-text/lesspipe package."
-	fi
-}
diff --git a/sys-apps/less/less-551.ebuild b/sys-apps/less/less-551.ebuild
index 161f495c55a3..cfc0e10bf5e8 100644
--- a/sys-apps/less/less-551.ebuild
+++ b/sys-apps/less/less-551.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-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 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="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-554.ebuild b/sys-apps/less/less-556.ebuild
index 826f236b361b..375e2585ca5b 100644
--- a/sys-apps/less/less-554.ebuild
+++ b/sys-apps/less/less-556.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-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 ~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="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/less/less-550.ebuild b/sys-apps/less/less-557.ebuild
index 27d9b6e09838..375e2585ca5b 100644
--- a/sys-apps/less/less-550.ebuild
+++ b/sys-apps/less/less-557.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/less/"
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-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 ~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="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/lm-sensors/Manifest b/sys-apps/lm-sensors/Manifest
index a6cf7e705e3c..4ab114a31680 100644
--- a/sys-apps/lm-sensors/Manifest
+++ b/sys-apps/lm-sensors/Manifest
@@ -11,7 +11,7 @@ AUX sensord.service-r1 155 BLAKE2B 8a61565976b7d333dfb257d0e57a18140229bedb44fc0
 DIST lm-sensors-3.5.0.tar.gz 267133 BLAKE2B f8fe8efe19cd17f2c828404bee7b2b285118279f06aaa2ebf831823d6767865a2b19da7bede1f3b43b2664ae3cec41b9e840be24fa673472fe577d38f602da4e SHA512 bea9b2ac01bc43622cafdce0b00ac3bb8cb2d818449c8b332ab51e7ad0022b66bcbf6ca1e99c8500bdc6092c5c1ef985bfe7cff05dbcf015bd3ccf58c00a72e1
 DIST lm-sensors-3.5.0_p20190505.tar.gz 269694 BLAKE2B 6d665b8cbf83b26786686c5000dcac139aac930f691bac9053173dfcb92b6320afeb2f9b5ba6305cba643ff8cde356ef9e6772948d0f618cb3f5a48b3b5396f2 SHA512 15e3c50a9f00d284995f1ae34ef38e1ce314acb0c15d4996002287fadcf89a6f066058838c74c2b2bbec2628a3e5b9e8e010b0f5139641ee5336ac061cb33353
 DIST lm-sensors-3.6.0.tar.gz 273209 BLAKE2B d05efa2bf5f052158a9b3f8bbe925d45a8e00fd7fb07490ddf6c87db786c803fbe8a728693f36c301269b995c72d510657d02f2e94fbbe5a7e9f50a36214635b SHA512 4e80361913aff5403f1f0737fd4f42cffe43cc170ef48fff3914c9952f71990739d723f7b0b8120d9a01bcbbc829e964cfbd0a5cf18508af8f8dc825b49860bf
-EBUILD lm-sensors-3.5.0.ebuild 6479 BLAKE2B a3db1c81ea87f7f481b004fd771a7b1b4fb1e9bda53df14f85228a4ee45a3a369afdd8dddec5ee728f4dde221172423a331a9ec9eb8f8c58b7b33820aaa69096 SHA512 b81d2559a28fd348dfbf42ce5a29952bf098653432d53a689699428ec7e893324f92514c4b4976332925bbdc74dd3860b251c941479538d3cc5d3d400ff141ff
+EBUILD lm-sensors-3.5.0.ebuild 6480 BLAKE2B 821fedf6773cc6712887d0e77a47e01ffa5fb527aefe9c401fe48963171a3f8a349362c7fa893c10e48ff36217275c9e90fc714c2a9eb5a540d0e3a5aea674c4 SHA512 ae83724161791d4b5766f6270c44a3a7cb557f695a3a877d1381afe755b995155d15fa2c1377d556284ec0c4fc5e36551321f856061f152da3618931d8033d79
 EBUILD lm-sensors-3.5.0_p20190505.ebuild 6443 BLAKE2B 1e6a8d6da3395666bcdb15971e390e08c9d95c8b6c588f248b63f5f26cb7b5db563f4e776045bea91a0a0fb2fdfeea46f5baf68f0f75fd95bc5c10a76e17336f SHA512 21c3006352737df9174ca25772e54f25f1f74688a6fb5b37e273d6070d30ac8952101e419d7f0f0dd86a74ca0dfa0ea0cf6cda9a1e41419a35b03095f55aab8c
 EBUILD lm-sensors-3.6.0.ebuild 6443 BLAKE2B 1e6a8d6da3395666bcdb15971e390e08c9d95c8b6c588f248b63f5f26cb7b5db563f4e776045bea91a0a0fb2fdfeea46f5baf68f0f75fd95bc5c10a76e17336f SHA512 21c3006352737df9174ca25772e54f25f1f74688a6fb5b37e273d6070d30ac8952101e419d7f0f0dd86a74ca0dfa0ea0cf6cda9a1e41419a35b03095f55aab8c
 MISC metadata.xml 943 BLAKE2B dec9c9764069667a9f5f5cd8359d0dc06020d6acbed972daab0b538b9f172f6d081a057cc6c55362de11c26857d1a885bb8a04e18dab1062370a8ddf0e25d7e8 SHA512 c32b85e2771b216861bf16d8c7ccfc8277b34c7ab712edaf487083f8d9e2a8e3707b65d1dd952e92d925fbefa87cf76799aa0b30f11ae8acfd4ffe27f2caf1f8
diff --git a/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild b/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild
index 700b74e76494..68d5821774fd 100644
--- a/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild
+++ b/sys-apps/lm-sensors/lm-sensors-3.5.0.ebuild
@@ -24,7 +24,7 @@ LICENSE="GPL-2+ LGPL-2.1"
 # SUBSLOT based on SONAME of libsensors.so
 SLOT="0/5.0.0"
 
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="contrib sensord static-libs"
 
 COMMON_DEPS="
diff --git a/sys-apps/logwatch/Manifest b/sys-apps/logwatch/Manifest
index e60991a46d5e..1704afa815b7 100644
--- a/sys-apps/logwatch/Manifest
+++ b/sys-apps/logwatch/Manifest
@@ -2,7 +2,9 @@ AUX logwatch 125 BLAKE2B 93e0bb2e65dda3a81e1bf560c06a3739fc2226488492219fab47832
 AUX logwatch.tmpfile 39 BLAKE2B 9b1df0ad28bdc16373e71eedb05e8962bf4eda5d564ba8e2632af8158fa3346e8784db2a6bf9aa90c04768743aee6eaefae517feb9f7066d748cae894c1a2299 SHA512 7902aab160b5fd6e1bb1573777f9fab065ed33b0df19da2b5dad31ca962eaea93f9d46e57efca2d76df26c55b48e0578fddf4136e36ed565d8a2b5258dc34afd
 DIST logwatch-7.5.1.tar.gz 469715 BLAKE2B 706352c60370d13b4f72047d08965ab0dd36837194a03bf44e08ec43641eddb8d80d655c783d4f25c8fa757853a4e069997b80676b781561c5e0a23b44a393c9 SHA512 945e66192a9e198169426497f7b5167fcbec2af9565dfead728aa91bfdac5f7e1b2ce2f5f404b6f03841fe6b978f70fb969b47d4f60f02f9a8ccea865c5c782c
 DIST logwatch-7.5.2.tar.gz 475277 BLAKE2B e3d841749af4776da84646444dd90bb084dc33712c1a6eeab87d46cb267656527008505f78506168b7ded40f3d0f8209c205249c2f953e6ee8af7a6cd82833d9 SHA512 157486143ba12167f6c50c778372a4295db3744878607bceba8e0813357651bffd8924ef5ef41a4fbd20811c020dcc031eb354a0f52b8eb6d9aac197087c2bc5
+DIST logwatch-7.5.3.tar.gz 495110 BLAKE2B b28d7381d259a132de7d9fd347ac4bafb44440b187aa811f3d3f65d7b1ccbb00c6b5bb660229cd8155fa5d7bc9668e7b4dd1ebe7bbb909b48367c6a6dd6793e5 SHA512 ad404f031fe016599a8f8d8c0820b23db61a9ad102815d3713e5d13e9a810c819ca7ad9cea50891852982e073ef033dbe7595fde8846971336148e32cbbe29ca
 EBUILD logwatch-7.5.1.ebuild 2412 BLAKE2B 59184da01772304868fadea2e53dfd4a8537b85c0579e856bb4588414e3b0ab9f1d06ad24291219f12ab53e26e7ba6b0b67a9a1e31dddd65b734c00e1f5d81ae SHA512 6019b71457100568fe2732f57d9c22059e211f48067a33c1064bd20f78274ede06670834b70125a5a617596091145af449d4e70200f11b1e68e7f953447442dd
 EBUILD logwatch-7.5.2.ebuild 2420 BLAKE2B ffa1af49cd9de0c37962d6d7a8f51f962a8e123081302b574f8600f399867f66dd15ba8ad2768914e5a88226cac739c1ad52ca326e9aebea5eb2a229600dcbb3 SHA512 a8dfdb266f4bc360a591da1fd4572ece32dd57a33af7bb7d2359754e6ffc004c773111a42e3ec3ed5d5d04ae61e788b78b09286fbd487b3a8ac9005149d3fbdd
+EBUILD logwatch-7.5.3.ebuild 2420 BLAKE2B c00b1d25242a17fadbe9198e107222c948948f5074fa6ed7cb37db75f50cdf46416d88ed5ba20cf8f5357f3e67b81f51f6b2370854175167648b3c2b6d6d68a5 SHA512 0df1c77fcd5568d99fe5395c32cedc997f62e8535e1368c05fe21b05d619dc6eb43c7eb15f26addc19327e3f4a275c8159352e037a436bc5711de77eb597e188
 EBUILD logwatch-9999.ebuild 2420 BLAKE2B ffa1af49cd9de0c37962d6d7a8f51f962a8e123081302b574f8600f399867f66dd15ba8ad2768914e5a88226cac739c1ad52ca326e9aebea5eb2a229600dcbb3 SHA512 a8dfdb266f4bc360a591da1fd4572ece32dd57a33af7bb7d2359754e6ffc004c773111a42e3ec3ed5d5d04ae61e788b78b09286fbd487b3a8ac9005149d3fbdd
 MISC metadata.xml 328 BLAKE2B 623e92420ca1fde8b78ac6142444544897284af5e74b610d2e6cac823b97355fc91bcad0ea3bc7ced3286e1bdf6cc2b340a34143b31529424ba9d90209b7898a SHA512 5feb78397d5abc4fc758c61c2c972032eca10f9fcbdbb6efcbae764c5ab1aaa09fd4f9a31082682dfd8e0ff865147fff22787b8d116bc7a954a4fdc42cf7b3e7
diff --git a/sys-apps/logwatch/logwatch-7.5.3.ebuild b/sys-apps/logwatch/logwatch-7.5.3.ebuild
new file mode 100644
index 000000000000..6b03d4907f51
--- /dev/null
+++ b/sys-apps/logwatch/logwatch-7.5.3.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit tmpfiles
+
+PATCHES=()
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://git.code.sf.net/p/logwatch/git ${PN}"
+	inherit git-r3
+else
+	SRC_URI="mirror://sourceforge/${PN}/${P}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+DESCRIPTION="Analyzes and Reports on system logs"
+HOMEPAGE="http://www.logwatch.org/"
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+DEPEND=""
+RDEPEND="virtual/cron
+	virtual/mta
+	virtual/mailx
+	dev-lang/perl
+	dev-perl/Date-Calc
+	dev-perl/Date-Manip
+	dev-perl/Tie-IxHash
+	dev-perl/Sys-CPU
+	dev-perl/Sys-MemInfo"
+
+src_install() {
+	dodir /usr/share/logwatch/lib
+	dodir /usr/share/logwatch/scripts/services
+	dodir /usr/share/logwatch/scripts/shared
+	dodir /usr/share/logwatch/default.conf/logfiles
+	dodir /usr/share/logwatch/default.conf/services
+	dodir /usr/share/logwatch/default.conf/html
+	keepdir /etc/logwatch
+
+	# logwatch.pl requires cache dir (bug #607668)
+	newtmpfiles "${FILESDIR}"/logwatch.tmpfile ${PN}.conf
+
+	newsbin scripts/logwatch.pl logwatch.pl
+
+	exeinto /usr/share/logwatch/lib
+	doexe lib/*.pm
+
+	exeinto /usr/share/logwatch/scripts/services
+	doexe scripts/services/*
+
+	exeinto /usr/share/logwatch/scripts/shared
+	doexe scripts/shared/*
+
+	insinto /usr/share/logwatch/default.conf
+	doins conf/logwatch.conf
+
+	insinto /usr/share/logwatch/default.conf/logfiles
+	doins conf/logfiles/*
+
+	insinto /usr/share/logwatch/default.conf/services
+	doins conf/services/*
+
+	insinto /usr/share/logwatch/default.conf/html
+	doins conf/html/*
+
+	# Make sure logwatch is run before anything else #100243
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/logwatch 00-logwatch
+
+	doman logwatch.8
+	dodoc README HOWTO-Customize-LogWatch
+
+	# Do last due to insopts modification.
+	insinto /usr/share/logwatch/scripts/logfiles
+	insopts -m755
+	doins -r scripts/logfiles/*
+}
+
+pkg_postinst() {
+	# Migration from /etc/cron.daily/logwatch -> /etc/cron.daily/00-logwatch (bug #100243)
+	if [[ -e ${ROOT}/etc/cron.daily/logwatch ]] ; then
+		local md5=$(md5sum "${ROOT}"/etc/cron.daily/logwatch)
+		[[ ${md5} == "edb003cbc0686ed4cf37db16025635f3" ]] \
+			&& rm -f "${ROOT}"/etc/cron.daily/logwatch \
+			|| ewarn "You have two logwatch files in /etc/cron.daily/"
+	fi
+
+	# Trigger cache dir creation to allow immediate use of logwatch (bug #607668)
+	tmpfiles_process ${PN}.conf
+}
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index affc75ab9287..f8ef5e760f4a 100644
--- a/sys-apps/lsb-release/Manifest
+++ b/sys-apps/lsb-release/Manifest
@@ -1,4 +1,4 @@
 AUX lsb-release-1.4-os-release.patch 614 BLAKE2B b15e0e136ccbee1907cafc9523ad0ca31b87fd910b770b212f1d06aef668f184343f7d961aa38a1ba35e2bc1628750bd1680a70b7405271fab59c5f732fde66c SHA512 289795f45144071f5f166a3dfd387267fd3327767bae9d8e9c48818de0c60b961ac35952eb8b42b3ebfd415b337c096fa2db8009fdfbc218814a3ace633a8483
 DIST lsb-release-1.4.tar.gz 10769 BLAKE2B d6c71d6604481a637f63fae00742ba77421345b36234fcfcae1da98bc1c80a8450bc569c2ea2f4b1c3a852de2fe24413fe397d4a60a0ca94eb70a9626871f4bb SHA512 84f6f8794380463587005043f601b7a40190cd9e3409abff7f5ce7658cf029a14346eff87838296d90307192bdeff68cc00480c5c04814da7acdb3e220640fde
-EBUILD lsb-release-1.4-r3.ebuild 907 BLAKE2B 0e4cd2df743da9c0fe89a6aa707f02e123da6108da0edf2f1ef86590f9b415f97e9eb2834594c356fa7129109bb83bc1f81584c3130213f06c43c6013aa8d71c SHA512 268a575fa435ac6350bf7b7176399914b57776a586594f873d4875133209b3a5aa9712ae21b895c797696b8e7f1b1a4ffc6b440534f551e153f1e8689b5835ef
+EBUILD lsb-release-1.4-r3.ebuild 904 BLAKE2B 1ed7678cc226354fd3c35be6afead4817a714d1054cb389dc6c8e81c66ef737f5fbde84435e3cf164d2858ddd1fc624b37f06b580a7a5a6e2f4c081f744b4524 SHA512 2a029b9ebade00e225973b49f493328bacf69eb5cf1c3e1f6fc8b8e3db24ddd7ee5d8697b2b93df89974cf04c7721c28dadf5966f56e0aa72f82633252da4056
 MISC metadata.xml 808 BLAKE2B cb931504b70813859d35bfda6408cb28f2bd56cb4f0cdca944c051b9731c2c1e7c38d87bfab70cffabf82d4f537ea68eaa88bf05e2c90e27899238315fe29ad5 SHA512 cc252166fb933fc78a5b5479c9cc2a49a0d9224371cd14635cb92e7e3c4c801bdc6f837b6680704d20f63dc0b8872b67c72b952361e9328dc12305f9351f7a87
diff --git a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
index 251d6738b97c..02f6bc5de4cf 100644
--- a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
+++ b/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/lsb/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86"
 
 # Perl isn't needed at runtime, it is just used to generate the man page.
 DEPEND="dev-lang/perl"
diff --git a/sys-apps/lshw/Manifest b/sys-apps/lshw/Manifest
index 980158160cd1..a4340cba13b5 100644
--- a/sys-apps/lshw/Manifest
+++ b/sys-apps/lshw/Manifest
@@ -3,5 +3,5 @@ AUX lshw-02.18b-gettext-array.patch 924 BLAKE2B 0ebb872cff09b1578026bb9026ca895f
 AUX lshw-02.18b-sgx.patch 842 BLAKE2B b1c9b676f8875ef312bcc55e6cf07be21500d50185e25075e61811a8342d4c1e165a75916cb3cf1a2a58ca5a062079dbadf314437c543a0792867d7828d92453 SHA512 face0b384e84379297b18b0efd106f59604a76ff526f3995038d8e261409f5117f456332f357c7c559a24980750779ae40757920b25bdf6b38588620966bc5a9
 DIST lshw-B.02.18.tar.gz 2322176 BLAKE2B 66183895fcdd5b47bfaa044c10f7b561b3310829b53828444a20f078ce63e166a878595c8a8a79e22f1e4ab726e98165a1b31225997785d2bfc3ad5d7b0c5214 SHA512 4385db86101178b8bd33a80e991718e14f83277c66b3d63ae97cb4339196873b6e9b31a174024bf43d16fe66e1d7f8cf5cea56076697878087880c8821b11e47
 EBUILD lshw-02.18b-r1.ebuild 1768 BLAKE2B e557af6f6f3874f434bb0f0da824a378d2fe1e36ac00782752f126df14d8b4ff83b2224bac4fe91df7652b0383de009fdc3c5f01b94e771c2d61109ddad343b8 SHA512 9eef7b1a0e54c2ef5d9e1af5c3caa21dbd566443d7b3d83e68cc8cb073495105452cbbd3126ce1eda78f08ea430f7a92e9cd01a83449bea86e8bc53b26c5b91a
-EBUILD lshw-02.18b.ebuild 1719 BLAKE2B fffe183d62674cce8b71630c8fb06c27b1c1d86a7e487df1b6af860bade9d36b7354dedea2092e975748f2e2cd278459948d2e4f90904af33c9290cef45afe8d SHA512 640f8789e4f8cd2c167242aa7296a45eefa2d4c91437775873dcf3065a867c624dda4f4a61e01ec2425313cc4e9f0ca016a8445af71cdd5a21da3e4874c9ab87
+EBUILD lshw-02.18b.ebuild 1720 BLAKE2B 19caa4b5a9206a08da746fa4804f3bbd6235812767e93b3285144e2f5a47490c8a191f87990a49b40fdeadff6aef0ee04814c3897afb851466b649959088ff50 SHA512 cbd71c5ef62fdf99c27240e53491aa2b1c5976e06b08cd54c72bff4d32122789fcc488132871c3ddeb1de5f2d95331a33fb201940ef71d060e77172d6232f8e7
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/lshw/lshw-02.18b.ebuild b/sys-apps/lshw/lshw-02.18b.ebuild
index f23725612742..0ed6352a9d3b 100644
--- a/sys-apps/lshw/lshw-02.18b.ebuild
+++ b/sys-apps/lshw/lshw-02.18b.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://www.ezix.org/software/files/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="gtk sqlite static"
 
 REQUIRED_USE="static? ( !gtk )"
diff --git a/sys-apps/makedev/Manifest b/sys-apps/makedev/Manifest
index a3a59b49397f..5ae698f55530 100644
--- a/sys-apps/makedev/Manifest
+++ b/sys-apps/makedev/Manifest
@@ -1,4 +1,4 @@
 AUX makedev-3.23.1-headers.patch 433 BLAKE2B bd8e6e4b32c69be3b5ccec72b425cdafbfa9723b0fdd1b634da6f130590a72fd251c6f21ff29224a705211274efad53f8fecff3ac3710eccff4833e1769c75dc SHA512 ffc80692b9bc317c0c14c5e7211155c4a7849967a9a3588a811f21feb6034da264c7aecdb7ce4e67786aa2a28f8d33af381ff410afd118ab44f47edddc421d0d
 DIST MAKEDEV-3.23-1.tar.gz 122613 BLAKE2B 2b0a4a02db36d7a3a71018378396c7d5ac8bbd4e9f8b24a1d3659084f381e8cc686f3d9198dc54e1efd93095ea09c21aab3b9866b942bff8e8a393355403f28a SHA512 5ca82cdcc4544042ede552370acf6266929fa34d177bd8e831573ccc1c57e06ec87766b9e60a686ec1449b204ae0ac3c048eab32b57ce8d610366219d3a77dbc
-EBUILD makedev-3.23.1-r1.ebuild 1353 BLAKE2B a4448069f80e7cbc2bb81e7c7ed6394019f014ccab6e34f59c3bc3bc36b74f3b6e1383805c0adf1f1ad397109c0f20d1c4816a29ccd0ef10e84969a49d6191d5 SHA512 625d61c9d0a9b44e57a179a052470884c7dda06d9f6a631e8b885ecf89491ebaf8a84b0216143ee2db0ba419d160a9aac75e49a24bea9933e0a3a9a18abcdf5a
+EBUILD makedev-3.23.1-r1.ebuild 1351 BLAKE2B e8726bbf4ea82f3e7fb531ab24446ca528c9a392d8d0181f467b60c100cc573004bdaf12266ba93e8174251f76204406e92d75b255c70cc1ad4420cac806fa97 SHA512 444caec3b2216df6aa4a09b9217c462485c02eff5f0e8d681584e41e5e8bcefc368b86114ddf2adba059af9c5ee719d6929baddc7915bcd91d8cec8822e362e6
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/makedev/makedev-3.23.1-r1.ebuild b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
index 38f97ce736aa..15218019fe64 100644
--- a/sys-apps/makedev/makedev-3.23.1-r1.ebuild
+++ b/sys-apps/makedev/makedev-3.23.1-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://people.redhat.com/nalin/MAKEDEV/${MY_P}-${MY_REL}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="build selinux"
 
 RDEPEND="!<sys-apps/baselayout-2.0.0_rc"
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 371fef769c12..6cf5c93d1fe9 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -4,9 +4,9 @@ DIST man-db-2.7.6.1.tar.xz 1541316 BLAKE2B ea3aa7e90ea8af4882bd99d99374cc37d9c0c
 DIST man-db-2.8.7.tar.xz 1839012 BLAKE2B 19b438b1083cfd838421f29ed053fe85686929bc9f2105fe399ea99622f138bca2c8888a17cddb9223362db2d5f9c4bb3669865ecf749fe845ea8e4223027f67 SHA512 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9
 DIST man-db-2.9.0.tar.xz 1857216 BLAKE2B b797c1bc48027346114d35f00624686daa7e139cf5836e207b482d645009b95577bc13cbad3f1b2498e8c7e8c2f530d43aa8dec96ebad6bb84e6cc77064319d1 SHA512 7deb4421c7944276c6edf974b1336ee2f6605ee470c98d374544e2fcaa32ec2afe077c5fd020fc1f74df058384a293b8ad5a92d86b1c15a949573af46ba09cda
 DIST man-db-2.9.1.tar.xz 1875456 BLAKE2B 42d7d5f49bf19e031bde18dd60cbf18a7656e8756f2cc5d3789cab6ea82283115ed0303ae2f7f7ffd3e32310302b7b70b4e39704bd5c2a08ab60a38905d8c448 SHA512 ae2d1e9f293795c63f5a9a1a765478a9a59cbe5fe6f759647be5057c1ae53f90baee8d5467921f3d0102300f2111a5026eeb25f78401bcb16ce45ad790634977
-EBUILD man-db-2.7.6.1-r2.ebuild 3175 BLAKE2B 4b31b2ed3147c80332ea5de476e97f2c4ed8444464e647ac5d9647798498ecfc5532f753e0a280ca76e78530296ce348d2cd9c7ce015fd3a31e8dd3d7edbf75c SHA512 b4f9bca1717cfa1c488d7cc6f162eb984c03c3c308e74690ce0a9ee67c2dba67bfd4c3c6877db9b86d0ad60fc5874b42aa459399c7f72313c7091baaadf2d7c4
-EBUILD man-db-2.8.7.ebuild 3465 BLAKE2B 1316fc94431ef91d88f5db50f5e7c8a7b77a39ffdf8fdc7f6e0b5c57198df1d2c62c83e990170faa51c56051a41be90ba4cee9dd742ad116212489a8c52b159a SHA512 af71614eebb52a88b3ac461c761b7bc67fbb9edccd3c585862bec9515fd24fc7ce7e8f7a2bb57394715360be9529d10768e85fd6788446a5ae7d8617dfa851b6
-EBUILD man-db-2.9.0.ebuild 4019 BLAKE2B 51ebbcad346410f4030b19ca787b36b0d86e32e0c54e9fb74b4dc95384868775dc777a30b101e4dea9e4b1c265567a5c53fbb686aaa9857eec6c7e5b9fc5be9c SHA512 732da754f75d4773cb267b30aac7b6076134e4183fc1572e95f0299cfd01fa470bc775f18753e7259443ee84db81c4109e73a97de360de093db90ee4077536c7
-EBUILD man-db-2.9.1.ebuild 4019 BLAKE2B 309bfd5e5c1c28848f542bf1b7fe1364349a8a34e9ba94b9beb71237d12f17b64b6692eba783a6f2cf0251fee00f08bf3b7bf6bf96879ecba63e0f4e1b837c23 SHA512 3dfd23b1931a06cf418e8d03a2f7752746a164a4a68e6760323b374b2ff9b08a82202dd49ad63582d516cf41398b0175b5e0572ee79d4e4f4889eb2a6be4f17a
-EBUILD man-db-9999.ebuild 4019 BLAKE2B 51ebbcad346410f4030b19ca787b36b0d86e32e0c54e9fb74b4dc95384868775dc777a30b101e4dea9e4b1c265567a5c53fbb686aaa9857eec6c7e5b9fc5be9c SHA512 732da754f75d4773cb267b30aac7b6076134e4183fc1572e95f0299cfd01fa470bc775f18753e7259443ee84db81c4109e73a97de360de093db90ee4077536c7
+EBUILD man-db-2.7.6.1-r2.ebuild 3173 BLAKE2B 3daa406630cd3383c81b890edc073340fd32242327e8690ca4fdb7e77257ea79c568b2b6909941dd0e43b6379bfeb787e2c693261409bf568ba5c2a4e5bff3eb SHA512 1e06484a1b0b69debd0c1dde22299a01afb006608e44d01d43fbbad82536a360df741c7e5928e59e726ef8576b32fb8344b26a308e8ca7e12a1d15f2f9bdc73d
+EBUILD man-db-2.8.7.ebuild 3458 BLAKE2B f3096c090cfe4f5d6926389d0e3e1d8d417c7cdfd0cee59d9d4182d9c1a602b8a2a4c57fd3b92e110e8a1e9c6c4922160fda8f24bf54fca20797defa6443af42 SHA512 3b38dfae452716e3a68e1ae6dd5c74ba92ab130e25c8bd77d9e5802e3cda8dedbf5c7e7af8613e0e62c9f337b0ddb2c1a6fd69058967d3ed774c639897278f9d
+EBUILD man-db-2.9.0.ebuild 4015 BLAKE2B 6ad75623c176a62cf26afb94bd84ea3a214a949bdf534e58e7e9ccbf11bf56159e02d48e3999549fd2f1f2e0240b954298717d6bfe29523e6e7cd2382b20234b SHA512 773c65cdda7fd8275266b05450cae51996652689ce26e3095e5eee97990dcce39412e784a3a0104b43218ab3d411d78bc70cbed9d8602852decc9c06f96d6074
+EBUILD man-db-2.9.1.ebuild 4015 BLAKE2B 6ad75623c176a62cf26afb94bd84ea3a214a949bdf534e58e7e9ccbf11bf56159e02d48e3999549fd2f1f2e0240b954298717d6bfe29523e6e7cd2382b20234b SHA512 773c65cdda7fd8275266b05450cae51996652689ce26e3095e5eee97990dcce39412e784a3a0104b43218ab3d411d78bc70cbed9d8602852decc9c06f96d6074
+EBUILD man-db-9999.ebuild 4015 BLAKE2B 6ad75623c176a62cf26afb94bd84ea3a214a949bdf534e58e7e9ccbf11bf56159e02d48e3999549fd2f1f2e0240b954298717d6bfe29523e6e7cd2382b20234b SHA512 773c65cdda7fd8275266b05450cae51996652689ce26e3095e5eee97990dcce39412e784a3a0104b43218ab3d411d78bc70cbed9d8602852decc9c06f96d6074
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
index 005af9aa14af..c11b6e20b51d 100644
--- a/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
+++ b/sys-apps/man-db/man-db-2.7.6.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="berkdb +gdbm +manpager nls selinux static-libs zlib"
 
 CDEPEND=">=dev-libs/libpipeline-1.4.0
diff --git a/sys-apps/man-db/man-db-2.8.7.ebuild b/sys-apps/man-db/man-db-2.8.7.ebuild
index 270ee83e29f1..c0b49d500cd2 100644
--- a/sys-apps/man-db/man-db-2.8.7.ebuild
+++ b/sys-apps/man-db/man-db-2.8.7.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-db/man-db-2.9.0.ebuild b/sys-apps/man-db/man-db-2.9.0.ebuild
index dffc4b56907e..92546556c66b 100644
--- a/sys-apps/man-db/man-db-2.9.0.ebuild
+++ b/sys-apps/man-db/man-db-2.9.0.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
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-db/man-db-2.9.1.ebuild b/sys-apps/man-db/man-db-2.9.1.ebuild
index 9cc7f136966d..92546556c66b 100644
--- a/sys-apps/man-db/man-db-2.9.1.ebuild
+++ b/sys-apps/man-db/man-db-2.9.1.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild
index dffc4b56907e..92546556c66b 100644
--- a/sys-apps/man-db/man-db-9999.ebuild
+++ b/sys-apps/man-db/man-db-9999.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
@@ -12,7 +12,7 @@ if [[ "${PV}" = 9999* ]] ; then
 	EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git"
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/man-pages-posix/Manifest b/sys-apps/man-pages-posix/Manifest
index 7019af05456f..bfb0fd33552c 100644
--- a/sys-apps/man-pages-posix/Manifest
+++ b/sys-apps/man-pages-posix/Manifest
@@ -1,3 +1,3 @@
 DIST man-pages-posix-2013-a.tar.xz 930736 BLAKE2B 4d496a4ea7bcf9f101a9b5c31eaa437317e872d9d266c202a1fcfd16d9b2fa71f968c3653bc9789ba18916a93802736e795c43bb3f87324397f49aed0f6d1556 SHA512 e6ec8eb57269fadf368aeaac31b5a98b9c71723d4d5cc189f9c4642d6e865c88e44f77481dccbdb72e31526488eb531f624d455016361687a834ccfcac19fa14
-EBUILD man-pages-posix-2013a.ebuild 771 BLAKE2B 418f180e232d540bdf2615cbb829a1d7c1d55b0fefa776f02c5f3cfcb0bee5ee7b9acf0c786f0ec7061c249fbfcbf0e915e13005abc5997ef703c430ec5ee722 SHA512 4276f45680914479aa72652aeb32ec9f7a0aeb1d7f537c732bb4efac42d62b48d00447b7344c6654a2a197fe6e8b825be74d4c33234ce348f918aecd590b3986
+EBUILD man-pages-posix-2013a.ebuild 769 BLAKE2B e1c94c69a7eaccc065507d56c0ddce2cca16c76a84f42fcdba147aa0fbbede83b48aed9edfd7cb1991fddad6b7adce57c857c897d0db8ad47b8c85296230ca3e SHA512 53bab6bcf639a7edb487b268a64df03008f94d2e0a7c79928f6c2e70cad4d43b8192a0da2df63f92942f38b47196f6670098bfd496c2c9aa5a2d0b81a247ba54
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
index bd7ae5ff1050..a019ae1d6a75 100644
--- a/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
+++ b/sys-apps/man-pages-posix/man-pages-posix-2013a.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/${PN}/${MY_P}.tar.xz"
 
 LICENSE="man-pages-posix-2013"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE=""
 RESTRICT="binchecks"
 
diff --git a/sys-apps/man-pages/Manifest b/sys-apps/man-pages/Manifest
index 2ed8ae9c92c7..d0169a7b75d1 100644
--- a/sys-apps/man-pages/Manifest
+++ b/sys-apps/man-pages/Manifest
@@ -1,6 +1,6 @@
 DIST man-pages-5.04.tar.xz 1684044 BLAKE2B 61b73edfe0d1f93f20b17e935f73c8c0ae778219f59f9b4739e1574b4b9aea5d83cd856f77b58cd2fdc4cd19ddc9a61cf2c7dd504461e9ac3b9a1d59574a2c1c SHA512 723c67eaddc2652dc36fa698d08473dbc8e17f4351b2c391064b80d637ec7e5cdc1b20ee4e542d95f441331c7b773899cfdeeeb7a2f599c64d6eac5c586b7cbe
 DIST man-pages-5.05.tar.xz 1687960 BLAKE2B 68d1391e9517837f55e1516f5c8f869d43ea4e7a01faef62ea27c740ecb73726d66a582b1f5b6bb8674173146035eed8d811d4923351d99bf9363a0ee6297e4a SHA512 4f1b9f69c44fb054de9834ad4356fc633416ce98285d137fc616967129f326c8dd28eba05d4fe12a385aced9ff478ed42dde777631be124b2ddc7569ee27a395
 DIST man-pages-gentoo-2.tar.bz2 5141 BLAKE2B c5c7956ab47c8a473e258b1902d5d19d9eb2e9d01786e907d9c3ba691c2a506834ed96cd1f54e8d8415e65d4fea0056659537f0faffe68fcbed33aa728a5e61e SHA512 6e6524b8ad6f1b8c9b147665ee32af49e05603dac61d433acd6b4f1164adef27cd542898f272b07d8659725013dac59c7f34a858968cc054a4785c945e14a770
-EBUILD man-pages-5.04.ebuild 1638 BLAKE2B 92687049ef1f2f63f0e417ff734524bbf7ac9c219cb6813c652a6d118130786a58023bc9f518db71ca5363450e721e1a5b0063716d4ba93e9902626c20cef775 SHA512 017fcdc1516c219522a27f5a64adc1b29e767896cf67357042bac3bf1e5d1c160a057d9f9c461db2981391ae1ee6cb1b49b9fce47648ff5556259886cc580e99
-EBUILD man-pages-5.05.ebuild 1650 BLAKE2B 2334dd511c995562ff21d6ae0502fcf4e10fa9ce822543fb73a3e984aa190ce14d12ecd0dd662aea1bc766632ed423ab4e30db7de693ff25c2eb25fad5760423 SHA512 5bb978e229b2963a0eb99f5768bc5618931fb36d96aa80153776a2019238eb15026cebc762dc21e65551807a915e86739e0e895cfb29f5fd397623815420b5cb
+EBUILD man-pages-5.04.ebuild 1636 BLAKE2B f9558c322a7c6c5f422e6600930afdeb153c467c1cb5e9ebc085d364d54a041cb7b0e34d1c576626d6b93337e8e5f09a3e0d44d45e927e6c7ec4eec8c67f4c99 SHA512 dc3ad987d990b0cee10afa1cd83a01ffe1940e0daebbd39c0930abac86cc94fdffb63d120a7d77ba0773f22af4a0312c59ab278ef6cf0f7e7f1a312856c796bb
+EBUILD man-pages-5.05-r2.ebuild 1736 BLAKE2B 6c620ccd3d161cabf1fa942ac0a03d1c602e8fb3f1a8b716bcfc969f5d5de1f909ecab8abc7fb03ecb8485734e03e842c5ff5650fd6541a90555aad7723bdef8 SHA512 bbdbe939f70c5c5129b467698f59933eabdc2c6c2764f46e1ebe287fa0a514b2d6bad4df79e88df1d2f8d874795e1cef7c190aa17413d9fd90ce0f450aee07b2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man-pages/man-pages-5.04.ebuild b/sys-apps/man-pages/man-pages-5.04.ebuild
index 6450c0bbb0a5..a7f6e7bf9335 100644
--- a/sys-apps/man-pages/man-pages-5.04.ebuild
+++ b/sys-apps/man-pages/man-pages-5.04.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" de fr it ja nl pl ru zh-CN"
 IUSE="nls ${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
diff --git a/sys-apps/man-pages/man-pages-5.05.ebuild b/sys-apps/man-pages/man-pages-5.05-r2.ebuild
index 63013ab5b776..497d908fc39b 100644
--- a/sys-apps/man-pages/man-pages-5.05.ebuild
+++ b/sys-apps/man-pages/man-pages-5.05-r2.ebuild
@@ -14,27 +14,24 @@ SRC_URI="https://www.kernel.org/pub/linux/docs/man-pages/Archive/${P}.tar.xz
 
 LICENSE="man-pages GPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE_L10N=" de fr it ja nl pl ru zh-CN"
-IUSE="nls ${IUSE_L10N// / l10n_}"
+IUSE="${IUSE_L10N// / l10n_}"
 RESTRICT="binchecks"
 
 # Block packages that used to install colliding man pages #341953 #548900 #612640 #617462
 RDEPEND="virtual/man
 	!<sys-apps/keyutils-1.5.9-r4
-	!<sys-apps/attr-2.4.47-r2
-	!<dev-libs/libaio-0.3.109-r2
 	!<dev-libs/libbsd-0.8.3-r1"
-PDEPEND="nls? (
-	l10n_de? ( app-i18n/man-pages-de )
-	l10n_fr? ( app-i18n/man-pages-fr )
+PDEPEND="
+	l10n_de? ( || ( app-i18n/man-pages-l10n[l10n_de] app-i18n/man-pages-de ) )
+	l10n_fr? ( || ( app-i18n/man-pages-l10n[l10n_fr] app-i18n/man-pages-fr ) )
 	l10n_it? ( app-i18n/man-pages-it )
 	l10n_ja? ( app-i18n/man-pages-ja )
-	l10n_nl? ( app-i18n/man-pages-nl )
-	l10n_pl? ( app-i18n/man-pages-pl )
+	l10n_nl? ( || ( app-i18n/man-pages-l10n[l10n_nl] app-i18n/man-pages-nl ) )
+	l10n_pl? ( || ( app-i18n/man-pages-l10n[l10n_pl] app-i18n/man-pages-pl ) )
 	l10n_ru? ( app-i18n/man-pages-ru )
 	l10n_zh-CN? ( app-i18n/man-pages-zh_CN )
-	)
 	sys-apps/man-pages-posix"
 
 src_configure() { :; }
diff --git a/sys-apps/man/Manifest b/sys-apps/man/Manifest
deleted file mode 100644
index 628cfa2ee7fd..000000000000
--- a/sys-apps/man/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-AUX makewhatis.cron 115 BLAKE2B 55491e18ad63037715d611cb2f2dbd9a577616bda54ade3b74e88dc5e3cea679ef6ac3486b0682cb385f68ae307eb0ccbcc521f0eb15a9adb0ac5c88877aaf3e SHA512 378f1980da40d67d82e3ed6a8d470df58180ca3eeee1d9f6df5d8eec7101461ee0af2f5d7c1da81af086f0aad0665bdffd4c6ee65418dff5f7c187a39b2e79b8
-AUX man-1.5m2-apropos.patch 450 BLAKE2B 911c3a05d3f82a196091c59ca55706b4b0b9c49da0ccb5f912dcde345708997a581af0620f75a3ff71de29eb82c7609b9c6ddf0ce5ab56000e74c97aa823df90 SHA512 cf8c5f6debe6de3a424d1b4cb4cd234e2524477150fb726f7dc659ed436d491c0506649f63d06f1b825765d48e18736ef6476dcbbb27aabe1d1a3b47d7bf7317
-AUX man-1.6-cross-compile.patch 1744 BLAKE2B cdad3118b088cf5de09bd58b9eb54e2b0325e3f11e2aae39351edccf25653ab05343b4044fa110774743957868b638e5de4c941cd58cb5c1cb629494fd40aaf1 SHA512 8be42b2ac831d7ba7de7e2f54c0b5d4ca2d1c88e6b3125b0bb2b9996c15daaf659f3e4e1c9edf05bf9628ea9e043cb9781e05987dcb34abb3c937b19d4787204
-AUX man-1.6c-cut-duplicate-manpaths.patch 2148 BLAKE2B 19ae613d1f3d340fb16a788a5097e06f87ea3be767765aea1d16826bb681e1191043397fb06e06b0772cbff04762a968e07cbdc480765bbf64a363715c23a6f3 SHA512 00141e89313e5dd4bf781c2010ca1aea4f8c265339cb4a46ee596870388b41e78135191b0266f4d1046a15f92d404477622139baf5f92a9692c8f9ee79d3a820
-AUX man-1.6e-headers.patch 241 BLAKE2B 90fc39cff8a8782a97b840b50a6646ff46a2e05ee8ae92d9b50bcc3be7fe47dcd22d0b68952a7016c23b154773aca470b536b1d1eb64f1ad009e038a039590b2 SHA512 0fb92a896fe6889289198ac2674ae238e1067e8e3681b6d9c6fee12843f5272a49b80899985ed6e718d84181c036ca7e7c00d8cdb5bdfca299cf4ec00681e925
-AUX man-1.6f-makewhatis-compression-cleanup.patch 2384 BLAKE2B f1b6ae414c95b16018ae49a26c1d9a087210049f3d9a3725c215f52f715b0a43d030beb1089cc5131b24439dfaa9607b39ebca643aa06a1d524e7d3aa9f77756 SHA512 24e85bda51ab9ce27d15bae0403b7528cd808b32642e677512806cd88afb6ba2b76cfc6550eeb18cf7cdc7fcf348eca01bbed1b0da3680f53ffb73f824316c10
-AUX man-1.6f-man2html-compression-2.patch 1725 BLAKE2B 314c3f3eccb90db6419b6069679457f24e3f5dbaa4ec466513f7a553886db1e25572a07ab8e74676df5bcb3d7a991ac58aa876d3abb780d5bdb415c4c8b1bfd3 SHA512 c7dc78f75876882e4f241ededd61ab1dad9292e2aa91d82c09e0e4a81c6a97d6537c8bb4b9154a17cb1db47d8716464b8146ccd487545e3f5c317482ad86e0bb
-AUX man-1.6f-parallel-build.patch 2312 BLAKE2B bd6172dc6fa3d7c590031da255092a61e0c2947c2f4aeabf8968b77a5a23b917ee65d24cfae2a38bfc3bf1efe0bc8c0ee48669ab794935d938671198fa54b73c SHA512 03bfd0c86d9d17eba4073a94d59a2d1fabc88fc373831796d65c1caf3f45ff17014f3bd314ece01be80746845961ef7f03e7b8e153e3e71ced77f43736f34bf8
-AUX man-1.6f-so-search-2.patch 1062 BLAKE2B 50f2cba7b420042c93942309528a3712e45a171a091498f8149009832a42bc8723a5963909a9086e25d14848e422dbd99282f74f14264e64020d9692dc8d1c2b SHA512 af21ff66a9bb0f6a47d98c1fe73fe99a4c0addce6496be154ccd7ede2efb51e80464156337ae40df9aed3a10daceb486f8785dd1130b50d59d4e991406dc70c6
-AUX man-1.6f-unicode.patch 656 BLAKE2B 5e35e50768106d12e11a83a71f63ba35ceffcaffbd9bfe917d090bb4b1257f36bc1055b79f5e0c1e5eba8a9f21c8858c39fd54e8285be421045f3a28ab353bb4 SHA512 f91ebf0886794bb1f3ccc2207cd5fb7dbd83f0dd727470a9270481c7c33dcf1c78e99a62d097232ca964b639764fc1c76ae88380775dc79ee4ed18a6cd677b97
-AUX man-1.6g-compress.patch 343 BLAKE2B b91a16bd5f0a1a5e7a83cf225659c204b6b3fd8785251171bba6a229eb6e1f721c3ff8b04379d09fa39d44984757342139d053ecde821aa6ebcb9de914765af1 SHA512 eab984c95b75bbf29b65ff38029bbcfa870972fa2cff208da5d4d43c89dd0ceeb32a8faceb43836ced9ff50ee5765d2a5c4f1faf51f5507f0ea97b6ffcfe36c8
-AUX man-1.6g-echo-escape.patch 630 BLAKE2B add028d6c6bd11590b3f69f989aac874e6695fa53f587c7bad52305b70afadf46b19a1dd722ee3256e7d9bbf6bc1d3ca1fb393c35e3c95d8cf35e232d05358a4 SHA512 d66aa7ccc97fe1af2afe1165e2305c4ad4cd4ec48078707432a1ccd79db80f7ff11ad977175651fb6c6875e31461a1e04352f2a3b542762afaf9a07290fe03c0
-AUX man-1.6g-fbsd.patch 366 BLAKE2B 882b3b3048e3dcb4f64f38e94d7603ae577038dce6636d6b2cbcb76a96b1c54427ddff737429e9e464fc50d0956cf9a9da86c0689bb6ebd8ae84d5d8f15727a6 SHA512 4019267584b1350b2c9da9aa1851a2e4e96f271265d189ecd677206be20dac67cd212b2887f844f43c10d96076a76613a12e53f3b29a185ec62ed4bff4c5a502
-AUX man-1.6g-xz.patch 1848 BLAKE2B 6a0855eda72386a0f48e715e9ba620b3473b3aa854c42fabd93bc02b7c9cd44fbd07f2608257fe953bdfa9b02e8fa35876d651ba5aab99937fe42325fcfb7b69 SHA512 6a883fa800a6d3b11c76a70e1a31c0736d380271c9f21315863ddaca9529e3d613b587724287fb94bab2b0d97215f6ccb3f1438a5c5e339e5a2edf872c92515c
-DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man-1.6g-r1.ebuild 3707 BLAKE2B 911fb7049dbfe7a9df05628faf6d36ca4c2e2c96608ce4a1de21aed11ab4842579e6597912aad1bc851e598ee7c3b4dcfcaacb60db8c187c1650c9f77b46e01e SHA512 5f24b3780191f09142751e057ed15e182fde6c386739a594492f19d8a63e54f5273072cdc2c4cc87457836b1807af5047df1f3e2cf03a305861006992f531ee5
-MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man/files/makewhatis.cron b/sys-apps/man/files/makewhatis.cron
deleted file mode 100644
index bef5ea6d1e2d..000000000000
--- a/sys-apps/man/files/makewhatis.cron
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-# this is part of the man package
-# it updates the search database for manpages
-
-exec nice makewhatis -u
diff --git a/sys-apps/man/files/man-1.5m2-apropos.patch b/sys-apps/man/files/man-1.5m2-apropos.patch
deleted file mode 100644
index 9735a5330e88..000000000000
--- a/sys-apps/man/files/man-1.5m2-apropos.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Ripped from Fedora
-
---- man-1.5m2/src/apropos.sh
-+++ man-1.5m2/src/apropos.sh
-@@ -19,9 +19,9 @@
- 
- # When man pages in your favorite locale look to grep like binary files
- # (and you use GNU grep) you may want to add the 'a' option to *grepopt1.
--aproposgrepopt1='i'
-+aproposgrepopt1='ai'
- aproposgrepopt2=''
--whatisgrepopt1='iw'
-+whatisgrepopt1='aiw'
- whatisgrepopt2='^'
- grepopt1=$%apropos_or_whatis%grepopt1
- grepopt2=$%apropos_or_whatis%grepopt2
diff --git a/sys-apps/man/files/man-1.6-cross-compile.patch b/sys-apps/man/files/man-1.6-cross-compile.patch
deleted file mode 100644
index 184236918b91..000000000000
--- a/sys-apps/man/files/man-1.6-cross-compile.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-Fix up to work with cross-compiling ... most of these tests only 
-need to see if the example compiled, not whether it runs ...
-
---- configure
-+++ configure
-@@ -232,15 +232,13 @@
- 
- echo checking for POSIX.1 header files
- echo "#include <unistd.h>
--main() {
- #ifdef _POSIX_VERSION
--exit(0);
-+main() { exit(0); }
- #else
--exit(1);
--#endif
--}" > conftest.c
-+# error no _POSIX_VERSION
-+#endif" > conftest.c
- eval $compile
--if test -s conftest && ./conftest 2>/dev/null; then
-+if test -s conftest ; then
-   DEFS="$DEFS -DPOSIX"
- fi
- rm -f conftest conftest.c
-@@ -249,7 +247,7 @@
- echo "#include <strings.h>
- main() { exit(0); rindex(0, 0); bzero(0, 0); }" > conftest.c
- eval $compile
--if test -s conftest && ./conftest 2>/dev/null; then :
-+if test -s conftest ; then :
-   else DEFS="$DEFS -DUSG"
- fi
- rm -f conftest conftest.c
-@@ -258,7 +256,7 @@
- echo '#include <sys/types.h>
- main() { uid_t x; exit(0); }' > conftest.c
- eval $compile
--if test -s conftest && ./conftest 2>/dev/null; then :
-+if test -s conftest ; then :
- else
-   uid_t=`awk '/pw_uid;/ {print $1}' $INCLUDEDIR/pwd.h`
-   DEFS="$DEFS -Duid_t=${uid_t} -Dgid_t=${uid_t}"
-@@ -291,7 +289,7 @@
- #endif
- main() { char *p = (char *) alloca(1); exit(0); }' > conftest.c
- eval $compile
--if test -s conftest && ./conftest 2>/dev/null; then :
-+if test -s conftest ; then :
- elif test -d /usr/ucblib; then LIBS="$LIBS -L/usr/ucblib -lucb"
- elif test -f /usr/lib/libPW.a; then LIBS="$LIBS -lPW"
- else DEFS="$DEFS -DALLOCA_MISSING"
-@@ -321,7 +319,7 @@
- struct option long_opts[] = { { "", no_argument, NULL, 0 } };
- main() { exit(0); }' > conftest.c
- eval $compile
--if test -s conftest && ./conftest 2>/dev/null; then
-+if test -s conftest ; then
-   manpathoption="--path"
- else
-   manpathoption="-w"
diff --git a/sys-apps/man/files/man-1.6c-cut-duplicate-manpaths.patch b/sys-apps/man/files/man-1.6c-cut-duplicate-manpaths.patch
deleted file mode 100644
index 9ecaeb70e16e..000000000000
--- a/sys-apps/man/files/man-1.6c-cut-duplicate-manpaths.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-http://bugs.gentoo.org/90186
-
-If we have entries in MANPATH that are really symlinks to other entries,
-then many man functions will yield duplicate entries.
-
-Without this patch, we see this behavior:
-$ echo $MANPATH
-/usr/share/man:/usr/man
-$ man --path
-/usr/share/man:/usr/man
-$ ls -ld /usr/share/man /usr/man
-lrwxrwxrwx  1 /usr/man -> /usr/share/man
-drwxr-xr-x 36 /usr/share/man
-$ man -k passwd
-passwd               (1)  - change user password
-passwd               (1)  - change user password
-
-With this patch, we get:
-$ echo $MANPATH
-/usr/share/man:/usr/man
-$ man --path
-/usr/share/man
-$ ls -ld /usr/share/man /usr/man
-lrwxrwxrwx  1 /usr/man -> /usr/share/man
-drwxr-xr-x 36 /usr/share/man
-$ man -k passwd
-passwd               (1)  - change user password
-
---- man-1.6c/src/manpath.c
-+++ man-1.6c/src/manpath.c
-@@ -380,6 +380,44 @@
-      }
- }
- 
-+void trim_symlinked_manpaths (void);
-+void
-+trim_symlinked_manpaths () {
-+	/*
-+	 * Skip symlinks to other entries in path.
-+	 * Do this after we've built the entire list.
-+	 */
-+	struct stat *stat_cache;
-+	size_t i, j, size;
-+
-+	if (!mandirlist)
-+		return;
-+
-+	for (size = 0; mandirlist[size]; ++size)
-+		/* count # of elements */;
-+	if (size == 0)
-+		return;
-+	/* cache stat information for every element */
-+	stat_cache = (struct stat *) my_malloc (size * sizeof(*stat_cache));
-+	for (i = 0; i < size; ++i)
-+		stat(mandirlist[i], &stat_cache[i]);
-+
-+#define EQU_STAT(s,d) ((s).st_dev == (d).st_dev && (s).st_ino == (d).st_ino)
-+	for (i = 0; i < size; ++i) {
-+		for (j = i+1; j < size; ++j) {
-+			if (EQU_STAT(stat_cache[i], stat_cache[j])) {
-+				/* these two entries are the same, so cut out the second one */
-+				memmove(mandirlist+j, mandirlist+j+1, (size-j)*sizeof(*mandirlist));
-+				memmove(stat_cache+j, stat_cache+j+1, (size-j)*sizeof(*stat_cache));
-+				mandirlist[--size] = NULL;
-+				--j;
-+			}
-+		}
-+	}
-+
-+	free(stat_cache);
-+}
-+
- void
- init_manpath () {
-      static int done = 0;
-@@ -391,6 +431,7 @@
-               (manp = getenv ("MANPATH")) == NULL)
- 	       manp = "";		/* default path */
- 	  split (manp, to_mandirlist, 0);
-+	  trim_symlinked_manpaths ();
- 	  done = 1;
-      }
- }
diff --git a/sys-apps/man/files/man-1.6e-headers.patch b/sys-apps/man/files/man-1.6e-headers.patch
deleted file mode 100644
index 9c6fd6f43516..000000000000
--- a/sys-apps/man/files/man-1.6e-headers.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gencat/genlib.c
-+++ gencat/genlib.c
-@@ -49,10 +49,8 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
--#ifdef SYSV
- #include <sys/types.h>
- #include <unistd.h>
--#endif
- 
- #if !defined(__linux__) && !defined(__FreeBSD__)
- #include <memory.h>
diff --git a/sys-apps/man/files/man-1.6f-makewhatis-compression-cleanup.patch b/sys-apps/man/files/man-1.6f-makewhatis-compression-cleanup.patch
deleted file mode 100644
index a7d74c32be3a..000000000000
--- a/sys-apps/man/files/man-1.6f-makewhatis-compression-cleanup.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-http://bugs.gentoo.org/331979
-
-patch by William Throwe <wthrowe@mit.edu>
-
-The problem is that a failed match() resets the RSTART variable used to
-extract filename_no_gz (visible in the trailing context of the patch),
-so it is important that no more match() commands are attempted after the
-successful one.  Without the scoping, if (for example) the test for .bz2
-succeeds, it prevents testing for .lzma, but doesn't prevent testing for
-.xz.  The failing .xz test causes RSTART to be set to zero so
-filename_no_gz becomes the empty string.
-
---- man-1.6f/src/makewhatis.sh
-+++ man-1.6f/src/makewhatis.sh
-@@ -234,7 +234,7 @@
- 	    find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
- 
- 	    function readline() {
--              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
-+	      if (use_compression) {
- 		result = (pipe_cmd | getline);
- 		if (result < 0) {
- 		  print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
-@@ -249,7 +249,7 @@
- 	    }
- 	    
- 	    function closeline() {
--              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
-+	      if (use_compression) {
- 		return close(pipe_cmd);
- 	      } else {
- 		return close(filename);
-@@ -263,16 +263,20 @@
- 	      if (verbose) {
- 		print "adding " filename > "/dev/stderr"
- 	      }
--	      
-+
- 	      use_zcat = match(filename,"\\.Z$") ||
- 			 match(filename,"\\.z$") || match(filename,"\\.gz$");
--	      if (!use_zcat)
-+	      if (!use_zcat) {
- 		use_bzcat = match(filename,"\\.bz2");
--              if(!use_bzcat)
--                use_lzcat = match(filename,"\\.lzma");
--              if(!use_lzcat)
--                use_xzcat = match(filename,"\\.xz");
--              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
-+		if (!use_bzcat) {
-+		  use_lzcat = match(filename,"\\.lzma");
-+		  if (!use_lzcat) {
-+		    use_xzcat = match(filename,"\\.xz");
-+		  }
-+		}
-+	      }
-+	      use_compression = (use_zcat || use_bzcat || use_lzcat || use_xzcat);
-+	      if (use_compression) {
- 		filename_no_gz = substr(filename, 0, RSTART - 1);
- 	      } else {
- 		filename_no_gz = filename;
-@@ -285,7 +289,7 @@
- 		actual_section = section;
- 	      }
- 	      sub(/\..*/, "", progname);
--              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
-+	      if (use_compression) {
- 		if (use_zcat) {
- 		  pipe_cmd = "zcat \"" filename "\"";
-                 } else if (use_bzcat) {
diff --git a/sys-apps/man/files/man-1.6f-man2html-compression-2.patch b/sys-apps/man/files/man-1.6f-man2html-compression-2.patch
deleted file mode 100644
index b79b3a1872f1..000000000000
--- a/sys-apps/man/files/man-1.6f-man2html-compression-2.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-add support for bzip2/lzma to man2html and friends
-
---- man2html/glimpse_filters
-+++ man2html/glimpse_filters
-@@ -1,3 +1,6 @@
-+*.bz2	bzip2 -d -c
-+*.lzma	lzma -d -c
-+*.xz	xz -d -c
- *.gz	gzip -d -c
- *.Z	gzip -d -c
- 
---- man2html/scripts/cgi-bin/man/man2html
-+++ man2html/scripts/cgi-bin/man/man2html
-@@ -93,6 +93,12 @@
-     *.bz2)
- 	bzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
- 	;;
-+    *.lzma)
-+	lzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
-+	;;
-+    *.xz)
-+	xzcat "$PAGE" | "$MAN2HTML" "$LL" -D "$PAGE"
-+	;;
-     *)
- 	"$MAN2HTML" "$LL" "$PAGE"
- 	;;
-@@ -103,6 +106,12 @@
- elif [ -r "$PAGE".bz2 ]
- then
- 	bzcat "$PAGE".bz2 | "$MAN2HTML" "$LL" -D "$PAGE"
-+elif [ -r "$PAGE".lzma ]
-+then
-+	lzcat "$PAGE".lzma | "$MAN2HTML" "$LL" -D "$PAGE"
-+elif [ -r "$PAGE".xz ]
-+then
-+	xzcat "$PAGE".xz | "$MAN2HTML" "$LL" -D "$PAGE"
- else
- 	"$MAN2HTML" -E "Strange... Cannot find (or read) $PAGE."
- fi
---- man2html/scripts/cgi-bin/man/mansearch
-+++ man2html/scripts/cgi-bin/man/mansearch
-@@ -153,7 +153,7 @@
-       }
-       print "<DT> <a href=\"" cgipath "/man2html?" fullname "\">";
-       textname = filename;
--      sub(/\.(gz)|Z|z$/, "", textname);
-+      sub(/\.([zZ]|gz|bz2|lzma|xz)$/, "", textname);
-       sub(/\./, "(", textname);
-       textname = textname ")";
-       print textname;
---- man2html/scripts/cgi-bin/man/mansec
-+++ man2html/scripts/cgi-bin/man/mansec
-@@ -128,7 +128,7 @@
- 				# Print out alphabetic quick index and other links
-       }
- 				# Split page.n into "page" and "n" and generate an entry
--      sub(/[.]([zZ]|(gz))$/, "", manpage);
-+      sub(/[.]([zZ]|gz|bz2|lzma|xz)$/, "", manpage);
-       match(manpage, /[.][^.]+$/);      
-       title = substr(manpage, 1, RSTART - 1);
-       if (section != "all") {
diff --git a/sys-apps/man/files/man-1.6f-parallel-build.patch b/sys-apps/man/files/man-1.6f-parallel-build.patch
deleted file mode 100644
index 41918d9244da..000000000000
--- a/sys-apps/man/files/man-1.6f-parallel-build.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-http://bugs.gentoo.org/207148
-
-patch by Kevin Pyle to fix parallel build issues
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -42,9 +42,12 @@
- makemsg:
- 	$(BUILD_CC) -o makemsg makemsg.c
- 
--msg.c gripedefs.h: ../msgs/mess.en makemsg
-+gripedefs.h: ../msgs/mess.en makemsg
- 	./makemsg ../msgs/mess.en gripedefs.h msg.c
- 
-+# avoid parallel build issues with makemsg
-+msg.c: gripedefs.h
-+
- # glob.c does not have prototypes
- glob.o: glob.c ndir.h
- 	$(CC) -c $(CWARNNP) $(CFLAGS) -I. $(DEFS) glob.c
-
-http://bugs.gentoo.org/258916
-
-avoid:
-	make[2]: warning: jobserver unavailable: using -j1.  Add `+' to parent make rule.
-
---- a/man/Makefile.in
-+++ b/man/Makefile.in
-@@ -3,7 +3,7 @@
- MAN5 = man.conf
- MAN8 = makewhatis
- ALL = man.1 whatis.1 apropos.1 man.conf.5
--MAYBE8 = makewhatis
-+MAYBE8 = $(wildcard makewhatis.man)
- 
- .SUFFIXES: .man .1 .5 .8
- 
-@@ -21,9 +21,7 @@
- # Where to put the manual pages.
- mandir = $(DESTDIR)$(PREFIX)@mandir@$(SLANG)
- 
--all:	$(ALL)
--	for i in $(MAYBE8); \
--		do if test -f $$i.man; then make -f ../Makefile $$i.8; fi; done
-+all:	$(ALL) $(MAYBE8:.man=.8)
- 
- install: $(ALL)
- 	mkdir -p $(mandir)/man1 $(mandir)/man5 $(mandir)/man8
-@@ -39,18 +37,17 @@
- 
- spotless:
- 
--subdirs:
--	@for i in @languages@; do if test -d $$i; then echo; \
--		echo "==== Making the `cat $$i.txt` man pages. ===="; \
--		cd $$i; make -f ../Makefile; cd ..; \
--		else echo "==== No $$i man pages found. ===="; fi; done
--
--installsubdirs:
--	@for i in @languages@; do if test -d $$i; then echo; \
--		echo "==== Installing the `cat $$i.txt` man pages. ===="; \
--		cd $$i; SLANG=/$$i; if test $$SLANG = /en; then SLANG= ; fi; \
--		export SLANG; make -f ../Makefile install; cd ..; \
--		else echo "==== No $$i man pages found. ===="; fi; done
-+MAN_LANGS = $(wildcard @languages@)
-+subdirs: $(MAN_LANGS:=_lang_subdir)
-+%_lang_subdir:
-+	@echo "==== Making the `cat $(@:_lang_subdir=).txt` man pages. ===="
-+	$(MAKE) -f ../Makefile -C $(@:_lang_subdir=)
-+
-+installsubdirs: $(MAN_LANGS:=_lang_installsubdir)
-+%_lang_installsubdir:
-+	@echo "==== Making the `cat $(@:_lang_installsubdir=).txt` man pages. ===="
-+	$(MAKE) -f ../Makefile -C $(@:_lang_installsubdir=) install \
-+		SLANG=`s=$(@:_lang_installsubdir=); test $$s = en || echo /$$s`
- 
- cleansubdirs:
- 	@for i in ??; do cd $$i; make -f ../Makefile clean; cd ..; done
diff --git a/sys-apps/man/files/man-1.6f-so-search-2.patch b/sys-apps/man/files/man-1.6f-so-search-2.patch
deleted file mode 100644
index ac42c8df7b37..000000000000
--- a/sys-apps/man/files/man-1.6f-so-search-2.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-improve the uncompressed .so search
-
---- a/src/man.c
-+++ b/src/man.c
-@@ -381,13 +381,23 @@ again:
- 	  }
- 	  /*
- 	   * Some people have compressed man pages, but uncompressed
--	   * .so files - we could glob for all possible extensions,
--	   * for now: only try .gz
-+	   * .so files - we should discover this list dynamically, but
-+	   * for now just hardcode it.
- 	   */
--	  else if (fp == NULL && get_expander(".gz") &&
--		   strlen(name)+strlen(".gz") < BUFSIZE) {
--	       strcat(name, ".gz");
--	       fp = fopen (name, "r");
-+	  else if (fp == NULL) {
-+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
-+	       size_t i, name_len = strlen(name);
-+	       const char *extensions[] = { ".gz", ".bz2", ".lzma", ".xz", ".z", ".Z" };
-+	       for (i = 0; i < ARRAY_SIZE(extensions); ++i) {
-+		    const char *comp = extensions[i];
-+		    name[name_len] = '\0';
-+		    if (get_expander(comp) && name_len+strlen(comp) < BUFSIZE) {
-+			 strcat(name, comp);
-+			 fp = fopen(name, "r");
-+			 if (fp)
-+			      break;
-+		    }
-+	       }
- 	  }
- 
- 	  if (fp == NULL) {
diff --git a/sys-apps/man/files/man-1.6f-unicode.patch b/sys-apps/man/files/man-1.6f-unicode.patch
deleted file mode 100644
index 89d3821df3ca..000000000000
--- a/sys-apps/man/files/man-1.6f-unicode.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-let the active locale work its magic
-
-http://bugs.gentoo.org/146315
-
---- man-1.6f/configure
-+++ man-1.6f/configure
-@@ -473,9 +473,9 @@
-   then
-     if test $Fnroff = "missing"
-     then
--      nroff="nroff -Tlatin1 -mandoc"
-+      nroff="nroff -Tascii -c -mandoc"
-     else
--      nroff="$Fnroff -Tlatin1 -mandoc"
-+      nroff="$Fnroff -mandoc"
-     fi
-     troff="troff -mandoc"
-     echo "Warning: could not find groff"
-@@ -484,7 +484,7 @@
-     then
-       nroff="$Fgroff -Tlatin1 -mandoc"
-     else
--      nroff="$Fnroff -Tlatin1 -mandoc"
-+      nroff="$Fnroff -mandoc"
-     fi
-     troff="$Fgroff -Tps -mandoc"
-     jnroff="$Fgroff -Tnippon -mandocj"
-
diff --git a/sys-apps/man/files/man-1.6g-compress.patch b/sys-apps/man/files/man-1.6g-compress.patch
deleted file mode 100644
index 374d80730074..000000000000
--- a/sys-apps/man/files/man-1.6g-compress.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-allow selection of default cache compressor
-
-http://bugs.gentoo.org/205147
-
---- configure
-+++ configure
-@@ -1012,6 +1012,10 @@
-       done
-     done
- 
-+    if [ x$COMPRESS != x ]; then
-+      compress=$COMPRESS
-+    fi
-+
-     if [ x$default = x ]; then
-       echo ""
-       echo "What program should be used to compress the formatted pages?"
diff --git a/sys-apps/man/files/man-1.6g-echo-escape.patch b/sys-apps/man/files/man-1.6g-echo-escape.patch
deleted file mode 100644
index 96e950a51e86..000000000000
--- a/sys-apps/man/files/man-1.6g-echo-escape.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-avoid using escape sequences in echo as they're not portable
-
-https://bugs.gentoo.org/523874
-
---- a/src/man.c
-+++ b/src/man.c
-@@ -626,7 +626,7 @@ make_roff_command (const char *path, const char *file) {
- 		 the current position plus 10 lines.  This plus setpl()
- 		 gives us a single page that just contains the whole
- 		 man page. (William Webber, wew@cs.rmit.edu.au) */
--	      strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \\n(nlu+10\"");
-+	      strcat(buft, "; echo \".\\\\\\\"\"; echo \".pl \"; echo \"(nlu+10\"");
- #if 0
- 	      /* In case this doesnt work for some reason,
- 		 michaelkjohnson suggests: I've got a simple
diff --git a/sys-apps/man/files/man-1.6g-fbsd.patch b/sys-apps/man/files/man-1.6g-fbsd.patch
deleted file mode 100644
index ef01a6e01fc0..000000000000
--- a/sys-apps/man/files/man-1.6g-fbsd.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixes compilation in FreeBSD
-
-http://bugs.gentoo.org/138123
-
---- man-1.6g/gencat/genlib.c
-+++ man-1.6g/gencat/genlib.c
-@@ -54,7 +54,7 @@
- #include <unistd.h>
- #endif
- 
--#if !defined(__linux__) && !defined(__CYGWIN__)
-+#if !defined(__linux__) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
- #include <memory.h>
- static int bcopy(src, dst, length)
- char *src, *dst;
diff --git a/sys-apps/man/files/man-1.6g-xz.patch b/sys-apps/man/files/man-1.6g-xz.patch
deleted file mode 100644
index fcf91f71d376..000000000000
--- a/sys-apps/man/files/man-1.6g-xz.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-add support for xz
-
-http://bugs.gentoo.org/302380
-
---- a/src/makewhatis.sh
-+++ b/src/makewhatis.sh
-@@ -230,7 +230,7 @@
- 	    find $mandir/${pages}$i/. -name '*' $findarg0 $findarg -print | $AWK '
- 
- 	    function readline() {
--              if (use_zcat || use_bzcat || use_lzcat) {
-+              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- 		result = (pipe_cmd | getline);
- 		if (result < 0) {
- 		  print "Pipe error: " pipe_cmd " " ERRNO > "/dev/stderr";
-@@ -245,7 +245,7 @@
- 	    }
- 	    
- 	    function closeline() {
--              if (use_zcat || use_bzcat || use_lzcat) {
-+              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- 		return close(pipe_cmd);
- 	      } else {
- 		return close(filename);
-@@ -266,7 +266,9 @@
- 		use_bzcat = match(filename,"\\.bz2");
-               if(!use_bzcat)
-                 use_lzcat = match(filename,"\\.lzma");
--              if (use_zcat || use_bzcat || use_lzcat ) {
-+              if(!use_lzcat)
-+                use_xzcat = match(filename,"\\.xz");
-+              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- 		filename_no_gz = substr(filename, 0, RSTART - 1);
- 	      } else {
- 		filename_no_gz = filename;
-@@ -279,13 +281,15 @@
- 		actual_section = section;
- 	      }
- 	      sub(/\..*/, "", progname);
--              if (use_zcat || use_bzcat || use_lzcat) {
-+              if (use_zcat || use_bzcat || use_lzcat || use_xzcat) {
- 		if (use_zcat) {
- 		  pipe_cmd = "zcat \"" filename "\"";
-                 } else if (use_bzcat) {
- 		  pipe_cmd = "bzcat \"" filename "\"";
--                } else {
-+                } else if (use_lzcat) {
-                   pipe_cmd = "lzcat \"" filename "\"";
-+                } else {
-+                  pipe_cmd = "xzcat \"" filename "\"";
-                 }
- 		# try to avoid suspicious stuff
- 		if (filename ~ /[;&|`$(]/) {
diff --git a/sys-apps/man/man-1.6g-r1.ebuild b/sys-apps/man/man-1.6g-r1.ebuild
deleted file mode 100644
index f5e27dee9435..000000000000
--- a/sys-apps/man/man-1.6g-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils prefix toolchain-funcs user
-
-DESCRIPTION="Standard commands to read man pages"
-HOMEPAGE="http://primates.ximian.com/~flucifredi/man/"
-SRC_URI="http://primates.ximian.com/~flucifredi/man/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="+lzma nls selinux"
-
-DEPEND="nls? ( sys-devel/gettext )"
-RDEPEND=">=sys-apps/groff-1.19.2-r1
-	!sys-apps/man-db
-	!<app-arch/lzma-4.63
-	lzma? ( app-arch/xz-utils )
-	selinux? ( sec-policy/selinux-makewhatis )"
-
-pkg_setup() {
-	enewgroup man 15
-	enewuser man 13 -1 /usr/share/man man
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/man-1.6f-man2html-compression-2.patch
-	epatch "${FILESDIR}"/man-1.6-cross-compile.patch
-	epatch "${FILESDIR}"/man-1.6f-unicode.patch #146315
-	epatch "${FILESDIR}"/man-1.6c-cut-duplicate-manpaths.patch
-	epatch "${FILESDIR}"/man-1.5m2-apropos.patch
-	epatch "${FILESDIR}"/man-1.6g-fbsd.patch #138123
-	epatch "${FILESDIR}"/man-1.6e-headers.patch
-	epatch "${FILESDIR}"/man-1.6f-so-search-2.patch
-	epatch "${FILESDIR}"/man-1.6g-compress.patch #205147
-	epatch "${FILESDIR}"/man-1.6f-parallel-build.patch #207148 #258916
-	epatch "${FILESDIR}"/man-1.6g-xz.patch #302380
-	epatch "${FILESDIR}"/man-1.6f-makewhatis-compression-cleanup.patch #331979
-	epatch "${FILESDIR}"/man-1.6g-echo-escape.patch #523874
-	# make sure `less` handles escape sequences #287183
-	sed -i -e '/^DEFAULTLESSOPT=/s:"$:R":' configure
-}
-
-echoit() { echo "$@" ; "$@" ; }
-src_configure() {
-	strip-linguas $(eval $(grep ^LANGUAGES= configure) ; echo ${LANGUAGES//,/ })
-
-	unset NLSPATH #175258
-
-	tc-export CC BUILD_CC
-
-	local mylang=
-	if use nls ; then
-		if [[ -z ${LINGUAS} ]] ; then
-			mylang="all"
-		else
-			mylang="${LINGUAS// /,}"
-		fi
-	else
-		mylang="none"
-	fi
-	export COMPRESS
-	if use lzma ; then
-		COMPRESS="${EPREFIX}"/usr/bin/xz
-	else
-		COMPRESS="${EPREFIX}"/bin/bzip2
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		hprefixify configure || die
-		sed -i \
-			-e "s/man_user=root/man_user=$(id -u)/"  \
-			-e "s/man_group=man/man_group=$(id -g)/" \
-			configure || die "Failed to disable suid/sgid options for man"
-		sed -i -e 's:/usr/bin:@bindir@:' man2html/Makefile.in || die
-	fi
-
-	echoit \
-	./configure \
-		-bindir="${EPREFIX}"/usr/bin \
-		-confdir="${EPREFIX}"/etc \
-		+sgid +fhs \
-		+lang ${mylang} \
-		|| die "configure failed"
-}
-
-src_install() {
-	unset NLSPATH #175258
-
-	emake PREFIX="${D}" install
-	dosym man /usr/bin/manpath
-
-	dodoc LSM README* TODO
-
-	# makewhatis only adds man-pages from the last 24hrs
-	exeinto /etc/cron.daily
-	newexe "${FILESDIR}"/makewhatis.cron makewhatis
-
-	keepdir /var/cache/man
-	[[ -z ${EPREFIX} ]] && diropts -m0775 -g man
-	local mansects=$(grep ^MANSECT "${ED}"/etc/man.conf | cut -f2-)
-	for x in ${mansects//:/ } ; do
-		keepdir /var/cache/man/cat${x}
-	done
-}
-
-pkg_postinst() {
-	einfo "Forcing sane permissions onto ${ROOT}var/cache/man (Bug #40322)"
-	chown -R root:man "${ROOT}"/var/cache/man
-	chmod -R g+w "${ROOT}"/var/cache/man
-	[[ -e ${ROOT}/var/cache/man/whatis ]] \
-		&& chown root:0 "${ROOT}"/var/cache/man/whatis
-
-	echo
-
-	local f files=$(ls "${ROOT}"/etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
-	for f in ${files} ; do
-		[[ ${f} == */etc/cron.daily/makewhatis ]] && continue
-		[[ $(md5sum "${f}") == "8b2016cc778ed4e2570b912c0f420266 "* ]] \
-			&& rm -f "${f}"
-	done
-	files=$(ls "${ROOT}"etc/cron.{daily,weekly}/makewhatis{,.cron} 2>/dev/null)
-	if [[ ${files/$'\n'} != ${files} ]] ; then
-		ewarn "You have multiple makewhatis cron files installed."
-		ewarn "You might want to delete all but one of these:"
-		ewarn ${files}
-	fi
-}
diff --git a/sys-apps/man/metadata.xml b/sys-apps/man/metadata.xml
deleted file mode 100644
index 56c124413057..000000000000
--- a/sys-apps/man/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-apps/man2html/Manifest b/sys-apps/man2html/Manifest
index 2b5ba25b6610..00b04592f36c 100644
--- a/sys-apps/man2html/Manifest
+++ b/sys-apps/man2html/Manifest
@@ -2,5 +2,5 @@ AUX man-1.6-cross-compile.patch 1743 BLAKE2B c94335e791ee5385f747f473ee6d4293524
 AUX man-1.6f-man2html-compression-2.patch 1725 BLAKE2B 314c3f3eccb90db6419b6069679457f24e3f5dbaa4ec466513f7a553886db1e25572a07ab8e74676df5bcb3d7a991ac58aa876d3abb780d5bdb415c4c8b1bfd3 SHA512 c7dc78f75876882e4f241ededd61ab1dad9292e2aa91d82c09e0e4a81c6a97d6537c8bb4b9154a17cb1db47d8716464b8146ccd487545e3f5c317482ad86e0bb
 AUX man-1.6g-compress.patch 343 BLAKE2B b91a16bd5f0a1a5e7a83cf225659c204b6b3fd8785251171bba6a229eb6e1f721c3ff8b04379d09fa39d44984757342139d053ecde821aa6ebcb9de914765af1 SHA512 eab984c95b75bbf29b65ff38029bbcfa870972fa2cff208da5d4d43c89dd0ceeb32a8faceb43836ced9ff50ee5765d2a5c4f1faf51f5507f0ea97b6ffcfe36c8
 DIST man-1.6g.tar.gz 256906 BLAKE2B f13e21400aecd41a5f001b37bf3c6f9fd8463ff627f761cfd0a6846c7b8dac48a6dc87ff2cf4786b55800a558141cffcc0d66420943e46f708292f5653b42d51 SHA512 c786fa2201aed92293e5590dc3ad5d550cf14e5059fa274ef7719af86ee4c892e747576495b6dc0a09286e73e2f0f0caf860216e0c8032d9ef13e5d26853048b
-EBUILD man2html-1.6g.ebuild 1199 BLAKE2B af3fccae1a9d955fdf5d40e7582f46be98a85c71025c8d440c3d0e55045bb2c099124212bbc9f38e5b89d793702c3f7a580dccb613b5e7b4b244073b310c3eaf SHA512 edcfe072b721eee7ec80780699909c23cefea67ef36a0434cbfc3a888f6288cd5fb4709ec3cba9518936d628db9b5f2d061024cbd275b9184483829eef6026fc
+EBUILD man2html-1.6g.ebuild 1196 BLAKE2B 04d23dad9f06f11b2a289326a9c66986861bd20c90f8b1e04400c88175a794e4b17f0a1b3b1e1f3c55dcd4198f363868316912b606f6c6d94d39c45505619fbb SHA512 48335178189d63fc10bcdbf83c58a05e2fe8a96ff0aed76b2d207195f9af795537a2c3237124e9b03003b49ccc4101f5444e0fa98bb3019f3fe10b39c7e1d5ff
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/man2html/man2html-1.6g.ebuild b/sys-apps/man2html/man2html-1.6g.ebuild
index cc39059ea149..6fbf711c9ca0 100644
--- a/sys-apps/man2html/man2html-1.6g.ebuild
+++ b/sys-apps/man2html/man2html-1.6g.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://primates.ximian.com/~flucifredi/man/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 RDEPEND="!sys-apps/man"
diff --git a/sys-apps/mawk/Manifest b/sys-apps/mawk/Manifest
index def836215939..2cad7d0dae84 100644
--- a/sys-apps/mawk/Manifest
+++ b/sys-apps/mawk/Manifest
@@ -1,7 +1,7 @@
 DIST mawk-1.3.4-20161120.tgz 461464 BLAKE2B 7481345b391198cc9ec47f6ad84f0f07e31c931a40d59bde401d00ea7bc74b728c8149f80187e5d73923496e2eef1ec70bc097aedf0b68630f73264d45d96ebd SHA512 c5edcbff4ab1e40eb9b178a045fcd426a5f3c93a3ab5bc1ca1fa85a0977b8c9060967fcbda4e4a6e9e68628f50a2814e22939676008dced529377d2cf9bda5b2
 DIST mawk-1.3.4-20190203.tgz 466481 BLAKE2B f647c52872ff510f02ab44f13f6c51497abdecf3d6ab40faa2e419f726a15ebdb531607465bcaf2f53d032284251f9fd25e73734a72fc31c014a0a9f200613ed SHA512 64d5b1838d34d30e32966f46cb7457c865caccfe9fe1049d2645ba301b1ddb4efc18588115dbcf96234a2a0b791211a7f82264a3c81899459dc3029e65837646
 DIST mawk-1.3.4-20200106.tgz 468031 BLAKE2B b125eecf780f0658d3a1c06875fdac221ffe5999e38646d71b15159c50271a7bbfb594fb6347442239c3eab6703f9c782739bd2a5a055e1ff8cd44a0e8a6545d SHA512 f6f65f3b73965f520a6f9bb7e2b6ad2a3c532c0768461744e6cfb2e72e2c718dacd1c5eea995dfa267facfc4e0ee71d337809cd45d5c75cfbc65294b45280ff9
-EBUILD mawk-1.3.4_p20161120.ebuild 861 BLAKE2B 350f7432f0ad79f494d7ad4902c25e7c3207c3f5970386e5651ea8f80b8267c353dc74b206a28254f159c3350b2eddbf4d26aa3f79afe343a9e97bfe908f6ec3 SHA512 a93740be50a7c1d18d1549872e5a5a25e58d16bcbd07d5f07cf8f17b6ab4f79f7577b202e0544029b38db184e687f4a929d709f0efd5cf6a4617417e6413ca73
-EBUILD mawk-1.3.4_p20190203-r1.ebuild 874 BLAKE2B dbe9ab4f5bbadf78e1b86c1f1161dd96d795d7e744b3caff1149ebbc85c2f45842fedb01df0649d9676c9488d998adb1daacbeec81a5ac609ec29f6efbb78ed3 SHA512 c0239d36b1b88c8094cf75167dfc65db56b7329a44297cea02fe579a3f07ed804dcae77517875467fe5ffc571cd347dec26b98560981d505548c68582b64101e
-EBUILD mawk-1.3.4_p20200106-r1.ebuild 882 BLAKE2B f76f8c13ce3ea63d330455091223707a24b12ee87b634c00da4c808de7b602d82b051ae0f28464b2cc6ec8be245c0e38ca39b58292fbdb9141fdbabec8b32924 SHA512 2f024e689e5198c622bfe666669285fcf9a0b68d4bb8355aedb2dc71956a963df5983211fd42cf482fe157252539550ed5765f0c17631e746c9de30621fed6fe
+EBUILD mawk-1.3.4_p20161120.ebuild 858 BLAKE2B 538082458c682fa329e576527df38d8bac43a73a7d680c59b0e2e73d343df61b91ec557dde525c263b3ac25c0bca52ba26819041010b095bb7b1377f79f07774 SHA512 988366417da4caefbfa19f5f77ec4b0bfc9824e31a140d459d92cb4a60ffde3afed56988d617a041596e00e366e128a6e6b87752eb424b8a7aefeff569fc0aca
+EBUILD mawk-1.3.4_p20190203-r1.ebuild 870 BLAKE2B 6807ee81efefa0b20bf167339f9d41666deea695335f1aa0aa4c027fb72c1c0cb24e100a5da8744d166397063c106beda877c018f89a2d6adfff59f0d1798c0a SHA512 e243b88614393657de85748fd449fbbd08d7bd2541fa00a3297566b8934b882026b3a4d0153405f36844632ef2a5ce76a63e351d6cb8eb73f8c674d271a5152f
+EBUILD mawk-1.3.4_p20200106-r1.ebuild 878 BLAKE2B 9ea1062423e2e93323595c5c9f164ef4953977765d444d3b6b0d36740d065fef48ffd32059796ad791ff6ff5dac4966584f920db4745ab9e46d9034e2f751108 SHA512 999bf4050651e251ed52f1886d2f3e0fde46a7d979772c5088a9403ce881faa5ba152160b975e747710ef3cc14b9c7f7ff7435c5cc0c3e6709c48d368dceee8d
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
index e40aa830d637..93e24c1e895e 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20161120.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://invisible-island.net/mawk/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/mawk/mawk-1.3.4_p20190203-r1.ebuild b/sys-apps/mawk/mawk-1.3.4_p20190203-r1.ebuild
index 110cbc7c9a0f..c65ac1f64223 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20190203-r1.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20190203-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="ftp://ftp.invisible-island.net/mawk/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild b/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild
index 7645505ca1f2..03a7db27a514 100644
--- a/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild
+++ b/sys-apps/mawk/mawk-1.3.4_p20200106-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://invisible-mirror.net/archives/${PN}/${MY_P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
 
 RDEPEND="app-eselect/eselect-awk"
 DEPEND="${RDEPEND}"
diff --git a/sys-apps/miscfiles/Manifest b/sys-apps/miscfiles/Manifest
index e9e1b3d4425e..eb2e1e19f267 100644
--- a/sys-apps/miscfiles/Manifest
+++ b/sys-apps/miscfiles/Manifest
@@ -1,4 +1,4 @@
 DIST UnicodeData-10.0.0.txt.xz 158456 BLAKE2B 2f4442c4bb26639e748f6a2b799e128ec9ffee357e13524ee4fe54e8df37b2916b03a209c71681b5049aefe000a896898e23879b7fccc7066e42061b42515b2e SHA512 85e8c7b33d71025a5f6f109e28010a5d5167f1aeb86c88eedd2e5ea5cecae3d1be741e5b0113a78566f51e8e15812a180a8c43c6b887385fec157d744c7a4a9c
 DIST miscfiles-1.5.tar.gz 1585293 BLAKE2B 816197e72192e8b41839eb29d501a148f95496a7f3e7be469184e9396cc34fc95c161207edb60a5b7f8d43fe50c58202f0b16b2e4b1ce188527718e4f85e24bb SHA512 d7ab23a709539278cce59e0c32bfcb3a0f11dc52ef537e3823e72382962af7f4fedb8b957f39ff1da51a93a00e3c4f6ec29f7332d7879c77fd7f4ec0ee4f82aa
-EBUILD miscfiles-1.5-r3.ebuild 1815 BLAKE2B f2d0d102505fd4c3bab90652c62e37e2335bb649a6c26643f0ce2d971fd43ae00c16fcb0d0a177dcc2d20323b782b24d68894b4fb7d11cf8dc8ebafb00eec3a3 SHA512 3941342d873c61144b9d4e98cfbd3cfe3ddf0477f5ef52302001920d19cc5823eb2c58d2897eeb173fffca1a0b84e8afb330492b6344f0fe82e1dabf2e6511d0
+EBUILD miscfiles-1.5-r3.ebuild 1812 BLAKE2B 9fe61ff458dcd814141c238dcc308a8f3a1f1c4d6d28ba54a511ea46b1444817ec4c2636520e47ddd4a6d88fabcafe04a6fee06ec9c455525b84ae7abd6a1183 SHA512 34ba81efad9a84a0e0bf1d99ad1ac43baed2f4697b29bd4a6c5157d863c806f226971e4c125413804b7e662dc8cd1c487d19ff2c2d597ca9c0547c9b616cd975
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
index aa11dccf1ee7..e845231e8376 100644
--- a/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
+++ b/sys-apps/miscfiles/miscfiles-1.5-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/miscfiles/${P}.tar.gz
 
 LICENSE="GPL-2 unicode"
 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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x86-solaris"
 IUSE="minimal"
 
 # Collides with older versions/revisions
diff --git a/sys-apps/mlocate/Manifest b/sys-apps/mlocate/Manifest
index fb4a882ac105..3a0427d39fcb 100644
--- a/sys-apps/mlocate/Manifest
+++ b/sys-apps/mlocate/Manifest
@@ -2,5 +2,5 @@ AUX mlocate-cron.conf 237 BLAKE2B 531d6461309b520db31ab8f682ebbe56f2cd425222ebbc
 AUX mlocate.cron-r3 1389 BLAKE2B 678aa37c9a092d0caccca9279f6d75aa1c23a39a36bdf2006ff0c64009a783a302eaae148d9bd88ea49af44647f64ede301e131f586e77381cac314eaa808a68 SHA512 20a25a7f83886a43cb61599a65ae78170d1b5cececc953117986d27cbfb6707cbf3613b569e0bc24ce6416ce1f2cc792dd5968f0e1bf3a7a6ae72c4e10b638c2
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
 DIST mlocate-0.26.tar.xz 359204 BLAKE2B 48ff448b0316169b35a3c421970b280632c4a056b7566d8fda7a2c3284ef46d3abaaa96e2411d9e408cc39466577a5bd3f8fde3376178e8b7bcc9e4e01997bd7 SHA512 b1207047e30a551cba39e70812439b554def567ebe9b8b81fed6f26435bb575beafe4875a21cd72876eadd85da4e7bfc942eb28b17c430b537c351690364837f
-EBUILD mlocate-0.26-r2.ebuild 1565 BLAKE2B c1da651882e5333b91617fa0f4ae649a045031429b16cf95851b994713cb6de5ae06eb31ea1568b5e6e83b8a4990e64d6f17d900e01ace0a04407e123ad55d45 SHA512 043d9069eef6dddb08aa15293bbc744e83a5746baf28decd85e70860efd5e0cee4bb9f0cb03eec4ac62fbe91068c7b0c91cfda0764c63efd77ce18ffa6bd5859
+EBUILD mlocate-0.26-r2.ebuild 1562 BLAKE2B 6114fce54e528534a815a94ef479516759a2f61eddbedad2afc0f076720785547a9875732a36e1efb64ecfb8c723fcacaaab223c02b1c3bcec02b24e462ceae4 SHA512 2b28c5d4dba3db6ec17fe3a6fded9bdefccf2e0ba79d6f70fb0ffb61351147e5310a4fb07c158b8d252e1e82e58629ed54e552a1e8d6d2bdffee896776bb5ddc
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/mlocate/mlocate-0.26-r2.ebuild b/sys-apps/mlocate/mlocate-0.26-r2.ebuild
index 307d5450366d..1517b0d5716e 100644
--- a/sys-apps/mlocate/mlocate-0.26-r2.ebuild
+++ b/sys-apps/mlocate/mlocate-0.26-r2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://releases.pagure.org/mlocate/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="nls selinux"
 
 RDEPEND="!sys-apps/slocate
diff --git a/sys-apps/mlxup-bin/Manifest b/sys-apps/mlxup-bin/Manifest
new file mode 100644
index 000000000000..2e5a07ea573e
--- /dev/null
+++ b/sys-apps/mlxup-bin/Manifest
@@ -0,0 +1,6 @@
+DIST mlxup-4.13.0-amd64.elf 12553984 BLAKE2B 4eb0cdf232156d227e07b6ce05fb7106b106c885f70b38e947c70ecffd871a143a68064175166ae07a02674e618ceaa09111c38f9d6a61510cb771649f3f5441 SHA512 ae884d0ca3a6fe11944362e6d361765a06da736780e4009192af66aa43fce20294dcfad8cb2ee1be25ac22720b30c75fff1d3736597830c1dd8a602decbb666f
+DIST mlxup-4.13.0-x86.elf 12223208 BLAKE2B 55c2e9624d143be6edc909faa3cf15135057aa332f4d69aa94f3dcd56041b346c90dbf16648e5d69546a58b0ae0890b92991ab1373c585bd9fed4faad915b41f SHA512 871a58981e463217932f25e5deff1eb04e427127847f9d65f13c08208a90390050b06f17613cd7e67d15bc738afed1908c13a8f3f78e44df6684f8b9b2cf5c68
+DIST mlxup_release_notes_v4.13.0.pdf 318733 BLAKE2B 1d026863a816368fc0e67dbaa37ab79eb4ea42d59a9e453f166dcf7bd106ddfb5244f0a502e2f6fc24f05b735e347061dd0951165980751f4983ec006552cb90 SHA512 8dde6170d77577519ae0b798b8045aaf17ccba90a4c6b40194ed684e06c0efffda10177cc1e3da4373d1d5ae3e20561725d635cd0fd8a6c425a64b7c5a7bcfbd
+DIST mlxup_user_guide_v1.4.pdf 307547 BLAKE2B e6fc418fbb8b89537cbe53ffd47a8bff00760c9579363343a9e808fe46584966aa7de3dc5f63e4ca8c1147af6afb118737f13b5eca3d1b15359b6bd8e3a09e03 SHA512 eff877d0254eb1bc8e2b8e29f6c669f8016e06f3d793b23ba58c523e993cb4a15efeec64d66acd7dde98ee1e8b15545ec20bee4f2c908464174a1552b70fd37a
+EBUILD mlxup-bin-4.13.0.ebuild 1126 BLAKE2B b346ff3952a6496e157fdab1ae3d7387bc776bf99c5ba43154a3104d8b5f47cc6c02cdb84e085985cc580557c5ad12207f64bb52cd9e0076e4e6c8e688212420 SHA512 ef89acbfe2ef16197ca84d50c7ca32c7e0fa9463e5cf8092ec2a6d72dbc20af4a5e4d1b93b9d01b427633cebe58384ccfe907b49eaac6fb04056ebba9633ee15
+MISC metadata.xml 255 BLAKE2B 2bb3830b8cec850703f7912f4c22f5b0abeabeed0715222bc56141779d02160773cfd0f85417c553c1cd8f2738bfeb78c56dffb8e648e572019319657646d1ba SHA512 522158915afe67937f81ba572a918a2de8ca1f8591e097da56799c97870d7c44756c1acd8224d63bd3375c2b9ebc0e1ce50816899117948a48065a27804883bf
diff --git a/sys-apps/entropy/metadata.xml b/sys-apps/mlxup-bin/metadata.xml
index d396d1b7e5a1..56cae167d372 100644
--- a/sys-apps/entropy/metadata.xml
+++ b/sys-apps/mlxup-bin/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>mudler@gentoo.org</email>
-		<name>Ettore Di Giacinto</name>
-	</maintainer>
+  <maintainer type="person">
+    <email>chutzpah@gentoo.org</email>
+    <name>Patrick McLean</name>
+  </maintainer>
 </pkgmetadata>
diff --git a/sys-apps/mlxup-bin/mlxup-bin-4.13.0.ebuild b/sys-apps/mlxup-bin/mlxup-bin-4.13.0.ebuild
new file mode 100644
index 000000000000..60f35e77c23d
--- /dev/null
+++ b/sys-apps/mlxup-bin/mlxup-bin-4.13.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN%-bin}"
+MY_P="${MY_PN}-${PV}"
+DOC_PV="1.4"
+
+DOC_FILES=(
+	"mlxup_user_guide_v${DOC_PV}.pdf"
+	"mlxup_release_notes_v${PV}.pdf"
+)
+
+DESCRIPTION="Mellanox Update and Query Utility"
+HOMEPAGE="https://www.mellanox.com/support/firmware/mlxup-mft"
+SRC_URI="
+	doc? ( $(for docfile in "${DOC_FILES[@]}"; do
+				printf -- 'https://www.mellanox.com/related-docs/prod_software/%s\n' "${docfile}"
+			done)
+	)
+	amd64? ( https://www.mellanox.com/downloads/firmware/${MY_PN}/${PV}/SFX/linux_x64/${MY_PN} -> ${MY_P}-amd64.elf )
+	x86? ( https://www.mellanox.com/downloads/firmware/${MY_PN}/${PV}/SFX/linux/${MY_PN} -> ${MY_P}-x86.elf )
+"
+S="${WORKDIR}"
+
+LICENSE="Mellanox-AS-IS"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+QA_PREBUILT="*/${MY_PN}"
+
+src_install() {
+	if use amd64; then
+		newsbin "${DISTDIR}/${MY_P}-amd64.elf" ${MY_PN}
+	elif use x86; then
+		newsbin "${DISTDIR}/${MY_P}-x86.elf" ${MY_PN}
+	fi
+
+	if use doc; then
+		local docfile
+		for docfile in "${DOC_FILES[@]}"; do
+			dodoc "${DISTDIR}/${docfile}"
+		done
+	fi
+}
diff --git a/sys-apps/modutils/Manifest b/sys-apps/modutils/Manifest
index a32923381db5..59d4f1bc80d7 100644
--- a/sys-apps/modutils/Manifest
+++ b/sys-apps/modutils/Manifest
@@ -1,7 +1,7 @@
-AUX modutils-2.4.27-alias.patch 2246 BLAKE2B 6d3af5179d74d0469f1fffabf31c85113de52c261d8c95e0361b9133d8985d58a483c7eb1d92ad0a3fadd197b3043c4f55c0873d9a9d0eb9ccad7d31621026a1 SHA512 e843cdcdca309646d8cb9db148db61bb6d9605068fbfc006be7c392d3349856c101899f26d39e3778a674bc9b64830bdc273484d1ccf37994eaca1cff594edc6
+AUX modutils-2.4.27-alias.patch 2250 BLAKE2B 623b62fa8aa70a2a28b7da0f60c92a4fd2178015c9de855b071df0fbe1a85b55d6d4604fb57ca518d22054288f16c8362483f15290714c2479596878a92c3cbd SHA512 06ffe92cab08411158324c0c9420185bc3726ff43ece6567f294a8c9d324ef588685462ce670bbc80661d5e3da6d55d856efed3ca71891e60e3b6ab5b66d7179
 AUX modutils-2.4.27-flex.patch 805 BLAKE2B 0efc0b03204181dc456667bdf2a15e2765c4ea50ef9213d090eacddcb72adf95e597547520df2694bb59e7c0c5f01cbb714d8290f71b6d7d5f45592e9cfc1c9a SHA512 2d427b2c9b5d45866a704caa3b564c986106aeb1c60898efa54c7272bcb536fa13a46df6970a8a0b6020bdbe4c86903503a2ec0e15092d0c254f9b5a940c2374
-AUX modutils-2.4.27-gcc.patch 6963 BLAKE2B 5748076f00175717b22cb27f5e580b99aa0630928afe0572bca707d2cf14949171f1d114fd2152cac01c0481d4c271e435892cc3fca1f9b48e777b9d1fc34e33 SHA512 1d2f0f2118ab40310cbd90d73da5300530c8b41bd5fc3832f8cc09914bfe9efba7161b80c1d29b216ba92bceb8b4f066eea1bf9bb2c6affdc9b35e12235a1008
+AUX modutils-2.4.27-gcc.patch 7007 BLAKE2B 2aade76f6aeee64a4ca25d2adccadbf5bfdaff25ebac4c317fd4d75339fdc8da5d723ffb54e6efe0fad805d5d4d279648de1ea7436df9dd89fd9c5470c2d7027 SHA512 44024ec0e6be1be4ab52a95726dad69670247665241bddcb11030735be58a4c78569dca8399ace467842f933b0fc15f4c3767a465ea433fdcea74c8c68a5d584
 AUX modutils-2.4.27-no-nested-function.patch 1422 BLAKE2B 3f1b2e95ef05815bee49666863f767e416cc67dfc4566011f59dc1ba49064c1810a31b4a91c5dcbbad0a5f47f33431644834dc872637532919cc0e2077f830d0 SHA512 0a01f28f9d3f803b1e148af382b396ad793354363c36e690ed5a731c31482bc8b909fcf77902b62f50967e1ed782ec9e53412c906117dc3d7d12b1f21ecf075a
 DIST modutils-2.4.27.tar.bz2 234963 BLAKE2B bc5d91554906d15c258bf27f9b3f28bcc1fdc13413ebcece0f763d28d70f61cc27243fc20eb72e2f28d90cac8f19fccdfd633ea978a0f6c809d10eaea83c24d1 SHA512 5a638ea757f9d2cd7e91a8711eadfc6c723ca3b75757363620c8128772b9c00ddeb46af853711ce4c845096ad322a1dd2e8429be3d2e0a371ca93b1c81aa089d
-EBUILD modutils-2.4.27-r1.ebuild 942 BLAKE2B 3df5580e58b70f742460fea479ff2b527b8a9b33456ee012db8d9448cb6cd2380628cfd391bb351ea234f4a5898d32e6b9f8e6a44c7260f31d5174bbaee89a57 SHA512 4bb66f8116d85549bc2774629e1f1653c358340ed2fba8ea57574701dace1cb91e6175139a93f9861d58ca3adf36dbb331677bdc7cb6fdb1b6639e5e4d40ab03
+EBUILD modutils-2.4.27-r2.ebuild 848 BLAKE2B 9152e41da23fd58f64c4c0bc078d8b75596b54aafcca5ed0508eabb419fad4a34d0d3e53a6170814424543f51f361a62b20216661d1a2eaa3b6a6035b71ee5dd SHA512 46cee77d0423b80f6defc14ba16ea9a09fcbd64ddd8f06d64e1c719a7a87b00a24c564ea14fb241a8ced8c201a0339df89c33ecbf2dbe631678f0e9039bcc4a8
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/modutils/files/modutils-2.4.27-alias.patch b/sys-apps/modutils/files/modutils-2.4.27-alias.patch
index 1fefffb62f85..3ca733984402 100644
--- a/sys-apps/modutils/files/modutils-2.4.27-alias.patch
+++ b/sys-apps/modutils/files/modutils-2.4.27-alias.patch
@@ -2,8 +2,8 @@ Taken from Debian.
 
 Update misc alias cruft.
 
---- util/alias.h
-+++ util/alias.h
+--- a/util/alias.h
++++ b/util/alias.h
 @@ -52,7 +52,11 @@
  	"binfmt--310 binfmt_java",
  
diff --git a/sys-apps/modutils/files/modutils-2.4.27-gcc.patch b/sys-apps/modutils/files/modutils-2.4.27-gcc.patch
index 3f90a9b2b2de..e2d5a37e89f5 100644
--- a/sys-apps/modutils/files/modutils-2.4.27-gcc.patch
+++ b/sys-apps/modutils/files/modutils-2.4.27-gcc.patch
@@ -2,8 +2,8 @@ Fix building with newer gcc versions.
 
 Most changes taken from Debian.
 
---- obj/obj_ia64.c
-+++ obj/obj_ia64.c
+--- a/obj/obj_ia64.c
++++ b/obj/obj_ia64.c
 @@ -127,6 +127,7 @@
  	return (*(bundle + 1) >> 23) & 0x1ffffffffff;
  
@@ -12,8 +12,8 @@ Most changes taken from Debian.
      }
      return (-1);
  }
---- depmod/depmod.c
-+++ depmod/depmod.c
+--- a/depmod/depmod.c
++++ b/depmod/depmod.c
 @@ -1133,7 +1133,7 @@
  
  		for (ksym = ksyms; so_far < nksyms; ++so_far, ksym++) {
@@ -49,8 +49,8 @@ Most changes taken from Debian.
 +	return depmod_main(argc, argv) || error_count;
  }
  #endif	/* defined(COMMON_3264) && defined(ONLY_32) */
---- genksyms/genksyms.c
-+++ genksyms/genksyms.c
+--- a/genksyms/genksyms.c
++++ b/genksyms/genksyms.c
 @@ -45,7 +45,7 @@
  int flag_debug, flag_dump_defs, flag_warnings;
  int checksum_version = 1, kernel_version = version(2,0,0);
@@ -85,8 +85,8 @@ Most changes taken from Debian.
 -  return errors != 0;
 +  return num_errors != 0;
  }
---- include/util.h
-+++ include/util.h
+--- a/include/util.h
++++ b/include/util.h
 @@ -39,8 +39,8 @@
  extern int xftw(const char *directory, xftw_func_t);
  
@@ -98,8 +98,8 @@ Most changes taken from Debian.
  extern const char *error_file;
  
  extern int flag_verbose;
---- insmod/insmod.c
-+++ insmod/insmod.c
+--- a/insmod/insmod.c
++++ b/insmod/insmod.c
 @@ -275,7 +275,7 @@
  		if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
  			gplonly_seen = 1;
@@ -149,8 +149,8 @@ Most changes taken from Debian.
  		if (!noload)
  			delete_module(m_name);
  		goto out;
---- insmod/kallsyms.c
-+++ insmod/kallsyms.c
+--- a/insmod/kallsyms.c
++++ b/insmod/kallsyms.c
 @@ -80,7 +80,7 @@
      error_file = "kallsyms";
  
@@ -160,8 +160,8 @@ Most changes taken from Debian.
  
      /* Process the command line.  */
      while ((c = getopt_long(argc, argv, "Vh",
---- insmod/modprobe.c
-+++ insmod/modprobe.c
+--- a/insmod/modprobe.c
++++ b/insmod/modprobe.c
 @@ -1023,7 +1023,7 @@
  		if (quiet)
  			my_argv[my_argc++] = "-q";
@@ -171,8 +171,8 @@ Most changes taken from Debian.
  			my_argv[my_argc++] = "-s";
  
  		if (insmod_opt) {
---- insmod/rmmod.c
-+++ insmod/rmmod.c
+--- a/insmod/rmmod.c
++++ b/insmod/rmmod.c
 @@ -261,9 +261,9 @@
  	read_parm.m.read_start = mp->sym->value;
  	read_parm.m.read_end = read_parm.m.read_start + datasize;
@@ -185,8 +185,8 @@ Most changes taken from Debian.
  		return(0);
  	}
  
---- util/logger.c
-+++ util/logger.c
+--- a/util/logger.c
++++ b/util/logger.c
 @@ -31,10 +31,10 @@
  
  /*======================================================================*/
@@ -234,8 +234,8 @@ Most changes taken from Debian.
 -	log = 1;
 +	logging = 1;
  }
---- obj/obj_kallsyms.c
-+++ obj/obj_kallsyms.c
+--- a/obj/obj_kallsyms.c
++++ b/obj/obj_kallsyms.c
 @@ -200,8 +200,8 @@
  
      /* Initial contents, header + one entry per input section.  No strings. */
@@ -258,8 +258,8 @@ Most changes taken from Debian.
      p = (char *)a_hdr + a_hdr->symbol_off;
      memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size);
      free(symbols);
---- obj/obj_ppc.c
-+++ obj/obj_ppc.c
+--- a/obj/obj_ppc.c
++++ b/obj/obj_ppc.c
 @@ -25,6 +25,7 @@
  #include <obj.h>
  #include <util.h>
diff --git a/sys-apps/modutils/modutils-2.4.27-r1.ebuild b/sys-apps/modutils/modutils-2.4.27-r2.ebuild
index 2786427b0ea0..396d4691041e 100644
--- a/sys-apps/modutils/modutils-2.4.27-r1.ebuild
+++ b/sys-apps/modutils/modutils-2.4.27-r2.ebuild
@@ -1,9 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="4"
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="Standard kernel module utilities for linux-2.4 and older"
 HOMEPAGE="https://www.kernel.org/pub/linux/utils/kernel/modutils/"
@@ -11,18 +9,16 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/${PN}/v2.4/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
-IUSE=""
+KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 
 RDEPEND="!sys-apps/module-init-tools
 	!sys-apps/kmod"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-alias.patch
-	epatch "${FILESDIR}"/${P}-gcc.patch
-	epatch "${FILESDIR}"/${P}-flex.patch
-	epatch "${FILESDIR}"/${P}-no-nested-function.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-gcc.patch
+	"${FILESDIR}"/${P}-flex.patch
+	"${FILESDIR}"/${P}-no-nested-function.patch
+)
 
 src_configure() {
 	econf \
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 4cd35bb43642..f873a71e58c9 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,3 +1,3 @@
 DIST moreutils_0.63.orig.tar.xz 80468 BLAKE2B 39efa522c5bf9b982b70c1180f622a7d5a489cabbeb741f2a1a0674dfe9907ef85bccccf9f9cc4ae8d3c81442b1513f0692c070b4c00f052135528dc0e47eb6f SHA512 71bd5ec4d265dff708db372189146acb067c4edaf62888755d245ccb3f4b5bb54f6c31bda68991f78c27ab231de8ea7126f947834f3604b60d7142d0357cb66b
 EBUILD moreutils-0.63.ebuild 1445 BLAKE2B 6cc4d0da336dd2aa3ea2bae611253c81d04de85ba8ca33da362130f2369c3360e403b772df2e53aba4958316929b8357b59173fa0f91d63b694efd5af12697a9 SHA512 5f187b5e75a072caea587b68f0349936af3f267114fe5c18f25b3a005ca71bc0c35494a974d7707ae4de58a44d96458cc7eb0f9e6d9e398635083d1ba55acf80
-MISC metadata.xml 237 BLAKE2B ceac7f98433ef3d26c4e5c452f2c41f30625ed0209982872213cc4917ad45d1dc64077b5adbc7e2aa14a86feb86a218a64d5f4d1829534b452516ffea6d6fe48 SHA512 38f6b51bed4a582dfe6137eabd3929e59232bfc626f6661cf936b7d00959d75591cb77ac900e1ad1d20c9a13097a2c08e39442cf5e6201dccfd2cfcfb5d989f7
+MISC metadata.xml 427 BLAKE2B 311360aef2c49094822392ff35feb4bcbf03f16a909e6047a89c6280094d51b2347817dcd6938df998909101d53b8a14ee847f0eea5568bae6326ff01ebe2fee SHA512 d535b7f684ce284bf60ff162383773df08a753e9b2e80bcfe271cf39f0765719f8a00cffb46fed0c948e971875286bc9c3ca5972debfc3ed3653fcc33ac6a2a0
diff --git a/sys-apps/moreutils/metadata.xml b/sys-apps/moreutils/metadata.xml
index 77a13c050fad..7780744d4f50 100644
--- a/sys-apps/moreutils/metadata.xml
+++ b/sys-apps/moreutils/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sam@cmpct.info</email>
+		<name>Sam James</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 <use>
 	<flag name="perl">Install scripts written in Perl</flag>
 </use>
diff --git a/sys-apps/mount-gtk/Manifest b/sys-apps/mount-gtk/Manifest
index 1c90562203d0..37c046aed063 100644
--- a/sys-apps/mount-gtk/Manifest
+++ b/sys-apps/mount-gtk/Manifest
@@ -1,6 +1,8 @@
 AUX mount-gtk-1.4.2-c++11.patch 1125 BLAKE2B 25871ab418def7d5723455afbf481be81f022978e563e904595de506f897349659b72a4ce5614e8ecccc5edfa9a71c988da71b5b2bc8650493fcb53795c9faeb SHA512 8ecbbec87ab65d1b69b3a64301c10168589a30a0b1487f841388c269ea705b3b04662b35d196daa8f17e9c708670597a2fe6c10f6dceab3d3cce62fa24318501
 DIST mount-gtk-1.4.2.tar.gz 232132 BLAKE2B 7c6be675db2fd11ce36501e8b247ddbb5a786b28698c4195c329b310cabc710f6df65f7869ec2bbece2edfd54820b8de88a0a7b20d442fe3d6e27ab5e93689fc SHA512 90fa174238d19bf009f5863e5571030091681038ddbfdc06c7a39f8859b78d9864b398899d66463d0f8a189e484201c7a32753b38898e0f5d55970feb85420ba
 DIST mount-gtk-1.4.4.tar.gz 240716 BLAKE2B 25244bfea0db577c3bfb61abb9acea4cdab41e9cad3173dc472c57ca39b7739e3cfef0501ecb874faf1bd8cd92e0cfd8b48ecc5aadcbe4294309aa692593c376 SHA512 85ed7e5bd92d6ea15a8fd907a0bca4bc7e64861b03e922bc28827108820f1fb4daa87b94a16f468c87d741a8d456f27f755e06b2049f2a95ce4ab00d395763d2
+DIST mount-gtk-1.4.5.1.tar.gz 239116 BLAKE2B 94ca6b0b4b9aec8989169c7a52e3e38f65c490e88e07531eb398c06be8c61b4d5ecbcaddabb2286ce7353294991a35e0f3b2d94a7b255817651e6570a6c7be1b SHA512 3cd69b872c278db80b6f91a8f66054c56be964d23f1a4e5a435343de5178c5a64440ba871e6e4b6b76b55bb01e156e8cacc8e4e3c7cfdb4bc55f95680d6dc511
 EBUILD mount-gtk-1.4.2.ebuild 858 BLAKE2B 80c7eea632ae9694cbe22fa1b01cf36f47f456fd6058010d557834e5738f67e5210af91a8cf3bf48014567eefd9c6e2aed5b54416cd054121868f97c9adc4904 SHA512 ccf32adf1b708c6330b706a9485a560e3ec5016f784e059ace30324b7c567a346fb8581d0efd9c79d707bef88475b8eadad1565ec42f23f2fabcedd22d4d574e
 EBUILD mount-gtk-1.4.4.ebuild 788 BLAKE2B a62cdbc7cdd29c02cbede00409dd0aef3f6305e0b3ea1d6ebc111610b0b9d68c767189f691b3e11cdd36ec8622ddba64165856be3603ef5d46174b9a9ea30e56 SHA512 35f57f13a320bba11b4b2943641678244f3322934d915d30ef92d693bee95d44b9637ddd8638dfe99497ea6852ff0529eac41349b3ca69750bee4ebf012bb2b8
+EBUILD mount-gtk-1.4.5.1.ebuild 788 BLAKE2B a62cdbc7cdd29c02cbede00409dd0aef3f6305e0b3ea1d6ebc111610b0b9d68c767189f691b3e11cdd36ec8622ddba64165856be3603ef5d46174b9a9ea30e56 SHA512 35f57f13a320bba11b4b2943641678244f3322934d915d30ef92d693bee95d44b9637ddd8638dfe99497ea6852ff0529eac41349b3ca69750bee4ebf012bb2b8
 MISC metadata.xml 355 BLAKE2B 2057650f632b2f484a75473cf9bb2054392e41704767bd7d33c3182230e4e386b4d99cc1b654b2e3b5b5c0d06cc574cf9f097ae78bd981334abbbcd4eece2d82 SHA512 a2160b97106975c45262beb68b1c6e1412edf2df400868ece4a93c1318a2e24b0a178cca0b0a4ac7c766e0a3c1e98b1a812d0fe079ec1412a05aaa1eb5f8d8e3
diff --git a/sys-apps/mount-gtk/mount-gtk-1.4.5.1.ebuild b/sys-apps/mount-gtk/mount-gtk-1.4.5.1.ebuild
new file mode 100644
index 000000000000..c8cf9d128bbf
--- /dev/null
+++ b/sys-apps/mount-gtk/mount-gtk-1.4.5.1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="GTK+ based UDisks2 frontend"
+HOMEPAGE="http://mount-gtk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-libs/glib-2.28
+	sys-fs/udisks:2
+	x11-libs/c++-gtk-utils:0
+	x11-libs/libX11
+	x11-libs/libnotify:=
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS BUGS ChangeLog )
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.2-c++11.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# acinclude.m4 is broken and environment flags override these:
+	append-cxxflags -fexceptions -frtti -fsigned-char -fno-check-new -pthread
+	econf
+}
diff --git a/sys-apps/net-tools/Manifest b/sys-apps/net-tools/Manifest
index dec6688ef933..05a7885bd957 100644
--- a/sys-apps/net-tools/Manifest
+++ b/sys-apps/net-tools/Manifest
@@ -1,7 +1,7 @@
 AUX net-tools-1.60_p20161110235919-fix-building-w-older-linux-headers.patch 968 BLAKE2B 4104f8238ac3758e756b37dd281f1ca66f3f6d6dff9966713ffb108c539fbd19b9bffff94c929b829254c755cd0e1fc4530c74c5b8d6ef85889d7b8f9f54b5f9 SHA512 e732e809a4a17e3535c9ef009519808d5d1a6a792c1249e5cbaedc2aebc0245a16f4cdbc351c6ceaca676e942d909de548b036b8c59a62a68c277093aaa09445
 DIST net-tools-1.60_p20161110235919.tar.xz 227552 BLAKE2B 0dba75b7b7345be047bd8618811c6ea43f96f0d7c8a2c67cd03138b8f31dc47a641c7ff1e93fb1ad295423f9b82e3d222178c7c97233d4e3698355fed729f723 SHA512 06c2900305a5b11035bdb9d94e9d0a50c2ca832e14598d00d6907d99a4a3c981169475bbe916805888f9746a7d787829f20e6a4dec283731a2c85a72875b8e01
 DIST net-tools-1.60_p20180626073013.tar.xz 228276 BLAKE2B 1545533abf75cb960896994710a02f0e4f5534232057fa9c80d2ec54af84d068d3337a93e869e8377539584eebf4c4d8175e16f19bc12360946ab908b41b2f2f SHA512 3ea9036c2597e6da3a1d9a61a77bbe0b80c448d42a3cc59469f37255064d9e046b5f331155adac256f9812200342f72624ba1ea27a4ee3696b3c9ad53b6b86eb
-EBUILD net-tools-1.60_p20161110235919.ebuild 2545 BLAKE2B 69cfa1cff834b00b775c2dae6827dee59c16430ba1b35ad7135e05cbe9d6365ce118822673d55ac64e6fdb28adb0f6f810199490dcf237e04f347327e193bd0c SHA512 8c80e80a0562f5b756307ecc05705cebdfe90cea7dddbc10f9ed9b7ac44176f176659f1cc43f8004390de5a46fc3618f89af31ab3d99a3421a8e7252c518ea78
-EBUILD net-tools-1.60_p20180626073013.ebuild 2477 BLAKE2B 6127bf20f55cebcee60089b10bc272325ca5c857ee90a32e591a83c44d1f767e22f96c27c4c420feccac783cb342b7bb499305ddd390eba671175961082e9cd9 SHA512 b0642715201d5d81adec58c57902d3953db98dc2a9d838143214ab5c0ebd78af6b71b72e0d7dfc6c6341ac0c0eac304903dedb3d371ab4eb76ef9c0c389cb643
-EBUILD net-tools-9999.ebuild 2489 BLAKE2B 3bb8b0d127ef850d7d72c11183059279cc88ba98285eff8aecbf6af350cc96abba15405fce12246fb9ac64b974ae761fe518d5bd547b05a3609604fc2c8270b4 SHA512 e4ce2c4a1c12424ef6e8b7564c233bb67fc2b58010822ebb0ce06913af2b0f476f209d1ce6fc130f27a5bae50f5924bf81985aac0dfb8f81ef1d831bba2ed0aa
+EBUILD net-tools-1.60_p20161110235919.ebuild 2543 BLAKE2B 421cf22334ba4fec08a194528236ff06603f6012f20080fba627a8e07767ca0c3500ca4da755531017349afacd11a212219a3c83b03a5ca969f1b858e62d09ec SHA512 750a1300987e467b62cc00d4d2b3268817e4530d9ec853adb994730bed1b46cc936da5362ddf4ed437f3e0f7abba8270dcbfce3deeebcda50bf68f79b42f2e5d
+EBUILD net-tools-1.60_p20180626073013.ebuild 2475 BLAKE2B 0681dd491db99aadf6e47674e10e3d6ec0d1bbb1a16ee6cbaace093b47040bd3f0803b2aa6879d83ace6202f382ec0dd6cb09bb1d3cc2ea42e2886e5e724bbaf SHA512 0d9b790b33aa0000455f63565fdc562eed2c70613b078fcb194e340fa7ef6395907d94246311a5b4c042af49da64691c9be224398e62612ca4a6e8923be506f3
+EBUILD net-tools-9999.ebuild 2485 BLAKE2B c7f7c12a1d9d46d4afd4d86bd7bfc50dc7f59f0b215d123f4d3a5689425a95dea2d4791be2fcac8b3bff0ca4496c1a15ead3ac19590190ffbaa85aa693dfb4a9 SHA512 9c4b5f1ae7010f035ebc427a5ec3b33707fa913b8377e5168960eb0af2247592c92656b2fd14243e8784560f2aa46825bc3fc8961cb58435929516581ba177d8
 MISC metadata.xml 687 BLAKE2B 0a0c86a9a234a973e5b16dfaa72fbfd1392f8a89f48e0ee2924e77d49c5160b904fd054c0616957882a4d2be78031989b01493454693607aff0d31dd3931b87a SHA512 ef16e4cde591fcc5815fb7fee106e007bea128f52b05a71d050956df586e8037e58d6eb3bdd00ef4a0b9d55ddaea4c29d6a0ce12409a515e638452fc932e2037
diff --git a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
index b3792e86fa2d..dabe1a60be44 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20161110235919.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
index b307e83834d7..03a6fe23847d 100644
--- a/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
+++ b/sys-apps/net-tools/net-tools-1.60_p20180626073013.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/net-tools/net-tools-9999.ebuild b/sys-apps/net-tools/net-tools-9999.ebuild
index d678d61450d3..1fd92a62a67f 100644
--- a/sys-apps/net-tools/net-tools-9999.ebuild
+++ b/sys-apps/net-tools/net-tools-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gentoo/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Standard Linux networking tools"
diff --git a/sys-apps/netkit-base/Manifest b/sys-apps/netkit-base/Manifest
index 666518b27c8f..308fc317bd21 100644
--- a/sys-apps/netkit-base/Manifest
+++ b/sys-apps/netkit-base/Manifest
@@ -3,5 +3,5 @@ AUX 004_all_netkit-base-0.17-misc-fixes.patch 1601 BLAKE2B 64cdad3fcb0ef6fb8bb7e
 AUX 005_all_netkit-base-0.17-no-rpc.patch 522 BLAKE2B 8935847c79c032dee03f0f99edf6fd879ba224b96a90b144305351e5cedf51e705e2c881bdcd16174ab32fa88eeaf01cc6c9bd326043b7274090b090a6373c11 SHA512 0dff7bb005c1d480444b8ff61f53626ed0a5748730c2a1ff489a277a1bbd61e08bd9c46261acc040f5030d7048a291fa5f22cb7b1a58bb468d8264d4b6272d0b
 AUX inetd.rc6 470 BLAKE2B 5f6fe30c6a3d07162194f9fb756bcd3748470200819733b291ca59612bdb9f2125bc2003b6c82ec5ed459bea43a29c5a69c20ceadcc90679f151759af2643cba SHA512 525f4f948721553f051a929d5c6b7c49208256170c423ac10ad49427cc89fdc19dbadf81e7a3d8eed07c54c5a266e73cb0ac24c8f95f60f731fab571ccbbd5d2
 DIST netkit-base-0.17.tar.gz 56473 BLAKE2B a84289eb56762c702ffe52bec634df1b36dee382dc46d2356886f0fe0039d8f7c393ac0a22f137d1d220222ff55429b25fb4da666c7e6d7f857dbb7dec54e2be SHA512 2faae6471251647ea0d499c96d13faf72bc9aa4ab408f9f7f4c9fc41b1e1e2ce0bcad626ca027135b5a20f311362e90af57c7197885d02a0839beea5b4fdb821
-EBUILD netkit-base-0.17-r9.ebuild 1008 BLAKE2B 51ef4aa8246a2c7e6bbf95e4d17b71d082319822f2c96afe87073fb44d32f5c12a6491eda19eba42b1eb57cb17fd885fcc1ee3c35d07312bd3df9131ce367c81 SHA512 156b3be0ba51429d2fd3517e898780e1b0104219ad3abb84014610afa9cbc408922a7923a65234d3ca8c8d3823fdbcf15783182caaac07e587792c51af649611
+EBUILD netkit-base-0.17-r9.ebuild 1009 BLAKE2B 4e08c085f4e4bf1c1535d3ff817388420acc143aed9ce8cfc3bad711bc3c462ee6e02962b7fae576552e861884cb1114a06625f75e81cc6bb9cf4e4c49b4b127 SHA512 587c35ef67f12a2fb10c31c85b382980b24e7567d5bb28db2137eb3b4b8b580279668e26cf1b0019007a5813f6492be13935a694199b7949bf9904275094b063
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild b/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
index 0ff749955812..7a4209222bcf 100644
--- a/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
+++ b/sys-apps/netkit-base/netkit-base-0.17-r9.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/${P}.tar.gz"
 
 LICENSE="BSD"
 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=""
 
 src_prepare() {
diff --git a/sys-apps/nosig/Manifest b/sys-apps/nosig/Manifest
index d6eeaa26d748..224a3d47f1b0 100644
--- a/sys-apps/nosig/Manifest
+++ b/sys-apps/nosig/Manifest
@@ -1,3 +1,3 @@
 DIST nosig-2.tar.gz 15586 BLAKE2B d49bf9f9d4b443e8bcbee11e59beac4593e1429c414d7b0e2b7e31cdea9dd68c53b3604fdc8c8a0eabf2753aed64ee60f5e70f92aec807fb2030b83df0ed191b SHA512 9cc00a0250def091e5df070506128d260300909cc8664d9cee4d9fe459b1b8362a5671ad5b537675fb7e15665750a158e19193171aefa973d932756ea15b3430
-EBUILD nosig-2.ebuild 479 BLAKE2B bf415695a07dc2f7f264d43ff88572a34bdafbe971ea47b7ee581b0f299a030bdd461113fc4308158365e18e696c263ce8f42b56a70465abd24b23f7bf51299c SHA512 19290947b70568de567b9030d13113e2c4194c908601783385571933ae16c3b52380ba76c5114b13a7e1f44281bcc45163c4c34d267a530b7a7105701fa99706
+EBUILD nosig-2.ebuild 475 BLAKE2B 3093563282c421f6225dee21ab55e78a722e1805055f841ea6928f8d24d13a232ee7a88284a797d0515434b7acfc335bdfe9543e12e7d2fbc9fb2f1ca746e143 SHA512 e7b5f52806c8840a1d40659bf188bb449a19861b88663d5f68e68c2d178436af1eea7325435c295d3d98726aabb293af19bc3c971b1ec261da62a5da74ef1721
 MISC metadata.xml 261 BLAKE2B f998263db8f83d1922e7d91c9b0498375ee3c0bf991efa6c7c317081324966b2865754dddddb1ba37fb2de5bc0ed7993e394d36b31a64ffe432b4cf06249577d SHA512 3936d32e0a206793c73fbaf41286da085b58c46a2fd91e6031325d0b923322524eecbea9e2325c6c93c75a804c52b2e395ba8a1e62dbaa0fb8c55349d297dc1c
diff --git a/sys-apps/nosig/nosig-2.ebuild b/sys-apps/nosig/nosig-2.ebuild
index 1868fbf57f98..80ba9d2a3afe 100644
--- a/sys-apps/nosig/nosig-2.ebuild
+++ b/sys-apps/nosig/nosig-2.ebuild
@@ -9,5 +9,5 @@ SRC_URI="https://github.com/vapier/nosig/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
diff --git a/sys-apps/nvme-cli/Manifest b/sys-apps/nvme-cli/Manifest
index a5438bd452fe..b54cf10316fb 100644
--- a/sys-apps/nvme-cli/Manifest
+++ b/sys-apps/nvme-cli/Manifest
@@ -1,5 +1,5 @@
 DIST nvme-cli-1.6.tar.gz 368461 BLAKE2B e40f4d76314860c966c3cb3de31e8d4a1bceab847b8950f0c99d47e00b8e8de077e91f6da9216ec10e939d37d34ab255b5cc3c641f3bbaf3ac8974f697051329 SHA512 05bcc539febd047f092a236ef2b2e9ad4e1df5d38bdc70416f80217425767f414e72294fda46868323cb7c77662d6000eaf16ebdaf74bdfad1baaed11b025d39
 DIST nvme-cli-1.9.tar.gz 440675 BLAKE2B 19d9f4982e6bf4d37bbced02aadd0f58e496901c1463c96596b289e23c4e5849bfed9a4129447588c9c8104d5b49fd0bf97ee6495907bf022487407f02d7c4ae SHA512 3565b33bc39bde4480bbde5d46d75ea6907c0921884e8f39029b746f8383d3630942e405c61bcc3654bac5646bc86479b4b790e1b823ec83650649621bab6dac
 EBUILD nvme-cli-1.6-r1.ebuild 664 BLAKE2B d0a5180d05af47aa3eb62a81de561cc5cc42fae37e1f93fa86a88b438dd0b3d967b86a9396124e70fb509fa74940377d855a5b00c77327562ccced4b376ee696 SHA512 6e922366a20a4ac14d52a0db689620e1140e9b146866adbf154e694e072fc8bf6f1840435ac133a64f42b91e5505fd62f0f21c0e0b9400e1c24e20d5ee77c199
-EBUILD nvme-cli-1.9-r3.ebuild 969 BLAKE2B f1a37b7e7b37aa1c5db5589ccf8f24b236f098de4493e3e11e27dcdb39499d920270a94d9c02fa48cbca6dd52033a48f469b7165d216338e4160413ec49b402d SHA512 3d427d5b6d948e33de7b099ff91349c829dc956e37a2006bfc45d0ffb3a26e336925c8446f39315d1d269150cbbdc7014cd45e4150cf13cbfce163afa3c4b0bf
+EBUILD nvme-cli-1.9-r3.ebuild 976 BLAKE2B b500757c242990e42c523da5d69675c0ee15fc5528923c6bd03d11b513cd3518986e866ac5a0e1503b55ffaa5748ebbef14ade322c731efcd6901ca1a55e084e SHA512 5868e20533d4b7c6c51bacc88c8ccf5a2ce37717e6e05ceb5a26de17192f548f72ede949002af9d86b03da91a45533809f188267925faae68e4b70afc9954d61
 MISC metadata.xml 369 BLAKE2B 67a0c73fe0e2de97927a7c827bf4d216c7460c2ec4383c07e028c0b2d10e71a45559482bab635a6b9374fbec557ab83327baf041eb47bbc06c5e624bb29f6925 SHA512 d9439fc99f1bc5051b670e7d287185af8e7db4ba9045fd9a9aeb4c0f04a33716650d3a01f0ad8640e8b62db048a0f536fbd6145d5a7d79bb7aa524d63112db61
diff --git a/sys-apps/nvme-cli/nvme-cli-1.9-r3.ebuild b/sys-apps/nvme-cli/nvme-cli-1.9-r3.ebuild
index 9d9a923835b3..c9ca69fcdc95 100644
--- a/sys-apps/nvme-cli/nvme-cli-1.9-r3.ebuild
+++ b/sys-apps/nvme-cli/nvme-cli-1.9-r3.ebuild
@@ -12,7 +12,7 @@ RESTRICT="test"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 IUSE="+uuid"
 
 RDEPEND="uuid? ( sys-apps/util-linux:= )"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 43a7bf4312d2..6392bf1acebd 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -1,8 +1,9 @@
+AUX openrc-0.42.1-gcc-10.patch 1679 BLAKE2B 464fa390a6626538dad9d68d9e1c81195ee5918cc503d1fe750b29fe5a87bfa7b99d2246069173c1fe23a4dbd9c13507bddd2e5d2951a38edb5c4d746830ecff SHA512 24c665098475c8a1dca75677b48864dc554930f8039900785d8f73c4ebab857255607297fdcbce6249f18f2b97bd7804a35a782721d4658a1c7a7b7b985418ff
 AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a20ef625a1959e77dbf38cd1756838337fb39a061c4ee19a39cccd2f5867fab9f04fb916a74029aaa SHA512 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.41.2.tar.gz 245302 BLAKE2B ab80dc4f3a7c2c464fe64cdfa7fd31363d5a9d25e90d0239325be05561e5802f22c47013fde82650f5ce08cf99f16f5f479d8617c254647b8c40cec9609d0b6b SHA512 ebfa691cae4704bb3023ea0508a712a45b8c20809828729dfa5292e96f3fd1b309813d80d7c286d0c09680bf5378aba40cfd994f27951f43a3ffb1fd0d69a58b
 DIST openrc-0.42.1.tar.gz 242848 BLAKE2B 381f52552c13afbbcf45456fe71078bacf9182adfd67c97394093986977f5e8262d8a3c64219501745575a5210f525afe9fccee72f7625485a9f575108baa369 SHA512 579b9bfbb151b945a364a2c12b037d2e15991820ca99a07ac18e9bdc50074e67fbf0dcf9865aa4deabe2bf82092e4623be51c9e0b4014384951e0a92ac1e7646
-EBUILD openrc-0.41.2.ebuild 5253 BLAKE2B 2cb2cf266caa998cdc7f2e085f2ed3368fcb687574a87d524d968d27a5421fd4e968359e5ea5a07135309854a3ada38a3c3153dcc23a3526330a39fff6cd0a69 SHA512 836d98465fdfd6bd594efb3b086530916207b6970b75608b95279b58b69f0e2f92ec395f9b019ba1bde062593c586bf8e04844bc620aea16eaffc598b4685ef0
-EBUILD openrc-0.42.1.ebuild 5356 BLAKE2B f8a652ec53cc27b004784898c0086bcd6ac0ea87acd69a58cabd8e03c9f47126ff4fc95ab3e61582475c58605c632b90681fb5fecdc7bc75bfb6703b112a9198 SHA512 296a25c7aa6d05f4e759db605cb66d5046eb1b11a934951c5ed8da90ea27d454c207614242c87cf4929085ef685082422296dde9edee8badd7f015fa2f356289
-EBUILD openrc-9999.ebuild 5028 BLAKE2B 0f2b5f367eeb0e8217024a9567a08a0a9dd1c9207351ea4bd242400fb995f4180151a290d6f7090649a013845a3bad08b036e0ba559e3c85f1d6286941ab4dd2 SHA512 5edc813ff3459f400f6a82d1855f26f1e5eb79b9e25e2b61da188885540017997339e2eab6b355c4573296feb2490a1bdc152712ff3e45f01043a63e4a7d2f57
+EBUILD openrc-0.41.2.ebuild 5250 BLAKE2B 99e9d190d921a13d249e0da95ba800b5d813b1d3caa4bdfc95d86df3141ad41adfffde2cddb3b66d3969699bc0b48a979def988317419781ff13fc1bae0de457 SHA512 70080e095841aa340d56b4ae916c8fd3c1c6eaffa58820e2a96867a12c17800f04fb0f7afd00d7faf53ea2aff562294b6b394d2af3f7559f2917449891fa8a04
+EBUILD openrc-0.42.1.ebuild 5404 BLAKE2B 75c843b5724f708223fae7af918d0a8910cd2ba273eb432db9969cdf9081838d1f5b3633206cd31f4e46ec1240527a3609cea0822858cd95b55ecf494e1ba454 SHA512 82ca19437a046905f9bee2854e22d60c415a80f9217adf68c722caac008dc9b2cff4acbec8fef29a43af1decc7dc928218caae3d7149bb6c259f3a9ce84759f6
+EBUILD openrc-9999.ebuild 5024 BLAKE2B e436f5a2d30359e32cd92b237d7ffb2ea821d26830ce6fe137f3c71f90ea245d9e300a9227984c7d93e2acb0f81a6674cc19960768fbb1a65dbdaadbe0300e43 SHA512 36442c0b1a737903ebb6251587d4ad200b4424e52031df41037eaf52b7e121a9ab216d0d202301cd74a2dc1fe9379432a82ab9e407403e60f4e781698b926604
 MISC metadata.xml 706 BLAKE2B 1d6a4937d577fff7db7fd64617328ca49faccaa61749adabc411a215960ee06c1af32499be697921012eee34f5c680295e46f545099f06393965a17c0d0d034d SHA512 d5d669cdcf8707689c855cab678031c6e9b1e33e4b931c7d80bbe2ad442aedabef718018466f0cb15bd8a329292a0de844935f9332611f3fb334b57d14aa39c1
diff --git a/sys-apps/openrc/files/openrc-0.42.1-gcc-10.patch b/sys-apps/openrc/files/openrc-0.42.1-gcc-10.patch
new file mode 100644
index 000000000000..ce2fd102d247
--- /dev/null
+++ b/sys-apps/openrc/files/openrc-0.42.1-gcc-10.patch
@@ -0,0 +1,48 @@
+https://bugs.gentoo.org/705868
+
+From 375ef42393f3dc6edbaa2cb70c79b2366072db38 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 19 Jan 2020 15:24:20 +0000
+Subject: [PATCH] src/rc/rc-logger.h: fix build failure against gcc-10
+
+On gcc-10 (and gcc-9 -fno-common) build fails as:
+
+```
+cc  -L../librc -L../libeinfo -O2 -g -std=c99 -Wall -Wextra -Wimplicit -Wshadow \
+  -Wformat=2 -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn \
+  -Wmissing-format-attribute -Wnested-externs -Winline -Wwrite-strings \
+  -Wcast-align -Wcast-qual -Wpointer-arith -Wdeclaration-after-statement \
+  -Wsequence-point -Werror=implicit-function-declaration    \
+  -Wl,-rpath=/lib   -o openrc rc.o rc-logger.o rc-misc.o rc-plugin.o _usage.o -lutil -lrc -leinfo -Wl,-Bdynamic -ldl
+ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:16:
+  multiple definition of `rc_logger_pid'; rc.o:openrc/src/rc/rc-logger.h:16: first defined here
+ld: rc-logger.o:/home/slyfox/dev/git/openrc/src/rc/rc-logger.h:17:
+  multiple definition of `rc_logger_tty'; rc.o:openrc/src/rc/rc-logger.h:17: first defined here
+```
+
+gcc-10 will change the default from -fcommon to fno-common:
+https://gcc.gnu.org/PR85678.
+
+The error also happens if CFLAGS=-fno-common passed explicitly.
+
+This fixes #348.
+---
+ src/rc/rc-logger.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/src/rc/rc-logger.h
++++ b/src/rc/rc-logger.h
+@@ -13,8 +13,8 @@
+ #ifndef RC_LOGGER_H
+ #define RC_LOGGER_H
+ 
+-pid_t rc_logger_pid;
+-int rc_logger_tty;
++extern pid_t rc_logger_pid;
++extern int rc_logger_tty;
+ extern bool rc_in_logger;
+ 
+ void rc_logger_open(const char *runlevel);
+-- 
+2.25.2
+
diff --git a/sys-apps/openrc/openrc-0.41.2.ebuild b/sys-apps/openrc/openrc-0.41.2.ebuild
index b745d7207f31..63a8bbbd49d5 100644
--- a/sys-apps/openrc/openrc-0.41.2.ebuild
+++ b/sys-apps/openrc/openrc-0.41.2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/openrc/openrc-0.42.1.ebuild b/sys-apps/openrc/openrc-0.42.1.ebuild
index 3a80774a11de..5c16f5c38e8b 100644
--- a/sys-apps/openrc/openrc-0.42.1.ebuild
+++ b/sys-apps/openrc/openrc-0.42.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="BSD-2"
@@ -56,6 +56,8 @@ RDEPEND="${COMMON_DEPEND}
 
 PDEPEND="netifrc? ( net-misc/netifrc )"
 
+PATCHES=("${FILESDIR}"/${PN}-0.42.1-gcc-10.patch)
+
 src_prepare() {
 	default
 	if [[ ${PV} == "9999" ]] ; then
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 5dd01f8740f4..d07f1b872887 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 LICENSE="BSD-2"
diff --git a/sys-apps/opentmpfiles/Manifest b/sys-apps/opentmpfiles/Manifest
index a94a2922522c..f3720e247ad4 100644
--- a/sys-apps/opentmpfiles/Manifest
+++ b/sys-apps/opentmpfiles/Manifest
@@ -2,10 +2,10 @@ DIST opentmpfiles-0.1.1.tar.gz 5626 BLAKE2B 2b2d21bae0c8280f31ea1ad35cd857a94b3d
 DIST opentmpfiles-0.1.2.tar.gz 5614 BLAKE2B d49485535bc3b92ba7e9a2af511969b1793d94187a2600b3196314bef8de235fe7a640bb2b7f78f51727f94c18556fc27e7996ffccef71ff94e006b9f9a63810 SHA512 d86ba71e5fe96d7a8e1999e14b0b99c78e850c42fbfefd203916edca593d0269feaf2252aa01cc35a838906fc2909015430f72cde8370e2d5b1d478a11fe456d
 DIST opentmpfiles-0.1.3.tar.gz 5691 BLAKE2B 56d79f0279a46ed3b4e13f94a7f2c7d494df245a17b8533c48cff357c21db56485bd076e375f3b4e2c9a140a65e8ab472a8a1030bbee0853463f734c316f71e8 SHA512 fd0b10ebfeb621466edadede50ec6e8f415861ab3b14b833c75bd71f7296e9c091e59144d39e1f9efd342b6d97776cade5a692c941085e33e9651fd885da7121
 DIST opentmpfiles-0.2.tar.gz 5711 BLAKE2B e1ee7820b2d184d18e63e7e9d93227bb301eb82be8c2b6021c7a1092f55a4ca2bb5dfb7494ff00c3b6debace1963f6c89011ff557f665f0a93c907bd759a4c6f SHA512 bc384cc9156ba6c54d3308ddad4d26b1877f020aa8558e82df2ed49ffa65e0fed5a49eaa11b27193bfe2ad11a4d7368f7cdbc225b820b309af3b299327ddb07b
-EBUILD opentmpfiles-0.1.1.ebuild 1019 BLAKE2B 82b9b929f0374dd231198d389dd483e7c4dc057e13e4c95f37dbf9cc57eeb65f104c2a128800f0ea43e05195be554c7d12925a03dfa6b93f28288bea71832dd7 SHA512 263dbb5daa257b86dc8a6b926c2f1a7db54c82775a5642d36abf6d3032a24ff3f38c7d7578d5335785d187241bb6777157b3034dfc7b54657a83c624da05b72e
-EBUILD opentmpfiles-0.1.2.ebuild 1120 BLAKE2B f9e9dfd90ce72f1a0b7eb603b430b66a08467786562539810cf091d0b320a763742f1d9fcd70d622d03e529640b9a9b1df0e51ffa7a55f8c4059e803272269a5 SHA512 7231a5327564f6471dff75348d85c7d38bb3f8eff50ef55ef38136de21d8139791e6c32e2ef712b37d1faf82f7f08fec47ba41978a6c051cb7fbf3aa4fdfc0de
-EBUILD opentmpfiles-0.1.3-r1.ebuild 1265 BLAKE2B d859b95a49870be6ded9846f82821c394b3c288c504ef5e44da08fd87884b675fa69e0fb8f8c45dd0e62e983750d9c64f093b0b5f4cc1ad371650c13d17663c9 SHA512 98b3afad555d6f046e94319a6d10e0eb30594d0ca1492016ed4ecf73ec33fffca17f6574066fe11047628c10d1aa59838a0293fe1e53fd1457db65dbf33b4395
-EBUILD opentmpfiles-0.1.3.ebuild 1115 BLAKE2B 5fc8f27beedb47a85ded124269fbd6a5fc286a85d9d6a6166a10d1538c3f6bd1878fa31f2326887b35b8e7208d3bf1ab8c5a566226af918d6a3be7708df91c22 SHA512 180cfb63aa82096dfff5bad12b363dc47cf43de3de6d4b45ae7fe4a63413f98951557f02483acd0f99dbfd7cc459d108b7d54063ae91bbba2dd20c96c520a881
-EBUILD opentmpfiles-0.2.ebuild 1395 BLAKE2B 8ca8d942b4e57f4dfdd88012bf539d6817da2655cdce4262fa0322f46657de5c2cfb05baca726f054bd4af43d3ec4a4d21601f4134cedab5ac7620d9e9dcdcc1 SHA512 2ac7656b91a6be81c2c41f2b14576776c824db141c5046accde49bb8601d1fca1d08fcbdb2cecd3e73dd2b7ba103e5619cef9e73977a06d4350531770159aa91
-EBUILD opentmpfiles-9999.ebuild 1308 BLAKE2B 5bb3df2e3defc43b71a1156e93e026052ce94d883806f51911e2b9c3c250c5a2a05be730311eae903e1fb045f44df6d99e211580b13850804a140a4d20ba6d27 SHA512 ee9eaa829b571a34d47e7ebb0436faea3ddc6161963bec0cf77e092b412dc3d7a7ae928e80a4d510e5370a0420014a8f67e52c240385c604fc556fd80e467718
+EBUILD opentmpfiles-0.1.1.ebuild 1017 BLAKE2B 3f66638df547cb272a3d1439aea8066ff9a55bd024b1c8ba5e88ab40e4dcd1b79fb98a82b120205c43eb38a5d763aa33a4c52be58675e080b3c4ae4d0d190040 SHA512 1497bb70de8600e5c34655b1aeff7be20b068d9d45d11f18c924240d44375d157ffce573bb2ea9108d1e5fc54e50e4e5b17114eda59b8121f9e5d97fe2647699
+EBUILD opentmpfiles-0.1.2.ebuild 1114 BLAKE2B 8640775a04316a4f61da4081d425fa94def15b0bf8412db00dd8db2130b9dc4a3118c7011c1cc7b44845193390760f3372702ba0389f2fe1861cf2728b479a2a SHA512 8d7c7c28ea64b6501e1a4825c8b03375a1bffbb75a78552b8a54f7ceca419ca4620f9bef5f8207230e0bf17affbbc0de8ede2457281944315120c6afd19c5d4d
+EBUILD opentmpfiles-0.1.3-r1.ebuild 1258 BLAKE2B aefc898a4e5839475cd4fc253c6598f2542f5d64566fa02b30e659647f9a93cb07e9f2bcfc4daabcf509a9e63dca726e25c4101874a4a8a51d9888ccf3eee1ff SHA512 eaf74899b6e924a95376b2f944cc75a330100ad358de698d5655acfae0f61c68192e9e82e8696df2afd631f559847f566ddc9afbb830178e525c4af5da6eb442
+EBUILD opentmpfiles-0.1.3.ebuild 1113 BLAKE2B c1a284391763367635abe142ff3acddd8f92177481118d8fbab5cee55a2677d5bcdcb3527ff419240e662e94c996fbcf0328ec70bebae8dcf26fc2da60800e0f SHA512 7185bbba4e751229261f97ef65c9be5aa62e95f555f1f0c944725c01cc2788eb0f0c164083e72145c5f63d5d57909f11030d969f056e7ba0c64da637533ddce4
+EBUILD opentmpfiles-0.2.ebuild 1393 BLAKE2B 9918fccad67f9d34924505a3d303f9380c1fe677fcc4d2610fb3c09cc32e3fdff5252125ca92e83a71cebdda27d7a6a190958b91db975344de323175f83aa4b0 SHA512 7f94f5fa96a3105b7e5ab1ac17c4d6ea48e6c0d6fd4d36ea0d40f4c5ae701447f5e4cc6c8ecfc4a0306187dcf9e089b82c0d7e38a5ee6abadf6ec2df5decdfff
+EBUILD opentmpfiles-9999.ebuild 1304 BLAKE2B 6a3d9f1531be076ac5cce725eca1c552eb09a3fdbb8f1eac884436d7bb566670d4021991d8eb648f6c30fc01f7631f552d00a52af78989b97898fc1a8e374259 SHA512 b804a5aa9b9def1f10541d10ffb9227112538310a2b7170fb585a122d03e05ece940ccb3c1647b99e288d153c9e91e9df876e797b618528be2c853f64e9c84cc
 MISC metadata.xml 445 BLAKE2B 7ef4133faa6be767de26139d7f9348e892363b327fda9103b24410e09043b9a27c4a155037ef72754b2200b0b799f01adb478d6519abe41d551742084dfdb75b SHA512 eef375fdacdf78b008c8205a8b1e86eb5715f6a18999df0b71ae81e02a366e052346222d7bbcb05857b2d1c882791972f143881d62ad8a9ca264f73911d10e33
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
index 8b981e55483f..fe1d792ef9e2 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild
index 47fc6ab98433..c6654b1ab7a8 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.2.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.2.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
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 ~sparc x86"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild
index a4bf95888916..b650b3c11347 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
index 5399f5c659cb..5b98b86c5cda 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.1.3.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild b/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
index c91a199340a4..a0448ee702d4 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-0.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild b/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild
index 405b02bc7386..1bdbb4ca4146 100644
--- a/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild
+++ b/sys-apps/opentmpfiles/opentmpfiles-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ if [[ ${PV} = 9999* ]]; then
 else
 	SRC_URI="https://github.com/openrc/${PN}/archive/${PV}.tar.gz ->
 		${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A standalone utility to process systemd-style tmpfiles.d files"
diff --git a/sys-apps/osinfo-db-tools/Manifest b/sys-apps/osinfo-db-tools/Manifest
index 55c73114fefe..2cc8f0d56156 100644
--- a/sys-apps/osinfo-db-tools/Manifest
+++ b/sys-apps/osinfo-db-tools/Manifest
@@ -1,5 +1,3 @@
-DIST osinfo-db-tools-1.4.0.tar.gz 519089 BLAKE2B 2c2e0cdbcd0a795f8deb09727b8b971748f5d0ecc08449238d3054cbd947a0f6059456d4e9feadded47cd0e0aaa87132f1bec7524a3183115dd459eca989d1b0 SHA512 f4813f948551f630cc9936986abc3ef4455647ec529b353dc4fee71f8071beeebac0a2ee1988cede92ea3635bca9bedd400ac9f275e3f5592ff50236d97cfb91
 DIST osinfo-db-tools-1.6.0.tar.gz 547189 BLAKE2B 38db3118d618d620a137b12021fbcf9caffe1e0f67252d2eb7c514d4f25969b152679f55b493bb64abc0925ff07ccea897acfd809d17d7257db2b33a690f4878 SHA512 a3bdf9d913b388b0f567a14245f57c4f1da9dae40d723f8e76096ffdae9d7a8e587ed4832e3e59c820bc01bbb2b74815b3fefd8e1f47cebd903091457fdee951
-EBUILD osinfo-db-tools-1.4.0.ebuild 856 BLAKE2B 038ba8148b42ea03985e3f898b791876a87b30080f369f228d61d74f65a0f013bc2c9b321f2b12357c2a4d4140a6aa11270019d1f9bdb3ec892dd62732a774ec SHA512 17aacd592fd949ffec601cf416b3f07fcc3562b6cb1ad5562cefa94b861959364f72da470133defe109c4aaca3f0dd497479339511933affb9ccd3ecb201e6fa
-EBUILD osinfo-db-tools-1.6.0-r1.ebuild 1296 BLAKE2B a1a99a1fafeb1748f59186a701981675475ad60644c9dbafddcc5e266dbc12e1bce12353b072f05a41061d8ea18973ae3ff3fae146c8781d67796eadfdd41f64 SHA512 1add0750f95629e65c7ddf6198fce1d7dff47fa30bb5e5f9a3a994578e01f18376bcac6c3eb72ace433462bc11fdabd29439a78d7ee7b8f69feff33a52c60476
+EBUILD osinfo-db-tools-1.6.0-r1.ebuild 1293 BLAKE2B 107343796bd9fd0647d3ed78b08c7b99945a5f73f70508a57b5eb295943949a2b3b3d8a61920f43072f068ce039b9243ae939d46a2a5ed4cd60c0ca7961e9905 SHA512 40c37b7492eb21c64e074f6832e4729167a9a36a7bc41680e7ce1665cbdb3f69e2341f734b54ca8f78906ed99d94102479655a2a9b5fa7d43d1ebfe25222521f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.4.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.4.0.ebuild
deleted file mode 100644
index 212f158f0ea5..000000000000
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.4.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit gnome2
-
-DESCRIPTION="Tools for managing the osinfo database"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-# Blocker on old libosinfo as osinfo-db-validate was part of it before
-RDEPEND="
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.6.0
-	>=app-arch/libarchive-3.0.0:=
-	dev-libs/json-glib
-	!<sys-libs/libosinfo-1.0.0
-"
-# perl dep is for pod2man (and syntax check but only in git, but configure check exists in release)
-# libxslt is checked for in configure.ac, but never used in 1.1.0
-DEPEND="${RDEPEND}
-	>=dev-libs/libxslt-1.0.0
-	virtual/pkgconfig
-	>=sys-devel/gettext-0.19.8
-	dev-lang/perl
-"
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild
index 1d3a019cc342..32b3f7fa9ee7 100644
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index 666ca7e1b8a1..5b4665cdc510 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -1,7 +1,3 @@
-DIST osinfo-db-20190218.tar.xz 82712 BLAKE2B d026b428171127b5048357ae75e2601fc184b9e2e5dd7224a7ba1a439ebf20e567bd910ab4b8a0920d3f8c0e2e8be637086920ab905a8fd8eb98c772a13c234d SHA512 e6b6f0e8b965ecf5a6c38071f3b2d5646123a6d84a5d5ebfb59995f10ae0aa8985bc5caeb1a4de396b92be0466291bc82247f33138f7954c847651eb682fdad3
-DIST osinfo-db-20190319.tar.xz 85668 BLAKE2B 9e1d95379c659dc325a0fa5d7d8e6abc6c486839cbf42d78e0964583f19258f2e6669e685bc09cd13f17ecd04cc3d1cf3188d862d12d2825636a76d9d2999b8f SHA512 fb06adeaf639e71b02bec30dafbc405e903d490cd8038d4fe94de63c4d0bb9f617a469e59d11fd4dfc5c1c0d9a6094b888ce5867634c0cbe501e5195316a8e75
 DIST osinfo-db-20200214.tar.xz 99572 BLAKE2B 0342b35c5e370d98a23ccc36c72233ac2d92d11d30330b6188101cd9451e7c557849c3d1d65c0d469d6539c5b4347a4fc16eb7a5a92493bd5a2a887fb19ade08 SHA512 b51f62f2d31b4da9cc6162b3798cdef0993b7cea2c884cbeffb4e81de027bbd077ab1c3d871391e456b41e87bf2a3e80244c01a49f39db53285cca0596ec09b4
-EBUILD osinfo-db-20190218.ebuild 668 BLAKE2B 0e4e429414a0a894b5dacf340fd5ce5be4dd7aa60d86c6c1508f7b60af03535831b9b8c55ff470f8ddaad5526425a5d805cc4fa17db2fd5aa880a73c9809e8c5 SHA512 b2ef8af5554474858ace472c8e7230cac8bf77efc45c6ecae37642eb719e3d5bcaeff6a52580bfd8d840c288e38455242ea8ea756cb6eb7eaf68c6521cd4618f
-EBUILD osinfo-db-20190319.ebuild 668 BLAKE2B 0e4e429414a0a894b5dacf340fd5ce5be4dd7aa60d86c6c1508f7b60af03535831b9b8c55ff470f8ddaad5526425a5d805cc4fa17db2fd5aa880a73c9809e8c5 SHA512 b2ef8af5554474858ace472c8e7230cac8bf77efc45c6ecae37642eb719e3d5bcaeff6a52580bfd8d840c288e38455242ea8ea756cb6eb7eaf68c6521cd4618f
-EBUILD osinfo-db-20200214.ebuild 671 BLAKE2B 1a1edab17c338bbc4067cbf99b89e362307a142f5c53c2ad2dd72bec89b88a13843b66a0552156bc1c7d3437641cefd767d6c3877d93cd7216fadc2b1c3c3da7 SHA512 a46832e3fbb2f8e5eb6632632896faeb184da58a01a1297fcfee5151b6235578a13ae413a2a48031399da2be31f050607cf7d71c32a65fbc944eb9d45d14a04a
+EBUILD osinfo-db-20200214.ebuild 668 BLAKE2B 5bd9f45c5745d97052e35df92fd9a6d7dd413816f28112c7574f310e792e905ab0b64f8198e968435d9c48c2d3b599edd0a9bf220be99f073ce7669042e9c79b SHA512 27ba85e90d6ec6079ef998b26cf86263345944644b93d86411e029ad8366b3e4570e349abe7579c27c31e5b4200f1b5885ce6dd9ccb7dc46701590b35571990e
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/sys-apps/osinfo-db/osinfo-db-20190218.ebuild b/sys-apps/osinfo-db/osinfo-db-20190218.ebuild
deleted file mode 100644
index e74d64604535..000000000000
--- a/sys-apps/osinfo-db/osinfo-db-20190218.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="osinfo database files"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-apps/osinfo-db-tools
-"
-# we don't depend on intltool here, contrary to README, as the tarball already
-# contains the processed results with translations in XML files
-
-src_unpack() { :; }
-
-src_install() {
-	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
-}
diff --git a/sys-apps/osinfo-db/osinfo-db-20190319.ebuild b/sys-apps/osinfo-db/osinfo-db-20190319.ebuild
deleted file mode 100644
index e74d64604535..000000000000
--- a/sys-apps/osinfo-db/osinfo-db-20190319.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="osinfo database files"
-HOMEPAGE="https://libosinfo.org/"
-SRC_URI="https://releases.pagure.org/libosinfo/${P}.tar.xz"
-S="${WORKDIR}"
-
-LICENSE="GPL-2+"
-SLOT="0"
-
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	sys-apps/osinfo-db-tools
-"
-# we don't depend on intltool here, contrary to README, as the tarball already
-# contains the processed results with translations in XML files
-
-src_unpack() { :; }
-
-src_install() {
-	osinfo-db-import --root "${D}" --dir "/usr/share/osinfo" "${DISTDIR}/${A}"
-}
diff --git a/sys-apps/osinfo-db/osinfo-db-20200214.ebuild b/sys-apps/osinfo-db/osinfo-db-20200214.ebuild
index ee488fdf635f..32c869734dbc 100644
--- a/sys-apps/osinfo-db/osinfo-db-20200214.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20200214.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 RDEPEND=""
 DEPEND="${RDEPEND}
diff --git a/sys-apps/paxctl/Manifest b/sys-apps/paxctl/Manifest
index ff5b46ff1724..0ec60e19469b 100644
--- a/sys-apps/paxctl/Manifest
+++ b/sys-apps/paxctl/Manifest
@@ -1,7 +1,7 @@
 DIST paxctl-0.7.tar.bz2 7642 BLAKE2B fe9dbf6a673e677556b7667a036cdb5243c064fb9a10dda49783b408ed66d6bb072c478b529fa58cd2795b19c3128d6ae83c4aa4f11e19fd835c16a7df1aa4ad SHA512 d715d7466c5d5b402a7b6c44257b959c81234b8b72dc3bad4ad1080f66da784b348e73fadd3b2072ddec6c6b08f042a35cbf9d63cb890ef9efceb1e2e8d56d0a
 DIST paxctl-0.8.tar.gz 8027 BLAKE2B 3d2e1b22b3bbe0912c2b3ab4ae864c9eb01e949349c382b4b395983f5787ffb6b6b5681329c81aa82231e8b779badf0c46a41cb43b967eef48892488b957d736 SHA512 9357601a96a7780bf900621e8b88e8e7cd323159084f62f30cd6967319fffabe08efff3596612fd05a1daf639610bb15d998f4a954c980ab4f45c9a0cc80037c
 DIST paxctl-0.9.tar.gz 8109 BLAKE2B b26049dedfa82890e5445b5baca8379d37a184124d468d895339f1dad6142e4d2ac8fe393df42a68c6aec8a03b151cd412c2996a098ed460265f4c7fe9ca519f SHA512 4048544bd05ed6eb37866034ade8482b8d017110ed9a639f220e8d2e32bb3dfb6c913a986c8fd41829e88efa793f7552eaa2a6d6b2af533c44a5754a5ab8650f
-EBUILD paxctl-0.7-r2.ebuild 773 BLAKE2B bc2c444103ff0bafd19070cec5d8d3c171080ae15b8922e6fb5247f40ca84401a2c6d070a1f7bfcbbc45f3dad8746e95eaa717cd4bf9b89847eb65aab8738bb4 SHA512 9018205d38ff88dadad643e4b82695147bea3899743c10bbca5fd03b5265bd80846f98e8350574f04c70bbbcb35abbf385ba2f6c5527b173d25c48ee0e4b3456
-EBUILD paxctl-0.8.ebuild 781 BLAKE2B 6f1dbc13d0d2deac6d634cd5d30d09962ad87424d68fadf8ddb5cdbd7ec4f20e131bd0ed91404123676d1cf7be3ae853974f7a3889d60941ead22706160af89c SHA512 a89e6d84f34734106cf9bb25af45151e0629c2b12765836e3fba865edc9dd1927522229e0a9c61ba672f10b97be1cd138b9c2ef9476638dff7e046b3614f4258
-EBUILD paxctl-0.9.ebuild 778 BLAKE2B 059fb76b059441abace7c3f39bec7ed8f16331a05059abc8cc398d975c9ea7fd32344c700fa6a35e59dada2189b0d7ea307e103ba038a28d0b9699fb615f0cc4 SHA512 c555bd96482c3dd19bb7d2e24210c7cf4afe9a4ad88b2304428d87cc6c39dc4308cc3ad437703815159c37ffb71ad73c2a8a3b5707537881aba8aa32fb53950f
+EBUILD paxctl-0.7-r2.ebuild 771 BLAKE2B 7d2c897fb3d6c19da709e4047a28fc782b14f11f628e0c2f9affec41e3d86caa2c4632598c7c7b3758b34076acf42c766e5c15c3a926e925305348a11f46ae5e SHA512 e3975705662756ac38d46abd77e0d0df149a1b1f47c6a3635e48b0896ef3c41d02a32c99f9daf33b24d47020088060c034979ca26b19518919f158dceb80fc0d
+EBUILD paxctl-0.8.ebuild 777 BLAKE2B 75d5d0f57cd14bfb70c92858efc37e97bd8c0424b911aa336ed759d878e8bed4ce36395c124021a88c9d190ea16267da750f9cfe75a257bcfc8f1f697f0480f6 SHA512 032f0075c87f4e9b524cc00373b8f9d26cb7b05601c7034fae125e432b719ed4c463e5ac49d1f40d53f964a5380ed859db27638f83c6c3fed1b4939c21902d0f
+EBUILD paxctl-0.9.ebuild 776 BLAKE2B cdb6fe84ef6686817c1cfab7ed52f590d2acff183420bf35568a0500bc9cd15ce34ba3ad71b0ab94bd0575257a4aeeb72d0fdc0e812adf8192063d21a8fdc3d0 SHA512 09e3beaaa717da9fdbe917f3f4ddc2a71b1e93596ea7a378cd6cfee1014d4191d01e07c9357ef87f3eaf484af1d96635a2a735ccaeb5538f1d41e9fdbb0a287a
 MISC metadata.xml 363 BLAKE2B 27b81c37d5a0f685942eda5610d73a0933a7654282c851a92bc352f27676c609452b6c7a3f3bb94c0fa358fa360c5c113aac6acd24e186347912f61cf4a0bdf3 SHA512 b848c5de5ed09c4843c3e75d59ea4697c5d1c1fa2ce8c9e9a0bf38b5102d57f25aa626f3c6295f4f3a345b1cedc15553fb45b460bf41e73df43eb2eef6e00281
diff --git a/sys-apps/paxctl/paxctl-0.7-r2.ebuild b/sys-apps/paxctl/paxctl-0.7-r2.ebuild
index 81c900164e31..66aaa087a942 100644
--- a/sys-apps/paxctl/paxctl-0.7-r2.ebuild
+++ b/sys-apps/paxctl/paxctl-0.7-r2.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Manages various PaX related program header flags for Elf32, Elf64,
 HOMEPAGE="https://pax.grsecurity.net/"
 SRC_URI="https://pax.grsecurity.net/${P}.tar.bz2"
 
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/paxctl/paxctl-0.8.ebuild b/sys-apps/paxctl/paxctl-0.8.ebuild
index d312a62fe96f..6727771993f2 100644
--- a/sys-apps/paxctl/paxctl-0.8.ebuild
+++ b/sys-apps/paxctl/paxctl-0.8.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Manages various PaX related program header flags for Elf32, Elf64,
 HOMEPAGE="https://pax.grsecurity.net"
 SRC_URI="https://pax.grsecurity.net/${P}.tar.gz"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/paxctl/paxctl-0.9.ebuild b/sys-apps/paxctl/paxctl-0.9.ebuild
index 3a0964c832d1..37b5eff6a1a9 100644
--- a/sys-apps/paxctl/paxctl-0.9.ebuild
+++ b/sys-apps/paxctl/paxctl-0.9.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Manages various PaX related program header flags for Elf32, Elf64,
 HOMEPAGE="https://pax.grsecurity.net"
 SRC_URI="https://pax.grsecurity.net/${P}.tar.gz"
 
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 6970e0358d49..5bd0320bb2f1 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -5,8 +5,8 @@ DIST pciutils-3.5.6.tar.gz 442190 BLAKE2B 9f1237828436f0566caa13e49a154b40fcc41d
 DIST pciutils-3.6.2.tar.gz 473699 BLAKE2B ae7563f2d17334f54e6b055d135138e21d105fa5f5b71061a6de638ecf26c35d9de79cb67a691f936f42fcedb9a1f300e046dd892429195a9f54f9536e313110 SHA512 ab2bab26dd11f941286593135b751b811fa6199d4b5fb8a18e74f72709ea598ab0c0efa31ad6ca70949966dcf80cdfb16d53e5d339b773c69e0a12f132bb8577
 DIST pciutils-3.6.3.tar.gz 495316 BLAKE2B 01dab2337dcde5dc436df6892ce7c54c9c875b7c619c8f8675027e82e1073ab9b4c603f61f9b03c27af90fecb60fd35199fdf0b62dc90b5d2d387bfde00408b3 SHA512 deaf265bae9149289c860eb47cf6b85ff300744a1e79bcd232819f56e6dcdddcda4e7d3639869c228a492237985298866eb2633938b00d880545594e3c02df05
 DIST pciutils-3.6.4.tar.gz 497675 BLAKE2B 45bbfafbf9ad6aea09fd17fe235bbb11bfe00fff2f31f1223d739eacf3db1a66ba0cd05f0df29349b01cc0a4fc598aeafb6fcf276e2edf2d557b9c21f25a0382 SHA512 001b2f722ee9f5fd57307aa4e8894c97ed3eee42f8b17caba2f29b191ab2fe98dcbfb76438f97dcaa343ea90011f6f6277ab367f361bc45e20d7ed848b439f86
-EBUILD pciutils-3.5.6-r1.ebuild 2864 BLAKE2B 494993bc4f075947e7e14debe4976e4314d0110132a20435d699ae3ec762f0c026ec57a299ff11ad596457168d8addc770f6d1da73ef924da7bef71f66129b05 SHA512 d37cfd99e4eca9aa76197ab99a99d53f14ba31d771e928984ce34d6a84cc006bc3625359f40a2734e39358e09ed526258e6913aa7d656ea052a19111fa8c7a9f
-EBUILD pciutils-3.6.2-r1.ebuild 2876 BLAKE2B e7852e9b01891c796595b6c281d1d54fed85c43f6fee281aa02a8cd6cc1ac9e1dfd86679a19ae4c749802b7813a0e6cadb9e8f411d9c1f00b3f3f661fd5b2944 SHA512 98256f4499e6a4fda867a0836b14b1ae5cbe1e0dfb9cafb712b86c7551156c8739c8e839055abf54a36460579927fa21d83be7f71c2c74270d246486971f30f3
-EBUILD pciutils-3.6.3.ebuild 2866 BLAKE2B c56d210349ca755e9a44f6a8aa253f86a921dcbc62fbb8c9b4131c9d732af2693e66c1fcd302f2524f3c74b3de0e87a233c77a7ac0d552cc9766d490cc8874d2 SHA512 ebc390275ee01db9e99ea58d929ac08e0b297e20423cacf6a1e9252a8d55f76cd360a01a74e7f3e6a302a8982954be2542e2506ac5b285d2d981a87f966b9f25
-EBUILD pciutils-3.6.4.ebuild 2866 BLAKE2B c56d210349ca755e9a44f6a8aa253f86a921dcbc62fbb8c9b4131c9d732af2693e66c1fcd302f2524f3c74b3de0e87a233c77a7ac0d552cc9766d490cc8874d2 SHA512 ebc390275ee01db9e99ea58d929ac08e0b297e20423cacf6a1e9252a8d55f76cd360a01a74e7f3e6a302a8982954be2542e2506ac5b285d2d981a87f966b9f25
+EBUILD pciutils-3.5.6-r1.ebuild 2862 BLAKE2B 3d526caa52cc1acda076b7dad0cb0964e8ba495ffb788c6f133764373ec7340d43e7c18630edd9a0bd09fb6c7330b1d0c5202ddd4503e75d81a0705de63f6a50 SHA512 eff4735012134921053dfa0151078c3624cddacb44504b7515c80e1355da4e736d352d6d1512f23659cb41a2336465af3db37c3410f98dff8a8d1821acfa21b0
+EBUILD pciutils-3.6.2-r1.ebuild 2872 BLAKE2B 80bdc75244fc5225c9bd86a6f936902c16da353c87d1d05f2e823a9aec59164cd164659c0b507a26e47aeab8c1d500eb9fc6534b21bc8c0e37e381be40f10994 SHA512 1d9f138b25e9aeb9f77f64e296fa9b6cccf7d769f75336fc96125135d792cc3af53d784f2d29adbcfb921a4af5d9c2347dc1376bfe08a8493031e6f62b19b26c
+EBUILD pciutils-3.6.3.ebuild 2862 BLAKE2B a23eb3655cd36b4e5ad5fb9c1c9ef3f1002032b55afe5a030f1f2ce832781a53c3c28a059218511fa26bbf31eb858b774dcbb2e9029cafeb495ebc64fd0ff484 SHA512 abda8c7ac9c539388f80bb4963759a8f33e3509e2dea00c4d3f49c49c50a9a2d533763730ebb1c314201d6e617d9849cc9f3ac5560374b882492ce15e899532a
+EBUILD pciutils-3.6.4.ebuild 2862 BLAKE2B a23eb3655cd36b4e5ad5fb9c1c9ef3f1002032b55afe5a030f1f2ce832781a53c3c28a059218511fa26bbf31eb858b774dcbb2e9029cafeb495ebc64fd0ff484 SHA512 abda8c7ac9c539388f80bb4963759a8f33e3509e2dea00c4d3f49c49c50a9a2d533763730ebb1c314201d6e617d9849cc9f3ac5560374b882492ce15e899532a
 MISC metadata.xml 524 BLAKE2B c000b3995b57cf87ea92270e4e2d9b8463e5db65dea3a3aeef50a72a153ff3320a1ab1825cf0a2dcac3569d32f6d17015debb79d567c22d7c6891ce48211d661 SHA512 881e7cb9a71e1ccbf84be8cbaab54cfd0258a782aa1e4def6f3398444f4c28790a23eb194c3facc6e7c77437c06e4c17db01e0360debb1f01349cbca69dd8020
diff --git a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
index 010634ababab..ab4c4955af49 100644
--- a/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.5.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild b/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
index 6b4cfffa226d..bab8c6b31951 100644
--- a/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.2-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pciutils/pciutils-3.6.3.ebuild b/sys-apps/pciutils/pciutils-3.6.3.ebuild
index d7349d7b8671..cc2e5824111f 100644
--- a/sys-apps/pciutils/pciutils-3.6.3.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pciutils/pciutils-3.6.4.ebuild b/sys-apps/pciutils/pciutils-3.6.4.ebuild
index d7349d7b8671..cc2e5824111f 100644
--- a/sys-apps/pciutils/pciutils-3.6.4.ebuild
+++ b/sys-apps/pciutils/pciutils-3.6.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 
 # Have the sub-libs in RDEPEND with [static-libs] since, logically,
diff --git a/sys-apps/pcmciautils/Manifest b/sys-apps/pcmciautils/Manifest
index 40d8530039ae..f302467054ff 100644
--- a/sys-apps/pcmciautils/Manifest
+++ b/sys-apps/pcmciautils/Manifest
@@ -1,5 +1,5 @@
 AUX pcmciautils-018_p8-flex-2.6.3-fix.patch 593 BLAKE2B bff765ae6c80daf3d2413528c4d42aefb7af7e3823590d33315c7089a5221d99c82802378cf9b51502b53bd920e0b5b4b68aaa82d50a92e83f5dfe7207c39a49 SHA512 b96f9bc3176f1eeb936a31f8fab5a495ce14218e92fbae2350aa970328b53bd6732ade90721f1ca55d80a94436189773f83a300aa8af7c43ecc5ed62c95f3557
 DIST pcmciautils_018-8.debian.tar.gz 11213 BLAKE2B cf28ecf71ebfd5c4ad7d882cbadab71b787f407adb2d20258cdc1157ca7d542bf398ff09207037d1d6e933d43e477b50b28ca3f0ac0e557fbaefb9f31656843e SHA512 8a00d776e208b43d01fe22b9d4e889bc1b2c5982aa1bf225bdd613ffb0f5b37f5266ccc1cb91df9ac49c4ee3e3653ebb29807b61fff53c585e2cfed5aa2cd9e9
 DIST pcmciautils_018.orig.tar.gz 48516 BLAKE2B 0b197cdd7d0940e5c0eee2da961f0f4dd972a3178ba5d07a6492185d0ab156cd61f5343c8f9d812cff402f04af76a15baa3db564d14317d3817e5325dd8811fb SHA512 f0af1fc6155686ae61c1c85a6451b032088a3880dfbc05c1d1ed33ca8e975745f9d4bedb0f3ee0a1252461aa008bed8014c73ff850cddd89d930524a6d68d47d
-EBUILD pcmciautils-018_p8-r1.ebuild 1554 BLAKE2B 88e32a07afd5e4bff22c20f3f497d450bc8dc8bf51a73286092b1d2a02da19824a8db71382e04d7fdf04cd53d9618e3a8790e48ec1f89468f6e9dbe39db45947 SHA512 aa4075c313d591a0acba3a5813a88b09fa94b60019b0f4acecf70c752d2354d0b527bc64a6afdded17a43cde4ab73460ca4b54c1b8e110fbc6b43165a2c29b97
+EBUILD pcmciautils-018_p8-r1.ebuild 1548 BLAKE2B 2f91a5e313c4f22e8aaa60cf8a624668626607522c9ab46443e7e16379acb8bda814aaa9db0a6ce6259bb3ee98238d74abddc9e5db7721f0f078110012cf5c0c SHA512 447e810a8a51d9fc091f330a10bef2920ec9bf57b717226ef18515da6833ff9ac2b1cf7a7cd5821410d4920f83e247a9c733e6f2b81be78664c0f4f7fa74c06b
 MISC metadata.xml 244 BLAKE2B 98282e1c41cb6f5c3e984cc3d0558218b91a7eaf13774ab9f7e3eec7351fb18831088c0ecf1422ec6bac434b1c46654cf253f41bd3a748f4c724bfed2b35e82f SHA512 5c9aa921d361b670fdacbc49e93fb5e3a8ed161e0866ebc08ec0940c480a6bed654059642675e37596d1ede56f0ca5b55ae31ed96040fcf8d01f9f683ce444f6
diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
index b5f7e9942485..798f57159009 100644
--- a/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ppc sh x86"
+KEYWORDS="amd64 arm ppc x86"
 IUSE="debug staticsocket"
 
 RDEPEND="virtual/modutils"
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 32a1747af05f..0714dfe887ad 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -5,6 +5,6 @@ AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d58398
 AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26
 DIST pcsc-lite-1.8.25.tar.bz2 757099 BLAKE2B c34727833206b4c868e4f0cd6f8bcaf6899695a92488df8e2fc815c00771ea2f248d9d5fa457c02fc437b8350cbfa37390e07f45b90d08630c8afc34b247034a SHA512 0da63cefd70d9524b2afabd62c5f404758c805b84bbe9ef64fb801ef91a8934c38495513022565ea31bd8550b23bc95b9e9b098ddc76930e3d0643c1fbfb5deb
 DIST pcsc-lite-1.8.26.tar.bz2 754838 BLAKE2B 98bc1abdd66a08dde479821f8b1ef489980a6d58d2a624902de12d0862a4e11b47ed7b12eceff438ecd794bd78a91a7a376e7f4c78c1b03867555dd0e5b734d5 SHA512 23f9f41e08f6a5ff1840bec621ee37d6eb268e4ced58df516eb7e32cb6a84998a1d04bafcec36e6524926963e6730a25301301d364b6bd4dda8da1caaa76f037
-EBUILD pcsc-lite-1.8.25-r1.ebuild 3035 BLAKE2B 61036770e277b3c5b05c9dbde0dcfa3e77cc8c971b8e50928c89eb67e194266a86b4d6bc64ca853cae28756d1ff37a5510bb0674830fb18a59baeacf2660767d SHA512 08b2203c969d15f9401ba5761f5ef5fbf88fa8c79483a9061cc6828e6ba78463ce8c98e28651a5a58a9de2f75d6643b3bfe65a028535fbc4c5b51429e62316c0
-EBUILD pcsc-lite-1.8.26.ebuild 3137 BLAKE2B d8c9cb8de8e16aaafdf88168a8649d6b97be7ac45fd8cb53257376b89305281971deb01459e99d20120358750af8deb9e325573403ef0b9d95c6fdd22d7bd257 SHA512 2d102477741164e9258b45a44513bbca59ee6fc8a9aa4df8c5fcbd6229d10233ff51c7da4079b334f5b98e98214a8f412acae47b5ebdb6302a1ad30ad644c737
+EBUILD pcsc-lite-1.8.25-r1.ebuild 3032 BLAKE2B 2bbbeff87a7a3786bb9d09dcfe0091b9c3e4722928bcb2f0b72cee9502c92aa2e418c9e2eed8f831258ae74f50af76b909586cd8f522cb9ed7d26646130a5923 SHA512 96fb03a7bdc02c68715c3b1237428d57b115e03e6acc603c65e5ad059c9ed9b0d1324649a695388f62aa2895cb27f7cebd08e09085029272d2e2bb9f5eeb5ed2
+EBUILD pcsc-lite-1.8.26.ebuild 3133 BLAKE2B e1e8b08bea89c8979d3ef9c22c4dc1c2373ce4589fb86929b191d3364c3a239bfccf1a49b3e7d2cb0809fe51cd32769f9a1833dec85011ea8b9525498250e298 SHA512 90e873296f4db4a69e98c6229f5b902f95779d1c133057ea9905fc94684fda8399b0ea174f398d6d3f6d895ff8d0470a5f975bcac73884b3cbdd703144ef5526
 MISC metadata.xml 1078 BLAKE2B b47112f9457ca29308517a6cbac1502a83bb8c3ac19f95db1788d0695808c07e3cd1955cbe0ea2f861e6cd9a78cab793f9fbeb699ffb0952d1fa4c3372b8ead9 SHA512 b1804b8e9ec6044221e4158a0127e1dfeb2381d264383f3ba4faa69d6a6ac8a1bd0fcf7681dec92ef7105c05463191bb6e890962bbf419f839d47d51f1d8f7d2
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
index d4b4b46d057a..6b7d4505ff89 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
index e962566ef384..0cd633a0948c 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.26.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
 # upstream.
 LICENSE="BSD ISC MIT GPL-3+ GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 # This is called libusb so that it doesn't fool people in thinking that
 # it is _required_ for USB support. Otherwise they'll disable udev and
diff --git a/sys-apps/pcsc-tools/Manifest b/sys-apps/pcsc-tools/Manifest
index 20bb11fecddf..5fd939036e40 100644
--- a/sys-apps/pcsc-tools/Manifest
+++ b/sys-apps/pcsc-tools/Manifest
@@ -1,6 +1,6 @@
 AUX smartcard.cron 319 BLAKE2B fac8c4360b802de32ff5b0fc5c2ef41aacc28186001ee6f4f3a1cd878ed75cae3f7f78aaad58580d11a695b3fd624fdd412669c743b951818de1aef6d9d4cdf0 SHA512 cb34e75090ff0fde349b81867383ed776b4c89672039f42426e27d2fce77ba0575827d2627b82fc9c435d6091b26e7c2a0e51dbcd1bdd1c883b8c37000ed516e
-DIST pcsc-tools-1.5.3.tar.bz2 267564 BLAKE2B b060e6fc923c6274d38c364325c367f793acf2979f2410c92857cce7483ebbb59db07657bc27be6d5a799f7f85da45782c4f1a9bbf7c450b43d533dce54755e7 SHA512 da5b362b7a3a6d47dd309ff217e6dd8af29298501db5e898ecd68762020ce62fc982132205f9bbee159a7d7eac549fdb8f25395416bb52bc0d0c888a5b0fa1a0
 DIST pcsc-tools-1.5.5.tar.bz2 287752 BLAKE2B dd0563f75c2b1cd05f21916287ff98c8b5f0c444b71ac7cda4da3a9dbf2db58f92555d54029a73feffd651b42ccae820670df1a90c8541eab188bf66b51ad114 SHA512 b34eaea663274e03790e409909ddb9819b20882795af2618068f59532e2f79973b22b4d0c468a0bb4338c74d1ceca310e8c60005fb1d15ab4f34053125ece3bf
-EBUILD pcsc-tools-1.5.3.ebuild 1332 BLAKE2B 501081f01c52942be7cb2bf59f944dce21d3a1dbdbe0ed66bfb1dd24699344e9dcbc6fe5e6d72ab76ba52a213835d4552f51731183709284d43ecc5344b39d7c SHA512 b04fac13c8113d3214b978592c89d21ada84300e626515ac8b2364218fb5cb2e38ab6c0a8f68446c44f736be09e9046e9f217b9ec406240055c9470543797fbf
-EBUILD pcsc-tools-1.5.5.ebuild 1336 BLAKE2B 575bb3247d69c2c6f6ae2e60a357c0df38b9b0d7e2ec28fd1706b0fc15483ed82cbe6094c67ad51a2c611d2a8fd7ceac01524168fb5d62076f6be11006ef2595 SHA512 69d537562db9dd93ff01ea5300422337270496f1e853ccd5e8741fcab0540286d001021c7fa2bb51cc14d226371b5b5f132313c3121d3013348cdf38f61c68c9
+DIST pcsc-tools-1.5.6.tar.bz2 289691 BLAKE2B 35dd50a3a8babff89f9e5d769ef70a573e58b2780d680c82dfa07177a3daaf527b5ccca665c901f9667ca4a81719916bd5aebb2e9b1b4d0301001498fe587832 SHA512 94076ed5af698afcec05da9645d7108c02c110fd0ee5efecbd8e0c7eb5ed9a55ee857d23b79ab2ccb93847f8a36f996fa9d521d999395f63274d4bf1d9cf3d26
+EBUILD pcsc-tools-1.5.5.ebuild 1332 BLAKE2B 501081f01c52942be7cb2bf59f944dce21d3a1dbdbe0ed66bfb1dd24699344e9dcbc6fe5e6d72ab76ba52a213835d4552f51731183709284d43ecc5344b39d7c SHA512 b04fac13c8113d3214b978592c89d21ada84300e626515ac8b2364218fb5cb2e38ab6c0a8f68446c44f736be09e9046e9f217b9ec406240055c9470543797fbf
+EBUILD pcsc-tools-1.5.6.ebuild 1336 BLAKE2B 575bb3247d69c2c6f6ae2e60a357c0df38b9b0d7e2ec28fd1706b0fc15483ed82cbe6094c67ad51a2c611d2a8fd7ceac01524168fb5d62076f6be11006ef2595 SHA512 69d537562db9dd93ff01ea5300422337270496f1e853ccd5e8741fcab0540286d001021c7fa2bb51cc14d226371b5b5f132313c3121d3013348cdf38f61c68c9
 MISC metadata.xml 356 BLAKE2B f2a71004d252e6d78f05b74f6d6f6568cec05e7b28460ae12a73f7d4cc0a42028f21553161b64c689902a4a4366243b0b112fbb69909a7f020fa283f3943b585 SHA512 e541ab4d7c75e0ecbc34ec540ed771dbfe7c99f4068adfae5142010b28b60b18770883a47b5c9da2410482cb9beb26713b3b876a091dcf326be7132d0dbb0aa4
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.5.5.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.5.5.ebuild
index aae8a0221d7e..add6360afa55 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.5.5.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.5.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="gtk network-cron"
 
 DEPEND=">=sys-apps/pcsc-lite-1.4.14"
diff --git a/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild b/sys-apps/pcsc-tools/pcsc-tools-1.5.6.ebuild
index add6360afa55..aae8a0221d7e 100644
--- a/sys-apps/pcsc-tools/pcsc-tools-1.5.3.ebuild
+++ b/sys-apps/pcsc-tools/pcsc-tools-1.5.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ludovic.rousseau.free.fr/softwares/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="gtk network-cron"
 
 DEPEND=">=sys-apps/pcsc-lite-1.4.14"
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 0b838f4a2fe2..1d213c51ccb7 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -1,6 +1,4 @@
 DIST pkgcore-0.10.11.tar.gz 648060 BLAKE2B 20bb4666a9adfcca090758ec427054155273a5b73bd3170ce1d52c21ca300be3c8b8c0c2f6ce4f8e2c07caa0d5f741117eef4d474265afbc016cc66b0f5217cf SHA512 9c8e839b0a0027f5182aed2b56eb6bded34fa365dc0df82d759f349778756951547aa9887f53343831018cabf59cd3dbd96a866998d482ae6f85e19fe7d82baa
-DIST pkgcore-0.10.9.tar.gz 647634 BLAKE2B e05b091d9ea797fe4207eb750edabf98faa3574b9ee93799554ed525cab5513b5cf45d9f2757c1ba27a3e7add4c55cd51ee57a650d988916e2bc6d03bb78f91d SHA512 efa9e43f2a67e934b7dded190f93f09b860b770097e3715b7f03af3213fc680f5b9d5d9d14c5671d0ef2df9cf0144a009f7fd20e2f28d5c2dcdc685c65bf7232
-EBUILD pkgcore-0.10.11.ebuild 1072 BLAKE2B d666b0e891000e1b8826f2c9b08dff7b5a6d57a356f96d0b94dfe4c5f7ba36d9e112aa86f76b7edd101f97825aa647884add91243a5361ed037c48564c44fb10 SHA512 70bad49df727f2337ba6a0f2ef36655663461d3dc6ae7a1157abcfd929439b4ed0a63546c1a3d7dee0974b5a7d55887d76f5dd67cf774ba95a874430cfa07bcc
-EBUILD pkgcore-0.10.9.ebuild 1072 BLAKE2B dbdc62e4f8549554caabf213cc4100c4733d8157f0d668ac449e9ef14de4894cde48917940c8da7c8d892d4c3a309999f4a73ef09372bc13a15b9f04175199e1 SHA512 e7c1c1af43e24aa946564869ae4f20e2824b401fa6072670ad44369734a83418d71cba9094a24fd02c064fce02b19d412b49a68c009ba3a1aef2706047e545fa
-EBUILD pkgcore-9999.ebuild 1072 BLAKE2B d666b0e891000e1b8826f2c9b08dff7b5a6d57a356f96d0b94dfe4c5f7ba36d9e112aa86f76b7edd101f97825aa647884add91243a5361ed037c48564c44fb10 SHA512 70bad49df727f2337ba6a0f2ef36655663461d3dc6ae7a1157abcfd929439b4ed0a63546c1a3d7dee0974b5a7d55887d76f5dd67cf774ba95a874430cfa07bcc
+EBUILD pkgcore-0.10.11.ebuild 1068 BLAKE2B 38d23c2f0d08ee2ae9f03f0a10f5613f9068692319ddcac42304203da7a283462d36872193a5cac8e6291b650cb5bbbc0eb2773a9feb2c42f170d4c388a213f0 SHA512 e67fc80decf285482b481450fdd400f565cc5b4a832b127ad6d6ddcac9ff70b535a02b73edb120ff3ef1bfc3d87ff83098ef6bcefe3a19dd31d5726aba254f51
+EBUILD pkgcore-9999.ebuild 1068 BLAKE2B 38d23c2f0d08ee2ae9f03f0a10f5613f9068692319ddcac42304203da7a283462d36872193a5cac8e6291b650cb5bbbc0eb2773a9feb2c42f170d4c388a213f0 SHA512 e67fc80decf285482b481450fdd400f565cc5b4a832b127ad6d6ddcac9ff70b535a02b73edb120ff3ef1bfc3d87ff83098ef6bcefe3a19dd31d5726aba254f51
 MISC metadata.xml 337 BLAKE2B 8980bf734cb1f95d4089aed57ac9ac0538b12aff969f37fe298581b5af005a805027962c343fcd88f7b828fc4e837f9bd47478fad7fb9bfd7a8e3bc3bc7a432c SHA512 1c1e68deab3ccdb8a2c80d0d13a9c3ed481f84bcaeae4a9e593c9f0080e9ed0762051d195ea9206ddeca4e60687a39210483aba3f51004031afd1b6bd2e7e5b5
diff --git a/sys-apps/pkgcore/pkgcore-0.10.11.ebuild b/sys-apps/pkgcore/pkgcore-0.10.11.ebuild
index fb6266da9121..801f60a204e5 100644
--- a/sys-apps/pkgcore/pkgcore-0.10.11.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.10.11.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/pkgcore/pkgcore-0.10.9.ebuild b/sys-apps/pkgcore/pkgcore-0.10.9.ebuild
deleted file mode 100644
index a4a26e422fe7..000000000000
--- a/sys-apps/pkgcore/pkgcore-0.10.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
-	inherit git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="a framework for package management"
-HOMEPAGE="https://github.com/pkgcore/pkgcore"
-
-LICENSE="BSD MIT"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-python/lxml[${PYTHON_USEDEP}]"
-if [[ ${PV} == *9999 ]]; then
-	RDEPEND+=" ~dev-python/snakeoil-9999[${PYTHON_USEDEP}]"
-else
-	RDEPEND+=" >=dev-python/snakeoil-0.8.5[${PYTHON_USEDEP}]"
-fi
-DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )
-"
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS NEWS.rst )
-	[[ ${PV} == *9999 ]] || doman man/*
-	distutils-r1_python_install_all
-}
diff --git a/sys-apps/pkgcore/pkgcore-9999.ebuild b/sys-apps/pkgcore/pkgcore-9999.ebuild
index fb6266da9121..801f60a204e5 100644
--- a/sys-apps/pkgcore/pkgcore-9999.ebuild
+++ b/sys-apps/pkgcore/pkgcore-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/pmount/Manifest b/sys-apps/pmount/Manifest
index b38717d1139f..2172742057ca 100644
--- a/sys-apps/pmount/Manifest
+++ b/sys-apps/pmount/Manifest
@@ -2,5 +2,5 @@ AUX pmount-0.9.19-testsuite-missing-dir.patch 1360 BLAKE2B 3a44bfe3de89169f56668
 AUX pmount-0.9.99_alpha-locale-regex.patch 753 BLAKE2B a79805f883143f6beea9597ab88059e15ccde83d08ce69625c8c3387b419e46f8a6ea3c3937c17adfdbaeaa4dd5c3f9ad7aef8d67cc5dd406e79dbc250196c1b SHA512 423d52a372c7cdd73206a9001fcc717b50b834023130cc77e4e063ac2b62ae5c84698d127646e3658ae44e3a47f2c77522d007664cf0c4277dc49b47413c8563
 AUX pmount.bash-completion 2935 BLAKE2B 8d89d6098764dbbbddcdc45e3aaac377eb71ead5ca0ea3f44b9eda1dbe1573e3cde154d51b9486903c6fe104948af1ad29031837375953239956651efff7dfad SHA512 b57a37afc2a124c6a4f19924a367d03b315e93575d0b152acde06e43c7dcd1b3d5df46c02d2e5ceef35911edb4f96d1d4113fb6d7cd1e9531fd9840c3729f924
 DIST pmount_0.9.99-alpha.orig.tar.bz2 364282 BLAKE2B a023d75623374186fb2de07bf1a41b01b2fc2570f9560b8bddec04441ffd083c6a0ece32b53db4e6067d181269f74cb7044f2c60bffece4b0e4c8dba9f1611b5 SHA512 12105674f099afb82302c0960f4f50a4bc75382071940e897d9c65b57a0f4de1fafdaa2a4c05f0fa5cba55453ae0c21376b9891353cad1afa88e5fbd9f63d5e9
-EBUILD pmount-0.9.99_alpha-r5.ebuild 2015 BLAKE2B 99952a4fc5ef7f84f48a0f1ea311fdcdedbc5859307691b18525cd43cdd58c1c846bb09cae796782c0451146f9736e2d77bda133cb1a258295908e3eba7f6408 SHA512 ccbb1bec622f307be37419f067a7d92d00b5b029dc238f8bb62517ec1c440d88b5a435916ad1a3bc444629f34b307913005594a296c187688abdde8c2dec5499
+EBUILD pmount-0.9.99_alpha-r5.ebuild 2012 BLAKE2B ed8abd0d3019487ad93411c907372fba7b7c6379d8fd51903cb5286ce5fa44a494085e07dc04da9fd83176ad7d831fb5c0c6abc2fc09676a553ebcef9b64d85d SHA512 cae67f0708ee111a1cf10df16a4cb65ebeaf4cd678508f0cf18988114088bceda11655311e7c302409cf81bbd7784e5fcbbba9d3f27612c7cdad3f7d6c3c8d18
 MISC metadata.xml 321 BLAKE2B 014d83434739678d62884604e7e4e56cc52123ddd326250068ed4fd2f5db2b439a75e29c5dc3699599db3c640df414f9407cc772e302796a34eec58e21ebf1a2 SHA512 be1e96e34fcb9d2c433c6d67280840adb13b8771860e6314fff1b716814b120c4d31574333052e54fb788f76c8990d0bd1bdb4c725fde28b174bbd5a918bdc6e
diff --git a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
index 5b47eedb2d28..116a1e8fa212 100644
--- a/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
+++ b/sys-apps/pmount/pmount-0.9.99_alpha-r5.ebuild
@@ -11,7 +11,7 @@ S=${WORKDIR}/${P/_/-}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
 IUSE="crypt"
 
 RDEPEND="
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 34d0c773d1c6..aebad1710b6b 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,12 +1,14 @@
 AUX README.RESCUE 134 BLAKE2B 2cd153e0077388f29e11779670086c50fb1a470b9bb76969a747313021bb85c37b20327ab2feb9b2cc715849245875e7d8a5ae6ceee84b4a33d532996cb793bd SHA512 0df49e479e551648519ea4db0986584463eed498f77b133bd0e517389e71f4ff4069f1a5017c39f349bae62baa2ac32d968048c396261a9045ff00a0e5aa8bf4
 AUX portage-ccache.conf 60 BLAKE2B b45ac69ba4bf6b221191ab9618aa484948ad8765ae906402e83df4b72fd10e006621523fe5b6d59219318a978e368649047784bb85771cd189b2542a2e19f941 SHA512 36427e57046118ecf982fc3b1a80a3543b5682e3eef7df5dfc8a50b261a5da56f997dd75f63c5194049aceea204c37aee638a3bc383b9f7a0eff8ac9c35f3b1c
 DIST portage-2.3.69.tar.bz2 1027945 BLAKE2B 22a06370d9db8f8954f609a4435983b914f03c11fa1c4c857089738db574e3346fc286c77bb62103d868742b423484b3a186cbc22545cccca0f516a5724e331e SHA512 20a6c9d26829e9d3738da824aa3fcc0bc8f01019ae9631871ce56e5ff37d91ed27d7b9505c433cc3b7441290abf98bf0897bbb66c099cbb982854047e6c8f045
-DIST portage-2.3.79.tar.bz2 1038675 BLAKE2B 7a6cff28fa1d4b54607e9416914ab534d250718b082a9789a36be057933867a8a3befd7c99d404b058f67b92c6ee975323c37251fe89d3e3e46865daf0fea25e SHA512 23101644185fb7c6eff12f015d442599b3af744f7b13dcb630f47a7f27c1392c46bd4aa5fa32d403dcf058cc3cc1d56cef00fd8c34dda811388eb268761c0797
-DIST portage-2.3.84.tar.bz2 1043069 BLAKE2B 85ccc209011ef5206e0aaf768ec0276449f5a691f62f8dd65b812b6a285030796180acce89e9f2c8ae05fe4f59505133535f0374bf076846f819477d0a62d231 SHA512 49797ded65091ea7450f3c37e4ca1efb4205bc67e873295b5060ee6d39c1c63313fc1caa8c2f6c7afa6b352cef6d7ef04b8371c66a3ade05ac734b46f807bfd7
 DIST portage-2.3.89.tar.bz2 1048621 BLAKE2B 1353f0697a977eb395abd857c8cc43c839912f4bd31436c6620d10e3dc29dc32ee9970478ad0f569b02f14989c48a7d956a233c7db22e172897a49a98fd2a94d SHA512 fa453d3134139fc1f435d6388aa7d6271cd680d08ea1736269a917c12500bb463a81afc956ddd0045e98784bcdbb6541c333be6ff0c2a00feeb482b637f08e98
-EBUILD portage-2.3.69.ebuild 8117 BLAKE2B 5a680c3d769e61cfd63a2613fe29952cb205c59d5c4fc9069895f6f3af07042e755dadf06c1303c7370962558cd854a4f6de929a32b50b83ce651502bd395aaa SHA512 a5c66f4e57a450428d263ed74961175e1b2ebe9c4081dfe6a75b4d2a2fc25555f882be74a9f1e4d9e4184e6588ed78daba3e38838f2eaa2fb15cdcca902c1f4c
-EBUILD portage-2.3.79.ebuild 8706 BLAKE2B 6f011fb264b74d493f338206e7237e908a1e882299faf7ea5682b058fcbbfbc603dbd125344dc5f939af46b3df5ebe69525f4970e378f1d424d4a82891b6c9e4 SHA512 4150faaae9f39442689441fc03537542aa7e6447489f848e33b5f08c2fba29e478d02d91a12dbd14fb42f6509a50faf780549a37f60ae89bf54cebe6634a168c
-EBUILD portage-2.3.84-r1.ebuild 8907 BLAKE2B b8ea438fe87920ec138871a00e02ea053bf8b01a29b3f273f1b0d920314e714e0b9f744f228399aab5f2057f03fd9f27ecb121bcd78d2692913ff7ac0313b032 SHA512 4fe53274396653f3ce63251afae2564eff321740a355fa693284cd998a63bc55c542a674f878aa800a806782438062f12c939a945825dbbb71214b8396776555
-EBUILD portage-2.3.89.ebuild 8650 BLAKE2B c03106fe492beef8bc9e681600d28c0f7d538cf0c7371131080931bc9ac5b86bb6550af22dbb82056488f0254037648dcf271ff9d1e8fb34718491907183b38c SHA512 3ce7136609d0ce38bd2f9e85737b715322583479df6408a8b00b0d08035c70d216f123cf150760ecdc2e736c8749571bb7160df1495f1a64951e050f5e6bdec3
-EBUILD portage-9999.ebuild 7794 BLAKE2B 3b6487927a5a689ec37052d38fd2940d099d81b64bcffd48ac3083adfd282504d5399cc12ae8b266d49147f793c411eddc99a9d081522dde054fb6e31b3a9a0f SHA512 b5b9ce2235d2145cbe467167ca2391b996327ed52a84d139da292518ce76ecbda2df0eaa88eddd7197dece2520a49ec369a5ec123bcade99d562b6196b6cbff0
-MISC metadata.xml 1508 BLAKE2B 23da1db6792f98d7c5c6ff0f260c69f76110438c6fd97ffb24552100f6a2e5c8264d0bd787f45367900b9ffa5ce5346badbf53a9f6be7867e725451c33b4f41a SHA512 f6712987c3062b960f76b6752c80ffa6069cec2d8ff743641164e275677ac8126fe2af6ab1588e91712ba6bbb11f73c6de42d6296d67af55ccac3ca48554162c
+DIST portage-2.3.96.tar.bz2 1050446 BLAKE2B 0cb61c70b3ea7557eeeb832ac1dfd3ee9a5cc84a5c9102e18f91fd61f046d738011b563a03203dd96e5164d5949b06945868f908e9c26abcd2971930421fae43 SHA512 4e291cda81cc735375e9e7ca122ec5a7e7f4c626e466c02dd91a0058b7468fedec057e231d5b724b6e111b2853c6c493d824ca385443ef39f8b5776624d3b70e
+DIST portage-2.3.97.tar.bz2 1049544 BLAKE2B 37c5554e3adfb22bf5e11f83645f271cc1b320e7e384cebe120daf9468312b1661c84ed0627aa4ca29f0526af80cb0c0ab6cf43dd7fae78440d2d734b4ad6261 SHA512 2c947146839655ea277867f1aab1527a8361c5ace7a8c767d13d8408e3309b6f5b83059b87c2812702af6e18d39bddbe64e26ff3a59539750dd06e8f6bed40c9
+DIST portage-2.3.98.tar.bz2 1049738 BLAKE2B f312a6e0f7fedee3d4d5948b50aad7dc786e5141a22fa6df9d5d425d76cd094c6e3256460230f8fd6b4261647413a6959578dd5feeda2a966ed5e9046b246d4e SHA512 a9ad1f268479e93f4b197c21db4ff352f96299828593eb34ca678471badbdcb72d6a0e5a62be40b24b84775fbed880d0169d25a4686e0f71805225fe242b6686
+EBUILD portage-2.3.69.ebuild 7663 BLAKE2B 004e1fab68f021d35566dfd3c9af6aeca2a605d58ee658eb1b3d401cdf74a588c8a0442a969d4a77ae15741f3afa8b411dfa10b7ff1fbee6de5116562481288d SHA512 cea1801ef3e13b96b0aa8e29cca10a1a2ae967dddd83fe6917616871316bdc74721ec92283daac04d8a0ebc0e6364637664a7d18f80a07d9930f60f3e003c81d
+EBUILD portage-2.3.89-r1.ebuild 8647 BLAKE2B bbc99b95bba9d9783fd1bb9e3c3d448a2acdd079b21a410e2584e8c3bc5a17989b4abe5fb581f5b2aeaee48350ff85f05957e00e0c150dbc895f66800efdf132 SHA512 f6dc96fb5d6a236e1ae5813fdcbd7397b4310441f3236a46fcf9c6f85d996ebf50e270c6941301336963887411655c90e5f4678b63c0754a6a082724592d0d30
+EBUILD portage-2.3.96-r1.ebuild 8547 BLAKE2B bb826c97efe1218b311cfa728e3cfaef3a4eed39940676f9819184e3db4ec1dbd65943955daea37b34349686001af82924e199d6553d4d4347cfdd841fb0018c SHA512 75cb86722ac7f348777a03b435602aee71f2e31898b11e583a16b70a4438c77367a7816c07e5512b44ef77135000568dd34ff9fb83d7aea22144da46b003c99a
+EBUILD portage-2.3.97.ebuild 8445 BLAKE2B 124a67401a3af39c24446c10d2ef72f40debcad9a00fd5ba078f4e4ca55fc4b0cdf639cdc5daa9f7b699bc42e49ea10d3546a45d894ccb78645f9ad5bc1067d3 SHA512 c4ad6569e96e0843de2d9bf6bb4dc31a6e38dad57ba1d9c2ddf842b06f5f11916e3660da446da281c91a85863a9069a33c49b21361ec90161a190eee91ff3d30
+EBUILD portage-2.3.98-r1.ebuild 8640 BLAKE2B c1cc1ddd2c2b19c2cdd2d4e98f7d4ca916607ff98301501baaa54f3f881b1b59be72406c74fd6e2477bad6d196e8c38e306502bda057daee6af6326b957eed04 SHA512 8afcacf03aea1f23dc4a30bb6f85d0742f74baa3cc0f928c982ad78f944e78805855ceff5d717cd94b0571114585e7eac0e7303abd551ffba6705d5a8c2ed075
+EBUILD portage-9999.ebuild 7592 BLAKE2B 866f7b3423cb4dd9d09b47d5db6cfcc4662a9b4543200d39cd47e62dbc996abcd8df44c745fd7ceed204c1e7580cab759cbca917dcbf3082cd1388da66875915 SHA512 6a5fa927002f4c62b2c877a63ee3b23ef7b4c90c6fac81e75507c3e64d83ded3c6fed21ae04f395b9bdce45cd41dc3c4460ba898b29c9a4b079684cab5e9c078
+MISC metadata.xml 1422 BLAKE2B 915e93aa294d3d16ff880e20460d1c22409e8d74e96e112806c9099d8fbdbcbc1110ab5485f9d82af2d552e4627ff91f585cafdfb3b4e978cbb23657df205f08 SHA512 6b87e9c1dd0444e74b687d907698623f0524bfc9ffbc56e730ded83d44f17894ad2533feebce2caafcc312fb52c5f84ccf10f7900f1f3febb4ec63fccf41dd7b
diff --git a/sys-apps/portage/metadata.xml b/sys-apps/portage/metadata.xml
index bf8c5a54f96a..9f4e43e394b5 100644
--- a/sys-apps/portage/metadata.xml
+++ b/sys-apps/portage/metadata.xml
@@ -11,7 +11,6 @@
   </maintainer>
   <use>
     <flag name="apidoc">Build html API documentation with sphinx-apidoc.</flag>
-    <flag name="epydoc">Build html API documentation with epydoc (deprecated).</flag>
     <flag name="gentoo-dev">Enable features required for Gentoo ebuild development.</flag>
     <flag name="ipc">Use inter-process communication between portage and
         running ebuilds.
diff --git a/sys-apps/portage/portage-2.3.69.ebuild b/sys-apps/portage/portage-2.3.69.ebuild
index 9079277e5ccb..81afe01e8c44 100644
--- a/sys-apps/portage/portage-2.3.69.ebuild
+++ b/sys-apps/portage/portage-2.3.69.ebuild
@@ -4,11 +4,7 @@
 EAPI=5
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=(
-	pypy
-	python3_5 python3_6 python3_7
-	python2_7
-)
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1 linux-info systemd prefix
@@ -17,16 +13,15 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
 	>=sys-apps/sed-4.0.5 sys-devel/patch
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )"
 # Require sandbox-2.2 for bug #288863.
 # For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
 # quite slow, so it's not considered in the dependencies as an alternative to
@@ -44,7 +39,7 @@ RDEPEND="
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
 		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
+			python3_5)
 		rsync-verify? (
 			>=app-portage/gemato-14[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -60,8 +55,6 @@ RDEPEND="
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
 	) )
 	!<app-admin/logrotate-3.8.0
 	!<app-portage/repoman-2.3.10"
@@ -73,8 +66,6 @@ PDEPEND="
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
 # NOTE: FEATURES=installsources requires debugedit and rsync
 
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
 SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
 
 prefix_src_archives() {
@@ -97,7 +88,7 @@ pkg_pretend() {
 }
 
 pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
+	:
 }
 
 python_prepare_all() {
@@ -182,7 +173,6 @@ python_prepare_all() {
 python_compile_all() {
 	local targets=()
 	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
 
 	if [[ ${targets[@]} ]]; then
 		esetup.py "${targets[@]}"
@@ -215,10 +205,6 @@ python_install_all() {
 		install_docbook
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 	)
-	use epydoc && targets+=(
-		install_epydoc
-		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
-	)
 
 	# install docs
 	if [[ ${targets[@]} ]]; then
@@ -240,14 +226,14 @@ python_install_all() {
 
 pkg_preinst() {
 	python_setup
-	python_export PYTHON_SITEDIR
-	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
 	env -u DISTDIR \
 		-u PORTAGE_OVERRIDE_EPREFIX \
 		-u PORTAGE_REPOSITORIES \
 		-u PORTDIR \
 		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
 	# elog dir must exist to avoid logrotate error for bug #415911.
diff --git a/sys-apps/portage/portage-2.3.89.ebuild b/sys-apps/portage/portage-2.3.89-r1.ebuild
index a5f1eff29051..f3080d284367 100644
--- a/sys-apps/portage/portage-2.3.89.ebuild
+++ b/sys-apps/portage/portage-2.3.89-r1.ebuild
@@ -4,11 +4,7 @@
 EAPI=5
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=(
-	pypy3
-	python3_6 python3_7 python3_8
-	python2_7
-)
+PYTHON_COMPAT=( pypy3 python3_6 python3_7 python3_8 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1 linux-info systemd prefix
@@ -17,7 +13,7 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 SLOT="0"
 IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
@@ -46,8 +42,6 @@ RDEPEND="
 		>=sys-apps/sed-4.0.5
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
 		rsync-verify? (
 			>=app-portage/gemato-14[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -63,8 +57,6 @@ RDEPEND="
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
 	) )
 	!<app-admin/logrotate-3.8.0
 	!<app-portage/gentoolkit-0.4.6
@@ -101,6 +93,9 @@ pkg_pretend() {
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	# Apply e762752a8bf5c19e0d6d7b22de86306bfa4270ba for bug 711400.
+	sed -e 's|\(if\) \(graph_interface.want_update_pkg(parent, avail_pkg):\)|\1 parent is not None and \2|' -i lib/portage/dep/dep_check.py || die
+
 	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
 
 	if use gentoo-dev; then
@@ -240,14 +235,14 @@ python_install_all() {
 
 pkg_preinst() {
 	python_setup
-	python_export PYTHON_SITEDIR
-	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
 	env -u DISTDIR \
 		-u PORTAGE_OVERRIDE_EPREFIX \
 		-u PORTAGE_REPOSITORIES \
 		-u PORTDIR \
 		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
 	# elog dir must exist to avoid logrotate error for bug #415911.
diff --git a/sys-apps/portage/portage-2.3.79.ebuild b/sys-apps/portage/portage-2.3.96-r1.ebuild
index 5b5f4e791f7a..ead0b6f01932 100644
--- a/sys-apps/portage/portage-2.3.79.ebuild
+++ b/sys-apps/portage/portage-2.3.96-r1.ebuild
@@ -4,11 +4,7 @@
 EAPI=5
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=(
-	pypy
-	python3_5 python3_6 python3_7 python3_8
-	python2_7
-)
+PYTHON_COMPAT=( pypy3 python3_6 python3_7 python3_8 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1 linux-info systemd prefix
@@ -17,16 +13,19 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
 	>=sys-apps/sed-4.0.5 sys-devel/patch
 	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0[$(python_gen_usedep 'python2*')] )"
+	apidoc? (
+		dev-python/sphinx
+		dev-python/sphinx-epytext
+	)"
 # Require sandbox-2.2 for bug #288863.
 # For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
 # quite slow, so it's not considered in the dependencies as an alternative to
@@ -43,8 +42,6 @@ RDEPEND="
 		>=sys-apps/sed-4.0.5
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
 		rsync-verify? (
 			>=app-portage/gemato-14[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -60,8 +57,6 @@ RDEPEND="
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
 	) )
 	!<app-admin/logrotate-3.8.0
 	!<app-portage/gentoolkit-0.4.6
@@ -74,8 +69,6 @@ PDEPEND="
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
 # NOTE: FEATURES=installsources requires debugedit and rsync
 
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
 SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
 
 prefix_src_archives() {
@@ -97,13 +90,14 @@ pkg_pretend() {
 	check_extra_config
 }
 
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
+	# Apply 2b3fc2be07ad
+	sed -e '422s/return True/return (True, None)/' -i lib/portage/locks.py || die
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
 	if use gentoo-dev; then
 		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
 		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
@@ -183,7 +177,7 @@ python_prepare_all() {
 python_compile_all() {
 	local targets=()
 	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
+	use apidoc && targets+=( apidoc )
 
 	if [[ ${targets[@]} ]]; then
 		esetup.py "${targets[@]}"
@@ -216,8 +210,8 @@ python_install_all() {
 		install_docbook
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 	)
-	use epydoc && targets+=(
-		install_epydoc
+	use apidoc && targets+=(
+		install_apidoc
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 	)
 
@@ -241,14 +235,14 @@ python_install_all() {
 
 pkg_preinst() {
 	python_setup
-	python_export PYTHON_SITEDIR
-	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
 	env -u DISTDIR \
 		-u PORTAGE_OVERRIDE_EPREFIX \
 		-u PORTAGE_REPOSITORIES \
 		-u PORTDIR \
 		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
 	# elog dir must exist to avoid logrotate error for bug #415911.
diff --git a/sys-apps/portage/portage-2.3.97.ebuild b/sys-apps/portage/portage-2.3.97.ebuild
new file mode 100644
index 000000000000..2892405c127b
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.97.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_6 python3_7 python3_8 )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx
+		dev-python/sphinx-epytext
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
+# quite slow, so it's not considered in the dependencies as an alternative to
+# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
+# for now, don't pull in xattr deps for other kernels.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f ! -name etc-update -print0)
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	python_setup
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-apps/portage/portage-2.3.84-r1.ebuild b/sys-apps/portage/portage-2.3.98-r1.ebuild
index 0e07eb5927e7..9c8a987a3eaf 100644
--- a/sys-apps/portage/portage-2.3.84-r1.ebuild
+++ b/sys-apps/portage/portage-2.3.98-r1.ebuild
@@ -4,11 +4,7 @@
 EAPI=5
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=(
-	pypy3
-	python3_6 python3_7 python3_8
-	python2_7
-)
+PYTHON_COMPAT=( pypy3 python3_6 python3_7 python3_8 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1 linux-info systemd prefix
@@ -17,19 +13,18 @@ DESCRIPTION="Portage is the package management and distribution system for Gento
 HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
-IUSE="build doc epydoc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
 
 DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=app-arch/tar-1.27
 	dev-lang/python-exec:2
 	>=sys-apps/sed-4.0.5 sys-devel/patch
 	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? (
-		$(python_gen_cond_dep '
-			>=dev-python/epydoc-2.0[${PYTHON_USEDEP}]
-		' 'python2*')
+	apidoc? (
+		dev-python/sphinx
+		dev-python/sphinx-epytext
 	)"
 # Require sandbox-2.2 for bug #288863.
 # For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
@@ -47,8 +42,6 @@ RDEPEND="
 		>=sys-apps/sed-4.0.5
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
 		rsync-verify? (
 			>=app-portage/gemato-14[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -64,8 +57,6 @@ RDEPEND="
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
 	) )
 	!<app-admin/logrotate-3.8.0
 	!<app-portage/gentoolkit-0.4.6
@@ -78,8 +69,6 @@ PDEPEND="
 # coreutils-6.4 rdep is for date format in emerge-webrsync #164532
 # NOTE: FEATURES=installsources requires debugedit and rsync
 
-REQUIRED_USE="epydoc? ( $(python_gen_useflags 'python2*') )"
-
 SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
 
 prefix_src_archives() {
@@ -101,15 +90,13 @@ pkg_pretend() {
 	check_extra_config
 }
 
-pkg_setup() {
-	use epydoc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 )
-}
-
 python_prepare_all() {
 	distutils-r1_python_prepare_all
 
-	# Apply 605ae9eb6dae230d8bb967edbdd719c61a2b14b8 for bug 704256.
-	sed -e 's|^		rsync ${rsync_opts} . "${repo_location%%/}"$|\t\tchmod 755 .\n\0|' -i bin/emerge-webrsync || die
+	# Apply ad325eb10bc6
+	sed -e '1638s|^\t\t\tself\._schedule()|\t\t\tif self._main_exit is not None and not self._main_exit.done():\n\t\t\t\tself._schedule()|' -i lib/_emerge/Scheduler.py || die
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
 
 	if use gentoo-dev; then
 		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
@@ -190,7 +177,7 @@ python_prepare_all() {
 python_compile_all() {
 	local targets=()
 	use doc && targets+=( docbook )
-	use epydoc && targets+=( epydoc )
+	use apidoc && targets+=( apidoc )
 
 	if [[ ${targets[@]} ]]; then
 		esetup.py "${targets[@]}"
@@ -223,8 +210,8 @@ python_install_all() {
 		install_docbook
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 	)
-	use epydoc && targets+=(
-		install_epydoc
+	use apidoc && targets+=(
+		install_apidoc
 		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
 	)
 
@@ -248,14 +235,14 @@ python_install_all() {
 
 pkg_preinst() {
 	python_setup
-	python_export PYTHON_SITEDIR
-	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
 	env -u DISTDIR \
 		-u PORTAGE_OVERRIDE_EPREFIX \
 		-u PORTAGE_REPOSITORIES \
 		-u PORTDIR \
 		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
 	# elog dir must exist to avoid logrotate error for bug #415911.
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 58aa5a833ab5..2094c8a30bf1 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -4,11 +4,7 @@
 EAPI=6
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=(
-	pypy3
-	python3_6 python3_7 python3_8
-	python2_7
-)
+PYTHON_COMPAT=( pypy3 python3_6 python3_7 python3_8 )
 PYTHON_REQ_USE='bzip2(+),threads(+)'
 
 inherit distutils-r1 git-r3 linux-info systemd prefix
@@ -47,8 +43,6 @@ RDEPEND="
 		>=sys-apps/sed-4.0.5
 		app-shells/bash:0[readline]
 		>=app-admin/eselect-1.2
-		$(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' \
-			python{2_7,3_5} pypy)
 		rsync-verify? (
 			>=app-portage/gemato-14[${PYTHON_USEDEP}]
 			>=app-crypt/openpgp-keys-gentoo-release-20180706
@@ -64,8 +58,6 @@ RDEPEND="
 	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
 	xattr? ( kernel_linux? (
 		>=sys-apps/install-xattr-0.3
-		$(python_gen_cond_dep 'dev-python/pyxattr[${PYTHON_USEDEP}]' \
-			python2_7 pypy)
 	) )
 	!<app-admin/logrotate-3.8.0"
 PDEPEND="
@@ -235,14 +227,14 @@ python_install_all() {
 
 pkg_preinst() {
 	python_setup
-	python_export PYTHON_SITEDIR
-	[[ -d ${D%/}${PYTHON_SITEDIR} ]] || die "${D%/}${PYTHON_SITEDIR}: No such directory"
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
 	env -u DISTDIR \
 		-u PORTAGE_OVERRIDE_EPREFIX \
 		-u PORTAGE_REPOSITORIES \
 		-u PORTDIR \
 		-u PORTDIR_OVERLAY \
-		PYTHONPATH="${D%/}${PYTHON_SITEDIR}${PYTHONPATH:+:${PYTHONPATH}}" \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
 		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
 
 	# elog dir must exist to avoid logrotate error for bug #415911.
diff --git a/sys-apps/prctl/Manifest b/sys-apps/prctl/Manifest
index 87081b5a6232..42c1f490816c 100644
--- a/sys-apps/prctl/Manifest
+++ b/sys-apps/prctl/Manifest
@@ -1,4 +1,4 @@
-AUX prctl-1.6-no-implicits.patch 473 BLAKE2B dabd09b5d334dc2731af41229248e1f5dcf1e8e5da0ce2c440aeb0e5ef3b278f0ea92db3affefd0632ddb00febaa242a43550d1b49fd5cbc7d6439a69d373901 SHA512 641ccfd96886e682db4ffb31a372f81af4d514fd50ba66fb3329879971f2af5d32afa7cfd27c584452edaf11412cff81b6f61020147071374c94b674a0a41c7a
+AUX prctl-1.6-no-implicits.patch 381 BLAKE2B 4374744647de591232e9da6398465a5b9f31f75027f57ce7da5d2294321c6ee17d6bb3c4a108131602bdab7f6643aff2778313c764d659e15093a6cee1081fad SHA512 b01e17872a6c098ddbd4720cf62cd83d485fd1095a9da47c2f79cc09b50648a02bde2aeb38b8dec03d5be794223c898f2c753f576068540252071209e1701812
 DIST prctl-1.6.tar.gz 18876 BLAKE2B 9f26fec1d178141d7e5aa7390dc0403ab1774d711a12588074ee6dbf62c980ab3713179b2f476f20cac0d7e4b027899b144fa67164021dd13b10be3dc087fb2f SHA512 c5b70abbb76f76f4a4c53cebcbd34fa4e87d7db2278a2ea17128da30dea958cc4e4d75b641cb3b9fbd8fa56fee482e97dbae5e61c697e80ef4d13f4b6d28cfda
-EBUILD prctl-1.6.ebuild 594 BLAKE2B 5e9331f2c23995708ef1dbb9ec14c9e080b0a153000005775bead2f711003fa1d60fe8f8fcd05415bf37e4ad92f6c4f5bc61a4647f698c45fa0d65c7130f1ec1 SHA512 417ed1c50f6b2dccb3648d92163e218850bee378ba5ccb9f5c22b34a5540bc3e55e2f1e4bb695a74ea24bb3c8ac34490fded9d220027915191ebb0ab62499fde
+EBUILD prctl-1.6.ebuild 595 BLAKE2B e4744b2d95c77ae908cfda020b20628f74494ad51e602c088a22eab63ac2db0d3638df1b32f7f78dbfde242bf161903943499d5b7dff4950731dc78872c54506 SHA512 0bd11b66d295562bd5db9ebe70c4779dc6f9781f0df194547bbb5a25a895db6d8a868cd6b19ac72a7fc6d4535557ae16d1e248fd48264724bd9d6f4fc42a9ce8
 MISC metadata.xml 449 BLAKE2B da01afb0a080790cad07f77c097cc92bad6fca77c6d8da75b21e35eb9f1253153bb90bdff9aa719bb77a0c1e760dbb2c60d8152c9d2de15e37fd41fd2edcda80 SHA512 a254e2fa6263298f6f35967195a6f27ea434767c5690082df42e09f3bbb2439835643cfa4d030a09fd5a1829086ebadd6c5485cd53c49ed0ebf291e897f9290f
diff --git a/sys-apps/prctl/files/prctl-1.6-no-implicits.patch b/sys-apps/prctl/files/prctl-1.6-no-implicits.patch
index 2bbf9aba69aa..eab464d22559 100644
--- a/sys-apps/prctl/files/prctl-1.6-no-implicits.patch
+++ b/sys-apps/prctl/files/prctl-1.6-no-implicits.patch
@@ -1,12 +1,9 @@
-diff --git a/prctl.c b/prctl.c
-index 2dcda79..01c542f 100644
 --- a/prctl.c
 +++ b/prctl.c
-@@ -27,3 +27,4 @@
+@@ -27,3 +27,3 @@
  #include <pwd.h>
 -#include <linux/prctl.h>
-+#include <linux/prctl.h> /* prctl constants */
-+#include <sys/prctl.h> /* prctl() proto */
++#include <sys/prctl.h> /* prctl constants, prctl() proto */
  #include <string.h>
 @@ -50,3 +51,3 @@ int verbose=0;
  
diff --git a/sys-apps/prctl/prctl-1.6.ebuild b/sys-apps/prctl/prctl-1.6.ebuild
index e87fc7d6da96..44642146eb72 100644
--- a/sys-apps/prctl/prctl-1.6.ebuild
+++ b/sys-apps/prctl/prctl-1.6.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ia64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
 IUSE=""
 
 RDEPEND=""
diff --git a/sys-apps/rename/Manifest b/sys-apps/rename/Manifest
index 742ca263e4b8..b3b224bd5a1e 100644
--- a/sys-apps/rename/Manifest
+++ b/sys-apps/rename/Manifest
@@ -2,5 +2,5 @@ AUX rename-1.3-build.patch 172 BLAKE2B 47ae1d23ce99ad6ef2099bd6484cfad23a7aa46cd
 AUX rename-1.3-gcc44.patch 330 BLAKE2B c574203c3df6d984de18dda43512ac3f91165789ee6a7525824d2ac0a11403a53e33a31dc843eb295b31c8119ced7bc3f0393482e60003673c9cf83d43d78b80 SHA512 5a40ab4c81b4c197af051e01682f4fbb580b3fea9287539f601b4c07c6155c3aba802e38752566f9d2a41239cf2d20d748bfd64d2f7007eff578344cd12852c9
 AUX rename-1.3-rename.patch 2345 BLAKE2B 7c7e513726d482c8243e64d1f414c242f8f3b49e2a028567fcee0ae2acf65af4e50f63ffb1a3b6b9740544970e2b648e3c5795e5d60224103a776b6f8bd1b08a SHA512 6d0d757c3991448a1937480bb5c1cd219b681e7cbb9b1fbdb27097715cac04b2d2c0bb0b9c77ab2b131f6bbb8e0774f4da5845e815918d4de6faf96f218adb47
 DIST rename-1.3.tar.gz 83854 BLAKE2B 2dedb5f7765f9f44da1efe61b2152c56b2d3731a2787a89677792434663252f4a0f22c3c2703211fd1c7f0017e98a7e566e369c13a4affeeea62843278d9e940 SHA512 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd
-EBUILD rename-1.3-r2.ebuild 894 BLAKE2B 49510c145acd276f067258e6dfd6193caa8f4e6143e6d377d3590d837c68be82c63b6449bad246db1e86b9d47dba980ffb9b378b75b262568e72e9b2a63f316d SHA512 9a6856d85c2d33f27a4ec93c527d26db05714c22a825f208638629ec9ee956a6b9db3ce45e75c97c8fd4f90b133c57561dcff641aa2ff6261ef5936272b8bcf0
+EBUILD rename-1.3-r2.ebuild 895 BLAKE2B 3b77cd101a23d2db30264523cdb534c4eb7a5467aaa34e7659b986aa05d0e25966047f036df1e1d620e3db629af1f6cd1908841833e33743aaf16d77f02a16b5 SHA512 02e554e2011f04fa28eaaa04501f45f4d9946f6d506d524388e31625bc1c9da43c476b1a6932bdf3e576beb6e367a70e1d43c91ee746ebe663c8f1cf8652e662
 MISC metadata.xml 326 BLAKE2B 0952c4b08788858859a0b53a418f4e2504d8a05ad4623495992fed7983c3f70d7eb40a7e042a6adf2b6785bf1228af302704988dbd715acf2347b67b97701d3c SHA512 5d7e26ff9fa47efcf1728be310c91822d85ef3e521a5903d66c9ae8e6449e72465f5f87a2fecc0a51086edc34a325545a0d40210ed320f56bd34af9db9fa45c0
diff --git a/sys-apps/rename/rename-1.3-r2.ebuild b/sys-apps/rename/rename-1.3-r2.ebuild
index d82f8e908445..f0e2609bf2c3 100644
--- a/sys-apps/rename/rename-1.3-r2.ebuild
+++ b/sys-apps/rename/rename-1.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://${PN}/sourceforge.net/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 MY_PATCHES=(
 	"${FILESDIR}"/${P}-rename.patch
diff --git a/sys-apps/rescan-scsi-bus/Manifest b/sys-apps/rescan-scsi-bus/Manifest
index 18bac4302606..34f812e90714 100644
--- a/sys-apps/rescan-scsi-bus/Manifest
+++ b/sys-apps/rescan-scsi-bus/Manifest
@@ -1,3 +1,3 @@
 DIST rescan-scsi-bus.sh-1.57 22575 BLAKE2B 71737a9b2df22d8aecc756bb690cc401343c7951f0e809804eee43e01566e9f5377d5fd2c1d3628602ed64536402a71770dfe8e6514ab2d36851c7f0827f0c7c SHA512 93a061af852e5f9dd3d64ad62692809a11d8ffaac68f5ce08ba1a4fd9201fc66a0a5482d3e6da6e5c36fb00805fa4f7483fc2c85c5aaf6bfc190690ccf7bc733
-EBUILD rescan-scsi-bus-1.57-r1.ebuild 853 BLAKE2B 84576eb58e3d131dc77613d3ee53da8476312beff0c5aefe9aeef41dde571dab89ebaddef34bb3357623c5edee3e6d7eb84abb3e20d9ac87ce57dc0d15dc9117 SHA512 734ab404a3f6361b98732d240fcfdbd8634540edfd6b5bcff6a04087205dd1fb2804dd3ebe8a0bbfbd65b9d43305893ad22e51ead805c5e49e2be4ad7c3b533c
+EBUILD rescan-scsi-bus-1.57-r1.ebuild 850 BLAKE2B b5e86a8d25a78771b7117c4a28045ba5d4b5290bef3454bdd3ad87db45202c13572bbb4ed1c0a17285bddb7faa8c57f262e1a6d137d5f161eb4ad3834dc8c803 SHA512 4eefad22b9d62625289991a4bc415fd07ead2032303d7a7d21e0cfe14524b0ff46553f72d363bc2e1393a31675be073a3763ec66f7581af58d886cfaf3c498e6
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
index 2a39aed8a3d7..b224dbcac390 100644
--- a/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
+++ b/sys-apps/rescan-scsi-bus/rescan-scsi-bus-1.57-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/${SRC_NAME}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 RDEPEND=">=sys-apps/sg3_utils-1.24
 	<sys-apps/sg3_utils-1.44
diff --git a/sys-apps/ripgrep/Manifest b/sys-apps/ripgrep/Manifest
index fceca97183a6..a2c92ae9b184 100644
--- a/sys-apps/ripgrep/Manifest
+++ b/sys-apps/ripgrep/Manifest
@@ -1,68 +1,120 @@
+DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 DIST aho-corasick-0.7.4.crate 55480 BLAKE2B 61f8913da203106380d20f8ae4eab2bce453557ae5745522ec1647deb04c0173f96279aa64e3ebf4f8bcdb6f34a31a0f37345e4a4b7baad750971088b301760a SHA512 06863d85a3183c7ace014d6a8345d47147df53475c194030607314b80e00890625ae88e3e669d15e54704f2d3132dd6bf56dc057b87dab7f06c5deaf50d29b79
 DIST atty-0.2.13.crate 4764 BLAKE2B 673eea1d377fc3aca792a3a8bd2a5c058f3041abc76a8760dd6acab7f19fa610f812c57d81a4dbf773675cad3df483904c66e66b45d83393402f747c6db60d89 SHA512 4554ca7dedb4c2e8693e5847ef1fe66161ed4cb2c19156bb03f41ce7e7ea21838369dabaf447a60d1468de8bfbb7087438c12934c4569dde63df074f168569ad
+DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
+DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST base64-0.10.1.crate 41988 BLAKE2B 6e28a70cc0d5e426d9a3944825952851928ec2e32fa2543a8e1d1b886ad306f38fd6e673da62e96581e56613f133265feeff5b0d2f1e2e34593e58c0424eee9e SHA512 674a8cbee95a41f755499a4e3bb93ebd3f80140c3e8e2d44a0b73890ee423754e7ba8abcd92132683cd54501ff5d14438d023a202eaf12776aecbe36df9e5535
+DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST bitflags-1.1.0.crate 16322 BLAKE2B 01931976111840ca69b58e77e2c18b26ebabe4ef71ebdbe83565fbef42ffbb9512ad376192c085070485cd344b8614f260aafe0614fb20342cca5a15e9616385 SHA512 e3e611cf35a1ed4930727d530e6c78add895bd96636ca1354f1269b3d0e36e77fbb9ec850fe1f448a10f09ea2b2f89c2b16bb96b7da585851ce4c29a308968e3
+DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
+DIST bstr-0.2.12.crate 344435 BLAKE2B b55a55be4875d9aefcff0091be82d80a19c1c92d5d6e17b751dd41bebd37f6a5f72d884fa8a70e829905baf3526ce4d854b162d10d894573dd2801ed030460e9 SHA512 2d14ac85274814bb29439acf67c3aaf84ac32ad361dd6d2cbca58bf571c968f594eeb1443a632b625296929b84047652fc60ec39983c110737ba1950d88bce89
 DIST bstr-0.2.6.crate 336014 BLAKE2B cfb2eb6ecff2e0e18f26b05fc284cfb9db31f022984243b9d8fbb25d03371588a829a73cd312f0e54daae1f49216fcbd0193385ba7183a73b992a94b619a07b8 SHA512 e5a4dd8061208bd153052fc991d827e96f5d3358ffde84c68d4fcee4ef5ec65de4482795f4d4fcdd5b2b4cea4b69a7e35e369f09a476ab536ecec54aa8d051d4
 DIST bytecount-0.5.1.crate 11888 BLAKE2B e7e72cd64f12315f6883c013ae4d309948cf6a577d653238742332d166d8072d30967b134a59fe22f14104e1764db3e9ff855a7e85511fca71b6e40eb120802d SHA512 9017ed0545266c1f55cc9cd65fb63906bc50ea28c8de30770cb618029a605744a5234487766d52c77ded01a8b08c91d08264175eb4f4352e6777ad5d152670a9
+DIST bytecount-0.6.0.crate 11905 BLAKE2B 7d935f86f0ab82c6c3d4974cd25ec3e193cdbea68b9534b1a461007d1486adc27274b43febd645db045cdd9b8101f93fb4b985ceb076c99a8f6efdc5e69ae855 SHA512 8e675f20b204d5828e79ba50012744b2f1b83f9d5d6355e6acb7d24cc4f7b1080ac120b94e65b6ea1d7604464ea0c6ad4f29880ff14895610889e4396f87062b
 DIST byteorder-1.3.2.crate 21596 BLAKE2B 2ac70cff46af36e96b8b41c3adf9e09134af4d3d5b17c14233047fc3b70c829bffe6c129def84f529c1017ab2882c1bb66e86eab7b749a0d40daf2650da85d0a SHA512 2ef6b986926a4671dd945583730b0bfd4bd5e75b62a8a70c2875328157ba95f2c1b17c534d905e9b287457bd34363c1a33fd3dee9217c371032393ebbe206a8f
+DIST byteorder-1.3.4.crate 21943 BLAKE2B 278b24e036e920f84683f883991a967d997883bc80edefc5b69f52551794a37e5051786a1ac1b7a30bf2f5cad7318d781f189a7b2e496e2743df01262d5c33d6 SHA512 0618ce2cd6f3f6c586201d9aee8c8aaa08f99c9f9f215cf448b3cb6af1ac741845f5279953544caaec7fcf0beec1474bb991bee1ad0c0dac0c3f1d3ddd99e2d9
 DIST c2-chacha-0.2.2.crate 13766 BLAKE2B 0b963b7a4ac64d71d75ab542a23585cd7bb99995b923c52edf99c49a76222978d0a96c020a5a1199c971133fc1f8629b562088b34fd283b7b5da7800848f85ab SHA512 d8edeff2f4eefb9504160d7f4d3c450661d10905c23cc4950736ab76e73bd1e88127c006bc762d63694847f2cc981ceeb0727ecf18e8fad7c89209d7a9e70f14
 DIST cc-1.0.38.crate 45503 BLAKE2B 19d8be59f639c200e43021eda8174dd2b6714d6a8756e1a87d01dc5d3876d11ceccdb5874cc0d2f94da3bba1b576f31409f660dd120a1ecdfe63adc6bff72dac SHA512 0d08ddd3f30c52eaca8195f9cd473ce3fdde6c6788481a33a8970c842781ce1eeb521023291f75d7c03279f524e8739abf3cc66f51ebf6e68945626589f37d30
+DIST cc-1.0.50.crate 49792 BLAKE2B 25ec14fd42536c381babcf697cf96fe8be61417a61ba5875a2461bb40bf3ffd9c9d03e1d9df83e2dabfc9472de3db97b08fdffb710e89b868a5e115d0463a9cd SHA512 34a721d9352f8b59cffb8cc0b9c520b972b65d6c23e83d9c6f6e88d6a6845c53ec89350a4aacd0444a5d6b03b867b97aedaf418b483afead209a7ae6d3885f5d
+DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-0.1.9.crate 7353 BLAKE2B 5556f3fdbf49708e6e4f08f2c536ee093b5f04dcf1fe4f68355189d129c416c338820143b5cf5f215323b38175ee0fd34eef4b2ff58179b190a63a9728fe2839 SHA512 45f7322217d291b3905ffdc45cadd5a7a7baf440f9a82a5b5596192ed0ac54353a3ecae0326d5807aae99bc4d79e0406d71bd65745ec8d9f8815a7c9436d648c
 DIST clap-2.33.0.crate 196458 BLAKE2B 3bb62d817afc77b421a6282746b9b61367d224de6b614c7ed66bde452ce1046728077dab3368a46635b5c74d82ba3196586d87c0201478ce5b89638910dadb1a SHA512 f1075031414d48e4340bfe308904a95a31b72460724773c52a0bc8c004e625a04c904a39fc5420cb8c26a633321f9b5f4f69019c7aae5ed89900b63ed8c21a91
 DIST crossbeam-channel-0.3.9.crate 86771 BLAKE2B d0898ecfa5aaccd03ed714b657aee7a3279f4242516c2943073e75d23f23437f34bf63b465bdfef6567030c998e7b3c6bd4f5fe2e0ee4b50a03d8a15396a2090 SHA512 4cc876bab2bd8874cee4b96bc490e77778f10e99ab624ed7a8b73be94b59a40bcb340fdb81a1d14242f6a795557c9f8bcdcf17d6bf6829aff85c7c1e8bf00919
+DIST crossbeam-channel-0.4.2.crate 87419 BLAKE2B 721013134069abc8f01ae5e98e1e6f10981d4892881339d3bf87f1bcb58b362348dad92e702a6b2367075dd41d860d62cca0ac8b3691954c454ca70bb5158000 SHA512 19b0ed2b5ed0fb1fe7c809e08483152fc36cf46f465c8571ca0fb9ebb1cb4b2b8f5860a303c932f336f434dafa9776ce6026ea2e64457147fb540766dc6da2ce
 DIST crossbeam-utils-0.6.6.crate 32836 BLAKE2B 48290733712549c46bcf99641ddff571cf2fff72b2a70e86a554899987fd71a61a8ab6a15c75e468164755fcc3218a1db54a4fa406f766f9a9f03bcb3d9bcd02 SHA512 771ac1a55a043600e7d8b720f9b5a32da2ec09efaa4dec4202f7b78a505eb391a842b7abc91516ccd287c3207c634b342b0bc8ebb3c0c7a0d73b7fb29badc9f5
+DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST encoding_rs-0.8.17.crate 1401378 BLAKE2B 95c7e545bdc14ba2870432e0c884f14cf56a43d3c5d9c063cbd1dcd9d18e70ddba5632bb1cdf42cef846eb86a901943c50af246b32fba478d2b60a9a44f2642f SHA512 db7a7d469d34feaa899195c336fb9211ee358c226597d0900850fbafac2ee39a89bff253663744ec737a055bf7582e96b9825e96e679da4bb9fb3b0cc59d1453
+DIST encoding_rs-0.8.22.crate 1403758 BLAKE2B b18eb34df4ddaf43c30ddfb5f531aaf30047bc1753d93512013854e8702f7834c463d4098b90c11be5df3f5c8f67bb785ea02d7e2f21d0e925361cb15bd68e14 SHA512 355b98e964ad126d94ecff2777c2f8592c74212a566b7162fb484e594d13cf9c60acabde291f244f8df5d5430d21813f951ae7fd503ed2fd35bfbce58aea88fb
 DIST encoding_rs_io-0.1.6.crate 16392 BLAKE2B cc3be4956c2bd26ae063757e815c9360f382a358ddec640361267b6abcd882129e924f59601e30eebf2b1e2e2025ece727de06ce11c8fb1907de35452705a8a5 SHA512 ef8e9d93ff5395c0a5dc0f777907632cd2d38cdef4d0b9d4ee0697701a1e4320221605ff699d6c66c0d80c582378ad7ca10a56c3914e8466192189a47c3cd9f9
+DIST encoding_rs_io-0.1.7.crate 16969 BLAKE2B 8d51835dc0882d0e0512f0a177f10da3a1c384f38cb4eb163f957cc134ef5b7aee65d951cf65c99cc80b087e0e92ca4dae431e3a8987fe6b86bbf0dd1bfa8ef8 SHA512 0c7d33616e96fcdf225599dbf469232d150fa4bef5809346c4003ff7fa0362a1cded8f3392fb5945f4950e2b2cd71b60c93025d73ecfdd2ba4fda5e03a16902c
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fs_extra-1.1.0.crate 29292 BLAKE2B ea1b787484218733a2c107ff059f3e89357afc51c510da0f5f30e4c9289c722a7c810a0a08138673aa454445dfcb08caa986ac64165ac27476d9b709d819308f SHA512 c001a37a23a614f1752a45fbf392694911c8d06bb5af8b8a40f2dcba9c80c67ab634de0dd4fa951007072204b162430fed2c89bbb11ac2fca62dfa5cd4cbd46a
 DIST getrandom-0.1.7.crate 21488 BLAKE2B 70bc3a4a4b4c624f5df8dd73954de3b77feb897406b7907f88357f6b4aec919fa72560e219933e744f909f3408478dd93f59cb28d53f7d608b7b6edc3204ad90 SHA512 e38e82ef3d3613e69e2ac38c63a16e6a4f0a7d54f8b894c45e1c9cb2b1d4f8d9a7bbf087c3561d5482fe45ecd51f3d4b2fdc61638df2c380e3c9c3d8fcc03eb3
 DIST glob-0.3.0.crate 18724 BLAKE2B 1f1dd380e7d668a0c2cff9134279ebda958b4bccdd4a65ff01f9665b45ec4cce8ffbd47eb46e52cf516c5fd5803561e6bcb60cdee21ddfbb8601a95d45500620 SHA512 87098ffdbc518442995c422120cef71f83069c8f88a1970ecec5105b0f284ddd92bcee929f5c230d5b90ae1ead7e1214c3eea26f4a8b26715a00c1ab8b09bc46
+DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
+DIST grep-0.2.5.crate 7137 BLAKE2B acd9dbe588693a96da75dbd66fee019a5fb959a5bd16b8e5c25b75111b9168317fbfbd9ba6a157f4e12dda73c27b99260cbd4feaf7032b06ad974753c62fa586 SHA512 11bc94251db60666c5ab585b03df16ef15d064d85da57e03204311a8b346d91c172ac34b2f4b100bee6546f7672cacc5ceb3e8053099d3b287646b523882e584
+DIST grep-cli-0.1.4.crate 16923 BLAKE2B aec2c54ce1a6677d9afb22c2df85578bec6cb486b2e6173b539a4ba99eb423b42d79c7b8c2ef631c1e08bc4e5338afac88dcba7d1255aa7deee94f4cb03c4f3f SHA512 77d0898c51824604025663cfb2b7ac9731e48c73c791a70ac13c8365cc42be8a30316ec2bfb2121fb3907e1227c1497d852142022f7145fbc840a255826bb377
+DIST grep-matcher-0.1.4.crate 15569 BLAKE2B 31681aa4536e5d12d17b3eabd3da054f1597df659878c79d21f587b17590eb7049b2f20d74acdedc86257c68125cd32c670dff20fd72b466f5b51926b671aab7 SHA512 6bb8fa1914cd34e61340d86a0ca09556f117ff638264875800fe2516662b4e8560e8d68e79333a0c19b6bc48e8d453dfc36b901747348c633233ce4b026339e4
+DIST grep-pcre2-0.1.4.crate 7811 BLAKE2B 69c875087623e7631cfba1e28b19d7d382dd8903da07495b588570cc4aeff83248d107d0c5174907b28fc1ab730409406c06723283d7203a643f7f764e3a1258 SHA512 607453d7f5c80a4cc431c9ec8a14c647ddf96cd785158c2a554482b6f37964a8508a0e64300eab1bb2f789360bd92687b83fd6c757bd0cad7542bc0b49cfb678
+DIST grep-printer-0.1.4.crate 43337 BLAKE2B 94f17cf7b3e04b7cad4bee7a98fe5aabbbfcfcebf8e585f7e2f5e6cea0b5cfb93aac95418eb30f6c92074333d47ece9ff751fb33f509dde863d027f1b4ff7819 SHA512 611d825c0648620a13178beb6e3fe24fd1b592b233901cee009dc7b882237923a188501bf4ac9eb1fa276c665300389443e3f30574cb9bc81745cda7cd7005be
+DIST grep-regex-0.1.7.crate 29021 BLAKE2B 8359f4f42a1cc310ba1bd27fda671549d70a955ea4050039c791025460c2a303844f59b0243b689a8d85854a949a76604be4118c2312943c9aa59af7ad7948bf SHA512 6f0e0708aecfbad9da598cbd1deb1ffa455caaad13e540b14f127eb0bf8dbc5f085124f45701e8db753242d34e3b0d1a507e2abe7ae7981e1994c6f93c054774
+DIST grep-searcher-0.1.7.crate 44320 BLAKE2B 1876e0523c99c6ed7c85f3291af76063677af09e62d94fb414b18142732981631afe31052480183ad52bf7cc44cb14afc144099045f3efd3f13b4883b1977f55 SHA512 2c32ac1fca430b0ec740c6f60d92954af81f30349865a04affa83959ba2ed04285aac31c4ec1913a03913037469b49bfe2607c887315ac32390d2f293876cc33
+DIST hermit-abi-0.1.9.crate 9032 BLAKE2B e9e314be938aa0cd1405b480ace091d8b0b33be559df3ba1323972f1de1b1b2b7a4b77140ad7273efd54a1066c162e5ea0f25b281dedd8e100cd83e1f6315b51 SHA512 6dee8ac600da02564f95762837c85f3f458b6167a930f9a214642aff3d8c6cedd8c862a0512a8bbcd170a325b55925c43c34e81cb59a21c58f9d3ca9a73c93c8
+DIST ignore-0.4.14.crate 51922 BLAKE2B d93eeaf945fa5165461979e2f54969b9e2ccf2f4986bbe465fba8a1f0f750ce66e82c1cc48d526e2115c8ed302daf37aa368503bd56d627ebdc9609a3136576d SHA512 eea97e9a80c9ae67b2f8e970e6d4362e8b2ed2067b6c94f8de51f851133db5e782fa0cedca835d342bc66af4ede3716a4ad97c9e0129bd5b78f8f6aacbfe23c6
 DIST itoa-0.4.4.crate 11147 BLAKE2B bb6f1caf1e58dc313bd3cfa2cf81252cb2ebc15e1f4c9adfcdedf46c5fa79811d5b0cbd58f1e91d1f62bf85d7b941b0dba535814fb43b5b70a38db791b45717c SHA512 f5e04bd908457e7592243ce64a99c5283428b767f4cc17d77946770411b06fccb0250625263c3e84a02a018ea7e8a0e4216e1929a71988bab8e1dbf603d3801d
+DIST itoa-0.4.5.crate 11194 BLAKE2B d8f0e2aaf62152c187e0987ab4b0cf842ac13255262a9ccbf8484d730ea5397572791c023d2363d0562c18c8efd2418680583e99a1f5d14450b3f0184dce69ca SHA512 79ff8774524130a4729d5e708a4a4a837b3e5052384a12c22db4ae3e208dc4391ee185365f685137a8ba55ea7dc3499f8cddddb2fd98b84177ab292c264034d3
 DIST jemalloc-sys-0.3.2.crate 1344660 BLAKE2B c530eed197673dd515b41d504127c6c7abf75bb2dd0063b0a693be9502e3b5ae9db6d97dbf7fdd4bbab626ba1f788bf6b8e6804a476e109f22737bd2a79dcdff SHA512 b718dd98474d16fa5448bba62ac5e18a9e9798f31fce19dbeb4a12526c63e78f306454e0d9e2c6c5a3fd95660bfe82bb5fb09e4091cd8b43706eca2c4872b647
 DIST jemallocator-0.3.2.crate 16393 BLAKE2B 03c190b2f4c6cf01957a4e11d13a230dd55593e1845ae4179b60c62fa28eaed4dd27efb3113039ddab1e66a28c102d4d9c64169d0c10a1945bac162d2f613a79 SHA512 e3fd9d377d6465519e73a91d5639d47bfd6cdf5898d551c49e3efd3269d14a75bb9163980e13ff429e7dc637b8430cdfdb1f5d6ec52993fcf7b6247a69850ac6
 DIST lazy_static-1.3.0.crate 10616 BLAKE2B caa2af77f69c96b5f35dbb2aad7e73784544e6baa5e1fcc2272738fcd3d5f0576480c8169cdddc665a953eb9b6b7ddeb69e93cfa60401458afbe783fff82d1b1 SHA512 08288790139876765b6d4a5988f47fd2a4bfc77c2f2406ad44e64920a471b5655c7f54cb197e5a40c29ee8b42aecbbefaac2b6f4a7dd2b5e24dd92c46cb9b822
+DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
 DIST libc-0.2.60.crate 409744 BLAKE2B 1d2dfb912a0a01d93ef10d57ee7d2259c0b82ec29b34a0f1c4065c6be080685f556407cee896bd74b01136a59d9c583258818118c81e9ecec5a6387569affe77 SHA512 649bb508f5e2800712618e76686c12dd3e7956ce2197d620b1b53427496296889f2743cf060e53400b33ea86982dff2c7d7c85b151fc1233895fb4c7f786b39c
+DIST libc-0.2.68.crate 468882 BLAKE2B c313ba0ed94de22abf2a764edaf1ca5dc4b86e98e004c3c23d53c7684996d68a4c5499fecd0afdabc4af3e1308e5e089a66cbac81d243f432ec1a9ca5b1856a2 SHA512 3f501182e814a2e4eef3a574bf5830a9ba633018164acdac115e7d8d809bc4308b08e657869206d4e5cc73d4ec4944ea98504b708201802b1b021f854a36159c
 DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
+DIST maybe-uninit-2.0.0.crate 11809 BLAKE2B 5e517b8c59f9ae4f1a4f86b48679ea64d62450ec2519c8caaa914479ce9e5b3aff24707e2e37272ba74bb60499afdc602fff17756337b0c50a9184edbd8b8805 SHA512 3006fc009c7c743d9147a4122e677cdeb2546f7bb46963b2f266839614eb906f9d763c161044fd0bf3f7b54124ac0734ac9ae7f7151b1a7a5f45cbc739976434
 DIST memchr-2.2.1.crate 20862 BLAKE2B 79c8b7772f6c4e76ef98e416cab1a87648fe1f78f77eb31a894a2b1611fcf2d8336e361ab3d692cd03579b33f6bc5adb20d42418475dac5441b8bf356e38e442 SHA512 0f5e11507a4235edaa8ef639753abf62f1c187c8c6e35b0c80c9306958e41893492d4995e28bf28e5710e8739c7e75bb75a515507ec87870741a3b426ba8f44d
+DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST memmap-0.7.0.crate 15214 BLAKE2B 44a5bde9b85b2c378fd4c6ebfaa322ef8d0076472d6c7322f7aa95b8aba3514fd5212b4429eb369d30d0327377e36c626de474ea5e1f764bd4fae595680a04f8 SHA512 3a7c7f963111c2afeaa0381aaa6a57f0f57600392693ee1807d54771bc058ea0f86ac6e8afbe858e45f9f17b685430bf256dba1126b8074ace3aafc07bc14bfa
 DIST num_cpus-1.10.1.crate 11151 BLAKE2B c1328d409d552c2323999a76ed5bed3382752c50091f68feae9b4cc56d28919a51672794122ba23d51a26e6241fe94d36a0a6c843e460ef9c36b734fe474fcc5 SHA512 f1f7408dc1cfe7c718928d8e3e219e3001ce4207467a0a129546f2729ba43a7bf334cd5d328a7f8f8b1c276382c8a0f9d7abf60a3ae2c32f4adafa96c6ea62cd
+DIST num_cpus-1.12.0.crate 11867 BLAKE2B 49ba476ebd14f2894dcd3e017921a865ceafe62ebf990a27874d264588f5e45fc8d6c3a3e82717e661434daca8b134faafeaf55f44e6ac447b81f162a9cbc695 SHA512 502cb7c7abdaaa42e849847313e6e12b34d9d619b58dccf7f3e80458b5b7778657f352828481daa21d482c247cfbf6d167f9ada8bbf0c3186b82d30a93a6e381
 DIST packed_simd-0.3.3.crate 97485 BLAKE2B 50d9c18099a75d8529ec8687d47b4b04dea280ae75967ad40fb778b39a2303ebc2b835de257072ba3fb6b339524a128f26df8d2106ef82e89d2655177065e7fd SHA512 f0198f5c589be082053ae156372ea826c66e31aad993f64af097faf36045f1d1b6cc4b4b46d9cc8a1c7a28e11f707026df6c419a42e2011b1c4a34f579018826
 DIST pcre2-0.2.1.crate 19394 BLAKE2B 49444b1cdae33b96bdb8bd40c94a7e57edfff0f733683ed7202d764df59952de4c3c70231caac87b6be63ad739dc615389486ee0ddfbe36c432dd3115a1fed1e SHA512 6e9a0d60c8bc633d4f19fbbb3934f86bd95e34dcfec8aad55dae5ebe4ed854dcb42ad265f4b0ed5c1a8683a032268bb38b2c3899d25428311cebf97789c62d0a
+DIST pcre2-0.2.3.crate 19605 BLAKE2B 6fcf5f37b5f37d77b5c3568392ac056c0dfc58e16c1d9cdf2f6cb6c2c712619d1ac75d89e1ae49086e9c0c7d9128140ae57cbe065ef0ae21b91e2aec1c2a7249 SHA512 6771b27b800e3eebc34ae5dda48ca8bf60d5c3fd46fb424a669341909491ef476427b23f0aec3ec606aa03ed9606e46daf76010a7b9e3ffe1a76faab3314e74f
 DIST pcre2-sys-0.2.2.crate 2184376 BLAKE2B 7247cfd843a74de8f2486d9e029afdf3eddfae6307983f14ab0d9c48ec487c3eeb710ae0485eab10b5ef200f8e3d8743ac9f151a5f8e07cdf3c67651e73fb1d9 SHA512 cae12d44a43c05b2303f230112f8cce349141a697a0ed7ab8b9acc1a812f8ae8db156dfdcf40eae3b51c143b31cbf842dddcb133eb7e0430ef78cf36906ff652
 DIST pkg-config-0.3.15.crate 14087 BLAKE2B 39ef9b5d573b8eaf15cfa779ecf877b7de785bf8adf9b3fa20e5bedebb958f950da7b69e69b0e135f46379ba370f51a2bb951d5959553f878ff6f5c4505d5e79 SHA512 645aed8e24ce99085e4f152eac511df50646f17705d57bd8566e70e17c18bd6b05001479c94b2425e45c67d4f84797784053a8299957a1492289853755a7867d
+DIST pkg-config-0.3.17.crate 14533 BLAKE2B 729b15209bbbee8a6d3854e30a89b3e6041ca3cf7b1460ff6008e37866e326d9ec8b4ac582c125676e31eefa048b143beda33432b95f00a8f51cc7fa33ee4986 SHA512 42be78556adc07dffa8933ab1436d5d6a776018898377d58dfdc9f961981f9f21397301b41536c55d8a3772bf74a38069899d1a5cddce5c24a032017137044bc
 DIST ppv-lite86-0.2.5.crate 20606 BLAKE2B aeded44b0a0fc59073d358b565c6241ce537a29967fe8f95eadc4cce420752e619023b0f813d1f157756dabc640351de61e7da9bd030c91a14b70d34e300a217 SHA512 281ea3479c4a8996aac643b707e75ca0a079681b1f182a074de0d9989ff9f1df6922cb8e4152af76025ebb4c2d00e6889aecc2a4f0fa66531eceb732aef62243
 DIST proc-macro2-0.4.30.crate 34731 BLAKE2B 0a27a06151b54e4ba50f08803a5de44d9c7702ed72cab1b775408696057246e3336dee3a61560886cb24fc4cf582339c8bde7d9211e4e0524f2c719b774339be SHA512 73a8de3f1d76a8baf2d45afc1497bba8c0cbf231bf9b6750b9cee2473f492d5f3957ac149998da720acc8287c96d604971b51dcdfa629523bbdd97c297856ac0
+DIST proc-macro2-1.0.9.crate 35576 BLAKE2B 16c687cfd21bc3b97113f32293c1e06ca5811df6c8f279e1c5661a501c230b430f1e8bc983a2ba30d097acd01df8701a5a90ed02a93feff83a1f6f33ffa1e8d6 SHA512 005d1d31ec62a25fcf3cb0e62063d5fb53a3b15fce8fa597ab09cac5ac404a7eb441ae44c2d3acc295e24e814a413d0664a3d142155495674c4713f489ec79dc
 DIST quote-0.6.13.crate 17475 BLAKE2B 985287f3e619c46b052e704c6da78565fe5d8e4f9a0d503aa0e8818f595fbef32a437d67228c35cd02d817ee3e19efc03e75239013a87a79553bb252f15c8ac5 SHA512 bafa9ba42ea6ff2d6df652384485c58327de6eaea2832423eedd8ef8b4aace673c23b70f1f22106515ac13d7f625cb8b1a5e8c4388c1701ea3cd86fb9ac3056e
+DIST quote-1.0.3.crate 22939 BLAKE2B c50e47b647fe1ac1930544d20b2b78ad98e6398a32c98460701d93f93fa1437c6d12c632386ab9eb733cbe64cad57e02dd201686885d0a951cb013fc10a95a9c SHA512 b4867554b86d119251db67f9d0949bf8c3cd7c64f006c76531398ebb7478cb93805b9bcafe159d921ba1a32e92773853b56685cff0e1ebdc6aadaefd3b932ef3
 DIST rand-0.7.0.crate 104208 BLAKE2B 61e0f8ba3a3be58fd43df55feae3bd571a2c758e6e36f7ffcb42af1ced067338b6baf9b9d3b097c3d9037a440ca961aec87267fa5147e59c1e34f3a8210e2a95 SHA512 20c82ed8edf0bd203ac6f04f746b80abf5ad5716b307cd76fda399f26519ccc3b757f390058e7d8826508ed8a2b524c49ebad56a79fa77416b386f2b9a854352
 DIST rand_chacha-0.2.1.crate 11475 BLAKE2B 698f830845e24b85fe52b11e9a1c621dcdbe4232bc22f3dc0b1d2fcd4427045f302f74134d9b451fc5b4f9ac559fb2bc06f3d0eec5eddb6fd6cf3e6d3030855e SHA512 30933fdb94ca8d4bf040a7e08a42944a0d7c2f3f6a9a3d547e74bc32f922b0eb79d85afb1f6c85c78dc115170e70bdf96b36f0478d61ba5651876d5350ad18f6
 DIST rand_core-0.5.0.crate 19736 BLAKE2B cd0b6212ef01e703510ff0131c9745bf5da4f55d96e321f943527a39e57c8403d1b37bc790f6a09addaa85947f0c431a3001ff14beebe67193c5628d4270f393 SHA512 e98f9b93cf5a80c40c11e7e8faee351ef567ae7cf9db1b7789a61eea41d6509e83684da00284e6e3d0f52af08ce2a834339e652f1fd39d818a2827f6236f5d6a
 DIST rand_hc-0.2.0.crate 11670 BLAKE2B 55fd048f2524cecd4f0e17927a81111e3070a8cc6a5b0234a46445400ad5527194edf8c91fb5ad6538f4958d53044ab02424f61a38adb2931e2cb7568c458ee8 SHA512 bca185612bed5cee4da76fb68fe854105da276f5bf2da464e596d586b925df798cc692ed881e276ab77c36b4b0551930966c93656be122ad05899d87853533b0
 DIST redox_syscall-0.1.56.crate 17117 BLAKE2B 57b1b01ef3cbc6f55def6c9a0dcde16bd98e83badcef993e26ae3ce849abcd1b1c10f4da931c605970d77f92471734764a537e7329291a221343fde23f3591eb SHA512 17a3044327aa733c830dd74e210d6bda32622617d1c5af9d70d7647232d8569ad0b04ccb14042cbabb5d97ad98e3f1f5a9968a75387354ffb4d175e9577115a1
 DIST regex-1.2.0.crate 245604 BLAKE2B 68951a1e686a4e7c1ba059e8d4c68bc44f59cf824d416d9430ca226c9bd52de42568a4ba041733a6f508711a94bf6f17fcf052683c2744885c98ca1c672ec0da SHA512 ed4317e4b91b91b4807daa56d8070a5cba5f99ecbaa23b78b92438d19415f38dc1befb11e8b5ade63cd1b392fb83778350583cf531c374303c6f3405e6b4784d
+DIST regex-1.3.6.crate 235465 BLAKE2B 18c6fa529f82fc9ea874605bdfb8d0306a22c88bd74a2473f3cf71b8df46b63133a0a9d3f7401b53a85ceecb6f3eda1d5d37ce5982d7d8e8b6cfa1c6206cfc5a SHA512 05dbc0f355bd1f3ee659a8ff888b37242f780500b76d153a100c21c12278db2429ccdd47f8dc182c708dd70d47fcfd5acd6eefb397c03e08cbdff701f6346628
 DIST regex-automata-0.1.8.crate 92234 BLAKE2B eb26c91f5c2ed5b08ff68d316a55a6a23e8b8392d74fd9de5850df38c39304aa3ccb1dca1271ea906602798b132ec49be0623c20f4f2cdb41ce699967dd8815a SHA512 41ad4ad05b0147e663f63e4bdab8281d3dc15f76663bb9eb3d9f6a230350b71e7f3f42bd18e6628a7cd971655a6b13aea2308d7f124bccca24d01ea9ed15d61a
+DIST regex-automata-0.1.9.crate 114560 BLAKE2B 2bbaeaaa896479c817b7bac2f51108f8f74fda72178068c3b5e599b466899692fba8ff3ce8cd30f1f978a944a0df98f466f3d4bd340bf595d6f7048ba6f648a8 SHA512 53323733dc2f8c47ec33b5b3aefacac3a0042cff80c59c3a05ee02b581671dd9a6ebf6b0b5eeddf9cd249662731cabf5a684553daeff440bf8d1d4d296afbeb0
 DIST regex-syntax-0.6.10.crate 276985 BLAKE2B 6cf614eff1c3db35fb60f206c927cbd8caf4ec4942089c9356414b0239f3fa060859cfcf48e18184ad8f3a0aeac71193ba0878f3179653fa626dcb3d40de5206 SHA512 30b5cc9887210c5594d57be7f05e25475b56732c9a0be02452aacf80b456f12450b63f4acbb67badb3ad16f22d244431f5bcf5ee30b9ce8f35dcdeddf3972175
+DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST ripgrep-11.0.2.tar.gz 461565 BLAKE2B 5a9bcb423c470e99cd9e9299fcb9f2cb2f663ad1e3b406f1abc6671e68d876e8cda1866983d96fc498498e796c1f3af16838799741ce87b0d5b400e440ca741c SHA512 62b5bcceac2ca4899e797799e67a8e45730f1bcb5115b48e9ebfe12d3b0e43921020f368e4328b0f5060ccdf0dedb8935857ece7126e05d9cbcca535cee68a92
+DIST ripgrep-12.0.1.tar.gz 475088 BLAKE2B de1298e5961babcd0e902acecc7a1a16d816bdbd7ab0e28db1b98c2614cd9433bd6f7a3eaadacb3779864db43a1960d35d1b5a2dafd6798715522424fff011b3 SHA512 2f05a60585e522ac900103c31990032429c6652647efc022ee0ff401019a4dc75614b6e0ac0779736398fe067bc326b3ec97e166fb5a58d09765f9b145414b4b
 DIST ryu-1.0.0.crate 40170 BLAKE2B 5938a70fe991ac71974a38172acff9e559ec457aa12775ac53305742696a7ccf8f4619734b1d7b0e2db01b548ef2945aaebca605c186dd0b599f47dfb3fbf536 SHA512 b5dd360611fdf76ff13d377c1c79ce09a4fab90a8b7fc917a4424b8246c8a0da7d3ec515b8c69b695d936b1207072d173b9f40fd5cb218f1eab947862112caf0
+DIST ryu-1.0.3.crate 41983 BLAKE2B 32f2b9e8b7aacee3fb86acf405efc86b44c564b4da4310567a0e1b22d09fa51e5ed8278f6b2c38c220ba235de39c596b15db8958aa413ff822c0876ebed56515 SHA512 53ee61ef116594829849b417feb02d415305783b08d3e45656a467aaf272899e4ed46ac0415cefdf3102f61faa666f21f3237244b2711ad10b528a3773aa8414
 DIST same-file-1.0.5.crate 9861 BLAKE2B 3f65c5cfa1ba526157f838ce10695c56dc9241b044890629a3bd7f589f3049b04944d70ce10f371f6844343222954fbed5674c04eb6a7b934a3a6761fc897825 SHA512 33be985579210b64eed7e26f24a695e2a59992ae51723e5aa026ba34dbb05be4c377bb25db9797dca1f70aa4be58f33cae32a89b61fe6b9353de9fb902ba2dcc
+DIST same-file-1.0.6.crate 10183 BLAKE2B a320c8343e0b38078ba81c4f0159d886bf47764c74efe0d7cd2b3218426e8341b51e523c00a9e5fbc2ee1057618296bd70b576c68751bd55d6ddb352defaca15 SHA512 3ba35309742c8db63210d9ea78bff4ecd80471d69e6238eb96c7bf0673814f221e2d838fe6311bfc5a0e71b4a7ccba33e07859c0b9cff2171969ff08a4214a7c
+DIST serde-1.0.105.crate 73358 BLAKE2B ef75efaa654a5980648e8418553af18508f95b29fa1441f0804c78d9f8fe91764a3565ee1138c96c9245c28ed2ed8082d08c50f8ff36b9d40b12456a758ee289 SHA512 e8b471769b696b0c7f3b673879dfd056279fb49dad0228bc2ec459a2aa8bd26073d40ac1809a42c0b5ab3e9abfd32252f812c6493d17979c10796e7ab78a795f
 DIST serde-1.0.98.crate 72417 BLAKE2B f0a49162951fe9e69b02dcd1f24ddf37aee08e23128de15e4a4490f07bda9f1c56d9abe3b90422152989d4485e78ce9e0da2ac8800d401922fe4732640755845 SHA512 a949d803c7c66312f280483c532c705f8b3a2b4d058b717195ffc539ce9e92bff707a585cb9e2f52c16152107edab40ff8bc4cf825c06f6b73f1fa189cb9dba7
+DIST serde_derive-1.0.105.crate 49700 BLAKE2B bbbb3a54b7eb4ca87b667c75dab007745a1e163b90c793258aa9f78b9bacd067262e3443d27c4d941b6c4ae0ad217779a4fe5ff79aaa84bb30fbac06252c5289 SHA512 1a39820708a609b3941ce6ff669068f67d65d446e208c904ffc59808ff7bb1d82148357515056fd4856e10cfdb2cfffbd968dbfba870ed23fddf1076e3f6e543
 DIST serde_derive-1.0.98.crate 49046 BLAKE2B beff0012254085fcbe0a73dad9b8f9bb650270c1dc0900cea98e816650ac3f0e12931560a2a36de9a589cbff767ebb65c11a8746646899b3ac3328292b8530b5 SHA512 16313a0fade030fce860f02daffd47febfe3c470b5ecf3a8a53d88eae42b251fba56dab7caceb3560f562860957be4fc66ece06d176757c61b8497f5508a1ece
 DIST serde_json-1.0.40.crate 69695 BLAKE2B ad156577b557ffffac9a7f75e6e0f6f6b86c82e33db1e674fd00dffd6f9c33a13f838f062a4bb39ab9dfac63199717f96bbbd53e107ce8231aa88665fd7a2eda SHA512 d09bc95c963f510686106d9885f3420b9eabba8bf32626597dafd43ffbe91ea72ee4a3fedfca922794a727214d73929970acced8eccaa23616cde33dfde9f842
+DIST serde_json-1.0.50.crate 72229 BLAKE2B dcf9ea24386a103f5b5ccc3e9eb3f0c3a083cb46f795b2ffc2da1fcc1d965c56885a417a64c3ad15c58aa79225f4f89895b90b56048cb9e1ee22bac15c296e84 SHA512 e1ca850d059a357ea9de29fed42b3945701b2b130a6b40e708b926088501652c8426e272ff754534f972f68dbb8845583df7e0887de139304245aefecce7388d
 DIST strsim-0.8.0.crate 9309 BLAKE2B 40a8be506c43ee1ffe006ddc7dee98c3d418bdd205d57b78f5d1e4c9312feb57e1eaf952e02d92d4e0932db240c6fba45beb06ea8c4fc6de1cf1faa8b6a3a939 SHA512 1d55a8d946cd55f5f37d06aea536549ded95739fa58c0f2da285a0041154c181f663682bdcac643aa198b3e762d694a04f058db985c62ebe22b5c16327ba6d34
 DIST syn-0.15.42.crate 185561 BLAKE2B 1c9bdd974393f020b6c56d78608349e52be836ca3a0f34f68a9c24107eafae02a32e998ceb5aa710be5f2b7101df71efba0bc9baaac36bc5c3ff156db5f879d4 SHA512 b2feecfb9d05e2d2a184d92ae78f873147e4950641dfc9300988d6974a85a63690c41bf22ecede2a2ac8e45ffe41b13011e5eaa82be5ce6037b40b9b247bd989
+DIST syn-1.0.17.crate 198158 BLAKE2B 7093cc8aab4ae2f435aa70a54c8c2b8e4f6928ea76186059942bf5c74e2ad25d73608f469cb0f1d97071a5dc2e3d048a155084bbc28647ca39032f06bcd5a3a3 SHA512 5acf5bafb32f780e08495e1e0782c170eae54baabd72c45a1d350aa41aa4ff2e5fa84b23d088fbb8522f430526e938c459087f89e3372690bde7bd0cb8c4750f
 DIST tempfile-3.1.0.crate 25823 BLAKE2B a34721369923771d5f9a2fc64adaff2bff41da97a0ce79e01aaedb8d6670867220c671c0d23f7a8a9c71b09c0559efe4e7c9bab1f7f9d890866be1de1ce050a9 SHA512 a87ee51c36a81a8a8eb8f091eb57926682f38b707f7f641332d8752170e6c139a656ae49c6861f51e07c2fab5c86cc9b2ac158f5d89c6bff15d18934dd4e7ba5
 DIST termcolor-1.0.5.crate 14526 BLAKE2B c799a73787fdc764ce634731c5cb7232a4696a88797aedad8d2bce72d9d193b099ed80240a03259dccffc5ac2df8b4acc8b60f916dce6ddf63913e2cf0eaec84 SHA512 d729ef6da68be8e2ce19ef02336193d8baea97a28cc8789806587da829471222a0c7669b4485ef81b1d52e85096d787dcfd4f064c894904602b595aa024fcdca
+DIST termcolor-1.1.0.crate 17193 BLAKE2B c3a1a80269195f6bc92d141fce0885413c031980a4ad2f0f6e5a9051acfac10bad8a484362bfcaf3a60851a97d930e9602df4c00aec39431ea5a8a20d40a55c2 SHA512 41b05b047cbfdd5e3990eb36f635dc8ccf26a42bd5403d6d14a9f3c341e92b61c3b8d4d5f4fcd29071a97b3d96280ed59b4557b63a769390e2729fc82ab39702
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
+DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
 DIST ucd-util-0.1.5.crate 26284 BLAKE2B 229c82089b0b070a812df63122e1413d59662c24e02c81a4b4d2c6a71eadf7f09505ff47376f9aafab3abb47eea1c7d28be9eb9377338a63839a3285a0468cd0 SHA512 14de9b370a49fe6fcce871e223daa257ca5e50e3d8cdfa3c6800db89ec4a0e6bac55e2b73990768fbc2a13a16d77c8b59015c4c4fe413735e7c893ac3651f5b3
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
+DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 DIST unicode-xid-0.1.0.crate 16000 BLAKE2B 159004a7bbb7476b39e982b51dbf615717095fd5946536e757653aa941bbf1b774f331db744ecc33bb2ead4b0a6d254fde86cfd6cd8b83ab9983fa89928eddbe SHA512 cc5343e2166938322cfd7c73f1f918f2a9c46846ac0ef55933d1e44cdfaf6f7da2b7ff18b68e356c47b6d8ba5565eda0db42c347dcbde830683f341ac2b1849d
+DIST unicode-xid-0.2.0.crate 14994 BLAKE2B e66b4255798f0ef1c81fb852613fee396a042d780d2158a171dbb5e7dedad0b3d2522f5401ae5d215f89ab8be4f5c371b046e4845693a65554c2a6eedc5d1e28 SHA512 590f727d8d8354023062ae5fe7ac5bed1bcf79d86b883effd7f33b3ea3b1c8922998a63d621ca6962a969e890fa6edd009871f21cd57b1969264f41ba3f78359
 DIST utf8-ranges-1.0.3.crate 8496 BLAKE2B 835ab4083ad965c8b17a1571a1629802b9f081a2c7a0fb1fdd55a2734b36c3e2397f7da708d8d8d81c10761a624d95acefb44d423ec7fee672da2c17ea1c015b SHA512 24907ad7ae1a02713e6ecc62e0c73488abea338f0dd3b49291b914ca907b3a220cb90f8ca409c6aa57d2e0e5d8ca8c44cd310081ffe7be9208952d73ec53b9f8
 DIST walkdir-2.2.9.crate 22423 BLAKE2B 7c5f1aa4a2078d4821a1fffc57751950295c99706b48198c70556461aa42b2535d93fd95804a6c5003ea906848accee510fe5bc6148c4155e6de074ba324da2a SHA512 43b8f629a43195c8cd8ad6821b431dd3648a19e6abb83f78deaa3300e7dafa32b31b3c89a228499585e3da4520ca26d82dabf938c1204c8011e5516b3b82da7b
+DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST winapi-0.3.7.crate 1075776 BLAKE2B 694cea6d0d14fbe85ba718c0ca7b9db79ba8f943b44f4741d77000617de43314a2c657285736a032c138b5d2095b06146a2ac8d84b8efe2307ef44bb7073c604 SHA512 6871b93ad8d48e39b90cb7b31b3132f84665f965b4dfe06fcebdfb873e7d099007cf3d7a50e832a941c3425ad2f39c3ab48a77151e60863685b97fc05c71d134
+DIST winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
+DIST winapi-util-0.1.3.crate 9913 BLAKE2B d310b3fbe45bf4a25971c4396f945119efbe8f5bd497f03ae04eaee7643d9d022af69c4d511ed6e89fd10bc56d4448b8b3a624491a67a87dcab4f156c31ab104 SHA512 55ed7996a8f63e2218e74e778e47450863b19170bf1f5375a36b094c5e34bb41b19f093157e40190e105a40cd1cd9bf90e95966fc3a7de71f6b74e272723a1b8
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST wincolor-1.0.1.crate 4737 BLAKE2B b1519327a69d71845bc4d7ebf34205d63883aacbeb9284260e5cc89178193aac15525641546582e32c00128ca4a7c1967ba8f076fbfa98bf9d79a5fe2801555e SHA512 f9914b8b416f3810f5199e85b8088c669bff3cbc0f5b86fdb5b600bbd0554465a559bae3ac918fb7197780663e94bf645ede8f35b60ab0e6a6cf2305b1eb99e1
 EBUILD ripgrep-11.0.2.ebuild 2568 BLAKE2B 869b9ce5a3a053b87e2ac721e98364fa0244cd8f42f255ccefa91a3628d75d70064caecbe90401e4e6108f3acded31643f374d4c10f71e46e09e2d0dd3baa1c9 SHA512 2120f89f201965787bae5f545aec9fce473196fe5b81a382cb65772eee36f4e6facc73a4738fa3f9d6c2a4b2a8ecd9b9a02a8f8baa8f5a6966570e62222ace93
+EBUILD ripgrep-12.0.1.ebuild 2555 BLAKE2B 1d85acb5c43ebf76a790fec45e522ca3c43900ac9ce99ba17f7d577fedbd27fb995652f65d9e35262dd0377e6dba3fddfbbb7472c91daf87e3e71bbab2d90e61 SHA512 5b155013323f28a06a34948d1f2e687f09dc0ab455e2fa87c509b56e2a4e76a06cb26935272a00ab487aeac9bfc3377205484b04fd103f01cebbfa1279e73429
 MISC metadata.xml 730 BLAKE2B 0355062074dfce2208602756187dad5d57f281271fb156c7cabceba38b3097b21b9ca46c713c7aac661249676de4e79fef92c9111c58e4dec70f0f9ae8618ee0 SHA512 683936fa04bc52eed49d0c8c64b15d22cc2583abff4d4549abd6b9156e33a0a80a5088802e5b321c40debd30ea70e1f93877f8caaedb164ae6c8a703fe961460
diff --git a/sys-apps/ripgrep/ripgrep-12.0.1.ebuild b/sys-apps/ripgrep/ripgrep-12.0.1.ebuild
new file mode 100644
index 000000000000..0e8ed3224c7d
--- /dev/null
+++ b/sys-apps/ripgrep/ripgrep-12.0.1.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+aho-corasick-0.7.10
+atty-0.2.14
+autocfg-1.0.0
+base64-0.11.0
+bitflags-1.2.1
+bstr-0.2.12
+bytecount-0.6.0
+byteorder-1.3.4
+cc-1.0.50
+cfg-if-0.1.10
+clap-2.33.0
+crossbeam-channel-0.4.2
+crossbeam-utils-0.7.2
+encoding_rs-0.8.22
+encoding_rs_io-0.1.7
+fnv-1.0.6
+fs_extra-1.1.0
+glob-0.3.0
+globset-0.4.5
+grep-0.2.5
+grep-cli-0.1.4
+grep-matcher-0.1.4
+grep-pcre2-0.1.4
+grep-printer-0.1.4
+grep-regex-0.1.7
+grep-searcher-0.1.7
+hermit-abi-0.1.9
+ignore-0.4.14
+itoa-0.4.5
+jemalloc-sys-0.3.2
+jemallocator-0.3.2
+lazy_static-1.4.0
+libc-0.2.68
+log-0.4.8
+maybe-uninit-2.0.0
+memchr-2.3.3
+memmap-0.7.0
+num_cpus-1.12.0
+packed_simd-0.3.3
+pcre2-0.2.3
+pcre2-sys-0.2.2
+pkg-config-0.3.17
+proc-macro2-1.0.9
+quote-1.0.3
+regex-1.3.6
+regex-automata-0.1.9
+regex-syntax-0.6.17
+ryu-1.0.3
+same-file-1.0.6
+serde-1.0.105
+serde_derive-1.0.105
+serde_json-1.0.50
+strsim-0.8.0
+syn-1.0.17
+termcolor-1.1.0
+textwrap-0.11.0
+thread_local-1.0.1
+unicode-width-0.1.7
+unicode-xid-0.2.0
+walkdir-2.3.1
+winapi-0.3.8
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.3
+winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit cargo bash-completion-r1
+
+DESCRIPTION="a search tool that combines the usability of ag with the raw speed of grep"
+HOMEPAGE="https://github.com/BurntSushi/ripgrep"
+SRC_URI="https://github.com/BurntSushi/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	$(cargo_crate_uris ${CRATES})"
+
+LICENSE="Apache-2.0 BSD-2 Boost-1.0 || ( MIT Unlicense )"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="+man pcre"
+
+DEPEND=""
+
+RDEPEND="pcre? ( dev-libs/libpcre2 )"
+
+BDEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=virtual/rust-1.34
+	man? ( app-text/asciidoc )"
+
+QA_FLAGS_IGNORED="usr/bin/rg"
+
+src_compile() {
+	# allow building on musl with dynamic linking support
+	# https://github.com/BurntSushi/rust-pcre2/issues/7
+	use elibc_musl && export PCRE2_SYS_STATIC=0
+	cargo_src_compile $(usex pcre "--features pcre2" "")
+}
+
+src_install() {
+	cargo_src_install $(usex pcre "--features pcre2" "")
+
+	# hack to find/install generated files
+	# stamp file can be present in multiple dirs if we build additional features
+	# so grab fist match only
+	local BUILD_DIR="$(dirname $(find target/release -name ripgrep-stamp -print -quit))"
+
+	if use man ; then
+	    doman "${BUILD_DIR}"/rg.1
+	fi
+
+	newbashcomp "${BUILD_DIR}"/rg.bash rg
+
+	insinto /usr/share/fish/vendor_completions.d
+	doins "${BUILD_DIR}"/rg.fish
+
+	insinto /usr/share/zsh/site-functions
+	doins complete/_rg
+
+	dodoc CHANGELOG.md FAQ.md GUIDE.md README.md
+}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 8fe6a03fb168..927e0eed586e 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -12,14 +12,16 @@ AUX rngd-shutdown.patch 1030 BLAKE2B bdfc3e3c9c7fcdf5b6aef15ab883852c02bcdcb0685
 AUX rngd.service 133 BLAKE2B 1c3059e7ee924b42bc6567f5142973d550282248b3e49053b96782039ebd63096a0a8960d3e5a43cfac1d505c57e71015ad706099f06ac2809adf52c0b108d7c SHA512 51e9ea84b624cda8d3689d6a9a8d60da4a556aa9d2a1a04e698d9a1490717aa47172e152c93711f8d04be8a5b68b1dfd568a762bd8ee7219afb7cdfff15657d2
 AUX test-for-argp.patch 1245 BLAKE2B eb60f4d921f395d713e0ab9f132e47ce8783a096600f050c45212bae6929dc9546ff5f7b5ddf92d66570d82041b1e31ca3d690abd1e17d1c0fc688629a462e06 SHA512 0fe4b37eb3d2e93ff9ce17aed8cfcaa29c7f04289ba692d10fd0f8ef6d9b1e5f64a5734a508aea548f13fd00217972a68bcbeaf6977e763087ad20c19d456ed6
 DIST rng-tools-5.tar.gz 122182 BLAKE2B de7085d530e38de21a1c33792d67a72e0131b221082d690cdb299367b80b0a123c2976174aa3f895a4a2ab1216aacfaa8e09de485c85154dc4a5b8f960d05245 SHA512 58047c37cad4f5f1210b696e4dba122878f78e57d05d9cb822f79234240ecce31efd2d39061fea1eb5b2e81d48d8c3bf6b92d06451f1ce5d5db7117704e89c50
+DIST rng-tools-6.10.tar.gz 56806 BLAKE2B 6cce0579a47f638cd90b51ba5216712fe39bf92dd59b288691a5e9783d520212cfb62e875a7e8f85de7a932568fdf0287cbea6f4869c9616a4c9325a111b0243 SHA512 b72d8918f709989ebc70cb9ea9c8b3dabf53041b24bc3f3a6de1bea318861dfd6c1a6110bd750041dc4819406db4a2b28f5137af5f5d5f2beb666f607913b389
 DIST rng-tools-6.6.tar.gz 51468 BLAKE2B 47231c60d78a48ade07855dfe8a807d6c10b8e27dc662ff7d98cf232b50e6c32f24197291a813d6ed6d15325a33fe9683d82943109a80cac1d9e348fc30cb849 SHA512 00bbe7f817d8f228f357a79ca270c27c62c0e588a99cd76917ecb7e88dfb627028c66497a59c9918205f3551aaf631963c8fd6504cb4198ddf57f714204c21c4
 DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a94ab456db61dc45c69ac5e4849a1e74abbe0f7640827ffb4bb20675c1f639a5be852d21d0d1a3c6b2e96bb5e SHA512 2f09edacb5448087041257326faf570c303b42f90bb695a1999b2c7543f20a28b15cdf705a2eca55cae8e9cf9fb5205c056fc26cfaf6af958bcda2cde1952b4d
 DIST rng-tools-6.8.tar.gz 53769 BLAKE2B 2a10a5639c5b1f4506b2c2cfb0185d16b5b604bd8aae72ca616b121f2e7624ff1ba00eb32daa3626b00d89f106356924bde511e263ab8978ff764757b44588ea SHA512 8fa47c2f0f8ebe6ac13025fa2c74505528b503c4e126c5d02b939797d6d4a8c9fc2b345353e48e497e32c1620a0821431e70752a9eb8ecb71960f16713696b62
 DIST rng-tools-6.9.tar.gz 54426 BLAKE2B b798f8d052b5f13a2847edbe5fc4c7f189433cecac97537193afab09cd35a89d8ddde16708f45f474997ea926bf47b2c6950f03ae7d7d93e559f22ed9fbbabc3 SHA512 08d0b19c309331fd2a2cfb5523a980d5ab1a2e727d06e2b3ecc8851aa94b6fffe9021714f33b5bd1eeb8e6a1d28ab865845520d8e4c96ab3f63019718c08ae7b
-EBUILD rng-tools-5-r2.ebuild 1145 BLAKE2B d406d2322f3559b65f4c1820c644bac3195746fdd7132dc3c58824ed36d2039b87ea85534cfa8054dc35805e1af6e58f917df672c31533ed2ec4b65bb17c04b8 SHA512 9143755e2eafcc2a00ff728f51c5b69aa6e733addd5ada41de2bd896c19709284bcc9ed4c13bc54d924e00f34996040a4956dfaca5093e9e262883aaf9026de7
+EBUILD rng-tools-5-r2.ebuild 1146 BLAKE2B 0fb06c8208399d1f4fee01b53ab112af78c6b4214b2c9caebd5f22c94d3de062cbc869ea207bc47bee48a11a4892ce94543972274042e5ce1f2b1cb153b33ef1 SHA512 7eb055a3cee18b56c845eb05f0a66666a8d108fc059fb0c4e2139251f9fa5f3625f25bf133cf13bcc07cb666b07d29d1b83809825c8fa664df3ea90b571c3fb5
+EBUILD rng-tools-6.10.ebuild 1807 BLAKE2B 144ef36a4555391f7f25ca032f81524a45fd476a5700549895dc45f9792c4d90d60dbf7f57b98f5d8227aae9e39826294062f56dbd4d8a528afa644329d06dfc SHA512 7059794659683afcbee82eb1ed3a0c45568cc975bff1c465b07d5d9a794dd0fb4559e4879cdeea6400818cc350aec0e31d3d48cb03ae6308c02c97ed14925428
 EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492
 EBUILD rng-tools-6.7-r1.ebuild 2143 BLAKE2B 0a0da05d43c4763da8c42c1d5ed39287878fd1c24dafe7d37f4002bb6bd08293ba0fa80189210a19a83ab5c5c6914a0e0205d497f1f88d59f2cea997ceb00eb4 SHA512 14e9cd49419ba51d6df5be4134f6bae33aae463a6e19faa6220023f1ba80c9d971c442ae52ca248d85828eb395fa60e5ae41fb95d85e4364b15e99709d36a286
-EBUILD rng-tools-6.7-r2.ebuild 2172 BLAKE2B d0e55b58e40cb445bd6c44d347e46b4283d52d8f3d89c5c8cece93efdb93024a51c4e3124cc1fb939ea43add3ba5c84640d2ad6010833ba4496a6b4723436e46 SHA512 cfe2ecc5a35fa7bc8f63aeab51c1a6c357028e484e09da2bf7bb7a699bb4476ef5cbb54074fe6ffb51369a56aaf67473ce2feed62809aaad36f64132f1fa5fe5
+EBUILD rng-tools-6.7-r2.ebuild 2173 BLAKE2B 01fb210ba3b0ed8b5f40ceb061b7e31c4f14de6ffef6af18d4c25519646776bdc66cab8c376b91cd057588a64e5b1377a0fca52d033174bbc6f77f59edac7e49 SHA512 cf9e07fc1ee37c37cd5de5b08e62aab692f83593ceeca0131edafa621a4acf61f9661851c230c5a7ded13796b99266fedeca97827c4e35ba26c301602e8d4a1d
 EBUILD rng-tools-6.8.ebuild 1835 BLAKE2B 7d78bef80be7e07da0792566bd96ca306984557f7eecb6940ae75b3ca75cbfb0590a3ed0f89f7b24a29abf65a836939577b75e4840f14896ce49ecd20ab1d785 SHA512 0efb9570fad17b1fec65c455bce367ef50062ac4bb5f764ba7f61734d5ff865386ee89f3871fad751226569cc424b6d38de4b236aa03de4a483bb0a793f04162
-EBUILD rng-tools-6.9.ebuild 1835 BLAKE2B 7d78bef80be7e07da0792566bd96ca306984557f7eecb6940ae75b3ca75cbfb0590a3ed0f89f7b24a29abf65a836939577b75e4840f14896ce49ecd20ab1d785 SHA512 0efb9570fad17b1fec65c455bce367ef50062ac4bb5f764ba7f61734d5ff865386ee89f3871fad751226569cc424b6d38de4b236aa03de4a483bb0a793f04162
+EBUILD rng-tools-6.9.ebuild 1829 BLAKE2B f463ef43eb9adfd54676a7d11c6ff6e29d2f6bdec6af78a6643f15c09ebb2492e3b901247ad872bbce3837ec0ba7e9de6ef39e2531a34face48ad9954c614b1f SHA512 9560ebf4224fe0b22c4fdc0237fe23bd91beece3b6e45bd5837103b12b06dac2e011d605d99d5b845b5b14b6b1eba9ff7eb24eee9bc1c96d9e2db6eade6a928e
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/rng-tools-5-r2.ebuild b/sys-apps/rng-tools/rng-tools-5-r2.ebuild
index a1d61a2ee7ca..40645077af97 100644
--- a/sys-apps/rng-tools/rng-tools-5-r2.ebuild
+++ b/sys-apps/rng-tools/rng-tools-5-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/gkernel/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc x86"
 IUSE="selinux"
 
 DEPEND="dev-libs/libgcrypt:0
diff --git a/sys-apps/rng-tools/rng-tools-6.10.ebuild b/sys-apps/rng-tools/rng-tools-6.10.ebuild
new file mode 100644
index 000000000000..fa2eda1a941f
--- /dev/null
+++ b/sys-apps/rng-tools/rng-tools-6.10.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd readme.gentoo-r1 toolchain-funcs
+
+DESCRIPTION="Daemon to use hardware random number generators"
+HOMEPAGE="https://github.com/nhorman/rng-tools"
+SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+IUSE="jitterentropy nistbeacon pkcs11 selinux"
+
+DEPEND="
+	dev-libs/openssl:0=
+	sys-fs/sysfsutils
+	jitterentropy? (
+		app-crypt/jitterentropy:=
+	)
+	nistbeacon? (
+		dev-libs/jansson
+		dev-libs/libxml2:2=
+		net-misc/curl[ssl]
+	)
+	pkcs11? (
+		dev-libs/libp11:=
+	)
+	elibc_musl? ( sys-libs/argp-standalone )
+"
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-rngd )"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	echo 'bin_PROGRAMS = randstat' >> contrib/Makefile.am || die
+
+	default
+
+	mv README.md README || die
+
+	eautoreconf
+
+	sed -i '/^AR /d' Makefile.in || die
+	tc-export AR
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable jitterentropy)
+		$(use_with nistbeacon)
+		$(use_with pkcs11)
+		--without-rtlsdr # no librtlsdr in the tree
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	newinitd "${FILESDIR}"/rngd-initd-6.7-r1 rngd
+	newconfd "${FILESDIR}"/rngd-confd-6.7 rngd
+	systemd_dounit "${FILESDIR}"/rngd.service
+
+	if use pkcs11; then
+		local DISABLE_AUTOFORMATTING=1
+		local DOC_CONTENTS="
+The PKCS11 entropy source may require extra packages (e.g. 'dev-libs/opensc')
+to support various smartcard readers. Make sure 'PKCS11_OPTIONS' in:
+	'${EROOT%/}/etc/conf.d/rngd'
+reflects the correct PKCS11 engine path to be used by rngd.
+"
+		readme.gentoo_create_doc
+	fi
+
+}
+
+pkg_postinst() {
+	use pkcs11 && readme.gentoo_print_elog
+}
diff --git a/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild b/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
index 1cdcb5a4c1eb..adeb2bb4fccc 100644
--- a/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.7-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~riscv x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="dev-libs/libgcrypt:0
diff --git a/sys-apps/rng-tools/rng-tools-6.9.ebuild b/sys-apps/rng-tools/rng-tools-6.9.ebuild
index 85c8eb05db86..45d0870a2f1b 100644
--- a/sys-apps/rng-tools/rng-tools-6.9.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv x86"
 IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="dev-libs/libgcrypt:0
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index c853ec97f955..7cbce182c385 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,15 +1,14 @@
 AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5277c5d59d345ce96ca802a5529a22892c929bafac04c616458fa147a3bee5c89d31b0baf1 SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a
-AUX musl.patch 1497 BLAKE2B 677d35a52cde1f4f1806888d145c76676e6674188c338162602d097a4571696489a14dcea07cf10abbbcfd394a7adda8256e53a2bb5766b37fda1b8b8e74ed55 SHA512 397be258d722413d8e4392bb9124802e02d9e10139ec77cdfc252717386d6bd60bbacbb59d23f838318b1e1452ad2a36fdd2530c5a8859494ddcbd77862e07f9
 DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
 DIST sandbox-2.13.tar.xz 424968 BLAKE2B efcbf527853e8cfe8b3fec026041f55f51cba78029f92195ec76a45e84cb2b6cc129267c6e50608584607de72a86b2e7836e77f20677de9b94bb5c40999e4712 SHA512 46ad79335e51a1ec0aaa34ab5eeabe9d007818c518682409c5aaf97d49ec23021ece8fa53264ce5332cdd04ef6b3fd9beff0dc0a3cb5dfe2f9b6a6e359f8c1cf
 DIST sandbox-2.14.tar.xz 426992 BLAKE2B a30984f613b773cb5e53b2b0297ada32d11797699418aebf3014e11f3ec2b69a1c4b4e22ce96c28b1df022617cab6787cfe61f84b37ed61e966ac425eae1c7eb SHA512 b84584cffc54678646798bc58d8b60cdc10a0a58c9f1a49276dcac205a06dd7a2e664d2a9c40c78b48eae8ac36e3ac498ba35674f10e6e06c3c2bab777e05ced
 DIST sandbox-2.15.tar.xz 426948 BLAKE2B e40bb728192ef3793a9129bc88a63878516b0977a19effd5b02ded644ec6fe1627fab34786b22024957d96725fc5c53f488f7b09119be7b7ca91692dcee985dc SHA512 7249b594864267311ce8e2c04275df49c6d8e8e811dde5780f7f676cb43928728b9abed77beb8f5ee32061efcdb03753cce44d5bf1827bd519d6be8fa54912e6
 DIST sandbox-2.17.tar.xz 431700 BLAKE2B 461404f5b98ac83d9e5bc63fc7251cdfbb04a0ccedb340a7a5b8595b68ab34034a56c0a0cfa8478961c9282f6450de89ef5b512b13d427a7f63c17a4141cbcbf SHA512 b5d7a76d894471f6610b41aa05f007d257c69ae5c90f8db455d626e0d1209b9d276678c36e90d2e4214d15074512be182b4f5f905ed2b7e236ff714cbf51958f
 DIST sandbox-2.18.tar.xz 427760 BLAKE2B 26199ff8f919dcecdfdb74d508e0802e2e929a003ff1caddc54c1ea0f7887938c4f69065e585d61f7e96b29be26a34a1cdb62b397309e993511097ecaebe0620 SHA512 1775d4d6f80d414ab94eafae73966c12c4dd80857e21f0849703a3230ddb80501d8e574b14296e554932766cd71aa7b48a802fc388aaab43ba882ee7d005a60d
-EBUILD sandbox-2.12.ebuild 1923 BLAKE2B a07a06f851aa7a08a0641f25d6e7607e52d824ca812cc7f2d80f8cc32fc79de6f979f8a532ce8d8f74baa443536b2d418277f2bbd6658dff40dc2c89fba1ab53 SHA512 c3bcfcf999c8b570328d0e94fc88fc57764ac2f673691353e81adce18bc2b2b33e4255e5623495cce34ab9e61ead8d3cdcedfe75c09bd6181b7109a940e770f4
-EBUILD sandbox-2.13.ebuild 1920 BLAKE2B 8b2898f3f969838a674ed25680e81058c222444ad2f1643a5659bb83a9f69e05cb059ff99006fcd9107786f4576312c53839e32836428a87ce76adab28217338 SHA512 c07dd18328d3d899063e81fe4e75768bb9c4482c638c2a77748f5089d26327d694e0b718b2b581bd26a80e580e5c7458558bf401e1226d12b4c9061acc64ce3d
-EBUILD sandbox-2.14.ebuild 1932 BLAKE2B ccf40b2fc278a09bee5445b339456ef2532a8b95862d70843a2f543dc75363e0554eb99ee6e33eb77b39763de0cde70ac59ce81fd6d31b1208ef5cfa0269aa96 SHA512 afb04d1b36ccb5c542c9f6b5aa69f19a5eb4dcb4f045126f19352cde5c14e64f5efcfb14bc17e7caa3a59cb22be1ce9830440454ac16775fc6bd94515f658f1c
-EBUILD sandbox-2.15.ebuild 1932 BLAKE2B ccf40b2fc278a09bee5445b339456ef2532a8b95862d70843a2f543dc75363e0554eb99ee6e33eb77b39763de0cde70ac59ce81fd6d31b1208ef5cfa0269aa96 SHA512 afb04d1b36ccb5c542c9f6b5aa69f19a5eb4dcb4f045126f19352cde5c14e64f5efcfb14bc17e7caa3a59cb22be1ce9830440454ac16775fc6bd94515f658f1c
-EBUILD sandbox-2.17.ebuild 1838 BLAKE2B 4c01e2be81405877a9864614afb99cd88c4ff39445e965e863b846617b0ce7f7f248d1a5c7bdbb9acc9edac0d2bb2c9526cc6978049b1e45d1354478a7de1672 SHA512 9a52dc34a47ea94d28be05e20448543ee0aeb9188a4fcc83f1aec501ad5f44990a09eee0ea1bb69b3b7cc0051efc419595a9a36952167ddc9750ebba459908bf
-EBUILD sandbox-2.18.ebuild 1917 BLAKE2B be7f09adcd4d36a131f2908063c2389a89a7a5ff31ccba51df08e31a84feb14236f0827c1e9f016f051beafd5c044132a9f4a2fcd3d1ab708a2c020a8147aebe SHA512 0cb24bac889981cd9e537e120fc32f2300c3f52ead422348532ad7ba285abcd82fd69e5d69a91d0f3ffde0752b0de780737439e8c3166a095dd7d6ce47886e37
+EBUILD sandbox-2.12.ebuild 1920 BLAKE2B a534856a86127a1e0ecdce10336db7d075ace4e9d410a2e0aba81fec762526c49c77555775c2bb9f21e4694d36e4c51ed61a72134580036c82bc3eb20a9fe555 SHA512 abdc9fde72bf47ff334a450dca9cb2e30f212e8aeffbd96596435f81b309484dc6523a424dbcdbc51d56c88b6ae2a7cd4134d3f7ec703a1f848015603ae0b489
+EBUILD sandbox-2.13.ebuild 1918 BLAKE2B f0a1f4280dc4f22cfd38a3326bce6684badb115ba0bc814c82c29623179526866815ae4cec33170f146cf46dd2100bfa44651512c845f7474a3c12293d1d06bb SHA512 9c14d07eb4a7373f39f28be80be6fb6608f0591d7b75799fe2ed6be48a603b566b2d0da2f5241d8d688949113a02f90bd4e3a0ae8ba04e4d9329a59f247016c6
+EBUILD sandbox-2.14.ebuild 1928 BLAKE2B 5384f8b0922def8766a87dbf781b122406f89ba084c57ed293f4cb6b16bfd76eaf4ae96621b6775b0cb5a1d5116c46790fd3568c8373b79516df508063718508 SHA512 7ee664e9ffd295e878e3c62fb6003bee4ef09eb6f30308c30c541473188f77f0eab46bb508af0aaf8e82939d4aa15b9a042243e94f00b4bed450ddbbb9cf1f74
+EBUILD sandbox-2.15.ebuild 1928 BLAKE2B 5384f8b0922def8766a87dbf781b122406f89ba084c57ed293f4cb6b16bfd76eaf4ae96621b6775b0cb5a1d5116c46790fd3568c8373b79516df508063718508 SHA512 7ee664e9ffd295e878e3c62fb6003bee4ef09eb6f30308c30c541473188f77f0eab46bb508af0aaf8e82939d4aa15b9a042243e94f00b4bed450ddbbb9cf1f74
+EBUILD sandbox-2.17.ebuild 1834 BLAKE2B e486e836e8f9d90c55f4ab48d500d8f93d813cf7eb123ffaac678b112a16b13703d5ca92bf48f700942a26f7f983033d705fd42d996eab4d6cbb7e393ea6e112 SHA512 d9d772320c17221627e73c689a2f6acb6a064c7d8a5b69727755e7910753e22359284abc78d414a75539d4fd3d95b2d5db5b8ada642492d3abb3ab8a55528a4d
+EBUILD sandbox-2.18.ebuild 1913 BLAKE2B 034761e9b7d7a1c3d157ceaafc61ac8c669aaeaf8e9e27ba2cbb80b2ace2fd075df9ab2b4e686ae7f1db85416a2bf5c85a4900c73837cb4bfc3643ccc53c9a86 SHA512 7d6c15bfb6ac75c5c59c04dea7a622b95fbe41ffbbffc9a745a072e2ffd4a0b68cc93b535823d088f6421d3f58199b703de429ad432013bb3defc1b900e7c84e
 MISC metadata.xml 252 BLAKE2B d709f9b334b2810c5ffe7d73ef430f0f347f26f7649bca4bb8803c8e0be106534bcee6efae4f80b6fb1781b09284bb3dbc32d8dff4a3aa01a924fd3437b9da7c SHA512 de8b6a78dcc379d1d34960caecdab8da9fdb9a9f010ec8611cab79487b5f28f6ae80c8b0884731fa91c4ae98482a195faa8d1ec911b1d95fafdfe9cd622cc5d9
diff --git a/sys-apps/sandbox/files/musl.patch b/sys-apps/sandbox/files/musl.patch
deleted file mode 100644
index 419d067f2a29..000000000000
--- a/sys-apps/sandbox/files/musl.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/libsandbox/trace.c
-+++ b/libsandbox/trace.c
-@@ -10,7 +10,16 @@
- #include "sb_nr.h"
- 
- static long do_peekdata(long offset);
--static long _do_ptrace(enum __ptrace_request request, const char *srequest, void *addr, void *data);
-+/* Note on _do_ptrace argument types:
-+   glibc defines ptrace as:
-+     long ptrace(enum __ptrace_request request, pid_t pid, void *addr, void *data);
-+   musl defines ptrace as:
-+     long ptrace(int, ...);
-+
-+   Let's clobber to 'int' lowest common denominator.
-+ */
-+typedef int sb_ptrace_req_t;
-+static long _do_ptrace(sb_ptrace_req_t request, const char *srequest, void *addr, void *data);
- #define do_ptrace(request, addr, data) _do_ptrace(request, #request, addr, data)
- #define _trace_possible(data) true
- 
-@@ -44,7 +53,7 @@ static void trace_exit(int status)
- 	_exit(status);
- }
- 
--static long _do_ptrace(enum __ptrace_request request, const char *srequest, void *addr, void *data)
-+static long _do_ptrace(sb_ptrace_req_t request, const char *srequest, void *addr, void *data)
- {
- 	long ret;
-  try_again:
---- a/scripts/gen_symbol_header.awk
-+++ b/scripts/gen_symbol_header.awk
-@@ -117,6 +117,10 @@ END {
- 				gsub(/@|\./, "_", sym_real_name);
- 			}
- 
-+			# Avoid libc's symbol rename via #define. musl defines aliases as:
-+			# #define mkstemp64 mkstemp
-+			# #define mkstemps64 mkstemps
-+			printf("#undef %s\n", sym_index);
- 			printf("#define symname_%s \"%s\"\n", sym_real_name, sym_index);
- 
- 			# We handle non-versioned libc's by setting symver_*
diff --git a/sys-apps/sandbox/sandbox-2.12.ebuild b/sys-apps/sandbox/sandbox-2.12.ebuild
index aa634d6f7be0..2f8334010de0 100644
--- a/sys-apps/sandbox/sandbox-2.12.ebuild
+++ b/sys-apps/sandbox/sandbox-2.12.ebuild
@@ -11,7 +11,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 ~riscv ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-2.13.ebuild b/sys-apps/sandbox/sandbox-2.13.ebuild
index 8eec394c5b8d..73fbc876566d 100644
--- a/sys-apps/sandbox/sandbox-2.13.ebuild
+++ b/sys-apps/sandbox/sandbox-2.13.ebuild
@@ -11,7 +11,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 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-2.14.ebuild b/sys-apps/sandbox/sandbox-2.14.ebuild
index 412726e4b75e..fbb175e58321 100644
--- a/sys-apps/sandbox/sandbox-2.14.ebuild
+++ b/sys-apps/sandbox/sandbox-2.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ 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 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-2.15.ebuild b/sys-apps/sandbox/sandbox-2.15.ebuild
index 412726e4b75e..fbb175e58321 100644
--- a/sys-apps/sandbox/sandbox-2.15.ebuild
+++ b/sys-apps/sandbox/sandbox-2.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ 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 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-2.17.ebuild b/sys-apps/sandbox/sandbox-2.17.ebuild
index eb2a93af25c4..4374f137b714 100644
--- a/sys-apps/sandbox/sandbox-2.17.ebuild
+++ b/sys-apps/sandbox/sandbox-2.17.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sandbox/sandbox-2.18.ebuild b/sys-apps/sandbox/sandbox-2.18.ebuild
index 179163388c4e..b8d0959d8eae 100644
--- a/sys-apps/sandbox/sandbox-2.18.ebuild
+++ b/sys-apps/sandbox/sandbox-2.18.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
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~slyfox/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/sdparm/Manifest b/sys-apps/sdparm/Manifest
index 70bb90280601..b6bb1481d5de 100644
--- a/sys-apps/sdparm/Manifest
+++ b/sys-apps/sdparm/Manifest
@@ -1,3 +1,5 @@
 DIST sdparm-1.10.tgz 361464 BLAKE2B e2e7f09936fcdbdd50b7f397c62023592b494d5b1f8a998d32a4777134ec2edc39b11433ed00f5518ba6a8d04f7dee36e6a070221901b9c31a1a0d25da8439e5 SHA512 1cfa95ced443d190ee9e4a899c9cfc6b98367ba39a9cc201c0db2f8c92dd4e74368182be3b8bfe28e51761b1ededf914ee669ef8ff6023d1ec1f05d69889a35f
-EBUILD sdparm-1.10.ebuild 1012 BLAKE2B 5f9a9562df8a4637f5a705f08362f830b49d8798e3b8def56de34e5bf7aebb6c5c2bff205e8dc8ebbb9c7ce7e26f1bb8c9cf48a248c3eaca3fdc027cfa49e7b6 SHA512 6ed715f61b71770194e2bb6eb742c7a587104d9a5fbadb3f19197d233c36d067ad73227ef31a2144474c9f33736a5e9ef4a34535e6873fd232e117f308bffcdd
+DIST sdparm-1.11.tgz 473501 BLAKE2B 7c8b8a1c14b72de3c36cd701c6d870e0b671df2f17d17a63eb00cce41a80f3cbfbe9e3f2afca08f1a1a9be5a08fbb98a9ddb1ccdc117bceef508790407513754 SHA512 cb5d1dd351464fcc05005429bb8f452b05e6673b1dd8b699f762d005ab3e612b3b7d6ea400ffbd5e98e33e3e78da735d01705353b8a9b9567aac55a3f6b6d813
+EBUILD sdparm-1.10.ebuild 1009 BLAKE2B f7e351301f894a718fb12f1dff540760ca4f23236de6adc846dfadeefe3cd792b3bd105fe7bf3ca2b191704d3343d65764046cfb48a1405ddfac8ae332a818e1 SHA512 c1567b91c66294d1efe62d5eb7730de9e9e806508bfa750125d3955a651df66e0f8200f1f1b1a0cb8aba0f13868999005ce4a61e5002a1f493265fa0e385eb0b
+EBUILD sdparm-1.11.ebuild 1016 BLAKE2B d612e67d7de185fa06ef544ea7a89bb388a7a0413a4a62c1ffd031f9f32de8995ea2c4ef6002a9e5e0ecda03c4ffada92100f16a90d70d061da423e5ab585cf9 SHA512 0ff795ab9b9a9b127d81ea0b14dc56d243c18967b82df622e936b395ef0a10d75e5bfc141d4f3036848be059a607092638caf070193f12ad9a043ea44e50b0db
 MISC metadata.xml 372 BLAKE2B b025115c048016a23d179218c7e3579cdf87fa3e6445b5d69029df1d96a5f3df951bf087f0c51f65ee1a5df7050163ec99c554428cf883247e1f9ff5b8812d1a SHA512 ac15ece82367c7a5a7cee2248a418b2dc5912027f29805d2851643127ea90c7b4ff3d21c90afcf0255f6946b0290551884405bab7fe62d2d9ab0dcc10de4da5d
diff --git a/sys-apps/sdparm/sdparm-1.10.ebuild b/sys-apps/sdparm/sdparm-1.10.ebuild
index 08b6a01be91e..7f52118a1cd3 100644
--- a/sys-apps/sdparm/sdparm-1.10.ebuild
+++ b/sys-apps/sdparm/sdparm-1.10.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 # Older releases contain a conflicting sas_disk_blink
diff --git a/sys-apps/sdparm/sdparm-1.11.ebuild b/sys-apps/sdparm/sdparm-1.11.ebuild
new file mode 100644
index 000000000000..a2e3e27e0ba8
--- /dev/null
+++ b/sys-apps/sdparm/sdparm-1.11.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Utility to output and modify parameters on a SCSI device, like hdparm"
+HOMEPAGE="http://sg.danny.cz/sg/sdparm.html"
+SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+# Older releases contain a conflicting sas_disk_blink
+RDEPEND=">=sys-apps/sg3_utils-1.45"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog CREDITS README notes.txt )
+
+src_configure() {
+	# sdparm ships with a local copy of this lib, but will use the system copy if it
+	# detects it (see the README file).  Force the use of the system lib.  #479578
+	export ac_cv_lib_sgutils2_sg_ll_inquiry=yes
+	default
+}
+
+src_install() {
+	default
+
+	# These don't exist yet. Someone wanna copy hdparm's and make them work? :)
+	#newinitd ${FILESDIR}/sdparm-init-1 sdparm
+	#newconfd ${FILESDIR}/sdparm-conf.d-1 sdparm
+}
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index a28d4d97e2b1..4513aace142e 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -1,7 +1,7 @@
 DIST sed-4.5.tar.xz 1274252 BLAKE2B 08525659e0e01ec50e736c1665634f3816f57c48aeefa7f6bc7a152cd6c171bb4e96e5c215429fc5edbe6e1de6cc3efe4f2f3bf6865933a30dd1700e921d5b3f SHA512 f95fb27e03b2301dae63878413b4c48e40341cc676945a612e1d0bd911da3192858ae142791292a99fbdaacbc7dab2d6fccb50787c06846f99b0b3740b40c196
 DIST sed-4.7.tar.xz 1298316 BLAKE2B 752bc2e942b6f041710c6811518147c5fa4b143b33ae842ec1f142ec914bfaf4d7e8a94a2b1a5b345789944e5426f7946997f2ccbc43ee5034351a95ce3a677e SHA512 e0be5db4cdf8226b34aaa9071bc5ae0eafde1c52227cee3512eea7fe2520d6c5cebf15266aa5c4adffbb51bf125c140a15644e28d57759893c12823ea9bbf4fb
 DIST sed-4.8.tar.xz 1348048 BLAKE2B 62f6b6500cc9a20a35cafc2b09b12bb7da67fa0afb0b1b26153babc0023424b3126f44d29eba14c25fc4490996c90738b191c9440c66da6c120bbb9bc6f6df65 SHA512 7de25d9bc2981c63321c2223f3fbcab61d7b0df4fcf7d4394b72400b91993e1288d8bf53948ed5fffcf5a98c75265726a68ad4fb98e1d571bf768603a108c1c8
-EBUILD sed-4.5.ebuild 1112 BLAKE2B b70619cbb0db9a432ae6fe0d9da6b132e1a384dfe7fd0b8327dcb705dbf24cfc10902011f1eee24199c8b6b12bfa855517f221d179d5f13cd07a5d1aec052068 SHA512 7f367d0b5d72c085f30055cf0e8e751f61d07041177aacbb67b9fafa03cfca5feef3f73a430f40900ee885c8acecb57de9cf75f98e12a0e118d9e55cd5996c8e
-EBUILD sed-4.7.ebuild 1115 BLAKE2B a4cddae52878c83988d266ac704af593f3d6677ff0ce454af53c889d5a879162f6662f2e61bb4e9d01a69ca5a270ca95f71b008c1ecd98f11334570924f67430 SHA512 ca8cfc575dbfa75975fbc23422b5879fd7e755a064f2879ecc88d4a242e632fde109986e3c575e0c0009b00500c7db08756ae62a578eeefc946f4d6cbdc445c3
-EBUILD sed-4.8.ebuild 1124 BLAKE2B 90231eec93291dcc293916699cf92b1209f09277b674ead4ffffa58985ec946d7eb6a36f2be939f83a80fd15ad48bba22b950dad996b50ededbe4b259c268be0 SHA512 ae2955a2f9195f6fc7ae2c6f9e1af5c7bd55e9489fa7cfb5e4a942b9ac16af8a2901a3dc6788c5c7505743b748e45005c2dae485894adf3c36810491d1eb8259
+EBUILD sed-4.5.ebuild 1110 BLAKE2B 58cb71fd93602807aee32985e33faef7124dc20f3a17da6e3c4e29acea01c69aa93d7640a3ff374e8e239e19c73a2f00802229702a0517530eebd679f455c6d3 SHA512 7428c74c88f13b4fbb5456a08e14723eb22bdbc712e0d92af12d2bbadff55e4e00629acf2cb6deaef837a9878baa732f83580514cfaa65894f685634091e33a2
+EBUILD sed-4.7.ebuild 1111 BLAKE2B 369db9f158dc01fe1e6405b174ceed1ca8adb068a42002bdc84bfe1db64cc00a7758747b0ede85a67cd44e169745e542667d7029f459deb2ef084c896da760d2 SHA512 45f5f6f4d095a007b4c5685f6af3659bd0194f1ecc595059c33866cc07f9dfbd5ed7fdb1b1928e01bba217b0898eb1f1935b0121e0f25467d386c406bcce4717
+EBUILD sed-4.8.ebuild 1129 BLAKE2B 1c73799cfc28b920f4421fcb3933744ec07a8663e1f65c6b279affa8e7832a9db0040d7b08f419d78f7f228f4ce2a542b0b4b41a6f69be48538baed21d6a5ea2 SHA512 4aa30771fd81ad28a55647e2103d0894be71b3e6953fc629fc7049c3f5aa2d25431fbab5da3455aaa822ea6201b9a83519846f49d36f6711cf5833251124dda6
 MISC metadata.xml 323 BLAKE2B 746a8514f64aa6bc67931a9a1c61ff47dd0ff984dee09d04afd44557986ef1fe87ebdbd844fb68bdbe8158ec16b6d776b6f9956f2b5611495af5aa3d56c8bff5 SHA512 ec3a11f7aafded3d4b5e12680358f39dbeb166f96af51eae8dafb21b186024ddb9b5b9ba36bde626be01b1938fd6f4bbcb58f0f8bad2208a84d44eaadc95652e
diff --git a/sys-apps/sed/sed-4.5.ebuild b/sys-apps/sed/sed-4.5.ebuild
index 2e5c67c6d5f2..773b7b0567cb 100644
--- a/sys-apps/sed/sed-4.5.ebuild
+++ b/sys-apps/sed/sed-4.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="acl nls selinux static"
 
 RDEPEND="
diff --git a/sys-apps/sed/sed-4.7.ebuild b/sys-apps/sed/sed-4.7.ebuild
index 60bb169a708f..28c5f7cfc63d 100644
--- a/sys-apps/sed/sed-4.7.ebuild
+++ b/sys-apps/sed/sed-4.7.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="acl nls selinux static"
 
 RDEPEND="
diff --git a/sys-apps/sed/sed-4.8.ebuild b/sys-apps/sed/sed-4.8.ebuild
index 3cf0562a1777..66b31632c461 100644
--- a/sys-apps/sed/sed-4.8.ebuild
+++ b/sys-apps/sed/sed-4.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="acl nls selinux static"
 
 RDEPEND="
@@ -22,13 +22,13 @@ RDEPEND="
 	)
 "
 DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
 	static? (
 		acl? ( virtual/acl[static-libs(+)] )
 		nls? ( virtual/libintl[static-libs(+)] )
 		selinux? ( sys-libs/libselinux[static-libs(+)] )
 	)
 "
+BDEPEND="nls? ( sys-devel/gettext )"
 
 src_configure() {
 	local myconf=()
diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest
index 2ea9398b0b7b..e406f4a6ea68 100644
--- a/sys-apps/setserial/Manifest
+++ b/sys-apps/setserial/Manifest
@@ -6,5 +6,5 @@ AUX setserial-2.17-headers.patch 236 BLAKE2B 06ba0f4ad6ecc3788115b02fa4f5762b272
 AUX setserial-2.17-manpage-updates.patch 1015 BLAKE2B aa164a5d52aa2a479f1815c2adcb7adc8e04f6d20594395cc01e821364d04aeb02608644c88e511453599af451d00dda8c8ab54bdd1710030cbdc7833c32286f SHA512 6041894014b3d139a8c2d59460003310c17aee407dab2fa3713f98ea2c29fd347906f68f3d988f052cbee45de43fa00afadc4359b562bfd34fd4931b48505cf8
 AUX setserial-2.17-spelling.patch 257 BLAKE2B 522183e8792b4f9bf814563d847bb06b954e75e6443d987fb6ceed534288734597385589a9c9aea9678a439d952742ccb2856e31c50e4798c5ead6bd554f237f SHA512 7511c46d4676cdd34d8abb0c124ca514d9d970078ea1cd03396b7e9699ec3fc2c0ff3ff04f01a50dd3fe28244ce75078566f8fe21aca89d063b939f1c2cb354c
 DIST setserial-2.17.tar.gz 52437 BLAKE2B 0f01611db185f2d55333ff3b4d29ca19e53bef414ed3b5c735f21a724670c6cb8d00e817f5afcf7d1924faae0ad2c2a20b8d0d844468f898dbc6c7800eba42fe SHA512 27b4918d303302dfdbca2f8c4fe500685068cfbf3de70b4907bac5a9cdb2e643656c1d821e714c08723abcfbaf99129866002117450bef731a0a09cd38138645
-EBUILD setserial-2.17-r5.ebuild 953 BLAKE2B af2fbaa08c78acbda4561cd1bd1cfb1e6542fe6faf9a32c0018ef21bf27addfafe278be89c85cd47a7acb42242a3ef177ded3fe16f9dde1b090145a6b69d1ab9 SHA512 58738fc2ec2725f32469cb6d0d28bc6e57ee72146320d82c9ae37ed3e87a8795f3916017ce4e259a213f77b2ae32fcb9543ec4d563eb2203ad6456af4e95a13e
+EBUILD setserial-2.17-r5.ebuild 951 BLAKE2B ad95335e576ff19baae9bf9d98408226aa294ec9c6193027f7e64def5008507e591cf0ef2c8643619281b5b4b5d63e2c9b43d45b79cdbaa0d10348366eed0a2c SHA512 e8e5c79b2d432d37b4876214af04b75eaa21f7b7d93517851f08040abaa57a81d1fe2b8e1ef7dcdd23f6f1faa22c4e17def718a0cd6e3dc024e5f356e8268dee
 MISC metadata.xml 329 BLAKE2B bb11d2dbf0f468577593ce76b97e058f369f9ccc8f7442df8673ff0505b67b981c671b647872e05cbc858696759e0c3e01e56db9eafe2ce91099cedc4240eaa1 SHA512 7eb699d04a9f2d0c39997818037f6ba309499afd0b1635d3b2c28389331f19753928d78e69e4cad0b98de11335c350f092153357360bbc8b00d941400d1e2981
diff --git a/sys-apps/setserial/setserial-2.17-r5.ebuild b/sys-apps/setserial/setserial-2.17-r5.ebuild
index a63aeddef0ff..16b96736d6cf 100644
--- a/sys-apps/setserial/setserial-2.17-r5.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-spelling.patch
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 0586f6162673..20757ac0eeeb 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -2,6 +2,8 @@ AUX sg3_utils-1.26-stdint.patch 678 BLAKE2B 52a78fcc176492e6ca5a7a4465e76a3b6642
 AUX sg3_utils-1.42-sysmacros.patch 925 BLAKE2B 0a066dccd2e69c0a9a5e6ed20d87700e85061146956601777c754e9411b70de01456bb894091fb0ea0228eb060172601492ea678de158c4733f6ec423f176156 SHA512 f90ecb687f851a45684ad0b1f13269c4d674e849f6782b4f328d7f43f04209ee8442a7b428c27a57610f0ffc4c04343f357e700b22a6817835a3da09300a4f89
 DIST sg3_utils-1.42.tgz 1219231 BLAKE2B dd9ea2c324cb6f4c0ce770c90b7980da5e998bddc3a2be43a0aa9bea88dfe34291d0f58b393b2a5ac680c05dc673802ec9fae1ead37107bc49fa33bc7c4df503 SHA512 d16b65e36b2bccb4fc4c189f97e71fa38e6619f37d668a4ddd74a52c715fa62325288d9737812ed19c80547059dbd27be5a20565e27e1aabb571e8f5f8ac53ad
 DIST sg3_utils-1.44.tar.xz 922152 BLAKE2B 8596ef78fbb7ade5a969f485b0f4ff63863dc8a5ff58fe630cffa91900ba9946b47ddf857346aa3904da8502afa4928f54baf99428344d2e561a90e52c8533ed SHA512 4f4d5536ebed62f2c81c55741043d9ac3f4610a4dd6ef2e3125f041afd57aae03a32c2affe84a960c9f61fb6f84784bc901c756a8c36c1bc97082fa61e73ae8d
-EBUILD sg3_utils-1.42.ebuild 1036 BLAKE2B 572fcc6dc263ae8190466d0470357b039e25d48c26b52163b712a15b918c80c43f113e5ab8e7ba9ccf768828e9bde1396d76a69b99cd0fc8cd577e977e17dbf3 SHA512 a86e9f757f11f40fc938f4dec079ce47956cbf9077191575d30f9ea3e2f77a745014ec0af10204c7fd0b6c50f58d492d64189e26ef127ad519b6f873cad41d44
-EBUILD sg3_utils-1.44.ebuild 1059 BLAKE2B 3142f90ed68830e64aa4c75c1b57afa1fdf360c4bb7b0053fb0df8ebf4806d6e1000df683075f49f9615166a8aba71a856b04964383ef0935f3423527feee8aa SHA512 1ee8606d54fe680c151bd6bf8299854caee899215aad564951be3092544b196b40ac814c4a6a597b041a0d9f585b36c8c9ea039bcc98979f66574470020f9823
+DIST sg3_utils-1.45.tar.xz 989864 BLAKE2B 2d0a9e0edf514c8c7a566798f8087fc27d15d31cc8df39073dd97cff569da396b24236e0c231781625379b2ecefe7c99716d5d9c7dc104b15e150cb4e3c43e75 SHA512 fa25dedc447154d33937248a856af9a7ef380dda282a681d465a57d7dfc24b6c0409fa06aabf8cc28ba191e91db80fed0757b45212eddf713855574b48a97868
+EBUILD sg3_utils-1.42.ebuild 1033 BLAKE2B 244e7b5a07f24593fcfef020ffad820926be28547fdc5d0067b65add39cc892db96e4c8d3ef473cccf8a2a031d9e2f88a9a44b49aefa879f5c36985a2e76f6ed SHA512 e43306e506e102d42ba7d675a537667e10b90d1399671226f7ddc905c02ec571022c0a4956940a246f330a3f8d4b19b1d840071954bb775b67b8072376e8bece
+EBUILD sg3_utils-1.44.ebuild 1045 BLAKE2B ac44106a8406085b68c2a4cb972a8a65f9d70fe47a8dc5d52377ecf291f877ab3fa3233eed1cb8ad5591bd34479f954e659e5926604056aaded8329e85a9f464 SHA512 a9eb796dc1063ee9c883b847a198f26cda04c4bd2602a96d1b09b8e47b5f6608b257bd3fbeb81012920f234bcd1d1525f5e4c48b24e6c5deb7069135656ce0dc
+EBUILD sg3_utils-1.45-r1.ebuild 1067 BLAKE2B 22eefc8e13dca6c86abdc10c160b833c16c53cbd423e95597becd131a05aa24897d1c1185482a3c4cf47b96f707d3ca412c10df4750647b8230f380eb3d852c5 SHA512 1c7391ab95673a97bf8c24f13dfe27de724fbecb4208cc5c9bd6121114811a35d51a19124d78dfcaab11cb30a3d485de9c6d31f85a55fe05997b2d567a39f916
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
index 722e2ce93046..6895cd743d83 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.42.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/sys-apps/sg3_utils/sg3_utils-1.44.ebuild b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
index 9967e7f36175..dcf3452fa05f 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.44.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="static-libs"
 
 DEPEND="sys-devel/libtool"
diff --git a/sys-apps/sg3_utils/sg3_utils-1.45-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.45-r1.ebuild
new file mode 100644
index 000000000000..f5f7118c4eff
--- /dev/null
+++ b/sys-apps/sg3_utils/sg3_utils-1.45-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib
+
+DESCRIPTION="Apps for querying the sg SCSI interface"
+HOMEPAGE="http://sg.danny.cz/sg/"
+#SRC_URI="https://github.com/hreinecke/sg3_utils/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="http://sg.danny.cz/sg/p/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="sys-devel/libtool"
+RDEPEND="!sys-apps/rescan-scsi-bus"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.26-stdint.patch #580236
+)
+
+src_configure() {
+	econf $(use_enable static-libs static)
+}
+
+src_install() {
+	default
+	dodoc COVERAGE doc/README examples/*.txt
+	newdoc scripts/README README.scripts
+
+	find "${ED}" -type f -name "*.la" -delete || die
+
+	# Better fix for bug 231089; some packages look for sgutils2
+	local path lib
+	path="/usr/$(get_libdir)"
+	for lib in "${ED}/"${path}/libsgutils2{,-${PV}}.*; do
+		lib=${lib##*/}
+		dosym "${lib}" "${path}/${lib/libsgutils2/libsgutils}"
+	done
+}
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index e323ca61137e..afa159b50d92 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -1,4 +1,5 @@
 AUX default/useradd 96 BLAKE2B 64b694bdff7f901e19ac21695e3b2eebeb5a03683be5a01e33f96a4e7f94d1059a3ea3703fd4f7167778c8aebb0605640edfd60c46bc48242fae8b37f7182303 SHA512 87b01ac88c2065392fa988871489d8403ef93341b4cfbadb4504f39a2a3396ddef756efc6378868d00627a58a1feb9612eb52a8135558a211a09c6a9ccf3404f
+AUX pam.d-include/chpasswd 42 BLAKE2B e9cb4b84dfba45e258970c4adf923e3384ae0b04b4fedf97cce8ded703e50291b7d57038dbd2f56f23714884a4b41ab4b66b866930fa4ddd8c38840163d12403 SHA512 9db15a228f3c360fb5f84f1203249eaebcc5c80bbfe8b24914b8344ca8303450aa6c46d5eebc6460bb4084562f8eb1c95ab3a17799634ce6a2c4b96b31f4f24c
 AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d35c9908ca400bd57dcb234fb7691aa2a5a7646a379553aa6dee0dd96ee569aa492d7f20774e991a90f8602 SHA512 31611a08d97cd2c129f18d451a555ff6c781f91603c77fc0c66ff406b5fa4a97db19ae4ce104816a6324529d10e131de0d5329646bdab2abc8dc3ee5b82b057f
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
 AUX pam.d-include/shadow-r1 116 BLAKE2B bc7baa8e224cb90b6ef79762941b3b7505fcf4b8ed8c5da06a33a8a7fefa91098e4ac0c0f915eeca4a19714d60a2bf43e3922805347e3dfe0ccc80f210bf88e4 SHA512 ddecc5cc8f667f9931ddf5d98d89a986712c5a6e44826add1e1d9ead37064758a3879f6afd1fc45c89c216956593852051e2ef3abc52e2ab58a0e191adfe75d1
@@ -9,8 +10,8 @@ DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf79297
 DIST shadow-4.7.tar.gz 3833335 BLAKE2B 8e030d3dcc5eb76332ff76aad8e9141edb4ae660f56dd3b420968c538d3022a72ab620710b9274b9afb44f497399f5c4ceef339b7d2c52106b9b8368ff127654 SHA512 9b134dc90d8fb39bc72db69ddb78cef6263921c8a2f00abc00ac796bf468ac18393399920eec14bd2a78b814a06fc18eb6f5685ede13fe222fc66b2e411cbb01
 DIST shadow-4.8.1.tar.xz 1611196 BLAKE2B 952707cdd55dc6c00dcbc60dbc3bf84ac618dbe916b36d993802b3ce42594de332a9bc22933a28881af3d317a340eab017ada55511b4e4fbc3ca6b422c4bc254 SHA512 780a983483d847ed3c91c82064a0fa902b6f4185225978241bc3bc03fcc3aa143975b46aee43151c6ba43efcfdb1819516b76ba7ad3d1d3c34fcc38ea42e917b
 DIST shadow-4.8.tar.xz 1609060 BLAKE2B 9d0b515e40f45c0baf420ef7ffaf5b6dd7989b26c93fc6dd610876263ac22e61fbc2821649d347c28055ae84f64cd5ab5c2435450c55339c80b4ae5062ccc44f SHA512 1c607aec541400fc179d6cbbac7511289c618ab2ce6ee9d7c18a8bfda00421c62d4b9e58aff52b5f82d485468e7db955c186ea0faad9a08003ffc01bdf2ccece
-EBUILD shadow-4.6.ebuild 5364 BLAKE2B 2e2ae645c85179df154cd6bb1173b0d22292be6294c24c6b83b42f7d3bbe51087ecda6f5c8927793c771a738f0128a075ef57079ff57c248248f49b5a9771a9c SHA512 8ac17706541cdb392ba2b9c458514133a908a1ad03c1d79283f794f3b3d8f3ed76b325f2ea60730280832db40871354806b7ea86ed2541f1783188afc5252384
-EBUILD shadow-4.7-r2.ebuild 5797 BLAKE2B 50ae8f70ef78adeadb61095580bb02f9ffa10eac29a4793918d4248e2e891790364f761808d1f1ac26b1fca5dbadaf6db3f16272f349be6f7f3885a12a568c78 SHA512 0533a37fe59edeee1ea32f3fe86b3f277c7cd40964fdf2f3e17a9e8b5775748d9ffb039beb309e2586e35acea78c8d200b2359246c4bf5c1a1573d2b5ae1b9d0
-EBUILD shadow-4.8-r3.ebuild 5765 BLAKE2B e1795aac463f30754906ea5cb872585bea5ac7ecf6265a7bb536ac1aa06a5ccb8f590e899a44f7a37c088c6c9241cabe1e470910bc63c3e1ee5d4bb6f12eec6c SHA512 59be0960eb5981a63d004475380b5c723d76ac6568589f5482f7e5b7d562c9fcf321e2bbf475b7d08209cde9bfc0509069ed4aa30844ea000f2e16f309616081
-EBUILD shadow-4.8.1-r1.ebuild 5742 BLAKE2B 3290d5e105fa4ae53f992ced7d24b8cd5110c0b66afc2aade8155148b10b9408badb5b71b7287b783733d204b1d4594a9e3bc6e6014f07f4600373740f18c498 SHA512 329abe6baaf7a6dbb56059c5d60f5e68aa2ad280e46aba08c75086a74c744a6582fd49bc84b065c4f0da9ef188320ccae5a18e561b75d703d3f38c78094a04d0
+EBUILD shadow-4.6.ebuild 5362 BLAKE2B 02e544a16044414f516aa98aefaae42d0dc86ce0d38501b1fb96251a3a147663efa0dbf22531a29204e7525614c273e78c5b4f0b98ca1d9414d8ee125792510a SHA512 ca07031d750b4be585d4ad3b270655e367529b1484461a9bc885943759ddb74fec7e0edaa839fa0e89c80eee345f00310c1a2bce2efd4879db5af9512860ee19
+EBUILD shadow-4.7-r2.ebuild 5865 BLAKE2B 904ce926d616c2d99f5c46cd76d467f379d2f03abaa2d69146ecfec1d1c8924ffca62b4f2384c52bed56e567b989f1ffda69015a8e3d66e8330eb84668af9d6d SHA512 11d686c602af33ccd92636d0d62fb5e314234192f7258c657c5a32789b99526f09f24268c7db1155128ba6e27c5b3f7b91f0ef9c7fb16088bfba74b3bafac3ae
+EBUILD shadow-4.8-r4.ebuild 5919 BLAKE2B 5441c3c87cad36d5d699dc9550773a0dbada6f7d9611e5f5c4257dbe7ce4bbdc9897462f83fa716697e29d9b41b4a0a9013150e1345c8a977df54513d0c6d3a6 SHA512 60213de331d25a1e3460c2f3534185949be43c88dacfce11c3e90f7e56c54eae42f63ddbea24ceef155511593edc1f6e6abd719701ac675b4482c7244817240d
+EBUILD shadow-4.8.1-r2.ebuild 5905 BLAKE2B cea5476aaf7a100ca61170bcae7c051c6b53ef4ff0e076ade433a391710e4724575c28ca9984fa6e9c81511c36e62894cf42de27c3570567d518b137e780eb07 SHA512 91dbacdb37c7ab338a3e6d570cf0c19b2e04e80a89afc9f0773141cabdacc6cad9d4c11432b7d72ef0c41efd4a216a6026c5dd1b4b5baaf30d236a3509879c7e
 MISC metadata.xml 562 BLAKE2B 7ea54e53f53a91898e5cb5975e9f1aa37639b0ca887213e389c85e0b46cc2dcdf6a1a80795ecd3a74ecc1c4b76d600af563b8d26ce618de1030914ae04f4b152 SHA512 35e207e3d5e3de3f93c8c4a580ec7109bbb778d2d424eef76c5c6b25f8b47d68480a55e9d2b15f9be4f27a273443d6220752337eb538dc05517c0c5a004722e7
diff --git a/sys-apps/shadow/files/pam.d-include/chpasswd b/sys-apps/shadow/files/pam.d-include/chpasswd
new file mode 100644
index 000000000000..1043726b0e50
--- /dev/null
+++ b/sys-apps/shadow/files/pam.d-include/chpasswd
@@ -0,0 +1,3 @@
+#%PAM-1.0
+
+password   include	system-auth
diff --git a/sys-apps/shadow/shadow-4.6.ebuild b/sys-apps/shadow/shadow-4.6.ebuild
index d62faed1a9f4..f8f0277dc131 100644
--- a/sys-apps/shadow/shadow-4.6.ebuild
+++ b/sys-apps/shadow/shadow-4.6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="acl audit +cracklib nls pam selinux skey split-usr xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-apps/shadow/shadow-4.7-r2.ebuild b/sys-apps/shadow/shadow-4.7-r2.ebuild
index 3c710558632d..f30ee5ed23c7 100644
--- a/sys-apps/shadow/shadow-4.7-r2.ebuild
+++ b/sys-apps/shadow/shadow-4.7-r2.ebuild
@@ -11,12 +11,16 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="acl audit +cracklib nls pam selinux skey split-usr +su xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
 
-DEPEND="
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+COMMON_DEPEND="
 	acl? ( sys-apps/acl:0= )
 	audit? ( >=sys-process/audit-2.6:0= )
 	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
@@ -29,12 +33,10 @@ DEPEND="
 	)
 	xattr? ( sys-apps/attr:0= )
 "
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.14
 "
-RDEPEND="
-	${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	pam? ( >=sys-auth/pambase-20150213 )
 	su? ( !sys-apps/util-linux[su(-)] )
 "
diff --git a/sys-apps/shadow/shadow-4.8-r3.ebuild b/sys-apps/shadow/shadow-4.8-r4.ebuild
index 37376095e4ca..9fe70f6c898a 100644
--- a/sys-apps/shadow/shadow-4.8-r3.ebuild
+++ b/sys-apps/shadow/shadow-4.8-r4.ebuild
@@ -11,12 +11,16 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="acl audit bcrypt +cracklib nls pam selinux skey split-usr +su xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
 
-DEPEND="
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+COMMON_DEPEND="
 	acl? ( sys-apps/acl:0= )
 	audit? ( >=sys-process/audit-2.6:0= )
 	cracklib? ( >=sys-libs/cracklib-2.7-r3:0= )
@@ -29,12 +33,10 @@ DEPEND="
 	)
 	xattr? ( sys-apps/attr:0= )
 "
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.14
 "
-RDEPEND="
-	${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	pam? ( >=sys-auth/pambase-20150213 )
 	su? ( !sys-apps/util-linux[su(-)] )
 "
@@ -150,6 +152,10 @@ src_install() {
 			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
 		done
 
+		for x in chpasswd newusers ; do
+			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
+		done
+
 		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
 
 		# comment out login.defs options that pam hates
diff --git a/sys-apps/shadow/shadow-4.8.1-r1.ebuild b/sys-apps/shadow/shadow-4.8.1-r2.ebuild
index 58cfc9e73031..956699aaf996 100644
--- a/sys-apps/shadow/shadow-4.8.1-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.8.1-r2.ebuild
@@ -11,12 +11,16 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/${PV}/${P}.tar
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="acl audit bcrypt +cracklib nls pam selinux skey split-usr +su xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
 
-DEPEND="
+BDEPEND="
+	app-arch/xz-utils
+	sys-devel/gettext
+"
+COMMON_DEPEND="
 	virtual/libcrypt:=
 	acl? ( sys-apps/acl:0= )
 	audit? ( >=sys-process/audit-2.6:0= )
@@ -30,12 +34,10 @@ DEPEND="
 	)
 	xattr? ( sys-apps/attr:0= )
 "
-BDEPEND="
-	app-arch/xz-utils
-	sys-devel/gettext
+DEPEND="${COMMON_DEPEND}
+	>=sys-kernel/linux-headers-4.14
 "
-RDEPEND="
-	${DEPEND}
+RDEPEND="${COMMON_DEPEND}
 	pam? ( >=sys-auth/pambase-20150213 )
 	su? ( !sys-apps/util-linux[su(-)] )
 "
@@ -150,6 +152,10 @@ src_install() {
 			newpamd "${FILESDIR}"/pam.d-include/passwd ${x}
 		done
 
+		for x in chpasswd newusers ; do
+			newpamd "${FILESDIR}"/pam.d-include/chpasswd ${x}
+		done
+
 		newpamd "${FILESDIR}"/pam.d-include/shadow-r1 groupmems
 
 		# comment out login.defs options that pam hates
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 108a3fe4eae1..ba3a75311c3e 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -3,7 +3,7 @@ AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6c
 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8
 DIST smartmontools-7.0.tar.gz 944925 BLAKE2B 41b3894efa05471bf358fca4ba87a765e3a54df68c9a617804a9e0853752c57b68fdbaa9d55fa1462a8fa7de1d6cb5630c66929dfe521be38b180944cb80acc9 SHA512 96e18a201182579f699d541539ce393e7bc2191e027cfdf7f87455a63da3a14451574f8fe391232047ac941ace453a017193d0a4987a4edb8f7ed9d5007f0512
 DIST smartmontools-7.1.tar.gz 971468 BLAKE2B de3e1b10997903cb9bf6107f1bd1be9587b66af08a94e368dc9ed3aa6d69ba93d6b41d1ba60076275603702d9d0b47b26e376d3c9f020eb18fde5af4b686485b SHA512 440b2a957da10d240a8ef0008bd3358b83adb9eaca0f8d3e049b25d56a139c61dcd0bb4b27898faef6f189a27e159bdca3331e52e445c0eebf35e5d930f9e295
-EBUILD smartmontools-7.0-r1.ebuild 4099 BLAKE2B df81860dcba670d510c957cc7da2ac55314a6bc382f0c31e1bf451a4c361d40ef66c86d7cc00c7d7ac00b847b5e4fe7a2c043b2e530462915ade880fae4a5ee9 SHA512 1dbb41d89bd68b7d1b17b5367e18c57abd48b4ad18f400535be2acbadd8ac2b5744007378f207ece05d14477ad0615dec8299b06c762740abe4e7fbf5e9622ba
+EBUILD smartmontools-7.0-r1.ebuild 4100 BLAKE2B acc122f3207d5262ea8cda4d2823d0743ad9dd6db5fec4650740aa671130a7d5acbd2be646c6b477f5e55d0d1925a7ce8d155988ee6842d3b89aadd88e5b3213 SHA512 673dc5ec30fce490f41edecb45c9c5ff84d6c7e32005d420c08aa1dfcf420174ccb0859d10483db2ddc6be1089228030d53344cc66e5a0dee8337805f3301608
 EBUILD smartmontools-7.1.ebuild 4107 BLAKE2B b5696f602da270a9d1fc77799fd3c5a9a7d6ee3fb5c9d4822baaf296a335f512c0efa51f803fb54fcdb101d21c518f0512519f36eafbc70f1a44fa2e3d4b00e8 SHA512 27b960e7048db48df78c91700393408ff90a1d4f548aeb0c840a4d8197e272e18b45aa6ec41408620f3a2b4299936ef4f6e1f99b66b36ab45b7f466a9ac1d882
 EBUILD smartmontools-9999.ebuild 4107 BLAKE2B b5696f602da270a9d1fc77799fd3c5a9a7d6ee3fb5c9d4822baaf296a335f512c0efa51f803fb54fcdb101d21c518f0512519f36eafbc70f1a44fa2e3d4b00e8 SHA512 27b960e7048db48df78c91700393408ff90a1d4f548aeb0c840a4d8197e272e18b45aa6ec41408620f3a2b4299936ef4f6e1f99b66b36ab45b7f466a9ac1d882
 MISC metadata.xml 628 BLAKE2B 1998d18fb38795b682ec935d8e994a93176e6bff49db77adcfc6a168e297515b7ac6a121b1acbb0743182d7dd4696b898cf6a8eeda0a290e0c75598036ef4951 SHA512 86ac56fbb2b15c7c4fa4e80607b5a3ceefd7300ade482d6d6adaf8e22c7a95797e10b1a03aacb34cf07c02e7d0fbd8437954d1c94c395afedc1c61c24202e3d6
diff --git a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
index c94cb434c53c..d7f4252e1499 100644
--- a/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.0-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit subversion
 else
 	SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 fi
 
 DESCRIPTION="Tools to monitor storage systems to provide advanced warning of disk degradation"
diff --git a/sys-apps/sparc-utils/Manifest b/sys-apps/sparc-utils/Manifest
index 21f4655f183a..ee60518746ce 100644
--- a/sys-apps/sparc-utils/Manifest
+++ b/sys-apps/sparc-utils/Manifest
@@ -1,5 +1,6 @@
+AUX elftoaout-2.3-64bit_fixes-1.patch 6806 BLAKE2B 49b9ce39d215496a858785c77c951d1ba2a920ff311e89c47993ee760a697781f925fe23d194a2e8fcac785c8f2c104fe3d186543bb2a8e094508cccebe9c2b1 SHA512 9d0363ec85c337de6e381d15b2bec68fb363b289b5b9e424c3963def31f445a1bcd1834bcae66b6ac3083dc6235ab0e130d0655ef427820305e546f11dd297c0
 AUX sparc-utils-1.9-no-implicit.patch 584 BLAKE2B 153440b685bfd044c24f3da85598895724873b536628ec205c24028baf908e84008c0e629381a6f703f42baa7d6bef3534e77bb03af6dd3b23d9a9017a43ebda SHA512 302c29f1a33ea6b92184bd272fc974b1886168e7aa3d0f0cdcc117024475cf6b27eed9336f8b7edd84b40862144f58c3337fcc47cf3c1a744e5f4a71f8ee4f7f
 DIST sparc-utils_1.9-4.diff.gz 9083 BLAKE2B e4b16c26fe67be73d0fd3ad8e1e80b19356d5961abac344f28650e4d355cac9c557999591947391c41be88d819ebb703ae1ff177b4fbe0d9bea7a411a791821f SHA512 ef79dc480471117da3a778450b3a122eaf64fdee69d35ff30b301f2360ff5d76c6343ce37c25cc188891c1619809daa0595d01c6e85781ddd7ddf1713c8378b7
 DIST sparc-utils_1.9.orig.tar.gz 110080 BLAKE2B 52f47c130fb8e24b0340589c846292fb2e4e9b211a10cddf52a7a63edd70673e2b7d05c2415e558c5f2d1235f33f4ae65b777d3f8b2cf2c50a601d1f0a7a941a SHA512 bde05f1a98211aaf502be6dfd757ddfb21c136cedbb46ca84a4539706c71901815c9d8bedfebc3800c7340634b32276197c75f92f9cc829e4f50c37d203e9358
-EBUILD sparc-utils-1.9-r5.ebuild 1546 BLAKE2B 5123d5ebf807f9d52f452615f73067592af46a903584a1abd505baa085f29d010e2773c64fdc85c0a5b884742b78b1ccc2d867accf379536092db0d62a60d805 SHA512 90c68e797ce41ec6816b3c0c5e578b7ade6b8799424a3310bee599f6bd4cfab423a0ba70cce51c6eb95b72c0749f2627aff862cdc7cdf6f09d64ad670f8d3cbd
+EBUILD sparc-utils-1.9-r6.ebuild 1595 BLAKE2B 9a6a0436f6da5368a2167aef10251095c9e063c9ec1971c483c1980960710e7423385765a8dc33586894be7c57c7beadbeacd2e9b6c7047eea60af6a55b50558 SHA512 78b0d1d52e616eaa55f16de32b2854c011b07bd3239a1f89091d4084a8340d23ecac55a941a9d81d943cc7ac97b8d508bd422ffa7f9405bd247aab613d613ae5
 MISC metadata.xml 416 BLAKE2B 3d0e052bc957750b869856cabb6e94d86dc1655e63da29ac3753c16d8437e7a9a97c89e225f03b6267bb32bdbe6215c25717f088684e493b5785a6d334854dd1 SHA512 c057eea9ea65b87cb366e802dd8962901024335a85b3ec53caa6c342c9e1a23e656dcadc2a70692e5e7ab55a0ac82637ef052699844f50061461a645613b688d
diff --git a/sys-apps/sparc-utils/files/elftoaout-2.3-64bit_fixes-1.patch b/sys-apps/sparc-utils/files/elftoaout-2.3-64bit_fixes-1.patch
new file mode 100644
index 000000000000..2be0e67184f6
--- /dev/null
+++ b/sys-apps/sparc-utils/files/elftoaout-2.3-64bit_fixes-1.patch
@@ -0,0 +1,261 @@
+Submitted By: Jim Gifford (patches at jg555 dot com)
+Date: 2006-01-03
+Initial Package Version: 2.3
+Origin: Dave Miller
+Upstream Status: Unknown
+Description: Fixes 64 Bit Issues with Elftoaout
+
+	https://marc.info/?l=linux-sparc&m=113617505627794&w=2
+ 
+diff -Naur elftoaout-2.3/elftoaout.c elftoaout-2.3/elftoaout.c
+--- a/elftoaout-2.3/elftoaout.c	2000-06-03 20:20:12.000000000 +0000
++++ b/elftoaout-2.3/elftoaout.c	2006-01-03 22:33:28.000000000 +0000
+@@ -20,16 +20,36 @@
+  */
+ #include <stdio.h>
+ #include <stdlib.h>
+-#ifdef linux
+ #include <linux/elf.h>
+-#define ELFDATA2MSB   2
+-#else
+-#include <sys/elf.h>
+-#endif
+-
+-#define swab16(x)  (((x)<<8&0xFF00)|((x)>>8&0x00FF))
+-#define swab32(x)  (((x)<<24&0xFF000000)|((x)<<8&0x00FF0000)|((x)>>24&0x000000FF)|((x)>>8&0x0000FF00))
+-#define swab64(x)  ((((unsigned long long)(swab32((unsigned int)x))) << 32) | (swab32(((unsigned long long)x)>>32)))
++#include <sys/types.h>
++
++static inline u_int16_t swab16(u_int16_t x)
++{
++	return (((x << 8)  & 0xFF00) |
++		((x >> 8) & 0x00FF));
++}
++
++static inline u_int32_t swab32(u_int32_t x)
++{
++	return (((x << 24) & 0xFF000000) |
++		((x <<  8) & 0x00FF0000) |
++		((x >> 24) & 0x000000FF) |
++		((x >>  8) & 0x0000FF00));
++}
++
++static inline u_int64_t swab64(u_int64_t x)
++{
++	return ((u_int64_t)
++	((u_int64_t)(((u_int64_t)x & (u_int64_t)0x00000000000000ffULL) << 56) |
++	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x000000000000ff00ULL) << 40) |
++	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x0000000000ff0000ULL) << 24) |
++	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x00000000ff000000ULL) <<  8) |
++	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x000000ff00000000ULL) >>  8) |
++	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x0000ff0000000000ULL) >> 24) |
++	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0x00ff000000000000ULL) >> 40) |
++	 (u_int64_t)(((u_int64_t)x & (u_int64_t)0xff00000000000000ULL) >> 56)));
++}
++
+ 
+ /* We carry a.out header here in order to compile the thing on Solaris */
+ 
+@@ -37,14 +57,14 @@
+ #define	CMAGIC	    0x01030108
+ 
+ typedef struct {
+-	unsigned long	a_magic;	/* magic number */
+-	unsigned long	a_text;		/* size of text segment */
+-	unsigned long	a_data;		/* size of initialized data */
+-	unsigned long	a_bss;		/* size of uninitialized data */
+-	unsigned long	a_syms;		/* size of symbol table || checksum */
+-	unsigned long	a_entry;	/* entry point */
+-	unsigned long	a_trsize;	/* size of text relocation */
+-	unsigned long	a_drsize;	/* size of data relocation */
++	u_int32_t	a_magic;	/* magic number */
++	u_int32_t	a_text;		/* size of text segment */
++	u_int32_t	a_data;		/* size of initialized data */
++	u_int32_t	a_bss;		/* size of uninitialized data */
++	u_int32_t	a_syms;		/* size of symbol table || checksum */
++	u_int32_t	a_entry;	/* entry point */
++	u_int32_t	a_trsize;	/* size of text relocation */
++	u_int32_t	a_drsize;	/* size of data relocation */
+ } Exec;
+ 
+ 
+@@ -56,17 +76,16 @@
+ 	int swab;
+ 	int sparc64;
+ 	int csum;
+-	/* friend void Usage(void); */
+ } Application;
+ 
+ typedef struct {
+ 	Elf32_Phdr *tab;
+-	unsigned len;
++	unsigned int len;
+ } ProgTable;
+ 
+ typedef struct {
+ 	Elf64_Phdr *tab;
+-	unsigned len;
++	unsigned int len;
+ } ProgTable64;
+ 
+ void get_ptab(ProgTable *t, FILE *inp, const Elf32_Ehdr *h);
+@@ -75,9 +94,9 @@
+ void print_ptab64(ProgTable64 *t);
+ 
+ typedef struct {
+-	char *buf;                /* Image data */
+-	unsigned len;             /* Length of buffer */
+-	unsigned bss;             /* Length of extra data */
++	unsigned char *buf;       /* Image data */
++	unsigned int len;         /* Length of buffer */
++	unsigned int bss;         /* Length of extra data */
+ } Segment;
+ 
+ void load_image(Segment *t, const ProgTable *h, FILE *inp);
+@@ -105,7 +124,8 @@
+ 
+ 	parse_args(&prog, argc, argv);
+ 
+-	if (prog.version) Version();
++	if (prog.version)
++		Version();
+ 
+ 	if (freopen(prog.iname, "r", stdin) == NULL) {
+ 		fprintf(stderr, "Cannot open \"%s\"\n", prog.iname);
+@@ -141,7 +161,8 @@
+ 	exit(0);
+ }
+ 
+-void parse_args( Application *t, unsigned argc, const char **argv ){
++void parse_args( Application *t, unsigned argc, const char **argv )
++{
+ 	const char *arg;
+ 	union {
+ 		char c[4];
+@@ -185,8 +206,8 @@
+ 	if (t->csum && t->sun4_mode) Usage ();	/* Checksum lives in header. */
+ }
+ 
+-void get_header(Elf32_Ehdr *t, FILE *inp) {
+-
++void get_header(Elf32_Ehdr *t, FILE *inp)
++{
+         if (fread((void*) t, sizeof(Elf64_Ehdr), 1, inp) != 1) {
+ 		fprintf(stderr, "Read error on header\n");
+ 		exit(1);
+@@ -249,8 +270,9 @@
+ 	}
+ }
+ 
+-void get_ptab(ProgTable *t, FILE *inp, const Elf32_Ehdr *h) {
+-	unsigned x;
++void get_ptab(ProgTable *t, FILE *inp, const Elf32_Ehdr *h)
++{
++	unsigned int x;
+ 
+ 	/** fprintf(stderr, "Program header table off = 0x%x\n",
+ 		(unsigned) h->e_phoff); **/
+@@ -294,8 +316,9 @@
+ 	}
+ }
+ 
+-void get_ptab64(ProgTable64 *t, FILE *inp, const Elf64_Ehdr *h) {
+-	unsigned x;
++void get_ptab64(ProgTable64 *t, FILE *inp, const Elf64_Ehdr *h)
++{
++	unsigned int x;
+ 
+ 	if (h->e_phoff == 0) {
+ 		fprintf(stderr, "No Program Header Table\n");
+@@ -332,8 +355,9 @@
+ 	}
+ }
+ 
+-void print_ptab(ProgTable *t) {
+-	unsigned x;
++void print_ptab(ProgTable *t)
++{
++	unsigned int x;
+ 	const Elf32_Phdr *p;
+ 
+ 	for (x = 0; x < t->len; x++) {
+@@ -374,8 +398,9 @@
+ 	}
+ }
+ 
+-void print_ptab64(ProgTable64 *t) {
+-	unsigned x;
++void print_ptab64(ProgTable64 *t)
++{
++	unsigned int x;
+ 	const Elf64_Phdr *p;
+ 
+ 	for (x = 0; x < t->len; x++) {
+@@ -387,8 +412,11 @@
+ 			break;
+ 		case PT_LOAD:
+ 			printf("Loadable to 0x%Lx[0x%Lx] from 0x%Lx[0x%Lx] align 0x%Lx",
+-				p->p_vaddr, p->p_memsz, p->p_offset, p->p_filesz,
+-				p->p_align);
++			       (unsigned long long) p->p_vaddr,
++			       (unsigned long long) p->p_memsz,
++			       (unsigned long long) p->p_offset,
++			       (unsigned long long) p->p_filesz,
++			       (unsigned long long) p->p_align);
+ 			break;
+ 		case PT_DYNAMIC:
+ 			printf("Dynamic");
+@@ -416,9 +444,10 @@
+ 	}
+ }
+ 
+-void load_image(Segment *t, const ProgTable *tp, FILE *inp) {
++void load_image(Segment *t, const ProgTable *tp, FILE *inp)
++{
+ 	Elf32_Phdr *p, *q;
+-	unsigned x;
++	unsigned int x;
+ 	unsigned long off, len;
+ 
+ 	p = 0;
+@@ -484,9 +513,10 @@
+ 	}
+ }
+ 
+-void load_image64(Segment *t, const ProgTable64 *tp, FILE *inp) {
++void load_image64(Segment *t, const ProgTable64 *tp, FILE *inp)
++{
+ 	Elf64_Phdr *p, *q;
+-	unsigned x;
++	unsigned int x;
+ 	unsigned long long off, len;
+ 
+ 	p = 0;
+@@ -547,7 +577,8 @@
+ 	}
+ }
+ 
+-void store_image(Segment *t, FILE *out) {
++void store_image(Segment *t, FILE *out)
++{
+ 	Exec ohdb;
+ 
+ 	if (prog.swab) {
+@@ -585,13 +616,15 @@
+ 	return;
+ }
+ 
+-void Usage(){
++void Usage()
++{
+ 	if (prog.version) Version();
+ 	fprintf(stderr, "Usage: elftoaout [-o output] [-c|-b] [-V] input\n");
+ 	exit(1);
+ }
+ 
+-void Version(){
++void Version()
++{
+ 	printf("elftoaout 2.3: ELF to a.out convertor for SPARC and SPARC64 bootstraps\n");
+ }
+ 
diff --git a/sys-apps/sparc-utils/sparc-utils-1.9-r5.ebuild b/sys-apps/sparc-utils/sparc-utils-1.9-r6.ebuild
index 3f13a6d64e5d..3aec8e00f8eb 100644
--- a/sys-apps/sparc-utils/sparc-utils-1.9-r5.ebuild
+++ b/sys-apps/sparc-utils/sparc-utils-1.9-r6.ebuild
@@ -23,6 +23,7 @@ S=${WORKDIR}/${P}.orig
 PATCHES=(
 	"${WORKDIR}/${PN}_${PV}-4.diff"
 	"${FILESDIR}"/${P}-no-implicit.patch
+	"${FILESDIR}"/elftoaout-2.3-64bit_fixes-1.patch
 )
 
 src_compile() {
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 85f3d29829a3..c8f5fc4d207d 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,18 +1,17 @@
 AUX 243-seccomp.patch 6293 BLAKE2B be1a78783e34d6cf8ba33f6ae6fb0e8747d414de692cf28bd9cce01ca47baf188b078171dd66c236ecf2a4a821f1dec0b7021e1298a29a3b21aacf3a9d667189 SHA512 da2cd2e11a06e0520af0ad3c6debe54c5ab046f7ee35a922c99a32924464a6b760b4620d8e511064f84d8adbf5e65db473877476a1cc36941a0420491b89cb25
 AUX 244-efi-gcc-10.patch 3032 BLAKE2B f9fd018c567384171b154809bb95b35c18fc9c3ad7d5c114f5854bb90db2bdafca9d96c3437a9d20a7ea875a3e5646750f29294025fcb657a40dcd7d4ed95282 SHA512 f9bbc9c3be417ff14775de06d3c4088913eff4c6f62e58278420345cbc7b115b706c169faaae9dc17448f895d9cf9b417ee8c04398ec4c206df89f5f3bcfb4a1
-AUX 245-rc1-network-debug.patch 1915 BLAKE2B b4e2fc470e584520c0423b06d00e663fb82e364594626e89632e9db4dd503b55c419f844c5063ca7f8641919ff47d3057f6962e269686829041ea262e75504ae SHA512 d55dac6e5b11d066eff46b0387b64d1cf59b9c4134171b17933447064f0ea0ca774681134be20e0af40f3de03f971778cf358d38bca78107e7129d3d86e7065e
-AUX 245-rc1-sysctl-segfault.patch 942 BLAKE2B 00fc826da41bfe0bb42e86bb839dc441d0762993ddabc227097865061a706a0598e1bd1ef4451b8ba11f702ba66ab1b9281e2141fcffed054c787206bb78966a SHA512 d92f4ac03d1ddb84a9ff2bb90efc92a7d0394165fa0dd7d3fa0739e1480b847e11ec522a3d6dc907998455df19c1b300c046a404f7c4226e77aa10f51fff37a5
+AUX 245-clang-gnu11.patch 3167 BLAKE2B 4d254ae7ffc906d282580805a041ac2c11552ff6e7569cc06709faf6fe0894d9c9856ba54783e141341c512a401428390f7233050921e5e045b867f7e517f298 SHA512 6261c71cb4afbbbe5189f7ac01bf7cc50139edca4175f6f821941e012f5f4335835eef518e187996612e174159947a4fc2fec70fdbb16c8cdfa82369c7f4c814
 AUX gentoo-Dont-enable-audit-by-default.patch 1027 BLAKE2B 9193a409db4e5c1dec6f6b66ee6e0a4cc1ada49d41ab758c788cf12534fffb67bd7370b8558a6af56572d7f2b73cf47db255fef105e56362c15f0a426f80b256 SHA512 44e512d8bbadbc5714192896a3ba262e460af034846e4e9b9832b4143fff772e2734e655316fd88d1ef386509bd234c195dce2087348f220836b3bf4f26790e0
 AUX gentoo-generator-path-r1.patch 1037 BLAKE2B 5eb80521a6726c9b4693f9b0f56d3e68fca1a49f5f5eb5a1576329d30c93d2fe7c121920099d74962eacf7ed1d3747250f103a57e4be246320a99871521a3b6a SHA512 1b0d1c2f96cb4aa95adfa5940efaeb2bd940110720399358317906d21d08b0caf625474980e101bba001afd626f8ad64367b09b40bec0b2d46b977021c4adfc5
 AUX gentoo-systemd-user-pam.patch 443 BLAKE2B fad5c24f35666313efbf1e33640320058022fe17acff869a80104ed87ce0ad7ebaa1498915f8e933985e9c2d66d77172eb21ab480fc4fa857e0e5b985735831a SHA512 0a47368b1b38995a4193492e3add5c716c063366a9bc53dec03b7cb59b524da644033e095344da6e15e01dc84d8f5b335e7510442eeaba26e06918403fed0e5c
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 DIST systemd-244.tar.gz 8445963 BLAKE2B 19751fb9c058a079694ee1b991259fd3f1fa30ae98ca38bbe8caadfc5628db7848c7f742a1b11781fbd67f911adda917d7a4da1dddb63064907f86f47e5a3256 SHA512 08f260fb15b5eb273faafda826dd9154e9a02841b4c5911cc1c7e1445072ad51389f8cced7b9acf112737c20fd56b2fbf48b3f914733c934c774d38a23b616fb
-DIST systemd-245-rc1.tar.gz 8961356 BLAKE2B ed04166ead57c2f1cc1a1ca2f0041cae134b503d3448ea9fdd799e12d81f45721ee304d4aabd96d3eab8ea1321b283820e8d2a850b41733e40f07fd419f67b95 SHA512 2ef9a295f3897c6642a2fac2e3c73467ece9bc6fc196cc4f3707b9c23af2581eb9f74def78909d57513b67604bf1cf6dc5dbb31c6d435f7997677d09a73d006b
+DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35 SHA512 1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
 DIST systemd-stable-244.3.tar.gz 8484735 BLAKE2B 25125ecdae59c852e8ceb45b7ed0b76631b301ab4026c4e389c4bc12090fe41f5918411a75bd20f38b6b3993445df93c850ba98f8d9b30fd24fc4e25f8355a3d SHA512 f8e83fa3e57ac8fdbed61b66bb45fd0eafa6fb36eda26f10690d93f34b03daab6ce4e7eff45b79dcaf59f11f41c1b022d1d9314f576c50ad28f6bb5901f1b18d
-EBUILD systemd-243-r2.ebuild 14551 BLAKE2B 7cc961a76f605d29fac9f931de5cd940d86bf8d113b5f9411f3da43a39632967e08c7065b26b8de55352f3ef9922a366b4756ad84e45544b75b08e51e882c602 SHA512 0d30a2ff1c48fa61ea34b6d9b2da84bb776f332c327c172cfbd68e1adf7a21488b28619f080190a84c81e62a7215f5f0bcabe5f8ed653afae5ebdd4a4448d40b
-EBUILD systemd-244.3.ebuild 14547 BLAKE2B 5b747e450e2cc3408082ef17704dfab6564bcdadee7f3b9339fb379d47146a1ffa30d4844d5e8d63b669cdcb58bfc75537ffeb058e7d018c4152636d8ff047a9 SHA512 060abc374a7f35347109109907075a302b6481012c1a8cafc40634986ff214177106ac03b8fca7c29de23b5576800032c19b911b929786bb3564309a8c19381b
-EBUILD systemd-244.ebuild 14531 BLAKE2B 97622ec92021c12016bb8f1e2181eef6573af83e4e71bc5bca31c05fbf3eea2ba674f77b69e152aa49bf4dae0068483df244c5ba29efc58fd2b995062286fa48 SHA512 871185ea400df7ca5bc90467a37b62380da20d8149f7d8f47f629e95a37da209c4754c397fefc6d11be58aee6a878534c2ea66ec479a2b63bfbebd1348dcbc67
-EBUILD systemd-245_rc1-r2.ebuild 14832 BLAKE2B 844021148e36863564bfd260f277919998f9c6ebb792796fb1ae9e9a46c72c8c04b2505b851da0c6c89ac1e6e9cca9ed1edfc99aaaf452272f52aff2a5d0e98b SHA512 85df145d991791c8330ac8dd5b7c6dd08d5cf62d1bf11998672016582452fedd5d25a2e5fbddab012034a55f06298b06614091849939497ff77aefc00f220e50
-EBUILD systemd-9999.ebuild 14742 BLAKE2B f19eab68908becf058b7e6e706204425951c392c010c9259ff7703771c899e046287fee721cd65f8b06f2cd1de5b509799c7ffebd16cff502d150b7e7645d509 SHA512 d757c4e343f546371dd409193b8eff4cb10a864b1cc2722434ca0278211e2efc399070654a4635cc76718e6620e0e6b5dd0c565a32b2f4912f941da08b14c7ea
-MISC metadata.xml 2170 BLAKE2B 40691c4b4248e8296325a2cd167f1485c28f50a2814320e151c03ac7293023b5720f8200ea6a314f853ac330994de2b8b79d50a4ee8412454be95c22c9580176 SHA512 77351af149533d7c8a8a0cb0308cae1fae1f45eaa533a52209fb63c9cb3aa54b0782796fccd480ab2c41c5ba7e2eda8e195f4b68a1a2487a9dfd0b22ea874c1f
+EBUILD systemd-243-r2.ebuild 14590 BLAKE2B 536b1996e88366d7aa24a474305f05ca2cd6d5e4f026c1fd8392679fd21bf1bba28ca8bf39121427faa1fd412fa3950d45e863e75a9cf2e4f16b3c499da68555 SHA512 49b6883b2a72a986a32bf084fb962698399449859b3dba42db6a08090a018a7598f4af0eb05dd86615005e72e3b4a72d0c4da7891407b1e0537cf7953c5510ab
+EBUILD systemd-244.3.ebuild 14582 BLAKE2B 47660116f69e9b59f0fc125d206f41cb7a94b0d70245c6ce92de957ab294fe6e969797ff05d16dec46fe6430173dae0a29ec68fe99ea960e18d731e231a5f038 SHA512 00034a5c3ee577d1719756aab0721c23ee1b944896d875fc1fb81c41481aa1683b6d155ed42ba3ba2979b2a2b44c2231dc531f888b8fe4b9fcaf80260a712c06
+EBUILD systemd-244.ebuild 14570 BLAKE2B 918be50336353a5d5512653c61ed6c1e1cbb4f8e49ec7fd8b1eeb5436951ad82b3d7aa7fa0e313681a952dcbd64c7fd899bb5ac3a7a319a4508d099a358a8ab6 SHA512 1b9d610e10c5c1a21d80395a3a68f82f4201f6b1c23d7e57f98e09cb509a133e60484c5e72ae0c78819a189b930b2f77cca84e869af9f03fbc5a3a4ac9448ab2
+EBUILD systemd-245-r2.ebuild 15009 BLAKE2B 945f285053fa32d29c0c19032e1acbf4af2a0ca7641a5cd9b7b4de944d5309d8eb5ed3c6bbdbd60be494caea1677b730a3ecb4d6cbd2d5fdddce4b1d15d6f444 SHA512 bd9dd09b7d2a8f072235aaa3045d842c96fc93c4c14c8a8d97c2ad3f3c34ed0ac5ac59c164d796503bbf5c07c42762631ded479cd2c50aa30b7222993cf57bad
+EBUILD systemd-9999.ebuild 14971 BLAKE2B b5d61f8f72003b93d42e0710fb9e73ac29a0033a96d0586b165264e6d59ce0361c39d4f56fdfa17d792cc53a608f93ee18b5e0431a6deb4275ea9c3140ae6431 SHA512 6bba52ec5ea5781b8538c60d947a2beb3a676461406103780d5b59b4f7dad6872c739c4a462e5d302d74c4fad0a6f6a2b35dc3a9ac112b96c8b2768520cf70ce
+MISC metadata.xml 2305 BLAKE2B ae8b39dbfa828f47622fb234a6f76255ed3357d370408686ceac8141a4068cf49954ebf203c9e1d31dcb7d70552f7768ef9f4308169e1c96685b375287dc113d SHA512 bc6a8c7317e3b39b5dd0268d89bfa99592f18ecb18e32b1e2a93659748547909c66e423ca30a79d5044bee31af2fd7a3ff386ddcbf6a456898471db4387cf909
diff --git a/sys-apps/systemd/files/245-clang-gnu11.patch b/sys-apps/systemd/files/245-clang-gnu11.patch
new file mode 100644
index 000000000000..9056b56d48ee
--- /dev/null
+++ b/sys-apps/systemd/files/245-clang-gnu11.patch
@@ -0,0 +1,60 @@
+From 36e0d89a88c51ba879a2d7e2f90ea9b38333e2c0 Mon Sep 17 00:00:00 2001
+From: Denis Pronin <dannftk@yandex.ru>
+Date: Sun, 8 Mar 2020 23:57:07 +0300
+Subject: [PATCH] Support compiling with clang and gnu11 standard
+
+Signed-off-by: Denis Pronin <dannftk@yandex.ru>
+---
+ src/shared/json-internal.h | 35 ++++++++++++++++++++++++-----------
+ 1 file changed, 24 insertions(+), 11 deletions(-)
+
+diff --git a/src/shared/json-internal.h b/src/shared/json-internal.h
+index bf158bff0d4..fabff0c860e 100644
+--- a/src/shared/json-internal.h
++++ b/src/shared/json-internal.h
+@@ -26,21 +26,34 @@ assert_cc(sizeof(JsonValue) == 16U);
+ /* We use fake JsonVariant objects for some special values, in order to avoid memory allocations for them. Note that
+  * effectively this means that there are multiple ways to encode the same objects: via these magic values or as
+  * properly allocated JsonVariant. We convert between both on-the-fly as necessary. */
+-#define JSON_VARIANT_MAGIC_TRUE ((JsonVariant*) 1)
+-#define JSON_VARIANT_MAGIC_FALSE ((JsonVariant*) 2)
+-#define JSON_VARIANT_MAGIC_NULL ((JsonVariant*) 3)
+-#define JSON_VARIANT_MAGIC_ZERO_INTEGER ((JsonVariant*) 4)
+-#define JSON_VARIANT_MAGIC_ZERO_UNSIGNED ((JsonVariant*) 5)
+-#define JSON_VARIANT_MAGIC_ZERO_REAL ((JsonVariant*) 6)
+-#define JSON_VARIANT_MAGIC_EMPTY_STRING ((JsonVariant*) 7)
+-#define JSON_VARIANT_MAGIC_EMPTY_ARRAY ((JsonVariant*) 8)
+-#define JSON_VARIANT_MAGIC_EMPTY_OBJECT ((JsonVariant*) 9)
+-#define _JSON_VARIANT_MAGIC_MAX ((JsonVariant*) 10)
++enum
++{
++ _JSON_VARIANT_MAGIC_TRUE = 1,
++#define JSON_VARIANT_MAGIC_TRUE ((JsonVariant*) _JSON_VARIANT_MAGIC_TRUE)
++ _JSON_VARIANT_MAGIC_FALSE,
++#define JSON_VARIANT_MAGIC_FALSE ((JsonVariant*) _JSON_VARIANT_MAGIC_FALSE)
++ _JSON_VARIANT_MAGIC_NULL,
++#define JSON_VARIANT_MAGIC_NULL ((JsonVariant*) _JSON_VARIANT_MAGIC_NULL)
++ _JSON_VARIANT_MAGIC_ZERO_INTEGER,
++#define JSON_VARIANT_MAGIC_ZERO_INTEGER ((JsonVariant*) _JSON_VARIANT_MAGIC_ZERO_INTEGER)
++ _JSON_VARIANT_MAGIC_ZERO_UNSIGNED,
++#define JSON_VARIANT_MAGIC_ZERO_UNSIGNED ((JsonVariant*) _JSON_VARIANT_MAGIC_ZERO_UNSIGNED)
++ _JSON_VARIANT_MAGIC_ZERO_REAL,
++#define JSON_VARIANT_MAGIC_ZERO_REAL ((JsonVariant*) _JSON_VARIANT_MAGIC_ZERO_REAL)
++ _JSON_VARIANT_MAGIC_EMPTY_STRING,
++#define JSON_VARIANT_MAGIC_EMPTY_STRING ((JsonVariant*) _JSON_VARIANT_MAGIC_EMPTY_STRING)
++ _JSON_VARIANT_MAGIC_EMPTY_ARRAY,
++#define JSON_VARIANT_MAGIC_EMPTY_ARRAY ((JsonVariant*) _JSON_VARIANT_MAGIC_EMPTY_ARRAY)
++ _JSON_VARIANT_MAGIC_EMPTY_OBJECT,
++#define JSON_VARIANT_MAGIC_EMPTY_OBJECT ((JsonVariant*) _JSON_VARIANT_MAGIC_EMPTY_OBJECT)
++ __JSON_VARIANT_MAGIC_MAX
++#define _JSON_VARIANT_MAGIC_MAX ((JsonVariant*) __JSON_VARIANT_MAGIC_MAX)
++};
+ 
+ /* This is only safe as long as we don't define more than 4K magic pointers, i.e. the page size of the simplest
+  * architectures we support. That's because we rely on the fact that malloc() will never allocate from the first memory
+  * page, as it is a faulting page for catching NULL pointer dereferences. */
+-assert_cc((uintptr_t) _JSON_VARIANT_MAGIC_MAX < 4096U);
++assert_cc((unsigned) __JSON_VARIANT_MAGIC_MAX < 4096U);
+ 
+ enum { /* JSON tokens */
+         JSON_TOKEN_END,
diff --git a/sys-apps/systemd/files/245-rc1-network-debug.patch b/sys-apps/systemd/files/245-rc1-network-debug.patch
deleted file mode 100644
index e65035f21857..000000000000
--- a/sys-apps/systemd/files/245-rc1-network-debug.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 01ec0028d97fa97d2e433659e24a1517b0e2382e Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Wed, 5 Feb 2020 11:04:50 -0500
-Subject: [PATCH] network: remove unnecessary link->ifname from debug log
- statements
-
-Since 98b0299479a68ffd414888368907fc776a46b82a, we log the interface
-name automatically via log_link_debug().
-
-Fixes: https://github.com/systemd/systemd/issues/14782
----
- src/network/networkd-dhcp-server.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/network/networkd-dhcp-server.c b/src/network/networkd-dhcp-server.c
-index a6dbe2e596c..bee75a6930e 100644
---- a/src/network/networkd-dhcp-server.c
-+++ b/src/network/networkd-dhcp-server.c
-@@ -45,7 +45,7 @@ static int link_push_uplink_dns_to_dhcp_server(Link *link, sd_dhcp_server *s) {
-         size_t n_addresses = 0, n_allocated = 0;
-         unsigned i;
- 
--        log_link_debug(link, "Copying DNS server information from %s", link->ifname);
-+        log_link_debug(link, "Copying DNS server information from link");
- 
-         if (!link->network)
-                 return 0;
-@@ -99,7 +99,7 @@ static int link_push_uplink_ntp_to_dhcp_server(Link *link, sd_dhcp_server *s) {
-         if (!link->network)
-                 return 0;
- 
--        log_link_debug(link, "Copying NTP server information from %s", link->ifname);
-+        log_link_debug(link, "Copying NTP server information from link");
- 
-         STRV_FOREACH(a, link->network->ntp) {
-                 union in_addr_union ia;
-@@ -148,7 +148,7 @@ static int link_push_uplink_sip_to_dhcp_server(Link *link, sd_dhcp_server *s) {
-         if (!link->network)
-                 return 0;
- 
--        log_link_debug(link, "Copying SIP server information from %s", link->ifname);
-+        log_link_debug(link, "Copying SIP server information from link");
- 
-         STRV_FOREACH(a, link->network->sip) {
-                 union in_addr_union ia;
diff --git a/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch b/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch
deleted file mode 100644
index 7618b2deba5e..000000000000
--- a/sys-apps/systemd/files/245-rc1-sysctl-segfault.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From db99904bc8482efe556bb010a8b203a3e60ee37f Mon Sep 17 00:00:00 2001
-From: Yu Watanabe <watanabe.yu+github@gmail.com>
-Date: Thu, 6 Feb 2020 19:13:11 +0900
-Subject: [PATCH] sysctl: fix segfault
-
-Fixes #14801.
----
- src/sysctl/sysctl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
-index bbcf0c43235..0cdb740d218 100644
---- a/src/sysctl/sysctl.c
-+++ b/src/sysctl/sysctl.c
-@@ -257,7 +257,7 @@ static int parse_file(OrderedHashmap **sysctl_options, const char *path, bool ig
- 
-                 existing = ordered_hashmap_get(*sysctl_options, p);
-                 if (existing) {
--                        if (streq(value, existing->value)) {
-+                        if (streq_ptr(value, existing->value)) {
-                                 existing->ignore_failure = existing->ignore_failure || ignore_failure;
-                                 continue;
-                         }
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index fdbbc809fd18..336245a670ab 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name="gnuefi">Enable EFI boot manager and stub loader (built using <pkg>sys-boot/gnu-efi</pkg>)</flag>
 		<flag name="elfutils">Enable coredump stacktraces in the journal</flag>
 		<flag name="gcrypt">Enable sealing of journal files using gcrypt</flag>
+		<flag name="homed">Enable portable home directories</flag>
 		<flag name="http">Enable embedded HTTP server in journald</flag>
 		<flag name="importd">Enable import daemon</flag>
 		<flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
@@ -25,6 +26,7 @@
 		<flag name="nat">Enable support for network address translation in networkd</flag>
 		<flag name="pkcs11">Enable PKCS#11 support for cryptsetup and homed</flag>
 		<flag name="pwquality">Enable password quality checking in homed</flag>
+		<flag name="repart">Enable support for growing/adding partitions</flag>
 		<flag name="qrcode">Enable qrcode output support in journal</flag>
 		<flag name="resolvconf">Install resolvconf symlink for systemd-resolve</flag>
 		<flag name="sysv-utils">Install sysvinit compatibility symlinks and manpages for init, telinit, halt, poweroff, reboot, runlevel, and shutdown</flag>
diff --git a/sys-apps/systemd/systemd-243-r2.ebuild b/sys-apps/systemd/systemd-243-r2.ebuild
index 5c4c417bc344..62ea76aad71d 100644
--- a/sys-apps/systemd/systemd-243-r2.ebuild
+++ b/sys-apps/systemd/systemd-243-r2.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P=${PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_6,3_7} )
@@ -188,6 +188,7 @@ src_prepare() {
 	# Add local patches here
 	PATCHES+=(
 		"${FILESDIR}/243-seccomp.patch"
+		"${FILESDIR}/245-clang-gnu11.patch"
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/systemd/systemd-244.3.ebuild b/sys-apps/systemd/systemd-244.3.ebuild
index 1acea5bfd495..2c8406ec99c6 100644
--- a/sys-apps/systemd/systemd-244.3.ebuild
+++ b/sys-apps/systemd/systemd-244.3.ebuild
@@ -16,7 +16,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86"
 fi
 
 PYTHON_COMPAT=( python3_{6,7,8} )
@@ -192,6 +192,7 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
+		"${FILESDIR}/245-clang-gnu11.patch"
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/systemd/systemd-244.ebuild b/sys-apps/systemd/systemd-244.ebuild
index 49383fe9a6f3..04b0c3c377d5 100644
--- a/sys-apps/systemd/systemd-244.ebuild
+++ b/sys-apps/systemd/systemd-244.ebuild
@@ -11,7 +11,7 @@ else
 	MY_P=${PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 fi
 
 PYTHON_COMPAT=( python{3_6,3_7} )
@@ -188,6 +188,7 @@ src_prepare() {
 	# Add local patches here
 	PATCHES+=(
 		"${FILESDIR}"/244-efi-gcc-10.patch
+		"${FILESDIR}/245-clang-gnu11.patch"
 	)
 
 	if ! use vanilla; then
diff --git a/sys-apps/systemd/systemd-245_rc1-r2.ebuild b/sys-apps/systemd/systemd-245-r2.ebuild
index 3ab16fd6edd8..6b80478fa7e0 100644
--- a/sys-apps/systemd/systemd-245_rc1-r2.ebuild
+++ b/sys-apps/systemd/systemd-245-r2.ebuild
@@ -28,13 +28,18 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
 
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
+REQUIRED_USE="
+	homed? ( cryptsetup )
+	importd? ( curl gcrypt lzma )
+"
 RESTRICT="!test? ( test )"
 
 MINKV="3.11"
 
+OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
+
 COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
 	acl? ( sys-apps/acl:0= )
@@ -42,9 +47,10 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	audit? ( >=sys-process/audit-2:0= )
 	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
 	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
 	elfutils? ( >=dev-libs/elfutils-0.158:0= )
 	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	homed? ( ${OPENSSL_DEP} )
 	http? (
 		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
 		>=net-libs/gnutls-3.1.4:0=
@@ -63,6 +69,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	pcre? ( dev-libs/libpcre2 )
 	pwquality? ( dev-libs/libpwquality:0= )
 	qrcode? ( media-gfx/qrencode:0= )
+	repart? ( ${OPENSSL_DEP} )
 	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
 	selinux? ( sys-libs/libselinux:0= )
 	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
@@ -194,8 +201,7 @@ src_prepare() {
 
 	# Add local patches here
 	PATCHES+=(
-		"${FILESDIR}"/245-rc1-network-debug.patch
-		"${FILESDIR}"/245-rc1-sysctl-segfault.patch
+		"${FILESDIR}/245-clang-gnu11.patch"
 	)
 
 	if ! use vanilla; then
@@ -268,6 +274,7 @@ multilib_src_configure() {
 		-Dgcrypt=$(meson_use gcrypt)
 		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
 		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		-Dhomed=$(meson_multilib_native_use homed)
 		-Dmicrohttpd=$(meson_multilib_native_use http)
 		-Didn=$(meson_multilib_native_use idn)
 		-Dimportd=$(meson_multilib_native_use importd)
@@ -283,6 +290,7 @@ multilib_src_configure() {
 		-Dpolkit=$(meson_multilib_native_use policykit)
 		-Dpwquality=$(meson_multilib_native_use pwquality)
 		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Drepart=$(meson_multilib_native_use repart)
 		-Dseccomp=$(meson_multilib_native_use seccomp)
 		-Dselinux=$(meson_multilib_native_use selinux)
 		-Ddbus=$(meson_multilib_native_use test)
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 6454de6e1695..c35e623d94d7 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -28,13 +28,18 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0/2"
-IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr static-libs +sysv-utils test vanilla xkb"
 
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
+REQUIRED_USE="
+	homed? ( cryptsetup )
+	importd? ( curl gcrypt lzma )
+"
 RESTRICT="!test? ( test )"
 
 MINKV="3.11"
 
+OPENSSL_DEP=">=dev-libs/openssl-1.1.0:0="
+
 COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
 	acl? ( sys-apps/acl:0= )
@@ -42,9 +47,10 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	audit? ( >=sys-process/audit-2:0= )
 	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
 	curl? ( net-misc/curl:0= )
-	dns-over-tls? ( >=net-libs/gnutls-3.5.3:0= )
+	dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
 	elfutils? ( >=dev-libs/elfutils-0.158:0= )
 	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
+	homed? ( ${OPENSSL_DEP} )
 	http? (
 		>=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)]
 		>=net-libs/gnutls-3.1.4:0=
@@ -63,6 +69,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
 	pcre? ( dev-libs/libpcre2 )
 	pwquality? ( dev-libs/libpwquality:0= )
 	qrcode? ( media-gfx/qrencode:0= )
+	repart? ( ${OPENSSL_DEP} )
 	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
 	selinux? ( sys-libs/libselinux:0= )
 	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
@@ -266,6 +273,7 @@ multilib_src_configure() {
 		-Dgcrypt=$(meson_use gcrypt)
 		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
 		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
+		-Dhomed=$(meson_multilib_native_use homed)
 		-Dmicrohttpd=$(meson_multilib_native_use http)
 		-Didn=$(meson_multilib_native_use idn)
 		-Dimportd=$(meson_multilib_native_use importd)
@@ -281,6 +289,7 @@ multilib_src_configure() {
 		-Dpolkit=$(meson_multilib_native_use policykit)
 		-Dpwquality=$(meson_multilib_native_use pwquality)
 		-Dqrencode=$(meson_multilib_native_use qrcode)
+		-Drepart=$(meson_multilib_native_use repart)
 		-Dseccomp=$(meson_multilib_native_use seccomp)
 		-Dselinux=$(meson_multilib_native_use selinux)
 		-Ddbus=$(meson_multilib_native_use test)
diff --git a/sys-apps/sysvinit/Manifest b/sys-apps/sysvinit/Manifest
index bca133adeb9e..7d7587b48eeb 100644
--- a/sys-apps/sysvinit/Manifest
+++ b/sys-apps/sysvinit/Manifest
@@ -10,7 +10,7 @@ AUX sysvinit-2.95_beta-shutdown-h.patch 2752 BLAKE2B a7174eaf34d5f9547d5d79c16bf
 DIST sysvinit-2.93.tar.xz 117580 BLAKE2B 2e771b00dbdc73e76df9e78659aaa5e5fcbfda36290a1b5aa20a5a6fe3540c4616f2a235a668de30d33c620e2d2516da303537eda47b83b29b0844ad7aa77df4 SHA512 c80d07a674253d15ec6382cfaf792f47486e2e84ab9c913d3c9e03b590cf211177a3a14e168f4d1c9c2e97737221f7ac70a75633d90502837a6d29bdc4c48d72
 DIST sysvinit-2.95.tar.xz 124576 BLAKE2B 1b0770e3bc7c5a32b8a634ab70d16854446816f9c22f57befb2602a8680d5d4a4adc51747b6199867ba73a3ac5118073a8bfa9ea4317de86b3b42867ae0cf6e7 SHA512 367990d166ec6dcc4de81e748f15035e2a4c2838da7336b064aeadac2db95ca77e8d11fb6aa7e7745874ef3e27118c9a68070062fffb16a886f32d6ab2529d28
 DIST sysvinit-2.96.tar.xz 122164 BLAKE2B 10c28d3bb57fc744b66c3a7ac78912fb6a9d987e9f6f32f82953d23a9884020daa6fa8c7722e6d8145d9899f7f7dc623f69f885d3d8fbbcd313d0e69ffb66497 SHA512 1388398568ebfe53460796f8ab75a3ead6111612888ea36e8f1c0db4d41ef6f45fc217abb7804519ff1143a78d97c95b24e42c8c22c95a47b9436484bfb6f45d
-EBUILD sysvinit-2.93.ebuild 3576 BLAKE2B fae933f0645d4c53baddca467e0cdfb9aa8d4388cd26c8120e4622c5f4ffa82999216bdbb2820ccca704fdb182328787762a080dd2d87d8e12b15abd0d351556 SHA512 f8945ef2646119e606579581e5f078345b5960c0816c9e813d4b3be1a861e8d2365d2abe80fdab91cd1ced3db05b17dd0d4f4269be444ea506a1232f5af358bc
-EBUILD sysvinit-2.95-r1.ebuild 3850 BLAKE2B 35c48ee36606087e84cfcb400bd79cb239546d0fdf37de2f1100947903d37520fed21e3997cfae398d88167132e341682feaa7e86a76719ef75c456bae650494 SHA512 24c2e92865047a41abe3a08e83f9a14445f9628e2730bd8f67475b182d79b94291abea92662ccf5343277e509d70b337f313bb5be93b1160c0c0a089ec23631e
-EBUILD sysvinit-2.96.ebuild 3850 BLAKE2B 35c48ee36606087e84cfcb400bd79cb239546d0fdf37de2f1100947903d37520fed21e3997cfae398d88167132e341682feaa7e86a76719ef75c456bae650494 SHA512 24c2e92865047a41abe3a08e83f9a14445f9628e2730bd8f67475b182d79b94291abea92662ccf5343277e509d70b337f313bb5be93b1160c0c0a089ec23631e
+EBUILD sysvinit-2.93.ebuild 3574 BLAKE2B 0746c62db94e370f57799161ad7f98e7ad1feb4ecb856e70c8b19ed8312db125037b77e6f8343bfd2a297621c66326f160d3f32a4fee4190876f11af241b9ff9 SHA512 3c68fa02acb739e9266ae6efefb309db767cd56b93ccc60ba25917d15e2eb2cb981c06f693432ce05225a13b36cfc50b41cbb7d82acc519c195198fec4a10e34
+EBUILD sysvinit-2.95-r1.ebuild 3846 BLAKE2B 9bca6d0efb55cc459afc3f2bf855d0ee036655f30989c36482033b5851ebcf5367684b1c84ab93f929640a79e708574d678511d8ea4470f74c83b97f405d6467 SHA512 ffc41aa2599b90a90b9a1602ec907301ade4c7d5a2786f246b009f0b019ec38603944debdcc5e5dea36221342ccf38bbb2c1f5f2efb2befbfa3019ef8097d272
+EBUILD sysvinit-2.96.ebuild 3846 BLAKE2B 9bca6d0efb55cc459afc3f2bf855d0ee036655f30989c36482033b5851ebcf5367684b1c84ab93f929640a79e708574d678511d8ea4470f74c83b97f405d6467 SHA512 ffc41aa2599b90a90b9a1602ec907301ade4c7d5a2786f246b009f0b019ec38603944debdcc5e5dea36221342ccf38bbb2c1f5f2efb2befbfa3019ef8097d272
 MISC metadata.xml 358 BLAKE2B c1093363e2c2f9cbce13e3a7025cf2f767b526e90bcdbe32714aba5aef411483e013facfc014c89ac591feae0fa733902be185ac8a0c673e56799b8168ad77ed SHA512 37306b4ebf69803889059875a22ceccde18725cc21e5a598496c30a377e6cb1d3d9ca88123121b2a70c2436b3a77530415169b53165de93ea8510cc41fbb589f
diff --git a/sys-apps/sysvinit/sysvinit-2.93.ebuild b/sys-apps/sysvinit/sysvinit-2.93.ebuild
index 0e94e5a614ff..8d23886b25da 100644
--- a/sys-apps/sysvinit/sysvinit-2.93.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.93.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="selinux ibm static kernel_FreeBSD"
 
 CDEPEND="
diff --git a/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild b/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild
index 6dd6484ee442..882813ce1d81 100644
--- a/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.95-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="selinux ibm static kernel_FreeBSD"
 
 CDEPEND="
diff --git a/sys-apps/sysvinit/sysvinit-2.96.ebuild b/sys-apps/sysvinit/sysvinit-2.96.ebuild
index 6dd6484ee442..882813ce1d81 100644
--- a/sys-apps/sysvinit/sysvinit-2.96.ebuild
+++ b/sys-apps/sysvinit/sysvinit-2.96.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
@@ -12,7 +12,7 @@ SRC_URI="mirror://nongnu/${PN}/${P/_/-}.tar.xz"
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" == *beta* ]] || \
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="selinux ibm static kernel_FreeBSD"
 
 CDEPEND="
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 7f2a9d42e315..4a4283133193 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -2,9 +2,7 @@ AUX hosts.allow.example 585 BLAKE2B 18a7786b0eb9d08b0536de6ef135189aa0527af34a9b
 AUX tcp-wrappers-7.6-headers.patch 5419 BLAKE2B 6d56c77652299c8bc75ea76ff42c5dfa915b94b4466c79a23529e1d815487145dffef73d262a1d79e209caaf627fbf81b4f5402fca45af6f995c129fcb2539e4 SHA512 48cd3d8951ef0f0106c51f1a1de6116fe1f68bf49f321b956d4f9dac1b3f1b6c2964163deb3d1bb449a2ac672e471c4b216e0e616de4a2dad0665d767d13f786
 AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae680b189158c9936428644e7b93981403ed017ef26806f3de184f66eace573cf385ae350f3b0fa1b3f250b2a0b4708908289c558 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4
 AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8139c2dfd0a4a061b6113898560436ae0e5fb6e5a74c3c4c163c27f99e9957ec89665186beed30e7a57810db886b8a86148f6b58f5f594 SHA512 bdefe3dd35e96d1e140d1dc363f1904526aaf0c44952b8ec5e206c8e53693437f07be2ad136a0e22c38e09c1dcd1c73c755165cc68b4588715f6997f9c6affb8
-DIST tcp-wrappers_7.6.q-22.debian.tar.gz 41730 BLAKE2B 2e507269b14e5cf3e1a599b4cdae40c2900b098a1e40fc1b74e6b5565183fc71e25306e8dd0863fb16e6e52a6c471aeccb73c0b7c42d6f3f98aa9f95274583fb SHA512 cee45f265c34ec1c4e9e81d54be636dcd9702964f9cf5bb076f72d6772d2dbc638d2ef366560b51c24a216724807826bb3b7bf9d5d0f5c0923b71de7d0b002a8
 DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
 DIST tcp_wrappers_7.6.tar.gz 99438 BLAKE2B 961d9858866990f0f5e8c6bb782f5f39a03b267a8957dcd89734aeefcc85ca32554e032c73314e0a88110f3bb8a0dbdd81f093392307623a996b0232773e1e67 SHA512 2d9d003791f8d00912a36ae00579e2b8dd7ad8a7bf8eae259659bcaf5365b150540ff6c93c91765872c76041579b7a02b6e3c64528fb7f8235680399ba1d9dac
-EBUILD tcp-wrappers-7.6.22-r1.ebuild 2482 BLAKE2B c872dce38e5ae757ae66223deea3ff54a7d5fcf798f036544b958136ec86b65af6a38de0b4f9e3493d1779077c7695608e391d7baaed1cafb5d1b03aff89e235 SHA512 e53367eebaedf81e99d6f2996d14e1de980c4848a64e7dc43e5e90085ac0e74e77be2c4713959a99804a85c698cebead65ae7ebffbc6f463eccd4435db6fad47
-EBUILD tcp-wrappers-7.6.28.ebuild 2425 BLAKE2B 4702a06c1818dfccc29c42907e8903d2137c1389cfeff9cc39c22c61519462e7ca80b86551fd1d6e6a5ea2be82ab4640fb623f90f446a798a638d1ccf81a3a50 SHA512 5ecdb9a4d4ae9ff911abbe9798d9a7bbca55289401d1ce19f02101f50e26febcfcb9c7da6064411310715c972a42b68276c40fcb8b9cf388b4d23f8eaa0a6d00
+EBUILD tcp-wrappers-7.6.28.ebuild 2421 BLAKE2B 85ebf9f0e8b3ef9a31631a2add177081e35cdbbccf56134e45b1947c1703db51aad96032a76700eb6310d72697491567570ecd858eb9dd6ccbb229b7f139d0df SHA512 3f8f400f4fb9ab91d9bfecf26c5e1bcedca5fc681c0f76b09f66f2d7f10ec1708dcbc7571e244ada5420a831d7ee35b793a154068ad439c2f39ab1bd39838256
 MISC metadata.xml 440 BLAKE2B 701c101283758170adf92309f323c549f8cdac83c8885cff01e0a9841474e88b00cd8ce7d3e5c0d19209cc2acd8c113d23129c54a116433cf495126960758bea SHA512 3075ada2500265fa53064720159a33779d79c46e4244a5cc6624d0c2de81dcacf62f89232162182bf29477c36025f4b3f4618d9ae3f592ebd714a658425428a5
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
deleted file mode 100644
index a251fc64ee0d..000000000000
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.22-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils toolchain-funcs versionator flag-o-matic multilib-minimal usr-ldscript
-
-MY_PV=$(get_version_component_range 1-2)
-DEB_PV=$(get_version_component_range 3)
-MY_P="${PN//-/_}_${MY_PV}"
-DESCRIPTION="TCP Wrappers"
-HOMEPAGE="ftp://ftp.porcupine.org/pub/security/index.html"
-SRC_URI="ftp://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
-	mirror://debian/pool/main/t/${PN}/${PN}_${MY_PV}.q-${DEB_PV}.debian.tar.gz"
-
-LICENSE="tcp_wrappers_license"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
-IUSE="ipv6 netgroups static-libs"
-
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	EPATCH_OPTS="-p1" \
-	epatch $(sed -e 's:^:../debian/patches/:' ../debian/patches/series)
-	epatch "${FILESDIR}"/${PN}-7.6-headers.patch
-	epatch "${FILESDIR}"/${PN}-7.6-redhat-bug11881.patch
-
-	multilib_copy_sources
-}
-
-temake() {
-	local mycppflags="-DHAVE_WEAKSYMS -DHAVE_STRERROR -DSYS_ERRLIST_DEFINED"
-	use ipv6 && mycppflags+=" -DINET6=1 -Dss_family=__ss_family -Dss_len=__ss_len"
-	emake \
-		REAL_DAEMON_DIR="${EPREFIX}"/usr/sbin \
-		TLI= VSYSLOG= PARANOID= BUGS= \
-		AUTH="-DALWAYS_RFC931" \
-		AUX_OBJ="weak_symbols.o" \
-		DOT="-DAPPEND_DOT" \
-		HOSTNAME="-DALWAYS_HOSTNAME" \
-		NETGROUP=$(usex netgroups -DNETGROUPS "") \
-		STYLE="-DPROCESS_OPTIONS" \
-		LIBS=$(usex netgroups -lnsl "") \
-		LIB=$(usex static-libs libwrap.a "") \
-		AR="$(tc-getAR)" ARFLAGS=rc \
-		CC="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		COPTS="${CFLAGS} ${CPPFLAGS} ${mycppflags}" \
-		LDFLAGS="${LDFLAGS}" \
-		"$@"
-}
-
-multilib_src_configure() {
-	tc-export AR RANLIB
-	temake config-check
-}
-
-multilib_src_compile() {
-	temake all
-}
-
-multilib_src_install() {
-	into /usr
-	use static-libs && dolib.a libwrap.a
-	dolib.so shared/libwrap.so*
-
-	insinto /usr/include
-	doins tcpd.h
-
-	if multilib_is_native_abi; then
-		gen_usr_ldscript -a wrap
-		dosbin tcpd tcpdchk tcpdmatch safe_finger try-from
-	fi
-}
-
-multilib_src_install_all() {
-	doman *.[358]
-	dosym hosts_access.5 /usr/share/man/man5/hosts.allow.5
-	dosym hosts_access.5 /usr/share/man/man5/hosts.deny.5
-
-	insinto /etc
-	newins "${FILESDIR}"/hosts.allow.example hosts.allow
-
-	dodoc BLURB CHANGES DISCLAIMER README*
-}
-
-pkg_preinst() {
-	# don't clobber people with our default example config
-	[[ -e ${EROOT}/etc/hosts.allow ]] && cp -pP "${EROOT}"/etc/hosts.allow "${ED}"/etc/hosts.allow
-}
diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
index e37ddc9c2952..c6a037553529 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://ftp.porcupine.org/pub/security/${MY_P}.tar.gz
 
 LICENSE="tcp_wrappers_license"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="ipv6 netgroups static-libs"
 
 RDEPEND=""
diff --git a/sys-apps/texinfo/Manifest b/sys-apps/texinfo/Manifest
index 44e22eea9db0..25635243847b 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -1,5 +1,5 @@
 DIST texinfo-6.6.tar.xz 4946900 BLAKE2B bd33297549d5285d7a4a65041b6025c489c6b436e9591eaf5187ef34f6e869bf7a2a82a00ebe11adc1c4b2904119e9e3f25d2496b5507f91f4b9ba548ba98604 SHA512 96e0764d0808152d3662e65c3287fb0f86ed918912cdc036380637dbadaacd6a489b516543c07b08105686575e8d495a945f73e23ff0909d5a0f12026e4131e0
 DIST texinfo-6.7.tar.gz 9027808 BLAKE2B ac9a47ae98f27ae55ea1844c74ead6fba256635a56e7a226a1bbdd9ee9ab33565ff8cc7a874410afe6463741285c8fcfd8ff835ae2802009e2d0758405559140 SHA512 a52aaa2f0113c6f14b3cb94fbf7191770017ff6ce2016292770831279cfbb898c2f7f720adee620e08d9d80a9505df89a689ba0c25e92f6579b28b075f7b8ee2
-EBUILD texinfo-6.6-r1.ebuild 1343 BLAKE2B a7f7a4dcdbe6114be20b33b02996b594e8131c26680f30ba939bfeae5114a9911245a512a41755973328bc1d75ab01fa241e22551ea74ba32b770875edb767db SHA512 2995321a6ce47c7cc348aaededcfd55fdb852230560e04b16c6a8ed36e77a6d6e0dbb71a7525d64f18e7e9094b170f45971683f772138f5a406ad3b1617cd910
-EBUILD texinfo-6.7.ebuild 1676 BLAKE2B 86c012b99896ffe9c3c1394aa6c8220f4bcc1dbb75f366811cc0b9e4adb49fc734ffcf7e1f335b3cf77798502e321662403338b0b442bf8ceb39fc9c7a1d6944 SHA512 c4cb835dc5fd04fce0e47edc9c8e23fa97ca1133d080af29f1dd56c557726f1c6e6eccfa017e9e0349ed82e26c2066cfa36cc0c2a78eb6f1b36db6fb395b2f7c
+EBUILD texinfo-6.6-r1.ebuild 1341 BLAKE2B 3eb8e90287ba89dfdbe36be768fabbcaf535dd66d3c30861bd78137260deb84f7fda51e5b56fd956b487fb177b74e57a74070497f54d4d78983982962540d010 SHA512 ebd37082b6cfed58213682bb0f20d7c85b34a59a35e6fd4d72b3386aab905063c395e90fa88ed176d589efea532f5bcb4950cb75f9fa8bc3f4caf82a34246661
+EBUILD texinfo-6.7.ebuild 1672 BLAKE2B 4661011697a1fbfc43bc82dc543c6d872dcad0aac360842a4bb3b5195676e92fb5941a189083a4808eda0269354e6c8fe9ee3514bc91e0fd54d6719be92c725a SHA512 58875968b5a295a87bfafdf5b9da4c7fd488c224996fe16413b9f7eb15ff114f0f04b58883360e7f6eacd7e7e84d46f6ef7478aea256bee4dbd991fa44243ff9
 MISC metadata.xml 462 BLAKE2B 2e3c58437bda45610f7a2ed95cc8a1ec38c64b256e980816946e02ed6edaf69f20b152a1bda59f8d58f5af6aa7afe1e6dce219a2ba1624aa3f00c36028dfbe4c SHA512 b2015a2dc9e82b7284df86fe013d12f846d19246153526a8b48d1e5124682fd823ad1fb9b6276896b8f4e991efd3daead9e5d02cc43662e6f5be0cf11dbb6260
diff --git a/sys-apps/texinfo/texinfo-6.6-r1.ebuild b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
index 76be975837c6..8784dd988c4e 100644
--- a/sys-apps/texinfo/texinfo-6.6-r1.ebuild
+++ b/sys-apps/texinfo/texinfo-6.6-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-apps/texinfo/texinfo-6.7.ebuild b/sys-apps/texinfo/texinfo-6.7.ebuild
index 3fb41fee741b..df1e867f0029 100644
--- a/sys-apps/texinfo/texinfo-6.7.ebuild
+++ b/sys-apps/texinfo/texinfo-6.7.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
 
 # Note: if your package uses the texi2dvi utility, it must depend on the
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="nls +standalone static"
 
 RDEPEND="
diff --git a/sys-apps/ucspi-ssl/Manifest b/sys-apps/ucspi-ssl/Manifest
index d77233980fc7..68125987b9c1 100644
--- a/sys-apps/ucspi-ssl/Manifest
+++ b/sys-apps/ucspi-ssl/Manifest
@@ -3,9 +3,9 @@ DIST ucspi-ssl-0.97.tgz 112640 BLAKE2B ead9a3d720e9aee8855039ce3873f30d9766ad78d
 DIST ucspi-ssl-0.98b.tgz 112640 BLAKE2B 3b970525f8c3f9511daadfc2fda3840566e679b885acd3c17b0d1b2a775d837b59e9ccbbf5543614440366bedd8c24ba5f8f1c4d6b94877c7ef92d3859fdf652 SHA512 c9f6749048059f870b5221296ecb01d4b5c57c1d8c8b3574c67926b60569bce983f257afacfc3383b1b9a60d55b470a5a1548d2c19b0a505b953171a83cee12b
 DIST ucspi-ssl-0.99.tgz 112640 BLAKE2B da1974f59d2fece5877f645f5843311eadd509bfb715576a56b59bc79f6f9954eca9bad88bb36b055aa939d533a8b95b4fb3d3ae9ebde1081bcd6a51b60af5b4 SHA512 2fd29d0f6b31b54f2b53206c6ccd0cf35c759834f34aab26d2a883319d33ff2257163150fc85a2e450c7bd81ce7bbed7b59c4013d71a35a9b3446a6338cb406e
 DIST ucspi-ssl-0.99e.tgz 112640 BLAKE2B 6db975f412723da1c6c76ff1040c27001c2d5b2b0c8bb3199f37226c31cf1e48f629aa1f8234319c844f2ccf8001d6d9ffd7700da2ae57b6cb22177cfc1e56f8 SHA512 231ef75eedc4f52f46c1f7d6f44feac54069d859da206f9ea874d3a8082dead1be310cc4b7da1148564847b5b452b691718b7ba8076a03145e2002e9250182aa
-EBUILD ucspi-ssl-0.94-r1.ebuild 1219 BLAKE2B 5d983268514f120f34b8e444b56c479271a300011ff5e5ddde0a4af92a64711e017404210161efff93e220a5d714c7b619b35cb5acf3a9f2c89a7b9fbfe1a4b0 SHA512 cb24e3acd207e6e4b21e202cd385a24e877c1853fec636901355266dffc293f3369ee174862e5f0bba7e46237c2abc345c3321ad55cebff886e7c1c0442c8f0c
-EBUILD ucspi-ssl-0.97.ebuild 1288 BLAKE2B 04547e2c33643974879c126960bc208bac7d007bcdb2d81017ad5c44e2de85d8acbcfa90d636e76636044439a9aef25522efcd49a3f42f16d1c07126c4126e6b SHA512 810f075191c27a986a7957628558be109a81fc261482b3436d3209579874b60d30ad86bcce623ae6177985f857f6349e391826ded239d6b462ce399cc690ba9a
-EBUILD ucspi-ssl-0.98b.ebuild 1258 BLAKE2B b19e32a1fd08baef65b4172f0f61f5410465990eca943c5226209969ca1535c9d55399d35b45a754ef6586ebbf93f1e6df7f295e6b9968bee9bdb657d8224086 SHA512 53060ce9afd145f825b0f1a49a97bb919dc9e8392a87247d78a4b21d8037c5d6be1d5c0dcd301c73ce4aba262c426a0802e7a7f0a47a2bb58524e3f674d95abf
-EBUILD ucspi-ssl-0.99.ebuild 1258 BLAKE2B 63beb1bad75b6df9b7da52bef64bf9ed8273b761e82c081d8d42fbd697509e7656aadf48634b00070751ef1ae8709797a98f29d5f1c9b7082ae50d6a082c9416 SHA512 2b80055256cd96865211c288e37fe7edd7f2753a00a3730c145e49454764ca9d65ef37d67b8405606ee14f290967ceef1e84a54c1b5d3fb5f714ff33ab29b495
-EBUILD ucspi-ssl-0.99e.ebuild 1561 BLAKE2B effac81d17b0a11f979c08ae77e66c550903d2e6fca2ea2352b4f68d165cf0783a1020d6d27f716688c824cc9d3d843e208ffb48568cf68fe5067a8274993661 SHA512 d677de122e4fa7af5bcd7ceb9fd9f3969e6d27e26519072347427e1420e1aa5c7e1e9371b6c23fb5966cd541fd83f62f19ac0f42f1ab850f389706ecdd1b6df3
+EBUILD ucspi-ssl-0.94-r1.ebuild 1216 BLAKE2B 16f75a1835b7ccb6a5726b9125f6fba24a7b50e358ebd32419b3957c1bf1aa0affc2ba31e4cffb6b071ed13129e23f2e9f5df76d61dd815eeaed6ae453676653 SHA512 3b56c09a0c844db2169ef9b286df920dc188793bb5b7686cc8ec463497e6ed93e9c29e0fca206091936770ed349ae7f1d599cbc65dc5485df24c3d9adab33984
+EBUILD ucspi-ssl-0.97.ebuild 1284 BLAKE2B 909f26fb66bda9f2b963d7d125496eb29d15ad6a50cc50713ff5a171c1cc8ce6a7adeb8902ab4307dae07e7eb4a42b142907a05c2fbb7400efbdb8eea6b43395 SHA512 473dbba22b26f7167e97ffb91773a85f5bceb3545dd9648d365a758543d7d1afa0e128bd3bb67a5489dc1d8cbccec18664fa39cde4afa5f264bfc6d442938d36
+EBUILD ucspi-ssl-0.98b.ebuild 1254 BLAKE2B 343c3a29a1034913840a1e73427a71bf589afd22625fe5b4f9407a0625e92c66cd189c3b1ef866c3601e943734653b91487daa5ae76ea7a74490aedd5f3bff4c SHA512 5a05bdbec11af831d8e921722425a757acbd944877b474bcb5f7f62351efa60988bc84130ab41c63a3ff707b9b0d30dd32a26b9a6da312d6e65a0f4ddb73aa3a
+EBUILD ucspi-ssl-0.99.ebuild 1254 BLAKE2B fb0dc76802a85bf458c05104f2c7550bc57fff52db5edd82862866864e8705f93f237419820a9016714118bb32bd9bc445e672b273b264ebf6b4b5064e8a8c7f SHA512 efda666c5a18c291cabc933e2e59b396775d957a30a5249472d7ca21902a06437c198fde858679722e3d5cc559aabc88756c5b1e509e05be245bc95d0098fc9d
+EBUILD ucspi-ssl-0.99e.ebuild 1557 BLAKE2B f3a531cdfdc93002109f5ffa321761c6e02881720c204676847a79e0f013d77a50980ee608f412f109aca5202f820e07ebb617a4a735c39d72e400d3ec1f75d7 SHA512 29d2ec99ad7718cd980d2fc059c9dc4d663a8ce99e93ae2b694039702b14bb9f1f0c1abda2ae501a1997180c48ada32f3f2865564cabae42841162c401b6d1ae
 MISC metadata.xml 749 BLAKE2B 3b6d6b29627fdd626bffc49b35d559c21436b0e31fb0ea037f872a5f3bcd114902ef91eb2c4be5d78100b16622c8b8cabd745fd82cb41570085b70ae6c4f9c8d SHA512 3e9e1026800839e5ca908831406d77e5aca076edfaa62588c9b966767d690ff6ed1c396ee3cb2457259c26b10e5160a10ac38f70a0be1cad0bf262adfd661366
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
index 1eacdb410494..1b9b4c33e185 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.94-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~m68k ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ppc ppc64 s390 sparc x86"
 IUSE="perl"
 
 DEPEND="
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
index 4aedc6d67c98..ca948ff43849 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.97.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="perl"
 
 DEPEND="
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild
index b02355b0c476..aafef7060ff4 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.98b.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="perl"
 
 DEPEND="
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild
index 2aecf2465356..7d270cb39f74 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="perl"
 
 DEPEND="dev-libs/openssl:=
diff --git a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
index 6e5ce201a116..50b5ef4f3c93 100644
--- a/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.ebuild
+++ b/sys-apps/ucspi-ssl/ucspi-ssl-0.99e.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
@@ -11,7 +11,7 @@ SRC_URI="https://www.fehcom.de/ipnet/ucspi-ssl/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="bindist perl libressl"
 
 DEPEND="libressl? ( dev-libs/libressl:0= )
diff --git a/sys-apps/ucspi-tcp/Manifest b/sys-apps/ucspi-tcp/Manifest
index f0f05b688425..02043af249e8 100644
--- a/sys-apps/ucspi-tcp/Manifest
+++ b/sys-apps/ucspi-tcp/Manifest
@@ -14,5 +14,5 @@ DIST ucspi-tcp-0.88-ipv6.diff19.bz2 22632 BLAKE2B 8fdab5cfc82151adaf85d1ea611c57
 DIST ucspi-tcp-0.88-man.tar.gz 7562 BLAKE2B 8b6326665cb48dd37683a50f3fe4cb65eb2fe3c28dc90ed1461b5bd878e7a7713f01d654d7d93df63e3f7a113baa4b6abfb6eeb65fdfb820051192b36070eccc SHA512 e779d6d6b24a3af0edc362def229c657c704143e5f1dfba8d16d26b3e6bcacb9c8ceaabcccac61485a4719221c144bc0c36ebca5182985dca85a6d72101d4146
 DIST ucspi-tcp-0.88-rblspp.patch 6565 BLAKE2B abf13c4c7cc25d555c57e29e45ead89340f01c5ddee4cc27a7acfdfd51f1dfae441d3b82b79d792f6acbc78b4d82843f5af34f0a166f4b7eeee44711cd39b26a SHA512 f3212d9d3bb59ec3b1f2b2bd09a80dce1eeeaf082dea68f18350a3aef818ef221eccfeb4dc7afff5c3f9e59003ec40f5e37fff86a2a5ab3145be1fe81297c990
 DIST ucspi-tcp-0.88.tar.gz 53019 BLAKE2B 3327de31e225c851b43e40ae9d8c5e4d3b93e2c15ed6ef993ad9f4105d60f322c56797c45a37363258e7cd9a8d52a315d6a8d65686c5cd45d4be19781e40c233 SHA512 44efbd477dacf31d39fc970e2d2f74526dc815b905742f6127f0d5c80928ecc7e743089eaab0492386a58d5b97905113fbe8bbc7214ae179b7be27966b7566c7
-EBUILD ucspi-tcp-0.88-r18.ebuild 2114 BLAKE2B a6aa887aeb38fb91b6fbe50c6bd8c0643bb1696e5a48d6f0f6fc035ecc5c0af876860124d596395bea6b2c27095cd3db1d612c580d9835f62a06e378723354c4 SHA512 90d522a11e8a3ded47c9d20d321b1d9a5c042949b8bcd575f5db37a998067f25f62d5a3721bf3141128046a4b828a16fd1c08109b282cd0f5832019f5a09564b
+EBUILD ucspi-tcp-0.88-r18.ebuild 2112 BLAKE2B bf5be5fb337d5654fc191f089f26d5ea9451f5ba80f0a90691e507dc6733102cd11c708eee08e5a1f754f23b6e1a69ef586a3a53b40f87a654574634cf4f5ded SHA512 1cd1cbcd1c7e1611751c480263008f4cf0b0023d3226dc88cf5e84067c198a1e1d160ba18fbc5329edfb1c03b1c064bb0711e378eb4dfa34c4c87b6310c1a747
 MISC metadata.xml 600 BLAKE2B eee72034e2adba51553bf32dd54e0ec2026a97fd709cc828f28e22525dc66cbff4bdc8801f7c5b4fa655fdbd682ceeb71639f22094b96150cca02f7db538554a SHA512 8cc6d3b8383d604b971b5cfd48060d5190269beacd1060ca279cb5eb0defc54e36fd1972ccecdff5f3fa912ca0a80e177433226876ba72158e93a5a6c1cadffa
diff --git a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
index e0582431e66b..8dc460f3cca0 100644
--- a/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
+++ b/sys-apps/ucspi-tcp/ucspi-tcp-0.88-r18.ebuild
@@ -17,7 +17,7 @@ SRC_URI="
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
 IUSE="ipv6 qmail-spp selinux"
 RESTRICT="test"
 
diff --git a/sys-apps/usbredir/Manifest b/sys-apps/usbredir/Manifest
index 155cdd9b062d..0cbc710d3283 100644
--- a/sys-apps/usbredir/Manifest
+++ b/sys-apps/usbredir/Manifest
@@ -2,8 +2,8 @@ DIST usbredir-0.7.1.tar.bz2 329895 BLAKE2B 7017b1441c2265c9e58532bcc8718844e6f64
 DIST usbredir-0.7.1_p20170503-patches.tar.xz 8120 BLAKE2B 21c7a853b3d5329fcca45169e22135bce615c9422f314f680f1087014d64179bf26f07bdb377bcff48155f28a37dec82b0bee8bce4d868e41614b128fe61b95a SHA512 b281d7a1ee191746e5fbe655b21c0cd9b2cf9cd69d5f28d91ab41de2d62a7f3c5c2a42f3f9c40c73d61a57d89423d996f4a779ebdff8f9d088030c2a4c2a24a7
 DIST usbredir-0.7.1_p20180211-patches.tar.xz 12508 BLAKE2B 57479444752070147583a0cc2f6651a32c8a618756638ae04928dda7082214d501fb5122a0f5d02aca994be0a386a8e493628faa240f61987dbd02d2fcfa679a SHA512 993c7ad5faf66f249546e1a631a10cd842439486de029ed2fff049b70967cb0a6ad45fb773a1c97fd6811e246f4cc4c7482522393dcc74b26ba2646a83ac70c8
 DIST usbredir-0.8.0.tar.bz2 331349 BLAKE2B 0190b4ab35cd554c13b65d30756b7b018e7ce82c72e7dddbaf05b8a704bd8a25724c4ac4759e1b86dfadb64ad7ade75c05365ab9ae3152f8fa60e909bc5e183b SHA512 976274adf08f8691b0961f5238021e988a4347873d0c67576038f44cbdaf25c2bb325d8cede0a507933b719f9715b1508ccd1d8f52fccd36f13a7640553dc108
-EBUILD usbredir-0.7.1_p20170503.ebuild 1002 BLAKE2B 1b20606876b3108ada778473487cd9bf87a262eaf7c7f83250bd668eb0d18de4950ec5ca071956e3dda41607669d19d0473bd8314b70169c2ddc794e6f801154 SHA512 dd15acc054835c108124ba6930031564f4ebeb9d2595a93e692420569141d55dba64f98994d0e81b022c1b85b2321a11f6370dbde166d766ec8a21c7ffc4df73
+EBUILD usbredir-0.7.1_p20170503.ebuild 1003 BLAKE2B bb0837a9d6c069743bea46321fa5381cec6e0ecdab4d3cfa0a4a745a7ef0b388f399e6d4cfebc1d1a50a72e888360ef05edd7692d7ada755375973a3e60d75c5 SHA512 b8ec95d79b4761d79bde59f077057a33747c050df4388bcd94f8101afa288220be67ddb0d242cdadc897fb3e686685cba04e8a1c7b4c6f6d245a84d625a0c2ba
 EBUILD usbredir-0.7.1_p20180211.ebuild 1015 BLAKE2B 414cbca6d217eff50399838c4ecf2347cf21d9dd1e0db647f3226e29ef310acb23cebbf0cb070c04b576d24bc1319fdcb8287ad5d4dd844a966e37a41bbbf31f SHA512 9c0677daf7aad198167007d60b271af0a94f9d92315b2f3b9f0d1b2fa20c0a2960db10d6d4b10a07c73e3a9efc8d5843b06eed05d6a8a89d65882f2ae8f41d98
-EBUILD usbredir-0.8.0.ebuild 926 BLAKE2B b7dadb48b31ee86be59c7bd90aaf0bdd704478a197141616191d88402103edd18660c88b5df5276400b8ddb587daa0eb162a45a815728ae2165791655cf9dd1e SHA512 82df093a90bd05b86ce37ea937bb6311ed0b59aeff4f7c48c0d8c52119f7804fe216b8a45c50830fc0bb18307d9435430cb54b68ded07a1a84e56776e55b3919
+EBUILD usbredir-0.8.0.ebuild 921 BLAKE2B cb5af912db31f71676d02ee218879c5376001f874679e06fd98a287eff3f35608699195f7f68cff955a93679acef691671b34b11fa77ca2f4bd7864a85a6da43 SHA512 dd32eda4402a98211b51ecbd28423f967228f2bc7cc095679feae79de84234fb0fd6d13fd1da59890b9773496c35077efc3feda028ba57c200ee4d349d0861b2
 EBUILD usbredir-9999.ebuild 852 BLAKE2B e6a96cc5978957733801a69c92d4b47f39ddf81415bea571f88eb2c18e8b8f6a90af63f2cdc21c8d16112eecd941a997b8b5c70ade8fc17ab41cf5b94335ac9b SHA512 34ea35e062d41cce07d9985b3ffa6a0e666d1794f9cf964ed962eb809c9ae7da013d4e93bae501f3eabbe2e44c302e35e7c6ff0fb20309060caac6c9a1e7a54b
 MISC metadata.xml 381 BLAKE2B 63160ad268e74a23031e19d54e171504f751e2337e6dc059215942052518e09e945796ec6522828eee63fc872be396f9f47f85a8b1ad970904f764e7e5a222a7 SHA512 a4363c96453be6c53dff19c47739440d00f03b7994a2c993f9be0608f2a1b7a4ac8e9178a4784a74dd51b97cd0de37cf0aad209041f2b03c65864b2798f9684a
diff --git a/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild b/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
index 0bfe01839407..5b382fb4c5c0 100644
--- a/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
+++ b/sys-apps/usbredir/usbredir-0.7.1_p20170503.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.spice-space.org/download/usbredir/usbredir-${MY_PV}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libusb:1"
diff --git a/sys-apps/usbredir/usbredir-0.8.0.ebuild b/sys-apps/usbredir/usbredir-0.8.0.ebuild
index 0f05f9cc5063..26b14b7a324b 100644
--- a/sys-apps/usbredir/usbredir-0.8.0.ebuild
+++ b/sys-apps/usbredir/usbredir-0.8.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.spice-space.org/download/usbredir/usbredir-${MY_PV}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ppc64 ~sparc x86"
 IUSE="static-libs"
 
 RDEPEND="virtual/libusb:1"
diff --git a/sys-apps/usbutils/Manifest b/sys-apps/usbutils/Manifest
index ef82639fec23..37073eb2d8c3 100644
--- a/sys-apps/usbutils/Manifest
+++ b/sys-apps/usbutils/Manifest
@@ -2,7 +2,7 @@ AUX usbutils-010-fix-py3-support.patch 4251 BLAKE2B 46cb941e30da1b3b9f1a346bba58
 DIST usbutils-009.tar.xz 309608 BLAKE2B bb5d7f756241377e81aa8f5b074bb0ba36bc778698afaebf7054cdb153149e4f3808a7b172019434756cae8b33410643cd6a03a36277f80ead9b0f4446385fd9 SHA512 e5936a42615690c13e618655fc5eb4f414d9a84f85b860eaeb3bcf737258e05d299b09d1c5388d50c718626036ec8cac5d670ad567ceadfaab85f401f0744a8a
 DIST usbutils-010.tar.xz 308344 BLAKE2B 5f0ba85564acaf60faad0e187e7ed5c870056cf80a1e1ae888fa498429a7a9e28eaced49047f8f793bad3c59f3b515557054860286b17d9f89f915d0db5943cc SHA512 8bc197307bc34b38c406c58c939be32f0b20ce9d3e7c977472fe4c3d47e791765432e381fd8d7393df621bbd4bf159ca24a08b22441770e7ae464e767f99a2e3
 DIST usbutils-012.tar.xz 98388 BLAKE2B a19d64edeb08bafe3e6a0d6be7cb5196cebb68623cfb5cd21941f109a3f3def774382bc6fe8b68398278e530417190030c8dd39ab982c088329c7acbb36cb672 SHA512 e26a60229e6eed5de670d6511dd1fa5ee3453cc5a848820531b46a1678b69378a2a45c29e24a218a8e7065c2c345356f03a2992f8298ddae6c8026d181f8de66
-EBUILD usbutils-009.ebuild 1141 BLAKE2B 7dafaa8d528e1f2095862f7310ae8d2ee0651e882fd881e03425e64041114f53971c43bd8e9fe69eb96442648ece4e51dd0cb0b665ca9a4f4bc7b5ee20a8ae3a SHA512 d08c036a755d00ba73f957f2658a254b819b7debd386bf58d409807d0d43d9f27c73e3b41ba28a9f99e8367946b3d8a432e634f79903d6384ebc7903e152e497
-EBUILD usbutils-010-r1.ebuild 1241 BLAKE2B 37603518aca357db776cde20bcb2cb413282635e1babfe0895d140b92262a184013ab08314799d2d9d68af5070b1ae6c499f04ba5828514aab2334f17e855c97 SHA512 fdc8a456417892b4d1d704f6003d08a80063522d7fa5ce8a3f7f1b642f45112b9916aa7f1fcaeaade152d83b31c2f9331df684c1c0ac61aef625263ccea8fbba
-EBUILD usbutils-012.ebuild 1209 BLAKE2B 525c92c7a2608b979c74b673c7a53d39d7cd8f38a00821bde0e97ce10a8710b829d2abe99e907f4d247f7b6d17ab4848950e06d279e6d1cfd524ea4848c5eae2 SHA512 4f98c4647320057b479d203233b9a3ec189beec1a66fa3fac0ac199e053b2707858ed81c5f47b9d0700033885024fcb65a04f9ead07a07f2cda0ad9c30632e2b
+EBUILD usbutils-009.ebuild 1139 BLAKE2B cc72a1ab065ee9947ac22decfe1d6b575df4944770c00b9a4b180c7b71460e32c1790e6399ea889398dd62d166b66a9d0e1e28deb833abfed55c89b8d75d3820 SHA512 818ab89f33e3bca698193c4b1d4a3251d07152484bf5603e9ab18cd4c791886a51b99104ed074e1cdad5b60b34eaf21c3dcef91810a0a1dbc14a700dcf8f4384
+EBUILD usbutils-010-r1.ebuild 1239 BLAKE2B a94afb7eb31a9ba06e56471b53292a5e3bd2206498055fb2d430f1cf212ce53d121ed0e08d2c7d336b793222b20bcc02bc7720227db3087691818b9f5edbc924 SHA512 38a91537821ef52943f7163b49e1359e53bf6082909a9d8906fbeb5196b48df039d6db9780a761bc57082cf66fc74470e36eedecf4df1014e2aae89cc3366544
+EBUILD usbutils-012.ebuild 1205 BLAKE2B c0a42d00e9388631a120d9c9eebad5d8405f6c696256eabf9319adbd8a793f16f5d4993e7f22144e5a694405df95e0afa2b2b31f6f787ec8428e4af0a505c3c4 SHA512 3e263fb634360f066f64f0db977597cf95faa5d1a3271894223056cfb424a0a7447c3ad248cb175aa1d6cdba8effe9b32859b1e7134d704ab761df5ff29d64be
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/usbutils/usbutils-009.ebuild b/sys-apps/usbutils/usbutils-009.ebuild
index 4b0c304ebe55..c1ee7bdbb81b 100644
--- a/sys-apps/usbutils/usbutils-009.ebuild
+++ b/sys-apps/usbutils/usbutils-009.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/usbutils/usbutils-010-r1.ebuild b/sys-apps/usbutils/usbutils-010-r1.ebuild
index 911395f9fefb..d50fb6601140 100644
--- a/sys-apps/usbutils/usbutils-010-r1.ebuild
+++ b/sys-apps/usbutils/usbutils-010-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${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"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/usbutils/usbutils-012.ebuild b/sys-apps/usbutils/usbutils-012.ebuild
index b426a3157d3b..7f1f23f3b167 100644
--- a/sys-apps/usbutils/usbutils-012.ebuild
+++ b/sys-apps/usbutils/usbutils-012.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/usb/${PN}/${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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/utempter/Manifest b/sys-apps/utempter/Manifest
index 65d0c81cfb3e..7189641f0caf 100644
--- a/sys-apps/utempter/Manifest
+++ b/sys-apps/utempter/Manifest
@@ -1,5 +1,5 @@
 AUX utempter-0.5.5.6-fix-build-system.patch 1168 BLAKE2B c513d18115a7a78e2c4d381f7ae650aa56de4d0833fa7c610948da072c4a1e85ae6832517012dd0c04ca91f4c3cb51d8b3b332c58b66b0716c63e3576917fe77 SHA512 a2febc07a01e0f9f95c8c846616d8f46e74e3db2ea66af720539f6825019dd05ab5472507210945c5caf84566584ab01824ebf0f16e51e7012f1334fc5a920b4
 AUX utempter-0.5.5.6-no_utmpx.patch 666 BLAKE2B 9ee0c3634b87ddd50d50f81811f749f615e4fad8dc27b9fc97cc1b61ffdd64eb5045910457547b2cbc245c593490ab354e3a7f5a5965a8aeebf330c6b32d4889 SHA512 4cdc7616f1b886b74fa39272f502fb9eb303047c93be57122ba32517f49a0274e4f7e02b25ead9dd9b60584610a576cb2d78c6350350b3d8364ccd903c3dafcf
 DIST utempter-0.5.5-6.src.rpm 21099 BLAKE2B a4a8c53ab31d53ec56d60a16e5c1d3a0a2ec6c73c3c3025c15dfc389da75f969545392b46976017cfcde1d9f9ca974b14786bbf39709aebdda890df13a7866ed SHA512 81eeac830631922f2d1b2099a559b60bfd21818b38a524d3c5f61aec143b3e70e95a9ccc300f649dd81f515837fe3befaba6b93bb2e22767e71eee7acb711655
-EBUILD utempter-0.5.5.6.ebuild 1176 BLAKE2B db00782251d522fbea0dc31b1f0d1b4691ab8ef5ce923953575e321ac4496dbb66d69099e6662a6d1805247b14064efbb4242d01142ac3ae13b30303bdbd7413 SHA512 51b4e93e9e4c7861f01f44a44b2292f32fb4fa28196252275d7d86d93d6a5801f4f970fe0ad30b53dd6f525eeb5b6b8a03cdf9c6031db81c41795af315d40b55
+EBUILD utempter-0.5.5.6.ebuild 1174 BLAKE2B b3a844c7f1b07cd0c12b537428509eedff05ced99af89d4c479e69a17db9d3eb9ba6630586457ba11a85080c64b74018ffbc25723773d9e477ede8d2ef1156ea SHA512 04e33c849eaf4324536dfef542c2480fd948c7cc9570b261b7c05d96d54148085887cad9a860f9c49d2af8c28a86649f5a4e004e1cf3b52d32821e2eb6bd6436
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/utempter/utempter-0.5.5.6.ebuild b/sys-apps/utempter/utempter-0.5.5.6.ebuild
index 3a15dcf1f760..9c46d738db2a 100644
--- a/sys-apps/utempter/utempter-0.5.5.6.ebuild
+++ b/sys-apps/utempter/utempter-0.5.5.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${MY_P}.src.rpm"
 
 LICENSE="|| ( MIT LGPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index bd6aa2d19cc5..33bbbe6d5eb0 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -1,13 +1,14 @@
 AUX runuser-l.pamd 188 BLAKE2B 4fbd934c05386732b32281fdfac19153f01e0610868f3168026fbc4eb828ed1fe177677939958322fb074a95c8f64bdbaea42a4e9c039ac86dee0154ac96242e SHA512 86538adbd3d01c4b9e46fee00c38d298d2857fb1224461206425532404c212f03331308b74347c9af2e00583a3b50802085bdc6cb2bd393cf5e9d032e7290301
 AUX runuser.pamd 278 BLAKE2B 61afa98e02a4ee030176dad97b7aa7d7075b07584c0e9f2c254f90bf22f6bad7ad8d87cb6d7c95efb789dcbec01e266c3192e135a3a36d817ab47c6bc05e7a01 SHA512 a4c4d41078acdc7c7f1d1f1894d20d052d3d5a3c66d5680d7f76665e251c614fd76ca9678a27ea376147f49250c716a1b3b0c0afa9595bd74d26d2190d1680fd
 AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d61596f125045a633865d088b8b9f2c1bfc828b90d1700dd2095e7c0a3220e40e6bef3db5f87fd828a018f9db9b774202f23722f460dce3a45a SHA512 eefdce290ec4a025e259d71a42fedb949e725ade512417800f043203418ccb9404673758a406a9ce5a144a5db8ee953122a4d0893f6d511e4f30a94482a20a6a
+AUX util-linux-2.35.1-cleanup-pidfd-include.patch 1117 BLAKE2B a207824f36b2167f721b4420b5de47462cdc3f12187316ee0ba37bebd1561aee0c591a522cb9cf7f24986322e1954f1fab1e6fe1751dfebc116aec12f70cc81e SHA512 315b5aabad68d3363f1a06034c22347d755ead4b974fd7879ce41b29953b41be510705a4806577710bb8e9d32a8034002f6868fea287a214640c80324754ea00
+AUX util-linux-2.35.1-include_sys_types-header.patch 1774 BLAKE2B 813067f05881846cc0a3f7a06595900aae05e53a18de8d9660c9254326f1736dab701bb16185a2906d75372503d0bf1ac275456a0b213d0545e29ad752fc16cf SHA512 e02c1d4ed4c719c35eb8413c8cdf1868f571937ecaca13e3d5db4f82b690376ae92b4f75c25538e28fbc9d4cf5a1699e34e820d0a2b3e26d3354e916e3524f73
 DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749
 DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
 DIST util-linux-2.35.1.tar.xz 5138360 BLAKE2B 08c16d4d9fd670b62c2d664feda2cfa53d0cecc36bbaa2c3ed5960bf70f905f11caa7a904c63f36e12b472f10b8e781351cca0cf2f858c2b66e4fd0204b1c456 SHA512 6e27e08bfc02378970f015decfea5a52d6c342c4c8f4ac48dd07d248485eb797e506d91d290dbbca344c3e5cfe1fc150db80a23d510367427232f5abeabe591a
-DIST util-linux-2.35.tar.xz 5137796 BLAKE2B fbd3124284d50e1dc3fd158f77969057c628e111ee489a920896cfbd93186de4cf1ea97f41854171f824e4b3042968d860827557a8d46aeadcfe5ef976e71222 SHA512 c95d26b9037d6b877a247e6aeb58d17aa80f7e1bd6b523a4e0fde559fe07b3d924ece6d373300fefb65d1f206b3f990aeddb3a03605040e72ce6d6ee88591021
-EBUILD util-linux-2.33.2.ebuild 8552 BLAKE2B 0a1101f73a337501c8862f0414ca908f01623a0dbe1f7398d611d42d53e35f0e15a55074f33cd1cbe576aba1d3b49d6663fa1c408468f1056b9454caba274501 SHA512 076b002b0baa8bc33a1795a92554c7e0f3bb312ad3b49a57dc8c66e03837ca9072db941276f42a9a2b1ce6ad69228280be5f73559c7f23101bc41296c2cae97c
-EBUILD util-linux-2.34-r3.ebuild 8588 BLAKE2B 75e9f7900d1d05c4c3f5b082c15206c3acf64e90c616e3271c0faf947ed8336ef0ccfb46b4393b531a9c8b271823eb4df8ec210b7c3acd03861ad7db2f5bbd87 SHA512 aedd7148e0a25d921829d6f108e5ce7d1927877b2dd3c01d0eab5020ce2a297173693f90017bd3503870ad55e98e098aa7f0f233831c80aff0bff24be4f2f71b
-EBUILD util-linux-2.35.1.ebuild 8681 BLAKE2B c20681d3125451fbb09de215afbb46187d9e2bee9b0ff601ba24d110e8116879bc0c718c838afabf9dfc2acbae88b34eecd5cdb73683d5d8c12ad831029cbdca SHA512 f5270f461889b89c03f31c442f32fd6de9d544387015c44523a8e3e83255466034adbe020960d4fb45769aafa44d7c72880b3d0453b049cf9c5c08f10cc83a28
-EBUILD util-linux-2.35.ebuild 8655 BLAKE2B 3bd3967e2bdabfc38bf154a5967c0f6101c78af0b7ec5bc5df977eaeb5b9c072a0825d3d68d428bd74a0304655bcdcfaca045f5e7f36594874129b77e964f99d SHA512 51bc9d69d70874f8ce68e30db2d38652bc26dc6af0fdefb585ab59796b2a3266307c402f579b6e9bca091b199d2b73b2eb9ca18e30ab25ccf0cb932bd9fd9d93
-EBUILD util-linux-9999.ebuild 8688 BLAKE2B 28cd40ac3b40daf69c3d93797dfd55029e3722e4a207746209f96831c1323b07ed87966720b1250071fc4bc55e946476e594e8998ce9312514db76edd6406282 SHA512 3ba05891ede3c2bf56a137988b1a82b0d2ccfe4ebdc55d095a4b21c2a062cd3463d8bbf3950b7dc7739c784d6a9e5e4814921867314a7a0c63566ba29b0eb02c
-MISC metadata.xml 1260 BLAKE2B c68fc8a1ab1ed6a5e8e8e09571adab4f0e6c539c7ce45434730d0bf7c039cb886b1a5273f0b41d5c00cd7188143aeedba9be70cd4eaa024f4e71503dc7f88e6e SHA512 701f00691c6fde1fcd3be15e9daa2c067f3b676b80a05d5131bf39ef111d652ede31bf2c45db1dffdfd81e523983a85ea96ed9b6ae0fd645b2203ac5c3afb508
+EBUILD util-linux-2.33.2.ebuild 8550 BLAKE2B b3e6e34a682982a203416bb32b9bc482e7a5ab2ed32121492f5dc5b050449cfa082df301c49464919cd55f6ec5d59e19ce026460d7dc79ce884cfdcbfd2f171e SHA512 d03dfa8ffa3e3b64efd5fa8b50b90764396c3fee11cd522a4e41c06740c83083be384d80f2013313c975de74f8c59ee943432a7dd536b5717978a6e45a6ced63
+EBUILD util-linux-2.34-r3.ebuild 8584 BLAKE2B 9784e46b22a8a9ea83459dabab76b0721502d8ee6e6356c63c7b638c009bec3fec70e111020a6794b71ea97de897caf0cbb98619bfe27f8ca2f2fa083318b6ec SHA512 658f1f0fc07133c3ef4e87cc39cfbb263d0ee1132393e96d4ff6b0d6fd2e74f34b67d7f886dd6b374f65a486ca5a0f12a8dc0c7da45c7ab377bc29cbac31568d
+EBUILD util-linux-2.35.1-r1.ebuild 9099 BLAKE2B 304a8fce27ac4c7f0b98f3fb6193c3fa73ce05c3858f26e8cd6e8b418a94b89e89fcb14c32d1429aedeac5bafdc9c2748c7b466417f6c04bd9b28c0917cb778a SHA512 73f9265571b0d848977304648b04bec8f7be48283b00986a6a7585bf46ca922d0e1db759febe4b08c924dbce93a126f0cd82f45c6252a6b6d694220f1c814cf9
+EBUILD util-linux-2.35.1.ebuild 8815 BLAKE2B c85da11208ba2e9f080ca3963e0980af6542a2e129dea7d97187ad22835fb91f96ea4008fb98031ef2dde38db8dba10e25df5ed9b57133c3bfa07cc138d1e1e7 SHA512 da76bcf689f7a0ed0bd24dfccc85da8057837df8ecf798b98da6c41ffb801b4a308bf75cdd07099bdf1229fb04f87a18938e4a2ae8ce805ce64ff6e9b163248d
+EBUILD util-linux-9999.ebuild 8974 BLAKE2B dea4a1e61f4f7c80bdbf278bd41e7bdb6903f7b91df9c142b24ba2ee50f86fa7ccb6fc756f2faa3bbc925cd6a4103932ba9fda3f6fd6657efb00d89e8a7ac1a4 SHA512 6c1fc66a7faeade9c99412036ccca1da7ab65b3586e7ccaacf13ccf7643c7035f2d7073eb9354b4dce36a38bc37bb1d3cddcca620dd09ab4a4c6ad0e4abc65c9
+MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/files/util-linux-2.35.1-cleanup-pidfd-include.patch b/sys-apps/util-linux/files/util-linux-2.35.1-cleanup-pidfd-include.patch
new file mode 100644
index 000000000000..85e4d705735c
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.35.1-cleanup-pidfd-include.patch
@@ -0,0 +1,36 @@
+From 0a4035ff2e4fd5b5ae0cf8f8665696c2aff53b75 Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Tue, 10 Mar 2020 11:43:16 +0100
+Subject: [PATCH] include: cleanup pidfd inckudes
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ include/pidfd-utils.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h
+index 0baedd2c9..4a6c3a604 100644
+--- a/include/pidfd-utils.h
++++ b/include/pidfd-utils.h
+@@ -3,10 +3,10 @@
+ 
+ #if defined(__linux__)
+ # include <sys/syscall.h>
+-# if defined(SYS_pidfd_send_signal)
++# if defined(SYS_pidfd_send_signal) && defined(SYS_pidfd_open)
+ #  include <sys/types.h>
+ 
+-#  ifndef HAVE_PIDFD_OPEN
++#  ifndef HAVE_PIDFD_SEND_SIGNAL
+ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
+ 				    unsigned int flags)
+ {
+@@ -14,7 +14,7 @@ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
+ }
+ #  endif
+ 
+-#  ifndef HAVE_PIDFD_SEND_SIGNAL
++#  ifndef HAVE_PIDFD_OPEN
+ static inline int pidfd_open(pid_t pid, unsigned int flags)
+ {
+ 	return syscall(SYS_pidfd_open, pid, flags);
diff --git a/sys-apps/util-linux/files/util-linux-2.35.1-include_sys_types-header.patch b/sys-apps/util-linux/files/util-linux-2.35.1-include_sys_types-header.patch
new file mode 100644
index 000000000000..8c646ee73a9d
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.35.1-include_sys_types-header.patch
@@ -0,0 +1,58 @@
+From 3cfde0370d3a8949df0c5bcf447cec6692910ed2 Mon Sep 17 00:00:00 2001
+From: Sami Kerola <kerolasa@iki.fi>
+Date: Sat, 15 Feb 2020 21:12:50 +0000
+Subject: [PATCH] kill: include sys/types.h before checking
+ SYS_pidfd_send_signal
+
+Including sys/types.h must happen before SYS_pidfd_send_signal is checked,
+because that header defines variable in normal conditions.  When sys/types.h
+does not have SYS_pidfd_send_signal then fallback is defined in config.h
+that is included by default, and has therefore worked fine before and after
+this change.
+
+Signed-off-by: Sami Kerola <kerolasa@iki.fi>
+---
+ include/pidfd-utils.h | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/include/pidfd-utils.h b/include/pidfd-utils.h
+index 593346576..0baedd2c9 100644
+--- a/include/pidfd-utils.h
++++ b/include/pidfd-utils.h
+@@ -1,26 +1,28 @@
+ #ifndef UTIL_LINUX_PIDFD_UTILS
+ #define UTIL_LINUX_PIDFD_UTILS
+ 
+-#if defined(__linux__) && defined(SYS_pidfd_send_signal)
+-# include <sys/types.h>
++#if defined(__linux__)
+ # include <sys/syscall.h>
++# if defined(SYS_pidfd_send_signal)
++#  include <sys/types.h>
+ 
+-# ifndef HAVE_PIDFD_OPEN
++#  ifndef HAVE_PIDFD_OPEN
+ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,
+ 				    unsigned int flags)
+ {
+ 	return syscall(SYS_pidfd_send_signal, pidfd, sig, info, flags);
+ }
+-# endif
++#  endif
+ 
+-# ifndef HAVE_PIDFD_SEND_SIGNAL
++#  ifndef HAVE_PIDFD_SEND_SIGNAL
+ static inline int pidfd_open(pid_t pid, unsigned int flags)
+ {
+ 	return syscall(SYS_pidfd_open, pid, flags);
+ }
+-# endif
++#  endif
+ 
+-# define UL_HAVE_PIDFD 1
++#  define UL_HAVE_PIDFD 1
+ 
+-#endif /* __linux__ && SYS_pidfd_send_signal */
++# endif	/* SYS_pidfd_send_signal */
++#endif /* __linux__ */
+ #endif /* UTIL_LINUX_PIDFD_UTILS */
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index d707189c1c8d..121dd51cf546 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -6,6 +6,7 @@
 	<name>Gentoo Base System</name>
 </maintainer>
 <use>
+	<flag name="audit">Use <pkg>sys-process/audit</pkg> to emit audit messages about system changes</flag>
 	<flag name="caps">build setpriv helper (run programs with diff capabilities)</flag>
 	<flag name="cramfs">build mkfs/fsck helpers for cramfs filesystems</flag>
 	<flag name="cryptsetup">Use <pkg>sys-fs/cryptsetup</pkg> to have built-in dm-verity in libmount</flag>
diff --git a/sys-apps/util-linux/util-linux-2.33.2.ebuild b/sys-apps/util-linux/util-linux-2.33.2.ebuild
index 479dd486b007..6e89832ebda4 100644
--- a/sys-apps/util-linux/util-linux-2.33.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.33.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/util-linux/util-linux-2.34-r3.ebuild b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
index 60611bb1505d..92f5cc3aaa24 100644
--- a/sys-apps/util-linux/util-linux-2.34-r3.ebuild
+++ b/sys-apps/util-linux/util-linux-2.34-r3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/util-linux/util-linux-2.35.ebuild b/sys-apps/util-linux/util-linux-2.35.1-r1.ebuild
index 07268ccec448..c7848ba55183 100644
--- a/sys-apps/util-linux/util-linux-2.35.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.1-r1.ebuild
@@ -16,26 +16,31 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
 DESCRIPTION="Various useful Linux utilities"
 HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
 
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
+LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
 RDEPEND="
+	virtual/libcrypt:=
+	audit? ( >=sys-process/audit-2.6:= )
 	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
 	cryptsetup? ( sys-fs/cryptsetup )
+	hardlink? ( dev-libs/libpcre2:= )
 	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
 	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
+	ppc? ( sys-libs/librtas )
+	ppc64? ( sys-libs/librtas )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
@@ -75,6 +80,11 @@ RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/util-linux-2.35.1-include_sys_types-header.patch
+	"${FILESDIR}"/util-linux-2.35.1-cleanup-pidfd-include.patch
+)
+
 src_prepare() {
 	default
 
@@ -162,6 +172,7 @@ multilib_src_configure() {
 		$(multilib_native_use_with udev)
 		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
 		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(multilib_native_use_with audit)
 		$(tc-has-tls || echo --disable-tls)
 		$(use_enable nls)
 		$(use_enable unicode widechar)
@@ -191,6 +202,7 @@ multilib_src_configure() {
 			$(use_enable hardlink)
 			$(use_enable kill)
 			$(use_enable logger)
+			$(use_enable ncurses pg)
 			$(use_enable su)
 			$(use_enable tty-helpers mesg)
 			$(use_enable tty-helpers wall)
@@ -272,6 +284,7 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+	chmod -x "${ED}"/usr/share/doc/util-linux-${PVR}/getopt/getopt-parse* || die
 
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name "*.la" -delete || die
diff --git a/sys-apps/util-linux/util-linux-2.35.1.ebuild b/sys-apps/util-linux/util-linux-2.35.1.ebuild
index c3759ac85c74..9153eb2da129 100644
--- a/sys-apps/util-linux/util-linux-2.35.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
@@ -76,6 +76,11 @@ RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+	"${FILESDIR}"/util-linux-2.35.1-include_sys_types-header.patch
+	"${FILESDIR}"/util-linux-2.35.1-cleanup-pidfd-include.patch
+)
+
 src_prepare() {
 	default
 
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 66feb7a972f4..dd30ee98905d 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
@@ -25,18 +25,22 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 LICENSE="GPL-2 GPL-3 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="audit build caps +cramfs cryptsetup fdformat hardlink kill +logger ncurses nls pam python +readline selinux slang static-libs su +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
 RDEPEND="
 	virtual/libcrypt:=
+	audit? ( >=sys-process/audit-2.6:= )
 	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
 	cryptsetup? ( sys-fs/cryptsetup )
+	hardlink? ( dev-libs/libpcre2:= )
 	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
 	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
 	pam? ( sys-libs/pam )
+	ppc? ( sys-libs/librtas )
+	ppc64? ( sys-libs/librtas )
 	python? ( ${PYTHON_DEPS} )
 	readline? ( sys-libs/readline:0= )
 	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
@@ -76,6 +80,9 @@ RESTRICT="!test? ( test )"
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+)
+
 src_prepare() {
 	default
 
@@ -163,6 +170,7 @@ multilib_src_configure() {
 		$(multilib_native_use_with udev)
 		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
 		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
+		$(multilib_native_use_with audit)
 		$(tc-has-tls || echo --disable-tls)
 		$(use_enable nls)
 		$(use_enable unicode widechar)
@@ -192,6 +200,7 @@ multilib_src_configure() {
 			$(use_enable hardlink)
 			$(use_enable kill)
 			$(use_enable logger)
+			$(use_enable ncurses pg)
 			$(use_enable su)
 			$(use_enable tty-helpers mesg)
 			$(use_enable tty-helpers wall)
@@ -273,6 +282,7 @@ multilib_src_install() {
 
 multilib_src_install_all() {
 	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
+	chmod -x "${ED}"/usr/share/doc/util-linux-${PVR}/getopt/getopt-parse* || die
 
 	# e2fsprogs-libs didnt install .la files, and .pc work fine
 	find "${ED}" -name "*.la" -delete || die
diff --git a/sys-apps/watchdog/Manifest b/sys-apps/watchdog/Manifest
index a9c5a26d61a1..7be8332ffdd8 100644
--- a/sys-apps/watchdog/Manifest
+++ b/sys-apps/watchdog/Manifest
@@ -5,5 +5,5 @@ AUX watchdog-init.d 861 BLAKE2B 5fbda896379eb22d6beb50c7839f9c10c463cea5491b7447
 AUX watchdog-init.d-r1 773 BLAKE2B 7d5bdf4e349f558f12e8250de5abf39278e3d7bfa5344225ce717cd3575573853f11feef8cdc3aa526280f717f9ae43bd42191789ddf81bb4beb32afc8f38bc5 SHA512 c07f0e3f026a86ecbcaa839c5711420fe00433a9ce84c3a7e3f4de4a1d90bc5ad6646561acaa1d1df2d1adb638dd6817497c4c538574ac894deb6c7451b2964a
 AUX watchdog.service 146 BLAKE2B 9a0a28cbc4509590c98850bf31355e991fd298e52a1fce0a7b6925554f24b80c76adf76bee20790e0d100c8372e4e35a3b0826d6192267f5addf7155d414cf4c SHA512 5eb489e72351db8a881d84fc15730a91ca2a108641031196ad5374aec5e01fa5b859872fa27c3382b4637482a5c8dab7efa61057f4663ae6c49c4ed01e9d8abd
 DIST watchdog-5.15.tar.gz 228132 BLAKE2B 040badcf66f048e2873c335a4dd1b5dad6716c61534322c0c92dad2238049555af40e92612a260507fddd4c284d7ccb5d362dc1660084fd0a7db2c522b1ea323 SHA512 a675cfadf3296d583b9163193297038fb19459daf7c6681289392d613e775e75b7afd42a3e01b136a955f25b2f45818033b56e10de9050075d7dc015535a6e75
-EBUILD watchdog-5.15.ebuild 976 BLAKE2B df9f2e8807f4bb88dc90f5e59e82960bc35714d4643a4eb1fbffe1890303bf53f760cfb52a8d058158641c6fbd991b4cec6ca80f228fe2f9d00e6f2fbfbb8b01 SHA512 235d0ee4af23297d80450c1a6c667421ea67d2676c4b95b8cbea9acd1c8520438eea1cb9ec1e4a9d2ee19def563f33f1ee512f7092ac38c9c9adabd828cd8dc4
+EBUILD watchdog-5.15.ebuild 969 BLAKE2B f7cd5a3efd5ba719eaad6c24e87a5255b6e657ff50d5a079f14f085fa4991fd5cb325ce0ef1daa419d1d3c82c2bc5bac88260dd75abacd23a74cd21d00668a9d SHA512 a5f8b3f6591896e29d140d63d2b05d5e50efad3920540db7937880b73dcbafa82da8b54fc32ee880d82697a07288403e7575d7797707c807a508a3a412a967ce
 MISC metadata.xml 405 BLAKE2B 47880df93bf397e1a7d905a0ade7c385eb7f97ca4e99fd5687f15147adb093da1312f518b6179d7ab9095a355d73147091787a0d3dc90200cef3e8cf7320a8c8 SHA512 36da0e0199b41608190b0e39de2b82bea5516890208c57744b93e527904501de01b1bfd4e20fc74450bd7b9ac4d152e0d57e31a35deca0b1edddc9ce60846d0b
diff --git a/sys-apps/watchdog/watchdog-5.15.ebuild b/sys-apps/watchdog/watchdog-5.15.ebuild
index 1907cbce3c03..889279958581 100644
--- a/sys-apps/watchdog/watchdog-5.15.ebuild
+++ b/sys-apps/watchdog/watchdog-5.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ~ppc64 ~s390 ~sparc x86"
 IUSE="nfs"
 
 RDEPEND="nfs? ( net-libs/libtirpc )"
diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest
index 107cd1ee2005..0924bda7e87d 100644
--- a/sys-apps/which/Manifest
+++ b/sys-apps/which/Manifest
@@ -1,3 +1,3 @@
 DIST which-2.21.tar.gz 149305 BLAKE2B 355888b0dfe3e4e1679a8a9e1255a935fa48be220408abc441fae69fe0b26bd39e0544ed20e75497ed5bccaa75e788d9aec17007c668f15eaf6b1599faa131a0 SHA512 d2f04a5c5291f2d7d1226982da7cf999d36cfe24d3f7bda145508efcfb359511251d3c68b860c0ddcedd66b15a0587b648a35ab6d1f173707565305c506dfc61
-EBUILD which-2.21.ebuild 667 BLAKE2B 29045687ce2fdb43593c8982877bc09cc967ab4e8699b0acc2a0c881b28f311903087abcba1cbdf5a0b1c451c5cc58f0de636b54b6903dfa1e8939d35e3785d4 SHA512 ccbd0224094e9ef8c1ef248876e023bab46c656a53759fcff2c25191dd34c9df417f781545d9503a47eaa0aae3444f23d34e98cbaa5629e49fd8e74a5d8bb1e6
+EBUILD which-2.21.ebuild 665 BLAKE2B ddaeb6250aedd674a4c741b244984f4546e8a4869dd0ab08295928fc7b276080541cc016dffa4d4c7a5a29ef2406313186701f094cde9c106f4bb2a4e60d5352 SHA512 e670f2edd07eaa458940c577451cb2667632d6a9d1eac42ac795e26a2a7e435ad830666a1f70764be24a9ae87a772445ae15843c8e054bef057ca278cf63b6f5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/which/which-2.21.ebuild b/sys-apps/which/which-2.21.ebuild
index aac86a2c22d9..55cae282aeb8 100644
--- a/sys-apps/which/which-2.21.ebuild
+++ b/sys-apps/which/which-2.21.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://carlowood.github.io/which/${P}.tar.gz"
 
 LICENSE="GPL-3"
 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 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=""
 
 src_configure() {
diff --git a/sys-apps/xdg-dbus-proxy/Manifest b/sys-apps/xdg-dbus-proxy/Manifest
index 2da21c13c317..d1ac6ddb18ef 100644
--- a/sys-apps/xdg-dbus-proxy/Manifest
+++ b/sys-apps/xdg-dbus-proxy/Manifest
@@ -1,3 +1,3 @@
 DIST xdg-dbus-proxy-0.1.2.tar.xz 119264 BLAKE2B 9f9fb561dd434e146636dd2e78275065c3f249b0486b1cb09ac0df2a2a9bd534f84192bb6f0f4b0627d47b9d490e3f5c10a6a4dca67d36a2465e4a971b28c64e SHA512 c76460e365778efeb1ef7cb9e479491afd1dc270680d108e7ece82b27be30bb4f958d4d218ac7d4497dcc749da25437f62119003866dcdeafcb6cea843dcbe1e
-EBUILD xdg-dbus-proxy-0.1.2.ebuild 544 BLAKE2B 3933580d7434b8dc1fad0a55b1c3deefe13a4f20366398cb441b0df0f029a72407fc92266cfcb288b64470ffaf4bae6fcd1fcbe42451274f08a2e43708fe17ff SHA512 ab375ef6345eb7de1df08c8fb4d4e8beb9ce97c2a75149fc622613f3c070a5e09b48c277fc83dc1fdec7d8a7ea52a46bc536184699ae0271877fcefff08a4811
+EBUILD xdg-dbus-proxy-0.1.2.ebuild 550 BLAKE2B 4699fb025e39ff164cb19e9f78c96c7bb52a620fc80c43845f1caa33daa3643762c7b5105fec8c57269e6523235fb337b1448d675bbef4c7e58f7f3d0d176d35 SHA512 1a7487de197946ebed7b4e7c958ed51306bd341bfe778936f5d60e73943ea06e26a8c239d50913db506e5eb862fb015ebf3b7ddcf5b2d2460d7ad620ca164dd0
 MISC metadata.xml 253 BLAKE2B a1efbd3751efaa83ee173f557ec1c8a4497a90b60896cf5a7a07da40b4f94a7a299ca0385477e82b2f5e5dbdf9afa482ccbe21f35ef44214e9c451d764b65529 SHA512 8d59f413993268ca783f7407b676900bb2d964754bf705d4175e2bafbe058a52af74f3928e4bd84d292518f8cf13fab7051486ab7cdc61d02fae6e0188d44442
diff --git a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
index 705b24af5e4b..11ae583d9307 100644
--- a/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
+++ b/sys-apps/xdg-dbus-proxy/xdg-dbus-proxy-0.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 5afc2d433938..ba4ea21e7373 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-desktop-portal-1.4.2.tar.xz 421660 BLAKE2B 5395218fa182947c589ff51cd43b838591e47442b23c4fe0719f0970bff3602e81c4f79ad93890bde97a529ca34a733032e85a1f21f41e9aa230d5c2d40e1136 SHA512 9a19dc8f6899a24f8827ce36447316ce74f293abed469be24adfaa16d18deac0b7c5d77f744eed9b540b54cd23145281dacb6811dc52b34180b21d6dc02efc5a
 DIST xdg-desktop-portal-1.6.0.tar.xz 453516 BLAKE2B 13ffcb21de6b61ddeb0782dcfc7b684287e54f94b9494b19589178594d1383a15048b8f9aeed7fb1260c3a2c967b267061d1db401085a686938c8629de8824c3 SHA512 7a0c702851762a55326142cb6b470205775284e0f749620ae6b648f216afcd684f8b20500339680b42812f628634344c9e826ab7cf13dd918fdbf733381d44ce
 EBUILD xdg-desktop-portal-1.4.2-r1.ebuild 1000 BLAKE2B 006ae8d4a91bca6f934eafff31a33f049d6652ab64a3e76ba8c2b9c3586dbe62333c9b1e9171f5d5da67ff0406ca9a12ce3fa075182bfc7c1ee19f9e1a55a565 SHA512 234bd5de3bbbe5e6a4dc4b1514f7a1157812eca3708a31cd1f84e37d6cc92d80d1fa13a5c1524c18474fe152b74eaf823c90fed968dc10c3d7aa36e97feb9e30
-EBUILD xdg-desktop-portal-1.6.0.ebuild 1047 BLAKE2B b4ac88ca5431882722f24fdf7f6a62a6486159747c0b7cecf30a394e7e4f77f96f76eac72a4ae99465c3d9d883fde3b345993a2236ace9c847f9a848c56f74ce SHA512 3f5ca2d0a753c1cb0ac1d10b5574f4610503a837e97b008fc23344e180e6c6744780dc95fc9df4c6cd8e5cadd29d368bb8b18d712de44c88e93a2b785f8dc79e
+EBUILD xdg-desktop-portal-1.6.0.ebuild 1045 BLAKE2B e14f57870aa69619d80ecd6dcdfeb46dbc14ddd9f01c6086189179dae3bdc981a58ab065bef9c6985aebf3d23f5816a902bc37f43475d15e258f216376a3db20 SHA512 596d4bbccf23251c543953107d0b9eee8142cb9a73faacc41abb152eb5929c8eb6393b24142566d0e76cc6990bff9521d0348e0e1d4401da27bc071458dee92c
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0.ebuild
index f3abf1640623..db0c9812c475 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
 IUSE="doc geolocation screencast"
 
 BDEPEND="
diff --git a/sys-apps/xinetd/Manifest b/sys-apps/xinetd/Manifest
index 77426d3243bc..0f3f39545b6d 100644
--- a/sys-apps/xinetd/Manifest
+++ b/sys-apps/xinetd/Manifest
@@ -10,8 +10,8 @@ AUX xinetd.service 192 BLAKE2B e13bdc35380da5805e9fbec1a1d05f7290bc154b1adea73b2
 DIST xinetd-2.3.15.3.tar.xz 383204 BLAKE2B dada7e1efb8c70d9b47efbb33de54e643e195fc043a2fe8b1b61a1d9e597a5a10feda8d6692e665af1f1690870e619098a9a2367df3a73f7821a91777532f1fa SHA512 3a744d5ce66da46743eec28d5b95a44709b1828187078984e59d7220ac325abce1198927e9156f343a4e16a9dc63e8846f1dcb0facbf05ea44c73aecbe7e504f
 DIST xinetd-2.3.15.4.tar.xz 384504 BLAKE2B e6981d7143c5e39d45a6274d003467f372b1e97637112c66a3fd3a1cb47fe948228d72c914cca5b2db1d65a626b83ff36f10768d343579aa48353d20e2541f4d SHA512 1d9bbf5f60b299746adf3e57a669bf1a554b50066563b65cdb7584f00dcab2d3d331df705eefb56b51c52a16b5ed6b109cd832c27df87c7f262bb304e17ddc0e
 DIST xinetd-2.3.15.tar.gz 309774 BLAKE2B b5c933a2aa7a2ef4a2d58b53890f04569fe592005c646f39a00d4716325c8ac9b9aa3b8b4b2f2b861430c8415167ab1d394de3d3b4bd761239c5223b1d2b0419 SHA512 9d6fee1fbc90329629d84086ae7de5cd51c25af7b68e52aa704d6f74bee5f0e3d54ca1bcf780f90f74ddc8d336ae0abb5e5e368d43c426a26b8dd2c4676d26aa
-EBUILD xinetd-2.3.15-r3.ebuild 1560 BLAKE2B c2aa1f931a7e9653d1bd0133317a47225cb1ee5c7b3c887c8fa17ca95fe63c7269129be5874e17f95c9d4bd6093990d8f49c30c93ad13aeaa362c097bcafb184 SHA512 e660df4946a43cbb498f062c4fb12b8849e9f072d31771b2ca1345e0f2ce764fa183ee63f6e940e264169cb37af89d1df9ca4ae61a5aae42e07cd20f86d89294
-EBUILD xinetd-2.3.15.3-r2.ebuild 1381 BLAKE2B 6c16dedba41a1f9ce0d6ee3d51f88b2d03137a8d3bc9068ac2a0db2550efa9d68174b075981391839a1abe13073ec392ef7fb5e0e91eac048f7d7831891713ec SHA512 86e8fa9e66d95313d05b6c7b3def44e26452846b889f335013be14cf051ac82eb292505e48bc1bd017f961cd0df5300345b32374ea15153a54da02d007b43a62
-EBUILD xinetd-2.3.15.3.ebuild 1064 BLAKE2B 0ab4e108d6abe899fee633ba5a8d4ae4f07ddca341e861a1f136997b2622f2b226d2cd47531a8a2b26d1a02852930cd3299253cf57f82f13e8a4ea0a7f8d2556 SHA512 12c6164fc844cce64bdd73a2dbe374342de03c121a2460ea64488f37c74e6862ba934cbf0bf4c56b0cfbe5dafd89a1c7954ac5f2cfa0c84bc17c934d7375fc59
-EBUILD xinetd-2.3.15.4.ebuild 1279 BLAKE2B a98a6f9bca2a0fd7b758d6d95eb65daa140037d8786012e06b21a61d781dae7dfc1c9d214d1f936b713f72f3083d444a3558312bb2301c622c0f4972d7d498b3 SHA512 72245d9fe374be1499dd20f99f0534b262d8fd22b990aacfe3217842dffe3e4f975280728e9bd0d8facfa6539855ee9e1f343af8faa4ffe7570b545bb63a474c
+EBUILD xinetd-2.3.15-r3.ebuild 1557 BLAKE2B fc610a9dfb3d199297718edeaf61498bb5aff861048e52683ede841e7385384161e323f1007dd5fb2690dbaa4f21a506219ca4b609e53dad571e95638af72514 SHA512 b180d02cc79803fdf636d25cc8b956ecf1a4678620c64f00300f8427f65bc2b0f1f93edce73b55ac0c775189a6ba3ab3b69fcd2214e320671ee2bf5f39465c51
+EBUILD xinetd-2.3.15.3-r2.ebuild 1374 BLAKE2B 3ff01d397797dbb3e3db0ccfe78eb74951c68ba9d597ed57d6175f780343e7e16ed79799a89bb8f45dda7a758ac44ad116ac45ba0b3b2b7c8513d1a9a127b1dd SHA512 97c3358a713966208b9e862216434b459c8725fd9d471b64b5de14c69e7481a26187ecfd9721333d2cab43c33286a10a0d2dbea202bdc260df14f84839701f48
+EBUILD xinetd-2.3.15.3.ebuild 1062 BLAKE2B e07947f75e7c8677e1f304637e2f3f6dc7915b1dc059d87e783aba547f084b3fb1b2c900b7459dcb1f4eb59b87b340a72e55936df2f1539161e37ec3fc924288 SHA512 128e8a607851169ed128ba045b5cee61c786f1af42d751657fb1e486bd03586e120e524b9cb1125b5e73ea256d6656d340b1eb096136b848d3f22e3bbee80ffd
+EBUILD xinetd-2.3.15.4.ebuild 1272 BLAKE2B 5b4dcb90820d53586246ee4cefbebd6e29a9ed6c3728fb03f6ede34751bdf7e85863068b31a3d9c0bebf6aa47b1bd198638d801d81b9916e92c6ea2c82b37405 SHA512 4af494a22e0168fda89c358f4e60e9bd2bb583812a5100f2c70a985b28d3e859517243d39798700f1cb4d65400c190ea994d02079b2c369b192c96eacb249afa
 MISC metadata.xml 401 BLAKE2B b00f11946b61c89e69864bc02fbbb0fb9d97e6e1b58c1f4604a806361a39b2eb5f4ef25c095a8ce42e2e2d1dc0160d6525d58e6ba24c6d63057e4b07291d2052 SHA512 35d6d241dfa7e9811b09f3df32805de026244d966a5e1c62654986c67541038f79acfe64a9b4b574f5cc14611fc68cba043d4d68dfa7cd8d198a738db5685cdb
diff --git a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
index 10fa66645771..fc91c97a8ad8 100644
--- a/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.xinetd.org/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE="perl rpc tcpd"
 
 DEPEND="tcpd? ( >=sys-apps/tcp-wrappers-7.6-r2 )
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
index 92bc834e7df9..d5c268f31bbf 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="perl rpc selinux tcpd"
 
 DEPEND="
diff --git a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
index 24a441fc9a8d..a7a0f4b2cbc5 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.3.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86"
 IUSE="perl selinux tcpd"
 
 DEPEND="
diff --git a/sys-apps/xinetd/xinetd-2.3.15.4.ebuild b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
index 73781412652a..5cac335e332f 100644
--- a/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
+++ b/sys-apps/xinetd/xinetd-2.3.15.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/openSUSE/xinetd/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 IUSE="perl rpc selinux tcpd"
 
 DEPEND="
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index cbb36611c23a..c2725ca47c08 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,7 +1,5 @@
-DIST yarn-v1.19.2.tar.gz 1244018 BLAKE2B f88d0b6c5c3bdb6e02c0dd8c36fa981d35a0e46da143399dbbd8a39fac13669dc1b459f3ecd192c99d767fc477f54e61d74caeafaf9d1f0cdfdc4fba0b405fb6 SHA512 39d2cdfcafec03e2a75b8820350c0760ae9825d2e4496c5bc7a21877e588409eb10df93c08860a72405fc06c530660da125b96b3cdc89f38c50a652a3eda58fb
-DIST yarn-v1.21.1.tar.gz 1244168 BLAKE2B 351ee6421fd85563ceb5d1e49f600b4f315041d85b412cd36a0bcfe352cd974ddf6c53e03171bf173794400c31eabc4fca5f3ae2402770441a9d9942ec79cf82 SHA512 75082626febbe97fcd41cce96e20ed73686c13fa69a460c9033c25462003313bc5cd86ddc4f8f658ee0f70dcab892b767388ec08ca6df14151287528ceddb519
 DIST yarn-v1.22.0.tar.gz 1244012 BLAKE2B 2764704103e281de8fd8c2c28abae56c7ba863365989b884add045d2f80810f0f8b83acd77baeef2375fe1424ad54cabfd89e4d14b38068114552115d3b7a812 SHA512 28c1cffc9ab9de364a4d8f624d4b77748565fdb7ba50fb3620da3debe0676472cac583537f03269601d368c5b2199a0eef8448e00205be75a162b5ead9448992
-EBUILD yarn-1.19.2.ebuild 983 BLAKE2B c2704e1e8d808e0092971ce0fb027c36f4b4d5e21edd38740de3578156d13a0127db6bd5674af08ddba1e2ebaa54d85b4de13ad85ae9b412a9973f17c0e7f5de SHA512 367b7ce5e5b178d1f5678bee8a7ad0f1dbe87c0c10403d5d91ca96f0901d66f28a4ee66ee1093bbc43965b1759722a99d92b2f749b356daa635fcae3689678d4
-EBUILD yarn-1.21.1.ebuild 1058 BLAKE2B be9fcdd3e7c70238e3efd9431b333cd6252dfe09d5ee7e3cd05c6b448d7ff76b63aecf6047eee373e549b2d119897fb0f9362df5f10eadbc340b0b03017cc5bf SHA512 3ccce50a4f4aea6cb1c9a568943828f3a3ba1e9820e5ad8c3a00ba65494f71c2c4437f559ece09b7a1fbb8f772413eea6eb60cfb6d186d5c535654593d91f2fb
+DIST yarn-v1.22.4.tar.gz 1244785 BLAKE2B 1f1eeb829096eaf19a8fdb48b46fa736769d9d3c247759e434413665186e4cccb750024afa836dae8a0130fc472df3c01805d263d81346e1dd7509e1b106e88a SHA512 a1833b862fe52169bd6c2a033045a07df5bc6a23595c259e675fed1b2d035ab37abe6ce309720abb6636d68f03615054b6292dc0a70da31c8697fda228b50d18
 EBUILD yarn-1.22.0.ebuild 1058 BLAKE2B cc521c197011573800b7671b187d0f5507df0dfb9283f4f5355cb29fc9c1f72a7e5e34589928bab4fea27a2d26f735b6274b011486efa70c6f347ff51327c4cd SHA512 ccdce002d42bd31f614e92bb8703eeba3c713504b1e2feb03120d76c35475328ff40772c1b3b237c48e87e09a86f4ba149bf3f38aed3d52a3a6f303b33621dc4
+EBUILD yarn-1.22.4.ebuild 1058 BLAKE2B cc521c197011573800b7671b187d0f5507df0dfb9283f4f5355cb29fc9c1f72a7e5e34589928bab4fea27a2d26f735b6274b011486efa70c6f347ff51327c4cd SHA512 ccdce002d42bd31f614e92bb8703eeba3c713504b1e2feb03120d76c35475328ff40772c1b3b237c48e87e09a86f4ba149bf3f38aed3d52a3a6f303b33621dc4
 MISC metadata.xml 545 BLAKE2B 223f9132b5cbabf71b64028e2fd75d4de88566b59069db3e1ebcf195cf3143e1c4c0f04dfa05d911a65f9d8ff29504385a9d8ed3001f66473e39ee2bca2417ba SHA512 f742b0908db5b89cd69b910497da75f129a0bc73b6068df891a4b8673d233b3bacc5347d98a872fdf8984f588c4991ae6c2b65ab60fbf81bfc5474402efae44a
diff --git a/sys-apps/yarn/yarn-1.19.2.ebuild b/sys-apps/yarn/yarn-1.19.2.ebuild
deleted file mode 100644
index 6366d1485234..000000000000
--- a/sys-apps/yarn/yarn-1.19.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-
-	while read -r -d '' path; do
-		read -r shebang < "${ED}${path}" || die
-		[[ "${shebang}" == \#\!* ]] || continue
-		fperms +x "${path}"
-	done < <(find "${ED}" -type f -printf '/%P\0' || die)
-}
diff --git a/sys-apps/yarn/yarn-1.21.1.ebuild b/sys-apps/yarn/yarn-1.22.4.ebuild
index 45da833461b0..706453936e75 100644
--- a/sys-apps/yarn/yarn-1.21.1.ebuild
+++ b/sys-apps/yarn/yarn-1.22.4.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
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sys-apps
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)