gentoo resync : 13.11.2021

author: V3n3RiX <venerix@koprulu.sector> 2021-11-13 13:10:00 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2021-11-13 13:10:00 +0000
commit: e9d044d4b9b71200a96adfa280848858c0f468c9 (patch)
tree: 1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /sys-apps
parent: fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff)
101 files changed, 1087 insertions, 1230 deletions
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index bf629f4c1878..6ef6af0595f5 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/apmd/Manifest b/sys-apps/apmd/Manifest
index f7721eaeadf3..6a82c5756f95 100644
--- a/sys-apps/apmd/Manifest
+++ b/sys-apps/apmd/Manifest
@@ -2,5 +2,5 @@ AUX apmd.confd 56 BLAKE2B 59236d42a8b27ba98ce06c61e19da23f0f131f82892e1a9907712f
 AUX apmd.rc6 568 BLAKE2B 10519550d5ed67ecdb2ae192517ecd9c4a8943309b31371be847aef4894b5171b50eca0b7a74655cbfd6fa4aa1a7a08c3fc2700b28b3945bb75962f93e5a60f0 SHA512 ac4578dd1b49207b8d1c50f3481a3652d8cfb83ea3c1984a553aa5acefd17fee5fa71a903fa9dca4d1991c47c6b14d6901352fc03df741cae0aed337ee55cf14
 DIST apmd_3.2.2-14.diff.gz 19195 BLAKE2B 554c84005fe443d3587169847b14cac186af0295e9b0dc4b9f564f014d2e717eb9c2d0ef0d6a4d701b81be26c2b0b8781f0bede008ac3bfcd2a20802a1e55ffa SHA512 a3578d0c43950f832fb437a744f8a4c3058c731649decb90f7b42c901b06f4df5f9a75599b4278e15af1c8a30d8043b0d76eb7d2cb67b05bf6bb210d5912a16d
 DIST apmd_3.2.2.orig.tar.gz 72757 BLAKE2B 1b93d831c1d24cbf8c061969dd915ce219bbf62374e4e82b8fd61b7154f3a1a8bd7da740c2b6a557a335f4aeed41feea13fb85bdedad80ab9197e1355d1b20e9 SHA512 fdc74703e75a700397bb2c907986f0cf0792ee4128d7a7ae08adf090bff0ea595044ba7a935d34929745bb702eb8bfe232e0ee9156efd23a995dc087f1b20bf4
-EBUILD apmd-3.2.2_p14-r1.ebuild 1813 BLAKE2B 9038ec4ec6adbea1c2ddd4bce959dda00fdd65dc9d24b4b1aee5b52fac46ffa601ca1ec2e92872745ba2abc8a83a0973497d418df77fe57db02be51943e376ea SHA512 2bc5f9f371acc7c168e31cbda3969986478681b5184a394910ff6eda12934e5fd5c73e9f8cb2785058c9ad24dc39a03f8b96842be77a74df751b63627a722405
+EBUILD apmd-3.2.2_p14-r2.ebuild 1903 BLAKE2B d5d0354d6de880bccf872753ebc8073d0fafd80f71612bfb3281cfc41c5c5c38b5838e96f61ff24561af5ac7d983fbfd2d9a95fba20d1da30c58b0efdaa81114 SHA512 bbbfbcdd36588bfb2971d9621b0321cfbdd2eeac009dd62e748cc639a6db120825ade0d9fb28a5ca0c3dd8a7d2b7002f26163d3ad63e1ab237a74c992465d4cf
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild b/sys-apps/apmd/apmd-3.2.2_p14-r2.ebuild
index fefa3c983ce8..669ba2f6a4f4 100644
--- a/sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild
+++ b/sys-apps/apmd/apmd-3.2.2_p14-r2.ebuild
@@ -1,40 +1,47 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit epatch multilib toolchain-funcs
+EAPI=8
 
