gentoo resync : 01.08.2021

29 files changed, 57 insertions, 769 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 66e92e122905..d35f4ee693f0 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 662c5c2fb675..47838717d237 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,8 +1,8 @@
 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
-DIST btrfs-progs-v5.12.1.tar.xz 2220424 BLAKE2B 1e6120609feb37dd2ced04b27d8cba9a28c3b962add6f037927dcb05bdcd46a229f981f7f68231ee58e7e36a65fae4e6041e92c0db11dba56fe63b09bca30cc7 SHA512 a4044ad7e40e232442601f102ea1c64a65aa4d9765be303813d2547a5b730c5f2f84c9b9c652a4218ab16821fdd049dd8573a1f7f6cc27974c2c4389243e20f5
+DIST btrfs-progs-v5.13.1.tar.xz 2237108 BLAKE2B 6de5d70d1b3611dc7c502530c08f9b58da798b33a97a415a787c5ed55b3369432f362c4d61636b6c85d952bf4482125a2d59397214ac543cf7160de28fe20a0b SHA512 4ef8256da59614d17316db9c19909a2aa4f0557504201e421332c63a4935dbd6578791484b9f3f2dbeaaa28f6f4b4fd59c5a7adf6853fd76546ac213a0f09823
 DIST btrfs-progs-v5.13.tar.xz 2234256 BLAKE2B dd6dc6977c2a21471b59573c3ae6f7853d5ec4434549873174a6bde6b3ed4c5ed03c5adaed896538cb74699f538ec13403c193f132fcc8a2ba1b4f6bbdbac67e SHA512 7832ca02b77410edd8d80f10c6f1482dee944073518dbacd5773e70f27b7c632231ea66bdb64aa4611869465c15d2d60d364bfd25c2e40e0a2c198edbf9741cd
 EBUILD btrfs-progs-5.10.1.ebuild 3058 BLAKE2B 561b88a1cd1009fd9fe45bc6a1e29c01a5a4bad16dcfda748c87bb02f38084ae822d2b406f94771a8dd0e775bd430b51100b2d70b84e7c3c07312ea6ffc32a50 SHA512 5b7c79c83ec1e549e7d8feb9b7f898fe5682ecf51094345b47174ec0ed3e44bee349db4e44c811508b9ca9df6fe96afa7cd87a8a94dab22150a192f9a70432e3
-EBUILD btrfs-progs-5.12.1.ebuild 3097 BLAKE2B 3805cc7ca9bfc522acfc33734abec7521f8659e3e593294d7af803fab61efaf30f10d05294febb83cd50a016bf2b341a23e202ba958d1475631c38ccf8141bea SHA512 ec47ac06ca1b090e4a9a70023d3c7e03aff7defc0e94cb052a4f0f1343a395cf69b6a73d4907ed15061ba4c14f2c58e87b739cc5329688c1960e330f58dfc670
+EBUILD btrfs-progs-5.13.1.ebuild 3092 BLAKE2B 5b07b20d1cb89479283b12614b4ce9ec27cfec01d2fe80a7422f2130f53d11d8d0d6e548b192fada2bcc99e47e3cdc827521e9e85293d82a755887adea599ba2 SHA512 d413b904b27d71dbbb74c06426c76d6ee39a95093db3660c25b269225ce60ce9eee5223edb385ba5f3a1c27d1f3b2e12e8a053d194e4196fd1b4f1d95aa45ef6
 EBUILD btrfs-progs-5.13.ebuild 3097 BLAKE2B 3805cc7ca9bfc522acfc33734abec7521f8659e3e593294d7af803fab61efaf30f10d05294febb83cd50a016bf2b341a23e202ba958d1475631c38ccf8141bea SHA512 ec47ac06ca1b090e4a9a70023d3c7e03aff7defc0e94cb052a4f0f1343a395cf69b6a73d4907ed15061ba4c14f2c58e87b739cc5329688c1960e330f58dfc670
 EBUILD btrfs-progs-9999.ebuild 3097 BLAKE2B 3805cc7ca9bfc522acfc33734abec7521f8659e3e593294d7af803fab61efaf30f10d05294febb83cd50a016bf2b341a23e202ba958d1475631c38ccf8141bea SHA512 ec47ac06ca1b090e4a9a70023d3c7e03aff7defc0e94cb052a4f0f1343a395cf69b6a73d4907ed15061ba4c14f2c58e87b739cc5329688c1960e330f58dfc670
 MISC metadata.xml 523 BLAKE2B 7757fa4d4f1400bf08e2975e5214a1dd0c8258b61366c98089ca9c497b8c62e497cdedad605370f7034519b91c266b23e2e42bcafef3bb2bb69cb6b93319fa00 SHA512 3830f8f555ade672eeb52394a5b262e06e69b8b27d947d81dcde9b341fea9f16b77df8101ee5cd3314b6552543431a5f32a2592bf77a7a50e28cc56c95a4b164
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.13.1.ebuild
index 0beda5a218fc..10909cb0c94d 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2008-2021 Gentoo Authors
+# Copyright 2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-fs/cachefilesd/Manifest b/sys-fs/cachefilesd/Manifest
index ddbc7b01414d..0fb1fee1ac9b 100644
--- a/sys-fs/cachefilesd/Manifest
+++ b/sys-fs/cachefilesd/Manifest
@@ -4,6 +4,6 @@ AUX cachefilesd-tmpfiles.d 32 BLAKE2B 26527e8c3b8e821fc05c6bb1ddd0a6cf74857f8219
 AUX cachefilesd.conf 296 BLAKE2B fce58c6af2016c45c0545b86c4dd98ffba8f58193af0b163a8ba83c297c9a9af944ba6d8997da5f1ac44c8cb331fafe94f93ed0b5fb4d4b14c5025cf6436b46e SHA512 6b82563b27b3a202afa6922bf4059836c7d363c5350d2b348ecca6ae12de2ae31d903e65b00f427712e7df22c0401b181177e168715e5e375b290f6d247fd846
 DIST cachefilesd-0.10.10.tar.bz2 26694 BLAKE2B c527a6283617ba53818e0cad1859544b1e66af1107b05d1f83904669425d31c5374f3c032b892c9d95892d02d9256bbd9b180f1d0b6b430f0cfa70440406ef9f SHA512 d7d816b5ef1fffe1272cb8c2e9cbd18c1393438afca250436a36a446c6a37303e7784057725a56be839e0489101190b563c4fc015fc4ff11baa8003121e5183a
 DIST cachefilesd-0.10.9.tar.bz2 26555 BLAKE2B da5df1d2c6715a7cc304b32842f00e69d356359abfae865cfc1b63b89e1149bcb48762ddf84d13f5d18b727d8e0693257d424e599c3874bbe842da9aed4a0cfe SHA512 06ab444a7df8ec37c15bc03554510f4acbb453e0730277f036abc5d61f9e377d90d9387dd5237ea481b95b1bf097b5992adce90ce971fe29760cc4c0d3c9cf34
