gentoo resync : 17.07.2021

24 files changed, 131 insertions, 157 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 33e4da92cfc5..7eca20e48d0d 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 3008b3a8dea3..80e76341e978 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,10 +1,8 @@
 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.12.1.tar.xz 2220424 BLAKE2B 1e6120609feb37dd2ced04b27d8cba9a28c3b962add6f037927dcb05bdcd46a229f981f7f68231ee58e7e36a65fae4e6041e92c0db11dba56fe63b09bca30cc7 SHA512 a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5
-DIST btrfs-progs-v5.12.tar.xz 2220396 BLAKE2B be3eaadca7386ab1348c4bef6cf10270a42ac34c8e7e1cb54b9db600fde6a5958cff9453e6c287fba23f928116eeccca5d90f78f9c042b972a3ac66a31566e3b SHA512 af9ab8bf232e0c62cc093d848b95991924cc3a84020fb9c85765a63a1cc132403e784bf18f81b71b2af9daa0038a7b11e578ee7b50d90481a888f7a967a5b197
+DIST btrfs-progs-v5.13.tar.xz 2234256 BLAKE2B dd6dc6977c2a21471b59573c3ae6f7853d5ec4434549873174a6bde6b3ed4c5ed03c5adaed896538cb74699f538ec13403c193f132fcc8a2ba1b4f6bbdbac67e SHA512 7832ca02b77410edd8d80f10c6f1482dee944073518dbacd5773e70f27b7c632231ea66bdb64aa4611869465c15d2d60d364bfd25c2e40e0a2c198edbf9741cd
 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.12.1.ebuild 3103 BLAKE2B cfe3377527fb701da2cf02fc6857a828cffa42f3b672854e12dfd355a5c3e52708df6bc74f00abdbe0548220220508a090039ea9107cdaa0dcf14e80eb2d00ee SHA512 feffef7dd3b8be3da822a2fa5d5bcd6465607b6fab93df44630cf3d1b386e80669d88537b433cd6cfdf21ff98a3011393106607b213f89c55b99f7b1570307cf
-EBUILD btrfs-progs-5.12.ebuild 3103 BLAKE2B cfe3377527fb701da2cf02fc6857a828cffa42f3b672854e12dfd355a5c3e52708df6bc74f00abdbe0548220220508a090039ea9107cdaa0dcf14e80eb2d00ee SHA512 feffef7dd3b8be3da822a2fa5d5bcd6465607b6fab93df44630cf3d1b386e80669d88537b433cd6cfdf21ff98a3011393106607b213f89c55b99f7b1570307cf
+EBUILD btrfs-progs-5.13.ebuild 3103 BLAKE2B cfe3377527fb701da2cf02fc6857a828cffa42f3b672854e12dfd355a5c3e52708df6bc74f00abdbe0548220220508a090039ea9107cdaa0dcf14e80eb2d00ee SHA512 feffef7dd3b8be3da822a2fa5d5bcd6465607b6fab93df44630cf3d1b386e80669d88537b433cd6cfdf21ff98a3011393106607b213f89c55b99f7b1570307cf
 EBUILD btrfs-progs-9999.ebuild 3103 BLAKE2B cfe3377527fb701da2cf02fc6857a828cffa42f3b672854e12dfd355a5c3e52708df6bc74f00abdbe0548220220508a090039ea9107cdaa0dcf14e80eb2d00ee SHA512 feffef7dd3b8be3da822a2fa5d5bcd6465607b6fab93df44630cf3d1b386e80669d88537b433cd6cfdf21ff98a3011393106607b213f89c55b99f7b1570307cf
 MISC metadata.xml 523 BLAKE2B 7757fa4d4f1400bf08e2975e5214a1dd0c8258b61366c98089ca9c497b8c62e497cdedad605370f7034519b91c266b23e2e42bcafef3bb2bb69cb6b93319fa00 SHA512 3830f8f555ade672eeb52394a5b262e06e69b8b27d947d81dcde9b341fea9f16b77df8101ee5cd3314b6552543431a5f32a2592bf77a7a50e28cc56c95a4b164
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.11.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.11.1.ebuild
deleted file mode 100644
index e7da9aa59cf0..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.11.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# 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/btrfs-progs/btrfs-progs-5.12.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.13.ebuild
index 90b1aa08f672..90b1aa08f672 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.12.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.13.ebuild
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 45c4bb714cc5..54fdb74719ba 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -5,6 +5,6 @@ DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e9494
 DIST cryptsetup-2.3.6.tar.xz 11154148 BLAKE2B 23a7d6fdeed2b8fb0492e800266a263b12dcf2b8c4304bda82e46d2de90b6c05a97a40f0f6f9c337b3dc428d51689d76953de5cc4daed210967cf0ea0ff503d2 SHA512 5b25cc806140d24181a0e4f0e7b0bd3caa8263aa502e8633b41c980f06ecba2e6acbf9c2d9cc4a785d38ce90d86dd8d22c52b28b9ca4a15824c2e8bdb3656665
 DIST cryptsetup-2.4.0-rc0.tar.xz 11145080 BLAKE2B e6425a54d14d93b712df42e7b9460e23afb8bcb74bbe164522a2399a26d3eb668bfcc6387e5934056cdf46fcf0c136601dc1617dcb96ded6d4251a8335442e27 SHA512 ed80cc7a1763cf0e788bd72eee979640d6133b98a7b294a3fa09c608273eef172c2d56d80802433143d01063a0c142e68ea06465392b273fc2615b8f90273b25
 EBUILD cryptsetup-2.3.4-r1.ebuild 3853 BLAKE2B d66f995f69cac742d0d1e6c22bccda546c49c74fc495fd43dad6469cb948214923f85119eae86f8d87989a6f689d20113048427d6238f2ee75910274a1fe3512 SHA512 ad6cd0dc0f2ca709ee380046c2d5b5b23f198fd2fff59197f052138b765752ee018b24e76de3ad929ca15fae14d736b25b643f7055f682cc02b61de4083976b6