-MY_PV=${PV%_p*}
-MY_P=${PN}_${MY_PV}
-PATCHV=${PV#*_p}
+inherit toolchain-funcs
+
+MY_PV="${PV%_p*}"
+MY_P="${PN}_${MY_PV}"
+PATCHV="${PV#*_p}"
 
 DESCRIPTION="Advanced Power Management Daemon"
 HOMEPAGE="https://packages.qa.debian.org/a/apmd.html"
 SRC_URI="mirror://debian/pool/main/a/apmd/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/a/apmd/${MY_P}-${PATCHV}.diff.gz"
+S="${WORKDIR}/${PN}-${MY_PV}.orig"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 arm ppc ppc64 x86"
 IUSE="nls X"
 
-RDEPEND=">=sys-apps/debianutils-1.16
+RDEPEND="
+	>=sys-apps/debianutils-1.16
 	>=sys-power/powermgmt-base-1.31
-	X? ( x11-libs/libX11
+	X? (
+		x11-libs/libX11
 		x11-libs/libXaw
 		x11-libs/libXmu
 		x11-libs/libSM
 		x11-libs/libICE
 		x11-libs/libXt
-		x11-libs/libXext )"
+		x11-libs/libXext
+	)"
 DEPEND="${RDEPEND}
-	sys-devel/libtool
 	virtual/os-headers"
+BDEPEND="sys-devel/libtool"
 
-S=${WORKDIR}/${PN}-${MY_PV}.orig
+PATCHES=(
+	"${WORKDIR}"/${MY_P}-${PATCHV}.diff
+)
 
 src_prepare() {
-	epatch "${WORKDIR}"/${MY_P}-${PATCHV}.diff
+	default
 
 	if ! use X; then
 		sed -i \
@@ -44,7 +51,7 @@ src_prepare() {
 	fi
 
 	# use system headers and skip on_ac_power
-	rm -f on_ac_power*
+	rm on_ac_power* || die
 
 	sed -i \
 		-e '/on_ac_power/d' \
@@ -54,7 +61,7 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 }
 
 src_install() {
@@ -74,5 +81,9 @@ src_install() {
 	newconfd "${FILESDIR}"/apmd.confd apmd
 	newinitd "${FILESDIR}"/apmd.rc6 apmd
 
-	use nls || rm -rf "${D}"/usr/share/man/fr
+	if ! use nls; then
+		rm -r "${ED}"/usr/share/man/fr || die
+	fi
+
+	find "${ED}" -name '*.a' -delete || die
 }
diff --git a/sys-apps/apparmor-utils/Manifest b/sys-apps/apparmor-utils/Manifest
index ed0bb264128c..c61f77d74dff 100644
--- a/sys-apps/apparmor-utils/Manifest
+++ b/sys-apps/apparmor-utils/Manifest
@@ -1,3 +1,5 @@
 DIST apparmor-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
+DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 EBUILD apparmor-utils-3.0.1.ebuild 2271 BLAKE2B 3f271bdaace473c8a1625f2655ff53e14c650072074fe9efdbea7809ec2b9faccdefe969505435f6acfe85f1763b53e6ff574132580f82f04d5cdcf0002386f6 SHA512 7464d7ce47e75ddfd4600306430ac26d25ced6f3a15874105c09e0749ddf80b17bd4ea9288f43cf05e7becd55ab7a9ab271361cd4b6f29ee7acafa5a3edc1689
+EBUILD apparmor-utils-3.0.3.ebuild 2253 BLAKE2B 1c00f8270847616ce07d8244aa85cf1b25a2a27ab706581012b9716839241bdd2b9a2f5411ff5efeeab32cb34d3e60175ae083c52217d31eac5a2da448910191 SHA512 4dd7b39d928040f91aae80c3f87cdca2b20b6f28c2c696f5acca124d55b0742a6997ed554494355c8a8a9220cafbc287a5544d279730b5bfd67339fc22fac925
 MISC metadata.xml 410 BLAKE2B 220c545add2a0fb45a95c28e09ef0472ae92a0faebfb03effa69a8e202e137367756355c389c8d59e8d5d87a45e6df336a8424cf3c631d89595311d7095f049b SHA512 cff4f2dc12a85268da9fe6ce889a85d68669e7c940017f7617f7566c274394a8e145993c5e9d00c838acd0d41b2c82a7fee661bc31f9e5c54a2547f42ac7a98c
diff --git a/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
new file mode 100644
index 000000000000..00aa102d612f
--- /dev/null
+++ b/sys-apps/apparmor-utils/apparmor-utils-3.0.3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python{3_7,3_8,3_9} )
+inherit 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"
+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,${PYTHON_USEDEP}]
+	~sys-apps/apparmor-${PV}
+	dev-perl/Locale-gettext
+	dev-perl/RPC-XML
+	dev-perl/TermReadKey
+	dev-python/notify2[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	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() {
+		local -x PYTHONDONTWRITEBYTECODE=
+		"${PYTHON}" "${S}"/utils/python-tools-setup.py install --prefix=/usr \
+			--root="${D}" --optimize 2
+	}
+
+	python_foreach_impl install_python
+	python_replicate_script "${D}"/usr/bin/aa-easyprof \
+		"${D}"/usr/sbin/aa-{audit,autodep,cleanprof,complain,disable,enforce,genprof,logprof,mergeprof,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 6520c6d8ac45..3e1a9dc73ad4 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-3.0.1.tar.gz 7785713 BLAKE2B c530d159a4139de8e59d9d975af866259b56d555e3abe2d1e2a6bfd2db57d8371d643bb93f1cd6ca96172960c09a74cc05c82d34a2e253c4c1f6ecce747f4129 SHA512 e1073e7b2cde7cc4cefcfddce8fa5069845b5873c260b9fbd4bea2ff801708101d813ff30e23a64da36f3c6394cd9339e01a170e9add69deef2d70ecd9ed9687
+DIST apparmor-3.0.3.tar.gz 7790012 BLAKE2B aada9c32c2cde4a110cbd1d626ec00b08e29e76182185752e5c23e2ec0c2668a732ffdf1eb1660bd8bc294188ccf0da42b4282939f5969a6aed39084be00769c SHA512 bbf26377e60da60dab56473ee5af15aa0f3fdf2f2a61dbfcdeba12a925afda3bc6a0f6cc31e07927400425b8c3b3649833f448d8674044c7274ef06923ab48b5
 EBUILD apparmor-3.0.1.ebuild 1738 BLAKE2B cd4d8d6f808bb7c8475f24a8d1b36700d1ada1194105ff12d91da9d6e45cbb25479b3ccb6f41a08cc1473c2be2a78f12b017f357df003dd4572a04a4028c61af SHA512 0d2d0d9d17fdd4abc604d27fc4fcc5b62c3740186765ee6170967905996b00da5cb8b0543f5ca6f48e07f5d953fc8510fcb08981e55a21318a3f795ad3e8a4db
+EBUILD apparmor-3.0.3.ebuild 1738 BLAKE2B 2eb39b0a5c07f348013fffb0c10bc3d20f4dd70b6044467cb855938dc3df44a60249d023fef948eb349ce54eb8072b5bab3d7d090032b2166517aa95c88fd1bc SHA512 9a40e928011cde60ae1bc6e3512445f4edc612fa5d540d74abbb94b5a3e683b1663dc85d4890e4788398694c424a5012b4628ac93aa096e40dec24a9397b8905
 MISC metadata.xml 410 BLAKE2B 220c545add2a0fb45a95c28e09ef0472ae92a0faebfb03effa69a8e202e137367756355c389c8d59e8d5d87a45e6df336a8424cf3c631d89595311d7095f049b SHA512 cff4f2dc12a85268da9fe6ce889a85d68669e7c940017f7617f7566c274394a8e145993c5e9d00c838acd0d41b2c82a7fee661bc31f9e5c54a2547f42ac7a98c
diff --git a/sys-apps/apparmor/apparmor-3.0.3.ebuild b/sys-apps/apparmor/apparmor-3.0.3.ebuild
new file mode 100644
index 000000000000..4c5fe4d4179a
--- /dev/null
+++ b/sys-apps/apparmor/apparmor-3.0.3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 ~arm64"
+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}-3.0.0-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
+
+	# bug 634782
+	sed -e "s/cpp/$(tc-getCPP) -/" \
+		-i ../common/list_capabilities.sh \
+		-i ../common/list_af_names.sh || die
+}
+
+src_compile() {
+	emake \
+		AR="$(tc-getAR)" \
+		CC="$(tc-getCC)" \
+		CPP="$(tc-getCPP) -" \
+		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 \
+		CPP="$(tc-getCPP) -" \
+		DESTDIR="${D}" \
+		DISTRO="unknown" \
+		USE_SYSTEM=1 \
+		install
+
+	dodir /etc/apparmor.d/disable
+
+	newinitd "${FILESDIR}/${PN}-init-1" ${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/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index 5a258b4a5e26..155395808215 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -2,5 +2,5 @@ AUX bubblewrap-0.3.1-selinux-configure.patch 5208 BLAKE2B 69db3066eebae54d34f02a
 DIST bubblewrap-0.4.1.tar.xz 214496 BLAKE2B bdbff50cc4e28c91d83c814df7f2ee15702962d26a9316bd841b1e63bf5976c4549c88e20869e8cc236a8a0c9a065518f945c356fa7a058f8831f5b1e9d4eb0d SHA512 0ff46dc0fda2d0cffbb36cc52ff43951b30cbd835a42cc56806acbbbd827796bfadbb1cfafc84d6b47a72c031ca44abe1c377acc0cc25fe3b33e854f5f687d35
 DIST bubblewrap-0.5.0.tar.xz 137796 BLAKE2B 36aef94335d61ae55076a0a94cd6f2c335a87f8df9900c0c603c7ee870cf84c617a0c2ad99a5979cc1dd22740d652155fa6049e717eb210c9a83afe516daa107 SHA512 b1f5bde9562bf3176c51fdc22304b901e00e1de5189d9b5479aed7b651b84bed5539fc5bb3b1db58a05da4a57d69c9f41c40e15aa5a575746630e015674a02b7
 EBUILD bubblewrap-0.4.1.ebuild 1143 BLAKE2B c8c40f0826442f2bb172d447dc94cbecef5e2edad9e453aff70caaf2e013099bb6890f6134ed4d93c15ac037c5d410f8f3432597d56c704dcd9b27da636f9150 SHA512 bd1f3b217a33d8089b765bbb7b0f1ec1b823e40bf80ea1e614ea997c969376686594a464c07c8f34cc23518e767162d783ba0af3d52ff60a0a497cab059f5863
-EBUILD bubblewrap-0.5.0.ebuild 1066 BLAKE2B 4bbc2153b7de88dbe4b399400f1cb74d9a198c37bf68179947b13b6215ba897ff7e6de36030ee859cdac034b258add9a153a5ed7fa3f69167ea8559688c458a3 SHA512 06d31adb1dc37c533409f9749980cd4fec9ba03ba6cc3d68ad4a5a9b9002208709dbc9baf9c5d09f5905b5f65f175aaf1c8dd2b879aea0bb0ca31cf1d8738e6c
+EBUILD bubblewrap-0.5.0.ebuild 1062 BLAKE2B 9ba535294ccb822020fbf22e435ca43cc5634e3da93e7075d243a6cc5d9635d4a153a45bddfb222a43b225cc2d1f8371882e5fb69002a0155836ded53122b87f SHA512 80325583f448ead83579c1c76daa25532066c6596ca0b3b75636e30323093aa751fe12e682c440c71d0521ef68a6ed0365a9123b0bc0b721eb59cff43c04f550
 MISC metadata.xml 453 BLAKE2B 69f1ca03c4b84f4adc2db8bbed8bf57852719c136778747e2679517afe63b1a0621ab486121b71d78c8ae235c2cd7e3077e85ed8d3ad51cc16f1838eb94bd448 SHA512 486775a479174ad72dbcd7f6a89c8001af1a8a4c5b73620153fed4da28b15fb1c481003ffd96ef68d2b49569ed0c1a9d445bc03a9901056cd29b77b3cf13a1ef
diff --git a/sys-apps/bubblewrap/bubblewrap-0.5.0.ebuild b/sys-apps/bubblewrap/bubblewrap-0.5.0.ebuild
index 3a103e74f0dd..6f58a64f538b 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.5.0.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.5.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.x
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 IUSE="selinux +suid"
 
 RDEPEND="
diff --git a/sys-apps/busybox/Manifest b/sys-apps/busybox/Manifest
index 2b609960462e..43a56e328dc8 100644
--- a/sys-apps/busybox/Manifest
+++ b/sys-apps/busybox/Manifest
@@ -17,7 +17,7 @@ DIST busybox-1.32.1.tar.bz2 2444679 BLAKE2B b0258345d40628d8c12b4cc5c3efdb318cfb
 DIST busybox-1.33.1.tar.bz2 2453694 BLAKE2B 2dce3427ab7703c56cbb3bdc0c93c1fe1c6dc24c5b467b6213b8f9cf55223ec63136b3837970e41293cc3d55d320599945d29a69a4ef8b4b3ab9fb5e2a527632 SHA512 d24931432f65e4e79cf54a6c2b91c9cafba817b637d337f456ce8f505434fc06c4345c65cde4fe2a019650a8a089a6f5336bfafb5ef64a4f14659a9d0b3ddb1a
 DIST busybox-1.34.1.tar.bz2 2476932 BLAKE2B 1f45f58db26ae0bae2eb728db3a7d49680d611f489c4633d1fdf2827d3c33285721e232f722ac1f80f2ad7616352df9fd6b8880bcb5fa0dc6787b70c897dd033 SHA512 fb7e53a56c07b1098a12ee7232ad5401b147816648a0619b3b5358fdcf0915cfbb054500c0e0dd4acb3bc0a93a584b62bc5448e1f16b28004f58b39518a13b9d
 EBUILD busybox-1.32.1-r1.ebuild 9640 BLAKE2B 1bf881647d58a197e690e068b81aa2522fdbecf69784862b1842d54ea1caedff7fa4d6bec8b69388bd8fbddfdd76d48d36b07b7147ebf7f5368df3219efb135e SHA512 c163d435a5bac776c519a539f1760134973314434e75c84dd9f427ea0a7c5fd9c41216db61444c97931b86a6cb6ae17fdc1f0d1c5f36118fc5006c89a3599b7d
-EBUILD busybox-1.33.1-r2.ebuild 9998 BLAKE2B 59394c0faf07f5e0a50c6ef4cb71b267623f87c3bf9d59f5ef1c101cd09f712bf8fd30f49068d1b31a5f2972217f7a3d0f17d608cfe8b14f1af208f0eb3cc013 SHA512 2b044d19940ca6b0dd40f8453a7bad6795102bb9137e53bd798110d4d0122093226bf4b17ae4cffbb8b7967fbcf0cd3ffe3828bfd4e53a457e01153fefe90663
+EBUILD busybox-1.33.1-r2.ebuild 9997 BLAKE2B 361c84459fba9270fc65e727da7cb679f246daf84aadda6fe1e662fefd234fa99fa50d33180311acdcf60cc86b7f081858efe695f8c278ce523afe117a16d242 SHA512 93b3177923c288aa08656a989f6db2d54df8d5208d4728f60a17ecc60122ae6d2a8c2926812f71b961de562fe2946213c80384a9990d71f48bbef2f070768eee
 EBUILD busybox-1.33.1.ebuild 9648 BLAKE2B 59715aafaca840cdac5b941fb5ad66619510b5cffc2fd252c2b1c8068638449c6ea7bff34f7262e64728b39c663185483db6ee74cedea07c669f6a4528ec4741 SHA512 c1b22a7535b4441ed47e53cac5a27dda04a6b58bdc8eaa96de558ae88cb4e2d10d720473284e569d3a93a53f14214566401bf7766c4fa5fe2a4d46a3a3803406
 EBUILD busybox-1.34.1.ebuild 9937 BLAKE2B fb48a1a27b71ca855ec7a0aa450216210316613cfa9bce696fbc0779f6cb0ba633ae102b10324e35a168cfb0b00ce05cf7bc1a61eca45089e61d504988557ac8 SHA512 ea9f0493291b6b1439add09f0d39ebf11c637a264e51432d026148ac667c00df9a9a3d7fe144595d2eeb2d82bd8013c6fcb10cb24f11aca929d053fa485476e5
 EBUILD busybox-9999.ebuild 9937 BLAKE2B fb48a1a27b71ca855ec7a0aa450216210316613cfa9bce696fbc0779f6cb0ba633ae102b10324e35a168cfb0b00ce05cf7bc1a61eca45089e61d504988557ac8 SHA512 ea9f0493291b6b1439add09f0d39ebf11c637a264e51432d026148ac667c00df9a9a3d7fe144595d2eeb2d82bd8013c6fcb10cb24f11aca929d053fa485476e5
diff --git a/sys-apps/busybox/busybox-1.33.1-r2.ebuild b/sys-apps/busybox/busybox-1.33.1-r2.ebuild
index e66cc1864b40..4f79e3d15633 100644
--- a/sys-apps/busybox/busybox-1.33.1-r2.ebuild
+++ b/sys-apps/busybox/busybox-1.33.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 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/colorized-logs/Manifest b/sys-apps/colorized-logs/Manifest
index df326148ff46..c9347b5c2435 100644
--- a/sys-apps/colorized-logs/Manifest
+++ b/sys-apps/colorized-logs/Manifest
@@ -1,5 +1,3 @@
-DIST colorized-logs-2.5.tar.gz 12331 BLAKE2B 79ee9d5a7d2e683ebba044a8b75666fe5824a087be3b41e9e1c4bb3b52d1d2a57b6dd5f3cc64a48fa6705b9074daa6cfaec61a730223bc3deb21835033fc3adb SHA512 a4849db1124bbf65a54285a121aa723a44b7270498858d0ac5f50892d3d8eb38c8109c3bb457cdf6ffe336e77703ba454217047ed819a0d61f415c5b8882cc28
 DIST colorized-logs-2.6.tar.gz 12837 BLAKE2B 8f2203ce11c4702c62d2e5069099470c23b6cff608bae41a944ac9d016232190643bd1bd6025e90a63a08137809d6b4c4cc3eb564bf05f29ef3e37b72313e276 SHA512 9251054331d4e008da68067409a3c526daef75a88befc2e0d349eb341c71f553ce907677a50450b3546b025e2b1a5ffb490671aa3031c560a9b61f2559a016bb
-EBUILD colorized-logs-2.5.ebuild 665 BLAKE2B 73f383328f1922d117670ad9c28acb604697d9267bcc4a43e8e4cf00eb8d44536c623ff58b3f57d1a26b99431f2928376f61dc73ae51f9f3b96b5f24be27fb1c SHA512 d1e80c867abd49622d660f055043ea083150eac03c95e152cce57cb1d814149bbdd837d841c1633330a6e74d14a167eae3e4f994b4f36937af3a18c5cdb8720e
-EBUILD colorized-logs-2.6.ebuild 655 BLAKE2B e4066ddeadd8f632994b0ff42d5f8eaa766d11f1db766c17ff8f1327d75ddd07fc7e02f8815f895262ff52a22b52c97ebf4d4f742bbd4b18c78505a46a9968d2 SHA512 28b3d6587348dfa84624fe14871953855bca4e2a74c757be1965f0c83daf857b9f789c38f99c08bac35ff5d07a5debb76bc587fced2876caf8d5a0dcf297c791
+EBUILD colorized-logs-2.6.ebuild 653 BLAKE2B 518adb90da8d6182d7483ec139c3e249597fd05eee5b9c4a2d140ee61a13585e51fc5c9714771e200b837dee3191238fb6bf2cb7cde76ebbae5e29a96e36a0f9 SHA512 0ad1b58e0d3e2288e7a97e1cb0026fa87b8c1b975efcc0f11c5316abd1f41ac4129c67488af5583bfdf21890c1c82f6e1126aca28766a356cb3911a9c9df9560
 MISC metadata.xml 244 BLAKE2B ef0fed756f714193730d5c9b111f85fbc050482d1b828cef3d2048fc61f87c4a69eb64b0d3d6203757d24d1c1c7888004623ae6b635b17ac56c56c25d1e4f3f7 SHA512 3b91401bf8504f8db213637e29ae377d72c06c406b01802764d14db5e3438e1b62c3ba90a44339ace16d38c7b568c7f01ec940acdc69fedfe6c8ccba56abb49d
diff --git a/sys-apps/colorized-logs/colorized-logs-2.5.ebuild b/sys-apps/colorized-logs/colorized-logs-2.5.ebuild
deleted file mode 100644
index bef488c2d92c..000000000000
--- a/sys-apps/colorized-logs/colorized-logs-2.5.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake-utils
-
-DESCRIPTION="Tools for logs with ANSI color"
-HOMEPAGE="https://github.com/kilobyte/colorized-logs/"
-SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	# Rename to not collide with dev-python/ansi2html
-	mv "${ED}/usr/bin/ansi2html" "${ED}/usr/bin/cl-ansi2html" || die
-	mv "${ED}/usr/share/man/man1/ansi2html.1" "${ED}/usr/share/man/man1/cl-ansi2html.1" || die
-}
diff --git a/sys-apps/colorized-logs/colorized-logs-2.6.ebuild b/sys-apps/colorized-logs/colorized-logs-2.6.ebuild
index 1418d2bd3623..a4d4e73a4297 100644
--- a/sys-apps/colorized-logs/colorized-logs-2.6.ebuild
+++ b/sys-apps/colorized-logs/colorized-logs-2.6.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 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-apps/coreutils/Manifest b/sys-apps/coreutils/Manifest
index cef7e114cd5b..c93db0740bf9 100644
--- a/sys-apps/coreutils/Manifest
+++ b/sys-apps/coreutils/Manifest
@@ -5,6 +5,6 @@ DIST coreutils-8.30-patches-01.tar.xz 5788 BLAKE2B a41511ce39ac570cb14b7f12d125e
 DIST coreutils-8.32.tar.xz 5547836 BLAKE2B 0ad99c176c19ec214fcfd0845523e5362f0151827707c759bd46c0fe8d2501c6ad1c29c5b71266f6525857bc0d56c472db0d7fe29953b6c65e2e6c76bdf3c515 SHA512 1c8f3584efd61b4b02e7ac5db8e103b63cfb2063432caaf1e64cb2dcc56d8c657d1133bbf10bd41468d6a1f31142e6caa81d16ae68fa3e6e84075c253613a145
 DIST coreutils-9.0.tar.xz 5612752 BLAKE2B 59617cd25fd4c70f51bfbef851bd83e73f9c9ba5c11eb539f7f75c0184d55832e004b28e9268fb8064db145cb071ead2b9c0c3346bc35a11934ffe1b15bf17ac SHA512 9be08212891dbf48e5b22e7689dc27dac50df4631ebf29313470b72b7921f0b2aa5242917d05587785358495ca56e3b21f5b3ca81043d53cab92354da6c53a03
 EBUILD coreutils-8.32-r1.ebuild 5967 BLAKE2B e4111bbbcd2c83ee5f25783434a8d841f75bb14dd9cbeb223558bf6c3d22f93ec7ba3d6c4ec740243473c53575776e9700004a0f9695b91a5468837a62b6c4c6 SHA512 adbd3c99b3e3e126e13a468bc66109005a1abdd603c11ea02bf8d8c2c8232ea48f6e2da768439ce4480789df0aa412eaff3849a24f3c81def5efd4479c87c27c
-EBUILD coreutils-9.0-r1.ebuild 5990 BLAKE2B aae844fd5650c162c268d9906d533a56d2a6e2e44cc106a031f75ca10fdfbe023e64909cf21409a5994638300e037f6a4be28dbac1d799b0991bca1ad58b0572 SHA512 4c023ab56b5070c52326a42099f8b14597ea3ce0efcb54bfe7098b37e6866f2332281f750a7b552bc38f4236e27c2e5b1ef79ff65662f3a7cf54d5d46d677325
-EBUILD coreutils-9.0.ebuild 5919 BLAKE2B a972080d2584b0bd38e48ee317b44a848767c182fed84f2b740bf3b8fefa79ffced03e885fdb64b689cbc88ac0929b73ecd478ae6071bd2bdaee3bfddf9d95b7 SHA512 5de0a279ed98b04c981f9b37a4e759d95cfa820af642813bf63ffc24a1e819349dd16a4a82c2c2bf93e11c0c29f00093f79add5ad0c97d74dad4aec8781321d0
+EBUILD coreutils-9.0-r1.ebuild 7124 BLAKE2B e21f4c5854529c85e233119931a844a760098e3df95d9847ce05092a1bda78ba8953896baac829050e6fd0af94bb4de126341ea313cffd63743687996c5a08eb SHA512 5b53f413d2dc5b9ce1595ed04decce9ab2fd0a026235b5f19c1bc51ed8726d370759e45a3f3ad95abb4dd34234cff0ad3914061caaef15bfcd0ad5e9a22f2b61
+EBUILD coreutils-9.0.ebuild 6976 BLAKE2B 20c21abb122307ce22ab5a73015ae749ed116625e2bad311af72a42018605591dbdbe918a8444ae581635738d5eab8a53de6835bd68671040d28221c2c83ef25 SHA512 90ff56fbb94c9ddadea01e002d7b497e17fd34f59ca411dff6e4f11660b99370f59d3e32e26801613107926a08d2acba6b1cedcc292335f9a0ffb83006ab4b79
 MISC metadata.xml 959 BLAKE2B 7db7eff5a6e1c45c37e20d66e299b44b7a8334b20f970eac2bb7dbf0f8e149784bb19f28c0baa228bdbfbfe0335793080a99aee7f92a9976864ae53a35fc0ac8 SHA512 c69fdd7a27b7980c6e537387a510cfab65d0b252492576ffae3caac930bd2efad29edb604f654c194cc0a485894c8fbd3a5dc63e44359c95fc62fd055066b595
diff --git a/sys-apps/coreutils/coreutils-9.0-r1.ebuild b/sys-apps/coreutils/coreutils-9.0-r1.ebuild
index ffbc9ea3ef92..9809b98ed1d3 100644
--- a/sys-apps/coreutils/coreutils-9.0-r1.ebuild
+++ b/sys-apps/coreutils/coreutils-9.0-r1.ebuild
@@ -58,6 +58,46 @@ RDEPEND+="
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4"
 
+pkg_pretend() {
+	if has_version "<sys-fs/zfs-9999" ; then
+		einfo "Checking for running ZFS module version"
+
+		local kmodv minver
+		kmodv="$(grep kmod <(zfs -V 2>/dev/null))"
+		# Convert zfs-kmod-2.1.1-r3-gentoo -> 2.1.1-r3
+		kmodv="${kmodv//zfs-kmod-}"
+		kmodv="${kmodv%%-gentoo}"
+
+		minver="$(ver_cut 2 ${kmodv})"
+		local diemsg=$(cat <<-EOF
+			Attempted installation of ${P} on unsupported version of zfs-kmod!
+			Please reboot to a newer version of zfs-kmod first:
+			zfs-kmod >=2.0.7 or zfs-kmod >=2.1.1-r3
+			Using ${P} with running version of zfs-kmod of can
+			lead to data loss while using cp command on some configurations.
+			See https://github.com/openzfs/zfs/issues/11900 for details.
+		EOF
+		)
+
+		case "${minver}" in
+			# 2.0.x
+			0)
+				ver_test "${kmodv}" -lt 2.0.7 && die "${diemsg}"
+				;;
+			# 2.1.x
+			1)
+				ver_test "${kmodv}" -lt 2.1.1-r3 && die "${diemsg}"
+				;;
+			# 0.8.x/9999
+			*)
+				# We can't really cover this case realistically
+				# 9999 is too hard to check and 0.8.x isn't being supported anymore.
+				;;
+		esac
+	fi
+
+}
+
 pkg_setup() {
 	if use test ; then
 		python-any-r1_pkg_setup
@@ -112,6 +152,10 @@ src_configure() {
 		$(use_with gmp libgmp)
 	)
 
+	if use gmp ; then
+		myconf+=( --with-libgmp-prefix="${ESYSROOT}"/usr )
+	fi
+
 	if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
 		# bug #311569
 		export fu_cv_sys_stat_statfs2_bsize=yes
diff --git a/sys-apps/coreutils/coreutils-9.0.ebuild b/sys-apps/coreutils/coreutils-9.0.ebuild
index b373e1d79b29..231339807e73 100644
--- a/sys-apps/coreutils/coreutils-9.0.ebuild
+++ b/sys-apps/coreutils/coreutils-9.0.ebuild
@@ -58,6 +58,46 @@ RDEPEND+="
 	!<app-forensics/tct-1.18-r1
 	!<net-fs/netatalk-2.0.3-r4"
 
+pkg_pretend() {
+	if has_version "<sys-fs/zfs-9999" ; then
+		einfo "Checking for running ZFS module version"
+
+		local kmodv minver
+		kmodv="$(grep kmod <(zfs -V 2>/dev/null))"
+		# Convert zfs-kmod-2.1.1-r3-gentoo -> 2.1.1-r3
+		kmodv="${kmodv//zfs-kmod-}"
+		kmodv="${kmodv%%-gentoo}"
+
+		minver="$(ver_cut 2 ${kmodv})"
+		local diemsg=$(cat <<-EOF
+			Attempted installation of ${P} on unsupported version of zfs-kmod!
+			Please reboot to a newer version of zfs-kmod first:
+			zfs-kmod >=2.0.7 or zfs-kmod >=2.1.1-r3
+			Using ${P} with running version of zfs-kmod of can
+			lead to data loss while using cp command on some configurations.
+			See https://github.com/openzfs/zfs/issues/11900 for details.
+		EOF
+		)
+
+		case "${minver}" in
+			# 2.0.x
+			0)
+				ver_test "${kmodv}" -lt 2.0.7 && die "${diemsg}"
+				;;
+			# 2.1.x
+			1)
+				ver_test "${kmodv}" -lt 2.1.1-r3 && die "${diemsg}"
+				;;
+			# 0.8.x/9999
+			*)
+				# We can't really cover this case realistically
+				# 9999 is too hard to check and 0.8.x isn't being supported anymore.
+				;;
+		esac
+	fi
+
+}
+
 pkg_setup() {
 	if use test ; then
 		python-any-r1_pkg_setup
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index 9e075279185c..b857071791d8 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -12,6 +12,6 @@ DIST c-utf8-8a8f07d623492d4b45532527f945b118a2b4299b.tar.gz 9331 BLAKE2B f5b380d
 DIST dbus-broker-28.tar.gz 216484 BLAKE2B 8d8dd9d15efa8c276d6db5c4f50320c7d18498c93205f9cda2bb849b781def17c387d5768ef62963024ee99f163ea1a72e457098612a9e6cac39238f3eac533e SHA512 d8b8e0c665e3c0e33f50da99330ff4cfba8107bff2c7e03a9653bd89f740e69ed1dce750c7f737c78454e07294821ff545007f3927f12d7f35f53339e4747791
 DIST dbus-broker-29.tar.gz 216639 BLAKE2B 94c8b7ea01367eae176d9411af064a960a054d6fbeb2bdebe9ba983d0938443abeb521f32e0eb9ae28155d5c5ebcf461317223387ccfad624ddd24e6bc8e227b SHA512 4c31b8c15f5d1ada0eb9c63c905c9fc9b3b8336beb533974b9c2b2a6a89c306b77d029d1ddbccbad873f62cc0d02cc373a090907dd19eae1a8a7fc2e3a4c2113
 EBUILD dbus-broker-28.ebuild 1830 BLAKE2B b12f4e076b1744abfb216f5e37f6fd5f589d43546ad3b652fa181671d3ccbc865cf300cf720d4aa89ee72794c61650adaeab104c2b9340f51ad23ef65c580ae2 SHA512 9bc28978b7c72b6b22790cec8335ee9450c09a7cb73e3b4083227cbf9124eeebb7870c575f64dd133163fb81d9776dd264759111a315f96bdf940ed49296b7bf
-EBUILD dbus-broker-29.ebuild 1836 BLAKE2B 540f87666d77363175c649b9ddf09889a84ea100d141c3e7b4ffa0f4b8b1188b938ca0c1b263e06bd33506e16e3654b272159e41b554071efc74b300606330ea SHA512 8402b53054399a02940d077a4178a5a1072935f5e7be7063fc120eb815bb1e42124ce6d7a64b399495e035814a4ff4a11eb27ed22f9deec89a4ae0a0652e70db
-EBUILD dbus-broker-9999.ebuild 1830 BLAKE2B 092eea3b81cc65d389c477ed3c1c16473628b417bf262f6609ef62edab4ce1da2efab34a278b66b9704944f3f5e9ada19e37dac40a13051c3eac03094f543c5f SHA512 c6e8f582a8d26de067f0cea6399750c6b93cbc856282a09e76630d1614ea559117f513b7cc59dc2a1dcdd98800f9012d17f16be69f712dfc4d7673ffda43534f
+EBUILD dbus-broker-29.ebuild 1842 BLAKE2B 08bab1715b6da38bbeac3ca7f3ec47d39da680bebb958a1c4d2435250842414542ebde00f558ce681c2d18ae406330fda5549e3fd787273fc6dcd465b4bd7f1d SHA512 905b42bb284cac7a025308a6bb78728f4c66ffe687ae7923dddf358e1be820308bad9ab7a6ff07e97c1ed3bce4c4a76c173c9503cacda3363f3b5d82d8e9671a
+EBUILD dbus-broker-9999.ebuild 1837 BLAKE2B 228f861cbd77eb330ae11d954191869b859f1734f9761ba68db9d5bf0bc5bd35b6b00120841b188f23e598026599b8fd446e0324f45411efb1c4a9b7fc785ef4 SHA512 ecad5c3a76d37243daed86f5fb34e3510f9d502199feb3c707b85073c0cda4577d96f7ede49ae81cee66266e47e243bdbc07f335caad6e7855c91fe21ae7759e
 MISC metadata.xml 328 BLAKE2B 8d8eea6a3d5e3309106ec3e6f248c4b5cad557ccd5095794bd153cd270c5f43de508363646afce491d5e6cc3bff1dca1ca024c2e87e656401432ac2d833cca90 SHA512 971b4214d0a9f9a68ca12a309096b7345014d2e0f57e85e6e10ff0a09b533d5cafe153fa8082ac01609e3417a31afc319cb285a822194c9c672a57ce316340c4
diff --git a/sys-apps/dbus-broker/dbus-broker-29.ebuild b/sys-apps/dbus-broker/dbus-broker-29.ebuild
index bd41cc4d1b87..3016acfe03f1 100644
--- a/sys-apps/dbus-broker/dbus-broker-29.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-29.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="amd64 ~arm64 ~ppc64"
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
 	declare -Ag SUBPROJECTS=(
 		[c-dvar]=c8ea9712a94186512c22c32f32c421d6a2db6feb
diff --git a/sys-apps/dbus-broker/dbus-broker-9999.ebuild b/sys-apps/dbus-broker/dbus-broker-9999.ebuild
index 3c404b237532..36eca730b925 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-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/bus1/dbus-broker.git"
 else
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
 	declare -Ag SUBPROJECTS=(
 		[c-dvar]=9e1a5b4363aaece7169df2b2852944a1434b2df5
diff --git a/sys-apps/diffutils/Manifest b/sys-apps/diffutils/Manifest
index d4556e3dc271..183c09fb6d96 100644
--- a/sys-apps/diffutils/Manifest
+++ b/sys-apps/diffutils/Manifest
@@ -1,5 +1,5 @@
 DIST diffutils-3.7.tar.xz 1448828 BLAKE2B d9f115e0ec9b2499545a3bef4e469fb7786d4a95e0a1c8459c885c53e8b1dc797027979e42c53c2a7df4e1e224942bd9ce5214813977af2bcc67f0698ea0c647 SHA512 7b12cf8aea1b9844773748f72272d9c6a38adae9c3c3a8c62048f91fb56c60b76035fa5f51665dceaf2cfbf1d1f4a3efdcc24bf47a5a16ff4350543314b12c9c
 DIST diffutils-3.8.tar.xz 1585120 BLAKE2B 573abbfba55c62ba30d2084ca68860e9681cfe92648407f7fb04e1aaed2e4719e2fb5a29cf25bd125d762f4dfd52f85ee91f2ec19b099365bada7fe27a0394af SHA512 279441270987e70d5ecfaf84b6285a4866929c43ec877e50f154a788858d548a8a316f2fc26ad62f7348c8d289cb29a09d06dfadce1806e3d8b4ea88c8b1aa7c
 EBUILD diffutils-3.7-r1.ebuild 1179 BLAKE2B aa0c831588bceba6c855b67d53b51fe853b94659c70f63e829540b46e61be3a87fa2dc3889f81640a819ff4ed1a0db2a8d2903b707f27f59bf5b839916271209 SHA512 3a4287c690502ea4890850726d42ae937f726821a712435eb749e1ef82ef40ab415739dc3981872c541a2007596b22319aea7909e1dabee721c3f076d733599c
-EBUILD diffutils-3.8.ebuild 1062 BLAKE2B ee00c8cbff2fd414480745c4c77a7144d99b0653fe5b721337ef2395a3163ce11340e4dfd033e05e69dd039f9150fe59d70443fca46bcf02b7e9c98d183d21f5 SHA512 e9ce056d0ad62319be877a8db0f147c12c28036cd6608a762ddb936439af94b8f5bfb8879cf09071f5b9b8aeb547e39077c1ae791d86d86d4dd6b4bb284b0332
+EBUILD diffutils-3.8.ebuild 1061 BLAKE2B b881418d23b680285d50f0a5f9e02e094612ef7aa18e652d0b18bcdd531784dd32a0853db5a85b1287a8a812da43a9144391ca38770114db2d77ee31e5e733fd SHA512 bf92d38ebfc7cb37551958bc8ce57c5ff8e063ee2aa224efb101e17605c8533549f2565d812a2864cc764c14aff48dc7ea4fa4cefd8b78e149f3cf7fa71ea428
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/diffutils/diffutils-3.8.ebuild b/sys-apps/diffutils/diffutils-3.8.ebuild
index 1ff5957c29c4..fc7ab80b4a3b 100644
--- a/sys-apps/diffutils/diffutils-3.8.ebuild
+++ b/sys-apps/diffutils/diffutils-3.8.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 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 BDEPEND="nls? ( sys-devel/gettext )"
diff --git a/sys-apps/ethtool/Manifest b/sys-apps/ethtool/Manifest
index d7af245a48df..4200d807437d 100644
--- a/sys-apps/ethtool/Manifest
+++ b/sys-apps/ethtool/Manifest
@@ -1,7 +1,7 @@
 DIST ethtool-5.10.tar.xz 310536 BLAKE2B acc91ff2f7cf233a5a7bc85e32fbcf78e3923b240ab3e3300fa11d42769b664b1b5740ad6577daf4ef1b1054432e2323429ee63774af5e0210c1ec1c7d6aa4ac SHA512 128ecc0445ec44e231d95158a71cea2c03f059314f1a844cfb2f424970bd68608fb73b8dc5e8905b88ad0da2b65a8884a626be78d6d25f770ce043c6c87580a6
-DIST ethtool-5.13.tar.xz 318204 BLAKE2B 5e693368ce56fa155c5d371bc650e5fb7e8e1c8fd30982b45a674da63119e54f005484bea68c7b85e8d070efbf7aa15e92637e7a3b8b2010b4022851154a6809 SHA512 44426653aabd20707d2e597707113f4d30d12696b4f32c0ab0450af0dccece1b6a11e529a22d1299204f63c9e71ae41a1495d3d36b8f630f1734a72694d779be
 DIST ethtool-5.14.tar.xz 318536 BLAKE2B 09b5c9c8103635e33b22e55caff3b0f3751bf14d48de63e025587814c6b0d7e80962cd8ed27b6be7ae35a5a9d5decd0a9127a69a7cbbd52e2218bb3fc9e9b176 SHA512 880c4b6d5f83c25cabc6101222a5abf5f7e5e6501165ba5cdb420da242c351d7c32c1cffacfa1bcf0c4655434d89c64d39f0809af0d38f626a0a78f92ec68f87
+DIST ethtool-5.15.tar.xz 318864 BLAKE2B 855c07e388bfabf37637f20e2714c6ca27717f38d7f658be96e0e9ec9d4514e61f4ee29361fc0279510869606ad18126ccd2a47160f1097ab52b1e35216e9721 SHA512 28147468a92c179217b459907a3257ee4f2d2ed028cb87b074f1c7ca6eb91aca81c8a9f5c7fe74e81d16a516e6e7eb20137bf7a15b5479fd82a327c64954da12
 EBUILD ethtool-5.10.ebuild 583 BLAKE2B bbce36771a7b34b2b62b533a36df3d4039b913ac36e34cbd63fc5a28e7d717cb8449d65c1cc0cd80353f55ad3380eea3fa9d9f2cfacbc574b172bcff7f7e8910 SHA512 79631f2df71aa0c831e92578dac932d49f1fa9b946b9450d7f61d8fdf14dda1a218e79bb51ffc1ebe9534505c68ddaa9d547c7c8b6c2d271c1ddc34130e5fddc
-EBUILD ethtool-5.13.ebuild 598 BLAKE2B 31042341fe0493ba59c2feb21148535e5274acb673e039ceba4d119d28417af0964147c522174086c55da7d3aa9885118ed685de5014e26a6f3636758c3ce12d SHA512 d219a369422e72561a14985674b6faa17f77be2669ff8690858fd05d9aab2c380a6d851fff50ef0bd813057b2e7824a79ce151f8aafc46f04f58c4139e3527e9
 EBUILD ethtool-5.14.ebuild 598 BLAKE2B 31042341fe0493ba59c2feb21148535e5274acb673e039ceba4d119d28417af0964147c522174086c55da7d3aa9885118ed685de5014e26a6f3636758c3ce12d SHA512 d219a369422e72561a14985674b6faa17f77be2669ff8690858fd05d9aab2c380a6d851fff50ef0bd813057b2e7824a79ce151f8aafc46f04f58c4139e3527e9
+EBUILD ethtool-5.15.ebuild 598 BLAKE2B 31042341fe0493ba59c2feb21148535e5274acb673e039ceba4d119d28417af0964147c522174086c55da7d3aa9885118ed685de5014e26a6f3636758c3ce12d SHA512 d219a369422e72561a14985674b6faa17f77be2669ff8690858fd05d9aab2c380a6d851fff50ef0bd813057b2e7824a79ce151f8aafc46f04f58c4139e3527e9
 MISC metadata.xml 993 BLAKE2B 92777546a5d0d904b319409448ce71991ddd4b89941888b19d2cb093b9f3227361fac1ef39535524a5bcb7b1cfd91c90fb4557d5501b46d44df64e647fb7d3aa SHA512 696f633f299189a01bc9ff309faac585a849323e0d471e1ddb7631bc917c83220844bae7ba1568a181b08029f4109bb2cf0c3063cee5f0d91705a04abe353793
diff --git a/sys-apps/ethtool/ethtool-5.13.ebuild b/sys-apps/ethtool/ethtool-5.15.ebuild
index 4ddb6be7e3ff..4ddb6be7e3ff 100644
--- a/sys-apps/ethtool/ethtool-5.13.ebuild
+++ b/sys-apps/ethtool/ethtool-5.15.ebuild
diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest
index 2b60ce2236a8..cee285cc91d6 100644
--- a/sys-apps/fd/Manifest
+++ b/sys-apps/fd/Manifest
@@ -1,104 +1,63 @@
-DIST aho-corasick-0.7.10.crate 111039 BLAKE2B 69f984dbe528ece5ce4345bc0f39c122507a88e781d7c2d5c9175d1788aeef8d21e0487c7c449e28fbbdaae8203fe68627d23ac0a58d30dc70befd26ac9af32f SHA512 e8a1cb252015435009883662ca23408f1491d8f01461f3a81082feabeeff72ec61beb4f1f3271fc8a87f1379899ecfc38036ac208dca17889f70ddaca2406a9b
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 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 anyhow-1.0.31.crate 28514 BLAKE2B 1177bbac61e96eb007a7a9a79499a7dab08a5c828987221df32c137b69bed53473b37f01debf49a7da0883407c6da40192fbc800c9b7983128738b2889d327a4 SHA512 e60394f48b74f8db4e61b9bfdb146b8e7a8b014c0a729ccb9e657d648a9310e642c77f6e5e5d4c8a6ed40a65c65bda79e45cda9a3efd04a901376e3912aebb8a
 DIST anyhow-1.0.35.crate 28928 BLAKE2B 74fec657b5c21455298198bd9feddbc5086c433f2c43de45950e33341ca9527f88f4ccb94eef248437e455394d54ec0dc13af33843deb799a0215abd1b1a874f SHA512 e93baa31f9eb04dcefc9e17fe030778337796490cec3467799f98dbfda77f55522457adde388c08b8893303e8a34292b863793f37956c4adfb7a88ba10fbd154
-DIST arrayref-0.3.6.crate 10035 BLAKE2B 88292fa4b3ad4fccd03772c2f0eca04cc13373fe094358bac57d7523c256d89f3087603e5bcb2a0b15d8b2ecd48e904a822b2cb800276a9c47ad6c6b660d9d34 SHA512 368341d00706c1250ff081b0d99c36c9af694a62ff4f4d8c837234340295771ca49c5439b24b6e1a4f2c3c5821764e98881dcb22d793f83de632fd5cb457671f
-DIST arrayvec-0.5.1.crate 26816 BLAKE2B 172dab8f0129134dfc89c6032c5fc15e2f86a5cd1e5be18b87fe2108d18a1bdb0f597a6ed4cd214dc663fbfb27b05c66846fba4543b5e068b5c75d075bdc5bff SHA512 53db2fafea1f60ac1af9ecc0bc9b69010e9f8573048481d55969ecdc9f3d19832fe05824acf10a0186b0464f0fbfe898d73500fba39ed63650c64dac2c2e8043
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
-DIST autocfg-1.0.0.crate 12870 BLAKE2B 79e495d53298574afd3b292da7c9c363dcb3ea434fd44258efaf3628e95ebfc731f03083f8a1060272a2a3478a6452cdc41539e2dac08465cc6e6283844bf260 SHA512 451fc63148792ba1952b884170e3481359b01bacca5ec0456f43ca58f8e092b8f81c9764f8b00d4104059ff608089be5858220ee868127c064cc890c767ec3a3
 DIST autocfg-1.0.1.crate 12908 BLAKE2B 40c53cab298e4f26634c3acff3ece6a3371188d91dbf377ed664eabedcde20536edaa93daf406618f37edde019f049a6e7b9a47f627344587dbd126bee2b5e3a SHA512 630b348acb98b012e97804e6325d03c89abc22f2157762c59144c04e6c733daf550bdc7f0fe0b9f3b50e15dae8c1c3c4bdfce3d805b02f0fc987311f5332419b
-DIST base64-0.11.0.crate 48362 BLAKE2B 90d2a64496e20c4bcca6f21c2546474ec88283679ccae95303ea7521133414eba021810e64e5916e3980b6878f90281f09295ebadcc12324fc9a9060ac41a707 SHA512 31b5f56d4907a5e4ae40e92ef1629a446126525186f5236afc2475829bf2e5e067554db200a18f7b3ab741d0cc9c01e20612e77cc0cbc1bc2a4a8d11c0fdbf33
 DIST bitflags-1.2.1.crate 16745 BLAKE2B 0fa6d3ce44aad7616d5cd02aad8c1d0b0fed4022650eb43067c4a72e6fc88da05442674fa51826e4858a47c9de233e1ba2229820af094197cd11bb416ceffb2b SHA512 ad89b3798845e23737a620bba581c2ff1ff3e15bac12555c765e201d2c0b90ecea0cdbc5b5b1a3fa9858c385e8e041f8226f5acfae5bbbe9925643fff2bf3f0b
-DIST blake2b_simd-0.5.10.crate 34093 BLAKE2B 6e725c9399714d1e199277e3f9882d636c1737af5b0b290f853573575005d053d2ab3a34843461747914a0c25d370f0d5a5cbb46765fe99308c1fd7666d471c7 SHA512 7471e0347267a4b88e9eea932b3001c420da0a472b2ea0f20dff974789955d6d95e19d51e3a8a312516c7fc4c83b6af17cc59ea2b8fcd4ef879ebac22534307a
-DIST bstr-0.2.13.crate 345445 BLAKE2B 9a17fa04d55e5d053b115aef2a075b58cab0fb84c574df61eec7c3ab6f06e17d156991b1c070ad357599de5455af78982eecb8632336d53792958800ecafe839 SHA512 f1f778262269dfea6ba1cf953a5177107c2e1e838248a67588283ee11efa81adfa30498c7cfb20422e0955544a07d2a8f86c4eefc78e9f407a92be9591e26fe5
 DIST bstr-0.2.14.crate 345490 BLAKE2B 96095cf4d70d88cd5cb4a61bd0e72a673933c7d1d95b713bd44375e739037ae12451602fa539ebf98e73d39a6786728ad145e882117b98108d945ba96b810e83 SHA512 de62c0f31ad672f90a8038fa163c7cdaf474b35ec24592aee5549af7c76d43e6ed00f8d7237e15ab27576c27a7232033a217955de6a0a3b40c83661b3a7e1e8a
-DIST cc-1.0.53.crate 51740 BLAKE2B 04d9d6d7e5999c9463dd86eaed965ec728c285ea0e642a02383b45ea820bcbb37c91116646b0fa2636e7176030bcff29612a72482df8c7a02a7262a805791e55 SHA512 8c7224b21a36d46afcdb7b2475686edb2d31b784e95e792f81acd5d5840b0065ca8869ca1c8c5a70cfb3e31dbe5c006360b054c1f11a92f0e1937e4e6d335229
 DIST cc-1.0.66.crate 53454 BLAKE2B fe34309ae50a3b022c36270a1dc819713f9d70e9ade2f421c33c542e865dc861e3b5191e8949de253515aef6878f786a6abe048391a819d09bf57f33054a90ce SHA512 b07a70f88fa0588fb0f6bc7376e985834672cc9914a0713afe01740af6bcf01821d15720d831e8b7ea8b42f5866dbd011a245997f35bf8febc3b13d66089723e
 DIST cfg-if-0.1.10.crate 7933 BLAKE2B 063a96ed176f34f788666b40adc483d147fc011dee941ab60569ddd0e57502b5dd06ed71090f4e14ce005d06e240500a286f74652615e9d068fba649610d8cf8 SHA512 9d22616bfb4a75770a828a0a3cddac6787297a5fdc53eb17e25811cc94de717f2de8bd66d53c5d65ba1c83d8892aefee5ae758cf56a1ef0a0c3120f70b244339
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
-DIST clap-2.33.1.crate 201567 BLAKE2B 7bb63b6a243eb33050e5354622fb544ba6db3b859005d857b198af4c3f34dbda22d605326e80a274a12f73fb2c13aea99ec6652584a02d0a3092841f4e119d91 SHA512 31209da6a0ac987f7e1b2504a2fb7738c3aba4ddee4cc2bc22cc37d4d2b0feeff41ece557d4960d51564fd31cb23e413bf180eb60102a872caf623bf55c6f089
 DIST clap-2.33.3.crate 201925 BLAKE2B bec9c866481c5b3fddeb314f68af9bce38fc421e42816182de3209e8ea3447b72cf033e6251eea27fe974eff8085b7d98cdd2911b5cc0ec6b4bf4c750deb8a25 SHA512 3eb0fd648e2e3f9e5ff69a5e6cf0d867304fe18523accd036f28a86de368e4774088a6936c108ccc045092c539fe7f7494ea96420ebf6b4bec16880cea84bedf
-DIST constant_time_eq-0.1.5.crate 4936 BLAKE2B 882dbf33f20954205fcc5b6e39863db8969d184b697fd51ef462f6890c1a754e3fae67bcc7db685d8cc26abe6e3871d3b80aa542489ba9551a0c95a49f7a6dc2 SHA512 a4e0155a7ad72babcfd418d832d362b3fca7333aaaf36c246b00e948983837c3c93378b86e37c5fa7626fe137e3b6d77276ccc61624a7f4ab914605905a88a01
-DIST crossbeam-utils-0.7.2.crate 34338 BLAKE2B 3cb287c7741c4d5b0551331634a75b066f07fb4b55fa2b347370506467a05923254b1c4dca667de59ed91ff91f5496b37f40f13d3e9885a1b4f639f5b6748433 SHA512 e375f24c007bcf660d9e297527ed938f678a55696ca7b555b96fee7e0b94c31db2d3f4355675aa0baeadba68b9755ec92dc3a09a37b5db48e3723b926fd4a8f3
 DIST crossbeam-utils-0.8.1.crate 35914 BLAKE2B 8d8e7e2df01f061d3596127dd62c1d5316540fbdb34e6b88badff8968a408b2bdbd0f86a32531f4e276b6d40a89c4834cd8e9991288a0bb8cc27d99ba2f7b978 SHA512 c9f3a513fd139dab3c8091366cd6d378ef8a4d00eb43a6c26d107361fea470a5ab180950a1204c1a8881c2ed1106500327d598ccb09c79d0eba2db11299aa286
-DIST ctrlc-3.1.4.crate 12702 BLAKE2B 96437ca96cc75eac980623a7ae15e9ecd224f7d6373744f39b16ff0fdac708bc2761829c1d8de2bc4c66a0f6e7fcf7791831044447e9d0ac6521e4da4d566d98 SHA512 1a5101d11b57c4000edfe3cec6367d59c4a59d4db3b0c39fb50a86f175dc89bee3494950c301317e6137250499cc39aa9b30bf94042caf08cc185152743a5b2f
 DIST ctrlc-3.1.7.crate 12854 BLAKE2B 7934273fc3763b6a6b763590f2f26f2479e9dd459e42222879cc40d9ccc109d78b02e69fec88d11781528897f5c7034b16bfd1eafaba13363981e46fb6fac703 SHA512 fe8aeb4168a7870f8ebcc212d9fa221740385d1f8498557e282b7dc0569b3e6cc03de0d124281809021ec8b9ebac9ec22b5418ca02ca8cf9810fd2d029e6ce6b
 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
-DIST dirs-2.0.2.crate 11779 BLAKE2B d1a6152d05a98eacff15c6c7f1f550d475b5a1cf62e541a2fa8b9836b9a1ea6b98f9314341dda35929b968fcf8a47dac7679c5c0b0dd97f21564a8d469c2e254 SHA512 34d6e5956c9db1dae965d33f13c64dde59d3e0e18cbdc56c02f7f31cac8e0034a80fbb561e0a73b8dbd145f85b46fc4e8a147b4c946b5816d8dda6caef185396
 DIST dirs-next-2.0.0.crate 11689 BLAKE2B f5022bc51dd50bad4ad0fd05b159a4117aca47afbea66dc42c8306ca58f3a550165afbcf9f5f721ef5ad8d357eaff305c6f6e42789354a910d5f1d05d3b7b7c6 SHA512 6ccb732da8ccf7bf35952c22a3b0caa8238319feb0a6cd3b0957e6be12548a2ce507c69cb6d3cbd2adfb37e13e6521c6229da5999edb0e47a292a41c3ea1a766
-DIST dirs-sys-0.3.4.crate 10477 BLAKE2B 062083f8469ab0d9f1c62c9213b66837e96e4e74ad2d167d5e7a1e3568c7f5432d6f254a248869117ceebdf3f2282231365173f7c6d5941dce42220ac51668b0 SHA512 af36976d97eca3dae3e0a53ea7e4cbefe4e3a4f5277fae5974d7e958e6a880f75b72128b1854320314e3f4da9b625bee7b55bc5331e561ecb3502462f82163f1
 DIST dirs-sys-next-0.1.1.crate 10490 BLAKE2B a691f9603b649f648d410c7588a84c69adaff41179aa8eac899ed47082f171d765876864f08e3d0dbf3fa3798c1342b30e3bdf530ef06ed017c235a63b15d5a9 SHA512 e89af71b6bb4e23efb8ff189b42615672c2aa305fb8798393de2f9151c78cbfd5f3e45b066f5de64dfad69a84b15e72a1cdb4377f31ee9288018143017ed5730
-DIST fd-8.1.1.tar.gz 75702 BLAKE2B 9bf5a18edd54cdf797c6279d2ed3181f0b7ac6ca3a54843bd7e8f3f070e9aecdd0d7b51922a420e330fecc5f6427b16be09302504ea26fbfb3beefe0f3a2a3c2 SHA512 71c078deacd498ebd9e52e32c4208c35383035ec7b87513b4127319c0294b598ce8fd9ad1acb7d665f6b64024b69f6f9fe3ace93da9f1504b7d5875018204352
 DIST fd-8.2.1.tar.gz 83391 BLAKE2B a2dc300c0f65aba04eeb422aa46c93136f305b73ca70b1e0b9429e507652a203855070115f3d0c3bd8bcd4015a470439197749ec2020edf518a55d024dfdea71 SHA512 5e921cb3556899e086f0fbaae21842b532c486c75e91cbb8351e25f640467217ac89e8cfba044e855e2425222bfdbd01befa4f35251c8705b30b3503adf3a7bf
-DIST fd-find-8.1.1.crate 75449 BLAKE2B 7f94b2c74fcf1b919c31cfde182b29f7409af1c107a5ca603d1d933568a65606db6c18128a6785ebf626a9aa9e26e2eb885f65b40c214f7074ee52864730a37c SHA512 fd9e887940e662337b6b1ff949ed60619e8996b52ff481dcde820d680a3eb9ba6676b710a8b2be7fde6a769089efbf49d857d06d64263965f58592524fff68d5
-DIST filetime-0.2.10.crate 13880 BLAKE2B bc2289129c0d79f37b2589ee31f7bd9719c1aa97854c0c06f321a394202bb96e86b9ec8f8727735e4925e214e6c7f75d87578ab44530a123807b5b7eae7b1097 SHA512 45d1b6fd6017bd1a479a4e343b8651c8d426616cb68914c728456fae2a27bb1a45fafcafeb9a12c89c4eed835327e461bf92b80eed0f3a4e84b196b584b8698e
 DIST filetime-0.2.13.crate 14348 BLAKE2B cdb21f88ba00293c93f4831ec81b1c5468d6ca88fc58d3c3daa106c5476089df630ce6082280a77bf6da881dd95f3000f4abeb2469d8aad4d0efb6c3bdd80a2b SHA512 ba7d31b0946bc30782feee124dd904b4c3ba75d1bd81131e3bef06faeb019b51e7cc436a4fe86f3dc9615900fa27bce3f4965f13472ead173564054db8f6f786
 DIST fnv-1.0.7.crate 11266 BLAKE2B 81da85889c91b6567e0f555e37dd915f1bd919719d1ca10c31a6861d7aec29a49ae9c1e8bc500791bf9d6b8dbb318c096d04872c5872a4b1f7d45fbd8e12842d SHA512 2195a4b34a78e2dd9838caf0ee556bf87cbb4a8ef5505aac663b614eb59dcfc0c40f432463ede41ecca57bfe7711f72673d39a85fe03d426f1324097d5628334
-DIST fs_extra-1.1.0.crate 29292 BLAKE2B ea1b787484218733a2c107ff059f3e89357afc51c510da0f5f30e4c9289c722a7c810a0a08138673aa454445dfcb08caa986ac64165ac27476d9b709d819308f SHA512 c001a37a23a614f1752a45fbf392694911c8d06bb5af8b8a40f2dcba9c80c67ab634de0dd4fa951007072204b162430fed2c89bbb11ac2fca62dfa5cd4cbd46a
 DIST fs_extra-1.2.0.crate 29918 BLAKE2B 92e5de4cdaa16ed8c2737e988f8f2419e394f56e30ec43d9a29dbadc13ccbbdff7cf2b30788d37f160123df83fa998b966fc9b5f793b6e15f84af4dda7ec4cd1 SHA512 66670d624394874d7f786f8d362438c53f5b18008909ab8e7a74e82518dbc189e37588836f05f19dcd4718f4c1a5296fdf274380d574b1f475e28891ecdd6c91
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST getrandom-0.1.14.crate 24698 BLAKE2B 8139227951eb65cc2bb7bba29291c0e8ff0b8d9a8e2d7eabb01682d1683c989c44b6195952ec7d087c338538c1d6858c45514822625266e0996829e8c50f3d17 SHA512 b5cb78ae81f31fffd7d720f9ea2b5917b4eac103711faf656a3a3fdd24ae5a2e671016d39309cdd11f902de919187311401dd8fe9e6ed68c29b83987de77c957
 DIST getrandom-0.1.15.crate 24786 BLAKE2B 868817d62ee44fa5bbf54f9af0bd71a29503f92bc93e190a834f4ebdb8eb73dd29e175c661f9964298987949c0b82a53e99080cbe4090fc9c5453daea4b05595 SHA512 b26d9558554058f8a54b03f56f488db5ebad2d5cc84f737e489f8f532f8464ef9038d104173eb30acca61caa1f99e1ce267bc493c01ba1611b829e0a090cc87f
-DIST globset-0.4.5.crate 22830 BLAKE2B e4e1c4924577cc8ad14f3c76e49821b2f6050395e7673cdf4d118e7025e59e6df1be807762a484ee80739121b14bee8833c10b52ba69a13537ff9919f1bd2e3f SHA512 8fca9a19953370aa5d13b876a254f71ad6ecf0df218d8f5598ff2328eec9676be56b3a44d898dd031c8d4328bda939ee198f9b8dc7e03b45a1609b6f693a9088
 DIST globset-0.4.6.crate 22893 BLAKE2B d47dce5ddb342b5c544f50c01160df66e81e80ca8a0abbf90a74ba67aa9c585843c051ea98ceb7249d4a56e5c1b985b00df734ec0fd19439274a8c1f998dbe75 SHA512 aac2b1b0f47103a0e8b404f4c97bcaa8561d51683fe741a85d745b3f30b56f0523c2fa21f21a680d9e883c697eb4232180f042dca290e954ac55429ae251fcbc
-DIST hermit-abi-0.1.13.crate 9230 BLAKE2B 9591171d6f303a4a462d23edc2f8d493bdc23b6c2da4b464444718bfc89078e5a627e1543b7ab5be9d4e05f16c3508e55642360bb8d2cbd5edc2ce39b28d022e SHA512 ac424683ee3cfff9c63c735ac91008df722a2709d12744f009466574098433677266799e8ca817d3d3cad8f10f3c02e8081c67ff479701eabdc4543c0a79bd25
 DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
-DIST humantime-2.0.0.crate 17374 BLAKE2B 35f36b30d8fe3cb26f666dd57e31ab93924cf9d1c40d6c83cbf800f141c951634fcd641634a8f552baabf858303570bf8d1207e5455d5129f433d0c95b138c35 SHA512 5686246351af000cc38d10f65bd6cf3fe446dbedd75867f9bfc7a68c4b8183ccfc9e0cf14b7fa149d912acbfd9ff917d8ed5be3b5eab7832d23bf573a8e024e2
 DIST humantime-2.0.1.crate 17381 BLAKE2B 254f2bc0ea87123b49c22e95ff2218abb5f611918ae5419b960b472ce3402c5baf9d66c3a586b0ad9b10639473a0dcb660b8a8d79f86e5d6bd48768cc6aeb0f8 SHA512 c3cb464801fcbeea7c04e148cda2467386b7f008642d2641bdffab85784c16aa2708e847740772674d62b746c66d404e3b8307ebaa9c2df836fb58b3b0278e62
-DIST ignore-0.4.15.crate 52328 BLAKE2B 12567e87ae3c5cbf6daae21b4b1a7df7270f95734a8e2d21d7eb038e7a195b8fdb78da646c00fb232f2357ed1eccdd10c747d8985e0edfa6ae847be361203977 SHA512 f12b152a841d29a812af12d668648a142b79b4cdb01eb8c59ef9574c7c7bbcd7321b3e049bb3931866c3b26c196dfd3a48f7e5df63fa5923cb13a2daf0033f46
 DIST ignore-0.4.17.crate 53056 BLAKE2B 734e74210f13e5ad08864cc8b143fb780383cd36048e78da04a0475eaa760867dd4a385b37fdfaff0c5aca946d4aab19c4901df0833271a3ba05887ea5dec9c5 SHA512 52380126bb46478875093eb39972949625e1d9ada6fac7148faeccc22807d8e2a1e41c34549e7d9f884fd3cd6dc3d42b47a88b5b6de1089d7e3ee8014b3aea35
 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.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
-DIST libc-0.2.70.crate 472909 BLAKE2B bbc4b3ec2ebad2bed2a164e407e344ee4a70a7d83a00b8501d82d70a03dd76a3af40b5a494676d203c37683d602437737c8fd1cf1e7f513bfe5db2820ff29b39 SHA512 a543b972e73d5bf142988464cd62f4402b782796074aabf4ec9396e341050d545b83212c7e4c62c224d5e06de4d794c67fea91b83d605626df115b30d8f326de
 DIST libc-0.2.80.crate 513503 BLAKE2B d4bb5f789efa230ec9a7a2071652fc1e344669e5dfe3a2015694a1e8442cd5adc142f1374841a4f01984f132f0ad5f027913b201cd624f97e93d2bba31ad96a0 SHA512 69b2f4c67d29bd4fc8f6d0388036ac3ea0de2ba7387f56f4e4bd035696ba313fdce10d18107ef83490f574d6fff796b305d5f2c2bb03a7cf33b9136386e65b8c
 DIST log-0.4.11.crate 36276 BLAKE2B 728647c829e96cb4fc795682facceebec887508e1ca14f13c0e7984db8ac39b3045885d1daa2f335de3e8f25c5cf1b519a1e7c8c6f4160a716bb8e39d085009f SHA512 e216fcb3c9635d8c4b67b05c1ada1e5de4e99dce89ab4c8f8033ddce6ac488605d8af09f93c42d25ebf8844feea22c93b71682e77a368ee01c686a15133fdeec
-DIST log-0.4.8.crate 31297 BLAKE2B 31037fdc2fc94f4ab8a6e89a251b0bc29975027dc7efb7cc86a8e848dfc8e2ae50acdb177b7ba9f7c1f20ec01e50798f89abb772d67a33f1b060ac617cf9a8ab SHA512 0b71f97d5964134b5eea1332347e177806b2f171d0be5c410c0ff1539470b242ba9f0933fafd853e4171a43b5e373a150af18918924be431c7216022553a8a3b
-DIST lscolors-0.7.0.crate 18036 BLAKE2B 6ed35013099c9adcbb6f1a471216138cf12592928a098ff2312dd227744e2208a001e812a77d63cb729cf2b66bcdb0188ab1ba51d78d7f80a88bfc8f1ae5623e SHA512 470bb3ec7d603959394e561a1f3f1d037479da48f966ff822bf8ae4f7e724be87523adc6b5225ee4521a7bffae15ef67f60d0c04488c12e30cbec45651198bd3
 DIST lscolors-0.7.1.crate 17986 BLAKE2B 927e3d9155591c5223fccf78f011dfce21f29c7f9322de0e3a97703eec2b27ff1eb93890b9ef62cb0916ceb06bb88660b34443ef815aef621801f7917ff46b31 SHA512 65c618c25624b360a98f98142e0867d524d19e7060887993f35899a26a812e360d8b8d627d36a72fa3c604a1cb5615d6a425850087183b694083b9649e120776
-DIST memchr-2.3.3.crate 22566 BLAKE2B f952070b98ef30f0d2780a6efbeb36d295710734f678517d913a8002cafebbd3cfc38975fc4546d306efc11bc815764d14320af3b7a2360bd46fc2ab3db9efa5 SHA512 922e05da920d0d94226857788878ee5e31518cd80d95ae57e1d7ecd233942c37d01565525db2f1dfdfd5b3b1f81b2c73eee058cbfd745cb4e1519518318df248
 DIST memchr-2.3.4.crate 23077 BLAKE2B 5ddcc5fba109030040dd0c394344860ac0cb96679948b364c3333eddd29992c335c2a46a6f496c2fe085981ecb6e5386f7d44c1d489cabba180c037f1a872013 SHA512 24cde03e6f7cbee1c1d12dcc691190c7e3dc72f468cf41e2397560961d62685976fe47de51119c04c473cccf75b38311bd887fd9db93e92563aebac8f9184df6
-DIST nix-0.17.0.crate 195654 BLAKE2B 6857f84b3deb5800fe3167efd226f042bbcbbc61a4153ce59f69fb544616842c3f6d4566444201c669c6235d1d7577302e5404399f4937f1c0bbbd17fd47ef71 SHA512 3f2bc4f0e9dcb9753535aec9d626ad8126f0a9ea18f73760ba72be0f35d82542c659b4c443783010de133a318f423a16f71cd1f1dd5b5a1f4f71ff7bda247b63
 DIST nix-0.18.0.crate 209962 BLAKE2B 3ff822e3d49a6c477d5da3702fc88bbe270202acb4f7c449a78969ada9b8fc8855a90ee194bd2943dd27c28286b88e1b22a6003e08260e19f7c8ed6036bc2891 SHA512 b86660bfa2533fdfb945a3ef840c692b5d96108e3e73b76d6489b65039cde87ae04935d2f10878cab1ea38f039083aebf4ec9b2bb6ba66ee204be700e3e96581
 DIST num_cpus-1.13.0.crate 14704 BLAKE2B e7a26e597ad5e45309393a9500b031ba64a77831320cbb96d7861139a2f7a453b7ba06a3255439b43ac1e2e36269b0a350d514020d3cd82c2513b57934b3ebbc SHA512 e75ec298fa682be84bf4efb6cf40126da9233ef25f07e887c2fa7421ee78790204564e6406c8219466651f47421e27f69eca690bb9cdfc982b644d78cc10de3f
 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
 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_syscall-0.1.57.crate 17087 BLAKE2B 88e3ffcfd752e757f8fadfd4edca367f9185f09e609c329bb36f179183cf103dc182aae701c14afb717d2b4c3d72ba307b49fc671cc97aa7c9d03df1a7a1835f SHA512 c6e187087060084b7173ed0d9d0e982e4259d4f76522112268c02ff20751382e3bc8e119da6153170f5c54bd5b9cb028910f2f85c1c842099205dccd44659184
-DIST redox_users-0.3.4.crate 12526 BLAKE2B cae43317cc63f129bec8d4da5959e5b00a17c4ecb35d5a18a410f12b70a9f72c235afcdbf9bf5de71a94cfe02f46d7e2d6988b536d02ff1b333c6025a5ab906d SHA512 7a42f4b6ced1b8ee53f2c35446154fea6646bd1634133738a281788e69121bfcbc02d4aeb88d25729382429945c0e89b6de4b6b63831e645c6197ff4ad022831
 DIST redox_users-0.3.5.crate 12644 BLAKE2B 093141c98164163dc66378f2ccb48a5f478c5b40b69ad4ecb89fe8967e4a309974088ea5f7a2b184b625fc03348f2e75b0809d3683696e9b74d5c4a5ac6a4e8d SHA512 d90f1816205a4f2eca59397f6866e5cd965af652940f56930f8bfbe2b50eda75cf78b09200bb69416a35cbeead3cbd4de354805568be2feef1ae4d691b9a6a3c
-DIST regex-1.3.7.crate 235600 BLAKE2B 15370ec0cc9f37c6a7092eaf78a731740aae3d79ec6d385244f4568395cac8947860828ff585aba9f35ccae684bb19e214120f39e7f4998350ff2890a43f2466 SHA512 59090515860c26551ce08e8b37cf1227712944844148b79dcc7348f430e5c3c70767c20807cb1affb242686e7e8f885224c4c9fb9ae890b57f766fec96e2aa69
 DIST regex-1.4.2.crate 236931 BLAKE2B f316b777df1c97aef2994745e1fbd9ca676b0da6bf4ffad4e54aa11014d39aed343884ede3648b5fd676dcec5e4840e9d84f4a4faaeefaf5a2d772e2c5b9ebf6 SHA512 a9bc8061b7563b8494b21f35bf3c2af5f58dcc1b0df4e25ab8d3f99ba66527d5163e2c04b229b688fcb7934961f718fab72f22d66fef53562c5d96a2fb3887de
-DIST regex-syntax-0.6.17.crate 294004 BLAKE2B 3d203b06b8b1a5bdb42d50d395ce117ad92e41a7d36e5cb5194014eb7af1b17f944ae493041b7e9a2a9ea929381b4c1cb513c895747beff97aafef524ea2ced5 SHA512 bd9a165bcac207ec3bb87a81ae644be98d9b5ea0053b3bcc69efb334e3ebfeb85021aa372bafc3575758200640cbaaa67d372950fbb3ab210d8ec62b336d147f
 DIST regex-syntax-0.6.21.crate 293572 BLAKE2B 49c499ba1c03447fe7c90f27147dc5d96daf815e330a4073fe293d3be594fab1d798d35a5e49f6af43c71befd47528927246c4ebb24b6a6a141135484bbecd31 SHA512 56507f4432804ea30820984f6cff03c3514988bc3e406b3ba3a89c36c9c5d75951e4acd000ba85b95bb83d253898ce7d7d282ed930e811e12bb644c4a5ec84fa
-DIST remove_dir_all-0.5.2.crate 8907 BLAKE2B 585f49f83db3ace90dd0b4fc77aab7525844194c82d36cc33ab8999aaa6226d24a130c30f55e2c46a08273cc554d9d4c8bc51958aa7dbf1045085b2e22639e4e SHA512 d19a45398a93adbcef9f233f6b3eaf4a63ae95f5bbae00c880b40c5edd34449e7f798ebcd4d11843c68ddfa15e11bed21d434b224e4a175dcb64ae011c13c8cd
 DIST remove_dir_all-0.5.3.crate 9184 BLAKE2B ab7ef94e0230ddc9b363f038254a180881bbc20eb04a254f97e6f71ed491c99ba1c88f5e85632d450243882a4a0df63f3b8b183bc1fbca9caf30ec23d577b1d7 SHA512 50417d6d8a33912193a1ed37eb72b47431b12ae65d2780cdb7080c3d141e63819da13751c3fb737685cea322f70b36d413389c3dc01aa12b4dce615aefed0e2c
-DIST rust-argon2-0.7.0.crate 27757 BLAKE2B ddeea9ffda1216294e0b8a3dced747fffbd8198fb3b5b74a347a8932a242db7c81554c08c3757574cfbcea5b13b253737df098355e65685d8ae7d95f55306290 SHA512 7310b7f993eb190c155b982bcc6e88e887ca4605dcdae521f0d744f48a5646694c4befa5518f9c94d303c8af1d9111e59c1c67512a9dac4e5f30b83cceed8ddc
 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.2.crate 10917 BLAKE2B 2302faf4cc03e0e40e4b4b0ca79cea5e70caed8087a16f2b985673476041d19ee6908bb17931b453e63a89e33158f7e01875716879964664487fb26395ff7f49 SHA512 7e820ca667f841719e82cf97e90bd2546cdd7ecd4834c68f8eeadd2e530bb13ced1d058ea7beda5db77eabacfaef64b8c3699c482bd912ff570f6ab78149dc88
 DIST textwrap-0.11.0.crate 17322 BLAKE2B 257428908342774593bbd3528fcdae710712ff54e8a711393a24356d8ba0e16e466a4b20c05f942c48ca76b3b5b5aaa90ec202f782cad892caa8b71ccf124da6 SHA512 f5c0fe4f28ff1a3a0931e8e235b5157a45f67967985bcc752418c5ec3481fca44a8ae4800088889b37e8cd0533f53d3c456d5ffd19b767b3f83a87b49a2e209a
 DIST thread_local-1.0.1.crate 12609 BLAKE2B 34206b5232262cda9cc0fb970e20f154d43ff1c4477a5ad5ff9200e6d874a6c7b2bcd99a2dae75a984b54574281e049ad35307ace0dd188f44c9a95fa93139cf SHA512 f2bfca4eee32a8fc88a01ff5bf24518c12142228d95916d13aae35ed6addd0b7da2235359f15220049ef197555344ac31a8833775e7a5bd49144db9c54b3165b
-DIST unicode-width-0.1.7.crate 16644 BLAKE2B 8cc5ee2dfeeda8ffe3405a0d4f1576d2b3b8ede1a42cbefb0ba3bd0d71b53a92ceade86c4a06e9d5b31382955dc6e1152ae5cd279dc26dbc51f478dad1d0f64d SHA512 39b8a539c9009d0421f54ae68b139f21456c9cb03d743b58535a977f98bc9655cf42eaacfadbcff796c187a6f315ae16259ee22be9c2da5aa042172c6b464d84
 DIST unicode-width-0.1.8.crate 16732 BLAKE2B 5aa7b87eef1322e4151a3fcf981ade311b8fa030527d7561815950e58d3f15156163dfe34da6a708c37dccc3f7652bf7fc2cd899fe8bb0118b67c4113ff3a2d2 SHA512 0abba6da6981a2451e01d93bbd47652c46eb6fb07cc0214f33259fb29945bfd5ee2b302e883ddca8f68e921635f222701b7310e7da2a5e225f854980d1e474b0
-DIST users-0.10.0.crate 18531 BLAKE2B 18f1dba893d2d88b33785b997f6b2a3582fbd5c2c21f460fd7ab3c98572d524dc0e0fdc1ab3c5651d46f4219cdfaa4b60fafc045f01f6147d99dd3aad92c146e SHA512 21052adcd602ff6c30a4e9f4e14fdca896dce03969b1b03069f93f3e9d2b25c66b83ac2f40ed4e960dcfb5a0e67719ee45da475855f6e397f3618273ea52469b
 DIST users-0.11.0.crate 21980 BLAKE2B c106e9ed67b9ad766bb7318506261579768185aea3d956d9e8b2adb52349525fe69703ee3bb2e4fb02aa223bfa6fc92a14d8128412623f70654254f842d7322c SHA512 e28028f895780bd59a11069b81b87470a287a447e42566cfb8de0e2d4ba8c90a3ce92901e253dcd2628383c8ed06c10714bc0181a57bf257f7edb3510936e596
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
-DIST version_check-0.9.1.crate 11459 BLAKE2B 72f002c00504f635b7d2d7ee7137e07ba9c182d2e41d32a51851896f6bf6742c5524b7f66946437ba581ccf80b9c9a57280dd4b02df0918569ac710511940fc1 SHA512 b9cf363169df2022a961f5bed4fb7da07513e0283a85aa69752f6ac567e942611ed2216ac61799db1a199e2bdf0fd9b994e35d4a40c6cd80cd26b97cbfe977cf
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
-DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
 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 winapi-0.3.8.crate 1128308 BLAKE2B e0e8ef6121f222b0500525192ebb69b26b71cc16f9ba92186f8ad6acc9de4cb8cc7c738f9c31f5bd223d2e34c93c496e8448c973d69797776004670c70abf69c SHA512 5a899ee5f09f30d742b8b8eba78da05cd9f4c664408fdeb9370373f8756a962a23e3f1c07619e745b3270138606c9a369076c02c3f5353f657df09d203d9a736
 DIST winapi-0.3.9.crate 1200382 BLAKE2B cb5799749ccd935ea2d7068d953cecf19f543d9db7dc16ad4584bb7005373ada34937a3ced7225544d8bc765da599911c7a3190efefb3a25b7c1bb7123b4f673 SHA512 ff8b7b78065f3d8999ec03c725a0460ebc059771bf071c7a3df3f0ecd733edf3b0a2450024d4e24e1aedddaecd9038ce1376c0d8bbf45132068cf45cf4a53a97
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766099872d856ebee51c883d9acf1122278db9607d50ca53eac351502b700fd2463900932d342240f97f683d517963 SHA512 7baeb661f397c4693dfa001fdc774b323c51a7c55caad40f2de5112a1cefd1d6151e3df41fa4ee193460a5905917c83d2b1de5fa10b4bd014ad96690af95c0fd
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD fd-8.1.1.ebuild 2246 BLAKE2B fadf076642510e21dcaecf7317ac472c3267d21d5e8de0a9ecf277d948a7890c7c513aaebe9c82f5fcc9300c4dbf053aef0c2001c9470e562a524ae043527735 SHA512 0ae0772576261c6fc9ba1359a19409fe3c996302f4aecb70a50ad43543eaa6b225ecafd6a64d1be02775e12dcad9720ee2ac240ed893496734378d76b55d543b
-EBUILD fd-8.2.1.ebuild 2170 BLAKE2B a5e3a93657481ab106ed5fdfa3ed0002a329a892afea84fd5cd8774a7554dab78f84a19e2f6e1763f5d20aa2c2c68976fb7f4d721eb05340d1555d7ad2edc0c5 SHA512 049e2d8fc535e7e3022fba7b270f15fcc0e28bde20da713fb1909ffac24b515c0572fa3075703f47fbd384a2494ebef4427c6f748b2106c85072ba1e45de0274
+EBUILD fd-8.2.1.ebuild 2166 BLAKE2B 5743a7c33f9d9897fe039748fdc15b99d6d90958eb7075a2657fbf6c29a3ed00719d343bfcf308ca01ad213ca857aec57f561e44b50754da3b28cd62c985123c SHA512 7ae387b7869a55dcf714c00f268e1d220a9fafd1de82d5bb7eee14f08a1ec6c339f82b866487e708ed293ac7a37e7519ffaad2a060f127efb587b1eb720d74d4
 MISC metadata.xml 575 BLAKE2B 7cea4b70a5cc9f91d9d7a3bc5821b8e3ea9762928dbeb538a3cab911e0cb1ebd865edc5dd1d0ab5c597da2a2aafad60b9c247108dc46c22ff20c15e2d47e43cc SHA512 8a13cdeac4b76847fa80e75575e7b8dd52faba7d047b81c145e3f51ff05e6b38f471d2c28a78ff3b26c7666dc645d68f2374f8f24329907d01582e0c3e9be8e9
diff --git a/sys-apps/fd/fd-8.1.1.ebuild b/sys-apps/fd/fd-8.1.1.ebuild
deleted file mode 100644
index e1a3a8f0436b..000000000000
--- a/sys-apps/fd/fd-8.1.1.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CRATES="
-aho-corasick-0.7.10
-ansi_term-0.11.0
-ansi_term-0.12.1
-anyhow-1.0.31
-arrayref-0.3.6
-arrayvec-0.5.1
-atty-0.2.14
-autocfg-1.0.0
-base64-0.11.0
-bitflags-1.2.1
-blake2b_simd-0.5.10
-bstr-0.2.13
-cc-1.0.53
-cfg-if-0.1.10
-clap-2.33.1
-constant_time_eq-0.1.5
-crossbeam-utils-0.7.2
-ctrlc-3.1.4
-diff-0.1.12
-dirs-2.0.2
-dirs-sys-0.3.4
-fd-find-8.1.1
-filetime-0.2.10
-fnv-1.0.7
-fs_extra-1.1.0
-fuchsia-cprng-0.1.1
-getrandom-0.1.14
-globset-0.4.5
-hermit-abi-0.1.13
-humantime-2.0.0
-ignore-0.4.15
-jemalloc-sys-0.3.2
-jemallocator-0.3.2
-lazy_static-1.4.0
-libc-0.2.70
-log-0.4.8
-lscolors-0.7.0
-memchr-2.3.3
-nix-0.17.0
-num_cpus-1.13.0
-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.7
-regex-syntax-0.6.17
-remove_dir_all-0.5.2
-rust-argon2-0.7.0
-same-file-1.0.6
-strsim-0.8.0
-tempdir-0.3.7
-term_size-0.3.2
-textwrap-0.11.0
-thread_local-1.0.1
-unicode-width-0.1.7
-users-0.10.0
-vec_map-0.8.2
-version_check-0.9.1
-void-1.0.2
-walkdir-2.3.1
-wasi-0.9.0+wasi-snapshot-preview1
-winapi-0.3.8
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-util-0.1.5
-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 ~arm64 ~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/fd/fd-8.2.1.ebuild b/sys-apps/fd/fd-8.2.1.ebuild
index 4d2bf148c6e5..1bfaeaa37873 100644
--- a/sys-apps/fd/fd-8.2.1.ebuild
+++ b/sys-apps/fd/fd-8.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -75,7 +75,7 @@ SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0 BSD-2 ISC MIT Unlicense"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE=""
 
 DEPEND="!elibc_musl? ( >=dev-libs/jemalloc-5.1.0:= )"
diff --git a/sys-apps/flatpak/Manifest b/sys-apps/flatpak/Manifest
index 03106dee8726..d2c81d1284f0 100644
--- a/sys-apps/flatpak/Manifest
+++ b/sys-apps/flatpak/Manifest
@@ -1,5 +1,5 @@
 DIST flatpak-1.10.5.tar.xz 1511032 BLAKE2B 704ce0b5828728f1bb438dca2c1cd0b84277547fbb08400fe11abf243f5d9b5a6219c79188b362174f2a61eea42ae548d4279646838f3de3e4e75b8782f3dabe SHA512 8c2e365ce442a092c15178a8b39daecf21bfe162078c9a323e68d53194413f174e329812dd01d8da6bbfba3b0087aeb4d92a44067df3f6fa0253e33014d138ae
 DIST flatpak-1.12.2.tar.xz 1541068 BLAKE2B 78162c9ccf0b7b18e69c2594865999fc052a507b255b855f3879cdac0c86dbfcabc6a282f0a4de548d3e85142b0b3c8c26d21825f35e6a2f25ebc1aa13ff2b8b SHA512 4887fe540a821f2c8539fbe1fd89b1cc350126a6fa90c1acf070e08db0de1073406a061f5483bc7a7ef9b07f73409beb7bc02d055d4b3ae1c33ba5c318e11b6f
 EBUILD flatpak-1.10.5.ebuild 2348 BLAKE2B 5a49a2773e347ef5a6a7f29f617069565f2f9ee34b5ff6f1f30ab5b3084be12b1370752124dc407cf8d936925e5f347d4fc592cfd7de79d47dea7df0a663504a SHA512 283da0b5ffd7c1e234296eb415de1e6671c28c335fde59651bfdae53439dac4dd0d034e4ceb16c02b0ec96b5f439bb2d971b98398b2bdba7d1239deebeb0d867
-EBUILD flatpak-1.12.2.ebuild 2351 BLAKE2B 95c29f8d377f935d0bd73262fad8c5c045abc78c0bdaa05672b27085a3ec2018f4411101dc004d093ff8ab717a57731110d7345718a5c4af2d0034ce58758466 SHA512 b60ef6b60442dd48ef3e4bfd01b4b4c8f527fa40f47711ac7d26a622eae1bfe8ce1fd2084a0ca29d3798d0e64bf683098158d214b566fc555e7f7c48e7558a0e
+EBUILD flatpak-1.12.2.ebuild 2354 BLAKE2B fc4791a4ca049737cd44a8b972c43bcfa64a565b259aab8dbe4f21bd8d7dc063ba6e78e45714874c40328b76012b997a51c4a34deb4ab847b49b8e75245c6558 SHA512 6458b51b5c4c009402b9b4ca04f7c9fcf08776535e1cab95867dbb95308d8dc28ca9015a0ece4319bf65da0953ce14e17ec92b18a8441a07835e82808b17822f
 MISC metadata.xml 325 BLAKE2B a8ca5c0feaab721a66653a8d5e084d2bba127d75faa0975a4dac7d4d7395801fc69bed88bf13663826188696ee5e25e18afc1b0d5161d27e15f36b9c88487146 SHA512 2736f22e733f2214b80c46b3280f90103e21c3211bea129614bcf372f05803b5d5148d34406e8aa332f7b21090e8aaa698bb1a25d767ccea21d3977f0894f464
diff --git a/sys-apps/flatpak/flatpak-1.12.2.ebuild b/sys-apps/flatpak/flatpak-1.12.2.ebuild
index a931e50425ab..0796956affd5 100644
--- a/sys-apps/flatpak/flatpak-1.12.2.ebuild
+++ b/sys-apps/flatpak/flatpak-1.12.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 
 inherit autotools linux-info python-any-r1
 
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 916b64b2c93c..64ffc1b72d15 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,19 +1,9 @@
 AUX fwupd-1.5.7-logind_plugin.patch 265 BLAKE2B 7959a4cb059a2207b0048f474ff9e0a3e3ab625d6db5e7dacafb7b6190c9718bd8659760579c6ee16fe22fefcc9ec4837f7b2635b1ff5f555ffda36cefacab48 SHA512 a809831e307549f109fbc2c705b80535d885db92a96b72d07f9ef7a954e52ffa2204331e608bc719d41ad038888adfeb23f6ed708c6a769c436f81b4086fedbb
-AUX fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch 1105 BLAKE2B 898f70b2baa27de6678b415ffe9671e2599ff69d9f1ad52cfcefd271d5c5c936bf32276970ef36a88464f11ea1956d90bedd64989adeb9f87be6a2e4d82bcd14 SHA512 106112dedd1c205604b6588ad08092cdb5bcdc1bab3f2e415526faf7af3075ed442d61b3f31a3d0421b683d6f772fb196f93131d3f2f8227b65a6dc781ec6461
-AUX fwupd-1.6.2-dell-dock-requires-gusb.patch 716 BLAKE2B 470db7243fa0e7398778ef8c5d716013e04ef6429e1b4a35b644c3f4bca7148f3bb9f2fc08814b82edc50e1605dc00feb2691f3f1c09b371afdeb1b838181a6c SHA512 08546194d1dfe27a09b10feb6d63a1f29cae881a0ac23bd1497b91eea44fff21559bb67ab5feac3b5613d4f99626708dade0127cb6c7f5ea4c842612c0323ec3
-AUX fwupd-1.7.0-elanfp-requires-gusb.patch 641 BLAKE2B 54dd8413a9608a9e1711622af3422ad874839c7083009c964f8cb2d198103e551d9bb262fc87da3dec0913829defbff358a2777aed1b11c0a42463d930a6f35b SHA512 fbe76f0db8364dd62b86fffaac16d8cf79eb65cbe71862030641c56d9b779c579f4528d176fbc382f055bee144fed5b2c9823486d3354d7de41240035307eacf
-AUX fwupd-1.7.0-fix-test-configure.patch 508 BLAKE2B 7b06c980fe18ee42969951cef6202c77f8c8bef713a344a6ade039c818e44123c4396ea1c191017d28491a3d3905c552d53d4e7d82d91f4cc4373bfae42861b7 SHA512 23232788c0e80933852d8df816889c8b0b181de62e8b0210f1f3e71f0a6d0ac9a1e484982c29e25bd47f57d49591564e92704afbf2638deb59170c8b65295fee
 AUX fwupd-r2 308 BLAKE2B 4494e69515347569965f0966ce2fe0779a6273df18412b4f6045c6186730dc8088f85eb029347b01c22897662d9205f98871752dee99690871a39cbb26db3899 SHA512 0f5070dc73cb6e0cfad7a66781afb85c695faffd05685e9df8c9798b94d55b31c0977134015d0d5418f5815d10529d79c898ae0efb2bdf0dc9ee44b696d5fdd7
 DIST fwupd-1.5.9.tar.gz 3712637 BLAKE2B 17429bdc3073a92b94de9bc67ce1955e928e8d6aeefa5f0ad39a9d15457f96c562ce5cfbc47e1fc450c31c2b9334ca3902ed63ef809e8d2cb5b5459cc54dec28 SHA512 ccd1246ab5b3c876251924a14d1c2c553b2df5702c6673978b1d627ea1028c3950241f73dd54e2fecb5cc204a1dc77e6597f7514eff6467beb50be7874352d78
-DIST fwupd-1.6.2.tar.gz 3885963 BLAKE2B 183abc4d620b884a276dece39ad1e57f606c2237a5fa03b76ede2e1c93bb9548d6641e35490d96e22abbbfb3c1852697a688091f62086f6b2e9d3366e796888e SHA512 a743b37c5969939cc3eb708b0af2e8f6c665848868473c29edf9db110cef5ac62da3c042cfa9617a2f10b2a9d153d0d4146a1832a18bc71fadcbf9a7b5cea1b0
-DIST fwupd-1.6.3.tar.gz 3888812 BLAKE2B 08d24fde80010d50e2396f59d743a00e640c1fcc06f6ada566ebcff48d25f1dc33676a40d13e1b684e45fd9483af1d9755ef3ac00bdaa8a37236589c03bb8a4c SHA512 837bcfe57873315ade8f3ff82d290d492dcb047387db5a642e6e7fc8e9ff7c3cabe5892692e2d4b5b0c5bd69f8a253bc364c61f23013c161a350b39de7d58e67
 DIST fwupd-1.6.4.tar.gz 3891113 BLAKE2B b4f3a629c0594ee69a0e2ea727c8080f63e970a6e9964b53d007e490d6b538f5441a65de20412673ded181611342c7c1c1ec16eb0d05c69c149f635fed325269 SHA512 d0c788313f8cf00c6e0e238436668ab5885133933cd74202d3eb4a3377d1b123689dd7f3827d45853c92b98196d5d896027b471117af461356e2f3c3ec82f58e
-DIST fwupd-1.7.0.tar.gz 4102985 BLAKE2B 9a29621e029c526d513304863294ee69f14ff1cf069b388fe5dc6037b2f030ea24136f18d9096abcc449376295996e3184c1c969f8dda329f2786622ba1300a7 SHA512 148f161f0e8d008fa20091c747baf4a205bc2e76ddc5dbb3676e3f2a15ca5d6d1454b572ea0336f185b5ef3a8ca8bfd3ad1098649e095a58c9822d4dbffe2987
 DIST fwupd-1.7.1.tar.gz 4025627 BLAKE2B 035796e8ebaafe139b8b6e7014f51c6e16a228d0ef697984f86e31c28f38aa62bc7d3bd64466b3f3c83c2605b229d7b3063287373c83ec4d962adca3c85cc6de SHA512 c695b66ebbe23908f5d6ef6d6084c092af8754e0677f094ee4d09b02d904f3f3cca0e460c5345a835c16b7303bba72209e216ba28285e44bce4872fffa136a5e
 EBUILD fwupd-1.5.9-r1.ebuild 4380 BLAKE2B f47d3b9dc882649c85549f3139ea2cd6473c21eee0a1750076b7dfad7c04caa6641f36704bc9bf978e047e16f9a07f12fcc862b22697ae4091c7f5cac31c2256 SHA512 f5d965dc302cd77877f13c0ccc3a952c71a6463b56b5d7aafce11ef4d673e46f9c486159be6e2ccfd1229d42ea014598705b867d7aa7795a5c9e0caf51a76506
-EBUILD fwupd-1.6.2.ebuild 4560 BLAKE2B f85eebae29ee6e20705e7db84bbf8ebc33d109a1fc063c6225c24faf70e1289ae693da3ba6bb36c53ab56e5cfefe39c99a684bbf5393abca8c94b082ce5c9a50 SHA512 f9556caeb5e6678a7bded64b97523e5917a81500a2f7791963c18c769e7e650e3d435c4fd0efe4bb3a0e771d95e294be28bee28a798c974abfaa252de90eb5ea
-EBUILD fwupd-1.6.3.ebuild 4504 BLAKE2B 78cb6e9716c4109fcf2e26cad2c8d5d84d952a1514827f2b48106b8b15d9a65085468396fee88584bc498441ed230dba5b150f682326e982c2fe45620aa3c1ed SHA512 01927eff188e8bf7fa80d394f9666bcc47266bf7e685264da4484ab4c7966adab92669007473c1602b31253cb35ec9bef44737bf4ba78d0ac8b1cb4d9799c255
-EBUILD fwupd-1.6.4-r1.ebuild 4504 BLAKE2B a5efb85ec19fd9484769314b6fcdcdffd1a7d331150496385e1f071421eaa20580c3b7590e52d83e36f752e8953fb6415873cff29fca9a70ea2e66722d4cf105 SHA512 f79dea7b0732564e976507863d39ea2af2d02a4218efc683476f9be1a18248ec8a25f1ff7729a44d5ff0171dc725cac3ebc3057b25c8704365c127a9ac6b9cde
-EBUILD fwupd-1.7.0.ebuild 4730 BLAKE2B 2ef6da5175a815e8867b180f0054657be387015ea200979d253bb35e9933adf9a8eee4fc9c64649965cd5fadccd98a3d8180803766abf3c1c586b7e1754c9c97 SHA512 d8c63a463cc5beca4580ab522cd4a027997deb238202e44ce4c1f79634385b834232bf5c4b0b6c20fbaa4e661bd63f78a1f699991eace1f4b3372bfb82dd4a48
-EBUILD fwupd-1.7.1.ebuild 4634 BLAKE2B 25e17477f6fdda731d559f0678558456834f2dd6ea624cce564ea951670dc482bf8fb16b6c8ce03272a4bc127d76f8e3d9fce05a5698a417a3f2f17c7dc70125 SHA512 e7b9940e52bc89a707d2d07107d8de16dd375c9a9ed88d038ac89a478ad36bec6a38378ca699b31c7881ee7c57489dae9d7a440038cf83816d55d2b970f3b1c6
+EBUILD fwupd-1.6.4-r1.ebuild 4477 BLAKE2B 899806f95e598ce0823a8e5af810b4edc5387884393e03fb51f3fe81cf37eb2f4cb96ec8461b20a4d0b016c142a9cb05113fd1fa6249a6883b0d92b780c37e02 SHA512 71e80891822d1e1a84cfa742ddde3fd7d6213ec9374fdfc7153db66d18129be99fb4eac9f137aa7b246dc9643dc6ffd50a9b728e9fc6b989a955b31b8417c019
+EBUILD fwupd-1.7.1.ebuild 4607 BLAKE2B 2a4f91e570ce3d7f0c204e46e7abd02fc78a8828392610ab94e4e721a4ade946477fda9db231f59cf929b7e0e7539d2ff6821084306aa6defc3c890fbaa6532d SHA512 969c631fa511c55473d1521d886c74de978f139a77de701f37404300ee33cf987ba44bc07a4b634a9ad3c7d8426efca21d6f10af560495a5ff96e899dbd0402f
 MISC metadata.xml 1493 BLAKE2B f75354ee9b89d3be913749ffc0d1e8d0d57946f1d785d6cbdab3c6670c790e99666c1943a662d0f5f054e22d3b97e1f8e739640efc5e04659d0a6723ee35b279 SHA512 6ea568ca9c8cba4e0db1f6c06d5e57f539602e5bfa1ce9be2fb9fc7107e1e42dde715c7bd0737ad60246569b0e9fad275a4c451c427451b9692410becb3b05d3
diff --git a/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch b/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch
deleted file mode 100644
index 99434fe226f8..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.6.2-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 196cc6d9b445ee4246c7ff18d98d616aef286550 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 4 Aug 2021 15:38:59 +0200
-Subject: [PATCH] plugin modem-manager: XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY is
- only available in >=libxmlb-0.2.2
-
-Closes: https://github.com/fwupd/fwupd/issues/3600
----
- plugins/modem-manager/fu-firehose-updater.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/plugins/modem-manager/fu-firehose-updater.c b/plugins/modem-manager/fu-firehose-updater.c
-index 00fcdf607..076aa79cc 100644
---- a/plugins/modem-manager/fu-firehose-updater.c
-+++ b/plugins/modem-manager/fu-firehose-updater.c
-@@ -630,7 +630,11 @@ fu_firehose_updater_run_action (FuFirehoseUpdater *self, XbNode *node, guint max
- 
- 	action = xb_node_get_element (node);
- 
-+#if LIBXMLB_CHECK_VERSION(0,2,2)
- 	cmd_str = xb_node_export (node, XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY, error);
-+#else
-+	cmd_str = xb_node_export (node, XB_NODE_EXPORT_FLAG_NONE, error);
-+#endif
- 	if (cmd_str == NULL)
- 		return FALSE;
- 	cmd_bytearray = g_byte_array_new_take ((guint8 *)cmd_str, strlen (cmd_str));
diff --git a/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch
deleted file mode 100644
index 162cc194a2ad..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.6.2-dell-dock-requires-gusb.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 4f5961a389698844117e70601ccf4c9e3ae1cb86 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 4 Aug 2021 15:11:26 +0200
-Subject: [PATCH] dell-dock plugin requires gusb
-
-Closes: https://github.com/fwupd/fwupd/issues/3598
----
- plugins/dell-dock/meson.build | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/plugins/dell-dock/meson.build b/plugins/dell-dock/meson.build
-index 829771de1..ae8f67f33 100644
---- a/plugins/dell-dock/meson.build
-+++ b/plugins/dell-dock/meson.build
-@@ -1,3 +1,4 @@
-+if get_option('gusb')
- cargs = ['-DG_LOG_DOMAIN="FuPluginDellDock"']
- 
- install_data(['dell-dock.quirk'],
-@@ -34,3 +35,4 @@ shared_module('fu_plugin_dell_dock',
-     gudev,
-   ],
- )
-+endif
diff --git a/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch b/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch
deleted file mode 100644
index fec6aab4a3ce..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.7.0-elanfp-requires-gusb.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit fa403db414301c247aef1bc895795a04b06d9298
-Author:     Thomas Deutschmann <whissi@gentoo.org>
-AuthorDate: Fri Oct 15 15:45:55 2021 +0200
-Commit:     Thomas Deutschmann <whissi@gentoo.org>
-CommitDate: Fri Oct 15 15:45:55 2021 +0200
-
-    elanfp plugin requires gusb
-
-diff --git a/plugins/elanfp/meson.build b/plugins/elanfp/meson.build
-index e8bb8255..2b5d7fde 100644
---- a/plugins/elanfp/meson.build
-+++ b/plugins/elanfp/meson.build
-@@ -1,3 +1,4 @@
-+if get_option('gusb')
- cargs = ['-DG_LOG_DOMAIN="FuPluginElanfp"']
- 
- install_data(['elanfp.quirk'],
-@@ -27,3 +28,4 @@ shared_module('fu_plugin_elanfp',
-     plugin_deps,
-   ],
- )
-+endif
diff --git a/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch b/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch
deleted file mode 100644
index 4974a82bdf52..000000000000
--- a/sys-apps/fwupd/files/fwupd-1.7.0-fix-test-configure.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-# https://bugs.gentoo.org/791760
-# https://github.com/fwupd/fwupd/pull/3921
-
-diff --git a/plugins/synaptics-rmi/meson.build b/plugins/synaptics-rmi/meson.build
-index acbb6b92..10ac3047 100644
---- a/plugins/synaptics-rmi/meson.build
-+++ b/plugins/synaptics-rmi/meson.build
-@@ -38,7 +38,6 @@ shared_module('fu_plugin_synaptics_rmi',
-     fwupdplugin,
-   ],
- )
--endif
- 
- if get_option('tests')
-   e = executable(
-@@ -67,3 +66,4 @@ if get_option('tests')
-   )
-   test('synaptics-rmi-self-test', e)
- endif
-+endif
diff --git a/sys-apps/fwupd/fwupd-1.6.2.ebuild b/sys-apps/fwupd/fwupd-1.6.2.ebuild
deleted file mode 100644
index aa776823c5e4..000000000000
--- a/sys-apps/fwupd/fwupd-1.6.2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-	spi? ( lzma )
-	synaptics? ( gnutls )
-	uefi? ( gnutls )
-"
-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]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	net-misc/curl
-	virtual/libelf:0=
-	virtual/udev
-	archive? ( app-arch/libarchive:= )
-	dell? ( >=sys-libs/libsmbios-2.4.0 )
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[qmi] )
-	policykit? ( >=sys-auth/polkit-0.103 )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
-	"${FILESDIR}"/${P}-dell-dock-requires-gusb.patch
-	"${FILESDIR}"/${P}-XB_NODE_EXPORT_FLAG_COLLAPSE_EMPTY.patch
-)
-
-pkg_setup() {
-	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
-
-	sed -e '/platform-integrity/d' \
-		-i plugins/meson.build || die #753521
-
-	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
-		-i data/builder/meson.build || die
-
-	vala_src_prepare
-}
-
-src_configure() {
-	local plugins=(
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use flashrom plugin_flashrom)
-		$(meson_use gusb plugin_altos)
-		$(meson_use modemmanager plugin_modem_manager)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use spi plugin_intel_spi)
-		$(meson_use synaptics plugin_synaptics_mst)
-		$(meson_use synaptics plugin_synaptics_rmi)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_use uefi plugin_uefi_pk)
-	)
-	use ppc64 && plugins+=( -Dplugin_msr="false" )
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="false"
-		-Dcurl="true"
-		-Ddocs="$(usex gtk-doc gtkdoc none)"
-		-Defi_binary="false"
-		-Dsupported_build="true"
-		$(meson_use agent)
-		$(meson_use archive libarchive)
-		$(meson_use bluetooth bluez)
-		$(meson_use elogind)
-		$(meson_use gnutls)
-		$(meson_use gusb)
-		$(meson_use lzma)
-		$(meson_use man)
-		$(meson_use introspection)
-		$(meson_use policykit polkit)
-		$(meson_use systemd)
-		$(meson_use test tests)
-
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${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
-}
diff --git a/sys-apps/fwupd/fwupd-1.6.3.ebuild b/sys-apps/fwupd/fwupd-1.6.3.ebuild
deleted file mode 100644
index 39ff4e2e07d0..000000000000
--- a/sys-apps/fwupd/fwupd-1.6.3.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-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/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	minimal? ( !introspection )
-	spi? ( lzma )
-	synaptics? ( gnutls )
-	uefi? ( gnutls )
-"
-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]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	net-misc/curl
-	virtual/libelf:0=
-	virtual/udev
-	archive? ( app-arch/libarchive:= )
-	dell? ( >=sys-libs/libsmbios-2.4.0 )
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[qmi] )
-	policykit? ( >=sys-auth/polkit-0.103 )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
-)
-
-pkg_setup() {
-	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
-
-	sed -e '/platform-integrity/d' \
-		-i plugins/meson.build || die #753521
-
-	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
-		-i data/builder/meson.build || die
-
-	vala_src_prepare
-}
-
-src_configure() {
-	local plugins=(
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use flashrom plugin_flashrom)
-		$(meson_use gusb plugin_altos)
-		$(meson_use modemmanager plugin_modem_manager)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use spi plugin_intel_spi)
-		$(meson_use synaptics plugin_synaptics_mst)
-		$(meson_use synaptics plugin_synaptics_rmi)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_use uefi plugin_uefi_pk)
-	)
-	use ppc64 && plugins+=( -Dplugin_msr="false" )
-	use riscv && plugins+=( -Dplugin_msr="false" )
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="false"
-		-Dcurl="true"
-		-Ddocs="$(usex gtk-doc gtkdoc none)"
-		-Defi_binary="false"
-		-Dsupported_build="true"
-		$(meson_use agent)
-		$(meson_use archive libarchive)
-		$(meson_use bluetooth bluez)
-		$(meson_use elogind)
-		$(meson_use gnutls)
-		$(meson_use gusb)
-		$(meson_use lzma)
-		$(meson_use man)
-		$(meson_use introspection)
-		$(meson_use policykit polkit)
-		$(meson_use systemd)
-		$(meson_use test tests)
-
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${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
-}
diff --git a/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild b/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild
index a64bc49822db..72e4cba1d3a2 100644
--- a/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.6.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
+IUSE="amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
 	dell? ( uefi )
