gentoo resync : 17.02.2021

16 files changed, 62 insertions, 68 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 79a525928d19..e430e1108ca9 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest
index 85d23318233c..5ba2f2dc47ce 100644
--- a/sys-fs/avfs/Manifest
+++ b/sys-fs/avfs/Manifest
@@ -1,5 +1,5 @@
 DIST avfs-1.1.1.tar.bz2 606819 BLAKE2B 240bb342dc9f993ac8deb60941411b1419c190f9909b5b1bde65777b82f622e121f44f238d2bd8ddc303c86ef376950d4af773c8fae79848b466ec3a3c5aafc1 SHA512 0707f8e746d8d3633755b1a1efb944a400c095b517a7befd75de4d25e2fad1a1b5132b9cf94285b05ad1344bfc138ec75e9cb5f8a5d7775a69595b9b35266f92
 DIST avfs-1.1.3.tar.bz2 609901 BLAKE2B 2eea31365533372fc5ea252d57da97a8e0d362b6db5f0a6e10af9255105ccdcadbd7f5157aafd63244da2c7a53dcbc6781d0c4ba5ca231ce2937855d400ea4e5 SHA512 8e87655cbdb64f0cbbcc399142957ea9e04a998953cc64def9c8bb338b46abffc85a35e09b5fa52bb9ddcf56e27c4f62503050d32c8201eaad61c54e22bdd005
 EBUILD avfs-1.1.1.ebuild 1491 BLAKE2B 4456b482d395814bcc942b915c443593d661284f5d8ac25f6a143b474f00b6bec645af06ffb56f355597195d01213285082bb7288c10f95e238ee9db98100538 SHA512 f983cbc72aaba0a55f88a26d8cb76b34baaa6f0cefd816ab9952eefdb2530dafb2b49ea5790b7281324d27159e37fef63cea9884ce9c6e052f2b5c44e0395e0e
-EBUILD avfs-1.1.3.ebuild 1613 BLAKE2B 289e0d10b67d6df761441abd5cfe35287955005af4d38b8ce70d058a1196e075727aaf6569c5ad7c6714ef355fb3520f93cecfcd3a3ba5b10302b1a9901d636a SHA512 fc7ddde213394a99640f2ab96984cfbed794f2f105cfb0178fca90722e057d280bd37e01dfe27988b8d3ab7b4cc62f09b5434002be66d7965935c0c3494095e4
+EBUILD avfs-1.1.3.ebuild 1612 BLAKE2B a907724e13fa959057992d53b78333d2cffcd6b7de0e2bcbaefe20101206a119280de3b6cfbf6d4f6846c1437bd74a6643e885096be2a98f6da3599f94ddab2a SHA512 44bea1e13bf358c18a261d8bf9142b8597ed3cd5a41c83af11bb03daa091ba79eb1575000b8aa140e19c8e9175984b67236563b68ed7998b9c07c4a3cb5d4e32
 MISC metadata.xml 421 BLAKE2B f4c3e8cd39e16235b32a251153c5ff5aab035dc31394cec6029ceef4e99c3e34dc4a58c9f0030dfa4c3618e30da404e4dc5e4802b9b4eca1def912cac902d1d2 SHA512 05215354a0ab9d2a810c2b917d345b1cc061fe20c58799d85549efdc7211bfd6be7ae4ad8bd4b7f5e34239c782cf103a272b2b7e04f356c4271e159758b23c89
diff --git a/sys-fs/avfs/avfs-1.1.3.ebuild b/sys-fs/avfs/avfs-1.1.3.ebuild
index a96738c6cad1..d9f910a68c5d 100644
--- a/sys-fs/avfs/avfs-1.1.3.ebuild
+++ b/sys-fs/avfs/avfs-1.1.3.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ~ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
 IUSE="+lzma webdav +zstd"
 
 BDEPEND="