-EBUILD cryptsetup-2.3.6.ebuild 3854 BLAKE2B 1bac5b091ad3fade727d2c5dafb797c4ca8f4f7a435cb43e13ca7b81e76ee7196f2385c596bf3fdebb08cc5159c48b6c26b2beae8c9789a6434c6ef73fec9216 SHA512 4671b8d6d72f45940ff305ee2b48f708d66de9e14fc24a4bf785646a98ead9012ad876aa79a8313226152b7e7be46120df7348c554051cb06652383323cd0063
+EBUILD cryptsetup-2.3.6.ebuild 3853 BLAKE2B d66f995f69cac742d0d1e6c22bccda546c49c74fc495fd43dad6469cb948214923f85119eae86f8d87989a6f689d20113048427d6238f2ee75910274a1fe3512 SHA512 ad6cd0dc0f2ca709ee380046c2d5b5b23f198fd2fff59197f052138b765752ee018b24e76de3ad929ca15fae14d736b25b643f7055f682cc02b61de4083976b6
 EBUILD cryptsetup-2.4.0_rc0.ebuild 4063 BLAKE2B 0bb3d1c586db729de6c1d2a48ed8ddf3e0cb41dda4185797b48dfab31bb61633df662b1a200f83285a48b1ed2c6bc8139066f2556e3742851639f3d5b8767c4d SHA512 50f77d38592217e2f72dd866c54115e52a2dbcea0c8a1feeb68cb11280ecc590f03eb1ea6112cf9d3b9ff730a365bc757b235a5a1f30dfbf9d0b83039f44a527
 MISC metadata.xml 1075 BLAKE2B cd8afdb9fb1117d48e88b4aa6dd7ec9b6e072fe12d8880de6dd4dfe2fe018bf25910da08056274f43ee6b93e672041b25f214694b2f6e46bc75c8fb63318b1b3 SHA512 6539b510c89c1e335897c7c32550f86fdc0bd7958977fc9d4188e664a21db84c8b333938a4e03e147f023d1404ac6291999a4bd943a131bbc1bc26d907877e25
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
index 9d0266bbbdae..e96df12d24be 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/genfstab/Manifest b/sys-fs/genfstab/Manifest
index efb68caef8d6..7078d8e1489b 100644
--- a/sys-fs/genfstab/Manifest
+++ b/sys-fs/genfstab/Manifest
@@ -1,3 +1,3 @@
 DIST genfstab-24.tar.gz 14281 BLAKE2B 93987794ba12e08daefd20ef596e915a70a11a9e641470b6f93873b738b4c4bb22f808513c63e7675cade43b992f308d26f3a2db0b211e99518a3d3702d6b897 SHA512 8c4d40e98b7a35abcd5fb2bf496722aa65819e4124a37385090fa70b55118ea3590ecb4e16f117bf93118a36bf402c4616ba0cb1837869b11db54a827332c661
-EBUILD genfstab-24.ebuild 465 BLAKE2B f0a595b1f929dd1033c7266f889c9262a4577e3bad9282321042390d4f8ce7a610df80b54903ca1586e2a9a9f1e707a75af72cf0f898ead342e4dbeec757f661 SHA512 9a42728709900e0e8c691e527e267798d58544e337bada26a037db136d8cf09923a2b71e9e06c2cd2d9816c0bf7dc7df4f14b9b1ac6719f3bf6d1c405efba562
+EBUILD genfstab-24.ebuild 464 BLAKE2B 8157fc8b781e77cab58918e6fc4b5092c14e432809f57a35f2630a1d8312231f536f3bb1592af71688da9363cb5c13b0a02deb61f24fb4f85adedbd87834de13 SHA512 f722595cddfec818b06ded7f353d63d64f2233574b2626b0a3f9d1cf64395294f4ab04e9075b178fa5d6228db362f11438035990cc3f5a352021aec916dc3f3a
 MISC metadata.xml 468 BLAKE2B b299a989190e27686497f3aad1f8b3ee071ab3bc488e4d3669f945057c604dd3aaf1679f4c51e44fc5739557325ce22f5bf2df4a0c75e1775d9d5c11969141e4 SHA512 935bab43b088e8bd1fcf4995616dabcea498f8e8e8483dc6f3bcd67e7114400b91eed55a05d47e907efac8c81c0e13560effae85bcac19d01f24b01f3b97b11d