@@ -140,7 +140,6 @@ src_configure() {
 		-Ddocs="$(usex gtk-doc gtkdoc none)"
 		-Defi_binary="false"
 		-Dsupported_build="true"
-		$(meson_use agent)
 		$(meson_use archive libarchive)
 		$(meson_use bluetooth bluez)
 		$(meson_use elogind)
diff --git a/sys-apps/fwupd/fwupd-1.7.0.ebuild b/sys-apps/fwupd/fwupd-1.7.0.ebuild
deleted file mode 100644
index aa0388af0054..000000000000
--- a/sys-apps/fwupd/fwupd-1.7.0.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit linux-info meson python-single-r1 vala xdg
-
-DESCRIPTION="Aims to make updating firmware on Linux automatic, safe and reliable"
-HOMEPAGE="https://fwupd.org"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="agent amt archive bluetooth dell elogind flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	^^ ( elogind minimal systemd )
-	dell? ( uefi )
-	logitech? ( gusb )
-	minimal? ( !introspection )
-	spi? ( lzma )
-	synaptics? ( gnutls )
-	uefi? ( gnutls )
-"
-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]
-	)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	>=app-arch/gcab-1.0
-	dev-db/sqlite
-	>=dev-libs/glib-2.45.8:2
-	dev-libs/json-glib
-	dev-libs/libgpg-error
-	dev-libs/libgudev:=
-	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
-	>=dev-libs/libxmlb-0.1.13:=[introspection?]
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pycairo[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]
-	')
-	>=net-libs/libsoup-2.51.92:2.4[introspection?]
-	net-misc/curl
-	virtual/libelf:0=
-	virtual/udev
-	archive? ( app-arch/libarchive:= )
-	dell? ( >=sys-libs/libsmbios-2.4.0 )
-	elogind? ( >=sys-auth/elogind-211 )
-	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
-	gnutls? ( net-libs/gnutls )
-	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
-	logitech? ( dev-libs/protobuf-c:= )
-	lzma? ( app-arch/xz-utils )
-	modemmanager? ( net-misc/modemmanager[qmi] )
-	policykit? ( >=sys-auth/polkit-0.103 )
-	systemd? ( >=sys-apps/systemd-211 )
-	tpm? ( app-crypt/tpm2-tss )
-	uefi? (
-		sys-apps/fwupd-efi
-		sys-boot/efibootmgr
-		sys-fs/udisks
-		sys-libs/efivar
-	)
-"
-# Block sci-chemistry/chemical-mime-data for bug #701900
-RDEPEND="
-	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${COMMON_DEPEND}
-	sys-apps/dbus
-"
-
-DEPEND="
-	${COMMON_DEPEND}
-	x11-libs/pango[introspection]
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.5.7-logind_plugin.patch
-	"${FILESDIR}"/${P}-elanfp-requires-gusb.patch
-	"${FILESDIR}"/${P}-fix-test-configure.patch # bug 791760
-)
-
-pkg_setup() {
-	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
-
-	sed -e '/platform-integrity/d' \
-		-i plugins/meson.build || die #753521
-
-	sed -e "/install_dir.*'doc'/s/fwupd/${PF}/" \
-		-i data/builder/meson.build || die
-
-	vala_src_prepare
-}
-
-src_configure() {
-	local plugins=(
-		$(meson_use amt plugin_amt)
-		$(meson_use dell plugin_dell)
-		$(meson_use flashrom plugin_flashrom)
-		$(meson_use gusb plugin_altos)
-		$(meson_use logitech plugin_logitech_bulkcontroller)
-		$(meson_use modemmanager plugin_modem_manager)
-		$(meson_use nvme plugin_nvme)
-		$(meson_use spi plugin_intel_spi)
-		$(meson_use synaptics plugin_synaptics_mst)
-		$(meson_use synaptics plugin_synaptics_rmi)
-		$(meson_use thunderbolt plugin_thunderbolt)
-		$(meson_use tpm plugin_tpm)
-		$(meson_use uefi plugin_uefi_capsule)
-		$(meson_use uefi plugin_uefi_capsule_splash)
-		$(meson_use uefi plugin_uefi_pk)
-	)
-	use ppc64 && plugins+=( -Dplugin_msr="false" )
-	use riscv && plugins+=( -Dplugin_msr="false" )
-
-	local emesonargs=(
-		--localstatedir "${EPREFIX}"/var
-		-Dbuild="$(usex minimal standalone all)"
-		-Dconsolekit="false"
-		-Dcurl="true"
-		-Ddocs="$(usex gtk-doc gtkdoc none)"
-		-Defi_binary="false"
-		-Dsupported_build="true"
-		$(meson_use agent)
-		$(meson_use archive libarchive)
-		$(meson_use bluetooth bluez)
-		$(meson_use elogind)
-		$(meson_use gnutls)
-		$(meson_use gusb)
-		$(meson_use lzma)
-		$(meson_use man)
-		$(meson_use introspection)
-		$(meson_use policykit polkit)
-		$(meson_use systemd)
-		$(meson_use test tests)
-
-		${plugins[@]}
-	)
-	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
-	export CACHE_DIRECTORY="${T}"
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if ! use minimal ; then
-		newinitd "${FILESDIR}"/${PN}-r2 ${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
-}
diff --git a/sys-apps/fwupd/fwupd-1.7.1.ebuild b/sys-apps/fwupd/fwupd-1.7.1.ebuild
index 3d035a100b4e..a5c8fc642ce5 100644
--- a/sys-apps/fwupd/fwupd-1.7.1.ebuild
+++ b/sys-apps/fwupd/fwupd-1.7.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="agent amt archive bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
+IUSE="amt archive bluetooth dell elogind fastboot flashrom gnutls gtk-doc gusb introspection logitech lzma +man minimal modemmanager nvme policykit spi synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
 	dell? ( uefi )
@@ -141,7 +141,6 @@ src_configure() {
 		-Ddocs="$(usex gtk-doc gtkdoc none)"
 		-Defi_binary="false"
 		-Dsupported_build="true"
-		$(meson_use agent)
 		$(meson_use archive libarchive)
 		$(meson_use bluetooth bluez)
 		$(meson_use elogind)
diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index 64bd8fe32d3c..9c5e3f93020a 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -3,6 +3,6 @@ DIST gentoo-systemd-integration-8.tar.bz2 53734 BLAKE2B 711f1f6603fa40e81fe32809
 DIST gentoo-systemd-integration-9.tar.gz 65696 BLAKE2B 7d2105e37ff53d48e312b78a971f16124df1d3a1f99ae37eb757e4be31663eee15ba1a9fb31ef31250c79f902f7a00e1de84030f3fb67e41ab2243d58deabcb6 SHA512 e4810e74c713793f1e5aca7f025780c32e8f0fe404bf74b65263bfaeff1ae1398551fdff7de37a4050f0e48d5e0b90525217f5b3caa18111ab1981f57f41fc18
 EBUILD gentoo-systemd-integration-7.ebuild 794 BLAKE2B 7f33bc671174599f5a855a93522f7888f2a818a2a45f47742ed61f05f05708b976ee566625df20cfd422dd6f9f9ba4ebd21fcefd51e9bbb2059d48b542e795cc SHA512 fdef060281bf6c98ac0236a6e111bf8f36746fe80c335b4b2fec453502f903effd7ff261593a60a836beb1e333812102061165c9e1f86a340c9bf3db3729bf1c
 EBUILD gentoo-systemd-integration-8.ebuild 959 BLAKE2B 7dd60424f23e74b82e59177529ed287033261331717b9ae266636cda173c2335d29ed7c49320427fdad5d0a3a0da3b0bdab32ceea4be40e47af44e0c479fcb24 SHA512 8d266198855d341d64db22ca0c721f48afe66d1a82d1de7bfc3164cfc00beb80a163dcf5c0593a7176fd4614097e96590620297200ce11dbbada4edc64eddf8e
-EBUILD gentoo-systemd-integration-9.ebuild 949 BLAKE2B 5b069394c6337d9cdad48839c2c27b1d455bae43f9f64f090a0a3514d240bd2a7e06fc1990e440a5a13fa5c9ed02271e6fa8bd3da866e6c52f2811f5936f8c53 SHA512 f1506897008d24f8c6229480ccfd25947b4db655eab9c5d25aef9ebea380ab1e195163f921aadec366f94a1b36254749642664228591ac1f5179708a85e4c478
+EBUILD gentoo-systemd-integration-9.ebuild 942 BLAKE2B 8db964ee0b5fafde839ba97071c474d771668f94a72b7b391cc8cd18b4f0e63b40cd486446206c60e25f5e1fd42b99b110998767c6c468a473790ee345904e99 SHA512 0860eecf00acc6a492ab42577eb8a0e66b6f81f31e9b1ff6e9d71b67534affbcc7f08771fcbf1e6b89afbe271c6ec4a9f16bb6b799cf61e45f3687b215573a40
 EBUILD gentoo-systemd-integration-9999.ebuild 949 BLAKE2B 5b069394c6337d9cdad48839c2c27b1d455bae43f9f64f090a0a3514d240bd2a7e06fc1990e440a5a13fa5c9ed02271e6fa8bd3da866e6c52f2811f5936f8c53 SHA512 f1506897008d24f8c6229480ccfd25947b4db655eab9c5d25aef9ebea380ab1e195163f921aadec366f94a1b36254749642664228591ac1f5179708a85e4c478
 MISC metadata.xml 380 BLAKE2B c85bcefccc2876a63a0b0348c42099812d371f2893971cd3ed76726bb1c305c6d17a30814743b9db8f91f96448ea241be723bd9deb11d627ee0c3b38643f8a42 SHA512 d72a532ad36554a12da2dad9645e939f79fe67ad969850f702bfb2691e80fda2c3c7a99e5f7be992a2b0b78aac4a09aa56d04ee914d1c98f131ef29e10a91dcc
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
index 0d5b07883d97..8e8064cc18f8 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
@@ -10,7 +10,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 ~riscv ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 DESCRIPTION="systemd integration files for Gentoo"
diff --git a/sys-apps/input-utils/Manifest b/sys-apps/input-utils/Manifest
index b37b1c7409c5..c656889b75db 100644
--- a/sys-apps/input-utils/Manifest
+++ b/sys-apps/input-utils/Manifest
@@ -1,3 +1,3 @@
 DIST input-1.3.tar.gz 23755 BLAKE2B 45a9d138f55677da596298d86e18af5849a81f5cff7397dab028c4939b6b385cc3116fc48bd23844edc36330d0f25456931fb903af9adcdc60aa21d8267cf725 SHA512 4f864301e6b7d40882327b26780db1d9b7e37215cb558653738f93b74ea2781f64676e41a440fbd2659f14bd30640c7af6c709315cce4dcc6a157d80ac2cb60d
-EBUILD input-utils-1.3.ebuild 570 BLAKE2B e8c662469a4d6503db709904c6d446d91bce0ab9ee9f9d111306797dcc6f01095f128cf5c261b5e3943b138d4b1f10ef0fa2ecbf430a23516d6c53b8430bf962 SHA512 b4741f733570824d38e4a483c10c5e9c3fde5a217fd3c1fe152405e92b1b57966a8499696c8029c4c2ac3ea47c75cb10ffafb7cb10a9ebc307782c56bf8f8890
-MISC metadata.xml 580 BLAKE2B dba766179c7ec94124f83b699826a4173a54c189ff3e4dfe2aca140b1cd14755fa70c4ca8bdb693aba6487426c4de15911818b50f79ee1acf92e82120728d13d SHA512 e55a38b9782b54475eda9cda1488bc130031f7504a42b27f310821aedead9ecc76e2eb3fcbe9f3c4d372290a39e840433813300c5731342cafa7a8614d17dd9f
+EBUILD input-utils-1.3.ebuild 542 BLAKE2B c39c6ad30ce82c1590ca26df01598765eff8ad8c745b92938eb735aa15f286b20479503ded9885b68dfaad91c01690f4e938565c940048cdd31b0a07a6bf138d SHA512 b71af17c39381994a62b94e89d07d8c424409ec673e89170d751e6ce6ce56d93952cdf18b17945c14cadd0e220eaed36aea2a9478097421684ce65a547b13262
+MISC metadata.xml 592 BLAKE2B 326d724a8ad880b221ddfd84995ef72ce6ec25357f6f8e5fe519654c4e54a8f4fd25b34e7ad84be6db7e820acfd3e704e352620f275709c57a0c23433e7b6e30 SHA512 247c39b0a3bed3369b44e8c960c0b9948d3a36f99ad061d43ff94893a2f77a65907cf8153e02a918fb127260016520d0de363fe3e8e9f00514564fbdd4ccf2ab
diff --git a/sys-apps/input-utils/input-utils-1.3.ebuild b/sys-apps/input-utils/input-utils-1.3.ebuild
index d5499f832ba5..244234922d65 100644
--- a/sys-apps/input-utils/input-utils-1.3.ebuild
+++ b/sys-apps/input-utils/input-utils-1.3.ebuild
@@ -17,7 +17,7 @@ KEYWORDS="amd64 ~arm ~arm64 ppc ~riscv x86"
 S="${WORKDIR}/${MY_P}"
 
 src_install() {
-	make install bindir="${D}"/usr/bin mandir="${D}"/usr/share/man STRIP="" || die "make install failed"
+	emake install bindir="${D}"/usr/bin mandir="${D}"/usr/share/man STRIP=""
 	dodoc lircd.conf
 	dodoc README
 }
diff --git a/sys-apps/input-utils/metadata.xml b/sys-apps/input-utils/metadata.xml
index 5ef7ecf1242f..632c9a4b1568 100644
--- a/sys-apps/input-utils/metadata.xml
+++ b/sys-apps/input-utils/metadata.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>robbat2@gentoo.org</email>
-<name>Robin H. Johnson</name>
-</maintainer>
-<longdescription lang="en">
-This is a collection of utilities which are useful when working with the input
-layer of the Linux kernel (version 2.6 and later). Included are utilities to
-list the input devices known to the kernel, show the input events that are
-received by a device, and query or modify keyboard maps.
-</longdescription>
+	<maintainer type="person">
+		<email>robbat2@gentoo.org</email>
+		<name>Robin H. Johnson</name>
+	</maintainer>
+	<longdescription lang="en">
+	This is a collection of utilities which are useful when working with the input
+	layer of the Linux kernel (version 2.6 and later). Included are utilities to
+	list the input devices known to the kernel, show the input events that are
+	received by a device, and query or modify keyboard maps.
+	</longdescription>
 </pkgmetadata>
diff --git a/sys-apps/inxi/Manifest b/sys-apps/inxi/Manifest
index e7ef90d402a0..5dd4b4221810 100644
--- a/sys-apps/inxi/Manifest
+++ b/sys-apps/inxi/Manifest
@@ -1,7 +1,9 @@
 DIST inxi-3.1.06.1.tar.gz 357819 BLAKE2B e6eb8a34807323d7f46ff029af797e3a13229813bf0cff4b8b874cd21ff1d38459e2181ddf3882b4ee0d29e8c788e2fce1c01f5c295911493292082192c56c2b SHA512 6621252048e95132cfec30e341f72f5942188f273488509614aab28e55ee9987b8f3820e1298c4d9a16b4f3464f1f270fb4c1d5e5a7bf0d2f616b4180193ab6b
 DIST inxi-3.3.04.1.tar.gz 450695 BLAKE2B 3bf2fc9296c9b1e2357e7df2edeb3df5069d48b401be793ab82bd630cfbf45fdc39d6403d851d46dfa9b8e7729da6dc07e96982941396e46493f4531bb29233c SHA512 0ffde2362c79a4269df0f4bbe439e50d24a13969a22f6e84f6caeb8cace2ee49fb075d6051211709efdc831c2f7ef37eaa38d70306bc8f1a86f8ed0dc7dea094
 DIST inxi-3.3.06.1.tar.gz 460416 BLAKE2B a7a5eeade861294c8c18cd9594ef6fd0c681d8ae66b6e1b112dbc968be46a617db666d863f5138883d7651fad8e3b27c4f27a2b518233ffa2aae7e453feab62b SHA512 0e9d7215339235914cfcd7292443199304d44e528545a0c1c3d65d597f57da5c2678c410d215e6c8668c22677f20d62c93bbd7fee02dc74f8c9aab75b1488d00
+DIST inxi-3.3.08.1.tar.gz 467132 BLAKE2B c0254174c0a48936e1f183c16f985838cf74302da706996c1baec0c67b9c4209da5b555805cb668d626eccaa69f95e3cab2605b06d2cc7361a6cd3ff5d88c29e SHA512 bcbb81dd022dbd525ed3811406997c6689f968de8a3b6e0988381d9d2a488617ef3bc966034f9baac8eebb412b8d2e612b7cece29d65bdcb20d8b8cdeca112e6
 EBUILD inxi-3.1.06.1.ebuild 807 BLAKE2B 448c656ce3d29ab6068ef103521cb60cec55d27e74294d98885230a1a3b437999187f9633af2b30e61ee8235067750152bd0a67394e4cd071adccc836ef9fa9e SHA512 6f48f6171bf6bfea9bafe1540d7f2a3ad809e3a422a9988420599620133dddccae19423e74998ff988b6e42e45317563884aa4a265b15e9137e635426c5e3004
 EBUILD inxi-3.3.04.1.ebuild 812 BLAKE2B a1889935dae2f8bb4e2b123f40092a2afe972638165475caab81518b1c07320179cd6f36d66193675f885ffaa1ca8b1bc4d1e7b66f3c62d22c51f3166a1d4b5f SHA512 44641459e267d3bf1a8ecf96cff0d54352bf8faf261e33fa751ac1d79f7a6b718ef958300b79858f17362562f2883cf7d0523dcee2d665ec55d2818aefd9dd53
 EBUILD inxi-3.3.06.1.ebuild 820 BLAKE2B 729a7050c2a4227dc0ce4b0c01d6c2a8c545682503312d552e8f5f9018aa04354abe2370ac6b97e97cafd4d6fb9a8af3caf62b79caa4bb71ccdd57fe95ec4f29 SHA512 2cb0591495315c2292549627f3c205613caa14d631f147f3890ee208cac8ff4afc07c3d6e9446f12aa403608b4b520110411c2a90d5ffe9d98e73bc5c5100cb2
+EBUILD inxi-3.3.08.1.ebuild 820 BLAKE2B 729a7050c2a4227dc0ce4b0c01d6c2a8c545682503312d552e8f5f9018aa04354abe2370ac6b97e97cafd4d6fb9a8af3caf62b79caa4bb71ccdd57fe95ec4f29 SHA512 2cb0591495315c2292549627f3c205613caa14d631f147f3890ee208cac8ff4afc07c3d6e9446f12aa403608b4b520110411c2a90d5ffe9d98e73bc5c5100cb2
 MISC metadata.xml 613 BLAKE2B f444aa0759120064814cacf0fcba57059d87b1c014d78eea52304fb3afb9da9b905e30c1cf1399bfbc0d66442e3d892eb2657543014b905f2bf9a943dc8480d9 SHA512 cbe6e76cb003bb77134398aa1db5a24c47de826eb1f17b07e2cee647b9d58948596c2f4588c7c834332c096ce8b782799f07ed4f47a7b252e85e402324ba76bb
diff --git a/sys-apps/inxi/inxi-3.3.08.1.ebuild b/sys-apps/inxi/inxi-3.3.08.1.ebuild
new file mode 100644
index 000000000000..3c22d8270f60
--- /dev/null
+++ b/sys-apps/inxi/inxi-3.3.08.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PV=$(ver_rs 3 '-')
+# 2.3.56 was the last version with no tagged release.
+# It was also the last Bash based release. Later versions are Perl based
+
+DESCRIPTION="The CLI inxi collects and prints hardware and system information"
+HOMEPAGE="https://github.com/smxi/inxi"
+SRC_URI="https://github.com/smxi/${PN}/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="bluetooth hddtemp opengl"
+
+RDEPEND="dev-lang/perl
+	sys-apps/pciutils
+	sys-apps/usbutils
+	bluetooth? ( net-wireless/bluez )
+	hddtemp? ( app-admin/hddtemp )
+	opengl? ( x11-apps/mesa-progs )
+	"
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+	dodoc README.txt
+}
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 7cf6301d3796..cee017ebd9f2 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -7,6 +7,8 @@ AUX kexec.conf 340 BLAKE2B a65aa0f402c712c10f6095b37b620dacfe883ad621f5403d8190f
 AUX kexec.conf-2.0.4 1013 BLAKE2B 7594bf8c150d1165f30449526b658c78feab82526e649aa8cce35b6a47b2abd5a208b7ae4376f0330ea2194ae63f786bf0c30682f734f1b604be131e6e63570e SHA512 96db2834454aa4d038061e9b1f918932da3d3054021487425d0f70c6ad32096b9433ae2f3921e83196b23af901c32e591df3d6a84a6d14e064608d8ad895a599
 AUX kexec.service 407 BLAKE2B 7854172c36f550fece58b6cb351a6bd8b4ab8b5a11da0fd629048f8cc2866baa11ee7311424f998360f02dc2c1210be32222283c2bd2f93e1bf4bf65ec903203 SHA512 9f0fa6d39c67048fe774fee0f2e8ed10e9e12a2468e7dda193cd8c5bd8b4cf49819d14703efad35c91265cd4e03c6f5460934b5fe92efd06eab8dc619920b1e3
 DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B 977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7 SHA512 7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
+DIST kexec-tools-2.0.23.tar.xz 304024 BLAKE2B 0150985093dc0012d3870c127ac5eab81d4cc839c0a79ff20224d1a409462a194d7e304f54ed8f0952e4d325dbff11bcbe1565b2c57c45c212302810dc06ed62 SHA512 b6e3b967cacc31c434b185d25da4d53c822ae4bbcec26ef9d6cb171f294fdcc80913d381e686a0a41e025187835f4dc088052ff88efe75a021d7624c8b1a1ed8
 EBUILD kexec-tools-2.0.22.ebuild 3263 BLAKE2B 81df746fbd75d29a45e23cc1b1509dbe7c99e2a34cae30a04625dd13b41c770451752eb7cbfc2c53bff33948aa666119fdac81ade871c086973b27e70f1f0331 SHA512 dbb7744f92104f1a174a90c30eda7a384c43d3659f36f1103987e4a6354c77d21b3c45f9c4053fae699f13b1e87550b7ae7f3b1abe6c4fe31ff9a7d97a4868d3
+EBUILD kexec-tools-2.0.23.ebuild 3265 BLAKE2B f1b79999adf8df2e0a85cdcc2cd25027e78e8305fd8ba10d530cd2db3d31f8f5a148b978131c77871f4b0a97c0b496fa342834e8b8c4fbea74417c82a36f430e SHA512 bfe4ebad0b2c3e5281309e8f7b76f9f2f5a4a6b19f46b8077b1f066d0a9e41b0dd529d19071c660021d7dad41e9d86b1e5f3af3ca4149a2ea660af89b2eafd5f
 EBUILD kexec-tools-9999.ebuild 3265 BLAKE2B 1f5c5356f79113a1956d1b57dcb570f4bd0327ab03aef0917e06cac9cd6e7c1ae02ca530dd9e95b1f8e8f1b9277dd5c96397efb8881cffedf2a8096107e6ccb0 SHA512 163fd666f3f892d80c12bb809f5ef8a5494ba6a3f13bb5e1679b89795d943c19735c631bddc0f3ab51abf417413c20d24af47143941bd35fec747dc1d500d246
 MISC metadata.xml 491 BLAKE2B a47fdf282e096eb77748e23470df2a95cf2982e1e722ea74b9aee795f764e287a9364836139bba6462afd0a0f2a9d2f67c25ba1dd22a0a842a3f547a92cdd476 SHA512 a9f187f3cd1d63cfcfdcd93cdb50015b2d29eeb24558530febe440e6573464712d8e83a8743efc727c4c92ad61e1c36dc7d93cd33a222d751a4ec2b75d42f17d
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
new file mode 100644
index 000000000000..0879b84e6744
--- /dev/null
+++ b/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool linux-info systemd
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 autotools
+	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
+else
+	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
+	[[ "${PV}" == *_rc* ]] || \
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Load another kernel from the currently executing Linux kernel"
+HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="booke lzma xen zlib"
+
+REQUIRED_USE="lzma? ( zlib )"
+
+DEPEND="
+	lzma? ( app-arch/xz-utils )
+	zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${P/_/-}"
+
+CONFIG_CHECK="~KEXEC"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
+	"${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
+)
+
+pkg_setup() {
+	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
+	export ASFLAGS="${CCASFLAGS}"
+}
+
+src_prepare() {
+	default
+
+	# Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely.
+	sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
+
+	if [[ "${PV}" == 9999 ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_with booke)
+		$(use_with lzma)
+		$(use_with xen)
+		$(use_with zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	# Respect CFLAGS for purgatory.
+	# purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
+	# -mfunction-return=thunk and -mindirect-branch=thunk conflict with
+	# -mcmodel=large which is added by build system.
+	# Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline.
+	local flag flags=()
+	for flag in ${CFLAGS}; do
+		[[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline"
+		[[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline"
+		flags+=("${flag}")
+	done
+	local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
+
+	default
+}
+
+src_install() {
+	default
+
+	dodoc "${FILESDIR}"/README.Gentoo
+
+	newinitd "${FILESDIR}"/kexec-r2.init kexec
+	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
+
+	insinto /etc
+	doins "${FILESDIR}"/kexec.conf
+
+	insinto /etc/kernel/postinst.d
+	doins "${FILESDIR}"/90_kexec
+
+	systemd_dounit "${FILESDIR}"/kexec.service
+}
+
+pkg_postinst() {
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "For systemd support the new config file is"
+		elog "   /etc/kexec.conf"
+		elog "Please adopt it to your needs as there is no autoconfig anymore"
+	fi
+
+	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
+	local has_rootpart_set=no
+	if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
+		if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then
+			has_rootpart_set=yes
+		fi
+	fi
+
+	if [[ ${n_root_args} > 1 && "${has_rootpart_set}" == "no"  ]]; then
+		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
+		ewarn "This was probably caused by a previous version of ${PN}."
+		ewarn "Please reboot system once *without* kexec to avoid boot problems"
+		ewarn "in case running system and initramfs do not agree on detected"
+		ewarn "root device name!"
+	fi
+}
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 66b0d6fa2fd2..4a2f3c5852c4 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,5 +1,5 @@
 AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52207771e1b6b4f921d0a07e51e97a8e6f432b542d88fb0195e1298cd54ba92d462a828ddd94dab7f924eb3 SHA512 8210d90f5d0702aea626b6db00adbabbd550009d8275fe430c8b113fcb0593a4dfb9efb22c061dde259e1bd94390be49823415d3fd99909e22a2bbf7ae349f63
 DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
-EBUILD kmod-29.ebuild 5228 BLAKE2B dbd7f670dbd2db25e7d5c3ebf9eeb8851040b938d633ea3c3ef2a86cdba5cf20d824e2257003a4cefdce859eed43d3b11614142d4e876de4d9b724e683720194 SHA512 b4c139fc87bce1066178b16d25d3e9806de5c9ab85fee5d9971f3252e80d098a4f20420e3c2b7cf16a60a2b0d8cf9851f6163fa6392c04f1d87bdfa2efe855ff
-EBUILD kmod-9999.ebuild 5236 BLAKE2B b8c89c6c4dcddf2b9da47b0b7a6ad342e155f30fadbeb74a1867b3ddee1b6575578407314c116afb19d1597d9a8ea34d5d4fb9ec7ce3a20ad62f51dc257c28ce SHA512 03cb2435a15e335a7a85d3fefea00b25e1a8561a7129b4ff173838092949d0cd88ff90df4ddf4522be5c1df5dcd4b030a22d3b545bb90d87b729167daabd3b1c
+EBUILD kmod-29.ebuild 5229 BLAKE2B 5a8532596f75b0a25e2c54d57fb96c43d2fc8e6f33a43971159f17138b28088e4ef2cb9e287c83c4a3b1c7e40a1c6cea7f18e10c0ba4faebdff4b98bf6db408c SHA512 9d43245699f2dd8c51dc21b7bf929829fc29073c8679964f723b2f398867b9a039b86335b4bc021a1fc9b03545a3847c5330dd0363bf0b20ed764c2833ce23a4
+EBUILD kmod-9999.ebuild 5237 BLAKE2B 6b8233ab744534061927afdd75bcd8d8a26c7f4243db2fa460729e5bbb78914d9279f0667e9d6f25ca5213eb4846d33fb18c3fa189dd8a68559507a68f513d49 SHA512 0739003537b94cff33ab4bb4a795df48dc01b2fb2cf15501e8f6b756a5734e0568d91b50787aff8e10e08db8e6a0c9a609db8bb473d50b10c1ea0add817ebe9c
 MISC metadata.xml 611 BLAKE2B d356a4efdd4696d1a57b9e57a4c2c6cda612830c11dcedadb307db85f202ceb8d8f6e6aaacc0e1b69f9bf909cf226f4174fb270f5f4eded14a1b42d236e345e5 SHA512 bba19da08e022d4de0970d80646dfdcaaede388e2b0a020bb9d83ebcb0fe1e62864e944c29a9bb6692df12981e24c091803ccda6161c2d6186b0dd46c3074108
diff --git a/sys-apps/kmod/kmod-29.ebuild b/sys-apps/kmod/kmod-29.ebuild
index 0e54b83b0aa5..d2700e7716d6 100644
--- a/sys-apps/kmod/kmod-29.ebuild
+++ b/sys-apps/kmod/kmod-29.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit autotools bash-completion-r1 multilib python-r1
 
diff --git a/sys-apps/kmod/kmod-9999.ebuild b/sys-apps/kmod/kmod-9999.ebuild
index b2369d923557..c18aedb0e8f6 100644
--- a/sys-apps/kmod/kmod-9999.ebuild
+++ b/sys-apps/kmod/kmod-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit autotools bash-completion-r1 multilib python-r1
 
diff --git a/sys-apps/lsb-release/Manifest b/sys-apps/lsb-release/Manifest
index 768ce1b7c7a8..929448e6fe85 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 929 BLAKE2B 5d1679ab5aaf4eadc596580d58fae90e71d927e56f40ff47c592b1c41183b91c2727f7fd7a959f0ccee84932d9e70e9612775242615bde7c31c5004c1fd42397 SHA512 a574fdb18f66a320c371963a71e6886b7c1c34da43e1d0587288aee5d1bc5225ce9670969af8a7186301374e0155d567374964f866ac02ed9cd79a1b8785c0ff
+EBUILD lsb-release-1.4-r4.ebuild 1097 BLAKE2B 23a59cca1c82fad9bbda0c0d4dfa4869bc29d47524dc43820555926e95d92b4b1251735b12ca58711bfdddf2f12ebb5423c4fdd4d9eade50c89828a61f7072f0 SHA512 13f4c4d16ad265edf84f05767b741968968090041508391c1fea36f5eb8927bcf1ac13c41ab74b983c48718bbae9b737cf4244f532d8416fe5391d9cd5202ff7
 MISC metadata.xml 809 BLAKE2B 38ad65227aa223463f44a81f24f8b8930ac8df03dd556eea24759b8a770c798ba42e3497970b6b2cca3437ebb21f38af094d4625128feef6cb1b6f228e2f8db7 SHA512 943f7df2955531edfef1305376c0cc2ee25f98d73f045cea5001d1e1956579c0d6779b16b70bc1ecdaf06737faead54b2a928202cfd252c2d9b3ab649920f0e4
diff --git a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild b/sys-apps/lsb-release/lsb-release-1.4-r4.ebuild
index 3a8dfe5cf969..46e771a99627 100644
--- a/sys-apps/lsb-release/lsb-release-1.4-r3.ebuild
+++ b/sys-apps/lsb-release/lsb-release-1.4-r4.ebuild
@@ -38,6 +38,11 @@ src_install() {
 		mandir="${ED}/usr/share/man" \
 		install
 
+	# installs gz compressed manpage, https://bugs.gentoo.org/729140
+	rm "${ED}/usr/share/man/man1/lsb_release.1.gz" || die
+	gunzip lsb_release.1.gz
+	doman lsb_release.1
+
 	dodir /etc
 	cat > "${ED}/etc/lsb-release" <<- EOF || die
 		DISTRIB_ID="Gentoo"
diff --git a/sys-apps/opal-utils/Manifest b/sys-apps/opal-utils/Manifest
index 0de4e36d7dd6..5367956f605e 100644
--- a/sys-apps/opal-utils/Manifest
+++ b/sys-apps/opal-utils/Manifest
@@ -1,8 +1,6 @@
 AUX flags.patch 1057 BLAKE2B 4b601dff49cfe1d82cc32b2fbb0c32922e9f049e010d1403b8986ed5d6e2d8d7c6550c1f08d184327518b71b461aa181b1b4230704dfaa993828c7a2be5d8ce5 SHA512 fd17023c238598472d8e590f2bdff75019c1c6cf76215fa54a15de7089e4f0c89259bdc99fa34147d3dbe2e1572989b6d0814ff99a859635975f627575bc1075
 AUX opal-prd.confd 99 BLAKE2B 105ccd9e2d6d7d51ffc1a82b3fa174ae61ea4e945f679f82460f84bbf2036f4f7f3da2f8d9c66807a275aa98778d824f8ba5d50d1e5349fd17adbee032816290 SHA512 387ec1d00afeaf7c44e4ee5c7e6a3959e1465b7a8a9a121bf470105c23df1f906f23cedbd1006bed250f50a3c3a77f9f40ea62bafa6d6397dda2152c9dedda06
 AUX opal-prd.initd 480 BLAKE2B 895440e30d5a136a717462f8890b3123ca4e31b75f1443f95020e98bf92b0a82f7c0536f828956ea5705c090bb598ab7d48f60653da0eab9bd904e234264ee9e SHA512 9a850a840697bcfeb272dffdabc80be321768fee91808562650d4162555212ce4c6639fd58832979fb710c2f2c78e7835dd99b435b22a64cae9810085d93f459
-DIST opal-utils-6.7.tar.gz 5320182 BLAKE2B e2fa86a7d5d96afda8f8266875687fb3c2e61ca2932ea5585921b2e5cffe30cb3554d85d078448cda032cbc0438d188ea40b5aad6e7f4c923e77fa4e42e6f364 SHA512 1626d64554c608cd823dc27b58f35206cf6d011afde124746e06fd5f1e8c714c199d9f2b60417415daf01cfbc46208d08d49eef29538a515b539a551b8c5e5c3
 DIST opal-utils-6.8.tar.gz 5321377 BLAKE2B 3be812618dcbd3d877576e1dec0b6a74ad9091b59760bd8f1f67ba9a8efbce79cba4130464dcb6f2b8e61dedca3a1a60103f36d04fcd234b5a4c577c6e07635b SHA512 a799112c14abdcdb37e1a4c63e48e12bb7a67b6c90476d4e60597f06fd6050a58ffd25859cf6bb12c393522e4b4771ce3aa25a1277bac35855d599e9eb357814
-EBUILD opal-utils-6.7.ebuild 2475 BLAKE2B de4715513ac5bf263634fd468ba762855ace15e63f678e6bc3b0a8faea353f12a76c1132fc85d29a33834fb1fbec4a2d6eada7299b3499fb82f6d7d4706f040d SHA512 9b22701b32998c75742714ecec9d6860463740ba4c0ff1252ac2b1b8c5b99f087304220302f2cc319c03d49ad459eb4ab3051547d852161e1e8df56b59f04aa1
-EBUILD opal-utils-6.8.ebuild 2480 BLAKE2B abbe19d2ff7cfb7701603efe72b2559931b469c1ef9d9348b7159390fe3e16b7bfc167ebf9783cdc5f027789bab10050bffd9dd0e57ca47c96401ec46cf01829 SHA512 3095b4aab7ee76985ec922517a2c1a6e36212997ef668668f992d4cf9f619a960ce0892446bdaf4e927a44c486a059b9b46134c0a86052e8b37445d0aec7ee31
+EBUILD opal-utils-6.8.ebuild 2479 BLAKE2B 4ffa2f22532e19ed4669651cc945653208042341b025dffdc3618b36a6246a38b410a4bd9d556426e1314f0d1cfedd3b68239add8929cb2bd674112df9dd8e30 SHA512 5ff7b665abe48acd0515ff41152e956c60a76fca0d5e76196f167a2afe890c1eb996412f4af22155bef933f56866d535cbb61b1d6b355ec0b166ebbfae6c4471
 MISC metadata.xml 1100 BLAKE2B 1e8e44dd35f5ced685c12c0ac30fb2b9c466103b75df166e53344c60c4c58d70be0bd42f4fcc59c37199ea770f40cedc4577c099dc6cd2f03b66606758f40247 SHA512 0e1b9cd39bdfa603a8e11a550d59877fe88d095332b500e470ac40fd3f3cfc84952a97b376cbff8037cd729ba8a2164a6aef390cb0cd13798909a2e1bda14ecd
diff --git a/sys-apps/opal-utils/opal-utils-6.7.ebuild b/sys-apps/opal-utils/opal-utils-6.7.ebuild
deleted file mode 100644
index fdaa7271922d..000000000000
--- a/sys-apps/opal-utils/opal-utils-6.7.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2019-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit linux-info python-any-r1 systemd toolchain-funcs
-
-DESCRIPTION="OPAL firmware utilities"
-HOMEPAGE="https://github.com/open-power/skiboot"
-SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 GPL-2+"
-SLOT="0"
-KEYWORDS="ppc64"
-IUSE="doc"
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-BDEPEND="doc? (
-	$(python_gen_any_dep '
-		dev-python/sphinx[${PYTHON_USEDEP}]
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-	')
-)"
-
-CONFIG_CHECK="~MTD_POWERNV_FLASH ~OPAL_PRD ~PPC_DT_CPU_FTRS ~SCOM_DEBUGFS"
-ERROR_MTD_POWERND_FLASH="CONFIG_MTD_POWERND_FLASH is required to use pflash and opal-gard"
-ERROR_OPAL_PRD="CONFIG_OPAL_PRD is required to run opal-prd daemon"
-ERROR_SCOM_DEBUGFS="CONFIG_SCOM_DEBUGFS is required to use xscom-utils"
-
-S="${WORKDIR}/skiboot-${PV}"
-
-PATCHES=(
-	"${FILESDIR}/flags.patch"
-)
-
-python_check_deps() {
-	has_version "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	tc-export CC LD
-	export OPAL_PRD_VERSION="${PV}"
-	export GARD_VERSION="${PV}"
-	export PFLASH_VERSION="${PV}"
-	export XSCOM_VERSION="${PV}"
-	export FFSPART_VERSION="${PV}"
-}
-
-src_compile() {
-	emake V=1 -C external/opal-prd
-	emake V=1 -C external/gard
-	emake V=1 -C external/pflash
-	emake V=1 -C external/xscom-utils
-	emake V=1 -C external/ffspart
-
-	use doc && emake V=1 -C doc html
-}
-
-src_install() {
-	emake -C external/opal-prd DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	emake -C external/gard DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	emake -C external/pflash DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	emake -C external/xscom-utils DESTDIR="${D}" prefix="${EPREFIX}/usr" install
-	dosbin external/ffspart/ffspart
-
-	newinitd "${FILESDIR}"/opal-prd.initd opal-prd
-	newconfd "${FILESDIR}"/opal-prd.confd opal-prd
-
-	systemd_dounit external/opal-prd/opal-prd.service
-
-	if use doc; then
-		rm -r doc/_build/html/_sources || die
-		local HTML_DOCS=( doc/_build/html/. )
-	fi
-	einstalldocs
-}
-
-src_test() {
-	emake V=1 -C external/opal-prd test
-	emake V=1 -C external/gard check
-	# this test is fragile and fails because of filename path
-	rm external/pflash/test/tests/01-info || die
-	emake V=1 -C external/pflash check
-	emake V=1 -C external/ffspart check
-}
diff --git a/sys-apps/opal-utils/opal-utils-6.8.ebuild b/sys-apps/opal-utils/opal-utils-6.8.ebuild
index ccb349721b3d..458c60157ef3 100644
--- a/sys-apps/opal-utils/opal-utils-6.8.ebuild
+++ b/sys-apps/opal-utils/opal-utils-6.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{7..10} )
 
 inherit linux-info python-single-r1 systemd toolchain-funcs
 
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/open-power/skiboot/archive/v${PV}.tar.gz -> ${P}.tar
 
 LICENSE="Apache-2.0 GPL-2+"
 SLOT="0"
-KEYWORDS="~ppc64"
+KEYWORDS="ppc64"
 IUSE="doc"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/sys-apps/openrc/Manifest b/sys-apps/openrc/Manifest
index 8d97b519c985..7d7094b52da1 100644
--- a/sys-apps/openrc/Manifest
+++ b/sys-apps/openrc/Manifest
@@ -3,7 +3,9 @@ AUX openrc.logrotate 43 BLAKE2B 0587cd211767937fd6273e6b159271490443a94d80a54b5a
 AUX start-stop-daemon.pam 63 BLAKE2B df39a1a12fe09dbbc0746eac67035d9e6d4a63323f6c937ef3888c70787354128e415b3c1c8bccccec0c987b3e789711cd1ddaba55e9b53a7f67b332c4ca9d5b SHA512 85cf440611b8f87f51bf24bdd9fa03639a75b950f00096d81b8826c21ae85ff9784b8c56b8ddb482e70f08bce933d4561b30750346d51fb2cef3be34acc065cb
 DIST openrc-0.43.5.tar.gz 242146 BLAKE2B 993d3895588e8f1383049006834f944faaae0f889d3afcae5bff697db9f26383712f18aba52ce07d835f1d2bbe8ef19ef116ad60141d1eb0650767430d1d9967 SHA512 680c1549a8a37eb3a719f3e026888d045d26c98357d6e6eaf09069a23a001272deaca8cac4a9b8fd79f489c4cfb4fe2c7b5d481d1469798a8f5ec470d0cadbe3
 DIST openrc-0.44.7.tar.gz 255444 BLAKE2B 8058e1fd8fcce46f53e73b56ec8da5eec9ba0807d657aef4ece2d49056c02a451c41155df96b167ff157863a85d77eb63796715b5191dd1c6c631c8f859d3090 SHA512 c6b3e2e30615d97a5185320a140ced881bc59ba31ea8dff5d80440396166af237826de6ffc7836ec141e305c92176cd9cc3dabff7e42ac0d80e5238513fefdb7
+DIST openrc-0.44.8.tar.gz 255668 BLAKE2B 13d023ea3346313ded9f9bff729c296a3317577ddc58cadbe57429833075776a3a3dc52dfd1c9e9721407b747df0f6471a81d12dc79216dc4b75222104208965 SHA512 ee8520b42df2f20cc770b9cc1a82eee4c7cb2e0d2e8b0788f5201e7c5ca864f414e97f679f3c25b808cb3641bc99cd74580dcd9777f4738f43adba65754ae679
 EBUILD openrc-0.43.5-r1.ebuild 5066 BLAKE2B b3e56275bd07558fa1b3a67e76c343d4368803ff8c806872e1fe7351667848640b722de86c5cac410d76e02d69a5adb764a942aafa180e22c4d79d7c90533e6e SHA512 8214a366eeb208c3f05302ec0f35a0bc9fb500951d102faa3010c0b8dc005d2d4a04609efd89351c76984ed18b0013e16367a0d257d809b667f69f981164dd46
-EBUILD openrc-0.44.7.ebuild 4527 BLAKE2B 8f583afc9ed0130d99193ab7dfbf2b74fd38aff8fa227f1ac5544cb156b4c0a0334945d25fcd675cd7ba8cc8876c7a1211dec001aa69dfda570ef9d104ac1e90 SHA512 b908e64fdc78bd79a5651b375b0beb43e30e29399425286d39eb34c9e96a0a3def8259d3939d4d97545180b27fa68aa9c7b765ac793c04c449818527b632fa18
-EBUILD openrc-9999.ebuild 4535 BLAKE2B 7320f6dc00ac1df21449846c389bc6cba8797da82bebb2b2055eb83e79351e593a0a9137222dca1f02de05ca6e1fe86f05531c51793aff2f0ee3376bc35ef91d SHA512 e59d13f838fbf466855c6049f8d743c952aa22cb97f1c617aff167db36069fc1e5c6aac283aa4920c33ca95ec2f0ec3598b1501c5aaf06cb8bbec69d8129031f
+EBUILD openrc-0.44.7.ebuild 4526 BLAKE2B b8764b74d29d517878dc2152940840ca70f7486ad9e7c5eaaad69bc6e567b213f345dbf80160f2f8437d8ee4f22b9d51941e057678b3ab28a1790c6ec5ad2b6f SHA512 24727522c449166a6bdb32648fbab754a880536f6edb463523499efac000ebb2de2087bb4875ad7fb743c2cdbe6087cb4bb111ada9ce278166562958ceb776fe
+EBUILD openrc-0.44.8.ebuild 4359 BLAKE2B f53a464c885015589d13e32ebfb698f68cf3e89ed00b8fa2f0fcad61c40f64b208f89b2e01ca5e7802b2c2b9a528c5df8025aa738ed96b2ae867574f8679fc78 SHA512 0382a8624f6adcc5506c1d3a391b7e996c51e06888199a99d5666909981279a0991c01222f52fdae7e5c1dd8c217b9cc9ebf7e51f68886e2719d41158b32562b
+EBUILD openrc-9999.ebuild 4368 BLAKE2B a0e9a673ba22f1d0c6db4d959f3b786044c06bce370f6e5df8bc9d0d722f9bd4132a3549fcd66448a4a1a136584feaaae8ca391f074636f18f69878eec3b786e SHA512 2cba40f232e34a4a6afc5f270143e1daed775ca58802be11159afb57b9e19708a342ca3dfd5fb3b1b54d535f80b4d9bdeacecdb5a5c55ec7ec1ffd2c9ded6a68
 MISC metadata.xml 707 BLAKE2B 713b69a4e4d6a61051c9f6dfda46da3afa62c590c62b4f371f3949140eaecfa665a977091ac858bff99380dfc3758038ee6a96b0c8b88c142e2e751b20318fba SHA512 5260e1aec8973d42bf059b1f20b3a5f95b98608efeac614d46b20d774a3453c25348cea4a45d745abe829ad016dbc524080c482c1666032e969e08fefe1efc37
diff --git a/sys-apps/openrc/openrc-0.44.7.ebuild b/sys-apps/openrc/openrc-0.44.7.ebuild
index 5146d1891fb4..7f782f68a788 100644
--- a/sys-apps/openrc/openrc-0.44.7.ebuild
+++ b/sys-apps/openrc/openrc-0.44.7.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} =~ ^9{4,}$ ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 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.44.8.ebuild b/sys-apps/openrc/openrc-0.44.8.ebuild
new file mode 100644
index 000000000000..4e57ae57a034
--- /dev/null
+++ b/sys-apps/openrc/openrc-0.44.8.ebuild
@@ -0,0 +1,157 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic meson pam toolchain-funcs
+
+DESCRIPTION="OpenRC manages the services, startup and shutdown of a host"
+HOMEPAGE="https://github.com/openrc/openrc/"
+
+if [[ ${PV} =~ ^9{4,}$ ]]; then
+	EGIT_REPO_URI="https://github.com/OpenRC/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/OpenRC/openrc/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+fi
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="audit bash debug ncurses pam newnet +netifrc selinux sysv-utils unicode"
+
+COMMON_DEPEND="
+	ncurses? ( sys-libs/ncurses:0= )
+	pam? ( sys-libs/pam )
+	audit? ( sys-process/audit )
+	sys-process/psmisc
+	!<sys-process/procps-3.3.9-r2
+	selinux? (
+		sys-apps/policycoreutils
+		>=sys-libs/libselinux-2.6
+	)
+	!<sys-apps/baselayout-2.1-r1
+	!<sys-fs/udev-init-scripts-27"
+DEPEND="${COMMON_DEPEND}
+	virtual/os-headers
+	ncurses? ( virtual/pkgconfig )"
+RDEPEND="${COMMON_DEPEND}
+	bash? ( app-shells/bash )
+	!prefix? (
+		sysv-utils? (
+			!sys-apps/systemd[sysv-utils(-)]
+			!sys-apps/sysvinit
+		)
+		!sysv-utils? ( >=sys-apps/sysvinit-2.86-r6[selinux?] )
+		virtual/tmpfiles
+	)
+	selinux? (
+		>=sec-policy/selinux-base-policy-2.20170204-r4
+		>=sec-policy/selinux-openrc-2.20170204-r4
+	)
+	!<app-shells/gentoo-bashcomp-20180302
+	!<app-shells/gentoo-zsh-completions-20180228
+"
+
+PDEPEND="netifrc? ( net-misc/netifrc )"
+
+src_configure() {
+	local emesonargs=(
+	$(meson_feature audit)
+	"-Dbranding=\"Gentoo Linux\""
+		$(meson_use newnet)
+		-Dos=Linux
+		$(meson_use pam)
+		$(meson_feature selinux)
+		-Dshell=$(usex bash /bin/bash /bin/sh)
+		$(meson_use sysv-utils sysvinit)
+		-Dtermcap=$(usev ncurses)
+	)
+	# export DEBUG=$(usev debug)
+	meson_src_configure
+}
+
+# set_config <file> <option name> <yes value> <no value> test
+# a value of "#" will just comment out the option
+set_config() {
+	local file="${ED}/$1" var=$2 val com
+	eval "${@:5}" && val=$3 || val=$4
+	[[ ${val} == "#" ]] && com="#" && val='\2'
+	sed -i -r -e "/^#?${var}=/{s:=([\"'])?([^ ]*)\1?:=\1${val}\1:;s:^#?:${com}:}" "${file}"
+}
+
+set_config_yes_no() {
+	set_config "$1" "$2" YES NO "${@:3}"
+}
+
+src_install() {
+	meson_install
+
+	keepdir /lib/rc/tmp
+
+	# Setup unicode defaults for silly unicode users
+	set_config_yes_no /etc/rc.conf unicode use unicode
+
+	# Cater to the norm
+	set_config_yes_no /etc/conf.d/keymaps windowkeys '(' use x86 '||' use amd64 ')'
+
+	# On HPPA, do not run consolefont by default (bug #222889)
+	if use hppa; then
+		rm -f "${ED}"/etc/runlevels/boot/consolefont
+	fi
+
+	# Support for logfile rotation
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/openrc.logrotate openrc
+
+	if use pam; then
+		# install gentoo pam.d files
+		newpamd "${FILESDIR}"/start-stop-daemon.pam start-stop-daemon
+		newpamd "${FILESDIR}"/start-stop-daemon.pam supervise-daemon
+	fi
+
+	# install documentation
+	dodoc ChangeLog *.md
+}
+
+pkg_preinst() {
+	# avoid default thrashing in conf.d files when possible #295406
+	if [[ -e "${EROOT}"/etc/conf.d/hostname ]] ; then
+		(
+		unset hostname HOSTNAME
+		source "${EROOT}"/etc/conf.d/hostname
+		: ${hostname:=${HOSTNAME}}
+		[[ -n ${hostname} ]] && set_config /etc/conf.d/hostname hostname "${hostname}"
+		)
+	fi
+
+	# set default interactive shell to sulogin if it exists
+	set_config /etc/rc.conf rc_shell /sbin/sulogin "#" test -e /sbin/sulogin
+	return 0
+}
+
+pkg_postinst() {
+	if use hppa; then
+		elog "Setting the console font does not work on all HPPA consoles."
+		elog "You can still enable it by running:"
+		elog "# rc-update add consolefont boot"
+	fi
+
+	if ! use newnet && ! use netifrc; then
+		ewarn "You have emerged OpenRc without network support. This"
+		ewarn "means you need to SET UP a network manager such as"
+		ewarn "	net-misc/netifrc, net-misc/dhcpcd, net-misc/connman,"
+		ewarn " net-misc/NetworkManager, or net-vpn/badvpn."
+		ewarn "Or, you have the option of emerging openrc with the newnet"
+		ewarn "use flag and configuring /etc/conf.d/network and"
+		ewarn "/etc/conf.d/staticroute if you only use static interfaces."
+		ewarn
+	fi
+
+	if use newnet && [ ! -e "${EROOT}"/etc/runlevels/boot/network ]; then
+		ewarn "Please add the network service to your boot runlevel"
+		ewarn "as soon as possible. Not doing so could leave you with a system"
+		ewarn "without networking."
+		ewarn
+	fi
+}
diff --git a/sys-apps/openrc/openrc-9999.ebuild b/sys-apps/openrc/openrc-9999.ebuild
index 2c2da59b7499..c1adfbae4a59 100644
--- a/sys-apps/openrc/openrc-9999.ebuild
+++ b/sys-apps/openrc/openrc-9999.ebuild
@@ -137,13 +137,6 @@ pkg_postinst() {
 		elog "# rc-update add consolefont boot"
 	fi
 
-	# Added for 0.35.
-	if [[ ! -h "${EROOT}"/lib ]]; then
-		if [[ -d "${EROOT}/$(get_libdir)"/rc ]]; then
-			cp -RPp "${EROOT}/$(get_libdir)/rc" "${EROOT}"/lib
-		fi
-	fi
-
 	if ! use newnet && ! use netifrc; then
 		ewarn "You have emerged OpenRc without network support. This"
 		ewarn "means you need to SET UP a network manager such as"
diff --git a/sys-apps/osinfo-db/Manifest b/sys-apps/osinfo-db/Manifest
index e04543c309a3..b1a881b82960 100644
--- a/sys-apps/osinfo-db/Manifest
+++ b/sys-apps/osinfo-db/Manifest
@@ -3,5 +3,5 @@ DIST osinfo-db-20210806.tar.xz 120664 BLAKE2B 1b52a2eee65e947dba9929e09758212a02
 DIST osinfo-db-20210809.tar.xz 120848 BLAKE2B 0d58c852c92d44d0e555bc572080f0390f2feb47904607486005f5d449fe8f732aaeab512cf5015f763c46af71ece536cd06dd2c9164a5c31c8ffd78533065bb SHA512 e191531b43a806acdd2b11f69d293c31ce809786bf1d224e15e54e80079ff9de49b6e7e44595a75c27d98585fe8389e293e333872a8c8d1c4e1cff9873a78b1a
 EBUILD osinfo-db-20210621.ebuild 646 BLAKE2B cb2303b33652d1a20a3a7daa6e09803d8f099e7d30bc6f6165c6627ec68547e15d381fb14e309584f9ea3cbba5995ac212969d49bee13b93e3702708217c8320 SHA512 91a69da519966c175e9ba3712ca281e5b1bd68f936c97c534207a7913bed8d105d9539f1af81fb2bfbbdce52917a32e4b3bdbb51ef404e2c59a872ddc092b91d
 EBUILD osinfo-db-20210806.ebuild 649 BLAKE2B 80c3a428f78561c85970aaa059ad466cd0d8e1a3c322b705fd42248a0ddbbc39f3b7949c671b67a93e746d1ec2b2fdd6b8a32b69bd143adee059a242d6c5ff1a SHA512 1b79aad1bba76087ea026480b9ff907aaec79701f0a2f2844a37590fedd7e55394759761ff948710acad4289db8e50c7a34c7cd3201e62d1b2abb2b84f4f6ffd
-EBUILD osinfo-db-20210809.ebuild 654 BLAKE2B 70cb6abf4f30ba58a83de842a851cc16a8d20fbaf267ab5328bac6ca7dfe0e72eda2507f7a53094310d3a1b30c3fe17f699cab158e8d1613a036480b3cd788ee SHA512 dd12ddc5d40eae35d4cbe694d4c21a93d4cce5e7e3c80e5be0113e80dfbef1086cb3941b0119b83e9f69ec5276d78e1d403d5ff3d1ef08a9e6e5c2486a2c8289
+EBUILD osinfo-db-20210809.ebuild 653 BLAKE2B 27f726b80dddd26c9253b28956b4a3f0529022f84ef69a4f1af58cf2e481429e95328eda9207d49b2296da254ab6d55011a4642f79f928c0156f845e56205eb6 SHA512 fb8669f2f20ada6541a8336acce7566915e619981207959401264c82657db69c228374bb7418c1fc3dce3f6aa32ffe4de5127b2bb75a96335dbb7ef8ba2465da
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/sys-apps/osinfo-db/osinfo-db-20210809.ebuild b/sys-apps/osinfo-db/osinfo-db-20210809.ebuild
index f98e3d55b641..20e2cff978e3 100644
--- a/sys-apps/osinfo-db/osinfo-db-20210809.ebuild
+++ b/sys-apps/osinfo-db/osinfo-db-20210809.ebuild
@@ -11,7 +11,7 @@ S="${WORKDIR}"
 LICENSE="GPL-2+"
 SLOT="0"
 
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 BDEPEND="sys-apps/osinfo-db-tools"
 
diff --git a/sys-apps/pkgcore/Manifest b/sys-apps/pkgcore/Manifest
index 396faa8c1128..4781f61be062 100644
--- a/sys-apps/pkgcore/Manifest
+++ b/sys-apps/pkgcore/Manifest
@@ -5,6 +5,6 @@ DIST pkgcore-0.12.8.tar.gz 624442 BLAKE2B d7e15fc659820e3cd6e4f7848413c12b2439d3
 EBUILD pkgcore-0.12.4.ebuild 1113 BLAKE2B 707e98f4ffdd8b2487c805d08ffe8953c95fc59e2a29e9756effa6dbb4eaafa457687a96032604594b121c32252242400c9a7609ee6be6f1cd61e50b2a67eba7 SHA512 18e5e6ea67c0c476a2232fc427d74ff52c0b92225f03d874f4018fa5b59c23a7a4ac79c4f11f50634e29ee09416f71801565fd26a48039bbf1c2078df09aeb10
 EBUILD pkgcore-0.12.6.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
 EBUILD pkgcore-0.12.7.ebuild 1113 BLAKE2B 707e98f4ffdd8b2487c805d08ffe8953c95fc59e2a29e9756effa6dbb4eaafa457687a96032604594b121c32252242400c9a7609ee6be6f1cd61e50b2a67eba7 SHA512 18e5e6ea67c0c476a2232fc427d74ff52c0b92225f03d874f4018fa5b59c23a7a4ac79c4f11f50634e29ee09416f71801565fd26a48039bbf1c2078df09aeb10
-EBUILD pkgcore-0.12.8.ebuild 1127 BLAKE2B e9ebe5fa39276a8ee620a9e3f322bcc8bf4ac7f5885c1dcb64507137b11a29e33af7ca3d4d75401c6d741e4e3c0abcdcc1a57adbc56a3827d7f536702eb29d4f SHA512 d9c1964fb7968ad83bd01656ca18aa30ce717b0b6e8763c052f1cdf2d84b8f3c86dba88cec165528b49750651cfdb73e48b6bbb628103d2b79f71236fda6dff0
+EBUILD pkgcore-0.12.8.ebuild 1121 BLAKE2B 71493afb287a5a1db0f187df74bc16706e38f7643c468f156871098263d0a9c839ebc0db26a0a2419211ceea503e9f381a6341232d50423e4083896049bb7331 SHA512 4c6154aeeca32d07d4503f4c35c88ed81c9ee6dd4a49651c753eab8df65c6f7dd23a164a24a81d5e8da1c2a77459e69a6af8eee1d877061c914ee420c9b5f5cb
 EBUILD pkgcore-9999.ebuild 1121 BLAKE2B f4bcdaba4897269b8e3d0b928fe30b4b8d913bed49397fbd6b8c125455c8e92bc6f16986cfa2d8764d38a3d148eab74b67db3d90cc614104fea135124858dab1 SHA512 6eca87f6e49d9f06fb602d6e2c504922dfbe9b7067a51016b8d8c91015f221afd7cf6dca7fd0b0010d83b5122afe5731447bc3cd22f5f49be97d1fa195a82ad6
 MISC metadata.xml 338 BLAKE2B 8e1efa689e0129b002ca035af4d3da753e9ef4d80029e01d2baceaca5a45a4c1c325ed25d58f38094a73564a033611e92a3b60d836967e9c664021d643bd0813 SHA512 019b2e934eb8f3a04148d4426466fc397983487122e10e9a2dc2f42e747bc7675947edf549e5ab5efb284d753de0af994a0a7a4f014ee22183a156afa4a462da
diff --git a/sys-apps/pkgcore/pkgcore-0.12.8.ebuild b/sys-apps/pkgcore/pkgcore-0.12.8.ebuild
index bf0996ccbaa8..e443ee4ff75a 100644
--- a/sys-apps/pkgcore/pkgcore-0.12.8.ebuild
+++ b/sys-apps/pkgcore/pkgcore-0.12.8.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcore.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index 586812de93c9..3413d75d26ee 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -5,10 +5,8 @@ AUX plocate.cron 1392 BLAKE2B 89f7eb05879c0c1a6c30376d36dc469dde0b94df3758ae6590
 AUX updatedb.conf 898 BLAKE2B de832ebc92e103ccaf8923b2eb872ad8e1ef36be2dfaa463a054e3e9fc256102db676ab0568501b695d943fcb74ae6ab01585bf7301cc6aa9ce6d709cc1690b5 SHA512 8b0b32e949636aef46c5439b0c963cc113306cedb1e5c84dbbfa2efba6562ca6dd602fdbfa0b3bc9095b0cf30a619ebb366535406cdb461f20d012ec1af7ff9d
 DIST plocate-1.1.10.tar.gz 72222 BLAKE2B 2d84177454380c9e806a46a6e7057aca15b65c9d83179ba35062d0b8772e7cb3ff50d594c294d73157e7705d4b2eea3f12d07e614076e6a6c7a9b532f42640f5 SHA512 eee4a8982b8fff18793cd06c35cdea501226fae6409df02e8bed3d14feb3ed4ba6c29e907f36f5efb74202e8926547def83379b03aeb6348e1a6e7b51f12fdb9
 DIST plocate-1.1.11.tar.gz 72366 BLAKE2B 2b945b3e61244670e2295e1e5abc2af65d2cdbb2393a96961cd4ae97384a735c327037771e6f41927cec0860207a6f98b7b0c2b03d08678bdb0d72a94dfa04f7 SHA512 59f88a11ebbac5f350acca6d1a5890ac1c1cb10c1de2e4e149df60fc63673eefa7f143b06f79ec4e59c65d435b3e222eba5618c48afab97983d76f56fbe8b433
-DIST plocate-1.1.12.tar.gz 72710 BLAKE2B 4b12d49f1e2827a5bfbc2d110579bb6af3c74368bb8d1ad76cc979a75d58e234dbc011bffcf2ee92059a2e1d62cacd06ba43fac2abcc130176aa2d034ad94211 SHA512 b22d6c45f43ac06391f7a92e9ef8d642d1da2ee40d7273e4a61d278d05cdc2be6d5a777ed5966bdf58b13ac7027518e3eb308d7034db030c665cf3b35baea2b5
-DIST plocate-1.1.8.tar.gz 71569 BLAKE2B 06ad0e9535b76bf0102cdeeb6014e2d84f85f51f5926520566e9c6871f04ac09651bb0674ed679d2a4c0d4e516e55dfef35a7021112fad3549bf76993554aeb5 SHA512 a685347df64ac1a3eb7789cb7023b4d0ffed5fb7435a4bd88c3943991e145a387829532ec0c01d30d851b97b8d3173ff4c7c274775e639b75f0b1b45e5bca2a6
+DIST plocate-1.1.13.tar.gz 72741 BLAKE2B 251c5ff570bda125c839e125eab093e15545beb24e75d29c21f13050fc088653f11ba1acbf4c4f6f6aaca4f134908b8084ad4b1e8b0cad83a1a05e1bc2973cdc SHA512 a7c761e4da169716686f438846587e4bdb6df4de039cd7b4fed455e5f52b8aa235714f0c1059787f65f1553a07929802d0ecda0b26111d4f0f811af96a48cb7d
 EBUILD plocate-1.1.10.ebuild 2076 BLAKE2B 24b739711c5dea6964cfac26f18ab4f7cff7d1a78a8d2d7d2ed1810d12a417a42bd0257ad14a36c9e65aa7c767fc9cd8a7db151f58ceac2345514964c084d0fe SHA512 0a6c96e085ed11000df8b30e2406c100a2404f0cd72b912493ab3734fca774313e86cb0f489db791fb2daa39bcba21a6452428a0ac1d539617296e72b5ef5c30
-EBUILD plocate-1.1.11.ebuild 2082 BLAKE2B be1b2f92a10046afec88779b936c1a859fd5d3f5555e72b992643f665b719809032fb6d391abedf769fcdd5a600adc0daf0b6714bf561efc85fc67106848ce85 SHA512 f230b493de88e8acf4bba3c1c46a10253688d7a6ae9a88c15045b8ff0083238737714872cb67376ca61d03f91465e69ad147b80de806f119ed6eaa6a515d940a
-EBUILD plocate-1.1.12.ebuild 2082 BLAKE2B be1b2f92a10046afec88779b936c1a859fd5d3f5555e72b992643f665b719809032fb6d391abedf769fcdd5a600adc0daf0b6714bf561efc85fc67106848ce85 SHA512 f230b493de88e8acf4bba3c1c46a10253688d7a6ae9a88c15045b8ff0083238737714872cb67376ca61d03f91465e69ad147b80de806f119ed6eaa6a515d940a
-EBUILD plocate-1.1.8.ebuild 2063 BLAKE2B 35011f66c0957b50861f4a8e4c658ac6457e1d64bc3171713dd7627fcb358a6dd55d9d270966cfaf928bd007d5897e1c0fffa639d00065d2de06450a57dce0b4 SHA512 24b7f3f25aceba3661c38b60a76d6e4229d8bc57c1ce45e00461bd4f264d43bab8432a592ca9abb0b662bad77e0c8072c6243164f0f395a07abda602b8de3d1d
+EBUILD plocate-1.1.11.ebuild 2081 BLAKE2B 075034c462d4781f2ff0d9de298569e215538d5d498c5d2cd042aa680b2f2cccf3d24ece0a4b4790d6e8f8c95dfe402b79512e132c036b43c6c033deeb5af995 SHA512 726ee0a4705cd7b695db84d995f8845efc75060f863bd9fe9a0d7908a1383a12efd9c380c43d4a66d2926bd3bf4572f3ffa640ce51473d44c0064b695eb79d99
+EBUILD plocate-1.1.13.ebuild 2082 BLAKE2B be1b2f92a10046afec88779b936c1a859fd5d3f5555e72b992643f665b719809032fb6d391abedf769fcdd5a600adc0daf0b6714bf561efc85fc67106848ce85 SHA512 f230b493de88e8acf4bba3c1c46a10253688d7a6ae9a88c15045b8ff0083238737714872cb67376ca61d03f91465e69ad147b80de806f119ed6eaa6a515d940a
 MISC metadata.xml 1393 BLAKE2B 1459e2cc800bad910a9e08a1fd0d6b6a533d3420279a4a89d5c07d91775180669684d5b454962323acb5ecc1d96de650f48623a9f63319004ad25bea7b4ded97 SHA512 16e282b1d1bc1f71631bbde3ca935c1e0747175460860ef068e6855a9efa3d843841e0b9deaa0848a2f4fbff32aa630f0b93c398b196c6619a61f59263ee8e31
diff --git a/sys-apps/plocate/plocate-1.1.11.ebuild b/sys-apps/plocate/plocate-1.1.11.ebuild
index b7c6c2e00ec2..f9cef1542c88 100644
--- a/sys-apps/plocate/plocate-1.1.11.ebuild
+++ b/sys-apps/plocate/plocate-1.1.11.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
 # GPL-2+ for plocate itself
 LICENSE="GPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE="+io-uring"
 
 RDEPEND="
diff --git a/sys-apps/plocate/plocate-1.1.12.ebuild b/sys-apps/plocate/plocate-1.1.13.ebuild
index b7c6c2e00ec2..b7c6c2e00ec2 100644
--- a/sys-apps/plocate/plocate-1.1.12.ebuild
+++ b/sys-apps/plocate/plocate-1.1.13.ebuild
diff --git a/sys-apps/plocate/plocate-1.1.8.ebuild b/sys-apps/plocate/plocate-1.1.8.ebuild
deleted file mode 100644
index 5cc0edbe149d..000000000000
--- a/sys-apps/plocate/plocate-1.1.8.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit linux-info meson systemd
-
-DESCRIPTION="Posting locate is a much faster locate"
-HOMEPAGE="https://plocate.sesse.net/"
-SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
-
-# GPL-2 for updatedb
-# GPL-2+ for plocate itself
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm64"
-IUSE="+io-uring"
-
-RDEPEND="
-	acct-group/locate
-	app-arch/zstd:=
-	io-uring? ( sys-libs/liburing:= )
-	!sys-apps/mlocate
-"
-DEPEND="${RDEPEND}"
-
-CONFIG_CHECK="~IO_URING"
-ERROR_IO_URING="required for USE=io-uring"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.5-no-systemd-check.patch
-)
-
-src_prepare() {
-	# Pretend liburing dep doesn't exist when USE flag off
-	if ! use io-uring; then
-		sed -i "s/dependency('liburing/dependency('/" meson.build || die
-	fi
-
-	# We'll install the manpage ourself to locate.1
-	sed -i "/install_man('plocate.1')/d" meson.build || die
-
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dlocategroup=locate
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	dodoc README NEWS
-	newman "${S}"/${PN}.1 locate.1
-	dosym plocate /usr/bin/locate
-
-	insinto /etc
-	doins "${FILESDIR}"/updatedb.conf
-	doins "${FILESDIR}"/plocate-cron.conf
-	fperms 0644 /etc/{updatedb,plocate-cron}.conf
-
-	insinto /etc/cron.daily
-	# Ensure that the cron file has the same name as the
-	# systemd-timer, to avoid plocate being run twice daily on systems
-	# with a systemd compatiblity layer. See also bug #780351.
-	newins "${FILESDIR}"/plocate.cron plocate-updatedb
-	fperms 0755 /etc/cron.daily/plocate-updatedb
-
-	systemd_dounit "${BUILD_DIR}"/${PN}-updatedb.service "${S}"/${PN}-updatedb.timer
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog "The database for the locate command is generated daily by a cron job,"
-		elog "if you install for the first time you can run the updatedb command manually now."
-		elog
-		elog "Note that the ${EROOT}/etc/updatedb.conf file is generic,"
-		elog "please customize it to your system requirements."
-	fi
-}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 011420f21a73..5d65b0aea1fe 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -10,6 +10,6 @@ DIST portage-3.0.20.tar.gz 1348818 BLAKE2B e8af0662d073110a921ef23865872b0440f5e
 DIST portage-3.0.28.tar.bz2 1153994 BLAKE2B 8d9e3af04acd9bb5fdb3cff5b928abbf707db13f6c25afdac4399ea47adb67b2621ebb733927b4f9386e3f285fa7daac0423ae3fb0509a9df747b41c82865313 SHA512 148484b0384672116f2f2187eaddb56f646548324cd5f6c8e187a02bc965fb2bea6632214aed9b40c615acb89eb6124ab831ad85c59bac9a416b02a07506669b
 EBUILD portage-3.0.18.ebuild 8756 BLAKE2B f4a457de8df4a6c79568de33f898c56016ef44fc44b8965befd5c15dd16b93a800c8797ebfaddb0cb6e81c1a6f7af68eb297d9399bad9aa534ea75117eba73e0 SHA512 40329720f7ea7538da334479835cf21560f2e3c3420863593cbaf7dfb454dae1b01293256622ee09c05d3e7d8949e4f2839d1d1bd0911ccb9d6e63254003790d
 EBUILD portage-3.0.20-r6.ebuild 9875 BLAKE2B 5057f1c542c443088fb5349692da20e01a113be85748e17d02c3034355d66bb6b94932baca8016d90d5f58b7d00baee5ee1dfd22842d3f25c31a8255808c26a4 SHA512 cb309c78a7f02df7b7b67b8ffbfb03b27106fef0a59ab89858e9be2d1257a2c9efe7bc6f0d2a9fdcb2c4ab9bc82387f2460270676dbdf3128552f20377c461b5
-EBUILD portage-3.0.28.ebuild 8523 BLAKE2B 14c0cd474a8aa00e39056122f49478bfd88f8a049a0d02e0937ade01f748fd2db4bd9fe7d571b3589eefc3c4566e73615943f74ebe684bbd6a5da5951c38e9fd SHA512 dcb604e81580247fdbbabb93d0118ffa4829b12bc8bf514b8e5c089da45fa58bebedc230ff025875d69ed6b30d9566d363f90d2f0a22abfa831888bc3543657c
-EBUILD portage-9999.ebuild 7797 BLAKE2B 9bd82de59c964dbcd36f9048baa9723371e52feb38e2abc18f49c0db92b52eb5a15dbd806a36afab48ea65db9440fe8da30ea328ee7dda6027df70621e30c072 SHA512 9bf7e45bc04a0c122ceb0aee8994558dc8d1f0cbe2d2abd69b1bce915080fcbdcaf2456d5f6c6056fc9792ca09a069a7a40bd01f6075bb1c3f06b0f107815f61
+EBUILD portage-3.0.28.ebuild 8557 BLAKE2B 0b98c96b06eea280478adb73237acc22a7b5fc6511d4bbe99258baeac6b88cbd40d80bba033811842bcc143a7710bea3f4cbb731adb61c536ff43ff3893a3812 SHA512 1b16c5458ce8c3a0d37c183c6ea0a12559ed3f2bd36c9eba526fd70c815ad89a6e13fe2b4684800b707ff6766985406a4b4f8e0f4f8a0f1988052f0e7718e8bc
+EBUILD portage-9999.ebuild 7833 BLAKE2B 99166bbedf61282c15d7766beebb1327b3ecf91066b8164d6b2341d70cdf4741e8749b26f1fe1a707b154276fef6478e5f2f413877be0c202a6408febebb2664 SHA512 7c2bf11a5d9e9853f32fdd147fc5c9bdc69e780001484e5bf550845592acc463c8849cb760a16aefccfe636e6d951a7095171d2ee77c895d9ef619181e2e7e4a
 MISC metadata.xml 1483 BLAKE2B 5f164044c11b8fc7a103c459be58268403dab87fbbfeedd0f5fa4d1a4edf9ec7d4983cc7d5a3e6d298b268859fc1eb91723f0c98313e9b3b5dfb0368aedb1a20 SHA512 284a46b4708fc88734ca87f041fb6a88bc4a7e6a50ce03533a1eef9602694adcb09679b665a3793e4609ea85fd41b84438b27479ffa00ac53cbf9d4bb89a3402
diff --git a/sys-apps/portage/portage-3.0.28.ebuild b/sys-apps/portage/portage-3.0.28.ebuild
index b7767bce94e4..18bbc5bc82b3 100644
--- a/sys-apps/portage/portage-3.0.28.ebuild
+++ b/sys-apps/portage/portage-3.0.28.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
 
 LICENSE="GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 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 test xattr"
 RESTRICT="!test? ( test )"
@@ -28,8 +28,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=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
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
 	)"
 # Require sandbox-2.2 for bug #288863.
 # For whirlpool hash, require python[ssl] (bug #425046).
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index af4fc9932679..8534c218fe99 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -28,8 +28,8 @@ DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
 	>=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
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-epytext[${PYTHON_USEDEP}]
 	)"
 # Require sandbox-2.2 for bug #288863.
 # For whirlpool hash, require python[ssl] (bug #425046).
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 425dd460fdfa..0050d778a256 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -1,4 +1,5 @@
 AUX 09sandbox 37 BLAKE2B 181213e2cc0bcfa328310cced40bfaba4530d8d2f80e892cb5649d5277c5d59d345ce96ca802a5529a22892c929bafac04c616458fa147a3bee5c89d31b0baf1 SHA512 4e8a9c58debde6480224a45559c5f2db4765213d151e47937f9142f110cac3681bf6402acaf21249a37bb17398e7bc00ae7feee68ecdb5b9363c432eac1b052a
+AUX sandbox-3.1-label-decl.patch 1331 BLAKE2B f8472f3a69663a4fb6c9502694fe3aa96a069cb81c3b5f2c54cc3a17f2d59e809a953ed697ba2ebafc35e0e8c45fa48137243096e2fbe15b7c2d96b28c502aca SHA512 451960db208520b356e744aa90cdbfa4f599ad8aeacd835a7536a2bc202a0056a9411f068cb0b8ecaf9f0950ed1c638466c1923891078500306f6e9c9e0ecb51
 DIST sandbox-2.24.tar.xz 438408 BLAKE2B 5e725d17da0abc06d56216f4df2f4034076f50163db1c3bbddbf4fd07dbd5b7d92ef2f1b2c01eb77ff6cf531c5cc6a05e60b028f585310ac56eef96240882843 SHA512 8df5414e334a15f367acfd218ba1b74ba618b93d7bdeca8a039b69cbd81ab048ec5a6cecb24df09fa9a5f4fe214d647acf5138004defd45e6396eec5ae7c93d0
 DIST sandbox-2.25.tar.xz 436004 BLAKE2B c9c7d351cdefbb2b1a585904c38742a5a3bde50d3d690c57cff9cdc71ffb822e78a2b56c47afd03fbc70834de5dda13c5a300d9d6b35e09ec400a050d4f8e82c SHA512 4e998c4d9ba6eb69369cc49849060a2e90535eae91fbb64c4d46371fe0ed5182413b14674f10c773fd997b6895bc870ccb23586351f5bb06b69dc11a0cddbe1d
 DIST sandbox-2.26.tar.xz 444412 BLAKE2B 3bc88d86ba4e2522895c4448dff6da2cffceb912e5ff9610fe4c3aea255ffd9b9ca9bbe8e45d94508f45e9c141aa6945a9a8d82cba0f3ca102ff6a1624c84161 SHA512 f20766daf2ce43753772a184c86a7b6847f96ab7b60b202616e15d791bc1f770162035a9b1ffe38765dff8d2567ad971a9a2bdeba9a8769845a758fcd95206fa
@@ -6,6 +7,7 @@ DIST sandbox-2.27.tar.xz 448948 BLAKE2B 03a311c8c7c8719bac398e39ce49e7149bdaa1d5
 DIST sandbox-2.28.tar.xz 450840 BLAKE2B 1a144db1dcd140ce393f47b224c4389693bd3db6d056749968a9e78730b1075192148aa63fdfd5ab93893dfb96a87bcc36bee8b4540abefca0590a8def8365f2 SHA512 eaac54fbc35f51da3c94bfa10e0556f0fd39c20660fea2aa7d3cbf76dd3e4c9fb4a16cc198425988b79313f9331af030e1dca431c3f057ee4a04927c96897895
 DIST sandbox-2.29.tar.xz 452784 BLAKE2B 388f5d9c49134696bafbc6b882581396a9fa2e7caa6ccfb4376706d653f836ce18e0d77527c4c4f2ff753c0b920ab5ab60e151dd8a4e399e13dbc3fe7c0533d6 SHA512 15c0e6b71e8b8547b8188f857568c99b1925d5a837a289b21c4f842341361bf7119b96083697dc83546caf530daab700fb8c2704974e7cfb804d64bb5257a4b4
 DIST sandbox-3.0.tar.xz 454384 BLAKE2B b4f38b7c5ed2dc52e558f1b7e36d2308e6017c9d14861c60eace0f240a909f11184e259b2359ea96cad81d21234cc9a6bcd9f313ce56bd2f3bb1ce836f006a50 SHA512 3a35ee0b19a356b1986468ef5d2ecd553b88cbdaf287ce31a211b4072097a9844fca413ffa0f2858b9a4e75ead822fe9d9834f17c241ba32c2f14e02619a70b3
+DIST sandbox-3.1.tar.xz 454404 BLAKE2B f8cc2960f1c7b3367d375952f0a7ca978c1a2cc27b63137046152d1080a1a7b6b99d356af0776d3b57a5c260b2d89f0b7bfb127967407b537642be04e92b8603 SHA512 e57c0fc1ddb5a63012abd02080770d49deaa1d0168508a794df2eaa25b2b7a4fa6c505e8b93572a3745912819202c264cdf980f10dc7101c487a9b03e7f65815
 EBUILD sandbox-2.24.ebuild 1617 BLAKE2B 5bb22638ea5e5735242e538cb8e0e2598a38237001162fa0cd4d4c3dba6ddb7b9d4607b04ab20b00cb2e7b17c7a759808117d6c0c521a7ba6843fb42e29d1ab2 SHA512 845b5ae83d2c12dc7101d01b76af6693ae888237eda43d2207ef4a1fd3c121d79c554cbb1e7395365867cb96b6a27bbae1c26ff79c301ed00e536acef396dae9
 EBUILD sandbox-2.25.ebuild 1615 BLAKE2B b42f819adc73df7f3c7b0f2654eeaa41f23840763c3fe5abe64ba147b20cf74f1df7411a1309d2581b4264a9a5152eda6386551acadfc04125d31251557c10b6 SHA512 df4789dff85f482c7e9750d8581d2b74686bef82a5b4dd15d1a4b7923f7a2541f68afa5e5b5c091ccdab8234eba2708110401bad527c99e25e236dd8921e8abd
 EBUILD sandbox-2.26.ebuild 1455 BLAKE2B d1d05a952f34ec697b26176ba6183006d636d546af197277d30a1811b7200a45d1327db669ac411174e74989024f4c87d69ffbd68834e7a76fdf5a8ce8bd0446 SHA512 8fb95b39aad62153208436bb73c84fd6d891333cb251958ac2ee71913cdc59b98002f53dbb471fbbb2e76ae954b34c3cedc8c94b4f5d6e4fb65ffd40e4c8b3d7
@@ -13,4 +15,5 @@ EBUILD sandbox-2.27.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a
 EBUILD sandbox-2.28.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
 EBUILD sandbox-2.29.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
 EBUILD sandbox-3.0.ebuild 1560 BLAKE2B 26d1f86f4161cd33f748a544556a05bf2392722a709cff67ab34ba065bab868d7cfcee374381291caf303d7d195fcf4359d84d62984c18a99c76df161c76fe06 SHA512 4148963c26accefcf5e752c23ce306360487477e7810b121cfb2e8c4c8efe0793332ffcedbb33206dfb5ff0d25e0ef5e7772f7b10f6d08179e20146a8dcaabca
+EBUILD sandbox-3.1.ebuild 1618 BLAKE2B 10cfbee355236fc67f56acec39539a708984aeddff9781ecdf72a00c05c4b38b31079324f41615a8cacd78f94c72da8fee1ca73e7d020b5b853812917a6f42cc SHA512 837fdd8538a28f67b1cde4795c57ef115a4637c94ae3723fca9be6936d354d156bf1b10492fc88f0ac7620cbc7edb952dc10ff92b19b6145b34f0a626f3ce3a2
 MISC metadata.xml 377 BLAKE2B fcbc91501a4a61bfa3c3cc01b0746f5f638093933cf8a9ba1e6206071cb0482c9ba18c5c10541d934327cf805ee0e40c010b3f25a221ab63fefa2fd9f39da0d7 SHA512 92aa26a3200dd1508fb86da0e0bc70be66ccbcf66593ee6833102c9961ac17c8a99c5b070a2cd2e79dba8e5daa0316cdb6744baa3fbd9342953fcc00b1277d35
diff --git a/sys-apps/sandbox/files/sandbox-3.1-label-decl.patch b/sys-apps/sandbox/files/sandbox-3.1-label-decl.patch
new file mode 100644
index 000000000000..b17f4b866f5a
--- /dev/null
+++ b/sys-apps/sandbox/files/sandbox-3.1-label-decl.patch
@@ -0,0 +1,41 @@
+From 82f6d876660ba1132d75ccfef5c4301d123ea505 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 3 Nov 2021 12:25:10 -0400
+Subject: [PATCH] libsandbox: tweak label/decl code for some compiler settings
+
+Looks like gcc is inconsistent in when it chokes on this code:
+> a label can only be part of a statement and a declaration is not a statement
+
+Hoist the decl up to the top of scope to avoid the issue.
+
+Bug: https://bugs.gentoo.org/821433
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ libsandbox/trace.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libsandbox/trace.c b/libsandbox/trace.c
+index f3390d99822e..d2899b743048 100644
+--- a/libsandbox/trace.c
++++ b/libsandbox/trace.c
+@@ -704,6 +704,8 @@ static char *flatten_args(char *const argv[])
+ 
+ bool trace_possible(const char *filename, char *const argv[], const void *data)
+ {
++	char *args;
++
+ 	/* If YAMA ptrace_scope is very high, then we can't trace at all.  #771360 */
+ 	int yama = trace_yama_level();
+ 	if (yama >= 2) {
+@@ -721,7 +723,7 @@ bool trace_possible(const char *filename, char *const argv[], const void *data)
+ 	}
+ 
+  fail:
+-	char *args = flatten_args(argv);
++	args = flatten_args(argv);
+ 	sb_eqawarn("Unable to trace static ELF: %s: %s\n", filename, args);
+ 	free(args);
+ 	return false;
+-- 
+2.33.0
+
diff --git a/sys-apps/sandbox/sandbox-3.1.ebuild b/sys-apps/sandbox/sandbox-3.1.ebuild
new file mode 100644
index 000000000000..1c11a7faf157
--- /dev/null
+++ b/sys-apps/sandbox/sandbox-3.1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit flag-o-matic multilib-minimal multiprocessing
+
+DESCRIPTION="sandbox'd LD_PRELOAD hack"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Sandbox"
+SRC_URI="https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="+nnp"
+
+DEPEND="app-arch/xz-utils
+	>=app-misc/pax-utils-0.1.19" #265376
+RDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-label-decl.patch #821433
+)
+
+has sandbox_death_notice ${EBUILD_DEATH_HOOKS} || EBUILD_DEATH_HOOKS+=" sandbox_death_notice"
+
+sandbox_death_notice() {
+	ewarn "If configure failed with a 'cannot run C compiled programs' error, try this:"
+	ewarn "FEATURES='-sandbox -usersandbox' emerge sandbox"
+}
+
+src_prepare() {
+	default
+
+	if ! use nnp ; then
+		sed -i 's:PR_SET_NO_NEW_PRIVS:___disable_nnp_hack:' src/sandbox.c || die
+	fi
+
+	# sandbox uses `__asm__ (".symver "...` which does
+	# not play well with gcc's LTO: https://gcc.gnu.org/PR48200
+	append-flags -fno-lto
+	append-ldflags -fno-lto
+}
+
+multilib_src_configure() {
+	filter-lfs-flags #90228
+
+	ECONF_SOURCE="${S}" econf
+}
+
+multilib_src_test() {
+	# Default sandbox build will run with --jobs set to # cpus.
+	emake check TESTSUITEFLAGS="--jobs=$(makeopts_jobs)"
+}
+
+multilib_src_install_all() {
+	doenvd "${FILESDIR}"/09sandbox
+
+	dodoc AUTHORS ChangeLog* README.md
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"/var/log/sandbox
+	chown root:portage "${EROOT}"/var/log/sandbox
+	chmod 0770 "${EROOT}"/var/log/sandbox
+}
diff --git a/sys-apps/sg3_utils/Manifest b/sys-apps/sg3_utils/Manifest
index 27f1a58d7b7c..db8ff447a041 100644
--- a/sys-apps/sg3_utils/Manifest
+++ b/sys-apps/sg3_utils/Manifest
@@ -1,4 +1,6 @@
 AUX sg3_utils-1.46-musl-drand48-compat.patch 4532 BLAKE2B 454837f33c374eb3002a47b441de9d34f57944ce99c26710b44cab010c1a5fdf538e97dfbea5714cb2d4ac5c7fd508fb23a5d835f0932ca6fcec22604dd55e46 SHA512 faba667b6cb4b7b1d6e04ddd7e80073cd5e80dd4ec7b2312c599a5c1c44df4b9ba8394354881a4968625450691587ddb42adec004043ab604f923d5fb643a86b
 DIST sg3_utils-1.46.tar.xz 1031800 BLAKE2B 034af23d10da49938979ea4d0041c6ce4309b9ceac13f06bd524011dccf285e88fbc5f4c3f261ec3e316db86278ccff235015de43d98b0b62ff05a2f98df0850 SHA512 0b4caab97ccc11fb45e88219e460b37c6ff69b8f3c79e513279aef51783ff22399d141253abdbf55db198db0815bc39d30e9b1e3bd7dda5e15c5f4dae3fe89cf
-EBUILD sg3_utils-1.46-r1.ebuild 1094 BLAKE2B b42d59a5ccb36e42797490579493f5f37d9e840bdc8b12f54d2f628f012a5e46c05da4d06bfbac726962852ee027a01a4073fc88fac2e95b03c27a5e042df45b SHA512 aab2f5019549ef82256ccf96b9cd8003bb935ff20ea2c09ab6ebb16943ef53ff963fba7161825b4cb1536c1a529a69c5b293cca40aa6d6734cd44ef0f1ed914f
+DIST sg3_utils-1.47.tar.xz 1046904 BLAKE2B 6efadd86f6d466469f5d5d3f53b2b6bf01143695db19e96b55a13a606d8a36d5571e390fed0b0990371dc4b77714f88c03f440a4468f6863544c0d21b2e3ef73 SHA512 ef072b8f0012d0944e21d2134aff7125e24ea24d1cbbb1aa79160e844f9a60236f1e244437a3bc08a22a7e99f613adad4a05ae5cc3916ded5a72d162cd3aa163
+EBUILD sg3_utils-1.46-r1.ebuild 1076 BLAKE2B cfce21f217dcd43b8c527e241c3a577cfe76fdf8a46f654439a6096f330970e545ba78b6ee91ab12da540125c35eb99d30eed94764bec6cdfc342d53af18c68a SHA512 806355cd5a302570b294af02a8607bfccb577bd4533eb04b3d0145535bb41749524c0e738af1bc44e4ac7763b90b83bce499eacda3e6ff8cfc9a885b446ba511
+EBUILD sg3_utils-1.47.ebuild 1002 BLAKE2B dcb487e43fa63a2d47680e111f8e9814af13c45aa9e3f361de3e096b32a387ba55b7ce09ef5d55b53ca4a0cca665c173221d3316d55f982aa4d0912a5feeb6ee SHA512 bfc1e971d80c67419fbb3bd5afe2160891d1f4c246d8392eb7b9a3f0731d2c7b6d08b3ceb3283f0486fe170c24b65e53c0e27a4fe071a5d8d90fd495b2e13ebb
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
index 35f989ec76fe..adf5be558150 100644
--- a/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
+++ b/sys-apps/sg3_utils/sg3_utils-1.46-r1.ebuild
@@ -3,8 +3,6 @@
 
 EAPI="8"
 
-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"
diff --git a/sys-apps/sg3_utils/sg3_utils-1.47.ebuild b/sys-apps/sg3_utils/sg3_utils-1.47.ebuild
new file mode 100644
index 000000000000..30882f707434
--- /dev/null
+++ b/sys-apps/sg3_utils/sg3_utils-1.47.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="static-libs"
+
+DEPEND="sys-devel/libtool"
+RDEPEND="!sys-apps/rescan-scsi-bus"
+
+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 62b41cca6ec0..8f0a656a9599 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -11,5 +11,5 @@ AUX shadow-4.9-libsubid_pam_linking.patch 706 BLAKE2B 8d9b3f6ab2aea004275e634756
 DIST shadow-4.8.1.tar.xz 1611196 BLAKE2B 952707cdd55dc6c00dcbc60dbc3bf84ac618dbe916b36d993802b3ce42594de332a9bc22933a28881af3d317a340eab017ada55511b4e4fbc3ca6b422c4bc254 SHA512 780a983483d847ed3c91c82064a0fa902b6f4185225978241bc3bc03fcc3aa143975b46aee43151c6ba43efcfdb1819516b76ba7ad3d1d3c34fcc38ea42e917b
 DIST shadow-4.9.tar.xz 1627008 BLAKE2B 7a9a6a489115c7a20520cfec61f008fc0f70f7f50aaf539e94dfdcb20035d2de88ab3198e76812a4e3eb944b92c76c0ca2e85e35f4342537711c2c033248a72b SHA512 254cda49bb14505a7604821e7fa898bf4bf317d648e9ddc881ab80a6860d52053dfffacad6feab87c7d16608c35ed6b6cee99e7757eac930da3a7b31cdcd4b95
 EBUILD shadow-4.8.1-r4.ebuild 6134 BLAKE2B a3effe54f52408bfee5ed17134a58806e005aab38391d4ff78888e3ae18c86f0d76dd946c2494bc92901e8400e7b98db0e4045f004a8880cb6c437acff28d560 SHA512 2e7375dd6c94bdc85eabfe8cb65d0c7df4bb1bc9b2aff418824046a8af80493f3a481476f63bdc91abca4aefcc61105b2aa6c551e8b260b8da1db2d0587b56fb
-EBUILD shadow-4.9-r3.ebuild 6113 BLAKE2B 4abd77ea93ff627286ab8b227d9a68634250617316db163a59ca5cf321cb9d2e37f8ceaf8ca6be505b8bade18b665ac27a93756a4b795e4c489f5854d70647c1 SHA512 8e542f1ecb7c7bd043722bb69b512d55959dccedf903003817f0e4125c9cfedc47b3e54beec4927c1c94e3c9a7df18703ee466f0f3ca5c40bd7b6e32641ed5dd
+EBUILD shadow-4.9-r3.ebuild 6112 BLAKE2B 09778e7c21213de9f541bd46e50c647c9a64f83bb3556c9f1845d72504e394de42a3ee4e2f832ba9e532b8eb46f542160928ef4d6e0b97ca53060b4980be7445 SHA512 82753d7c7936d72b80dd759a94746c66cf89f68528584af369e2e1978807853e5d39364feea9b169e3c7beb0bbcceb46f2a1d11bbf0e7bd08ab55c0a84df9e6c
 MISC metadata.xml 563 BLAKE2B c798cc562a973cf521347a9245dec0b6622144d0ea1d3a1cfb82aa9fc44bf9b3c26cf5f6a265a02399e1decfa7cf1db87df7d7eed7bb1a7ead74d2f156688ecd SHA512 024b490bd1197bebd41e53c74aa7ef72e0f46b5db88484d357b69a5f9acb14e790a2706e39fc83666c6cdfcee610571401c7288310775eb5341dbef3f1160c1a
diff --git a/sys-apps/shadow/shadow-4.9-r3.ebuild b/sys-apps/shadow/shadow-4.9-r3.ebuild
index 8c120ddc8945..69a16bb519be 100644
--- a/sys-apps/shadow/shadow-4.9-r3.ebuild
+++ b/sys-apps/shadow/shadow-4.9-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/shadow-maint/shadow/releases/download/v${PV}/${P}.ta
 
 LICENSE="BSD GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 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 )
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index 78eaaf94a3dc..1e6663ef0eb1 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -1,7 +1,8 @@
 AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba692cfcf106557047ce4ecb2756addff2800f75ae2d550e209a83d1399484f7c1bf1c7f7f859b9 SHA512 7a46212d2d76b335ac7470b51b44e40b1cdd4814e5db4a8a2f013803bb40ea5072fde64590ffd51754b03a6f80a43e835605a5bb3ac2c23e456633995191ec31
 AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437
-AUX smartmontools-update-drivedb 161 BLAKE2B e1ff7f8f77b6b1afe02228e1b5a3045555ec11f4f1cef86af2a024544ae8714520682ca87592a54d801327f95c4cb3b7c9e1b49592e7bcfcdc0c7837a3a5c881 SHA512 cf460168f1e0cb9a5276a098b62b61044d797ffc992dc0233fae5109769aeab4c04eab56fbcbdc5202513f8a537bc7c40cf463d9260deefd3efa4811e58a249b
+AUX smartmontools-7.2-update-smart-drivedb-quiet.patch 2141 BLAKE2B 9de69ba2187b94885e29594c9a350f0b44c2ea88b6fdee96e8c397ea57db74903b174714fce94433cbf00e11e9c6270f70ccdd3ca818667c09ed4681ebc49b8e SHA512 7e1f70212602b6e4b87ab1017777c4edf8627dbea3bb15476e4c356d41469913a1194dbba5054055fb6fd814face766b85851d16b7383c64d26eb9a8d796bc7c
+AUX smartmontools-update-drivedb 45 BLAKE2B 6b77927d453f6b39898dcb164b4e7cb32f65de528088bfe4e2b358a3adffecc5cc6a120ee64de307551f0a0444b13901eb2db28bbd8ac81fba50f1dfbf0772f9 SHA512 6fd231ea3215fdc14c25f2ee7d767ca35f8c1f438e97d6056f419699d042a6a23473b26f2e28b1fb16a1389144a62a4b642f0ae19ab1dbda0c0a4a34bf709246
 DIST smartmontools-7.2.tar.gz 992256 BLAKE2B 9f671656e610404b0ab8b6ec51421b4046c64d16331cff821a8d9dbf34dd6c4be4fa63d3a2eaffe2aa869b09acf5f18b9c9750f76e33423710ef9166212e3a92 SHA512 d7e724295b5d53797b5e4136eea5f5cc278db81e4016ba65142438b8c68c54f85a32c582c147a1590b9bc8f74a58952bcb57b9923dd69d34582530a0985799ea
-EBUILD smartmontools-7.2-r1.ebuild 4112 BLAKE2B 765864c21f3d938f524f3060e02de878d7720395a5cef885e2be272657450512f009378b1ac919f644036ef5b546b57a716a70ea21fe23472627df8543fc7b85 SHA512 cbd85fad50a8a5e6094fbd0dd75ab906a0650ebf01e3191f8758fba643f7a38ccac1237dd382d79174ba3cc5458671140ff4a827332710ea91dd5df58a26efa6
+EBUILD smartmontools-7.2-r2.ebuild 4243 BLAKE2B a03483429b480b9116c6e7f9fd20dd39cd68899f5129bfac5e4a3ead00d5ba810047bbcdfba40dc6a7c9dae59dcef04234fe3964748e681e6ba1ec3922a402eb SHA512 dcaeb1f24fd743c8ebfb65ff44808d35d3258819e6ca75f26dd2077f7f9ecd18dcde295a68b335f74f82b50b4247db301ade39c5c2dab643a331a43e80a0110c
 EBUILD smartmontools-9999.ebuild 4120 BLAKE2B 8934c567f80a47f0a3d31a7e97b6a0821bb3cc34cc203c0c8568e78c2023b64bfbc938c4b68584bff6ec9eb41c46f7a6d7edcbc9f1f63a62fa0329b87412c2f8 SHA512 424b6c177004e0d7c706699343e0aa145470e95f6e65cb8d3b326e702c699a02e9bd4a640c30ffec7de635c9d7dfa4db1cd54e46b8d3cc010084103ed494526a
-MISC metadata.xml 629 BLAKE2B c73896c9de740a685e9032160525ff16cea74570a357add089208502966cd30a8aa9e60cd582ebd739c452e11da41a9e1edf5383d0060b4b6e90e4184d2c7478 SHA512 2263c65a48ab07a4fa6440c38c4d25486f0b55b686983911297becddbacb7549c54d6d8c890e5df5a30654d1b3d589389d83cb4d974bb6c9a5a4aa61907b2478
+MISC metadata.xml 708 BLAKE2B fcd5acb620a89a1171a63a678e16a6eefd0f72616c7c8c8999adb617d5b7e6aa359c89793db574e18a7424e838cf986005df9b538eb4d3a0df59fe09aa701f0f SHA512 0c6315a656c69a2d343f072d91d0457d3ee6169824c6eb232fd651895f207cf8162b178adc5a1f9de2b76bc9cb0f10fb3ead49c45a104db744bc98915a3aa7dd
diff --git a/sys-apps/smartmontools/files/smartmontools-7.2-update-smart-drivedb-quiet.patch b/sys-apps/smartmontools/files/smartmontools-7.2-update-smart-drivedb-quiet.patch
new file mode 100644
index 000000000000..773375508222
--- /dev/null
+++ b/sys-apps/smartmontools/files/smartmontools-7.2-update-smart-drivedb-quiet.patch
@@ -0,0 +1,86 @@
+commit 56363dff436c12eaa296bbba39dfd65ec3f1f1f2
+Author: chrfranke <authors@smartmontools.org>
+Date:   Sat Nov 6 15:07:18 2021 +0000
+
+    update-smart-drivedb.in: Add '-q' option to suppress info messages.
+    (GH issues/110).
+    update-smart-drivedb.8.in: Document new option.
+    
+    git-svn-id: http://svn.code.sf.net/p/smartmontools/code/trunk@5242 4ea69e1a-61f1-4043-bf83-b5c94c648137
+
+--- a/update-smart-drivedb.8.in
++++ b/update-smart-drivedb.8.in
+@@ -1,6 +1,6 @@
+ .ig
+ Copyright (C) 2013 Hannes von Haugwitz <hannes@vonhaugwitz.com>
+-Copyright (C) 2014-20 Christian Franke
++Copyright (C) 2014-21 Christian Franke
+ 
+ SPDX-License-Identifier: GPL-2.0-or-later
+ 
+@@ -144,6 +144,10 @@ Print the OpenPGP/GPG public key block.
+ .B \-\-dryrun
+ Print download commands only.
+ .TP
++.B \-q
++[NEW EXPERIMENTAL UPDATE-SMART-DRIVEDB FEATURE]
++Suppress info messages.
++.TP
+ .B \-v
+ Verbose output.
+ .Sp
+--- a/update-smart-drivedb.in
++++ b/update-smart-drivedb.in
+@@ -72,6 +72,7 @@ Usage: $myname [OPTIONS] [DESTFILE]
+   --no-verify     Don't verify signature
+   --export-key    Print the OpenPGP/GPG public key block
+   --dryrun        Print download commands only
++  -q              Suppress info messages
+   -v              Verbose output
+ 
+ Updates $DRIVEDB
+@@ -131,6 +132,11 @@ inpath()
+   return $rc
+ }
+ 
++iecho()
++{
++  test -n "$quiet" || echo "$*"
++}
++
+ vecho()
+ {
+   test -n "$q" || echo "$*"
+@@ -522,6 +528,7 @@ mv_all()
+ smtctl=$SMARTCTL
+ tool=
+ urlid="svn"
++quiet=
+ q="-q"
+ dryrun=
+ trunk=
+@@ -547,6 +554,9 @@ while true; do case $1 in
+     shift; test -n "$1" || usage
+     urlid=$1 ;;
+ 
++  -q)
++    quiet=t ;;
++
+   -v)
+     q= ;;
+ 
+@@ -727,7 +737,7 @@ if [ -f "$DEST" ]; then
+     then
+       rm -f "$DEST.new" "$DEST.new.raw" "$DEST.new.raw.asc"
+       touch "$DEST.lastcheck"
+-      echo "$DEST is already up to date"
++      iecho "$DEST is already up to date"
+       exit 0
+     fi
+     mv_all "$DEST" "" ".old"
+@@ -738,4 +748,4 @@ fi
+ 
+ mv_all "$DEST" ".new" ""
+ 
+-echo "$DEST updated from ${trunk:-branches/$brnch}${no_verify:+ (NOT VERIFIED)}"
++iecho "$DEST updated from ${trunk:-branches/$brnch}${no_verify:+ (NOT VERIFIED)}"
diff --git a/sys-apps/smartmontools/files/smartmontools-update-drivedb b/sys-apps/smartmontools/files/smartmontools-update-drivedb
index b7d1bb95243f..270789c53d0a 100644
--- a/sys-apps/smartmontools/files/smartmontools-update-drivedb
+++ b/sys-apps/smartmontools/files/smartmontools-update-drivedb
@@ -1,5 +1,3 @@
 #!/bin/sh
 
-# Hide stdout until a --quiet switch is added:
-# https://github.com/smartmontools/smartmontools/issues/110
-/usr/sbin/update-smart-drivedb > /dev/null
+/usr/sbin/update-smart-drivedb -q
diff --git a/sys-apps/smartmontools/metadata.xml b/sys-apps/smartmontools/metadata.xml
index b1a371e967df..db3a4e7b4141 100644
--- a/sys-apps/smartmontools/metadata.xml
+++ b/sys-apps/smartmontools/metadata.xml
@@ -1,16 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="caps">Build against <pkg>sys-libs/libcap-ng</pkg> to allow smartd to drop its privileges.</flag>
-	<flag name="daemon">Install the monitoring daemon (smartd) and associated scripts.</flag>
-	<flag name="update-drivedb">Install a script to update the drivedb file.</flag>
-</use>
-<upstream>
-	<remote-id type="sourceforge">smartmontools</remote-id>
-</upstream>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="caps">Build against <pkg>sys-libs/libcap-ng</pkg> to allow smartd to drop its privileges.</flag>
+		<flag name="daemon">Install the monitoring daemon (smartd) and associated scripts.</flag>
+		<flag name="update-drivedb">Install a script to update the drivedb file.</flag>
+	</use>
+	<upstream>
+		<remote-id type="github">smartmontools/smartmontools</remote-id>
+		<remote-id type="sourceforge">smartmontools</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/smartmontools/smartmontools-7.2-r1.ebuild b/sys-apps/smartmontools/smartmontools-7.2-r2.ebuild
index 39f90ac1de44..3059ff0feb50 100644
--- a/sys-apps/smartmontools/smartmontools-7.2-r1.ebuild
+++ b/sys-apps/smartmontools/smartmontools-7.2-r2.ebuild
@@ -48,6 +48,11 @@ REQUIRED_USE="(
 	static? ( !systemd )
 )"
 