diff --git a/sys-fs/bindfs/Manifest b/sys-fs/bindfs/Manifest
index 5003d08d8d2e..150ad753a9b6 100644
--- a/sys-fs/bindfs/Manifest
+++ b/sys-fs/bindfs/Manifest
@@ -1,9 +1,5 @@
-DIST bindfs-1.14.5.tar.gz 407863 BLAKE2B 2c75b426f2b2fd8947c2f7e8b74fd9826cccba99afce661713946acdc7765cd8065475ecc244d4ffd534fde8243d100eba03abcc643cec2a9d2fbec954c4ab73 SHA512 df8245339ef0491a58d69f3fca215b4cca4853976cedc507ba4c953ef136d34d245130c7bdb9b75adb7661e0f359582afae0b6e7b5f69252ca5adecbc09c51ec
-DIST bindfs-1.14.7.tar.gz 409427 BLAKE2B 0027ee589a39d6d29b4bc337aaa87e4cf231f4549245c14353a39fb7a66e8ade17412740f5caf2e2eed4cb0501b6537beaf4929d21256c5b0625304b056829a3 SHA512 03b0bce29b87219e7e159077942e66e7e0e783b8c41234231696f96aa83e66271431fd3b4e7c1d98ba74705ec7255bd7da9d9484981ddb86c4d1c1b35dcaa0cc
-DIST bindfs-1.14.8.tar.gz 410096 BLAKE2B 93184ccbb5b2ed3b75bb74e2c79e92d4b0f90a977713936a3aaf70d56a5801ca0316ea4a4c09818c435618b8a3c848a9d115fd038190a30053c82134a1a38106 SHA512 aa76528d227024b10631dc542c87d6ed9511226ee2983f8aeaf4da5f59acd9537194065505302f506b12150177f1fbdd654366aceea568ca16f40ae8dd2bdb94
 DIST bindfs-1.14.9.tar.gz 410344 BLAKE2B 3875c436e7f52a59c0b7aeb2d7fbcfa7d4edfc3f8397bf7d2a920a260f857ec16df64b78655175f9b0929b93788fb6af46c2844f30ee59c30b6ef9fb5beb4cf7 SHA512 e8c454b4edd65faa64255c7706c195aa1cab6436a0d3481e434a5e535a3c24df1b13342b72ed3da097e68e9d94582237d682dbb675734061d115e863d5767ffd
-EBUILD bindfs-1.14.5.ebuild 478 BLAKE2B 8a742f9c0a17005ab1d6feec04d155cef1e9d6350dbaff76191273f3ff586bdbe21d96fdc34ce2f1f9ffe9c377537f1fe3135fd50e37db0e3c4d46d3124386a9 SHA512 23105ab140967691268df3809cfeb577a7c63538c356702ae471bf9dbaf3dd2fa1ff432f982ed0d90318cdef902d63237c6473e1487582ecff35ae7f6afd4e60
-EBUILD bindfs-1.14.7.ebuild 478 BLAKE2B 8a742f9c0a17005ab1d6feec04d155cef1e9d6350dbaff76191273f3ff586bdbe21d96fdc34ce2f1f9ffe9c377537f1fe3135fd50e37db0e3c4d46d3124386a9 SHA512 23105ab140967691268df3809cfeb577a7c63538c356702ae471bf9dbaf3dd2fa1ff432f982ed0d90318cdef902d63237c6473e1487582ecff35ae7f6afd4e60
-EBUILD bindfs-1.14.8.ebuild 478 BLAKE2B 8a742f9c0a17005ab1d6feec04d155cef1e9d6350dbaff76191273f3ff586bdbe21d96fdc34ce2f1f9ffe9c377537f1fe3135fd50e37db0e3c4d46d3124386a9 SHA512 23105ab140967691268df3809cfeb577a7c63538c356702ae471bf9dbaf3dd2fa1ff432f982ed0d90318cdef902d63237c6473e1487582ecff35ae7f6afd4e60
+DIST bindfs-1.15.0.tar.gz 415596 BLAKE2B e80bf7e233668ceddb6f57b7b939a68c918f3a6635d99bdc0efdacd67d74fdea66aa3d03ced6cfeddfc1a402e9866d27d83bcbe39dc6c25c50247c6b42739d9a SHA512 4f11dcb29321daa950bc8d778c7cc0269f200535367534c5ebb1e85f2f9e0e37359ebaa0d033fefc2140f07915d6ad7e884d185ac168db31c32e2e52175d0bfa
 EBUILD bindfs-1.14.9.ebuild 478 BLAKE2B 2be2fd62b6507cbaf1a5e57a0582f87278bb6f568f000ef805f159bc4e655104d2f18ac9b1f9d164155b7706d6779f13abdb63979fb3e9200be837dd8e715d12 SHA512 c006e5f23ffd417f5a8c77b417f20ca083ba2a4669189806217a73685a8b62ede8bab826bd6ae713af35dda4bce2eee800f5e12e4866d0f3b6cb1dc53e1434b3