diff --git a/sys-fs/genfstab/genfstab-24.ebuild b/sys-fs/genfstab/genfstab-24.ebuild
index d26d48dc6e40..b0dcb0a50058 100644
--- a/sys-fs/genfstab/genfstab-24.ebuild
+++ b/sys-fs/genfstab/genfstab-24.ebuild
@@ -10,6 +10,6 @@ S="${WORKDIR}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 arm64 x86"
 
 BDEPEND="app-text/asciidoc"
diff --git a/sys-fs/lufis/Manifest b/sys-fs/lufis/Manifest
index 4e69e5b409e0..b2b3c1c123ce 100644
--- a/sys-fs/lufis/Manifest
+++ b/sys-fs/lufis/Manifest
@@ -1,5 +1,5 @@
 AUX lufis-allow-uid-and-gid-addon.patch 1090 BLAKE2B 49bd9cbec1b101174b0aab1a11723104a858ff68652f960e14ab1b05e24a70fac014e8fbf6bf8c611671783579bafa93a4cd983c2fc43b34556de0af9466d534 SHA512 7e5680560b624e033530dea158684d92c134bd8b73ab0d9030eb2c73416785c546915aeb8e13dd815730dca65925659394b86c0a8ad1b94acac04e8e787762e4
 DIST lufis-0.3.tar.gz 18158 BLAKE2B cad5154f244232262ae3fef7f792bea58b18019e29df8c0763cf39a6d61bd84abc030bcb3e20eb47a557a8edcde8f7ff1ea6c9873da885bea5184845f15e54bd SHA512 86f0c77e748ab7ba3f92ed9563011e8262b435a8878bf3629c8fa4a8e1bec058249a288e2aafd395f524748b419a599c6533900348b4e23239f47930a874e14e
-EBUILD lufis-0.3-r1.ebuild 635 BLAKE2B c18d3a14093862628908d35c605f66754ac2ce1d51a70ada29abf3bdc09bb254f511c28e5cb3939c1286d6baf75f08859634abee3c588c5584642f22bf864c03 SHA512 096b4132956092042f269eeb833e4d6d907d78e1fd29755f78581ca0b9c340dc491a1bb038449fff54cd3eaf4bf3d6306b40344b09e1328f911193c530438003
+EBUILD lufis-0.3-r1.ebuild 634 BLAKE2B dca854b4bcb65c5b9ab3dc90fa49db8ff2f8630c160b9a8c266e4bdbf41a86d6300d8c1202bbd455e7348d79617192d084355b280ef328a381dfc06d3c47b33d SHA512 15a26248b7c630a0ab311a18d785d0d4d21294bfcb2e203035d1f062bdce618a80cf5a51cd236ab594b3a1bbfcb7791ff8a946d4d2793ff4543c77ae8b4c26fc
 EBUILD lufis-0.3.ebuild 622 BLAKE2B c06f03c41e5f1b10b023c6ee6eb2a0db6ab8f378c3d4c4e5c8555209428d0678d0a1ddae79b501d04972f74e7e1a7fc4ff94a8360f978b3daad3adbbd93bf6c2 SHA512 b951e7334dffb752df47920e1482dbd57590ad02df59f9e9278395f33f8e20c82edd22330b5251d68f013c60719289321ad6e5aa17707067dda813db2dcd032a
 MISC metadata.xml 246 BLAKE2B fd5580dee18582c2dcb849e4f5f46b7f430a240ddf6b50d7ecd3b096a72f55cf7e16206474766dd4688fb3d43c31fc85523a897f15e613e8ed013f91950241dc SHA512 41ea0697fbdeac910a35652ecb4de0a35d7a531956c7c0ace6364c9cef6e1348ecd427a1c5b9301b779d2f189ffbdcd04c7c9f59fb429ef73b75af9d140a92af
diff --git a/sys-fs/lufis/lufis-0.3-r1.ebuild b/sys-fs/lufis/lufis-0.3-r1.ebuild
index 5f2f2645949e..a7f5d38b0a24 100644
--- a/sys-fs/lufis/lufis-0.3-r1.ebuild
+++ b/sys-fs/lufis/lufis-0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/fuse/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND="
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index ad563bfc3489..4c4604da9d4f 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -25,6 +25,7 @@ AUX lvm2-2.03.05-pthread-pkgconfig.patch 1442 BLAKE2B 6d2864c91fc38ba3c8e9764161
 AUX lvm2-2.03.06-example.conf.in.patch 1833 BLAKE2B 21f9d51be4a704417dc35ed7d5ae385dab1376e3f25c030d215fd3b5d0a495f97d4230dd13cf88472b9699321f091ce90ac7162644f9c7f04ed9d8c5fd0eafe9 SHA512 49b0db05552be36153986322e28098ffc006ff2bad3fc91de99ce63f75207b0bbdfd8e4cdb5fb07decb4a84c883b552135a8b203186a10f2360a3616caf10957
 AUX lvm2-2.03.12-dynamic-static-ldflags.patch 2591 BLAKE2B b1edda6bd715d805ae12967ca453e08859c44f5e48d32e6d264682a6aac6a27fb47aa8fcb36b68b28e3237d76c8b5d060b050736c38d6913a7647b6168a98c3d SHA512 5c9c1d65579a14585c68a348c00b867a48398ebe7a871e6bfcc8cd3a6776c260aa6200f22c108f95ecd65b61ba4b260a5e6acae17dc8c9e639692bbcca2bdf37
 AUX lvm2-2.03.12-static-libm.patch 1000 BLAKE2B 4bde7eda80a00f7c692341ebc74ab30308f3157162caba4d789dac42318fd5a16d6b1471463bc2a1f02f50313ce274ecc5aeb039c90e0b979d73146cc9497fba SHA512 cc7764fdaadd767e88d68a3a071f72a7ce30e5bc98fb55b49cf8ba00c3c5a1cac288f2aad0fec94eba5dd2100108756f1315b9704e872d7d64100bbeff1b7a17
