gentoo resync : 27.03.2021

15 files changed, 138 insertions, 161 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 76352c258941..46e16b9c68cd 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/aufs-headers/Manifest b/sys-fs/aufs-headers/Manifest
index 49cacd80f3b1..84f07af26df8 100644
--- a/sys-fs/aufs-headers/Manifest
+++ b/sys-fs/aufs-headers/Manifest
@@ -1,7 +1,3 @@
-DIST aufs-headers-4.14_p20180709.tar.xz 3352 BLAKE2B 31b1573de9305518ef7935d7166d720f055c4b70de48943910d9041f976f483759af1998e6aa1dccff89fad0ff391686c4e18c867e700fcd4bb1211cc0004cc6 SHA512 e2c4e90c555edc072ebcb348de50e5ec9ba6e2785758d10f14e43c8a03980dfadd58bc9cd37c811648bfabda37e6ed7d0bf36d7099edd26f40672b0ca0f2f226
 DIST aufs-headers-4.14_p20190603.tar.xz 3352 BLAKE2B 771597a8812030caaf39f5b1d087fd9e815c6d4b0deda8a8f64c05e9cf21ceefd9001a6491ab87db3a3fedb6d8d7f510db334ddb32a6f1b52230a7ea83242ad1 SHA512 4cee3900ff832bbd76fe68868c60fa29b9a5680ea7ef34fdc7f838c50be699616035929734badc89afa06dc429ec795cfbf16a5a76d6928cc8cdc4ec86491a58
-DIST aufs-headers-4.1_p20170130.tar.xz 3136 BLAKE2B cda05eed3429c84dae70a5c88600e4369d4997cca5d0b8f21c82dcb3449b0b88ac27b3e3216034272a6f2ff53aa455b3eb9dc23fc7cc77473aa53943340df9c7 SHA512 d8099a59784739b76eac74de7113754981b6d2d4155eaf42f9d36ea4b6c84f6f49cd96ce0b9e19b2507674cd9b91667fe8520f1cfb7ff0e1d5c58596e784c6d0
-EBUILD aufs-headers-4.14_p20180709.ebuild 616 BLAKE2B a8db7ed67120d808ce9a17e813c9aa1c3bc644746a7f1ca2d3f0b56add1e3e5e3479e75ce49dd0d735536fe7ea5292063abdb09c57c9805929b7de16f41bd43c SHA512 811e1645d18bbfb22ea70136441c121f79a8b491625538fb81e4c096be24bee3f4dd4f426a4eb361123f17e62226d6bcb725ab3bae08590c7e5b17e22433325b
 EBUILD aufs-headers-4.14_p20190603.ebuild 616 BLAKE2B 294a106b60390098f6181dfcb2059cef5c1a03e34a6d7b8eb275dc7cc01070af6b99f58597269229ca52802b7d22c72939afc0cda3c70c006236241b8ec077f1 SHA512 53331430b07ab14274cda2b42cb7ae2689c2060df19c5175c08ec932fa1c05dcec0596e0984fd380571b78cf07c021d6c050dbe78de2b1021c8268a4c0414aa2
-EBUILD aufs-headers-4.1_p20170130.ebuild 637 BLAKE2B 4b7e239c911ef0a8b0641d1f3643f9e7860d492e142245d014b6767b14f11bcc0f8ffb3f1bd98651d68cc73314ef5d268fcb84e86d45977dc4f36f70271c4f74 SHA512 fa44465b5d9c5c4964268289fbb0b378b64f0d340ba4037b34d702e97344f9ea5cdf600319ddd44af6c4f6ef8e598dd3744f8acb5c7ff222ed1a279b6212b3cb
 MISC metadata.xml 246 BLAKE2B 54e23dce6915d5dd3bcd3ef84d487319a22a98e6c6dfa2addfce08b994aabe988e81204bbf956fc403c7fa1d660488a1a140d48c382a01fe11b6c154757956c2 SHA512 e3170e1d40a96c800cc21a6f8a3d54f6896865eba97d04f2e3962f7627af5460312de37f9c7eee34f9f2428dc752d6fb32c83e27a958e2b3a046805d48c2698c