+EBUILD bindfs-1.15.0.ebuild 494 BLAKE2B 1c12cfd2b776d5847e5d74517db43081e3bcd915c82e76dda412ff5d278c216543a9c7066470235b2b55ac12e4a6d1c70df8a3ffd2f0ce374dccab8f5f96f201 SHA512 e02feecc34a1b2f43f27f9124a35810609aa047c49642985dbedf693538dc9d778fdca5af9cb16c2fb8012323fea2899aa4df4e4931bc54f2880b2a97f2d04e6
 MISC metadata.xml 325 BLAKE2B aa0a376311bff962fc56dfcfdf9f0d7eab54cde65ad9518ef24e38651e57bccc1514e444657e1dfc4c9a5c7f651e700b5b7122dedca39ac24029b6b7e990c493 SHA512 466c2a77d115de2a7b8110a3076d58b604e0f53a9de46842ffcb0fb2c913e0cc6e0393035432a101327a780163453ff973044f0b473584eb2be65a53a181e83c
diff --git a/sys-fs/bindfs/bindfs-1.14.7.ebuild b/sys-fs/bindfs/bindfs-1.14.7.ebuild
deleted file mode 100644
index 69f9d93e580a..000000000000
--- a/sys-fs/bindfs/bindfs-1.14.7.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
-HOMEPAGE="https://bindfs.org/"
-SRC_URI="https://bindfs.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=sys-fs/fuse-2.9:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-src_configure() {
-	econf $(use_enable debug debug-output)
-}
diff --git a/sys-fs/bindfs/bindfs-1.14.8.ebuild b/sys-fs/bindfs/bindfs-1.14.8.ebuild
deleted file mode 100644
index 69f9d93e580a..000000000000
--- a/sys-fs/bindfs/bindfs-1.14.8.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
-HOMEPAGE="https://bindfs.org/"
-SRC_URI="https://bindfs.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=sys-fs/fuse-2.9:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-src_configure() {
-	econf $(use_enable debug debug-output)
-}
diff --git a/sys-fs/bindfs/bindfs-1.14.5.ebuild b/sys-fs/bindfs/bindfs-1.15.0.ebuild
index 69f9d93e580a..fc99a2e749ba 100644
--- a/sys-fs/bindfs/bindfs-1.14.5.ebuild
+++ b/sys-fs/bindfs/bindfs-1.15.0.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,12 +12,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="debug"
 
-RDEPEND=">=sys-fs/fuse-2.9:0"
+RDEPEND=">=sys-fs/fuse-3.10.2:3"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 RESTRICT="test"
 
 src_configure() {
-	econf $(use_enable debug debug-output)
+	econf $(use_enable debug debug-output) --with-fuse3
 }