+AUX lvm2-2.03.12-static-pkgconfig-libs-2.patch 1260 BLAKE2B 3ee43306af649c4d23ac9b096f0649b48f40416a6e77098e449429e6b8a881a23e8e1158be72ab4c2b5d9bf11dda4b983da1b03d13ec614250d530b57d6d8ec1 SHA512 94704e273c82272fcb3e77da66894204f96bfa28343d3f3edc3aa90aeba6334872bace17c57c64cf35114113cd6d20d628702d1516b7c1296f6ceafd75c5c3b6
 AUX lvm2-2.03.12-static-pkgconfig-libs.patch 4438 BLAKE2B 0b24f49401f0ac5c440e3b6dbb768d368ed30609cdb9720598700855c2d8394feb5f495945ef67129ce3897b50a1d029ac8e46a7303461f2163b52605b694a02 SHA512 a68db7128107220631db0b3752a1c4ff89d376a50e71700c24ed12833a1a1394caf88769ab376277a838f1878991c0c208b3d40e61ffd616b988c2f6dacf3095
 AUX lvmetad.initd-2.02.116-r3 345 BLAKE2B d458efd01fa08debe0857072c880adf951477445dd619a052f50cab9da39d8a38c9d480fc2d20fe899e01dcbcdaea0696d5c3e65af128652feea3186857d206e SHA512 f3143c6e1d00893009c68141f5ffd7e1e6bcf5b7ef0ff8505bc6c7049d83b2f9ddd2dc5a3cfdc2641a20603830b5dba07d73740cc5ce82e6b1b602a9b737a241
 AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc
@@ -32,7 +33,7 @@ AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b56
 DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
 DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca
 DIST LVM2.2.03.12.tgz 2594040 BLAKE2B 4e5630f27c818b79a1241b96a9d58d7078ece4a061b9bb4f26fddf77036fa2a319cc4f23835a6c784b025b3ddd07a18ce0a7ad3038fc90e90c2990d309a5d64a SHA512 e4d3bfb38b346251a2ea2cee7b79f2e12ed407652b659b35b65f58c8bb252943cee1c511713aeec8ff3400790e0e99ea6b83e8740050defe5cbb118f18bf7700
-EBUILD lvm2-2.02.187-r2.ebuild 10034 BLAKE2B 3a2417d5126141dd67488386fd2520856580fc82f1a9d6763373b5f3050a673a43787a7deef7b4b2ffa23558eea504e5c1ee81e2c9c0af8a9185a54ed657fd5b SHA512 d8e223ac76bb91c9596e0c9ba49dd150fb36403bd57dabe31d3bc2ebdd3c4c729ff33b2c85ed1154e4d5f38654739505dcd634ba9dfaa94f1f9d97ce7e37db7d
-EBUILD lvm2-2.02.188.ebuild 10042 BLAKE2B 6b0117f19053c1083231f5e555ddfac6467b23308eb2d8da0461038c00bbb558ecc32204ce62d6ba7bb248594048ad3d0be681b3d623323b56c5278d5ed1dac3 SHA512 e06227795ad67abbeff1ed7c57d87b0c58ee0be191b0e58abd45f859b230a3af4f2bda08bf51767550e33b34deb80735f2d81ae1176d0507aa999440d8da3569
-EBUILD lvm2-2.03.12.ebuild 9485 BLAKE2B e971fe6fc271ac3bf5f526db5b95ccfe8e7c8abe13d9368bebbad3449f218b11b5c37d97cf6fbbe389f646aeaee9b0ad9e8dd3069cd6891d983159d2956eecb8 SHA512 c9e89d9332032bb673edb4e5b7c2755722b0d67a4583c738f339b27ba271785a42e9d0d2eeb939da42115a596a25057ba10c86845e1f69bd2e51dccbcc58acf5
+EBUILD lvm2-2.02.187-r2.ebuild 10056 BLAKE2B 31cdeefe94de7cbdffe76ff3aa1d19d6f06044d6c7d25745d6445a25f811b9b05b4e513e08cfe84a41fc11534ec640757eb288bd7e6c9e02e7ec9ee20bd29e97 SHA512 fd0393f7e0a8bffb07b7bdbdee016afd3f3fccb6ba6a36aa017b378f1793049ebdfe41bc1a6ed09d7389441a0f4494b65b18d0ea951ce49dccf9c3507809b438
+EBUILD lvm2-2.02.188.ebuild 10064 BLAKE2B 77886e23d429faedd93225821f21b13ac620bb0ad0577ceca2802cbe85113ec147b1bf810138b356fe10a2a0f4d08ecf931fb559d4a1f7c58739fad600c2f14a SHA512 5759fee7cfa8df1f7d222a197e5aa9c71ae9340b445837f93af85200fdcfa68a1f16638e6671aa0313423899c1967e8e1d9f14df4605c822cb3e6d53b12ff0b1
+EBUILD lvm2-2.03.12.ebuild 9566 BLAKE2B eab74b57cfb62358727f33610296192498065c3fc7e7b1afc5e95a689db66920c9dbe77790977c34922b6ef26aec483157c36da5f294bba04f07f395d39f7e75 SHA512 10bd2e82478ddb205995d7fb0c0dca575304befeeda501a3535cc2e8a3bd96c781d5c1a6b389d4aaf1339d684f2a02a62d73486f71ef775123ba0c40d44ffdc3
 MISC metadata.xml 1034 BLAKE2B f0f14e228cefe806333830eec09a076c06985750b08669036f951e7aefb45b2482091f4da404ccce7e5180e7294adc2940311d360773a7ec72e16f96d9d82961 SHA512 ccdb84869eaa98af048d561791879796ea8a82cb2603241496ce050133402f66e0e5b7d6eab161bc9739451712e73370616698ff492377e54d8dd5582abfbc69
