gentoo resync : 24.07.2021

43 files changed, 425 insertions, 71 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 7eca20e48d0d..aa625193993b 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 80e76341e978..662c5c2fb675 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.tar.xz 2234256 BLAKE2B dd6dc6977c2a21471b59573c3ae6f7853d5ec4434549873174a6bde6b3ed4c5ed03c5adaed896538cb74699f538ec13403c193f132fcc8a2ba1b4f6bbdbac67e SHA512 7832ca02b77410edd8d80f10c6f1482dee944073518dbacd5773e70f27b7c632231ea66bdb64aa4611869465c15d2d60d364bfd25c2e40e0a2c198edbf9741cd
-EBUILD btrfs-progs-5.10.1.ebuild 3064 BLAKE2B d0bbb45eab6acfe22503d7537d29d40d3182208c57617baa476e993fb105c0057db34132f03391eed7683da07ffe9a059885778553522a434b21717ba50ad822 SHA512 8b24f2934aee146ccd6e9ac06f5a0b12b90263121e2e6a976ac02774bca0c9f4c3d0f2a7d14e79c026c87c6ed6576ec3c07375607d55ccbb2879edc5b5a84d17
-EBUILD btrfs-progs-5.12.1.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
+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.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.10.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.10.1.ebuild
index 3a62ead80149..9a8ec6aa8d5f 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.10.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.10.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
 	convert? ( sys-apps/acl )
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			dev-python/setuptools[${PYTHON_USEDEP}]
 		')
 	)
 	static? (
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild
index 90b1aa08f672..0beda5a218fc 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.12.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	convert? ( sys-apps/acl )
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			dev-python/setuptools[${PYTHON_USEDEP}]
 		')
 	)
 	static? (
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.13.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.13.ebuild
index 90b1aa08f672..0beda5a218fc 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.13.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.13.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	convert? ( sys-apps/acl )
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			dev-python/setuptools[${PYTHON_USEDEP}]
 		')
 	)
 	static? (
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 90b1aa08f672..0beda5a218fc 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit bash-completion-r1 python-single-r1
 
@@ -50,7 +50,7 @@ DEPEND="${RDEPEND}
 	convert? ( sys-apps/acl )
 	python? (
 		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
+			dev-python/setuptools[${PYTHON_USEDEP}]
 		')
 	)
 	static? (
diff --git a/sys-fs/dd-rescue/Manifest b/sys-fs/dd-rescue/Manifest
index 0ded602e7c95..2970763fbf73 100644
--- a/sys-fs/dd-rescue/Manifest
+++ b/sys-fs/dd-rescue/Manifest
@@ -5,6 +5,6 @@ AUX dd-rescue-1.99.8-xattr.patch 9308 BLAKE2B 0874806f5394759edacdc4d937619b4ab5
 AUX dd_rescue-1.99-musl-r2.patch 4035 BLAKE2B cffc620f429db2042a405174a280e44c27dc60f9b3da007969b77d66df599b9c4b9fb02cb2799017c7fb6a0a0f1e8b785c88fb741fb478b6a8f256d0e461bf78 SHA512 a0fe42686852cbdd4ce5a4c55c9dc77cff7165109f3c7d4dfaaec527fa116a17f602ad4fab22410991f05aac6aa8f5b57bb711c05e08f146d532aaa807dbfd66
 DIST dd_rescue-1.99.11.tar.bz2 181927 BLAKE2B 8cd4db6cb8d85962e4cea50b0006fdbe5f085fbcf7bdbfe4d0fab1fe33412c1379317f54429c76ed1d905e32d5e791869fa27f2f14917cb1c3842fc6caca2a12 SHA512 e1d32711421ebbafd80fd210718667ff8c2d22b5349945105b3e4c29d54d381385b1fd188b2d8aa1b7a0aaf2cc9d8f7374373cff3992726a3d17549ca50f3904
 DIST dd_rescue-1.99.8.tar.bz2 174594 BLAKE2B 51e62989bf6318cb5926f30bc1db746bddd41fb49aab15dc2b1c67e0af079469161d390ba4e1e109d195249b3aace3aa830a3aec14ba534eb47f38c0136f910c SHA512 a230e1df4532671ea631036012dd1e38614e45bed58b00757f0017b0ea60f14ac3bdac07777d175aa4929def593b3c8485e463b1fc25b5067adf4cf3f3ac040d
-EBUILD dd-rescue-1.99.11.ebuild 2374 BLAKE2B fdff6926987018a00f43f04d60e979c96e2023221eceff4f6075f5ecc03a7801c2dcf02e5bd0f8e7cd852ced215a4a26e22c9013a2785f19dd020d851aad77f9 SHA512 5882cdde9a0f693446400ae53d0c9105d496f8fff2e17c66e1e0a24b5b6b26c61e2995fcbb41c9cb6ceb025daebdde21456a52fb5e8b186372f503cb9f310db4
+EBUILD dd-rescue-1.99.11.ebuild 2381 BLAKE2B 901bc00304978c28bf32c1609a510a375fe3512af94859c689ccf259f5fdc2a9e8fb89ae86bbc0136875c63d101e608c6ca34121e7073298512efbcaeca85e74 SHA512 496c4f4bfe2191d26f2d2c9cdacca0a1ff9b16909b7100757fb8616cf3ca79cf8ea439094513818a3fa1691f452894ccef02ba86deadd1f788cf7618e9f8b8b1
 EBUILD dd-rescue-1.99.8-r1.ebuild 2502 BLAKE2B 8d7f487f02b8c6cbb1ecab1d9226f646a8a6118eb4d90b25128538b1d4a3430d99a1eb2d17f8e70600346e2f3b987e3cf86276c360bc127d90f15dde0c60a099 SHA512 7df6dceb92cdb93f43002cf33f138cdee775ab431e761663cbb6ea4b15c2bec73d73dabb11347d2a3e6cbbb04a2e1feee8f3bff128bdc9c3cc5b6891e00aacd3
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild
index 8a52492e4e00..5b84b240edb4 100644
--- a/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild
+++ b/sys-fs/dd-rescue/dd-rescue-1.99.11.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://www.garloff.de/kurt/linux/ddrescue/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE="cpu_flags_x86_avx2 lzo cpu_flags_x86_sse4_2 static xattr"
 
 RDEPEND="lzo? ( dev-libs/lzo )
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index eba1cc88fa29..183fa9faf7b7 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -5,11 +5,12 @@ DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d1810
 DIST eudev-3.2.7.tar.gz 1892931 BLAKE2B 9ae903d624e8fb1b334735527329e6074a194dd6e22073c54acc58010d0f8f2d29bdc42d3e6d72dd388c1012be273ca27626ffe1173382d7dde9ad3aee942cd0 SHA512 e6c8ec86ae434c967f6a568fa0b281229bb87be7e3fec025dc3e0225de7843ffaa5dd65bdeffefbc91e9e2911aa3de9df84c76148fe8863ff60fba4c88653c40
 DIST eudev-3.2.8.tar.gz 1894193 BLAKE2B 8709a13031744d5dd2f57853375b920bdaa6ea028624111dc96be9d46748de8423ac749f27183c668336701c16735d7ca2db4566621e0e741a2604785c14c64f SHA512 13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42
 DIST eudev-3.2.9.tar.gz 1959836 BLAKE2B 8792ded8a7d1dfbc16fae249283b58251656961cf360d72932c3fc6ea3e752f6334c21e9ebd9ee3ad0da03a590f8405b3bb7413eec3f964984225f7813311ef6 SHA512 09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f
-EBUILD eudev-3.2.10.ebuild 6979 BLAKE2B e23d90cd49b2029bc53c434a05d6c9cb40b7a62b1a66e45b123ac09862bf4ced60f6ec7686c07c5e5a5f0594d94845506e78aad5377ffe439a15f118ebcebf8b SHA512 c159306e61f1e8d4fe43ef0a655041260c48ef5c145c45fe23606f9f7587c841379adc6a306be2b77d1fd911fdc7ab25c1adc57a463f911b8aae78b94f7a91e5
-EBUILD eudev-3.2.5.ebuild 6813 BLAKE2B 2a3a5a7594a975a3de14e73de39c56f15fd36451b971beb2d04402aa760085a8a599c896ffa9608af6bb11bb7e5de7b1b96d1981648667f909d109906f235394 SHA512 48c14aa3400d9abcd159216185f39b3560860122c2b6090bffb3a8be3149e13574471bf345fcebb99eaf5fe0e430c3d7726494ce63056db30b4556368f7a63e7
-EBUILD eudev-3.2.7-r2.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
-EBUILD eudev-3.2.8.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
-EBUILD eudev-3.2.9.ebuild 6979 BLAKE2B e23d90cd49b2029bc53c434a05d6c9cb40b7a62b1a66e45b123ac09862bf4ced60f6ec7686c07c5e5a5f0594d94845506e78aad5377ffe439a15f118ebcebf8b SHA512 c159306e61f1e8d4fe43ef0a655041260c48ef5c145c45fe23606f9f7587c841379adc6a306be2b77d1fd911fdc7ab25c1adc57a463f911b8aae78b94f7a91e5
-EBUILD eudev-4.9999.ebuild 6111 BLAKE2B 534328760b1714d5a487fe36a8b717fcf5588128bf9d2702fc7739dea1a58b514f231e0cbd9d50dd5c455d0c106f0d0c155cdb89dec881188c0c78791977ad13 SHA512 c101dd4ea16381991470e13388d80b86ddd8930cc2e03993f338b374b1ea27777fcb6f8f934ecfed67e297f3219c3252dd11886133596e2c5aa28f5e981edf24
-EBUILD eudev-9999.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
+EBUILD eudev-3.2.10-r1.ebuild 6980 BLAKE2B e6fcf8106c961eb1984ffe875a984b105210b828840a472022c9e719ec1e9bbc32ae48e4c95ea8adbe704bd59a06a317b99f87d0922772c7a1834a3d984b1e5b SHA512 d7c4fcaea483235143e21b7fd9976050bd272b9dbab3eaf3b39222f1380c895d2491a483ed021e1cac536bc49da8af323e0adc92157029585a93574edd738893
+EBUILD eudev-3.2.10.ebuild 6999 BLAKE2B 5da3c37f967d1ab858aeb027e9928c098a7dd57f118ff1c3725218891e328be153cf6f539b2cae8f3c4bb33263e18170e2d1769d888c67b4a0bb697e4e93daf7 SHA512 82a9d129dd1a8ed9c602215f9d6fb789ca1fd77bc6fd4b9b861f4f3b039fdf6ab3513a854e7cda231520477240b1ba6aa5fff8b370c73c16bf6da82c2185e585
+EBUILD eudev-3.2.5.ebuild 6833 BLAKE2B e1a9f2ce47f6df7ed61f0544d7c134898a25d84b73842a66b94c95135bcf6ba95483999025a763264c2a44b6d5fbac0f34bc4e7051b420e90aaf50fa1cbda75f SHA512 ebadb7eb40160b3b85432cbf6b59285b47f4cbeaea7de47a3ce72fc6558edcfdcbb3956980ca3a3933c3f6887330fe0d7bcebafc1d579a42283d20b124c7d4e3
+EBUILD eudev-3.2.7-r2.ebuild 6994 BLAKE2B 2f6a2777d92b7db0190752b07a1bb3f8f450b9680b950bde5d58952e512465094fed47806f37fd1f2a5d74f7775ebc292f4f84d25ac771b5b9129cedfeba98c8 SHA512 a257717cf80c4704e18a984b7c500657842f7ee7465b424f9233364594ac438f2affbe2b025ccabb8debf61dfe005cf409144ff864ddd0d716d2eef1766532ba
+EBUILD eudev-3.2.8.ebuild 6994 BLAKE2B 2f6a2777d92b7db0190752b07a1bb3f8f450b9680b950bde5d58952e512465094fed47806f37fd1f2a5d74f7775ebc292f4f84d25ac771b5b9129cedfeba98c8 SHA512 a257717cf80c4704e18a984b7c500657842f7ee7465b424f9233364594ac438f2affbe2b025ccabb8debf61dfe005cf409144ff864ddd0d716d2eef1766532ba
+EBUILD eudev-3.2.9.ebuild 6999 BLAKE2B 5da3c37f967d1ab858aeb027e9928c098a7dd57f118ff1c3725218891e328be153cf6f539b2cae8f3c4bb33263e18170e2d1769d888c67b4a0bb697e4e93daf7 SHA512 82a9d129dd1a8ed9c602215f9d6fb789ca1fd77bc6fd4b9b861f4f3b039fdf6ab3513a854e7cda231520477240b1ba6aa5fff8b370c73c16bf6da82c2185e585
+EBUILD eudev-4.9999.ebuild 6105 BLAKE2B edad7d04272f0430ad3e8a347ad3f043a295298d04156ada8576757db2a4d0bfc8732f295ca6db69cb14ee2a47ef376160e06358aa25c17a2f21e2346394149e SHA512 e265895d5feeab3053595e9b84db879a4b87829b0aa28383ec16ad213cea56e6231d8742ace9c303397d261e4fad3e11dab3b2a10025e29cb65504d69e4e7426
+EBUILD eudev-9999.ebuild 6968 BLAKE2B 31272c7f13a0c06fddc6c2ffbe7bbcce75e1a9e1deb79960c2d27c509802acc85694de3d048b628b4b575c1cfc6bdf6e8b8ae8c1576201b35fff7cca9d03dc81 SHA512 8577f6c5dcccc932835efc88106feb9f1a04fffa51cb1770f9f3add1670283718ee8038f8771577d2d3033fbc58011c3c011e9a57fecad5ca2623391f5ff2862
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.2.10-r1.ebuild b/sys-fs/eudev/eudev-3.2.10-r1.ebuild
new file mode 100644
index 000000000000..4c0eb02700d6
--- /dev/null
+++ b/sys-fs/eudev/eudev-3.2.10-r1.ebuild
@@ -0,0 +1,236 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+KV_min=2.6.39
+
+inherit autotools linux-info multilib multilib-minimal toolchain-funcs
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://github.com/gentoo/eudev"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
+	introspection? ( >=dev-libs/gobject-introspection-1.38 )
+	kmod? ( >=sys-apps/kmod-16 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-devel/make-3.82-r4
+	>=sys-kernel/linux-headers-${KV_min}
+	test? ( app-text/tree dev-lang/perl )"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/input
+	acct-group/kvm
+	acct-group/render
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10
+	!sys-fs/udev
+	!sys-apps/systemd"
+
+PDEPEND=">=sys-fs/udev-init-scripts-26
+	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/udev.h
+)
+
+pkg_pretend() {
+	ewarn
+	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
+	ewarn "as described in the URL below:"
+	ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	ewarn
+	ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
+	ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
+	ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
+	ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
+	ewarn
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+	linux-info_pkg_setup
+	get_running_version
+
+	# These are required kernel options, but we don't error out on them
+	# because you can build under one kernel and run under another.
+	if kernel_is lt ${KV_min//./ }; then
+		ewarn
+		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
+		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# change rules back to group uucp instead of dialout for now
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
+	|| die "failed to change group dialout to uucp"
+
+	eapply_user
+	eautoreconf
+}
+
+multilib_src_configure() {
+	tc-export CC #463846
+	export cc_cv_CFLAGS__flto=no #502950
+
+	# Keep sorted by ./configure --help and only pass --disable flags
+	# when *required* to avoid external deps or unnecessary compile
+	local econf_args
+	econf_args=(
+		ac_cv_search_cap_init=
+		ac_cv_header_sys_capability_h=yes
+		DBUS_CFLAGS=' '
+		DBUS_LIBS=' '
+		--with-rootprefix=
+		--with-rootrundir=/run
+		--exec-prefix="${EPREFIX}"
+		--bindir="${EPREFIX}"/bin
+		--includedir="${EPREFIX}"/usr/include
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--with-rootlibexecdir="${EPREFIX}"/lib/udev
+		--enable-split-usr
+		--enable-manpages
+		--disable-hwdb
+	)
+
+	# Only build libudev for non-native_abi, and only install it to libdir,
+	# that means all options only apply to native_abi
+	if multilib_is_native_abi; then
+		econf_args+=(
+			--with-rootlibdir="${EPREFIX}"/$(get_libdir)
+			$(use_enable introspection)
+			$(use_enable kmod)
+			$(use_enable static-libs static)
+			$(use_enable selinux)
+			$(use_enable rule-generator)
+		)
+	else
+		econf_args+=(
+			--disable-static
+			--disable-introspection
+			--disable-kmod
+			--disable-selinux
+			--disable-rule-generator
+		)
+	fi
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		emake -C src/shared
+		emake -C src/libudev
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake -C src/libudev DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_test() {
+	# make sandbox get out of the way
+	# these are safe because there is a fake root filesystem put in place,
+	# but sandbox seems to evaluate the paths of the test i/o instead of the
+	# paths of the actual i/o that results.
+	# also only test for native abi
+	if multilib_is_native_abi; then
+		addread /sys
+		addwrite /dev
+		addwrite /run
+		default_src_test
+	fi
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/40-gentoo.rules
+
+	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"run
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${EROOT}"dev/loop 2>/dev/null
+	if [[ -d ${EROOT}dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
+	# process it as a list.  We only care about the zero case (new install) or the case where
+	# the same version is being re-emerged.  If there is a second version, allow it to abort.
+	local rv rvres=doitnew
+	for rv in ${REPLACING_VERSIONS} ; do
+		if [[ ${rvres} == doit* ]]; then
+			if [[ ${rv%-r*} == ${PV} ]]; then
+				rvres=doit
+			else
+				rvres=${rv}
+			fi
+		fi
+	done
+
+	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+
+		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		# reload database after it has be rebuilt, but only if we are not upgrading
+		# also pass if we are -9999 since who knows what hwdb related changes there might be
+		if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
+			udevadm control --reload
+		fi
+	fi
+	if [[ ${rvres} != doitnew ]]; then
+		ewarn
+		ewarn "You need to restart eudev as soon as possible to make the"
+		ewarn "upgrade go into effect:"
+		ewarn "\t/etc/init.d/udev --nodeps restart"
+	fi
+
+	if use rule-generator && \
+	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
+		ewarn
+		ewarn "Please add the udev-postmount init script to your default runlevel"
+		ewarn "to ensure the legacy rule-generator functionality works as reliably"
+		ewarn "as possible."
+		ewarn "\trc-update add udev-postmount default"
+	fi
+
+	elog
+	elog "For more information on eudev on Gentoo, writing udev rules, and"
+	elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev"
+}
diff --git a/sys-fs/eudev/eudev-3.2.10.ebuild b/sys-fs/eudev/eudev-3.2.10.ebuild
index 3296733f6bf4..c2910b122451 100644
--- a/sys-fs/eudev/eudev-3.2.10.ebuild
+++ b/sys-fs/eudev/eudev-3.2.10.ebuild
@@ -24,6 +24,7 @@ IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index e7cf8529cb8d..8dad253df479 100644
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.ebuild
@@ -24,6 +24,7 @@ IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/eudev/eudev-3.2.7-r2.ebuild b/sys-fs/eudev/eudev-3.2.7-r2.ebuild
index 25d8b24c74ea..1038cbac1eec 100644
--- a/sys-fs/eudev/eudev-3.2.7-r2.ebuild
+++ b/sys-fs/eudev/eudev-3.2.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,6 +24,7 @@ IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/eudev/eudev-3.2.8.ebuild b/sys-fs/eudev/eudev-3.2.8.ebuild
index 25d8b24c74ea..1038cbac1eec 100644
--- a/sys-fs/eudev/eudev-3.2.8.ebuild
+++ b/sys-fs/eudev/eudev-3.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,6 +24,7 @@ IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/eudev/eudev-3.2.9.ebuild b/sys-fs/eudev/eudev-3.2.9.ebuild
index 3296733f6bf4..c2910b122451 100644
--- a/sys-fs/eudev/eudev-3.2.9.ebuild
+++ b/sys-fs/eudev/eudev-3.2.9.ebuild
@@ -24,6 +24,7 @@ IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
diff --git a/sys-fs/eudev/eudev-4.9999.ebuild b/sys-fs/eudev/eudev-4.9999.ebuild
index 49cfe608ea80..3299349b6218 100644
--- a/sys-fs/eudev/eudev-4.9999.ebuild
+++ b/sys-fs/eudev/eudev-4.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -26,6 +26,7 @@ IUSE="+blkid efi +hwdb +kmod selinux smack test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
 	!<sys-libs/glibc-2.11
@@ -37,7 +38,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	>=sys-devel/make-3.82-r4
 	>=sys-kernel/linux-headers-${KV_min}
-	>=dev-util/intltool-0.50
 	test? ( app-text/tree dev-lang/perl )"
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 25d8b24c74ea..1ed46df87518 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -24,6 +24,7 @@ IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	virtual/libcrypt:=
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
 	kmod? ( >=sys-apps/kmod-16 )
 	selinux? ( >=sys-libs/libselinux-2.1.9 )
@@ -36,7 +37,6 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 	>=sys-devel/make-3.82-r4
 	>=sys-kernel/linux-headers-${KV_min}
-	>=dev-util/intltool-0.50
 	test? ( app-text/tree dev-lang/perl )"
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/sys-fs/genfstab/Manifest b/sys-fs/genfstab/Manifest
index 7078d8e1489b..eb54b6573bbf 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 464 BLAKE2B 8157fc8b781e77cab58918e6fc4b5092c14e432809f57a35f2630a1d8312231f536f3bb1592af71688da9363cb5c13b0a02deb61f24fb4f85adedbd87834de13 SHA512 f722595cddfec818b06ded7f353d63d64f2233574b2626b0a3f9d1cf64395294f4ab04e9075b178fa5d6228db362f11438035990cc3f5a352021aec916dc3f3a
-MISC metadata.xml 468 BLAKE2B b299a989190e27686497f3aad1f8b3ee071ab3bc488e4d3669f945057c604dd3aaf1679f4c51e44fc5739557325ce22f5bf2df4a0c75e1775d9d5c11969141e4 SHA512 935bab43b088e8bd1fcf4995616dabcea498f8e8e8483dc6f3bcd67e7114400b91eed55a05d47e907efac8c81c0e13560effae85bcac19d01f24b01f3b97b11d
+MISC metadata.xml 329 BLAKE2B 86103da6ac4e1b0ae84bf3b8040f350727946da374d553817011ad206847a774fa7e9221536ce4b79f1d1a159c7518c2e63b9b5e0e1ba59c6b0277c68a39ecef SHA512 39d3d11f092338aae0e895f8e3cb110d8320a5830fd6acf0215d5920263cce410754985c25693e54a9b46212aaf6efe212fd0cea6634d2fc4405e744bf9ea01d
diff --git a/sys-fs/genfstab/metadata.xml b/sys-fs/genfstab/metadata.xml
index a45016676e49..2f0394991b92 100644
--- a/sys-fs/genfstab/metadata.xml
+++ b/sys-fs/genfstab/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>marco@scardovi.com</email>
-		<name>Marco Scardovi</name>
-	</maintainer>
-	<maintainer type="person" proxied="proxy">
+	<maintainer type="person">
 		<email>mattst88@gentoo.org</email>
 		<name>Matt Turner</name>
 	</maintainer>
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index ca308963ef47..1ae759d77294 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -3,5 +3,8 @@ AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061de
 AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf
 DIST lxcfs-4.0.8.tar.gz 458975 BLAKE2B 19ac81c36c3aad0ee3301eda73aa29399304dff1c827041678be73c4134181667a4d92b3efa37a44b2853b825031fef2e07e7cbfcaf552676a01f5f9faedf9c3 SHA512 830a4a25583a645b59c75327701af24c239323bfe822180c2cb7cb7cc284f50e8bb7c38e771ea869b4449370af1ab1a4fed9611c6495883d193f5a0f6f71380e
 DIST lxcfs-4.0.8.tar.gz.asc 833 BLAKE2B da4ef0f8d6dea59d83f708b6aa7c1835773537e3111d8e9aaf4a7c111d21a0b57486cc9828919bea55ea06ee6bf3e03eeae89eb26199e287066b309d6d798c8d SHA512 f8fc10e52472fff599df7e008d34346489754d64347d005794a4b280949130bb0370ade0d65c9eb182914cae3a6c55f9872bc38481b0b64ea1218c8d1640a74f
+DIST lxcfs-4.0.9.tar.gz 453383 BLAKE2B 06694218d45d93baa9041aeae39e52d827ca1b53d616284d0ee04ddfe98436a15b3cf900c7b58f14e506a0726f30679b0a04e6b5047087201ad2a9c35f0cc09e SHA512 c8d02cefb42dee82ea9467631e8e59243a6cb06d4ea53f0ce8da0a9bbc9018480bb0f12723091da672446a75ba200cca044b84c2f13388009dde9e5ad0ca3ebe
+DIST lxcfs-4.0.9.tar.gz.asc 833 BLAKE2B fa71f7a6a7a35fbc7613ec2d7549197fe0d33c9584aea86fe3db959848eeb1b0e69a75ca2d596578f3c7f3a9deca5cec1badce428b4aa52e6f112cf3fe544b3b SHA512 fd9feac31469db7785c8b486ddc4f5c0431ab2aa52aed715e853fcab322e8c6ee755aa87d9bdee7a969a8030be1956863662f8b2db09bfe4b8ba69ef8f2fbb3e
 EBUILD lxcfs-4.0.8.ebuild 1446 BLAKE2B 7c7eb6eb44f3cdeb5c38be49dc36b34f6fe77b23283b4928ab5b0d13edfc21c6d0b29b366f8d771dba608ad5970bee4b9ceebfbf37ccda82aea9c977d2583189 SHA512 549ce7620931289cfba89a89aff9bdf4cc62759e67fc96df29d0227718751ca4b2743b0d981d1c484038996eabb2402653abf93ae88bb037c49d1da4e1acbc76
+EBUILD lxcfs-4.0.9.ebuild 1447 BLAKE2B e5711cb3ae0d93591afede59b97bafe863486c18d7f6b314905f3c991e08f6764b7fe69005f33ed07bef49a68ecedafd7b1c377a137fd83d97b8a53cab09fb09 SHA512 88fb2e45a0931820bdb1c94e0275a87bbe2989d3ea6f7851dd6adb587936991db178ce388a5cf22341f0dc8a1c3bd48d99aefdd21ece01799b16d4b426710e05
 MISC metadata.xml 709 BLAKE2B 7c053869dc93fb8eea0b63604fa137736820ff1e2b8e6ee7d500ffd2a46ab381dc1321f2df0268d8f34eef10935f98959089b9f983c112b6809880b27f93eeb6 SHA512 bba720236a7d3fb0c4e71f624575c14a79abacea4441d672a151a3fe16c220fde0c03fa4bbdb2f7d0171920ccb787e1357a0c7aaa54bea4244e8e6771423f19c
diff --git a/sys-fs/lxcfs/lxcfs-4.0.9.ebuild b/sys-fs/lxcfs/lxcfs-4.0.9.ebuild
new file mode 100644
index 000000000000..61b57c9974a8
--- /dev/null
+++ b/sys-fs/lxcfs/lxcfs-4.0.9.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd verify-sig
+
+DESCRIPTION="FUSE filesystem for LXC"
+HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
+SRC_URI="https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz
+	verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/${P}.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="dev-libs/glib:2
+	sys-fs/fuse:3"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-apps/help2man
+	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
+
+# Test files need to be updated to fuse:3, #764620
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Without the localstatedir the filesystem isn't mounted correctly
+	# Without with-distro ./configure will fail when cross-compiling
+	econf --localstatedir=/var --with-distro=gentoo --disable-static
+}
+
+src_test() {
+	cd tests/ || die
+	emake tests
+	./main.sh || die "Tests failed"
+}
+
+src_install() {
+	default
+
+	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
+	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
+
+	# Provide our own service file (copy of upstream) due to paths being different from upstream,
+	# #728470
+	systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 0f373b56d4ec..a2524b0e14a4 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,7 +1,7 @@
-DIST mtools-4.0.27.tar.bz2 420579 BLAKE2B 3044fff1896427227e4585df81c208f7580302155cf119db426cfc7a24b3d5195b560b8810613f571eed77584d47bb5125007cdcb8551b303db62ce264853776 SHA512 21072e1b6d22ea00913dbc856c5fbe1ecfbfc0207432c7632f0026ae2d9555743eb0710c86e8939a6b3183a03693b8d1297121df9d5702dd5bf6121ad240572c
 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
+DIST mtools-4.0.33.tar.bz2 439522 BLAKE2B fac0880a7f0967f6998b8e234b7c61a58ed28205738f92db4ea0a039f5a883cfb68df492788174720068a2f976d37032630abfcca0461fcc72133b564bed472b SHA512 6dd47d422e999100a7834bac0e1e6e5e26387f8462bd84c5934da7c24f1cf90674dc873878bc37c2051dd7df717f85793861fed8544f77aecfc30a6cecd7bf43
+DIST mtools-4.0.34.tar.bz2 453751 BLAKE2B 9e4874bd724e2a62e23d7b7def601e41ba6676d2b9c37d198f0b521938297664dcd1d2fc75531c79acc93e9c642ea4555b174007ca6d2fd27cbad1b9a3d61f1c SHA512 5a401ac17b9021e5e957bbd911810958f3d665d2ada8b60e723d72709e687c804bbecdb09b50fc23a9876540abead3894213e5f668f23356c629261b40980535
 EBUILD mtools-4.0.31.ebuild 1052 BLAKE2B 6a345c0c1436f2bf591b32c55514ceaf7b415d413107d0d3c07c50bcf7bdcef742c729fc1ed83fe967e32e4a580ddf2feaa0be482481d6bbc429c409cf622929 SHA512 d28ef71fcfcd7db607521ffc4170f632209f9386ac49b9ab40338a6960c96b5b769a96abf5781c5a49f515ba1e154155afa34af9f49c642167e9bac80afd187a
-EBUILD mtools-4.0.32.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
+EBUILD mtools-4.0.33.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
+EBUILD mtools-4.0.34.ebuild 1058 BLAKE2B 65ee6b4287807ebba32519c220b279fab658dce34591eb969759b65360d0e873c4b13dbdb32d519afbea724be852b3a3424208eb4fbf7d985bb4da198089a4cf SHA512 7ec38355fe34e7121f2226e66d7fce9b6ebded835b74dca317f4664cc9650f57110d115120f2cc692a793bbe712e79a1fd50c167a27876dbdc1b4d551a4fc931
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.32.ebuild b/sys-fs/mtools/mtools-4.0.33.ebuild
index 3ebdd3b6df91..3ebdd3b6df91 100644
--- a/sys-fs/mtools/mtools-4.0.32.ebuild
+++ b/sys-fs/mtools/mtools-4.0.33.ebuild
diff --git a/sys-fs/mtools/mtools-4.0.27.ebuild b/sys-fs/mtools/mtools-4.0.34.ebuild
index eba20aaf2121..3ebdd3b6df91 100644
--- a/sys-fs/mtools/mtools-4.0.27.ebuild
+++ b/sys-fs/mtools/mtools-4.0.34.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/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index ea24bf9c2757..8f9cff9aed5c 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -10,4 +10,4 @@ AUX mtpfs-1.1-wking-patches/0006-Check-for-find_storage-failures.patch 3484 BLAK
 AUX mtpfs-1.1-wking-patches/0007-Use-path-instead-of-fields-0-for-find_storage.patch 987 BLAKE2B dcf215b4ad2fd16e2cef84becdc530d4faed1cbab59531be095ea000546d14623a3a3ad370f9005e3b7b42016fcc21092ecb16ccd8ea7b892e63c0fb1429fe6d SHA512 b358816389cbde3679bd1e50505f9e68de9ffe68041dfdc48af9ae64d1453d1ce7c3ab4ee4b6260a6d42d520225ad91c6cf6cd8d05cd561e3b72d102fd6dcbdb
 DIST mtpfs-1.1.tar.gz 108329 BLAKE2B 7172c1ca0b31a532d0ba1068874c0fd4012dd80da4684d69fa36355126be0c56d79570d5fe5f42876d1a98f49bbc21b0f446c08e28b62e20583bbfd4d7054f62 SHA512 627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8
 EBUILD mtpfs-1.1-r5.ebuild 1248 BLAKE2B dac042ee8488b5a310154756668066cbe6972be15378ba10f416d2c0ca42b86afd0b502aa64e9b81cff5567a381900593cbae58e6ecd85145e02d56dbe1aae98 SHA512 5a9f59cadd34ca4baedde8e7b1619ee22f8311225625c6782f9a5ea216138fa7a7754bca842342c0527219d5679b60ac6e38bebca07d4819b4498c6e7874f2a3
-MISC metadata.xml 684 BLAKE2B e83930dc207e798257d2e2a2cdb065ce462e232a20c33514034852099cb3e6683fbd2905b90e328cee8b50b84e6c9f887698a1c920d164f5f910174531ab7ad4 SHA512 725d050ed87be3de8beff0e97178452e806261e704aaaaf523982deb2fc803c771949bee9ac0651747323b3294d584470e49e4877a3cf5e8f2301f477a543955
+MISC metadata.xml 571 BLAKE2B 68b875e88a89c915067db4911eaa0d0a64a4e9054eecf489b2a222371c4d56beef2c46e2d1f7e773b70d6b9d249c2d00fb49cc51a7a4c285dd8d7959372d9041 SHA512 976c4699853d0ad7e9f299f89c60a04170a31546fa55a3a253ae7659bc31c43607a586d4b377a622bee88adfbaf32e288beed67676cfca56c955fd330f3fd5f6
diff --git a/sys-fs/mtpfs/metadata.xml b/sys-fs/mtpfs/metadata.xml
index cc200ab69553..cb18a07276ce 100644
--- a/sys-fs/mtpfs/metadata.xml
+++ b/sys-fs/mtpfs/metadata.xml
@@ -5,11 +5,6 @@
 		<email>voyageur@gentoo.org</email>
 		<name>Bernard Cafarelli</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>slyfox@gentoo.org</email>
-		<name>Sergei Trofimovich</name>
-	</maintainer>
-
 	<longdescription>
 		MTPfs is a FUSE filesystem that supports reading and writing from any
 		MTP device, as supported by libmtp. MTPfs includes extra features such
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index c55aa4c754b0..a415cbdb673d 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,5 +1,5 @@
 DIST ncdu-1.15.1.tar.gz 148242 BLAKE2B c49fc706c852f081256437bcb566d0dd4cc34682693186dd84321f4c6831ac982206d59b15f3afa7a2cb25d4affcce7ff84fcc0bf922558241df1ac13212ec7a SHA512 572379264b9bd0d782151bd2f79add0e7a6d092029a041ff8f9288e928a4b6a6733467bca7c1702cbb44c3861279da1bc3d4278df6fba1814fe1dc909f2d8087
 DIST ncdu-1.16.tar.gz 149705 BLAKE2B 61d004581bdcf1885bec24d0a1de4fc890fe91bba511abbdbc507a48f31946caf5c7324979e8410e53cfca8ada1b20342b737dc4e8b1f034f2fca5aea84e4369 SHA512 ac8b7e573332e4e006bf743224096b697517b6899744f189ea5a31665c1ef5e50c7fdaaa0a50a8d7bc3d471656f1f1c6681c21368bdaf983257d8cc311a0dfd0
-EBUILD ncdu-1.15.1.ebuild 432 BLAKE2B 7dddb5c5355a94b104fe57099a13eb48762289b0c7772526d184311ae298c9b8a3f2cca061d93712ed2619e2581052bec8ca187cf5f99c587dd24aaacdae0a74 SHA512 2e43fbc0fa51a6eb2d638100861d90b51bb0583e563533564be32d507934ddb9a9849eb2134865fb00542c27a424f404e3187e9a5e8186cd90c7515f8ac13e59
-EBUILD ncdu-1.16.ebuild 442 BLAKE2B 4916d389647db80c3358d6a36115d8846e180dbc4dbdd889aee35e93fbef4151f7538989ab00a7831b54ad9e7d085e7b04d9a495e3d368f08c4e9c94dd3aa6b5 SHA512 92ec86e41ab1681f89a41fb34671a44818f7751a8d86684bf6df6214b2b0cd1cb15e8639b38680ab3bab954d67e4aabb742b1d497b12ee13868b971bd5652468
+EBUILD ncdu-1.15.1-r1.ebuild 434 BLAKE2B f25cfd209692d138a2c192f68b459c51c8c8b670888d6778a6291bea02530f62ae744b5317d5da9f28387c3f0af993302b6e2cc7f1374a349ed812c803f78c9f SHA512 ea403df7b180959ad2dc8494b48caa8f521b30f8976bf6e00b5b2f6eb6fa89c6df53e65f332be1c4eb59512eaed14587b22597f96fc071d1823929fff4c27ef7
+EBUILD ncdu-1.16-r1.ebuild 444 BLAKE2B 3023c33a6618e88beaa816a1b89c27350412b8b0ee8095267d1778af069b45df1f60d13054b28bcb549b934e673c86313f84d904903997e0c658ebd75fceee85 SHA512 8c830b4e8a6b1b07efdeaadf766cf9b5bf369d1dab3311be8102b101ddab503e8f9a36883087a973612d514174b570fdb591ca2cabed55e2bcf3ff9e959367f2
 MISC metadata.xml 589 BLAKE2B 9915d839320066570a64eb949ce52f48af51689617cdb6cdbac0fb6094a3923900bb940ae84be99fcd52618db5ba8a2de698c5c0515f4e5f0a6a3dbf73a42165 SHA512 2c3cf9225fafe928e442ef61f3ec10b810051843c801f3901fe8cf97d0a22e6c2354c9b3517b0c9439fad6e5829fa223ec36c6c295f426aa8a8a89a06b637d21
diff --git a/sys-fs/ncdu/ncdu-1.15.1.ebuild b/sys-fs/ncdu/ncdu-1.15.1-r1.ebuild
index b0e05454504a..748704d358b5 100644
--- a/sys-fs/ncdu/ncdu-1.15.1.ebuild
+++ b/sys-fs/ncdu/ncdu-1.15.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
-	sys-libs/ncurses:0=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 "
 DEPEND="
 	${RDEPEND}
diff --git a/sys-fs/ncdu/ncdu-1.16.ebuild b/sys-fs/ncdu/ncdu-1.16-r1.ebuild
index 4148fd7e31c8..22076a152350 100644
--- a/sys-fs/ncdu/ncdu-1.16.ebuild
+++ b/sys-fs/ncdu/ncdu-1.16-r1.ebuild
@@ -13,6 +13,6 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x6
 
 BDEPEND="virtual/pkgconfig"
 
-DEPEND="sys-libs/ncurses:0=[unicode]"
+DEPEND="sys-libs/ncurses:=[unicode(+)]"
 
 RDEPEND="${DEPEND}"
diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index 37c84d9d5e21..db17cd499f83 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,6 +1,6 @@
 DIST squashfs-tools-ng-1.1.1.tar.xz 1170232 BLAKE2B 8224b59f70c3c02df3762024510c75a038f8d9f1853575ccfa527173a528f17bd68ae4ec1d2448563aa504f683f5d9152cb07545db6b965f36a224dc95841f17 SHA512 2a7aa689b49fe06ec77e9b9c3bdcf264d05a478aa08543d8e8bc22ef45f10f351b49706485ed93cbd5adc537cd066f94e70952867838ec51859e8f6ce34607f4
 DIST squashfs-tools-ng-1.1.2.tar.xz 1178028 BLAKE2B f54419cdb57ace39a85dfa3a691adcdb637939ef7cc0419e596fb7a7b1fe24d469d2f2104c745303159c64f0692d45562562b6acf4cce3bfa49ef7a59a892cde SHA512 3f66cd9034997104e2d3281e271e8ccfbdd6ecaa98313636dcfd5251717e173ceede27b4a94342b011707fc1e96884ec733423f978697c6420915d96c153cf3e
-EBUILD squashfs-tools-ng-1.1.1.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
-EBUILD squashfs-tools-ng-1.1.2.ebuild 1122 BLAKE2B fa54789fe9987f868abe97325d54d26092dbe6f78551fa3835804a156b055cf4cff237148e04f09a9937623612c37d57b1841b1b065891d290fe74c4b2b7ca02 SHA512 2f99f16d6c83c01aaecd50191b2becc76c0ba8db2f0a607e0831f5a6206878e02d97cd2b2919220c050859a7890f4e812745362053a39c95c84e91f3898f60d8
-EBUILD squashfs-tools-ng-9999.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
-MISC metadata.xml 556 BLAKE2B fcff50b7024c1743fb7d7e677c04865bba266c011305d701b4a27b1ce813eb492b6becb64b5f1d4d52a3efd5a80d3369ac88ac65c2665cb0121c6b59d592b966 SHA512 cd1de16571ec7651bf353e804c8f44cbe6a919c21577a832782d8213e7e956b5af1769889eb1631f1a97c44b89018d484122fee59bedef4409363901101df6e3
+EBUILD squashfs-tools-ng-1.1.1.ebuild 1129 BLAKE2B aa3e69a031b60b665d6c74b16a0bfc61a327a092a6b9dfa64035fa2fdf2ecc7c3805cd1753b9f2703af02659e7187b9b939011d9a2e0741493f5cedcde56ea30 SHA512 2ccbfe6a31cf89e5a35ca4bd7bc299758464760be4a6de352ee19b5cebec9f564a39f485d64bc1cc2d7435c527e0758fa675d9615d1bd58761a6872c86a90d66
+EBUILD squashfs-tools-ng-1.1.2.ebuild 1129 BLAKE2B aa3e69a031b60b665d6c74b16a0bfc61a327a092a6b9dfa64035fa2fdf2ecc7c3805cd1753b9f2703af02659e7187b9b939011d9a2e0741493f5cedcde56ea30 SHA512 2ccbfe6a31cf89e5a35ca4bd7bc299758464760be4a6de352ee19b5cebec9f564a39f485d64bc1cc2d7435c527e0758fa675d9615d1bd58761a6872c86a90d66
+EBUILD squashfs-tools-ng-9999.ebuild 1129 BLAKE2B aa3e69a031b60b665d6c74b16a0bfc61a327a092a6b9dfa64035fa2fdf2ecc7c3805cd1753b9f2703af02659e7187b9b939011d9a2e0741493f5cedcde56ea30 SHA512 2ccbfe6a31cf89e5a35ca4bd7bc299758464760be4a6de352ee19b5cebec9f564a39f485d64bc1cc2d7435c527e0758fa675d9615d1bd58761a6872c86a90d66
+MISC metadata.xml 452 BLAKE2B 5c3c39049e66a5a41bed571814e6596f4d382b0e0d26fe0ecc47efcc7cf49911fbb44e0fa1e51d15003c3319e2fec07c61fe32f35f3dc36afdb0d16773d43caf SHA512 4f9da113fb9ae5edeb519f63ca56db88c4d4b6ba523990045557ea07574a051ffc5b0474f9b774af9f87e0686df902f752bcb794a014dd8501b45fa51f4df95b
diff --git a/sys-fs/squashfs-tools-ng/metadata.xml b/sys-fs/squashfs-tools-ng/metadata.xml
index 9d2517015161..024d650b54ff 100644
--- a/sys-fs/squashfs-tools-ng/metadata.xml
+++ b/sys-fs/squashfs-tools-ng/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="tools">Build the gensquashfs, rdsquashfs, sqfs2tar, sqfsdiff, and tar2sqfs tools</flag>
-		<flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="github">AgentD/squashfs-tools-ng</remote-id>
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.1.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.1.ebuild
index 22a2dbc93b62..a9e2e335faeb 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.1.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,13 +15,13 @@ fi
 
 LICENSE="LGPL-3+ tools? ( GPL-3+ )"
 SLOT="0"
-IUSE="lz4 lzo selinux +tools +xz zstd"
+IUSE="lz4 +lzma lzo selinux +tools zstd"
 
 DEPEND="
 	sys-libs/zlib:=
 	lz4?     ( app-arch/lz4:= )
+	lzma?    ( app-arch/xz-utils:= )
 	lzo?     ( dev-libs/lzo:= )
-	xz?      ( app-arch/xz-utils:= )
 	selinux? ( sys-libs/libselinux:= )
 	zstd?    ( app-arch/zstd:= )
 "
@@ -39,7 +39,7 @@ src_configure() {
 		$(use_with lzo)
 		$(use_with selinux)
 		$(use_with tools)
-		$(use_with xz)
+		$(use_with lzma xz)
 		$(use_with zstd)
 	)
 	econf "${myconf[@]}"
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.2.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.2.ebuild
index 3e96fd1fdfe9..a9e2e335faeb 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.2.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.1.2.ebuild
@@ -15,13 +15,13 @@ fi
 
 LICENSE="LGPL-3+ tools? ( GPL-3+ )"
 SLOT="0"
-IUSE="lz4 lzo selinux +tools +xz zstd"
+IUSE="lz4 +lzma lzo selinux +tools zstd"
 
 DEPEND="
 	sys-libs/zlib:=
 	lz4?     ( app-arch/lz4:= )
+	lzma?    ( app-arch/xz-utils:= )
 	lzo?     ( dev-libs/lzo:= )
-	xz?      ( app-arch/xz-utils:= )
 	selinux? ( sys-libs/libselinux:= )
 	zstd?    ( app-arch/zstd:= )
 "
@@ -39,7 +39,7 @@ src_configure() {
 		$(use_with lzo)
 		$(use_with selinux)
 		$(use_with tools)
-		$(use_with xz)
+		$(use_with lzma xz)
 		$(use_with zstd)
 	)
 	econf "${myconf[@]}"
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
index 22a2dbc93b62..a9e2e335faeb 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,13 +15,13 @@ fi
 
 LICENSE="LGPL-3+ tools? ( GPL-3+ )"
 SLOT="0"
-IUSE="lz4 lzo selinux +tools +xz zstd"
+IUSE="lz4 +lzma lzo selinux +tools zstd"
 
 DEPEND="
 	sys-libs/zlib:=
 	lz4?     ( app-arch/lz4:= )
+	lzma?    ( app-arch/xz-utils:= )
 	lzo?     ( dev-libs/lzo:= )
-	xz?      ( app-arch/xz-utils:= )
 	selinux? ( sys-libs/libselinux:= )
 	zstd?    ( app-arch/zstd:= )
 "
@@ -39,7 +39,7 @@ src_configure() {
 		$(use_with lzo)
 		$(use_with selinux)
 		$(use_with tools)
-		$(use_with xz)
+		$(use_with lzma xz)
 		$(use_with zstd)
 	)
 	econf "${myconf[@]}"
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index d60c4ccf33f4..23555f1d0860 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,3 +1,5 @@
 DIST squashfs-tools-4.4-git.1.tar.gz 241963 BLAKE2B 7a80c353efbbca851b2eb44e742f20b4cf59e91058b53b77c74d879dc18d882e3bb6de8a010a4469c0a53384ccf2968bba4cd1d6f10cfcede70fe07eebbf2409 SHA512 8d8cc3da7cbfc7b94d070021383413f3d1ef1261ba3fd9924dde4453558a8f8f14812c2f5614f87bef719496b0a023897de8d087c32a7344fa2eb9c1624563a0
+DIST squashfs-tools-4.5.tar.gz 250471 BLAKE2B 2fc8ab9bb6565b97656afd63b76bfd7449d96b83697286e88b55a8cd82957b395df17a707ee93e8a99ed19dc5ba73966ce33530ef6c35797924dad4e3f16ed3b SHA512 e00610487d24eed9e5dadcf84014a3d7faa9815d8ce00fd4660e6c8ce394dccf185ed9f387f4fa1313b9812fe770f802bdcbaef87887f2bcefacf234594a72e0
 EBUILD squashfs-tools-4.4_p1.ebuild 1315 BLAKE2B 5b64d6ab302b07973be65fc4d93219f32e93d348f2c4db4122ba87f47b589d70966ba511fd14de6ae3eb4f34296d4a0c610dbee28b0f5c7086543f3f8d79aa35 SHA512 1e299fcd3c0f6e9920b4f28549bc42dc7900e62b82adcbd57428edf22f65a449e4f4821fe223d4af2310746159635a3fbcda0b7bfcecf451c9c64500597cb1cd
+EBUILD squashfs-tools-4.5.ebuild 1322 BLAKE2B f24a5b268493d2e9a1bc8791a89f76c9ec584dc11d3521b68e2786fb1d07eaf6a16d05d1db3d601cc2d1c90c69316fc779192dc520337f1f3eca9ba3ca486191 SHA512 0e61fb08df1e07ce2d8b6f512740c621c89a978361bf8dc994266be3a6f5bd292b7e58b8aa35f481e3ee5ffaf05c51bc6bb3943927d0dda5da712295bb17da49
 MISC metadata.xml 325 BLAKE2B 69746d14350ab40f297e7944dd2ffa3af61c6b7890012856fa7a8c8971246591844a078f3ca79cbc579bbd1d8d5fad5e6c8338766a80d4a2d068219ac303e77d SHA512 452fd4de6f1a2ab284e8dd388c18caaf75bba2c07bbf3eb5d990259d92ed6af0f7a2174a85998214f17a09f087f796dae7550e09ebfaad15c6a8ca514335afe4
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.5.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.5.ebuild
new file mode 100644
index 000000000000..da568d9d59e9
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic toolchain-funcs
+
+MY_P=${P/_p/-git.}
+DESCRIPTION="tools to create and extract Squashfs filesystems"
+HOMEPAGE="https://github.com/plougher/squashfs-tools/"
+SRC_URI="
+	https://github.com/plougher/squashfs-tools/archive/${PV/_p/-git.}.tar.gz
+		-> ${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="debug lz4 lzma lzo xattr zstd"
+
+RDEPEND="
+	sys-libs/zlib
+	lz4? ( app-arch/lz4 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	xattr? ( sys-apps/attr )
+	zstd? ( app-arch/zstd )
+"
+DEPEND=${RDEPEND}
+
+use10() { usex "${1}" 1 0; }
+
+src_configure() {
+	# set up make command line variables in EMAKE_SQUASHFS_CONF
+	EMAKE_SQUASHFS_CONF=(
+		LZMA_XZ_SUPPORT=$(use10 lzma)
+		LZO_SUPPORT=$(use10 lzo)
+		LZ4_SUPPORT=$(use10 lz4)
+		XATTR_SUPPORT=$(use10 xattr)
+		XZ_SUPPORT=$(use10 lzma)
+		ZSTD_SUPPORT=$(use10 zstd)
+	)
+
+	tc-export CC
+	use debug && append-cppflags -DSQUASHFS_TRACE
+}
+
+src_compile() {
+	emake "${EMAKE_SQUASHFS_CONF[@]}" -C squashfs-tools
+}
+
+src_install() {
+	dobin squashfs-tools/{mksquashfs,unsquashfs}
+	dodoc ACKNOWLEDGEMENTS CHANGES README*
+	dodoc -r RELEASE-READMEs
+}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index baf1d364ff58..805c1d0b0c4d 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -5,10 +5,10 @@ DIST systemd-248.tar.gz 10306883 BLAKE2B 3cb25d6101136a5f57e841d3f464f0d7649f6c1
 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 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 5435 BLAKE2B 73db98a1a0f358cfde36d7ab34e61ec52a69ba6cd2189536aa3adb3d09c6e946c3d5d6d726616cc9feeb3d7c4c39aab3d3a8826ab62ac07506838448518edff9 SHA512 415134bdcc7221eba54e940be02d081e89228b54ae3efa03ee6c1abb5458592440b26cab31a0ea6e21a288933cd2ff16330cb8c9ba91f2df323a34b65fe0a600
-EBUILD udev-249-r1.ebuild 5736 BLAKE2B dafb410a1b719d4febd2366584b55c66b5967e2eaf9d14225be7a5a8ca55222f66c4c4ac15741834d15085349186be4cdecfc58ffd710b5292f53f2b5ce8a723 SHA512 af851c186240a0814dbb1992884cd7f01b7b24520138e2147a001f7de05a73b28daa06ab6a99395f09db9167345e118b8f90f46adcaac6905207ef4367ce1836
-EBUILD udev-9999.ebuild 5695 BLAKE2B b32ab2f191c4163bf0949446646dd24fcf2b6e1c08454922108e0e41cc7fc6709ee4f27504ac4bd49a387958f2c3c2359b3e4e9d1869510a632dfb77589057ec SHA512 254593d7c82cef560530a29453ac96292bc84558188e55d5533e3e77916f9cd0708fae3ad1caba750e121de1aab90d4eed098920365583361e2cb4f76d676b50
+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
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-245.5-r1.ebuild b/sys-fs/udev/udev-245.5-r1.ebuild
index aa7adfc82320..1322ad2f6057 100644
--- a/sys-fs/udev/udev-245.5-r1.ebuild
+++ b/sys-fs/udev/udev-245.5-r1.ebuild
@@ -45,6 +45,7 @@ BDEPEND="
 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 )
diff --git a/sys-fs/udev/udev-246-r1.ebuild b/sys-fs/udev/udev-246-r1.ebuild
index 51979da0f5c8..5fc08f3b74af 100644
--- a/sys-fs/udev/udev-246-r1.ebuild
+++ b/sys-fs/udev/udev-246-r1.ebuild
@@ -45,6 +45,7 @@ BDEPEND="
 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 )
diff --git a/sys-fs/udev/udev-247.2.ebuild b/sys-fs/udev/udev-247.2.ebuild
index 276bd37716fe..b1dfe60bc551 100644
--- a/sys-fs/udev/udev-247.2.ebuild
+++ b/sys-fs/udev/udev-247.2.ebuild
@@ -45,6 +45,7 @@ BDEPEND="
 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 )
diff --git a/sys-fs/udev/udev-248.ebuild b/sys-fs/udev/udev-248.ebuild
index 48130385ec4b..090111f3ac0d 100644
--- a/sys-fs/udev/udev-248.ebuild
+++ b/sys-fs/udev/udev-248.ebuild
@@ -45,6 +45,7 @@ BDEPEND="
 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 )
diff --git a/sys-fs/udev/udev-249-r1.ebuild b/sys-fs/udev/udev-249-r1.ebuild
index 412b8abefde7..4b808e917a4d 100644
--- a/sys-fs/udev/udev-249-r1.ebuild
+++ b/sys-fs/udev/udev-249-r1.ebuild
@@ -46,6 +46,7 @@ BDEPEND="
 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 )
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 889f61023243..9cb8cd5f731a 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -46,6 +46,7 @@ BDEPEND="
 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 )