+PATCHES=(
+	# Backport from commit 56363dff436c12eaa296bbba39dfd65ec3f1f1f2
+	"${FILESDIR}/${P}-update-smart-drivedb-quiet.patch"
+)
+
 src_prepare() {
 	default
 	eautoreconf
diff --git a/sys-apps/spu-tools/Manifest b/sys-apps/spu-tools/Manifest
index 83091d3aeae5..f8bcacd27245 100644
--- a/sys-apps/spu-tools/Manifest
+++ b/sys-apps/spu-tools/Manifest
@@ -1,5 +1,5 @@
 AUX spu-tools-2.3.0.136-buildsystem.patch 983 BLAKE2B 1f3feec2ebcc4b6e6d991461ee20411048dc23030c2f013470c0d9f37fab167f2d91546274be83e654810214b238c49f09f3c8f5d328e3c436fcd4c3f1e18a59 SHA512 093f9c881a8b60d027d24ceb1b120d7f2d475a688dff82df3418b115b613218555e885067cc67e8bd1ebd3b66024d1b6ff6b51d8d2ea73f3244dc2339a5e805f
 AUX spu-tools-2.3.0.136-format-security.patch 431 BLAKE2B faa46ac8e2e9c9ccf9f5bd1735c3860db179a836338b4725a1021e15b1df1125022217c0a963110bbd5a54da5b19cc7b48ba7e99c46fb8b57fbed48190043e58 SHA512 33ea0520587668e10876e3ce62f14cc0b751e69b1f4816456a0cdd4cfdfd542f9b3896ae80f6ba095eccb087253c10a924fac18cdc66a5f7cb88bb83bffdf488
 DIST spu-tools-2.3.0.136.tar.gz 21981 BLAKE2B 24aed86e43179e547c871b804a39b2c49215757b2c5c7afdce2ae798367350725f18974bb67ede5fe24f9178ea2003ed7b1b2f5c09c157b90757d4dc789629d5 SHA512 d25ef8fda067ee98eb698859c21f497ae1a09a6d791c0c2063957beb022b2f2946f9df7e78907b4d3b2f71021fa3c2f76012db7154faaee5be3285a0224c7612
-EBUILD spu-tools-2.3.0.136.ebuild 760 BLAKE2B 8b6137c6c588e88ec82560ae349c248f64b9ab238f117dd8b795c07cd3ba6a111504bc73ef8f03159389037760276e2862a773f0d84dfd5f9e41284fc961fc82 SHA512 82291f6c914e4cf3e69f124ee0bc7df16749eea86ebe0434552bcaf3b7226b602b91cb53955ccb12289974099bda1af47986a9292a8fff11dd563f7015805517
+EBUILD spu-tools-2.3.0.136.ebuild 763 BLAKE2B e58e834531daafbe52ce4093b36e48472b68590b121eadabf3945f714288229ec8320fd9e1683dcf34a1d881c8973e2d9059eba4ec28962b2a8fc01c76e7bed5 SHA512 a33a1be35e76cc9e3faa4992be4006775badb1f460f68d3c9b583a0cddf839ad861dddc3a69431b899eaf78454a5075a561b836cd7bb0d4d384f35122c55610e
 MISC metadata.xml 295 BLAKE2B 2e767fe85262e5b7135b148b7e53a24439889fbd17cbe8620e83b448394340f3cca10a99f6bde4f59fbcae7a73473991726e693f3bc17eaf6ef606270c98f67b SHA512 197cede7e1ec71dcd98b118f2c4d14716c59851dfd2835e58d6302213477eeb7dd3d17361b433ab1e1b14b3521f4f0d3a6a1d9a5c234fc38348310abede27564
diff --git a/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild b/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild
index e64a12c86a55..2955c689ee4c 100644
--- a/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild
+++ b/sys-apps/spu-tools/spu-tools-2.3.0.136.ebuild
@@ -1,35 +1,36 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
-MY_P=${P/_p/-}
+MY_P="${P/_p/-}"
 
 DESCRIPTION="CELL spu ps and top alike utilities"
 HOMEPAGE="https://sourceforge.net/projects/libspe"
 SRC_URI="mirror://sourceforge/libspe/${MY_P}.tar.gz"
+S="${WORKDIR}/${PN}/src"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="ppc ppc64"
 
 RDEPEND="
-	sys-libs/ncurses:0=
+	sys-libs/ncurses:=
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	sys-apps/help2man
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/${PN}/src"
+PATCHES=(
+	"${FILESDIR}"/${P}-buildsystem.patch
+	"${FILESDIR}"/${P}-format-security.patch
+)
 
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-buildsystem.patch \
-		"${FILESDIR}"/${P}-format-security.patch
+src_configure() {
 	tc-export CC
 	append-cppflags -std=gnu89
 	export CFLAGS="${CFLAGS}"
diff --git a/sys-apps/systemd-tmpfiles/Manifest b/sys-apps/systemd-tmpfiles/Manifest
index e6a048a897b5..0152bd69a718 100644
--- a/sys-apps/systemd-tmpfiles/Manifest
+++ b/sys-apps/systemd-tmpfiles/Manifest
@@ -1,13 +1,12 @@
 AUX 249-sys-include-posix.patch 1831 BLAKE2B eaea99f57a189d77789c9b61ed7962f108f1ed733e3ab8d76fb8dd4849faf8f05338f3addaaad97ba2f8796200de0f5079d3838d995ba2519b7d4ea2a568d0d5 SHA512 3d98055f2beb22fe5607125585929fc531b790f489779dcd162541b5461a9da15d76e7a713f6476a3278073e6fd2488bc0af19eca952f6534d90aadb81ef644f
-AUX musl-1.2.2.patch 656 BLAKE2B 73abdd679bfb99f8085e3341a80059f62e836622c765c89d4d0e8123f8ad391eca5a0eacf006f1a92bcfce278e806bc565972c2cf2b0c08862a4bcda4799d7f1 SHA512 a72ebb54d7f7b2ba9fbfcae1a6d03ff5bc0511923429502e1dd1c19bb57b06b184e0c762a5b9a9d824a72c2a3e293f7805b7f0cd7be9b8b4d9be676b39c7604d
 AUX stmpfiles-dev.initd 421 BLAKE2B af962a76a2f3985aff460193a9bdcb7d340a3cf0a5c7cb65150dade564dc780d91634028b5f8a87750be66e6c47bbe519088fbc0c46047f180e93c3eabffc16d SHA512 1eac910984bda9ba5d8e9c5b17718c356f90b41ccf22bb68393b4f00901c8999501e1b482decbf22e6a16157f430eee159b3332f6e82a9442423adc884057475
 AUX stmpfiles-setup.initd 396 BLAKE2B 54796d5db9fc350a98e467cf763afaa82bc27f547755f0631f5f37f2d6e1382e361878aed80545bbb5ba198b564337e4083c073f73552d8bed4a8732ff6b819f SHA512 12201b6a3d7f4a178ca9504638cbbc7e518c5075ce9a3b2653650960b54225f3516381dd4e0366d13f16aecaa1dec40ad1a41ef1f849b6c45be81c49108bdccd
 AUX stmpfiles.confd 56 BLAKE2B c26aafd0e47b01354c7f20869cd71d36d7a8560e9013863eca6abb736d78c1eeb3eec00427c6bc8d37ab5b9bb88155d11b9e18809da9110ed40c77a34ebb1a82 SHA512 464cb238b87a8fbeb57e6534d0f2d861e8ade4219be9b7e2faf05c799f717cd2f23d176393bdd3c3b236058aa6f8bda837ad947fbe8f9489405760e9bfedbe40
-AUX systemd-tmpfiles-246-musl-mallinfo.patch 2317 BLAKE2B b2d7d82fadfb42273ae37cf57da569421c0ac3334d27e404035fccc0fe70e4bc6b44dc4b5d19c5d95cc9f5761a384497606653a94c8951df9353600da174d989 SHA512 c008e2f6b6a63b36bd582e09c35109093a2883f3fc8b784e15990f5ccdb17f3922d5a6468a89b61ad530bdaed1c667c5c0a6554b23cf80e2bd01812d068d4a59
-DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
+AUX systemd-tmpfiles-249.2-meson-0.60.patch 867 BLAKE2B 9bc6279989dabcef766da3b46113d29547c4146a38e52c440093229462bf781e431cb8770ab1808c13fd81a196df913da6eaf1abb6bf127439237228b5af6d1d SHA512 9b690693e003f30d30d4341a395bb7c28d0c0cf0117ae1bb0844f52aef3937723eb8a42120d4f4777dbad2243e49b2e771892e6157d0e930831982ff96ccffa3
 DIST systemd-musl-patches-249.1-r1.tar.xz 24536 BLAKE2B 25135519112b2a1c638046addb6971ea1997fc7dd8626de90d162a4beb6383b5724df78a14c73be1283df58632fb4a0fcb32f90f50f1886f31a1aded15e9567c SHA512 4655f2a06e1b3310cb27b839360353dfbfdbdaa86f4392aeebf63f63efd441d1953f7ac108be7fed7ea721596d191988ed999e34443e47922afca92db779175a
+DIST systemd-musl-patches-249.5-r1.tar.xz 25148 BLAKE2B 6717291b5335997dcc327764beffc4ded50a5ac0e777bb3c540b5e355bee419c3d9b4a5605c239392d4c1b0e70792bc87282fa15dc9c09a0465b5608f2909006 SHA512 4bb7566437c280e75402fc435a3437aedad127f7b94c9bd54b94e9e1e7507409ad0898681f23e813b9b47414f58e4ca413b6d4e520bbbf578faec09054bf7f9b
 DIST systemd-stable-249.2.tar.gz 10591728 BLAKE2B fb24c681cf2328aa26fa49a8ba20cccd1ee0fae82ec9f9931a69eaa377fc01b2ece12fdf407444514d494b8ac1418f155b0fceeff4925bebaba691f0b8a2acc8 SHA512 4f42a0b93156529a464545361436fa98193e12a7e0809315b9fdedbcf33b81dd2037acac27fb0dfefcb2679bc49ebb6da4d152ecb4b15db797c81f7ca4588a11
-DIST systemd-tmpfiles-246-musl.tar.xz 25860 BLAKE2B 87fc4ca37abec9c1a0cee48bf78c575bd53e16a50d427eff338159dc6d5474ffd328af533ccf90a0e1e160a16baa7378070f418f2be0d7f77e00907a5d07d30e SHA512 4a93d9f0cb2df2dd0a2f91820615dd3a95d19583f45dc0589e37ceaedfc2040112310a6e3fc525e28e222e96a91498af2fe8541b5bf86a635c0f52dd1a84deb7
-EBUILD systemd-tmpfiles-246.ebuild 4822 BLAKE2B 26d1a3b13c66b8cada48736564bc834c403f94c7a76cd9806eff5f0013d727315f8e5aadd3d05468ac0c24124275065cb8b43af1002910adaf21e32c2d921df7 SHA512 0f10d4604791bd20fed0816ae6560db3d04ed2a447f2735606934d479c979389b199c9609d9401a517974e78e7d8b2d8591d547e0b9a8708636e7156dc3e6f16
-EBUILD systemd-tmpfiles-249.2.ebuild 6075 BLAKE2B 380ff032064d6890f5bc98345f8f94ad2abe73ada324ba163e59dd7ba9c25d7a8c1bedd3b2b3e6865fa7519af93a71d2dc0adba268c92f02f0694cc895a3be71 SHA512 45154a06b18612995465302836817a8a16ab65eddbde752ca2d4c8d9f6e5f705caad14442123a48702cfaffb6d4de1e328f9f13fbb8e78e871b12b03f8579c58
+DIST systemd-stable-249.5.tar.gz 10597897 BLAKE2B 5c573322ef9bcd9d019776d6e2d8625a741c1535c0d06661b5666c2438a70cfc4dc182919bb419829de27a4d93c16717ce24e668faf9bd6b09e57f8bd88be725 SHA512 d6f1a5a6f03f0ed05b111aee75da509c5868c523af6209f33e630724dd0c7e0d0abf16920795d587e6c31a5915d247ebc613cf26d4aecf39f82ebb0690fab75f
+EBUILD systemd-tmpfiles-249.2.ebuild 6112 BLAKE2B fbb96ea7d801712fdfccdbb5dff9c9a834b62b4cfa89b768f62552786b3bb4ce6f4cb41aa222959f4ac19c08728c1af25908e7de48ea781140a7eaefff0ac826 SHA512 dba3880866c5eb033a38fbff1728f4a327cf5e0e737ad20d9cbb4d3305ad39122dcfca243b9024bc16c6f06a47c1fb13072505d34d8bfe02288a3b29b65b97be
+EBUILD systemd-tmpfiles-249.5.ebuild 5975 BLAKE2B 8ef548ba4bab67dcce2d36c3375a15adb7e3418bfc57c3836500a5c89b04ae6315af9efc5be9333313740227979fc3da81df0b6962079f83c08c9ec506b90fa0 SHA512 9989518772b4fb4edd3c212e4a850575f4588928f68624d08dde126ac9a2afd4a73d9a6e1739f77c564532bca3fff382aff524652bf3314b4e8c45e64a904c41
 MISC metadata.xml 361 BLAKE2B 51c4e3dcb18cea86f9508c51e534a670e92e81aefe8e04af436f279d3158999d6dd8836dd53abcd4b35cacfeffff829a4157d2a63ce08d4eea62791b6761feb4 SHA512 6645f474e642a386927ae353561fadda273327321705500ddb8de14ed53f94788d782680b4b765c5da0151395a9f3f3c9bea2726c05cb79e52ee26a6e033c63f
diff --git a/sys-apps/systemd-tmpfiles/files/musl-1.2.2.patch b/sys-apps/systemd-tmpfiles/files/musl-1.2.2.patch
deleted file mode 100644
index dc8905d5aabc..000000000000
--- a/sys-apps/systemd-tmpfiles/files/musl-1.2.2.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/meson.build b/meson.build
-index bea9935..03b40f2 100644
---- a/meson.build
-+++ b/meson.build
-@@ -510,7 +510,8 @@ foreach ident : [
-                                  #include <sys/stat.h>
-                                  #include <unistd.h>'''],
-         ['explicit_bzero' ,   '''#include <string.h>'''],
--        ['reallocarray',      '''#include <malloc.h>'''],
-+        ['reallocarray',      '''#include <malloc.h>
-+                                 #include <stdlib.h>'''],
-         ['set_mempolicy',     '''#include <stdlib.h>
-                                  #include <unistd.h>'''],
-         ['get_mempolicy',     '''#include <stdlib.h>
diff --git a/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-246-musl-mallinfo.patch b/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-246-musl-mallinfo.patch
deleted file mode 100644
index ea97b909022e..000000000000
--- a/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-246-musl-mallinfo.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- a/meson.build	2021-05-13 20:47:21.487670275 +0000
-+++ b/meson.build	2021-05-13 20:53:12.977688147 +0000
-@@ -542,6 +542,12 @@ else
-         conf.set10('HAVE_GETRANDOM', have)
- endif
- 
-+if cc.has_function('mallinfo', prefix : '''#include <malloc.h>''')
-+        conf.set10('HAVE_MALLINFO', true)
-+else
-+        conf.set10('HAVE_MALLINFO', false)
-+endif
-+
- #####################################################################
- 
- vcs_tagger = [project_source_root + '/tools/meson-vcs-tag.sh',
---- a/src/basic/selinux-util.c	2021-05-13 20:17:47.044246714 +0000
-+++ b/src/basic/selinux-util.c	2021-05-13 21:00:56.591045053 +0000
-@@ -75,9 +75,13 @@ void mac_selinux_retest(void) {
- int mac_selinux_init(void) {
- #if HAVE_SELINUX
-         usec_t before_timestamp, after_timestamp;
-+#if defined (__GLIBC__) && defined (HAVE_MALLINFO)
-         struct mallinfo before_mallinfo, after_mallinfo;
-+#endif
-         char timespan[FORMAT_TIMESPAN_MAX];
-+#ifdef HAVE_MALLINFO
-         int l;
-+#endif
- 
-         selinux_set_callback(SELINUX_CB_POLICYLOAD, (union selinux_callback) mac_selinux_reload);
- 
-@@ -87,7 +91,9 @@ int mac_selinux_init(void) {
-         if (!mac_selinux_use())
-                 return 0;
- 
-+#if defined (__GLIBC__) && defined (HAVE_MALLINFO)
-         before_mallinfo = mallinfo();
-+#endif
-         before_timestamp = now(CLOCK_MONOTONIC);
- 
-         label_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
-@@ -95,6 +101,7 @@ int mac_selinux_init(void) {
-                 return log_enforcing_errno(errno, "Failed to initialize SELinux labeling handle: %m");
- 
-         after_timestamp = now(CLOCK_MONOTONIC);
-+#if defined (__GLIBC__) && defined (HAVE_MALLINFO)
-         after_mallinfo = mallinfo();
- 
-         l = after_mallinfo.uordblks > before_mallinfo.uordblks ? after_mallinfo.uordblks - before_mallinfo.uordblks : 0;
-@@ -102,6 +109,10 @@ int mac_selinux_init(void) {
-         log_debug("Successfully loaded SELinux database in %s, size on heap is %iK.",
-                   format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0),
-                   (l+1023)/1024);
-+#else
-+        log_debug("Successfully loaded SELinux database in %s",
-+                  format_timespan(timespan, sizeof(timespan), after_timestamp - before_timestamp, 0));
-+#endif
- 
- #endif
-         return 0;
diff --git a/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch b/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch
new file mode 100644
index 000000000000..b931912be23e
--- /dev/null
+++ b/sys-apps/systemd-tmpfiles/files/systemd-tmpfiles-249.2-meson-0.60.patch
@@ -0,0 +1,26 @@
+https://github.com/systemd/systemd/commit/c29537f39e4f413a6cbfe9669fa121bdd6d8b36f
+https://bugs.gentoo.org/821547
+
+From: Dan Streetman <ddstreet@canonical.com>
+Date: Fri, 3 Sep 2021 12:43:33 -0400
+Subject: [PATCH] meson.build: change operator combining bools from + to and
+
+upstream meson stopped allowing combining boolean with the plus
+operator, and now requires using the logical and operator
+
+reference:
+https://github.com/mesonbuild/meson/commit/43302d3296baff6aeaf8e03f5d701b0402e37a6c
+
+Fixes: #20632
+--- a/meson.build
++++ b/meson.build
+@@ -35,7 +35,7 @@ conf.set10('BUILD_MODE_DEVELOPER', get_option('mode') == 'developer',
+ 
+ want_ossfuzz = get_option('oss-fuzz')
+ want_libfuzzer = get_option('llvm-fuzz')
+-if want_ossfuzz + want_libfuzzer > 1
++if want_ossfuzz and want_libfuzzer
+         error('only one of oss-fuzz or llvm-fuzz can be specified')
+ endif
+ 
+
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
index a651892d8e0b..ad80dc82cf86 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.2.ebuild
@@ -62,6 +62,7 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 PATCHES=(
 	# backport from 250 to silence musl warnings
 	"${FILESDIR}/249-sys-include-posix.patch"
+	"${FILESDIR}/${P}-meson-0.60.patch"
 )
 
 python_check_deps() {
diff --git a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild
index e88b531fdb79..68d31c3828ba 100644
--- a/sys-apps/systemd-tmpfiles/systemd-tmpfiles-246.ebuild
+++ b/sys-apps/systemd-tmpfiles/systemd-tmpfiles-249.5.ebuild
@@ -3,18 +3,28 @@
 
 EAPI=7
 
+if [[ ${PV} == *.* ]]; then
+	MY_PN=systemd-stable
+else
+	 MY_PN=systemd
+fi
+
 MINKV="3.11"
-PYTHON_COMPAT=( python3_{7..9} )
-inherit meson python-any-r1
+MUSL_PATCHSET="${PV}-r1"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit flag-o-matic meson python-any-r1
 
 DESCRIPTION="Creates, deletes and cleans up volatile and temporary files and directories"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz
-	elibc_musl? ( https://dev.gentoo.org/~gyakovlev/distfiles/${P}-musl.tar.xz )"
+SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${PV}.tar.gz -> ${MY_PN}-${PV}.tar.gz
+	elibc_musl? (
+		https://dev.gentoo.org/~gyakovlev/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+		https://dev.gentoo.org/~soap/distfiles/systemd-musl-patches-${MUSL_PATCHSET}.tar.xz
+	)"
 
 LICENSE="BSD-2 GPL-2 LGPL-2.1 MIT public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="selinux test"
 RESTRICT="!test? ( test )"
 
@@ -35,19 +45,29 @@ DEPEND="
 
 BDEPEND="
 	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
 	app-text/docbook-xml-dtd:4.2
 	app-text/docbook-xml-dtd:4.5
 	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
+	dev-libs/libxslt
 	dev-util/gperf
 	>=dev-util/meson-0.46
 	>=sys-apps/coreutils-8.16
 	sys-devel/gettext
-	sys-devel/m4
 	virtual/pkgconfig
 "
 
-S="${WORKDIR}/systemd-${PV}"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ -n ${EPREFIX} ]]; then
+		ewarn "systemd-tmpfiles uses un-prefixed paths at runtime.".
+	fi
+}
 
 pkg_setup() {
 	python-any-r1_pkg_setup
@@ -56,20 +76,32 @@ pkg_setup() {
 src_prepare() {
 	# musl patchset from:
 	# http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/systemd/systemd
+	# check SRC_URI_MUSL in systemd_${PV}.bb file for exact list of musl patches
+	# we share patch tarball with sys-fs/udev
 	if use elibc_musl; then
-		eapply "${WORKDIR}/${P}-musl"
-		eapply "${FILESDIR}/musl-1.2.2.patch" # https://bugs.gentoo.org/766833
-		use selinux && eapply "${FILESDIR}/${P}-musl-mallinfo.patch" # https://github.com/gentoo/musl/pull/433
+		einfo "applying musl patches and workarounds"
+		eapply "${WORKDIR}/musl-patches"
+
+		# avoids re-definition of struct ethhdr, also 0006-Include-netinet-if_ether.h.patch
+		append-cppflags '-D__UAPI_DEF_ETHHDR=0'
+
+		# src/basic/rlimit-util.c:46:19: error: format ‘%lu’ expects argument of type ‘long unsigned int’,
+		# but argument 9 has type ‘rlim_t’ {aka ‘long long unsigned int’}
+		# not a nice workaround, but it comes from debug messages and we don't really use this component.
+		append-cflags '-Wno-error=format'
 	fi
+
 	default
 
 	# https://bugs.gentoo.org/767403
 	python_fix_shebang src/test/*.py
+	python_fix_shebang test/*.py
 	python_fix_shebang tools/*.py
 }
 
 src_configure() {
-	# disable everything until configure says "enabled features: ACL, tmpfiles"
+	# disable everything until configure says "enabled features: ACL, tmpfiles, standalone-binaries, static-libsystemd(true)"
+	# and optionally selinux feature can be enabled to make tmpfiles secontext-aware
 	local systemd_disable_options=(
 		adm-group
 		analyze
@@ -115,9 +147,11 @@ src_configure() {
 		machined
 		microhttpd
 		networkd
+		nscd
 		nss-myhostname
 		nss-resolve
 		nss-systemd
+		oomd
 		openssl
 		p11kit
 		pam
@@ -131,6 +165,7 @@ src_configure() {
 		rfkill
 		seccomp
 		smack
+		sysext
 		sysusers
 		timedated
 		timesyncd
@@ -153,6 +188,7 @@ src_configure() {
 	systemd_disable_options=( ${systemd_disable_options[@]/%/=false} )
 
 	local emesonargs=(
+		-Drootprefix="${EPREFIX:-/}"
 		-Dacl=true
 		-Dtmpfiles=true
 		-Dstandalone-binaries=true # this and below option does the magic
@@ -165,7 +201,7 @@ src_configure() {
 }
 
 src_compile() {
-	# tmpfiles and sysusers can be built as standalone, link systemd-shared in statically.
+	# tmpfiles and sysusers can be built as standalone and link systemd-shared in statically.
 	# https://github.com/systemd/systemd/pull/16061 original implementation
 	# we just need to pass -Dstandalone-binaries=true and
 	# use <name>.standalone target below.
@@ -199,11 +235,11 @@ src_install() {
 
 src_test() {
 	# 'meson test' will compile full systemd, but we can still outsmart it
-	"${EPYTHON}" src/test/test-systemd-tmpfiles.py \
+	"${EPYTHON}" test/test-systemd-tmpfiles.py \
 		"${BUILD_DIR}"/systemd-tmpfiles.standalone || die "${FUNCNAME} failed"
 }
 
-# adapted from opentmpfiles ebuild
+# stolen from opentmpfiles ebuild
 add_service() {
 	local initd=$1
 	local runlevel=$2
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index be364216d482..12d61efe1f3e 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,3 +1,4 @@
+AUX 00-hostnamed-network-user.conf 227 BLAKE2B 0cc780a2ea9f31f08be01184704e4fa8b4b95e4c82b7e2dd4127f82c594a5cd7c8f865a83ae5f1284e58a7fd120ee9a9f4f586b7e479d21f1e8adf26e8e61238 SHA512 97e8decd802de8581fb546e3a714376fbd065108f3edfed54a1036d93df02f9947c358aec9aa4841a766c9120fa20c69eb7867bb4d2bd7339d8bd89c43235b2b
 AUX 249-fido2.patch 2323 BLAKE2B 5977ec0bed24f25ef3c152aab8e8b40cc91c115256cad912c22d93d4ec533921124448e0bd2d994a48ea58e0d1e38cdc7a8b0281730e68b90b58fd6f7a319d69 SHA512 a385fd7889fe3e679c70d7dd62fe468da83385eb000bd3af4b2df36e836a42d1549ba90e09e57b611e5550a6e3f95d7e8cde8e749e9a85c6dff58ce88ea611f1
 AUX 249-home-secret-assert.patch 5057 BLAKE2B 59fada3228e726110ed865e80f85c62d2faca852b3c3fdc47135123da622697e448a8c2d8826c140240210513b7474d27e71383f6d41b561790135d67d9324c1 SHA512 2ad4e15a900a27c55ca32b065ff91ea51344eeb0b5508ab6310efe2537a66e5eaa80c4acd287fb57b2d531c79528577c6fd0599e29e862c05cf81dc439a6a7f6
 AUX 249-libudev-static.patch 1454 BLAKE2B 420f9452066ccf951033c1ae1e215284fa9d11f24777c68ecd0178db5c7571ee881451300d409468c1ba3f3b2ad4b35adca5b2761309c84b315bbabd45f6b97f SHA512 4d616b4b02981c4622951a46f23519e03c2d1228453837d31fe060db70afa24722883ca57c08c55cd9fd35c720a5ef2ecb11ab3313867e1b3cfc3682e45e3f45
@@ -8,10 +9,11 @@ AUX gentoo-generator-path-r2.patch 994 BLAKE2B 2bfb42623221291030fa9f7310e9bf747
 AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed68272fcfa9cc34a309ff5d4cc2230f71a6f7fed42c79afb1c96605df141e8e40b2d8290d12ad3c18038269814f2df8 SHA512 d77d4dae9f8a7819c6d4855476f3163ee19f52b20f66a93e25818f0747404462c47e3cafbd82ba85ce1b3d2fdbabdd96a0398b71149b318c540d82403f8ad0ad
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
+AUX org.freedesktop.hostname1_no_polkit.conf 471 BLAKE2B 50d9f86b2c4813a90eac8a31f0f762eb1b9e0272024419bfffd1d8c4dbe9955541df5c1e5a14e1663db3c0194e95a8984e5ec0c8a65eb74d279f021c3ef3d348 SHA512 af38bfed2230a75e03de6831a5202e21af6c01e13670df1a5b1b454203bd9db47428a61aa9cf0a21841a11e7caa889e3f6147342ba5411649e00f334a8e03639
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
 DIST systemd-stable-249.4.tar.gz 10593723 BLAKE2B 466b3cb27c4bc6c85c9ba50f6614175b2c31a4c177d452542faa1395e99511440029b1a093dc80a5a1a0135eed09d8b1849572f36dba4e18a1396230bfc31adb SHA512 5b9ec28102538bc3dcb632ee16389ff20dccf4b723186f6ae2da119a1809d84db0d8bcecf9b75c5e2da8427f5543e1da281bbed1a154e529d8a82ea5128c465c
 DIST systemd-stable-249.5.tar.gz 10597897 BLAKE2B 5c573322ef9bcd9d019776d6e2d8625a741c1535c0d06661b5666c2438a70cfc4dc182919bb419829de27a4d93c16717ce24e668faf9bd6b09e57f8bd88be725 SHA512 d6f1a5a6f03f0ed05b111aee75da509c5868c523af6209f33e630724dd0c7e0d0abf16920795d587e6c31a5915d247ebc613cf26d4aecf39f82ebb0690fab75f
 EBUILD systemd-249.4-r4.ebuild 15099 BLAKE2B 7076124a49b1beeb8153cbca7868a1e828cb0ae9b2c0e5e3fa60db5473f2f1d3870a7010d5b9dda71acb81d98cff970758595d32b2944761c4f59dcd7f65463f SHA512 e4be3bdf1c30aa36b02ffcda10502371543bc616988ad8cd558651f01efc55a813532af9ad42590e13831be8025f674af273e0001fe670929b9442319c812bf2
 EBUILD systemd-249.5-r1.ebuild 15086 BLAKE2B dad65d652cbf7723121b07b2a623dbaae414d97179341fd2b78c86aa0b64c12086dd128fbbdb616e22201ac95932e96d29272a93c3bf14d52a4c1b253ebac7fa SHA512 a1cf432f246af2bddf5d90fce671cde62b227d2401b48f142480a71dbbda984ba57c7bf6fab23a20a0d86ea70bc116d4f3fc149d231d06bf72d12b8bf28393ba
-EBUILD systemd-9999.ebuild 14945 BLAKE2B b427e2f0c2fc28fe9d67432426dbcc2aa83893aae17c9cdf3ca25dfebb0b3e8ef194ab6964bdc8d7a71afb8f0b6e509ad15579889dd8d8c9c9fc4ff7a8df3d01 SHA512 16aac9a616c40e08414f71a704f3866ef98d830fb0751fc503e719e184b42334b5a4f43a940034f48372ccbbecff4218886c2d4ec26d636e63e1fc8f46081c5a
-MISC metadata.xml 2468 BLAKE2B 62d58ff16df9bc0ea157279e4fe750cff42d02bc61a8d545671adf01da4de5359184a3247c2423b49fd9a104efdbdc879fe5a4e46f5ddc5810d6046cf8896473 SHA512 99408e7635e3deb8ceb2c58a56632d0ee1947865729b56eca9ce6626e61ef201c5b42e9d4baf6784bd6021380f8d592b01be00ea488ce475310be63c3501407c
+EBUILD systemd-9999.ebuild 15447 BLAKE2B 57772e77237210d88b764e48a3117a9eca0c55621b9d5c1e4d032c7ce2048833949cfd86dbab0e5f7ba7b54e91e82435c9c4d03cdba386045b460e194f6c1df8 SHA512 edc4591b9762d207bcbdceb1c7a99489fbaecd24f6729330e9d8d95d89ad5850527ffa4039ed0944d2901346445aa5f96ef40e1c793256b8ef755740d3cc908b
+MISC metadata.xml 2623 BLAKE2B f07eb8074cfbd61dfb5580b1ec83d6f26dc3aff248d3dcb6932c164921b96681d829516fc9106d3e95f152412f5da4665506402d3c07db58ebd6120f32c9c1a5 SHA512 d2579bdef5d5715fc0d2a699c547ed3dcd938a91ab586fa6b8ee6f9c251af3ea8d04bfd0fd1db60fc943064a12e2ead4efed11894846fcf31d304cb18ee8c43a
diff --git a/sys-apps/systemd/files/00-hostnamed-network-user.conf b/sys-apps/systemd/files/00-hostnamed-network-user.conf
new file mode 100644
index 000000000000..6b224ba9b937
--- /dev/null
+++ b/sys-apps/systemd/files/00-hostnamed-network-user.conf
@@ -0,0 +1,6 @@
+[Service]
+# By running with these options instead of root, networkd is allowed to request
+# a hostname change via DBUS when policykit is not present
+User=systemd-network
+Group=systemd-hostname
+AmbientCapabilities=CAP_SYS_ADMIN
diff --git a/sys-apps/systemd/files/org.freedesktop.hostname1_no_polkit.conf b/sys-apps/systemd/files/org.freedesktop.hostname1_no_polkit.conf
new file mode 100644
index 000000000000..f4d0271cdb6a
--- /dev/null
+++ b/sys-apps/systemd/files/org.freedesktop.hostname1_no_polkit.conf
@@ -0,0 +1,11 @@
+<?xml version="1.0"?> <!--*-nxml-*-->
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+        "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+        <policy group="systemd-hostname">
+                <allow own="org.freedesktop.hostname1"/>
+                <allow send_destination="org.freedesktop.hostname1"/>
+                <allow receive_sender="org.freedesktop.hostname1"/>
+        </policy>
+</busconfig>
diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
index b35d6bfbd411..cd0754d004d6 100644
--- a/sys-apps/systemd/metadata.xml
+++ b/sys-apps/systemd/metadata.xml
@@ -20,6 +20,7 @@
 		<flag name="fido2">Enable FIDO2 support</flag>
 		<flag name="gcrypt">Enable sealing of journal files using gcrypt</flag>
 		<flag name="homed">Enable portable home directories</flag>
+		<flag name="hostnamed-fallback">Enable setting hostname with networkd/hostnamed without polkit (requires running <pkg>sys-apps/dbus-broker</pkg>)</flag>
 		<flag name="http">Enable embedded HTTP server in journald</flag>
 		<flag name="hwdb">Enable support for the hardware database</flag>
 		<flag name="importd">Enable import daemon</flag>
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 8348517478b6..485b6498181e 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -30,11 +30,12 @@ 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 fido2 +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
+IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed hostnamed-fallback http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
 
 REQUIRED_USE="
 	homed? ( cryptsetup pam )
 	importd? ( curl gcrypt lzma )
+	policykit? ( !hostnamed-fallback )
 	pwquality? ( homed )
 "
 RESTRICT="!test? ( test )"
@@ -117,6 +118,10 @@ RDEPEND="${COMMON_DEPEND}
 	>=acct-user/systemd-resolve-0-r1
 	>=acct-user/systemd-timesync-0-r1
 	>=sys-apps/baselayout-2.2
+	hostnamed-fallback? (
+		acct-group/systemd-hostname
+		sys-apps/dbus-broker
+	)
 	selinux? ( sec-policy/selinux-base-policy[systemd] )
 	sysv-utils? (
 		!sys-apps/openrc[sysv-utils(-)]
@@ -400,6 +405,16 @@ multilib_src_install_all() {
 		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
 	fi
 
+	# workaround for https://github.com/systemd/systemd/issues/13501
+	if use hostnamed-fallback; then
+		# this file requires dbus-broker
+		insinto /usr/share/dbus-1/system.d/
+		doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf"
+
+		insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/"
+		doins "${FILESDIR}/00-hostnamed-network-user.conf"
+	fi
+
 	gen_usr_ldscript -a systemd udev
 }
 
diff --git a/sys-apps/tomoyo-tools/Manifest b/sys-apps/tomoyo-tools/Manifest
index f133da5addd0..5a0a30566f89 100644
--- a/sys-apps/tomoyo-tools/Manifest
+++ b/sys-apps/tomoyo-tools/Manifest
@@ -1,4 +1,4 @@
 AUX tomoyo-tools-2.5.0_p20130214-warnings.patch 814 BLAKE2B 10a9966f726a47058388773500bc06bc6cebbdcf90eaaca5ecf8b2c1159618843645e55663892a5897c6741794b49cacf823a1fcee5e0e67e9a5c7e27ec3b892 SHA512 947caa5ce7f2c80e7e0b40042b09568c4fed731b530cf70c1fa24fa0f1a382dd41443f3db82a6aa6444c0ebcd25fd7de657c0f1990d69579e4645f3efa561e10
 DIST tomoyo-tools-2.5.0-20130214.tar.gz 210892 BLAKE2B fc9435c5b4c97a58d6e3b00cfa5b82e08732c0f6804a819e99872fbcf64e3e831f33766c23e0ab7d8767e0c806d8e2f7c18280ebedb198684c386e8c7c8bb637 SHA512 1ba6f6b3a3d4e644e6ee742beb64b09c6d527f130b1fe6d09a2e19760ced26f540ac8cc1e6f83fddacc3ef8844c3c23425191e4e0098c8b72b5ba3086adc9dc4
-EBUILD tomoyo-tools-2.5.0_p20130214-r1.ebuild 1421 BLAKE2B f35b37191eeaff92ab865a647f44e49167bd8121502064b2eff8817f3a29efaf8048b1ae46d47f878739593935f09f8e3cb8bc8d469e6e10c19bbdcdf4985f91 SHA512 cf0a6282f88b3a15689feb231555e417dcaa0e0e199ee91c4992f5ada4b12a9646562779bf20b5b5ca95e5d0b3f665c5d6d8d52fe7e475bce12cead9b75a3c12
+EBUILD tomoyo-tools-2.5.0_p20130214-r1.ebuild 1374 BLAKE2B ac08fe95a322b0108ab270b7338e51fdc9758e0fe37fc57436f2f5c83f771378563cadc40d916bd6ebcf104cc17f1f70569759b8d443a9007284b6b5a0d47e39 SHA512 a97f68573f73256eb10f5749832c1c8888a176669cde4cb8c1d9d7b06403df74ec5aa0cf8d4fb3831dc3e85e965af9728a52ee76ff0dad508f4f2087a14ba8e7
 MISC metadata.xml 296 BLAKE2B 73fba5aacaabc3b7fdd5815352cfff6ea1fd2a39f28b0ea29392148893dcfd681a38296a9ee146048d54879e2e84919001bfb62468dde8c7b5db651b4b44ae0a SHA512 f277a3cc3482960a897d170d9669e39e415e50c3ad20437e139ebb04626de0735d9cca513ed6f48ccda2eed810cfb7fc0a3cde829fd2ee1a2ba6573c9ab8c945
diff --git a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214-r1.ebuild b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214-r1.ebuild
index e8e373515d05..025594e4dd37 100644
--- a/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214-r1.ebuild
+++ b/sys-apps/tomoyo-tools/tomoyo-tools-2.5.0_p20130214-r1.ebuild
@@ -1,29 +1,31 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch multilib toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="${P/_p/-}"
 DESCRIPTION="TOMOYO Linux tools"
 HOMEPAGE="http://tomoyo.sourceforge.jp/"
 SRC_URI="mirror://sourceforge.jp/tomoyo/53357/${MY_P}.tar.gz"
+S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
-COMMON_DEPEND="sys-libs/ncurses:="
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig"
-RDEPEND="${COMMON_DEPEND}
+DEPEND="sys-libs/ncurses:="
+RDEPEND="${DEPEND}
 	!sys-apps/ccs-tools"
+BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/${PN}"
+PATCHES=(
+	"${FILESDIR}"/${P}-warnings.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-warnings.patch
+	default
 
 	# Fix libdir
 	sed -i \
@@ -35,8 +37,6 @@ src_prepare() {
 		-e 's|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses)|g' \
 		usr_sbin/Makefile || die
 
-	echo "CONFIG_PROTECT=\"/usr/$(get_libdir)/tomoyo/conf\"" > "${T}/50${PN}"
-
 	tc-export CC PKG_CONFIG
 }
 
@@ -45,10 +45,12 @@ src_install() {
 
 	emake INSTALLDIR="${D}" install
 
-	doenvd "${T}/50${PN}"
+	newenvd - 50${PN} <<- _EOF_
+		CONFIG_PROTECT=/usr/$(get_libdir)/tomoyo/conf
+	_EOF_
 
 	# Fix out-of-place readme and license
-	rm "${D}"/usr/$(get_libdir)/tomoyo/{COPYING.tomoyo,README.tomoyo} || die
+	rm "${ED}"/usr/$(get_libdir)/tomoyo/{COPYING.tomoyo,README.tomoyo} || die
 	dodoc README.tomoyo
 }
 
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 8114b28a9771..1d8ca552478f 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,5 +1,5 @@
 DIST xdg-desktop-portal-1.10.1.tar.xz 479660 BLAKE2B 88a2b8ea890036bf0d4192fae4ae143e350d903a528e09a0bd7ffc7bda2a58b5c04ae80f1cec4357bb05cba8db417b6193fc6ef7f7dd65bf414f80a8ac2800c5 SHA512 5db0bd866674ff016d864646ea7f91f09a1b8fbc5ec735e4c97165af71770d2c7d3333e771062644dd522b32f67ead72bc7ef99186e3b069671c174d4d601fdc
 DIST xdg-desktop-portal-1.8.1.tar.xz 473052 BLAKE2B a7d0aa2aa1e8220ced3e4abff8a8284c521b983ce807cd3e0d7b5d22f98f6428b6de9a193ae3aced9c13473617f453d13d0af83c677e3d077906b6cf8a138d45 SHA512 447d287d6627a1086d97dc5ebda20dfb1d0ca8643cbe54a7af5f6205a122a7be9d1643fded592f922c015561b7e2f4c6b6df555db3e0d3c02aad5bbe944077b6
-EBUILD xdg-desktop-portal-1.10.1.ebuild 990 BLAKE2B 2d032aa8872c861e0bc5f579462224c60dc4fb52f6947bbfaf8a1ca5df44d580850049bcf63b9011c4bf29d3ced84e25637a4d7c7cadd059f5553426b49b1c70 SHA512 0f56111736a8150bd7230574e37886b720965ef2397d2f3d2a08a57311e9456c46d397cd5140c09d86750def1dff270ff527d4f24b6212f76502b13755c2da5c
+EBUILD xdg-desktop-portal-1.10.1.ebuild 987 BLAKE2B ad57dd3a283dc008a022b61bdb0a23c8aa3476ca466a528387aa7ebffce602a75e9f1349f53e0f806d50e94a61eeb74774452bf0955cdf8b05ca3e40e438fd10 SHA512 6e9b80266a96c9b9f7752849395e0543bf083ccaa1490a94f73891530c9bfa03d25338a00b53f234c21ffecde74714690f9208d326d83e9aadf69f4458f972a7
 EBUILD xdg-desktop-portal-1.8.1.ebuild 987 BLAKE2B 6cb3b3a1ca0eb4216ec4bbd1a3661f166608e8ffd1284e24a17a73b8173fa0405c6ba113557fd86b1c3193966ab630a0c34bfdb97913bf658d065ff53bab31e8 SHA512 43d463812643df7b233739b88d17634f61397610986a128bb84909511ff2a441852f8fb5b51d1736c66ce94915fe30e0ff4e3135009ddce1be63640599f6cd5e
 MISC metadata.xml 361 BLAKE2B 29f050b1cf9380b76d4a779066ae0db5704da11ba9d97e1b2ed7c8d15003d534ecb83c4cd186e7f47e0e89b10e51299ee7bdd9acff9a02f9dc721647bca283da SHA512 872fc2c477635667b5593856f3fef346b96add82b754f9978c36c3c4e56a00516196faab14bac0adff40636c481ba436889b13549b2fc29412f3a21d1166fa25
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.10.1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.10.1.ebuild
index 8f4d537d111c..157153a24a49 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.10.1.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.10.1.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 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 ~riscv x86"
 IUSE="geolocation screencast"
 
 BDEPEND="
author	V3n3RiX <venerix@koprulu.sector>	2021-11-13 13:10:00 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2021-11-13 13:10:00 +0000
commit	e9d044d4b9b71200a96adfa280848858c0f468c9 (patch)
tree	1bd8ef816043a8cd340f1d774e79553a1a7d31d8 /sys-apps
parent	fc2f1018fc323ef2c6572734a9b130427cba76a6 (diff)