diff --git a/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch b/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch
new file mode 100644
index 000000000000..a3a4642e8281
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.03.12-static-pkgconfig-libs-2.patch
@@ -0,0 +1,38 @@
+From 27ab05863dc56fcd7254bccf30797f9e3c448cac Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Mon, 12 Jul 2021 10:36:04 -0400
+Subject: [PATCH] libdm: add SELINUX_STATIC_LIBS and UDEV_STATIC_LIBS to
+ make.tmpl.in
+
+Fixes link failure for dmsetup.static.
+---
+ libdm/make.tmpl.in | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in
+index a306101d5..2309fb3e5 100644
+--- a/libdm/make.tmpl.in
++++ b/libdm/make.tmpl.in
+@@ -55,7 +55,7 @@ RM = rm -f
+ 
+ LIBS += @LIBS@ $(PTHREAD_LIBS) $(SELINUX_LIBS) $(UDEV_LIBS) $(RT_LIBS) $(M_LIBS)
+ # Extra libraries always linked with static binaries
+-STATIC_LIBS = $(PTHREAD_LIBS)
++STATIC_LIBS = $(PTHREAD_LIBS) $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS)
+ DEFS += @DEFS@
+ # FIXME set this only where it's needed, not globally?
+ CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
+@@ -71,8 +71,10 @@ PTHREAD_LIBS = @PTHREAD_LIBS@
+ READLINE_LIBS = @READLINE_LIBS@
+ EDITLINE_LIBS = @EDITLINE_LIBS@
+ SELINUX_LIBS = @SELINUX_LIBS@
++SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
+ UDEV_CFLAGS = @UDEV_CFLAGS@
+ UDEV_LIBS = @UDEV_LIBS@
++UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
+ BLKID_CFLAGS = @BLKID_CFLAGS@
+ BLKID_LIBS = @BLKID_LIBS@
+ SYSTEMD_LIBS = @SYSTEMD_LIBS@
+-- 
+2.32.0
+
diff --git a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
index 339b9d3d225f..2d515b2b1447 100644
--- a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+	static? ( !systemd )
 	systemd? ( udev )"
 
 DEPEND_COMMON="
diff --git a/sys-fs/lvm2/lvm2-2.02.188.ebuild b/sys-fs/lvm2/lvm2-2.02.188.ebuild
index 05bdee02a554..d685c793532f 100644
--- a/sys-fs/lvm2/lvm2-2.02.188.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.188.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+	static? ( !systemd )
 	systemd? ( udev )"
 
 DEPEND_COMMON="
diff --git a/sys-fs/lvm2/lvm2-2.03.12.ebuild b/sys-fs/lvm2/lvm2-2.03.12.ebuild
index 5a5bd509c37a..93957db3a69f 100644
--- a/sys-fs/lvm2/lvm2-2.03.12.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.12.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+	static? ( !systemd )
 	systemd? ( udev )"
 
 DEPEND_COMMON="