diff --git a/sys-fs/compsize/Manifest b/sys-fs/compsize/Manifest
index 5905aae5182c..69dbe62d4ca5 100644
--- a/sys-fs/compsize/Manifest
+++ b/sys-fs/compsize/Manifest
@@ -1,6 +1,8 @@
 DIST compsize-1.3.tar.gz 14782 BLAKE2B 738ff0e2b936f5974064759914284e495c895d22d95b705e1b8fac4b3189891771b0e5be7e0eeac0883dd92f9cef276400bb7ee79840fd7db14a5269e7f78f11 SHA512 411b92651fdc3d03deccbf38f72936fee95cf80c67d6368efbc0dafacfe9793815a23ef0d02f7feadf31391e415df3d90cd19fb3acc8cce94f37cb3e4eed623d
 DIST compsize-1.4.tar.gz 15001 BLAKE2B 7e4d4a1f3ea59b23fec891c084f68ddb74838320a817767e48eb857de9678a1915d304d25b454afafec867ea6a028d99d9182087d3229ddae55d8305fe6b174c SHA512 c07081721f87d8a59e724a62a0a6d6724434292e6bb3ffb71acd7c47e21727db8f02f4df296cb6094c0e80d3cd555018e492616747ce69055d21302a6617ca54
+DIST compsize-1.5.tar.gz 15015 BLAKE2B 1a7fc676ffaeb69fd410a834eab54ef63c5fa11e428bd0567ab5dec5dc27fe1b4901fdd47760c07a7fb26375b81ba997528c0aa83409eb364a3b9f2cb1942cc8 SHA512 25d6f1973e8a0a86bd857dc1e1ba99760451cf388f3bd3ede6a6ef35351ff63f100646d313010aff3de9e70b2c68866a31c4ea31d9c6df9254648cd1bd0272fa
 EBUILD compsize-1.3.ebuild 966 BLAKE2B 190fe583af11b73cebc53de403e6db93b227640d211501ad7f0320c47684cb1ccc9e4fcce6248eac7ceebdb8bc188e1f518e15091c71acc2d64489eb75ecde35 SHA512 0e8e2cb492d64db2192e7eeeece71628e9395bbe30bfed2530ce9b7411dd12033f88ffd5260f1a0b0c40d7d7f35137c50b68ec7017eae528b353e9e11251ade7
 EBUILD compsize-1.4.ebuild 878 BLAKE2B 3564d9e3bedc4bdd95294e1ec12baf423a6bde645a3d03e53f6bd6f547742459845265bff9d7570c050f7f52f80cc1e9e78d8054b0a265d817706ddb9cf33c31 SHA512 abd05d452e141457a48967404570dac752100ca835df1851370602402991246cbee58a73ef3e2c79b2ba4ba4cdf5202f70fdad27ef0d8e28a31c69404189d366
-EBUILD compsize-9999.ebuild 878 BLAKE2B 3564d9e3bedc4bdd95294e1ec12baf423a6bde645a3d03e53f6bd6f547742459845265bff9d7570c050f7f52f80cc1e9e78d8054b0a265d817706ddb9cf33c31 SHA512 abd05d452e141457a48967404570dac752100ca835df1851370602402991246cbee58a73ef3e2c79b2ba4ba4cdf5202f70fdad27ef0d8e28a31c69404189d366
+EBUILD compsize-1.5.ebuild 909 BLAKE2B ed676805a2e426bb25874aefc1f8335949f5d2576d9963b748479f66a47f23dd52e1857bf22cb74e3b5af42ec9474834dc3917142978f196f7b6284693861350 SHA512 62ec27b02a1c338e1dcd4528fb5042805761a7a7e45bce0a99feeacbc888065d5e5f4528f56ab5b110699fe41e790fbcdbb0cb040c0895c09f953f87c5d04628
+EBUILD compsize-9999.ebuild 909 BLAKE2B ed676805a2e426bb25874aefc1f8335949f5d2576d9963b748479f66a47f23dd52e1857bf22cb74e3b5af42ec9474834dc3917142978f196f7b6284693861350 SHA512 62ec27b02a1c338e1dcd4528fb5042805761a7a7e45bce0a99feeacbc888065d5e5f4528f56ab5b110699fe41e790fbcdbb0cb040c0895c09f953f87c5d04628
 MISC metadata.xml 444 BLAKE2B 0eacf312059aaec47fa5f5036bc09afccf3275819b8e2890a02130d9e142020945f68d3e155cee27e18d6c061ddbbd6de71231beeab8a4b29e5535ad84db308c SHA512 1c03b76ef3eae52b3212d7f1a8b2e822ac24dcad2a95ed078d4819a7084e6e701f76ce3c17e38efaaeaede24357126cbf54e311c6b2a5c26e75299971ac7649e