-EBUILD cachefilesd-0.10.10-r1.ebuild 1554 BLAKE2B 5028a3afe6ce251736b7c1eab841ebf04817e43b4ade3242cb73bcd54de5ca709307c8f023305522022753e62bb1026bc7b252e9353e2db09ec52cf349720009 SHA512 2ca17a482e3b328bbd42b87610092192c53f5ab03c19a844aaed93591e1ba6e896142c0bda8ccbc3c4b39c49a06b5474c053ea54dabe4b98cc895dd8f537de41
-EBUILD cachefilesd-0.10.9.ebuild 1471 BLAKE2B f7520cc3beae29bf2db2115ee88f31d3c97485db9806802b297c6106c3a3b5c5f355bfd9e371ada6c0decea2cc3be35367ce6da40c3da66e4a458a7216f79e23 SHA512 9409bd10c3f393663004a2b0f1e1082ed59bdb8804a2cfcf68a1e683a5898c97bc242f45f6bd17bf3d2560343dba049e326154264a85d301eff7b11d3898f8d6
+EBUILD cachefilesd-0.10.10-r1.ebuild 1584 BLAKE2B 071ba66543118ba53e2893a9226bf6716d12250f226759c38697e43eb6818ebc5904389de3a9b839e20f912a211021cf7a2cd60594ffbfa3a0a34a01a7b23f9a SHA512 c158d7c153336ccbeceb63a1ba2c26dc3779fad2ee92ae3032e4a8e5275ef7d3814a2dc692a20d0f983587f396081794f43ccfe9993f077c82658af299e6b4a3
+EBUILD cachefilesd-0.10.9.ebuild 1501 BLAKE2B 40541a5c37516de1694a7bf485debe1ea56cae9a091e2456b34947c5d1b169083289150809c2777447c1ddb949650751d5a1e37b1f3ad0ac3896c7b5fab723f3 SHA512 80a5038fe9cbf257e981f1d54ebeed81c49b7a69adb7cf55092478a474732ad0c9dab4667b50913873ae39c8cb3cae6556f55668d2d47c76cc39ff9aebe23e94
 MISC metadata.xml 247 BLAKE2B fad006bd63156a3ffcdfe9e4c216b806d3b341fa5b7e8de2608ad51674b482493f7d0fabdeb6010ce0c41aef65a55abe404b8ba5ba7d72f36822b7d96d58182b SHA512 189f876175728dfb474cf2ccb122ebfe48b068cc5fd65a3cfed7dad947dd9ce0fc7c89ce5c0982fdee5262025236b7d5cccf48b55c67c5cd33e84910c28e0b46
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
index 495532b754a1..48fbad06a93a 100644
--- a/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.10-r1.ebuild
@@ -50,6 +50,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	[[ -d /var/cache/fscache ]] && return
 	elog "Before CacheFiles can be used, a directory for local storage"
 	elog "must be created.  The default configuration of /etc/cachefilesd.conf"