diff --git a/sys-fs/aufs-headers/aufs-headers-4.14_p20180709.ebuild b/sys-fs/aufs-headers/aufs-headers-4.14_p20180709.ebuild
deleted file mode 100644
index 1a3ae3719eb1..000000000000
--- a/sys-fs/aufs-headers/aufs-headers-4.14_p20180709.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="User space headers for aufs3"
-HOMEPAGE="http://aufs.sourceforge.net/"
-# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs4-linux.git
-# Check aufs release Branch
-# Create .config
-# make headers_install INSTALL_HDR_PATH=${T}
-# find ${T} -type f \( ! -name "*aufs*" \) -delete
-# find ${T} -type d -empty -delete
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
-	doheader -r include/*
-}
diff --git a/sys-fs/aufs-headers/aufs-headers-4.1_p20170130.ebuild b/sys-fs/aufs-headers/aufs-headers-4.1_p20170130.ebuild
deleted file mode 100644
index 9cdf2fc061a1..000000000000
--- a/sys-fs/aufs-headers/aufs-headers-4.1_p20170130.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="User space headers for aufs3"
-HOMEPAGE="http://aufs.sourceforge.net/"
-# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs3-linux.git
-# Check aufs release Branch
-# Create .config
-# make headers_install INSTALL_HDR_PATH=${T}
-# find ${T} -type f \( ! -name "*aufs*" \) -delete
-# find ${T} -type d -empty -delete
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}"
-
-src_install() {
-	doheader -r include/*
-}
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
index e3300248b2dd..0506a0eb06d5 100644
--- a/sys-fs/aufs-util/Manifest
+++ b/sys-fs/aufs-util/Manifest
@@ -1,7 +1,3 @@
-DIST aufs-util-4.14_p20180709.tar.xz 103724 BLAKE2B 50df13812b090e5d8aa9a07009822f9a324091471243a76c9432ea22698a6167273e661f5ebf176fb3cc419fbe560e82ff73d6e3b37ed0a85a01e6315b06c8ac SHA512 f6330dfc0ddc36102473d9931c62a7f9a5549a3ad2b78ababedf68d335ef02b155a90327dd0c7d446182530db755b9ff756533f90c540bf8aacca5eb117555df
 DIST aufs-util-4.14_p20190603.tar.xz 104096 BLAKE2B 901c7405866cc8db490248b86e45e57375ea5d8db11505c0c15fd49f5bd9e7ea5a6c3d272bd8f001ac3db11665a9c3607565c7eb5be8cd5f45acf4b5f994ceb9 SHA512 803ce51a77c3e4942d3b8817be638c5e2440821088eeb58742eb0395b9c83f68975ed64a0410b6155b18edf0af47ef9df916be07d912fdb2bd4e94987a037fa7
-DIST aufs-util-4.1_p20170130.tar.xz 100144 BLAKE2B d3032feeb787e3864247890c2b77468cb39ac1936cebc7e2044a2a58bd84817401b0cf7ab42413ca2c6307430552b49fb642d45e04c42f2729c0a5f1ccfb1589 SHA512 bf47829bdd93472a318e3eb1fd76332a95a42b3ec39b4d3392baac419ca70bd47b7b0c6209592ad70c284ee997a71e3448e79fa0ad6b4a6db16ffa0c47ed11ca
-EBUILD aufs-util-4.14_p20180709.ebuild 1078 BLAKE2B d1627bfcac4d66856cff0040f6dec53cdf48d3e5ba8ff6b90b5722ed86b349d83f5200927c3e28bee34427e2b09462d7df076d6adbda8a2e947941d321fb6426 SHA512 d3e970e5b98fec4ccb5750614c25a5ccc27696fd00e2167d6ed1871de0c968c97649cc8c0b02597196e60637efd9a083aed30851f29064397b399274bf01ccb8
 EBUILD aufs-util-4.14_p20190603.ebuild 1078 BLAKE2B d1627bfcac4d66856cff0040f6dec53cdf48d3e5ba8ff6b90b5722ed86b349d83f5200927c3e28bee34427e2b09462d7df076d6adbda8a2e947941d321fb6426 SHA512 d3e970e5b98fec4ccb5750614c25a5ccc27696fd00e2167d6ed1871de0c968c97649cc8c0b02597196e60637efd9a083aed30851f29064397b399274bf01ccb8
-EBUILD aufs-util-4.1_p20170130.ebuild 1020 BLAKE2B e111c9619c4045c0c01d594429cbc0ba048607b0ad1724890c0e3576cf51dbf183837e9fe8f80b2e1388353a5a3d3d108e0e43cacddf9be457e7cbf92e9fc34c SHA512 e568606dcd2d50839433cb5acaa1e41be730f7feadec891541fc1ab7b8fd6a1d59a5b00fe6140a2b8d5604a55bdd8054a98de907109ff1f5992e7e785fff6f33
 MISC metadata.xml 246 BLAKE2B 54e23dce6915d5dd3bcd3ef84d487319a22a98e6c6dfa2addfce08b994aabe988e81204bbf956fc403c7fa1d660488a1a140d48c382a01fe11b6c154757956c2 SHA512 e3170e1d40a96c800cc21a6f8a3d54f6896865eba97d04f2e3962f7627af5460312de37f9c7eee34f9f2428dc752d6fb32c83e27a958e2b3a046805d48c2698c
diff --git a/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild b/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild
deleted file mode 100644
index 98b1a6c96eae..000000000000
--- a/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils flag-o-matic linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs4.14 -o ${P}.tar
-# xz -ve9 *.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!<sys-fs/aufs3-3_p20130318"
-DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
-
-src_prepare() {
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e '/LDLIBS/s:-lrt::g' \
-		-e '/LDLIBS/s:$: -lrt:g' \
-		-i fhsm/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-	export STRIP=true
-	default
-}
diff --git a/sys-fs/aufs-util/aufs-util-4.1_p20170130.ebuild b/sys-fs/aufs-util/aufs-util-4.1_p20170130.ebuild
deleted file mode 100644
index a709e0871aa6..000000000000
--- a/sys-fs/aufs-util/aufs-util-4.1_p20170130.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic linux-info multilib toolchain-funcs
-
-DESCRIPTION="Utilities are always necessary for aufs"
-HOMEPAGE="http://aufs.sourceforge.net/"
-SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
-# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs4.0 -o ${P}.tar
-# xz -ve9 *.tar
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	!sys-fs/aufs2
-	!<sys-fs/aufs3-3_p20130318"
-DEPEND="${RDEPEND}
-	~sys-fs/aufs-headers-${PV}"
-
-src_prepare() {
-	sed \
-		-e "/LDFLAGS += -static -s/d" \
-		-e "/CFLAGS/s:-O::g" \
-		-i Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e "s:m 644 -s:m 644:g" \
-		-e "s:/usr/lib:/usr/$(get_libdir):g" \
-		-i libau/Makefile || die
-
-	sed \
-		-e '/LDFLAGS/s: -s::g' \
-		-e '/LDLIBS/s:-lrt::g' \
-		-e '/LDLIBS/s:$: -lrt:g' \
-		-i fhsm/Makefile || die
-
-	tc-export CC AR
-	export HOSTCC=$(tc-getCC)
-	default
-}
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index f61860ba360b..f615a42ebdb8 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,7 +1,9 @@
 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
+DIST btrfs-progs-v5.11.1.tar.xz 2213548 BLAKE2B f428e8ffb62f60e6772102f4623b9965edc5d18fa60aa8cb60fd92b4867ee29e3067a6b9d0935c738acce5f0abfc4b88c900121ee233aa881857ed4690e38e3b SHA512 f93a54bd2256851a74fc8e52b26f697bd7bf788cb2481512c92ebf1b9a2f2968b62d680f9f000d6162bd6f22b5d632b2149a88adad8c489e1332f810b439da90
 DIST btrfs-progs-v5.11.tar.xz 2212292 BLAKE2B e19933e1c0d3f80db931554c1cb4b1d25c5b2f2c5ea0ec19623696b24d696247536d615d569cc28c9a84b1484e38141945465251272b2d1df2cadde5af4dee88 SHA512 20b10ba0f6978d0cb202f055edf41abeb36b629fd6d5cc7cb9ebc82ef79d2bef31ff7c9681770c7ea7b126cfb4cafd6d610476fd5cc7506189f74dc214445cf0
 DIST btrfs-progs-v5.4.1.tar.xz 2107476 BLAKE2B 1ea58f49b0f8185e944010804e544643a2eafeea58fecb480b13095c362350c218f0602fbb43a96705a81befe88ec3e3abe35cc90d4732006479b059aa7fed32 SHA512 56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f
 EBUILD btrfs-progs-5.10.1.ebuild 3064 BLAKE2B d0bbb45eab6acfe22503d7537d29d40d3182208c57617baa476e993fb105c0057db34132f03391eed7683da07ffe9a059885778553522a434b21717ba50ad822 SHA512 8b24f2934aee146ccd6e9ac06f5a0b12b90263121e2e6a976ac02774bca0c9f4c3d0f2a7d14e79c026c87c6ed6576ec3c07375607d55ccbb2879edc5b5a84d17
+EBUILD btrfs-progs-5.11.1.ebuild 3070 BLAKE2B 56289d7f3b80ee4370957694f696b9b3862b7e050d02a1dcda2564eabb68abf20b841fa8259475ffdbe39a1f092a268a79579bcf5526d3dc2a3d35eb7222e41b SHA512 1fe2eaed192f6a96f9eb3adbe41c58e58b282ac120e3ba44a792004ef6d26d5bea05e7c091417461d8d032373f87ecff4bf1a871000e1bc16251b859723d4ced
 EBUILD btrfs-progs-5.11.ebuild 3070 BLAKE2B 56289d7f3b80ee4370957694f696b9b3862b7e050d02a1dcda2564eabb68abf20b841fa8259475ffdbe39a1f092a268a79579bcf5526d3dc2a3d35eb7222e41b SHA512 1fe2eaed192f6a96f9eb3adbe41c58e58b282ac120e3ba44a792004ef6d26d5bea05e7c091417461d8d032373f87ecff4bf1a871000e1bc16251b859723d4ced
 EBUILD btrfs-progs-5.4.1.ebuild 3056 BLAKE2B a2d362c80bb40672688d25a283240be4a3830266bbd5ca2ccdd2fffcca6ff1b3ccfae511550863f509d0d8d5f3e281dff913ea10061838a1a5a565ada30a961c SHA512 468ae334e9dc072583f237bf0108be6dd68d194cdfd57cbcc59ead705ab8796763a399a90ebdcb620b8aaa2a074fb3acb402917dfb68203cc0169ce4941089b1
 EBUILD btrfs-progs-9999.ebuild 3070 BLAKE2B 56289d7f3b80ee4370957694f696b9b3862b7e050d02a1dcda2564eabb68abf20b841fa8259475ffdbe39a1f092a268a79579bcf5526d3dc2a3d35eb7222e41b SHA512 1fe2eaed192f6a96f9eb3adbe41c58e58b282ac120e3ba44a792004ef6d26d5bea05e7c091417461d8d032373f87ecff4bf1a871000e1bc16251b859723d4ced
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.11.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.11.1.ebuild
new file mode 100644
index 000000000000..e7da9aa59cf0
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.11.1.ebuild
@@ -0,0 +1,129 @@
+# Copyright 2008-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit bash-completion-r1 python-single-r1
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV="v${PV/_/-}"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+else
+	WANT_LIBTOOL=none
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert doc python reiserfs static static-libs +zstd"
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-apps/util-linux:0=[static-libs(+)?]
+	sys-libs/zlib:0=
+	convert? (
+		sys-fs/e2fsprogs:0=
+		sys-libs/e2fsprogs-libs:0=
+		reiserfs? (
+			>=sys-fs/reiserfsprogs-3.6.27
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	zstd? ( app-arch/zstd:0= )
+"
+DEPEND="${RDEPEND}
+	convert? ( sys-apps/acl )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+		')
+	)
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs:0[static-libs(+)]
+			sys-libs/e2fsprogs-libs:0[static-libs(+)]
+			reiserfs? (
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+			)
+		)
+		zstd? ( app-arch/zstd:0[static-libs(+)] )
+	)
+"
+BDEPEND="
+	doc? (
+		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
+		app-text/docbook-xml-dtd:4.5
+		app-text/xmlto
+	)
+"
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" sys-devel/gnuconfig"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		AT_M4DIR=m4 eautoreconf
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		$(use_enable convert)
+		$(use_enable doc documentation)
+		$(use_enable elibc_glibc backtrace)
+		$(use_enable python)
+		$(use_enable static-libs static)
+		$(use_enable zstd)
+		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_install() {
+	local makeargs=(
+		$(usex python install_python '')
+		$(usex static install-static '')
+	)
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+	newbashcomp btrfs-completion btrfs
+	use python && python_optimize
+
+	# install prebuilt subset of manuals
+	use doc || doman Documentation/*.[58]
+}
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index b1854255c9a7..076310a713d2 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -8,7 +8,7 @@ DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fed
 DIST e2fsprogs-1.45.7.tar.xz 5570052 BLAKE2B 237ef068c3899641b5eb908cc302c8c6b454e337bce2de95fc96b9a078a003db0c44bd34391063cc2f30a95dcce57950fe900f59ae7d273786c657b7c190b341 SHA512 fcbd66af7b87f2bdec562ddd59c8c5fbd60f32fdd582a5c9d21cb6cfea642d2cdca57b6c29124309798528b2d9ceadf770928a6698f75dc88a47701286128763
 DIST e2fsprogs-1.46.1.tar.xz 7019700 BLAKE2B 2356fcd206de14377a4625a8be2ff94cfd3fb2b911836a3da46499964fc5d7f2a6d03bf5818543d2ead34ac7cab36ef0e18885343d6814a0124b50ab7ea4bb69 SHA512 fe6aa55b62f183633872209cd69cf6be0753d5a430542a7c73dbbd428e5fa93b5df7efa7507bb60f9f90a1c61cb8f5cf10665675eea8bd72aad3d04dd2dae15c
 DIST e2fsprogs-1.46.2.tar.xz 7020552 BLAKE2B 0eda7428862c13dfd02308f0321d22c134679197bad5b247baa6f0ca386433db6749b97529709d43934afa73d8d0801379bb342456a0fd3dab7df01f5a90fd31 SHA512 5297a4d7bf944806d8ee77227eac596b5e5efed2c665561d40094c40b9f321616c60975a2716f1499a9f72243df6e3b6e2267b98ec1fdc1dfd646d7be887fc4d
-EBUILD e2fsprogs-1.45.6.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
+EBUILD e2fsprogs-1.45.6.ebuild 3976 BLAKE2B ff4ae16ea6146eec58ee8a0b1bcca21d245cbec976a3905b84a1b65804bef437f4f2b3062e08d63caea4ed762fe2f5e3a5d1a7edc42f376f4dd0c30cb01bd659 SHA512 b2f855eee3141b9ab0a7228abdd89c201443d3a8de0af83593c09eecf66e20974912d483190800fcdfcfef4771d446a423c45fa043f0a7b0e72c471053dec373
 EBUILD e2fsprogs-1.45.7.ebuild 3977 BLAKE2B aa340ee1dfe6fa745c5e69e48098e3d0bbde09ac6da4c28fa6a853193414e5236a0eb2f50fbe3b9951afaad1b903247eccc85becf793acbda1d30c262f373a78 SHA512 bdc90d96f2200c1e2217cab8c7e2775d377fae6eee2524b5dd1dac0196d0ab5b1f4adf1d0dc84ea2bb55a67ca45e09ed348db0f5482c79acf69fb22ea3f7df04
 EBUILD e2fsprogs-1.46.1.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136
 EBUILD e2fsprogs-1.46.2.ebuild 4019 BLAKE2B ea12fa2e331be15f3f7c003575ab6369025c28b49a421174ac9559b671c347df954c505c74a4e41b67d18798cf4b4ee8da6595deec11a3e1420990a279fb6454 SHA512 99c1ca7e4780e2716ccddfc03415d31f1f292347d127874335a6219a4afc56bf3c7b2fb8e850d9b6a9bc375536164c8e28dc743c3bdc9afe930ee335f7802136
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
index 9325951632f0..a66e5f0def32 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/$
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-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"
 IUSE="cron fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 1dc2dffa0f21..50b5aaf2c4bf 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -5,7 +5,7 @@ DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d1810
 DIST eudev-3.2.7.tar.gz 1892931 BLAKE2B 9ae903d624e8fb1b334735527329e6074a194dd6e22073c54acc58010d0f8f2d29bdc42d3e6d72dd388c1012be273ca27626ffe1173382d7dde9ad3aee942cd0 SHA512 e6c8ec86ae434c967f6a568fa0b281229bb87be7e3fec025dc3e0225de7843ffaa5dd65bdeffefbc91e9e2911aa3de9df84c76148fe8863ff60fba4c88653c40
 DIST eudev-3.2.8.tar.gz 1894193 BLAKE2B 8709a13031744d5dd2f57853375b920bdaa6ea028624111dc96be9d46748de8423ac749f27183c668336701c16735d7ca2db4566621e0e741a2604785c14c64f SHA512 13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42
 DIST eudev-3.2.9.tar.gz 1959836 BLAKE2B 8792ded8a7d1dfbc16fae249283b58251656961cf360d72932c3fc6ea3e752f6334c21e9ebd9ee3ad0da03a590f8405b3bb7413eec3f964984225f7813311ef6 SHA512 09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f
-EBUILD eudev-3.2.10.ebuild 6979 BLAKE2B e23d90cd49b2029bc53c434a05d6c9cb40b7a62b1a66e45b123ac09862bf4ced60f6ec7686c07c5e5a5f0594d94845506e78aad5377ffe439a15f118ebcebf8b SHA512 c159306e61f1e8d4fe43ef0a655041260c48ef5c145c45fe23606f9f7587c841379adc6a306be2b77d1fd911fdc7ab25c1adc57a463f911b8aae78b94f7a91e5
+EBUILD eudev-3.2.10.ebuild 6978 BLAKE2B 5c4c3d2dc903b4c4fa22882f85bd7498705a2537093c67c8556d44981ea8991e91a9d8b27f9827aec3f423c5facdb4cc540100ecb0600bd56da0a11f48be3389 SHA512 14727ec2332d4ae5630b13e4a07573992b2e5f831341d5a391a2a556f9ecf066d55e7715d20adfb5647b6d303b48cfb930500d41387ce688b2c9517d6730f168
 EBUILD eudev-3.2.5.ebuild 6812 BLAKE2B 0fdbb319de304026fb2c3f036f759cb47abdf33585062ecb3ea2491b68182b7fc29af8a50761ecf5642d5c4e5c587951db4e8e8bc6cd8cc807c4ab44fde24290 SHA512 6444a8d845287d76f8c20add841d1e2cca7ce398647c694b34d4388c9a29ee03e1c640e2ec7cdb9fb8265a5c812dce04d4536684f7ae67f04e3e39778f8d3bee
 EBUILD eudev-3.2.7-r2.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
 EBUILD eudev-3.2.8.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
diff --git a/sys-fs/eudev/eudev-3.2.10.ebuild b/sys-fs/eudev/eudev-3.2.10.ebuild
index 3296733f6bf4..f7ba93d53eef 100644
--- a/sys-fs/eudev/eudev-3.2.10.ebuild
+++ b/sys-fs/eudev/eudev-3.2.10.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${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
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index ee3bee319974..a58ad3b0a9bd 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -1,8 +1,8 @@
 AUX reiser4progs-1.0.7-readline-6.3.patch 472 BLAKE2B 88f0489b88691e72a8813145428e949b0ace21b15dc01f18da4292524e3601adfbe30e3b6cb3d1f12174bc5241fa7732bf36856025c7af5c678f3ca53d24497e SHA512 0162505148699f8e5270314be586d8db7d42f9ea5fc8517b5475aa59f54b47eb626349c36820cc34c0490e0c3df1597a230c27abf316226cc7d261e986963788
 DIST reiser4progs-1.2.1.tar.gz 980203 BLAKE2B 8c9cb77458c083c50f34c17bddf4747b755b52b911a63835152ad584494c2738a5317c28e5b3f1e6bfdc49416f3715ca4fbbd9c8a428b5b484b54f8f4a861a58 SHA512 2caac5a98d672d68910c6df3e694a42365fa6273ae367c26126778c1fbe956aa502dac236d36c3302a5bf109468ad3447e645a6eab89c83f122dd1afe2aeda21
-DIST reiser4progs-2.0.3.tar.gz 995921 BLAKE2B fa38c8998603ca0c26a17c75240d07afec6c46da1b437e5a733ce3a5a865329591d4343b52d7fd5dc56bb6afe34f4f7685e7dc258ed075dfe4a70a7ad420324a SHA512 59bcd6d73a220fd0e71cc4213489801f45597ebfcf0be55f150e929ef391e0a461a94ab99ee9698e1fb1eb58840497277ece6a2ea57e88d54573347a8854da87
 DIST reiser4progs-2.0.4.tar.gz 997361 BLAKE2B 3d083c2c702f6c469403447bd2bb59257c22a6f87e062b83227c97147c37e69f93f1ffb6a1ea2c9f23f94a5ac8fcb834da475893c9bd268fc8902e6af2af4c10 SHA512 222eaa69f89fa1cfad2b5791af028560fb6e57e44fbb5e025122c25b50dd4aea28a8fd362818a884fa6b3d6164e5b0c78ab63f0649e2e65780f1aee2c0d26375
+DIST reiser4progs-2.0.5.tar.gz 997516 BLAKE2B 38799bd2161ac3ad631b3f11f4f01f647fa8210786fa4aeb290a84dac95080cdf979be1cb4526abf08567e88f25aad54a3d776be85900e702a7325e674ddd0e1 SHA512 1e1f263828bd5f44837bcbdde072a94b2cc5a099dbf52d3e0f7f6851812fb2e8b77a3edcf5448f678304e23240c63919547a9671d36b816f97f989b17b494d27
 EBUILD reiser4progs-1.2.1.ebuild 1295 BLAKE2B 8ef4781ad4a121a92f6c732ba92eb8d6adb51f918eb975eb7cb97969135d1380e41bb1b010788ebd970805d29d8ca7267387ed3da75943922ac0fad729066ef1 SHA512 81f2db7655fe926394e628cacc97ef1d1749a4387393a7c04575cff245268f42b8e9fa58c974a5a8647b9d34f9e73b4f9b596dc70bf512f53b90fd3022af9fdd
-EBUILD reiser4progs-2.0.3.ebuild 1348 BLAKE2B 309eb37179f526c8eb55d848c5da2de5288ea3df88dcdb09e3155151eb6b0e2a1efd5190886b58a910c912b4e992a08b035264dccc12ca0ef5692a7d9928e77b SHA512 1a9f042cdb874e0a207774d62a7b804ae8980d7b09920cb05b6ed1439583d8aff4164e51b511b2cbbb172df6f9800435aa9a65570ca8348d617d1793e0af3246
 EBUILD reiser4progs-2.0.4.ebuild 1348 BLAKE2B 309eb37179f526c8eb55d848c5da2de5288ea3df88dcdb09e3155151eb6b0e2a1efd5190886b58a910c912b4e992a08b035264dccc12ca0ef5692a7d9928e77b SHA512 1a9f042cdb874e0a207774d62a7b804ae8980d7b09920cb05b6ed1439583d8aff4164e51b511b2cbbb172df6f9800435aa9a65570ca8348d617d1793e0af3246
+EBUILD reiser4progs-2.0.5.ebuild 1348 BLAKE2B 0cc2709ae7e786fc83c57d3b48fe6afa644851068318b6d569be48fa98a4f14e5ca98662c7eb213dbb6be9d806096a27ba76a550d9d30caa21595eeea0e47885 SHA512 463266de436ad30c3eca89b4b109be2b8f3f1fdf8508a47e4442c8ed38381ab4ba2c510dbced86792038818b7b7a722747ff89b72d1c9acc0311e20dfc8508c9
 MISC metadata.xml 327 BLAKE2B dcc63f48d652f59288d08c38c2f0e430bc15f4224e2b5cf8b690e4e2cb1bcbd7ff97151d2e13f7482f21c1e9a92f45b867beef2aded7bb090f9011532c401e93 SHA512 f578c1f4305a1e24c06dfc53231a053cffde7ddebdbd7f61dd0fd58b650dadc8bc1cefa48213ca9734e081d30436bb7e5a093682eccc1a4a1a9e5bf707d61846
diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.3.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.5.ebuild
index 45ddbfaabf1c..2381c45ae855 100644
--- a/sys-fs/reiser4progs/reiser4progs-2.0.3.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-2.0.5.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