diff --git a/sys-fs/compsize/compsize-1.5.ebuild b/sys-fs/compsize/compsize-1.5.ebuild
new file mode 100644
index 000000000000..471c60d719d1
--- /dev/null
+++ b/sys-fs/compsize/compsize-1.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Utility to find btrfs compression type/ratio on a file or set of files"
+HOMEPAGE="https://github.com/kilobyte/compsize"
+
+if [[ ${PV} = 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kilobyte/compsize.git"
+else
+	SRC_URI="https://github.com/kilobyte/compsize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+ GPL-2"
+IUSE="debug"
+SLOT="0"
+
+DEPEND="sys-fs/btrfs-progs"
+
+src_prepare() {
+	default
+	# Don't try to install a gzipped manfile during emake install
+	sed -i -e $'s/\.gz//' -e $'s/gzip.*/install \-Dm755 \$\< \$\@/' Makefile || die
+}
+
+src_configure() {
+	tc-export CC
+
+	use debug && append-cflags -Wall -DDEBUG -g
+	default
+}
+
+src_install() {
+	emake PREFIX="${ED}/usr" install
+	einstalldocs
+}
diff --git a/sys-fs/compsize/compsize-9999.ebuild b/sys-fs/compsize/compsize-9999.ebuild
index f00e46619d53..471c60d719d1 100644
--- a/sys-fs/compsize/compsize-9999.ebuild
+++ b/sys-fs/compsize/compsize-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Utility to find btrfs compression type/ratio on a file or set of files"
 HOMEPAGE="https://github.com/kilobyte/compsize"
@@ -29,6 +29,8 @@ src_prepare() {
 }
 
 src_configure() {
+	tc-export CC
+
 	use debug && append-cflags -Wall -DDEBUG -g
 	default
 }
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index e1dc81c692d9..5c551b35d6c6 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -6,5 +6,5 @@ DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 54aa6f087c5366e843c1f9b649fd77ec8b
 DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
 EBUILD cryptsetup-2.3.2.ebuild 4237 BLAKE2B 162a44538c0e962723b53de1e1c62252b2ba18d102724572d97c7a769d2a3298fe9c02170c0a6569d8f915c5987e4ebcd3cbe5d03c093d7181b8dbb8f98d8abc SHA512 6fd1de10c444320888ec5b0d4378c45001afae613f501c89914647a210cf3bb1ac8414325aa79d32fbfd4d4b6954b77ffcd50e06a3867c9fa43d8b044c9e59f9
 EBUILD cryptsetup-2.3.3.ebuild 4246 BLAKE2B fd0847b15440e36bcce552f84678dc995e06722938e64f4700d51c545f77dfc60fe08f0e4cabd8ac5bf02496ae3d42f13f413f75b4b1dfc484559263dc7d0b9b SHA512 388e9da18c262989e564a3cc8c5d0bababa3620b9ad13e1b49aa63d0082d1837460845e626e839befe07dda48b32c8c41248e77156dc46909ff5c70c41be8323
-EBUILD cryptsetup-2.3.4.ebuild 3918 BLAKE2B ac28ea0f8533e159aa4b47ad6f844379959807624f6a9af4069c6eb90ce299c839a20fd758a03651f2c6f33987508df219fbca04ed080259c07a64230dee9bd5 SHA512 646a9e1bd8b5c8672c5a642ed0dd8e7c25af8f2878740a0360fda0956ad2498ed9eb3524c465c62fcdaa9f643cfc8bd9a387d788607e5e59493def36f1d63bf9
+EBUILD cryptsetup-2.3.4.ebuild 3915 BLAKE2B 2bb7a4ed0608e243817430bbe1bca5b1549c5dee4b7f457cbcf6bc0846474638f0396e5682e1c235f969c078ce95ed92b3c8003e2ce9354ec76f8eac7d9b648c SHA512 0836b3355c17a7e5bca45cd5e285e9b564be5c6532f79c492bfe75a1aefb135442fbc5d0830f8c985d61796259042ab4ca1ed044263dea879bf205631f488aa1
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
index 994ecb298f9d..42ae3e6e9397 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~riscv s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 0c76b6104f63..8c79d168a742 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -5,7 +5,7 @@ DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d1810
 DIST eudev-3.2.7.tar.gz 1892931 BLAKE2B 9ae903d624e8fb1b334735527329e6074a194dd6e22073c54acc58010d0f8f2d29bdc42d3e6d72dd388c1012be273ca27626ffe1173382d7dde9ad3aee942cd0 SHA512 e6c8ec86ae434c967f6a568fa0b281229bb87be7e3fec025dc3e0225de7843ffaa5dd65bdeffefbc91e9e2911aa3de9df84c76148fe8863ff60fba4c88653c40
 DIST eudev-3.2.8.tar.gz 1894193 BLAKE2B 8709a13031744d5dd2f57853375b920bdaa6ea028624111dc96be9d46748de8423ac749f27183c668336701c16735d7ca2db4566621e0e741a2604785c14c64f SHA512 13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42
 DIST eudev-3.2.9.tar.gz 1959836 BLAKE2B 8792ded8a7d1dfbc16fae249283b58251656961cf360d72932c3fc6ea3e752f6334c21e9ebd9ee3ad0da03a590f8405b3bb7413eec3f964984225f7813311ef6 SHA512 09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f
-EBUILD eudev-3.2.10.ebuild 6982 BLAKE2B 07231fa12444370e23cb9b9a7320a988db43721fa596f9cf24988df8392d618a3bbf7fe1b9eb23abfb7d7770cc3aa74d42cbd892303058c7f2fa16fd9c904416 SHA512 67af8926a9fc0c892f9d48f2d9072c469d6f52c2c8136e428257ca6b48f56190f3ce67b3622f3d92c6e81444e49b4778bcbafaa3beaef83b44e758c3b7d4b56e
+EBUILD eudev-3.2.10.ebuild 6980 BLAKE2B 79651327abd3cf9feae72bbb9de1ba72287346d093ae3e51bc27d5c6e74d1f5731cd3b30402d9b83879c8919a07b36d514b413fca98079c298bf057832a868c9 SHA512 5b498c710f309ca1af95bda7a862a4bdda47742b6a8f4720fc86b7dc408cbaddc48bae9bcde5b26105ea18971af98fdbd240737783e406c4eaba15b0716a71e7
 EBUILD eudev-3.2.5.ebuild 6812 BLAKE2B 0fdbb319de304026fb2c3f036f759cb47abdf33585062ecb3ea2491b68182b7fc29af8a50761ecf5642d5c4e5c587951db4e8e8bc6cd8cc807c4ab44fde24290 SHA512 6444a8d845287d76f8c20add841d1e2cca7ce398647c694b34d4388c9a29ee03e1c640e2ec7cdb9fb8265a5c812dce04d4536684f7ae67f04e3e39778f8d3bee
 EBUILD eudev-3.2.7-r2.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
 EBUILD eudev-3.2.8.ebuild 6974 BLAKE2B 34eda740d96fda21fdf8e00d9bc9f832f159e4929759b650d34333cf1a49645618e1484154df8ec64a891651c3a1a510074b763bd527db5939a3d2c2300563e2 SHA512 eccd69a314efb3910124fc47db5ccd69a18385f6c03ca8b5f0ab3f61fefc12e8e3e0827a5649f2b2e48cbe665b8cadb09f283ad12cff33210dd616ea261a9e6e
diff --git a/sys-fs/eudev/eudev-3.2.10.ebuild b/sys-fs/eudev/eudev-3.2.10.ebuild
index 56fc1d448292..cfd51e2da06e 100644
--- a/sys-fs/eudev/eudev-3.2.10.ebuild
+++ b/sys-fs/eudev/eudev-3.2.10.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/reiserfs-defrag/Manifest b/sys-fs/reiserfs-defrag/Manifest
index bb303486f196..5cd2e4237a7c 100644
--- a/sys-fs/reiserfs-defrag/Manifest
+++ b/sys-fs/reiserfs-defrag/Manifest
@@ -1,3 +1,3 @@
 DIST reiserfs-defrag-0.2.2.tar.gz 52988 BLAKE2B fd137c7a485c0c59ee8c9e3cf1695fb640073a85a89465bc33ef39fc9dddd78dd397d4f638930cb92116fc8f0174cef69b0b7a2f925e11d4353b790d0c6de23c SHA512 1e8dfb085a7635eda92bb820d3089b8ca2101fb00ede971b8de24018250a2238067e8db4e5f52b3d3aca2c45c8a395ae6687ce762d355e814697faef8ff59025
-EBUILD reiserfs-defrag-0.2.2.ebuild 580 BLAKE2B dc01880423f7274c38d66152ec1dfa36ca3c0fa914c01d603bfe3552b14a16a0bc29cb70c788184b6c2a02353996cdf7a5c2a20254de35ccd479944f49eea5b4 SHA512 c81384cd4eb6b0aa58f3f8a7469fea705c1e4f24fc6825cfc53066e5d4fd42fa4e6a836e112ee3b58b620268d644d0aafb32651093ee652e2cf676882f946e2e
+EBUILD reiserfs-defrag-0.2.2.ebuild 558 BLAKE2B 15c1daf810702daf8778d4cc673444c2c07e63a5ddcceb6aa98402099e63b9745a35925bb238c433e425ef3e2314bc49e6f1a2a4e8a33bd109a3ccefd9a29f35 SHA512 b5c05d87128937491a4aea542f6c340ecd3b6eafb112e8bc39795c0ee3de9a9c01aa5f6ebf749a715379ae5eb12958616ecf055fcf2acbebd18a38d958552e48
 MISC metadata.xml 510 BLAKE2B 4e3ed7d28ebc97455aabecc27134071f9526c1d86464f10afb45d2ece46332c42ffad78b989e0b2085e22d68161328da0cea61f572a6ad1fe814dc4e2bccdcf2 SHA512 97f508e7e986e8140b0a1760898f1ceb417e7e2ae7da1c0924435fd15b85900eb4a1103f2a240e8c05ee16d4327121650a66163b0573df42d94532c8face9263
diff --git a/sys-fs/reiserfs-defrag/reiserfs-defrag-0.2.2.ebuild b/sys-fs/reiserfs-defrag/reiserfs-defrag-0.2.2.ebuild
index fa199ec1c407..3d0f7202d04a 100644
--- a/sys-fs/reiserfs-defrag/reiserfs-defrag-0.2.2.ebuild
+++ b/sys-fs/reiserfs-defrag/reiserfs-defrag-0.2.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit cmake-utils
+inherit cmake
 
 DESCRIPTION="Small defragmentation tool for reiserfs"
 HOMEPAGE="https://github.com/i-rinat/reiserfs-defrag"
@@ -12,7 +12,6 @@ SRC_URI="https://github.com/i-rinat/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="debug"
 
 DEPEND=""
 RDEPEND="${DEPEND}"