diff --git a/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild b/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
index 27984303d163..849ad870b21d 100644
--- a/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
+++ b/sys-fs/cachefilesd/cachefilesd-0.10.9.ebuild
@@ -46,6 +46,8 @@ src_install() {
 }
 
 pkg_postinst() {
+	tmpfiles_process ${PN}.conf
+
 	[[ -d /var/cache/fscache ]] && return
 	elog "Before CacheFiles can be used, a directory for local storage"
 	elog "must be created.  The default configuration of /etc/cachefilesd.conf"
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 54fdb74719ba..047661a33ba7 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,8 +3,8 @@ AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2
 AUX cryptsetup-2.0.4-fix-static-pwquality-build.patch 427 BLAKE2B dfdc56c6627084732973254cd52c48f0869aa7b4c58e466840a87f77c1d4fb09ae37295fb54e980abccfdfe51dc63161e188a0be9bb4bf3c69d7731120f84bac SHA512 23b5f9b21ec86c92787bfc8744682ce0777dfa87e1de97afbb8db33c4587f1e2c8e5f8c9d0fa56ca801d7795739f9a66f14633d8a3904ea68ddd58ddc3863adf
 DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
 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 3853 BLAKE2B d66f995f69cac742d0d1e6c22bccda546c49c74fc495fd43dad6469cb948214923f85119eae86f8d87989a6f689d20113048427d6238f2ee75910274a1fe3512 SHA512 ad6cd0dc0f2ca709ee380046c2d5b5b23f198fd2fff59197f052138b765752ee018b24e76de3ad929ca15fae14d736b25b643f7055f682cc02b61de4083976b6
-EBUILD cryptsetup-2.4.0_rc0.ebuild 4063 BLAKE2B 0bb3d1c586db729de6c1d2a48ed8ddf3e0cb41dda4185797b48dfab31bb61633df662b1a200f83285a48b1ed2c6bc8139066f2556e3742851639f3d5b8767c4d SHA512 50f77d38592217e2f72dd866c54115e52a2dbcea0c8a1feeb68cb11280ecc590f03eb1ea6112cf9d3b9ff730a365bc757b235a5a1f30dfbf9d0b83039f44a527
+DIST cryptsetup-2.4.0-rc1.tar.xz 11148144 BLAKE2B e3ae27231b0a4e634be35b1c767aa74e50d09b14339ad82678df1058eeda7b3280f8aaf0e0ccbf039fe632564974f778dac524311767ab7e3c6a419afbd3cb2b SHA512 73f07e7963624111d916f9791617af52bdf614be04da8462603aa17e0b10f28f681eca2bc991c74c9c3804a4ffc9714f7d075242631f5b77a86462bc57bade93
+EBUILD cryptsetup-2.3.4-r2.ebuild 3916 BLAKE2B ef3b9cb1322bfd44370a9e6340476017ec8441fc9bab9c344a194ad147bdb7a27b28d38a1c06f4c3930ad7a4960eb426af36c830f6db95723862c0bb42d1c4b0 SHA512 7df3da59e92df22745f3c9fc7b9f3e7d5b6e419182cd4529fa8734048e542c9c8f90ea276f28c23f74ef6717c624487d4d3840b9ce3f5bfe1050bd1d9d09d416
+EBUILD cryptsetup-2.3.6-r1.ebuild 3916 BLAKE2B ef3b9cb1322bfd44370a9e6340476017ec8441fc9bab9c344a194ad147bdb7a27b28d38a1c06f4c3930ad7a4960eb426af36c830f6db95723862c0bb42d1c4b0 SHA512 7df3da59e92df22745f3c9fc7b9f3e7d5b6e419182cd4529fa8734048e542c9c8f90ea276f28c23f74ef6717c624487d4d3840b9ce3f5bfe1050bd1d9d09d416
+EBUILD cryptsetup-2.4.0_rc1-r1.ebuild 4126 BLAKE2B 076450aeefdc22e92f8ebeeb2a96664ebf1fc15dc3b11d57c1c4e83f35711c6b8b931cfdffda2e7a31c20a2703524666c8c77ae82fd48ee7b409442fdc7d5e4a SHA512 9c45be16d0519ee47a1fc7f827c0f7eac1bcca69346147b5e68834b3d2c8fe0b27c68dfbac5b9c70a7defa3ed55b988cf71da838aed3b47018b82cb95aecf17d
 MISC metadata.xml 1075 BLAKE2B cd8afdb9fb1117d48e88b4aa6dd7ec9b6e072fe12d8880de6dd4dfe2fe018bf25910da08056274f43ee6b93e672041b25f214694b2f6e46bc75c8fb63318b1b3 SHA512 6539b510c89c1e335897c7c32550f86fdc0bd7958977fc9d4188e664a21db84c8b333938a4e03e147f023d1404ac6291999a4bd943a131bbc1bc26d907877e25
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.4-r2.ebuild
index e96df12d24be..3c4bf01a993c 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info
+inherit autotools linux-info tmpfiles
 
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
 HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
@@ -121,3 +121,7 @@ src_install() {
 	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
 	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
 }
+
+pkg_postinst() {
+	tmpfiles_process cryptsetup.conf
+}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
index e96df12d24be..3c4bf01a993c 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.6-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info
+inherit autotools linux-info tmpfiles
 
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
 HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
@@ -121,3 +121,7 @@ src_install() {
 	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
 	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
 }
+
+pkg_postinst() {
+	tmpfiles_process cryptsetup.conf
+}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r1.ebuild
index 6a8851cfee43..3e204ddad194 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.4.0_rc0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.4.0_rc1-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools linux-info
+inherit autotools linux-info tmpfiles
 
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
 HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
@@ -16,7 +16,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~
 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
-IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt static static-libs +udev urandom ssh"
+IUSE="${CRYPTO_BACKENDS} +argon2 nls pwquality reencrypt ssh static static-libs +udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
 	static? ( !gcrypt )" #496612
 
@@ -127,3 +127,7 @@ src_install() {
 	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
 	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
 }
+
+pkg_postinst() {
+	tmpfiles_process cryptsetup.conf
+}
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 6521e7d1c12c..f86db311c939 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -4,7 +4,7 @@ DIST fuse-3.10.3.tar.xz 2558792 BLAKE2B 5b730321677e5080148c2ca5db35ed14b6f1919c
 DIST fuse-3.10.4.tar.xz 2787472 BLAKE2B 174b51bf55544bbc08e04089a4d8685b371d3f584e337ed0d8d82c62e10c14b6ef14a964d6627e8a121036db1ab4c6c1ccd413c08f8685d3d91893874427e46f SHA512 1cb7600dc04f148b15ec3183d0348320dd946cf15d4077798e7e34fe7e8202837718c8b8bd1f190b7dddda2453ee2b0433d77e18f142ecb7affec1cae29520f6
 DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
 EBUILD fuse-2.9.9-r1.ebuild 2056 BLAKE2B a62986e92f4deb4993f4c0bd71996c1f2b4be435e396dc869f8fda9d6b0c3e74e397a6388fb66b076cc5bbc441d3122aa8ea7c788d5a96b82386621e1427b882 SHA512 0c65cac78140b2baf6ce8c3342c99cb52a1746b0a7d0a21d4e44955d56d7fd5b334b020ffd2cb1bb982f9652b422e7555d05ab2ff5746b664786e5c2f3c38bf8
-EBUILD fuse-3.10.3.ebuild 1780 BLAKE2B 8353528e780c89cd401d0d9edfbfe48e5483e555f953c7f55e143ea6d14f2da86d51c86b6a88917d4fe58a09feb6e4c3b194a2cfed3adeac14e124a3b0e825be SHA512 4218dbf5460324b4f0944f5154ec04da949c5d3dc7b097cd6abffc62cad6351195d007c6d8ad09df71a444c3245f76b641648a47b1d50e097c13f58f4b585778
+EBUILD fuse-3.10.3.ebuild 1779 BLAKE2B c6b51c0cb628354f575d7428a6fd1db86a9a8db3c400f425170334c74409599f079bb5195338b9f1b8325cf7eaeb4a6e52672eec253e7ddf018c84c5687c0930 SHA512 3f52e1f3b2fee5b8704c01d7309c4f0864a48c688731bc54662c7eb96107ea0468f3402df22ff71409311311736f114c6f6c76e43b5ca6f06687cbaf6e7f38cb
 EBUILD fuse-3.10.4.ebuild 1787 BLAKE2B 19b6886011b27cb4ecb6e8128d23833b78c6f97c349b1b65e290607c0ee24a186ff5945ac3f689905162cfba719aad02ebe2269cc6ca0ab33aeeb16eb2edf22a SHA512 b81a884161020b1d1e284e47b0857e0edb4543f3ae504409f2f2f1f2c798e137626a20f914cb1217d42e8273493bad61e9c2e5c12e5d18feb2da38dec2279d80
 EBUILD fuse-3.9.3.ebuild 1909 BLAKE2B 1782605f62d587f1677e140cd2dcf714c2420d642d164a1cfafdbd1270d8a79881ff3daefe168fd9b5fea7dfbf95c994878106493ca89a84cdcbeaf41362dabe SHA512 2dac127d407278184c69798fd84c2f1520a48a31122ef33988efeab878dd942fa82b2abf62098a0ae52b3ffcfe3a5cfc883690bd642238112069f36c0575034e
 MISC metadata.xml 460 BLAKE2B a8f51e9fc0148b7bcc163ea5e0f72291f9e36f3dad8c20076495fe32cb8d5fe992579ab069f840bca251164ff646c522ee0b7ad5ffa7b3115effa89d5acfe332 SHA512 e56ba815557e847487dbc76dbec4ae657c7c4ecebc9b3c02c39402daa699c5ff90923bcaf1843747c94d2025f339ca6521f35f48c6c4583d36e9de33e6f3a586
diff --git a/sys-fs/fuse/fuse-3.10.3.ebuild b/sys-fs/fuse/fuse-3.10.3.ebuild
index 23c420f21ebc..80905c5ccb83 100644
--- a/sys-fs/fuse/fuse-3.10.3.ebuild
+++ b/sys-fs/fuse/fuse-3.10.3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="3"
-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="+suid test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 2e37ad06efce..65ae527b84f9 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -3,6 +3,6 @@ AUX multipath-tools-0.8.6-no-compress-man-pages.patch 8056 BLAKE2B 6e1ef1680538f
 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
 AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e
 DIST multipath-tools-0.8.6.tar.gz 519405 BLAKE2B 5aed36550c76bbde0e874e37356b6c5a80a80b876b56dadb69ce09f0fb049a7097fd1c0aca5076f816848e2c2660f96680d7f16d56918a25299017b39f76f777 SHA512 82e5b7307e599ba6b059679c3987a442fb5be4885f0a27c260a99a07cb336b88d48e314b4ec951944e0200e4731522d8da043d98fa566857ecc6d100791c0e38
-EBUILD multipath-tools-0.8.6-r1.ebuild 2143 BLAKE2B e43f6abb36ea701d747513b6ac01344872b9e36c976f3f8213a51406d767047af9e69e0f1e4c6436852397fc597c57f89dc819985249362fed8e491015a47211 SHA512 c958b3bc9ade0daa842992efe67499ecd86d7948057bd1fcc88d158e5109539e5ac20ce5aaa17d6d73125158a38aa4dabbe4eb150dec8f282ebfa3b189b0d062
+EBUILD multipath-tools-0.8.6-r1.ebuild 2141 BLAKE2B 70dc0bdd9bc5d7d4fff9a64d883841410265f541c10e24d79e64708422f32a9a6b9eaf561054292bac27ff46a66b5c4c56086a7eadc3819bc0e7a7d8df4ad0e8 SHA512 1f4c59f6ea83c0463f7350a2ee3f6003ca081c33c965db90b26dcd4152682c60b6449cf438e5ee8d0b2a7f2a2380cc2af8a3379a4f9e2bc68ca84ef070e0b43e
 EBUILD multipath-tools-0.8.6.ebuild 2078 BLAKE2B 185d6508999de14cb02f9db69823b561cc62d9dbe596828421cd2381c656301874bb3f43052042b5a3179ca8de469914557acc7369109cdd5ef9c267b5493059 SHA512 c591a02efae279dce30f20f6ba5647eeec4d353e29f38f07a4677c0a683b07ad24a7471e7316e8e4063df43c4bca0833bbdef653ffa8e833566a9bb7fdb14c2a
 MISC metadata.xml 452 BLAKE2B e950c42b1b03518526a348e0bb2a6ad8d2b912e14f71562d4249d1adeaf149443621d4518a6fdf7912e8efeb40634177a0da7d944d2142c7eb851231356a353c SHA512 2bd1aab9e07240502a4bd344c9ed73df3c677f41083f76865862e679c613dbf23957bce83469b5ddb9afa43fda13b7cf2fa4efb31da9b89a9ec91631260111b2
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
index 8dff4dda6bf3..7a3d1e0718c2 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.6-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/opensvc/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ppc64 x86"
 IUSE="systemd rbd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 805c1d0b0c4d..319b0f2a6d56 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,13 +1,7 @@
 AUX 249-libudev-static.patch 1454 BLAKE2B 420f9452066ccf951033c1ae1e215284fa9d11f24777c68ecd0178db5c7571ee881451300d409468c1ba3f3b2ad4b35adca5b2761309c84b315bbabd45f6b97f SHA512 4d616b4b02981c4622951a46f23519e03c2d1228453837d31fe060db70afa24722883ca57c08c55cd9fd35c720a5ef2ecb11ab3313867e1b3cfc3682e45e3f45
 AUX 40-gentoo.rules 167 BLAKE2B 07116c6e5aab7de9fa8a88c6cdd9ad76a09d797d6f7bc3d0535c93ccf83486bbdae8f68d682714576b072a174df070505cce9c6f4b729e91a6f61ed89da72e8e SHA512 92e2be610839432f46cefab4d128825199dc9f2c5ef33119f9ff84dfe635ef56a4f7aaed64ba52ea2798868b00c3a1b7955caa33219aa298c6a2b8290181f94b
-DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1cb190b25e4dbf0a8f2be075d04a3cbe92e2fee5bb6a03b73bd8195d8c7b691661b39b7850547d512219cc40af SHA512 486f6ac6c2897a2aac97a59306091a03fd50768340407401e1f088ea5b21c67dae726bff4cbe53cec6b89a8f0ee72205b340165a4fe3a3c16cff6d176506c6e0
 DIST systemd-249.tar.gz 10588828 BLAKE2B f7896dea0bdec25125188b94ee84270b972649b1eb16599bed1967ced79f62dbfd1494e22362934f418823c054b342fb24dc57706b49520814beb95b6956bf27 SHA512 0810d09cc32e4aaa4425ee5b7ddf129262b061ce159cbd43571fabda48285243d8f80b566379ece9215d531b9407ee45e1e72c71935644fea31c7bca1bbf540c
-DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
-DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
-EBUILD udev-245.5-r1.ebuild 5968 BLAKE2B 67f2fddbebf375b7901ffc12c0f0c50f4745acf0a24d5e5b5955910a1f1403c523a024538e29b41985a2638e3f35e919517e1789a22208b975c31b0499d62815 SHA512 0d805c6259030058a1e22b0a69bb427df1c8eacc7d4c0fe5a78c76ddbb3e5da5995d24f1832cd70db12735c58ffef3a70a2d8accfddd8c4c423b8152996cac1a
-EBUILD udev-246-r1.ebuild 5967 BLAKE2B 3b1af1762b4a31f83084cc616770769e54772ab4be84e279e56764e0c9693da670e91f67acaa102de44e2d8eb469a84b1a3e7dca4a3053e388fe270d939b736b SHA512 ff1cbb4d84cc5caf468db8b79750bf0631c26d65200bc2f76c4776ac84e6bceebc189d7f8fd8733ff29f67cf826484eaa5dd162c03682bee2233181279a40cf1
-EBUILD udev-247.2.ebuild 5688 BLAKE2B da40822cb40389a42ef0e11f65fefa8d13b121b8e10a3cc6bb68056a081f2aafe12cabb7394b9b022fc8c3fc5718e5d6b2b3cd8f8ce04457e1a766e882abc5cc SHA512 83f80cbe8f786264b86dd3b880759d3519942805f2625e3e171e88601ede87cb488c4b3ec98e8a5e7e3f3023a2a244c6c3cd465fdb82f1e148883a88757891ba
 EBUILD udev-248.ebuild 5475 BLAKE2B 70b628ed25d8f5b39c556e680bece42604ba30ff083fe7e0f2e77a677dc8f89a7aafcea7fadfec4f756aad03c0f9b19dae34f1a43bff724444fa429d55ab183d SHA512 1954e732be787b8a9b9454ae0987bbc2276de6b7e71ec8d260d5e1c835bb9a1f68c04843709f42c791e58ad43c70f5146f5faeaf1e776353119b5ad15404d901
 EBUILD udev-249-r1.ebuild 5776 BLAKE2B 909f1699e70b77b0347f35fa3353cc16021870aea15fbdf4faca6623327a22237ca78a9891e4e141cf72ae682023611155234cac4fb6008e6ccc1cfb97d9eef5 SHA512 1ec11b20403555deb4d7725289af1a214550aa92d3aea2d39807a1d26a73764e499eed1b3b8deec9300e406c5eb9efab24ae01d365fb9055728660b2c74bacba
 EBUILD udev-9999.ebuild 5735 BLAKE2B 7847f1af44dd1dd3b85b9144c690066260297ab2beba5cc86be946838f3a07b7976b108629f8d50424b6cc3bfe37e60c3ed87262a44465d42c68c689fb70db16 SHA512 68ee2e626625d6fbd7c7747b0e6788329b3a81015ebe3f6db1d65bc3bca8cbe8e56792ffe2a9acb736395c2549d0f6969f1fadd2cd00eec950ed5726674c05dd
diff --git a/sys-fs/udev/udev-245.5-r1.ebuild b/sys-fs/udev/udev-245.5-r1.ebuild
deleted file mode 100644
index 1322ad2f6057..000000000000
--- a/sys-fs/udev/udev-245.5-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 2003-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 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	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"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="acl +kmod selinux static-libs"
-
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	virtual/pkgconfig
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-"
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl )
-	kmod? ( >=sys-apps/kmod-15 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.9
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/kmem
-	acct-group/tty
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/lp
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-"
-PDEPEND=">=sys-apps/hwids-20140304[udev]
-	>=sys-fs/udev-init-scripts-26"
-
-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"
-		linux-info_pkg_setup
-
-		# CONFIG_FHANDLE was introduced by 2.6.39
-		local MINKV=2.6.39
-
-		if kernel_is -lt ${MINKV//./ }; then
-			eerror "Your running kernel is too old to run this version of ${P}"
-			eerror "You need to upgrade kernel at least to ${MINKV}"
-		fi
-
-		if kernel_is -lt 3 7; then
-			ewarn "Your running kernel is too old to have firmware loader and"
-			ewarn "this version of ${P} doesn't have userspace firmware loader"
-			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
-		fi
-	fi
-}
-
-src_prepare() {
-	cat <<-EOF > "${T}"/40-gentoo.rules
-	# Gentoo specific floppy and usb groups
-	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
-	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-	EOF
-
-	if [[ -d "${WORKDIR}/patches" ]]; then
-		eapply "${WORKDIR}/patches"
-	fi
-
-	local PATCHES=(
-	)
-
-	default
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dacl=$(meson_multilib_native_use acl)
-		-Defi=false
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Dlink-udev-shared=false
-		-Dsplit-usr=true
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dstatic-libudev=$(usex static-libs true false)
-
-		# Prevent automagic deps
-		-Dgcrypt=false
-		-Dlibcryptsetup=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dseccomp=false
-		-Dlz4=false
-		-Dxz=false
-	)
-	meson_src_configure
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-	python_setup
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	# meson creates this link
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	local targets=(
-		src/udev/${libudev}
-	)
-	if use static-libs; then
-		targets+=( src/udev/libudev.a )
-	fi
-	if multilib_is_native_abi; then
-		targets+=(
-			systemd-udevd
-			udevadm
-			src/udev/ata_id
-			src/udev/cdrom_id
-			src/udev/fido_id
-			src/udev/mtd_probe
-			src/udev/scsi_id
-			src/udev/v4l_id
-			man/udev.conf.5
-			man/systemd.link.5
-			man/hwdb.7
-			man/udev.7
-			man/systemd-udevd.service.8
-			man/udevadm.8
-		)
-	fi
-	eninja "${targets[@]}"
-}
-
-multilib_src_install() {
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
-	gen_usr_ldscript -a udev
-	use static-libs && dolib.a src/udev/libudev.a
-
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins src/libudev/libudev.pc
-
-	if multilib_is_native_abi; then
-		into /
-		dobin udevadm
-
-		exeinto /lib/systemd
-		doexe systemd-udevd
-
-		exeinto /lib/udev
-		doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
-		rm rules.d/99-systemd.rules || die
-		insinto /lib/udev/rules.d
-		doins rules.d/*.rules
-
-		insinto /usr/share/pkgconfig
-		doins src/udev/udev.pc
-
-		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
-		rm man/systemd-udevd-{control,kernel}.socket.8 || die
-		doman man/*.[0-9]
-	fi
-}
-
-multilib_src_install_all() {
-	doheader src/libudev/libudev.h
-
-	insinto /etc/udev
-	doins src/udev/udev.conf
-	keepdir /etc/udev/{hwdb.d,rules.d}
-
-	insinto /lib/systemd/network
-	doins network/99-default.link
-
-	# see src_prepare() for content of 40-gentoo.rules
-	insinto /lib/udev/rules.d
-	doins "${T}"/40-gentoo.rules
-	doins "${S}"/rules.d/*.rules
-
-	dobashcomp shell-completion/bash/udevadm
-
-	insinto /usr/share/zsh/site-functions
-	doins shell-completion/zsh/_udevadm
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	# Update hwdb database in case the format is changed by udev version.
-	if has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT}"
-		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
-	fi
-}
diff --git a/sys-fs/udev/udev-246-r1.ebuild b/sys-fs/udev/udev-246-r1.ebuild
deleted file mode 100644
index 5fc08f3b74af..000000000000
--- a/sys-fs/udev/udev-246-r1.ebuild
+++ /dev/null
@@ -1,245 +0,0 @@
-# Copyright 2003-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 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	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"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="acl +kmod selinux static-libs"
-
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	virtual/pkgconfig
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-"
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl )
-	kmod? ( >=sys-apps/kmod-15 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.9
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/kmem
-	acct-group/tty
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/lp
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-"
-PDEPEND=">=sys-apps/hwids-20140304[udev]
-	>=sys-fs/udev-init-scripts-34"
-
-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"
-		linux-info_pkg_setup
-
-		# CONFIG_FHANDLE was introduced by 2.6.39
-		local MINKV=2.6.39
-
-		if kernel_is -lt ${MINKV//./ }; then
-			eerror "Your running kernel is too old to run this version of ${P}"
-			eerror "You need to upgrade kernel at least to ${MINKV}"
-		fi
-
-		if kernel_is -lt 3 7; then
-			ewarn "Your running kernel is too old to have firmware loader and"
-			ewarn "this version of ${P} doesn't have userspace firmware loader"
-			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
-		fi
-	fi
-}
-
-src_prepare() {
-	cat <<-EOF > "${T}"/40-gentoo.rules
-	# Gentoo specific floppy and usb groups
-	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
-	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-	EOF
-
-	if [[ -d "${WORKDIR}/patches" ]]; then
-		eapply "${WORKDIR}/patches"
-	fi
-
-	local PATCHES=(
-	)
-
-	default
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dacl=$(meson_multilib_native_use acl)
-		-Defi=false
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Dlink-udev-shared=false
-		-Dsplit-usr=true
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dstatic-libudev=$(usex static-libs true false)
-
-		# Prevent automagic deps
-		-Dgcrypt=false
-		-Dlibcryptsetup=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dseccomp=false
-		-Dlz4=false
-		-Dxz=false
-	)
-	meson_src_configure
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-	python_setup
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	# meson creates this link
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	local targets=(
-		src/udev/${libudev}
-	)
-	if use static-libs; then
-		targets+=( src/udev/libudev.a )
-	fi
-	if multilib_is_native_abi; then
-		targets+=(
-			udevadm
-			src/udev/ata_id
-			src/udev/cdrom_id
-			src/udev/fido_id
-			src/udev/mtd_probe
-			src/udev/scsi_id
-			src/udev/v4l_id
-			man/udev.conf.5
-			man/systemd.link.5
-			man/hwdb.7
-			man/udev.7
-			man/systemd-udevd.service.8
-			man/udevadm.8
-		)
-	fi
-	eninja "${targets[@]}"
-}
-
-multilib_src_install() {
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
-	gen_usr_ldscript -a udev
-	use static-libs && dolib.a src/udev/libudev.a
-
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins src/libudev/libudev.pc
-
-	if multilib_is_native_abi; then
-		into /
-		dobin udevadm
-
-		dosym ../../bin/udevadm /lib/systemd/systemd-udevd
-
-		exeinto /lib/udev
-		doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
-		rm rules.d/99-systemd.rules || die
-		insinto /lib/udev/rules.d
-		doins rules.d/*.rules
-
-		insinto /usr/share/pkgconfig
-		doins src/udev/udev.pc
-
-		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
-		rm man/systemd-udevd-{control,kernel}.socket.8 || die
-		doman man/*.[0-9]
-	fi
-}
-
-multilib_src_install_all() {
-	doheader src/libudev/libudev.h
-
-	insinto /etc/udev
-	doins src/udev/udev.conf
-	keepdir /etc/udev/{hwdb.d,rules.d}
-
-	insinto /lib/systemd/network
-	doins network/99-default.link
-
-	# see src_prepare() for content of 40-gentoo.rules
-	insinto /lib/udev/rules.d
-	doins "${T}"/40-gentoo.rules
-	doins "${S}"/rules.d/*.rules
-
-	dobashcomp shell-completion/bash/udevadm
-
-	insinto /usr/share/zsh/site-functions
-	doins shell-completion/zsh/_udevadm
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	# Update hwdb database in case the format is changed by udev version.
-	if has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT}"
-		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
-	fi
-}
diff --git a/sys-fs/udev/udev-247.2.ebuild b/sys-fs/udev/udev-247.2.ebuild
deleted file mode 100644
index b1dfe60bc551..000000000000
--- a/sys-fs/udev/udev-247.2.ebuild
+++ /dev/null
@@ -1,236 +0,0 @@
-# Copyright 2003-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 linux-info meson ninja-utils multilib-minimal python-any-r1 toolchain-funcs udev usr-ldscript
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	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"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="acl +kmod selinux static-libs"
-
-RESTRICT="test"
-
-BDEPEND="
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	virtual/pkgconfig
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	${PYTHON_DEPS}
-"
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl )
-	kmod? ( >=sys-apps/kmod-15 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.9
-"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/kmem
-	acct-group/tty
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/lp
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd
-"
-PDEPEND=">=sys-apps/hwids-20140304[udev]
-	>=sys-fs/udev-init-scripts-34"
-
-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"
-		linux-info_pkg_setup
-
-		# CONFIG_FHANDLE was introduced by 2.6.39
-		local MINKV=2.6.39
-
-		if kernel_is -lt ${MINKV//./ }; then
-			eerror "Your running kernel is too old to run this version of ${P}"
-			eerror "You need to upgrade kernel at least to ${MINKV}"
-		fi
-
-		if kernel_is -lt 3 7; then
-			ewarn "Your running kernel is too old to have firmware loader and"
-			ewarn "this version of ${P} doesn't have userspace firmware loader"
-			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
-		fi
-	fi
-}
-
-src_prepare() {
-	local PATCHES=(
-	)
-
-	default
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dacl=$(meson_multilib_native_use acl)
-		-Defi=false
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Dlink-udev-shared=false
-		-Dsplit-usr=true
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dstatic-libudev=$(usex static-libs true false)
-
-		# Prevent automagic deps
-		-Dgcrypt=false
-		-Dlibcryptsetup=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dp11kit=false
-		-Dseccomp=false
-		-Dlz4=false
-		-Dxz=false
-	)
-	meson_src_configure
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-	python_setup
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	# meson creates this link
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	local targets=(
-		src/udev/${libudev}
-	)
-	if use static-libs; then
-		targets+=( src/udev/libudev.a )
-	fi
-	if multilib_is_native_abi; then
-		targets+=(
-			udevadm
-			src/udev/ata_id
-			src/udev/cdrom_id
-			src/udev/fido_id
-			src/udev/mtd_probe
-			src/udev/scsi_id
-			src/udev/v4l_id
-			man/udev.conf.5
-			man/systemd.link.5
-			man/hwdb.7
-			man/udev.7
-			man/systemd-udevd.service.8
-			man/udevadm.8
-		)
-	fi
-	eninja "${targets[@]}"
-}
-
-multilib_src_install() {
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
-	gen_usr_ldscript -a udev
-	use static-libs && dolib.a src/udev/libudev.a
-
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins src/libudev/libudev.pc
-
-	if multilib_is_native_abi; then
-		into /
-		dobin udevadm
-
-		dosym ../../bin/udevadm /lib/systemd/systemd-udevd
-
-		exeinto /lib/udev
-		doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
-		rm rules.d/99-systemd.rules || die
-		insinto /lib/udev/rules.d
-		doins rules.d/*.rules
-
-		insinto /usr/share/pkgconfig
-		doins src/udev/udev.pc
-
-		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
-		rm man/systemd-udevd-{control,kernel}.socket.8 || die
-		doman man/*.[0-9]
-	fi
-}
-
-multilib_src_install_all() {
-	doheader src/libudev/libudev.h
-
-	insinto /etc/udev
-	doins src/udev/udev.conf
-	keepdir /etc/udev/{hwdb.d,rules.d}
-
-	insinto /lib/systemd/network
-	doins network/99-default.link
-
-	# see src_prepare() for content of 40-gentoo.rules
-	insinto /lib/udev/rules.d
-	doins "${FILESDIR}"/40-gentoo.rules
-	doins "${S}"/rules.d/*.rules
-
-	dobashcomp shell-completion/bash/udevadm
-
-	insinto /usr/share/zsh/site-functions
-	doins shell-completion/zsh/_udevadm
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	# Update hwdb database in case the format is changed by udev version.
-	if has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT}"
-		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
-	fi
-}
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 7b2a72c3467c..845b40e1a787 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,5 +1,5 @@
 DIST udisks-2.9.1.tar.bz2 1680327 BLAKE2B 6573dd91decfaece6668a9848fc5ff276190c0d2be272e2d0fa550274a3e20df4038a87dd5fbb7b1b6a33a4c94f5668d01297d583da7df7027353353ef3936f4 SHA512 a360cafc65375153c5de65f817eecbc65d56a9d9167222e1adbc8f57568d15ccf7ed317e8e0b567340f250ca9247196de104442191bd069510f72dfc5ed65eb3
 DIST udisks-2.9.2.tar.bz2 1701377 BLAKE2B 402cf2354907acee13230d035c8b22634a70efab0e61939d8ff260391c80a0d166de67f57cc4b78025da027df16deb07c5620ab546d37181681d824ea84d0e8c SHA512 73a162bbb0fd6ec1e6a79af2a01185672712d7e94eacdc1a913f559a87fc620a095fe4c8b4dacbaa12bc816f565fc966d28c2f9299104da18581d4879321aee9
-EBUILD udisks-2.9.1-r1.ebuild 3446 BLAKE2B d42d0f9cdffdcec6f22ee1d03ed7a6d8b69075586e38adc316e794b67daaadc3fd48da317a813d5c5a02cae6a5f0f1c4399a3caad73175ef178e44380f21badb SHA512 d5a5e129d0f8ffe1a1c7e3e7208f2392d5d5bf9913ae19bb8a2aa5fa413cec96f450041ca54c83e8483279e41d9091d8d4733e67ad37c118d955eef69c744bf4
-EBUILD udisks-2.9.2-r1.ebuild 3568 BLAKE2B a2e34c2603f70bbe9eed4d8aadadbb966fcafb6e55fa11032e9a04090d06c889dc551c39d621e29b3300807d0f3a6516203be73ce9ea350172d437f20200f748 SHA512 d0cebbe4f56339110685a6227c3e05a9d8c21226ed0254aa950ea5bd4e85694b156d7e37e9d8e9bca5e32aa86c8ef5fda83b00a9c770a3d35a9a74b1054ce7d7
+EBUILD udisks-2.9.1-r2.ebuild 3529 BLAKE2B 45aa4d904dd309b528754dd7077a1c0c23b94c6f6f2aa3413af4ff793536aafc46947c360274ed38999538838e63accbb34d01d2e846040268df8f24853c0193 SHA512 2d20c606cd8e05f50da1e0020b58f8790f9ae25fbd98de2e4280a1dc55826ae44e15a2d8ceef3c2d6c4fea5da4622c8d29ba71eb86245fcc8583f70728d8dd36
+EBUILD udisks-2.9.2-r2.ebuild 3652 BLAKE2B b7e3809e57ab006d4652152287941e08c902d1cdc950a9dbbd187fb62be7f7dcdfd01bd840157aa62b6612d56bdf11f24dbc048dc01073010c33ac005c39e52c SHA512 83b736c253aedda99a8376e3bcd341a73430d18ccbd056314573af5d7fe29fa7b51fd593c0a260ae22e4fcd7dff04aad35cd4cfffa58e111bd6118f5e6e4a753
 MISC metadata.xml 728 BLAKE2B 4a540e1378d04b04e2b75a531e9df8c13faee4870c8bc3778e9e08dc742eb9e28e2b1134448302e43cbb8815432fa0bbbb402f22722267fa4869fe0c04775c8b SHA512 9f057eb51f5924b53cecf5e495b02bb6fad41e9b23c197b1f24a972e8a25504506e73329a93295e9eb30e62863f7c4454909fba10fdea696be23caa7cf50d8cb
diff --git a/sys-fs/udisks/udisks-2.9.1-r1.ebuild b/sys-fs/udisks/udisks-2.9.1-r2.ebuild
index c6aaf0083376..57047f60efec 100644
--- a/sys-fs/udisks/udisks-2.9.1-r1.ebuild
+++ b/sys-fs/udisks/udisks-2.9.1-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit bash-completion-r1 linux-info systemd udev xdg-utils
+inherit bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
 
 DESCRIPTION="Daemon providing interfaces to work with storage devices"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
@@ -119,7 +119,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	mkdir -p "${EROOT}"/run #415987
+	# TODO: obsolete with tmpfiles_process?
+	#mkdir -p "${EROOT}"/run #415987
+
+	tmpfiles_process udisks2.conf
 
 	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
 	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
diff --git a/sys-fs/udisks/udisks-2.9.2-r1.ebuild b/sys-fs/udisks/udisks-2.9.2-r2.ebuild
index 47fbecee3c8c..480609ab96ff 100644
--- a/sys-fs/udisks/udisks-2.9.2-r1.ebuild
+++ b/sys-fs/udisks/udisks-2.9.2-r2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit bash-completion-r1 linux-info systemd udev xdg-utils
+inherit bash-completion-r1 linux-info systemd tmpfiles udev xdg-utils
 
 DESCRIPTION="Daemon providing interfaces to work with storage devices"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
@@ -122,7 +122,10 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
-	mkdir -p "${EROOT}"/run #415987
+	# TODO: obsolete with tmpfiles_process?
+	# mkdir -p "${EROOT}"/run #415987
+
+	tmpfiles_process udisks2.conf
 
 	# See pkg_postinst() of >=sys-apps/baselayout-2.1-r1. Keep in sync?
 	if ! grep -qs "^tmpfs.*/run " "${EROOT}"/proc/mounts ; then
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 55c17eecb6c8..c75d5b2ad606 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -5,7 +5,7 @@ DIST zfs-2.0.5.tar.gz.asc 836 BLAKE2B 6bc53160ce650f63c717b67116fb754c7a8196c9aa
 DIST zfs-2.1.0.tar.gz 34810470 BLAKE2B f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 SHA512 2121b90a1d4d92353801c48a2e34e2dd42bd295dacc3c30aa77cde967a1326e17c983bdd6905552421df0a652c09e84b3d4d2ba01001e053b8afb12e189c046f
 DIST zfs-2.1.0.tar.gz.asc 195 BLAKE2B d5a7c01c7fd1798a235d5bc9ba89353a85978ac8bb1eaec1c587b8cc6d7cd24b0d7613c465a8da7ba29a172e4ebd6e465f893145d9dd7adf11d7e3858fea835a SHA512 1c5c8d20adbcc27c5e5d760a84e258a897dee7c3950ef1eb56f3ef6bd1c85516c7776ce30b3e63229cd65315d43e06b5e04c587e9483b96b00adb42d24749c1a
 EBUILD zfs-kmod-0.8.6.ebuild 5334 BLAKE2B abaa4b20899db464246d9c445ba55d938ba1982a2686a2c6b22fcc213e76551d2a28a59709760dd5e15af6cfdc8e4999713ae4d1efd3275c02a85f1dfc5b3275 SHA512 f67b1c4483f2a985256c18dcaf232c47219726f67c9fa95b184be6e608dc997b2beab18bd5863d32afcc92da0bad5c3ef8337a8878cf060d45b3931e8e736b77
-EBUILD zfs-kmod-2.0.5.ebuild 5369 BLAKE2B e8ad56e7d466f9663d30a06c52ea06d3ebafc2cc4565caf2b57b6d2355878806ef859f74e43dce2b3622820d64b57dfca21d59ac2fad32c789ab3f1ee2160071 SHA512 df15493fb58aaa9c9fd46ec1017d159478be417f8b480ecfc7abe5bbdd3bf1917d8204428763c79363578a59d26e5691a49ee0698a54a7a3e58ea8a40b1469bf
-EBUILD zfs-kmod-2.1.0.ebuild 4578 BLAKE2B 7555ad82359618753003e5ef2e7e3e2f51405c748aa1c58b6a6019358353f240caa57629ad9bdfacf440cfa9dabf3b2b0d726acbcbc607fc114309e0d89206d0 SHA512 30b8887454da16b66f244ca1ce6a78a8486f09183c3b95316df673292e53ca1ec87706638f725235183779e3464673a6ee73f37aa5d1484ce4ee6441144edb56
-EBUILD zfs-kmod-9999.ebuild 4578 BLAKE2B 7555ad82359618753003e5ef2e7e3e2f51405c748aa1c58b6a6019358353f240caa57629ad9bdfacf440cfa9dabf3b2b0d726acbcbc607fc114309e0d89206d0 SHA512 30b8887454da16b66f244ca1ce6a78a8486f09183c3b95316df673292e53ca1ec87706638f725235183779e3464673a6ee73f37aa5d1484ce4ee6441144edb56
+EBUILD zfs-kmod-2.0.5.ebuild 5377 BLAKE2B c2072da1710548fa4e48db0acfe432c4f274b99fde91e0d567080ddb48b8fe943a0eaae91ea0e5effe36280086c53a7e0945ef7276543cb8cf013d8548b84bc7 SHA512 43f97f4c862b9e92f129922b78aca4fba2be1eb1ec338c8e46ec98ac471efc3cda5c60c9a59cc6d0ffc45f9dd5198f9a4266ed82d8a42a157bf4c4bf8a88f280
+EBUILD zfs-kmod-2.1.0.ebuild 4586 BLAKE2B 2c60424a9ad3f7473eeda9828fe91a6a805d24e2662c768f388ecadd76eedc52e70992a15b701adcf72687557f808b0d47f7849bd4d8e7634a0ce99445918f89 SHA512 2423d31d421a8c1c3f46f9618f13823413eab3c70cd7cb580f25647e9ae9db1e53bda49aa0656ca220f27cc53b4d5c8091db73e6c88be429e04d14249c852c0f
+EBUILD zfs-kmod-9999.ebuild 4586 BLAKE2B 2c60424a9ad3f7473eeda9828fe91a6a805d24e2662c768f388ecadd76eedc52e70992a15b701adcf72687557f808b0d47f7849bd4d8e7634a0ce99445918f89 SHA512 2423d31d421a8c1c3f46f9618f13823413eab3c70cd7cb580f25647e9ae9db1e53bda49aa0656ca220f27cc53b4d5c8091db73e6c88be429e04d14249c852c0f
 MISC metadata.xml 548 BLAKE2B 0245ac0b73ed129ce2df41358814d46749fab0463a03fceb643010629cd522460e84c5b8c0247f499adf4ed2e781e0d6f6857a3c6be4f4fb206eeabba158e86c SHA512 2b98b289369d875c5ff89825590a98c9764a1b716df1b79c852dbb833f4f02d5c66782f43084a1acde11a0ba2cb9ef2956b35c10881f77ec92d6749566276e6b
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
index 1b360228eba2..1087f2c1bc99 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.5.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
 	MY_PV="${PV/_rc/-rc}"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
index 1bb0a99b0c65..894d7583448b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.1.0.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
 	MY_PV="${PV/_rc/-rc}"
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 1bb0a99b0c65..894d7583448b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
 	MY_PV="${PV/_rc/-rc}"
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 4a677f562de0..88ce734d26d6 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -6,7 +6,7 @@ DIST zfs-2.0.5.tar.gz.asc 836 BLAKE2B 6bc53160ce650f63c717b67116fb754c7a8196c9aa
 DIST zfs-2.1.0.tar.gz 34810470 BLAKE2B f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 SHA512 2121b90a1d4d92353801c48a2e34e2dd42bd295dacc3c30aa77cde967a1326e17c983bdd6905552421df0a652c09e84b3d4d2ba01001e053b8afb12e189c046f
 DIST zfs-2.1.0.tar.gz.asc 195 BLAKE2B d5a7c01c7fd1798a235d5bc9ba89353a85978ac8bb1eaec1c587b8cc6d7cd24b0d7613c465a8da7ba29a172e4ebd6e465f893145d9dd7adf11d7e3858fea835a SHA512 1c5c8d20adbcc27c5e5d760a84e258a897dee7c3950ef1eb56f3ef6bd1c85516c7776ce30b3e63229cd65315d43e06b5e04c587e9483b96b00adb42d24749c1a
 EBUILD zfs-0.8.6.ebuild 6466 BLAKE2B 1826a984e3bcafa84585869df35eb86d77e713f6f909ae5bdef3a3bce10e78fbf3aaa9ace7d3e0d096ddfd926f75b164020f570864c868224551f2c16eece2ca SHA512 f9241fb89ecef5ba2ecd118dc6ac856614a9afd2b247e87c71a67a136736d77e79d28ad2dab0a019beeb241238424c9e58958704f9435de320e9b97e26f26a62
-EBUILD zfs-2.0.5.ebuild 8178 BLAKE2B 1019348eb30db8ddae5ffc43170ea10100e904ddb51b19b4f9218646754636fc34ac26b1b6065de7540c9531b996101897492fb00518b1b309f8b4715998c46b SHA512 6cfb59f8b6d12ceeba412b201247442d02d941ea605eb0cce260fc3605b1cc5d7e1227a6096a8b7df749d0a82f853eac4440553dccc9abadef750d83d61b3924
-EBUILD zfs-2.1.0.ebuild 8138 BLAKE2B cfdc600c5074229690a23b44124bb11c47708ed9d5d732fc0dc88c92ab84f2984894248ca971a04308fe19088a18662e16afb40c310156173b6a40fa6cf0dce3 SHA512 eda0796cbedf4efe4119a6e79da2c05e0ad70d48e4780f6356442ee607fde8981f2c481c84e97fbc0b66156b74715c1034e0ad30b98b3b68a0c857da482b4eab
-EBUILD zfs-9999.ebuild 8179 BLAKE2B 32692c05c5b90cd9f4e15d9a283b159840129dfa899c5c1093eb28d7bf719882bb5c370a95b599ef113911e4d92c06aea19957cf1221d1b1bc280e9f1fc72d6a SHA512 00da3a86127656479a2515eafd8befbd68a6bf51c1e94fb5302c8df2efa50e8810030d019a0a2d28f42eb8b626ff733397c6eb2cde15ef6672f0615dd7c5d73f
+EBUILD zfs-2.0.5.ebuild 8186 BLAKE2B 75107653cabb6c2dd2ddb7ae3b404a41c11ce3289e5d48dd0dd93d915bdcecfe6ead6633a2af28ec91121657bd9c827b68b8f3a114ee2a71fa21bccedd4b2893 SHA512 30dfc53c514287c073281007c98ba939361bec955b4f1d7727d19a97743d1526b3bbf216c2d55bc47b899bf5962cf0e153dfda120aca1c3ddb2a417c0d013be6
+EBUILD zfs-2.1.0.ebuild 8146 BLAKE2B 70a69fab198c6e031f706270e3dfbb3ad3bf2ed4137d4000592413c370142067271a2c7a5f1eee39f8dc6eef38d2ccee066345fbf2dafc2049fa3389dfcf425f SHA512 7901a471ddf8f6186cff822e9aedf3d6100d78b6cc84a790fd3d8820df832a440f4d3541c3e6fef6d98575a02ce31720bf815e6dcb8c8b2cb4fd928bba49de22
+EBUILD zfs-9999.ebuild 8187 BLAKE2B 9de4cebaf3a9bca728e5e2320bd8575c2b98f3ff2471a822103941f38a4c0f3df3375f49f5276f08138f6954c8e45a49bb55132499788e89cf99eb8dc180f3de SHA512 21aaa4d13cd3bd249754b066380acfa9a8fb5ea427f72f1c387dcc4d03d49ccc3fa6f425dcd72ac37fbf838841c32904a7774b4285a7e120cd331b5f301a4377
 MISC metadata.xml 1000 BLAKE2B 1f3e75ef73d5680d5863f0fda415931a6af19ab1a535c9795c417526ccce2a826ede05abee88ff27c2ec99f1f23aa06cce02cd3cb6d49b2952e90eb94ab95a6b SHA512 f8b30ce788d80c8f65db738f251fe5ebdc4d3ec7206dc78e0b9e53c2cf92153b90e20f6799b2a36bf8e616147b28f9660421bbc2ad17e7dbd804d47f430f6e40
diff --git a/sys-fs/zfs/zfs-2.0.5.ebuild b/sys-fs/zfs/zfs-2.0.5.ebuild
index 30cd97c09b90..7a80202ba47e 100644
--- a/sys-fs/zfs/zfs-2.0.5.ebuild
+++ b/sys-fs/zfs/zfs-2.0.5.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
 	MY_P="${P/_rc/-rc}"
diff --git a/sys-fs/zfs/zfs-2.1.0.ebuild b/sys-fs/zfs/zfs-2.1.0.ebuild
index d4c87d5718e6..5f76d5686bf4 100644
--- a/sys-fs/zfs/zfs-2.1.0.ebuild
+++ b/sys-fs/zfs/zfs-2.1.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
 	MY_P="${P/_rc/-rc}"
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index e3ae8b236090..6d147415a2c0 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/openzfs.asc
 	inherit verify-sig
 
 	MY_P="${P/_rc/-rc}"