@@ -60,6 +61,7 @@ PATCHES=(
 	#"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
 	"${FILESDIR}"/${PN}-2.03.12-dynamic-static-ldflags.patch #332905
 	"${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs.patch #370217, #439414 + blkid
+	"${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs-2.patch
 	"${FILESDIR}"/${PN}-2.03.05-pthread-pkgconfig.patch #492450
 	"${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756
 	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 03b9a747708d..0f373b56d4ec 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -2,6 +2,6 @@ DIST mtools-4.0.27.tar.bz2 420579 BLAKE2B 3044fff1896427227e4585df81c208f7580302
 DIST mtools-4.0.31.tar.bz2 446527 BLAKE2B 4b954362d0c177c5a2f7b098065f841ca075092b8c49230ca4098a1a34fe64bce32d31df1aae702f12b174a8176026687de9dea5344f3878c1acdba4a8a0c753 SHA512 6c50eadcd32563b593b58984fd6426faabab208283c0b81c7df194cc27fb7d6bf873916b152c74c4800374f0b70f7dd41c768d823d9efc78cab6efbb6ee37df5
 DIST mtools-4.0.32.tar.bz2 436537 BLAKE2B 6b057be3d053ecf1ebee72b6b73324ec2cdbd7daf87c927f6ec2f6ef203345ddb869d6d7cb645e21054304ae68fc7a33e77e7a0f0cb606d3b755da36e66ca69a SHA512 a66e7483c422abdaddbe9e6b2cd0ecc2f87b0bc4f40929ac2e4db8b8d88cfacf118b126cba3207307bff376d5572170a1ee5803618de0544f68d420ed06bcab9
 EBUILD mtools-4.0.27.ebuild 1052 BLAKE2B 6a345c0c1436f2bf591b32c55514ceaf7b415d413107d0d3c07c50bcf7bdcef742c729fc1ed83fe967e32e4a580ddf2feaa0be482481d6bbc429c409cf622929 SHA512 d28ef71fcfcd7db607521ffc4170f632209f9386ac49b9ab40338a6960c96b5b769a96abf5781c5a49f515ba1e154155afa34af9f49c642167e9bac80afd187a
-EBUILD mtools-4.0.31.ebuild 1053 BLAKE2B e2f1e01bc4e7ca2ec6780695dcc1ea308bd546c331486810267d494761f1cc728dd1994d531643537d603fddae96bc100a4c71082542344aabeb16bfc0803bf3 SHA512 c6d35dffd8ed5b889b44aed6518cd8aef7e647d9b03c2db36a906e87469d04cbae976b991e2cdc5b7703738d0178c08042ac380c617bff1ef30e5f8e73a77a58
+EBUILD mtools-4.0.31.ebuild 1052 BLAKE2B 6a345c0c1436f2bf591b32c55514ceaf7b415d413107d0d3c07c50bcf7bdcef742c729fc1ed83fe967e32e4a580ddf2feaa0be482481d6bbc429c409cf622929 SHA512 d28ef71fcfcd7db607521ffc4170f632209f9386ac49b9ab40338a6960c96b5b769a96abf5781c5a49f515ba1e154155afa34af9f49c642167e9bac80afd187a
 EBUILD mtools-4.0.32.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.31.ebuild b/sys-fs/mtools/mtools-4.0.31.ebuild
index 87146d25de94..eba20aaf2121 100644
--- a/sys-fs/mtools/mtools-4.0.31.ebuild
+++ b/sys-fs/mtools/mtools-4.0.31.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="X elibc_glibc"
 
 RDEPEND="
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 9100350e73d5..baf1d364ff58 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -8,7 +8,7 @@ DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102
 EBUILD udev-245.5-r1.ebuild 5928 BLAKE2B 5fc1655db3633cd1a7459bc05d2065a0878a43e8cf48ac6a5957a71b662f9ddce8dd18c906de8707fdf411378ffe82e71b6217f2d6e8ea0136830718af125af3 SHA512 4450cd68fcebc939de12f641f4404570e48b6cb623a4ccc8536dad9d3ca92534d5d2b44b68fa723baf24446b034193788ca4e32ade975f2e4c7413cea3f99092
 EBUILD udev-246-r1.ebuild 5927 BLAKE2B a8830dbfefdb6c12fa7e8d6034bcb9c94b0eb81eee871655e8f57bb3732d693b345588ab6e3f1c211695fdd15e7402bea08ac097c7721998f9625a77ca725430 SHA512 a113458cf68bff8881e0b1c7ff80bc4ff4dbe715dcec7f4f83b264e8f5f0f4c0153a6365ce3e1105d1dbbe8144016d94c1c530397e3ae768f9bc2bb3030428a9
 EBUILD udev-247.2.ebuild 5648 BLAKE2B c99ee7449eecca95e92f2178a2b7e0b38fc9d2211b171539af45d28fd407c31012ab0ca4b877392f39d7e42828686661abfff2ca72efe01ca8f0bdf64b6018fb SHA512 98f3bcc0e3a6277685e52e570e4a6f3d279329ad3fbe6dc0bbb33a0ee7fa7491b422878afde0eeab00223567de3126c331df1de83fa30350919f56d1e7bfa75a
-EBUILD udev-248.ebuild 5461 BLAKE2B 20ac6f812475c24362dd6258d474c1bdd611efd8c3ff4955328046b9e32862bad3b43b9405ac07525c8cedf4093da671c5ab37d2b3d3e106ad94a962e9bd9121 SHA512 ac27997375f9d2a62e37c9d6c60b49dd6d18f702113790a4adbba1800f71a775aa46c7d345c0722e31f529baecc0b7a2c029fb472ba7fcf7b28d36761977dce2
-EBUILD udev-249-r1.ebuild 5616 BLAKE2B d6a83d6572c3916eeefbe84f3dce9b0ecd839d120084b7747f0d06858544270871940d072267994155ec364551000c449d00cf99282608e5e0b2ba489ff238f5 SHA512 e40f6d47c4f9002cdcfe30aac2cc028f7b0d75bd72d39feb07215e093df5fe7c00ca49c4f7db680b485460ed70e94d32908d95a3392c621a151ea807e5b6ec25
-EBUILD udev-9999.ebuild 5575 BLAKE2B 8298696ad05cb845a59b117bec1231a25b8a1ebf3284515607b77827b69d68a59ae9fb61f66dca95bdf37072c9aa3d845154653311e9c1ecc541e1a934e4b7d7 SHA512 14efa15db19ebe88fa20a20ab2193c67bbdfc31709d010fbfa5cf793223ce8605c126fe2134fbdabb92409ce748979edb22440851d47e61019e1f9d41f4eff0c
+EBUILD udev-248.ebuild 5435 BLAKE2B 73db98a1a0f358cfde36d7ab34e61ec52a69ba6cd2189536aa3adb3d09c6e946c3d5d6d726616cc9feeb3d7c4c39aab3d3a8826ab62ac07506838448518edff9 SHA512 415134bdcc7221eba54e940be02d081e89228b54ae3efa03ee6c1abb5458592440b26cab31a0ea6e21a288933cd2ff16330cb8c9ba91f2df323a34b65fe0a600
+EBUILD udev-249-r1.ebuild 5736 BLAKE2B dafb410a1b719d4febd2366584b55c66b5967e2eaf9d14225be7a5a8ca55222f66c4c4ac15741834d15085349186be4cdecfc58ffd710b5292f53f2b5ce8a723 SHA512 af851c186240a0814dbb1992884cd7f01b7b24520138e2147a001f7de05a73b28daa06ab6a99395f09db9167345e118b8f90f46adcaac6905207ef4367ce1836
+EBUILD udev-9999.ebuild 5695 BLAKE2B b32ab2f191c4163bf0949446646dd24fcf2b6e1c08454922108e0e41cc7fc6709ee4f27504ac4bd49a387958f2c3c2359b3e4e9d1869510a632dfb77589057ec SHA512 254593d7c82cef560530a29453ac96292bc84558188e55d5533e3e77916f9cd0708fae3ad1caba750e121de1aab90d4eed098920365583361e2cb4f76d676b50
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-248.ebuild b/sys-fs/udev/udev-248.ebuild
index 676b5a0be4e7..48130385ec4b 100644
--- a/sys-fs/udev/udev-248.ebuild
+++ b/sys-fs/udev/udev-248.ebuild
@@ -19,7 +19,7 @@ else
 	MY_P="${MY_PN}-${MY_PV}"
 	S="${WORKDIR}/${MY_P}"
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -139,7 +139,7 @@ multilib_src_compile() {
 		${libudev}
 	)
 	if use static-libs; then
-		targets+=( src/udev/libudev.a )
+		targets+=( libudev.a )
 	fi
 	if multilib_is_native_abi; then
 		targets+=(
@@ -166,7 +166,7 @@ multilib_src_install() {
 
 	dolib.so {${libudev},libudev.so.1,libudev.so}
 	gen_usr_ldscript -a udev
-	use static-libs && dolib.a src/udev/libudev.a
+	use static-libs && dolib.a libudev.a
 
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins src/libudev/libudev.pc
diff --git a/sys-fs/udev/udev-249-r1.ebuild b/sys-fs/udev/udev-249-r1.ebuild
index 0154e132439e..412b8abefde7 100644
--- a/sys-fs/udev/udev-249-r1.ebuild
+++ b/sys-fs/udev/udev-249-r1.ebuild
@@ -41,6 +41,7 @@ BDEPEND="
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
 "
 COMMON_DEPEND="
 	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
@@ -71,6 +72,10 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=sys-apps/hwids-20140304[udev]
 	>=sys-fs/udev-init-scripts-34"
 
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != buildonly ]] ; then
 		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
@@ -141,7 +146,7 @@ multilib_src_compile() {
 		src/libudev/libudev.pc
 	)
 	if use static-libs; then
-		targets+=( src/udev/libudev.a )
+		targets+=( libudev.a )
 	fi
 	if multilib_is_native_abi; then
 		targets+=(
@@ -171,7 +176,7 @@ multilib_src_install() {
 
 	dolib.so {${libudev},libudev.so.1,libudev.so}
 	gen_usr_ldscript -a udev
-	use static-libs && dolib.a src/udev/libudev.a
+	use static-libs && dolib.a libudev.a
 
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins src/libudev/libudev.pc
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index d23c86c0aeb8..889f61023243 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -41,6 +41,7 @@ BDEPEND="
 	app-text/docbook-xsl-stylesheets
 	dev-libs/libxslt
 	${PYTHON_DEPS}
+	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
 "
 COMMON_DEPEND="
 	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
@@ -71,6 +72,10 @@ RDEPEND="${COMMON_DEPEND}
 PDEPEND=">=sys-apps/hwids-20140304[udev]
 	>=sys-fs/udev-init-scripts-34"
 
+python_check_deps() {
+	has_version -b "dev-python/jinja[${PYTHON_USEDEP}]"
+}
+
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != buildonly ]] ; then
 		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
@@ -140,7 +145,7 @@ multilib_src_compile() {
 		src/libudev/libudev.pc
 	)
 	if use static-libs; then
-		targets+=( src/udev/libudev.a )
+		targets+=( libudev.a )
 	fi
 	if multilib_is_native_abi; then
 		targets+=(
@@ -170,7 +175,7 @@ multilib_src_install() {
 
 	dolib.so {${libudev},libudev.so.1,libudev.so}
 	gen_usr_ldscript -a udev
-	use static-libs && dolib.a src/udev/libudev.a
+	use static-libs && dolib.a libudev.a
 
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins src/libudev/libudev.pc
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index fb44dbc3d009..dc044a03b403 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,3 +1,4 @@
 DIST udiskie-2.3.3.tar.gz 92133 BLAKE2B 515673182297f02761f8c354ab9450b04b4533b8165035322c104cbc9aa41da83898dc7e2c371da47dcc8c5dc7ef6adbe5b05f913d77b395d5d8457f9260e845 SHA512 0b0b37dba437fd4af45d0344f36b36ccf0626d18fc29e020270cd567d4912fe1362182a28b55f3dfe1a23922d416cc8d952555e350c7b2d90fb49702dc497ebb
-EBUILD udiskie-2.3.3.ebuild 1003 BLAKE2B 025bf87e0e856e135cc21b078fcf83226c935ae95e855fdcd82bbab75e5cece01fe495ddf338b724ccf22390fec0f4f79d4824a633ce87ed81dcd7418f707550 SHA512 5e9ab3c79b78afa2f6c3143f1df0bfd4138696ae6f49208675d8ae1ff3097cb88895efe174fac0827bffa20d56e3073046a715c0197b823359ca589153370091
+EBUILD udiskie-2.3.3-r1.ebuild 1079 BLAKE2B 9b785883113e3c678863f37126bd5202271ecb58f02bfdbffc98b552a3191838491f20321e78ec24e4d257c557cd5ee1e4234526d6878e0dd48e2e5e2ba9f295 SHA512 a9c93d8317e62a4f299aad6953b4fd826c5ff5f132b74d726ba4741db314fce60d02e61383ccbe7942ca641926d01c11bd65f2c39bebd6da0797a3fe10ac6349
+EBUILD udiskie-2.3.3.ebuild 1004 BLAKE2B 9f34d757a24e3b6580e4030ee6c73a49d8a4357121dde2b5368175ebaa560961207a6f81d2cc339a14c41b3ae2dc682ab9e5c88cbc05b5299fb57b5833adf942 SHA512 d51f8e3e5edbf842b2d5ff040d310b9d516eb58be78806c0cb4af7d0ec5258d70d7e66883186b7c4ae6782d61b6589faca23fd190904ddafcbe647f8b7b3f8bc
 MISC metadata.xml 369 BLAKE2B 0241a847b1eb2f650f66bc3fd631ccdf1927562d510e08c7bcd3db850752b665894838d0c705b7d03690aeea0aa93372d1faae5b313c9136d46e4913c177b0a4 SHA512 0772b0fa065a42292268b9e6a6b99b7198f5923bcc4697913b6c432db4e206a28b0fb1bd6c14b6363591cca02108a8a91029233824c3ec5bd7fbc592a941137e
diff --git a/sys-fs/udiskie/udiskie-2.3.3-r1.ebuild b/sys-fs/udiskie/udiskie-2.3.3-r1.ebuild
new file mode 100644
index 000000000000..d2dcca70c9a1
--- /dev/null
+++ b/sys-fs/udiskie/udiskie-2.3.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{7..10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="An automatic disk mounting service using udisks"
+HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
+	dev-python/pygobject:3[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	sys-fs/udisks:2"
+DEPEND="app-text/asciidoc
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( dev-python/python-keyutils[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:gtk-update-icon-cache:true:' setup.py || die
+	default
+
+	distutils-r1_src_prepare
+}
+
+src_compile() {
+	distutils-r1_src_compile
+	emake -C doc
+}
+
+src_install() {
+	distutils-r1_src_install
+	doman doc/${PN}.8
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sys-fs/udiskie/udiskie-2.3.3.ebuild b/sys-fs/udiskie/udiskie-2.3.3.ebuild
index 4d0eaef9ab3e..083c3ad9c7a5 100644
--- a/sys-fs/udiskie/udiskie-2.3.3.ebuild
+++ b/sys-fs/udiskie/udiskie-2.3.3.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
 DISTUTILS_USE_SETUPTOOLS=rdepend
 inherit distutils-r1 gnome2-utils