gentoo resync : 25.11.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-11-25 22:39:15 +0000
commit: d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree: 0625f358789b5e015e49db139cc1dbc9be00428f /sys-fs
parent: 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
134 files changed, 1336 insertions, 2721 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 26bce9305637..3a631260ba2c 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest
index 49d66d694904..59678b3a88bf 100644
--- a/sys-fs/android-file-transfer-linux/Manifest
+++ b/sys-fs/android-file-transfer-linux/Manifest
@@ -1,6 +1,6 @@
-DIST android-file-transfer-linux-3.8.tar.gz 780911 BLAKE2B 07b4e7670125b1ff382e7c6b1e36427fe0c1fd9665106d73144de5ca68692ae390496985fe83550ec90a64a83fa45b27e4e6d6738e4590ca8c5078a4814ac141 SHA512 b311b76658b57d16cd11c8f5bf03630adc6e0f1939d985a75e7effab584c93dbb82e65fb4cf84a9ef453c901c7f7d3100b96737de20577235fae6fd156a03da1
 DIST android-file-transfer-linux-3.9.tar.gz 781268 BLAKE2B 63032a39b39cf31b8d051c0069c0357f0b6ed5bd9e592ee5ce1f5e95438ff27571ec7d58789eb865a1896097c3cebf0ec30a89526b62c93694d71ca29e95d415 SHA512 7468ff19d2b4ae0f768eea70ec45246da11c4e541d07a9548d057c080adbbc905f76dcdff18c4c8478cd19aee6992d02beaf8b4275d7302997652e25351ab5c8
-EBUILD android-file-transfer-linux-3.8.ebuild 1194 BLAKE2B cab174e5582f94aead2dde5bedd357dd045beb912f07df3d677d59b1244c38c6a1a8424a6cfb5a277b22fa8f8199602c1003765554ccf422fb55138678b6927d SHA512 448b714c40bf84705876697d154a77d58e6ffb2c782cde0b5187ec716c6f5492ea4f82adcb7a8ac9906c6350a2c6c38e09d6e87fe978ae2ccf24371e81ab1d3a
+DIST android-file-transfer-linux-4.0.tar.gz 820094 BLAKE2B 1cb7150647e09a9f3dbe30cdf8ff01e122c9bab5a450c9bbe58fc8e3c8b48de0e2b6d571c8e7fa71de25fff28b803ef60aed7f8a77129919bdf9f482fff975ee SHA512 31083d3f7adb06ba0b5e79738825f5a10f3f4ce7e5b24498f7255224c11a9d978b814749c4b5fd60a5ec2b4c7d06bc85ad4b0cfb6cbcf6b3ff3f7e331c6c03f1
 EBUILD android-file-transfer-linux-3.9.ebuild 1193 BLAKE2B 8b0d02c8d933b9dcb08cd4d256d2b349694fb4db8a6fc07fff613aad18b217fefe0290a12cb3544dd765c68cf956141b9d1d232571914177bad2461c812235f5 SHA512 fcfc9a94eace56b09890fb2cf4abeece387a9d934c2ae483ec17ba5a62282685dd4609ab59176e51e19b10171d0946b60159d3a9440e0e616d2ef13de0316522
-EBUILD android-file-transfer-linux-9999.ebuild 1194 BLAKE2B cab174e5582f94aead2dde5bedd357dd045beb912f07df3d677d59b1244c38c6a1a8424a6cfb5a277b22fa8f8199602c1003765554ccf422fb55138678b6927d SHA512 448b714c40bf84705876697d154a77d58e6ffb2c782cde0b5187ec716c6f5492ea4f82adcb7a8ac9906c6350a2c6c38e09d6e87fe978ae2ccf24371e81ab1d3a
-MISC metadata.xml 429 BLAKE2B 8d4f35c4537ff2fbe3f410e1d07a5e973b13f644d8a22b2f0dbddefc360ba851802ea8c0af29383dd791f4df26f0d235acfc35e3051e295512d0c9fbef19e9e1 SHA512 65bc09b634fa9f7d501ca82d4b64ed6ab524d226dc2e47c8b52db340cb5614280ace108fdf1bcd37b6ba80ea48e7c5a249c43da5053fadb7d5993950b5448874
+EBUILD android-file-transfer-linux-4.0.ebuild 1680 BLAKE2B 110607fd5a05b4ddf9db93346220624bd3dbd7f15605fcb35f77095d3eac50c060201f1d446b606791b992bd75878df9fa1a6fda76c02de1362c40a45c88d1e8 SHA512 266e8abcd474e3449f6983f2b7d7d75ebab5a3ced25bffb42f79a725e3948211307da281b6be640920307d4fb35cc44b339ec76e7b1bf094004136c9ff4b66a7
+EBUILD android-file-transfer-linux-9999.ebuild 1680 BLAKE2B 110607fd5a05b4ddf9db93346220624bd3dbd7f15605fcb35f77095d3eac50c060201f1d446b606791b992bd75878df9fa1a6fda76c02de1362c40a45c88d1e8 SHA512 266e8abcd474e3449f6983f2b7d7d75ebab5a3ced25bffb42f79a725e3948211307da281b6be640920307d4fb35cc44b339ec76e7b1bf094004136c9ff4b66a7
+MISC metadata.xml 492 BLAKE2B 25383fac13727b68cd34690e79764360dc7bd68720386048ce2c74cbc4292eb5b76d8f296eb6399c520ef562eb10dd574a960b8d04ff048de3918ab9aac6cdc4 SHA512 4c7f31e3255a9afcb94d210b2c4f53068f5919fa6b7f5928479d0c920af62852ef8752e8a72de2e175bbd7606f73795781db54189cbdbbee34868fdb59b36b47
diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.8.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.0.ebuild
index 96cfef233539..3ef7155a7e2c 100644
--- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.8.ebuild
+++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-4.0.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake xdg
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit cmake python-single-r1 xdg
 
 DESCRIPTION="Android File Transfer for Linux"
 HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
@@ -19,21 +21,44 @@ fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-IUSE="fuse qt5"
+IUSE="fuse libressl python qt5 taglib zune"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	sys-apps/file
 	sys-libs/readline:0=
 	fuse? ( sys-fs/fuse:0 )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
 		dev-qt/qtwidgets:5
 	)
+	taglib? ( media-libs/taglib )
+	zune? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 "
 
 DEPEND="${RDEPEND}"
 
+BDEPEND="
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 # required to override src_prepare from xdg eclass
 src_prepare() {
 	cmake_src_prepare
@@ -42,23 +67,14 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_FUSE="$(usex fuse)"
+		-DBUILD_MTPZ="$(usex zune)"
+		-DBUILD_PYTHON="$(usex python)"
 		-DBUILD_QT_UI="$(usex qt5)"
 		-DBUILD_SHARED_LIB="ON"
+		-DBUILD_TAGLIB="$(usex taglib)"
 		# Upstream recommends to keep this off as libusb is broken
 		-DUSB_BACKEND_LIBUSB="OFF"
 		$(usex qt5 '-DDESIRED_QT_VERSION=5' '')
 	)
 	cmake_src_configure
 }
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild
index 96cfef233539..3ef7155a7e2c 100644
--- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild
+++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit cmake xdg
+PYTHON_COMPAT=( python3_{6..9} )
+
+inherit cmake python-single-r1 xdg
 
 DESCRIPTION="Android File Transfer for Linux"
 HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
@@ -19,21 +21,44 @@ fi
 LICENSE="LGPL-2.1"
 SLOT="0"
 
-IUSE="fuse qt5"
+IUSE="fuse libressl python qt5 taglib zune"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	sys-apps/file
 	sys-libs/readline:0=
 	fuse? ( sys-fs/fuse:0 )
+	python? (
+		${PYTHON_DEPS}
+		$(python_gen_cond_dep '
+			dev-python/pybind11[${PYTHON_USEDEP}]
+		')
+	)
 	qt5? (
 		dev-qt/qtcore:5
 		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
 		dev-qt/qtwidgets:5
 	)
+	taglib? ( media-libs/taglib )
+	zune? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)
 "
 
 DEPEND="${RDEPEND}"
 
+BDEPEND="
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
 # required to override src_prepare from xdg eclass
 src_prepare() {
 	cmake_src_prepare
@@ -42,23 +67,14 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_FUSE="$(usex fuse)"
+		-DBUILD_MTPZ="$(usex zune)"
+		-DBUILD_PYTHON="$(usex python)"
 		-DBUILD_QT_UI="$(usex qt5)"
 		-DBUILD_SHARED_LIB="ON"
+		-DBUILD_TAGLIB="$(usex taglib)"
 		# Upstream recommends to keep this off as libusb is broken
 		-DUSB_BACKEND_LIBUSB="OFF"
 		$(usex qt5 '-DDESIRED_QT_VERSION=5' '')
 	)
 	cmake_src_configure
 }
-
-pkg_preinst() {
-	xdg_pkg_preinst
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-}
diff --git a/sys-fs/android-file-transfer-linux/metadata.xml b/sys-fs/android-file-transfer-linux/metadata.xml
index 9746ecb92773..d01c43a440a2 100644
--- a/sys-fs/android-file-transfer-linux/metadata.xml
+++ b/sys-fs/android-file-transfer-linux/metadata.xml
@@ -10,5 +10,6 @@
   </upstream>
   <use>
     <flag name="fuse">Add FUSE mount helper</flag>
+    <flag name="zune">Enable support for Microsoft Zune</flag>
   </use>
 </pkgmetadata>
diff --git a/sys-fs/bashmount/Manifest b/sys-fs/bashmount/Manifest
index 0c18ac219960..db6a643c3f21 100644
--- a/sys-fs/bashmount/Manifest
+++ b/sys-fs/bashmount/Manifest
@@ -1,3 +1,3 @@
-DIST bashmount-3.2.0.tar.gz 18152 BLAKE2B 61ced33a9d912d1bb9ad7ba4f9331830523ad0a35aa643ca71aa30618b0d94234d74823c6170e4047c9517aa07d1b70a59b780e6950f7888028e0143867d5866 SHA512 9fd287f67ecb61c9b72d1fc6a5b85b39d48671299585ad456ff3e14cf2304ad540de1462bbf3eafd333ac038cf8a7f2286f5077b896ea88dff570306f7c7d642
-EBUILD bashmount-3.2.0.ebuild 584 BLAKE2B 9e9df6081c1e3a33a7ae4b9144e38db67ea102ce4b76f6a8a4d7982fc8ec84d0d84a36e7200784eae9b19b80320d29a7afaf1c9b04f9a29662396323852f3a89 SHA512 0a1ee47d5505d72ac0928be4dcbaca48923e0d04a47ce4a16bbfb58c421506ea291c45b77b344c86c5fe09b9912d56ca8dcdd86db7310030bd249c6a1b8a4389
-MISC metadata.xml 246 BLAKE2B a49e994b78eb6150dd71a093106b6117e24561440c58455f5ae2e5b3432089328121f4d6f58ab2ace94eb6af6bbc19c1c81d0acb9f5fdc2712ba34eeb30395cb SHA512 d9990b6587013c58d123758bb630e46ea6e7ac3435a075eadf0922bf3e48e8a97a8303d704da320b236d9cb9ec996288b5e6d7245f11175911b8cb3d9c649ccd
+DIST bashmount-4.3.2.tar.gz 47450 BLAKE2B 0dc45580b62aa55872753de17ee50e77e716e87498193c8dab0998f5a70994ad5cc9434c104bc1d6cc77d75d63688afae8be8e0e8ee4344249ded5f1719051c5 SHA512 ac18d76dc27099524f4051299dc5421e1e5811e943df21d64a1405b5cdf6401189d78571596f27c89c0d76ab40874392c0c90756ef5fa9c036f447ac884ee062
+EBUILD bashmount-4.3.2.ebuild 620 BLAKE2B 8b4527930b036a75b236e1b7621f49426b739e6cf0bbf0461be8f52bad74f4b7f148415455680aa35cb2b77f9f3176af69c935931372d2661636434311942688 SHA512 1c828df7d9f03330daf4621b535061c73796c82d7e98fadc1fbbcfd601c28cbea2144c29fd2d7c0e4de500d8424c71f8aa9c089e4f04c86fdc87011c7fe054c4
+MISC metadata.xml 447 BLAKE2B 8495fe20d357824d2c5ba05f50ffe45d209b016f56c13b61959341ecd592bfd4236cac2dafe6211b3755cd71e28f0a99b8bd597a2aed3375b448f5c535a839ff SHA512 03d0381cd11be4856fb54a60353684b9466e3b3effa47cc02415198f821077bad31663bb033b8d2cf8ae82578aa4fb2c462e253b862018d08f9bb19eca3b9ca4
diff --git a/sys-fs/bashmount/bashmount-3.2.0.ebuild b/sys-fs/bashmount/bashmount-4.3.2.ebuild
index 9124bc3307ef..71c5fb9802b5 100644
--- a/sys-fs/bashmount/bashmount-3.2.0.ebuild
+++ b/sys-fs/bashmount/bashmount-4.3.2.ebuild
@@ -1,24 +1,24 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
 DESCRIPTION="Bash script that uses udisks to mount removable devices without GUI"
-HOMEPAGE="https://sourceforge.net/projects/bashmount/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="https://github.com/jamielinux/bashmount"
+SRC_URI="https://github.com/jamielinux/bashmount/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
 # sys-apps/util-linux -> lsblk
-RDEPEND="app-shells/bash
+RDEPEND="
+	app-shells/bash:*
 	sys-apps/dbus
 	sys-apps/util-linux
 	sys-fs/udisks:2
 	virtual/eject"
-DEPEND=""
+DEPEND="${RDEPEND}"
 
 src_install() {
 	dobin ${PN}
diff --git a/sys-fs/bashmount/metadata.xml b/sys-fs/bashmount/metadata.xml
index 16ee64e7f2d8..5f308339baae 100644
--- a/sys-fs/bashmount/metadata.xml
+++ b/sys-fs/bashmount/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">bashmount</remote-id>
 	</upstream>
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index a73e897b5a43..70608ea5b27c 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -3,6 +3,6 @@ AUX 6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch 1281 BLAKE2B
 AUX 6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch 3250 BLAKE2B 3f6a81bbf00aa528b238b1c54458c369ebcfd890cf5080e640b0e201273cc01f72380fd57b3f63ff02c9ace0c6a7d8ac9c5b684182b5d8957be756107aab24a5 SHA512 827871dfe5d7ddd2dd6afad96b23f25ba4f722d7f73575554d9968f95e22990b36d1d34384406beb72a61050938a1e8910fbac5ea8d68fb41dfdc099d1ed183e
 AUX 6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch 3102 BLAKE2B 20319e2791f68201bc7b13471b4192b2124cfd9d16f72ced72e95cd99619d890834d5373b45f620be2375a1a8d3db780d83b95fa855488643035ed244ee16c6c SHA512 1042b4042718061be5bbfe5201000c5098bf63a1eee157ae093c4ff99d72a9a7d74fafa865a1d08eb5e8243116ac1b36e2e1dbb224548c1517def1955ba3fb18
 DIST bees-0.6.1.tar.gz 124411 BLAKE2B fd6c875334cb610da94a4633351b7edc5a4ecf4ff467bb93c8559a1698fd29667d43955e0031498401ceeb3d8db13b5aeb80d2f16cd61e4d5a6607e432082c79 SHA512 cd44d21959d3ab4dda255f0a4a57bd3aeecfb9fee6ea26d68a1b5f84d407f75bd0b442ecf4fefc5ac856dcd9af035f44ceeff77a8926b164f97a15350efcee33
-EBUILD bees-0.6.1-r2.ebuild 3523 BLAKE2B 3caee68e4cd62f81071ec7e713f9ca7f900cb5beb5f17c6b6323375b872d2bf603fa759b90836b8416a657ef9106186dae9236a8f45049b217fc5c2a9687d793 SHA512 4c96c4ce8e2df0b175674c2697845eb79b413829ce69d16ee7962f9f1657efb946840eb0d3dc74448afae20b58406c809d5fc8b0dab2f468995a40ac9db8223b
+EBUILD bees-0.6.1-r2.ebuild 3530 BLAKE2B bfb723fb4df7bffc3463bb8c102027d33922f6bcddb3d663aec57844846e15d0d91a94076f60390004a93598ac15e5c3a97e5430f2a8a1bac8b13f6500404892 SHA512 01ddc099d86adf73eea46fb447e807ed6b571c6f7bd1f0a3f4b6acaa9d74ec555b89b8ae27ae3f0a9b139b3e4c3edb77bd009b196c2febe30c87a38bb373d221
 EBUILD bees-9999.ebuild 3148 BLAKE2B 05dcb515e076c7572be647d97ed05891a989c290248e119dea54b0f979a09ce3fdacde0b301a6c19c3d8e82d460c438b47ed19189ef816a709cc4f09a7096091 SHA512 e92b472c4f6cc6666638436f1afa8036a2e08c1a7f07ae9870f0a2c7c1312341dce9c8a23e7e548f21b4c93e120da086b940f50987c4e6f4dbd1d83a54963d0f
 MISC metadata.xml 591 BLAKE2B 8744c233c9718ce545165c6c8deaa455efe283cfe186aeee9876ad31195891b1255ae20851e5d5f52c19f4bb038558dffd7c2f3bd091af1b0b5c3d6e7a717975 SHA512 333a091d0869955cc3fce76c1d462b44715f8f1b89017c1b240cd5398e53ee1b370f7fc2d76407efa8a045c1088a195786da072d4d6ec30c1f09f42977839b20
diff --git a/sys-fs/bees/bees-0.6.1-r2.ebuild b/sys-fs/bees/bees-0.6.1-r2.ebuild
index 3f4ce0f69aa4..70bf39d08a69 100644
--- a/sys-fs/bees/bees-0.6.1-r2.ebuild
+++ b/sys-fs/bees/bees-0.6.1-r2.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Zygo/bees/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm64"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 71bc8e697047..b8c5965c297c 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,11 +1,11 @@
 AUX btrfs-progs-4.19-be-bswap.patch 1035 BLAKE2B 153ffa73bf79eca3172bd566d7daffd84d52fcb01fd69ad30547ed44a2ce1eec23b6eb95bbcb0259a966a152f796f5c57f022b33cbf7063c4e53236e93c6b3aa SHA512 695d21bd1dab1196596e4f6e2d14020e0b0e938493459feec33ac21f9ab6ecddc5c14a79ba738166d6010662b4f6c75232c6d3393d8eb69c5d7c7d0560448051
 DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b098108f7363fc3c015d73bf9afcda9d579831fe0e324125893cdb2510873d052522b15843c461e640a546900e535ce76 SHA512 e5abf637a9c811973422ca05a5530f6cd18263013d141277e2a70099cf8ab7e0eb8781df56368da4321c90f21d1022ad852b661adc4877e9a9ba5c60ccbefdee
 DIST btrfs-progs-v5.4.1.tar.xz 2107476 BLAKE2B 1ea58f49b0f8185e944010804e544643a2eafeea58fecb480b13095c362350c218f0602fbb43a96705a81befe88ec3e3abe35cc90d4732006479b059aa7fed32 SHA512 56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f
-DIST btrfs-progs-v5.6.1.tar.xz 2117064 BLAKE2B 9183300e7c086cb8f03ac14139d3d2a424461f4c5afc0e7b9bb588f4c0ddd2c41d7cefe91787b1cabe6397f8abeb6e958900e7742a80d3519382e98c3b197c9d SHA512 8f523249a5c2bfe1c0d52b0dc5d31d52b330b1c616d3ec423fa1fb4a845441bfeaa32abbe42a444a4fc84016a482c8102a3eb451ac423b542e332e9c26e76dc6
 DIST btrfs-progs-v5.7.tar.xz 2182728 BLAKE2B 47573baa26cde058003b402dadba28f278b4b3ffd270d002ab8fd72d94ee41d3fdfb3d36c0c579e24ea6afae4b2dea2ca704d9dd809fcd10fbc146d63d48980c SHA512 72c3af13ca589f2e0b96cb7602319035ef8aab6ee224fff3544a5d0bfc013a66552dde4533ec5e64696d404b8905431cd0f25367c40fd34ea39be7c0ed8c2d16
+DIST btrfs-progs-v5.9.tar.xz 2189724 BLAKE2B 3692e058e5e52c2a3684548d0b0ca94a9101a66dc8951266a49a71b6848b7f0cce8ade0e914ae8b71345021750e7d20742af13aec69aef7d52e3030fca289529 SHA512 38db047198ab0467d3fe235f7e8e1fd14ade00dd0b182588220c5f5e4b598efbdcd30a3d5d56cf0a0ed8a902d2374af0927eb7f3720cd761172c7291a2a65c94
 EBUILD btrfs-progs-4.19.ebuild 2935 BLAKE2B ec90c74cd306183cf06e9a16551d0bb3c029eed1336ee32ba06fc243fa6598cfeacf896334e36855055031c67c49d4eaac15f27d6c2c13e1dbe125cfef757c7d SHA512 cd4490f127fa27ffd9916c8464c3dcf6453d5da8e9a4ba81e3c4ddcc6fa17740293c7324a80c1bc5d3faa2a28b6f7dbcf5cba577cf6a9e09652fb1a02bb66cff
-EBUILD btrfs-progs-5.4.1.ebuild 3057 BLAKE2B ea4719eae94d8466501d701ef0734ac95ad009535f7b7cd60a9d5fe5d569385102d69237874fea58688686a57e256d443b73af5329135c5b55b3ad336a960575 SHA512 7349724ea6470a3b46a69c9d959860cfa3c0a791a28359ff7b80f8dc829bd9acd6e3fedff5d6dc3f769f090a5ed9e39c904979fa5c80fb618c4361ab5d1c41c0
-EBUILD btrfs-progs-5.6.1.ebuild 3064 BLAKE2B ce781c34885668adeef3e1a0009f0a929122b482e7ef356a33652d791f082c9f2832b280c1f10894f3c43b0724c24f69850b26fbc26ee3d6a56b47dc7c409f9a SHA512 2797cbc83b6716addd885daa532fd17df55da984d8c184ecc37a75cbbc47765cb530909572671adf680f7408a3d75f58aceefcb544ab948d9a5b6cb9c77168ef
+EBUILD btrfs-progs-5.4.1.ebuild 3056 BLAKE2B 1e99fa5a44629e1ff802fa056a3c026ca4c2f266415f910910bd2a205e8a98939355221d220e938fe276c74daf8462ee44f8038d449a5d46e26c9fafc3278078 SHA512 963080d0816c9b226848d8c8cbcf0bdc979e37dc0a0212c23202e4167170595490fc9cdd83597473ed723a903aa6a4d64e66bf29e4f8da93cd2667ccb1ae695a
 EBUILD btrfs-progs-5.7.ebuild 3071 BLAKE2B 36dbc24c764f7a903b611b52ce125e06c4e29b54dfd4ab3a89d77b7f52fc5696b0f01dce4b4305e1852d317f7624090e60598ba319a92dd52128424760a6dba6 SHA512 d09374b0ff974ecf54aad32eaf6394289f36bdce10940ed80f4100444db3fff03e847bf4834937a1a9aa8748b6bef32e597ea0a6bf08d0de29f497ef75062190
+EBUILD btrfs-progs-5.9.ebuild 3071 BLAKE2B 36dbc24c764f7a903b611b52ce125e06c4e29b54dfd4ab3a89d77b7f52fc5696b0f01dce4b4305e1852d317f7624090e60598ba319a92dd52128424760a6dba6 SHA512 d09374b0ff974ecf54aad32eaf6394289f36bdce10940ed80f4100444db3fff03e847bf4834937a1a9aa8748b6bef32e597ea0a6bf08d0de29f497ef75062190
 EBUILD btrfs-progs-9999.ebuild 3064 BLAKE2B ce781c34885668adeef3e1a0009f0a929122b482e7ef356a33652d791f082c9f2832b280c1f10894f3c43b0724c24f69850b26fbc26ee3d6a56b47dc7c409f9a SHA512 2797cbc83b6716addd885daa532fd17df55da984d8c184ecc37a75cbbc47765cb530909572671adf680f7408a3d75f58aceefcb544ab948d9a5b6cb9c77168ef
 MISC metadata.xml 523 BLAKE2B 7757fa4d4f1400bf08e2975e5214a1dd0c8258b61366c98089ca9c497b8c62e497cdedad605370f7034519b91c266b23e2e42bcafef3bb2bb69cb6b93319fa00 SHA512 3830f8f555ade672eeb52394a5b262e06e69b8b27d947d81dcde9b341fea9f16b77df8101ee5cd3314b6552543431a5f32a2592bf77a7a50e28cc56c95a4b164
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
index 279448662bff..f20f3fcae63f 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
@@ -12,7 +12,7 @@ libbtrfs_soname=0
 if [[ ${PV} != 9999 ]]; then
 	MY_PV="v${PV/_/-}"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 else
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.6.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.9.ebuild
index e8b44f1ff9b4..81e4dc34e2dc 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.6.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.9.ebuild
@@ -12,7 +12,7 @@ libbtrfs_soname=0
 if [[ ${PV} != 9999 ]]; then
 	MY_PV="v${PV/_/-}"
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
 	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 else
diff --git a/sys-fs/clamfs/Manifest b/sys-fs/clamfs/Manifest
index 8f6b6cb65ba6..5b984722226f 100644
--- a/sys-fs/clamfs/Manifest
+++ b/sys-fs/clamfs/Manifest
@@ -1,7 +1,5 @@
-AUX clamfs-1.0.1-gcc45.patch 391 BLAKE2B 1510b32786a059127d58651df0c9220407d018272431ac28c2a6bd3c3c42b8c42ed74903349c1820ab622a3f223af691b8dd0fabef9e015457028162f522f1e0 SHA512 00bc13b5abfb07d08e5b34d2490d62de6f8c0daf78f920dcf5a0c92b203d3fd769ea631247cc3f61992ee4453875a8707379a1c9e399e805dec9c8c47cf2a5de
-AUX clamfs-1.0.1-gentoo.patch 675 BLAKE2B 4e0e8658444f706aed06b69c9c0d110dc7ea81839243042ef06040d28525091053f3ecdfc1c79ff8e84c0414dc9b0f4fff1ba5c54df21d83b5a126e20f33d9ef SHA512 3b96022c30b66cf62c440d4150168bed5a25b4bdac1cca8ac97d3383c5bf16749712185a7011aebc97c2730d42d6b90e48dd9b1825988c2a5366ca1af916296c
 AUX clamfs.confd 41 BLAKE2B bfca4ec45eab1c94f54e9f470797be54c2bcb363bccf2565e391803189ae614f8d17d0eee6bcd83bfac5b7829dbd5a1ccbbebbf34a4f5033ed87d632f0f9358a SHA512 a49afb1e2684732581c4b6274744be71193e48137d71abf4d12b943d1b91502b52fd077a6124c33182e6796cbdb609c000e0f3c1baa05b9349ab4a38b247280d
 AUX clamfs.initd 441 BLAKE2B d14da6b7120e4ab864be2faa1c8387044be9ee8d666eff0a57e45ad0ffc0ea2609a36a5ab97e8255aeb9d68f615ddcb40199eb8bb68626aae3e24f25f59faf38 SHA512 5a3b2de57733893df42d307ac299ec785f9e7a9d52bbd4139c166b607c5e803d3052afaee5dcc95b430fdb76a0da05c198c419dd8f3885e7d2d1b5d5e3c6e8b6
-DIST clamfs-1.0.1.tar.gz 142386 BLAKE2B d4333ddebae3aec1ffa36cd5db361b07daa4007c75e6f6e7e3c296f99573bde5ac77722b7af95fe194fd2ba0d56550a608911235da6cc7e9c25359af6554fcbd SHA512 8a9912c068c178049e8538da729635af1372e8ad1f7bc0e14cc7506208d15a4c1fdab7cf229dd683a3245168c627a3d994ec5b24bca5f12efc9ff638040e3258
-EBUILD clamfs-1.0.1-r3.ebuild 879 BLAKE2B 2d5134ccafa339a451c8bed3b5e88f76a4027417f6d8fc6c9618be1ba732a7c17cc466b45a918211176977f1a9f47a563c7aead84e404a460e25cf41f14bdd33 SHA512 d997aad74ff871769af91dc4fc46a013077970405384da336cd7c7c1cccb12e55f2b817d2562147c587f12fcf71271906892caf7b8dd510ec0878e57f8b54fd6
-MISC metadata.xml 475 BLAKE2B 6f62f5c3c67b45ea22c1075f4698e51d00e64da546d62ba7f6bd3f1e65e2f29eafc9d14e577c543fb25a0d76e95f32f37a97d696d2c32653658de917b42958a7 SHA512 b6df75e41f257bd6d420906c1aadbdab5efac2e6910ffcdf41f6353d3745f17f1f7df7733e816944c87f8f7503082bcdc422430c601ab06701408663fc150011
+DIST clamfs-1.2.0.tar.gz 196903 BLAKE2B aa84e3a35714a2638d9569b6bb77f5da5c34f962d7baff0e5b08bbd7a56f1d1624936a5054b1a99d5593dc20412e55f36ab732fb84326f40c0614f084698618f SHA512 72a8625c18f520258075cb0310d14974e15f7f0cd628ca968317adac778fd8db26fa28bd72d954f2c21e6c41c32a38a5fbfa8be3918f9e0314d1d7f1da2cc626
+EBUILD clamfs-1.2.0.ebuild 884 BLAKE2B 6980e4d40b869b5de9b7f4d1a4442a02e416d5303a0a32843cbcba960698f959a791137da39d4014d13596ec281f1d5d6a103d2941e85ba469380b7b6f7a988a SHA512 c075fdda1cfef3b76d37a3f6a139a0677a3d0af6c75ae46d376061b0f5b5906ef69157f9c7764dd14c0e7979a6ac6ec90b574403f64a94db6c4eaf1683053afb
+MISC metadata.xml 687 BLAKE2B 37829356f4f52cd8839f2ef33ae462c2a5e8a062bd3293bb177c4ebd31a933912e7ea30f26cbaf149de613ef8e4913e9adce1a223c1a9715d81af3b70657663c SHA512 f18160b3711dd7e8f064abd9b4e929d50ff9c7996807402916e4532902aed5c52f3ca0460c44c280e89d79ee4c4ffd0c682fc8cc56001eb93064304157d8659d
diff --git a/sys-fs/clamfs/clamfs-1.0.1-r3.ebuild b/sys-fs/clamfs/clamfs-1.2.0.ebuild
index 8a8bf827a5ba..c7a90b3a7d45 100644
--- a/sys-fs/clamfs/clamfs-1.0.1-r3.ebuild
+++ b/sys-fs/clamfs/clamfs-1.2.0.ebuild
@@ -1,36 +1,35 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
-inherit eutils linux-info
+EAPI=7
+inherit autotools linux-info
 
 DESCRIPTION="A FUSE-based user-space file system with on-access anti-virus file scanning"
-HOMEPAGE="http://clamfs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+HOMEPAGE="https://github.com/burghardt/clamfs"
+SRC_URI="https://github.com/burghardt/clamfs/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE=""
 
 DEPEND=">=dev-libs/boost-1.33
-	sys-fs/fuse:0
-	dev-cpp/commoncpp2
+	dev-libs/poco
 	dev-libs/rlog
-	dev-libs/poco"
+	sys-fs/fuse:3"
 RDEPEND="${DEPEND}
 	app-antivirus/clamav"
 
 CONFIG_CHECK="~FUSE_FS"
 
 src_prepare() {
-	eapply "${FILESDIR}/${P}-gentoo.patch"
-	eapply -p0 "${FILESDIR}/${P}-gcc45.patch"
-	eapply_user
+	# Do not use Werror ( #754180 )
+	sed -i 's/\-Werror//g' configure.ac || die "Sed failed"
+	default
+	eautoreconf
 }
 
 src_install() {
-	emake install DESTDIR="${D}"
+	default
 
 	insinto /etc/clamfs
 	doins doc/clamfs.xml
diff --git a/sys-fs/clamfs/files/clamfs-1.0.1-gcc45.patch b/sys-fs/clamfs/files/clamfs-1.0.1-gcc45.patch
deleted file mode 100644
index 1f5f63a252f2..000000000000
--- a/sys-fs/clamfs/files/clamfs-1.0.1-gcc45.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix building with gcc 4.5
-
-http://bugs.gentoo.org/show_bug.cgi?id=320107
-
---- src/scancache.cxx
-+++ src/scancache.cxx
-@@ -37,7 +37,7 @@
- }
- 
- ScanCache::ScanCache(long int elements, long int expire):
--    ExpireLRUCache<ino_t, CachedResult>::ExpireLRUCache<ino_t, CachedResult>(elements, expire) {
-+    ExpireLRUCache<ino_t, CachedResult>(elements, expire) {
- }
- 
- ScanCache::~ScanCache() {
diff --git a/sys-fs/clamfs/files/clamfs-1.0.1-gentoo.patch b/sys-fs/clamfs/files/clamfs-1.0.1-gentoo.patch
deleted file mode 100644
index f5c02daca6d6..000000000000
--- a/sys-fs/clamfs/files/clamfs-1.0.1-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur clamfs-1.0.1.orig/doc/clamfs.xml clamfs-1.0.1/doc/clamfs.xml
---- clamfs-1.0.1.orig/doc/clamfs.xml	2009-02-07 23:09:26.000000000 +0900
-+++ clamfs-1.0.1/doc/clamfs.xml	2010-01-08 18:19:13.000000000 +0900
-@@ -16,7 +16,7 @@
-          check  - (yes or no) check if clamd is available on startup (useful if
-                   mounting clamfs file systems from /etc/fstab early on startup,
-                   while clamav daemon is not yet started) -->
--    <clamd socket="/var/run/clamav/clamd.ctl" check="yes" />
-+    <clamd socket="/var/run/clamav/clamd.sock" check="yes" />
- 
-     <!-- File system settings
-          root       - real directory to attach as our root
diff --git a/sys-fs/clamfs/metadata.xml b/sys-fs/clamfs/metadata.xml
index dfe00d7ec76e..57d224d33e73 100644
--- a/sys-fs/clamfs/metadata.xml
+++ b/sys-fs/clamfs/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
+  <maintainer type="person">
+    <email>jakov.smolic@sartura.hr</email>
+    <name>Jakov Smolic</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
   ClamFS is a FUSE-based user-space file system for Linux with on-access
   anti-virus file scanning through clamd daemon (a file scanning service
diff --git a/sys-fs/compsize/Manifest b/sys-fs/compsize/Manifest
index fcaea01166da..fb1fa6cd1708 100644
--- a/sys-fs/compsize/Manifest
+++ b/sys-fs/compsize/Manifest
@@ -1,6 +1,4 @@
-DIST compsize-1.1.tar.gz 14345 BLAKE2B 8b35e6f3526b8b2395972ea1a595011b867fbc076d79c90c66a19853f1b101dbe3decedab8244d893b20d6cc9ff3ecfa2b3320fc12c583415b2d446a9298fcb1 SHA512 1c7de5156b695ffa4be9b634fd6224214d3de1653eb23e5d85b250e27146fe655883bed17ed458bae1b448ed9ae8a254d2a673fdb3860e69c99f8676daea0d8b
 DIST compsize-1.3.tar.gz 14782 BLAKE2B 738ff0e2b936f5974064759914284e495c895d22d95b705e1b8fac4b3189891771b0e5be7e0eeac0883dd92f9cef276400bb7ee79840fd7db14a5269e7f78f11 SHA512 411b92651fdc3d03deccbf38f72936fee95cf80c67d6368efbc0dafacfe9793815a23ef0d02f7feadf31391e415df3d90cd19fb3acc8cce94f37cb3e4eed623d
-EBUILD compsize-1.1.ebuild 940 BLAKE2B aae5bb225b287ece48d4bffc921d95837bcc5c48affc88ccf55eb6565943994bfa08eaf8be6cfeaf4c86cde3aca37946d6cc50ea10fa679d10e557c2b207090f SHA512 b97df62447581e46b6b7276044861ab1900b77055e0a8f0989fa46dce204bd52ad000d66a1662133fe581d8aa354b4c1214596c83547267997628f54c2172c5e
-EBUILD compsize-1.3.ebuild 962 BLAKE2B 6a1acd0d8c62796e6c0159f453bac412f57ae4afdc9c20f8794518f9a12f25961f55ffc493916496455b7f9d5e253de9c02379e28b73f17fd2cf50c4c250aacd SHA512 d1a5530f238ff30fd311d38a47e30ba9e0db668b426c789de6dd0c2654f94d910cbae423e49042fec940daf8e557d2872f6c7514b15fdbb37e5cc23ef3672ae5
+EBUILD compsize-1.3.ebuild 960 BLAKE2B dbfcde92a1f46173797d02234b62321341e1a21ad81948a718d79d801a8170bed6a3fc6a6d00d466023508ebe8478d8951ca93f4b6edc68c0784826f6ad6f27c SHA512 fc7f93faba100c79d64de5699bda9a189d1aaab1588933604009e1b508c3823a9daee945ea6e9c90ed07574597becea1b1186bc5bfa0857386ca807033a9b770
 EBUILD compsize-9999.ebuild 1086 BLAKE2B 99aa3fe99ee99f19ee8beb7328dc9bb1af8288111a6b8e52b0551ecc1cf818f9d2ff7e939ed88a40493e421e1afe2c56cd69a64e92bd5d788517d0ea997c31ba SHA512 4e54a226690115710a9ea85d05a77448b593e5657a9392f52570ef1f4d70770d8b7bfa5a666c6fda50270fafaba9f7009059fb8e4a30230e7e4c5c7d5d2c0259
 MISC metadata.xml 444 BLAKE2B 0eacf312059aaec47fa5f5036bc09afccf3275819b8e2890a02130d9e142020945f68d3e155cee27e18d6c061ddbbd6de71231beeab8a4b29e5535ad84db308c SHA512 1c03b76ef3eae52b3212d7f1a8b2e822ac24dcad2a95ed078d4819a7084e6e701f76ce3c17e38efaaeaede24357126cbf54e311c6b2a5c26e75299971ac7649e
diff --git a/sys-fs/compsize/compsize-1.1.ebuild b/sys-fs/compsize/compsize-1.1.ebuild
deleted file mode 100644
index ad73046823bd..000000000000
--- a/sys-fs/compsize/compsize-1.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic
-
-DESCRIPTION="Utility to find btrfs compression ratio"
-HOMEPAGE="https://github.com/kilobyte/compsize"
-
-if [[ ${PV} = 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kilobyte/compsize"
-else
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="https://github.com/kilobyte/compsize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2+"
-SLOT=0
-
-RDEPEND=""
-DEPEND="sys-fs/btrfs-progs"
-
-src_prepare() {
-	eapply_user
-	# Don't try to install a gzipped manfile during make install, instead
-	# use doman in src_install to ensure that PORTAGE_COMPRESS is used
-	sed -i $'/^\tgzip /d' Makefile || die
-}
-
-src_configure() {
-	# Used in upstream Makefile, but clobbered by portage's CFLAGS
-	append-cflags -Wall -std=gnu90
-	default
-}
-
-src_install() {
-	emake PREFIX="${ED%/}" install
-	doman compsize.8
-	einstalldocs
-}
diff --git a/sys-fs/compsize/compsize-1.3.ebuild b/sys-fs/compsize/compsize-1.3.ebuild
index df2657574f74..bf8f1d40bf84 100644
--- a/sys-fs/compsize/compsize-1.3.ebuild
+++ b/sys-fs/compsize/compsize-1.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = 9999 ]] ; then
 	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"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="GPL-2+"
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 025c024cb538..129d442bc20b 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -1,5 +1,5 @@
 AUX cryfs-0.10.2-install-targets.patch 1296 BLAKE2B d43ada858124c67242fdf537ae3dd7e6b7bf3566ee564dae47aaa0b0ee3ae20c2beada683d8cda12518f89bda2919ec296c26d004c48a5bbc953aa6c23bc9dc8 SHA512 c097dcc9893dbe7f6098ab80d9937810856de16e6c34ede558dc30edf76571a2e1ef2fdd91fd8d14b2e40d5e32246d08d198cd3ba28f33d19442cd8c2332b4e7
 AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c
 DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f
-EBUILD cryfs-0.10.2.ebuild 2252 BLAKE2B f6de0d76ff9c43d727cb62f1b8c419210bcb603e9a2b60dfd3c741a98cbbaec199f6eea7232d8c150da0448f9887a917062d14b21f01cacb14728d5212e26389 SHA512 aeacb7c7fc9f337f0b6e38320db58c772e4fe9a2fb15267471ec34332ceedbaa54e894e3d46b46e2e80da54a44936ed38781f052c0d21bf077af96a61cbcabe7
-MISC metadata.xml 272 BLAKE2B 1f7b2457b970cd9a387d88914129fc76ae26bcd3e089bcecffdab0a8a86657ce3abc9c19bab77c51e1bd12b4fbfece20077dc4b15a673a11e821ab7b4952e137 SHA512 9d4fce67773a55f3f8dedd7c1532eb639aed188f0fba41375bc4e8219ffa9e720f51175571c6defde06afdeebe83c940ec77192d78555cf28a41f0c64e25629f
+EBUILD cryfs-0.10.2.ebuild 2295 BLAKE2B 3c3ebc455fdfce6d3bf498e3fced4dfa9270d9434e7224c3763af8380ac635112e4d5110e38fe1e62608d488503bd4011dfe9698737cb66d13b05907ee26877e SHA512 8fc95d23665a10c8f1ffc1f542ae7fca8cc77d73f397595b09dfe7ea1fcc70dcc7af7175f6e2643b620011b2735879360eda3b40562673519c8e8116320b1828
+MISC metadata.xml 491 BLAKE2B 481c7242ceac6e8d51121976478817f2acbd7c845992b1d4ead21dab39710a2b465acf3bcbb6a8207e90065875b3563517758df4845ae1e4fc3bf1c8c7f25103 SHA512 11d71adee10ca97cc8a8bba077a9459af2f51d328d53eb63748cafcfe43992d51bf129ea1043f823b299874f6bdf8ab390a714570a5516fbb60d094c9aac6e14
diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild
index 5ddc187c3316..5ab97c61f31f 100644
--- a/sys-fs/cryfs/cryfs-0.10.2.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
 else
 	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm arm64 x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 	S="${WORKDIR}"
 fi
 
@@ -73,6 +73,7 @@ src_configure() {
 		-DBUILD_TESTING=$(usex test)
 	)
 	use custom-optimization || append-flags -O3
+	use debug || append-flags -DNDEBUG
 
 	cmake_src_configure
 }
diff --git a/sys-fs/cryfs/metadata.xml b/sys-fs/cryfs/metadata.xml
index cf73e5490d63..a4e7e74cd609 100644
--- a/sys-fs/cryfs/metadata.xml
+++ b/sys-fs/cryfs/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
+  <maintainer type="person">
+    <email>nickaristocrates@gmail.com</email>
+    <name>Nicholas Meyer</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="custom-optimization">Use user-defined compiler optimization level</flag>
   </use>
diff --git a/sys-fs/diskdev_cmds/Manifest b/sys-fs/diskdev_cmds/Manifest
index 6edfe8c799b4..cd36de7d2a75 100644
--- a/sys-fs/diskdev_cmds/Manifest
+++ b/sys-fs/diskdev_cmds/Manifest
@@ -1,7 +1,8 @@
 AUX diskdev_cmds-332.14_p1-AR.patch 251 BLAKE2B 7bab604de5c1ff6ed2a78e2c7ef987bf85fc02b1a21c6996fef567086286cb1596cca61a5ddc246272570603cf0ef25050b2d6afcf8286c23f465b92e3bf096b SHA512 c81bd2bbeca3b76efb98142b9004011de923d5819d8f8bb65a9ec6afa9b1e5a594bcf69d3a733913bca614fca2ea0d456ee852beee897d7bb4799097640e8e9c
+AUX diskdev_cmds-332.14_p1-ldflags.patch 300 BLAKE2B 40b91cc8361b456f4dc62716a122971c1e87d5ca8a20154f2c9fa991db700cff67c5d7436cd38da0f1a83b712c14886ba6fc42e93f9004068379e7de167b7b56 SHA512 aa6c56cc464d18a1dbea3ddb14915605a913c786c882840c8c3b82ebf19bb768a0576aecea38a4d95853415f0756a81d7270636385ae83836ba0b7419448e3b4
 AUX diskdev_cmds-332.14_p1-no-sysctl.patch 235 BLAKE2B 4eebaa367a3c1eef94c82755ddb848958984055b26097b98e078bf162a502632f1c0a29385db17aba61730b9ec28cf7dd46539520eab2a2d8fbf6a5a42106e8f SHA512 2dca72c6d7b82804e6355fe3262762c966dfaa848f5151f97946f4f9d0d29773f43f8f134d6e2dd52cb97430f2d98e02c37066ae8c88ca75c9fb7efb94c4c8c7
 AUX diskdev_cmds-respect-cflags.patch 388 BLAKE2B 8ecaa932e3a5841bc9ace0ffd2fea2f974a42ad33f0f65551bcc4c2a873b50a4413cf16542b74f277244f578142fcd5f1bfe63063c280062bf06aed20f601385 SHA512 21325ea43ea19a06962b7123ba418d5759d712d44b1ba7d35fa982613a95d2d91d1e7cde287b497d9e6de9483658f36378f7d3d03e5780d7dc468a82e5b0da69
 DIST diskdev_cmds-332.14.tar.gz 714035 BLAKE2B 8c66509366db8067b6b3057dc8dd8c6de5f25df86a88fec8beac78e4e14d91af5319bf61671ceea206508b6abac54231e82d527a2cc79ea467e7660e10997a7f SHA512 e1df91fb5330dc01a79de99dd8b1f389a337a19c2136994d59b7cbca9c2e1cb5f7d47101366dd01db4e23a5d3d7afab41758045bf7402d739fa22182dc922044
 DIST diskdev_cmds-332.14_p1.patch.bz2 21989 BLAKE2B f7e421c164ec242e6516a4638bc4c4706a11b03587fad0e7328a311d15f47b48b4e706f819cffa8e8539d7e4eaa8efa5f9a55a838f88586872e7fc8d67c9ac8e SHA512 aaef096aa6a3f2e09bcc8c1831172c3d68994589ade505153ade00e6f4d0c49263b63212f8616ece597b1ee218a87474bb1c3812d15f34c5bc5c51fd7b72a062
-EBUILD diskdev_cmds-332.14_p1-r3.ebuild 1331 BLAKE2B 3aa87e3b8743f508f1176c8e652e2d63660574c4a88bf829cd5c4f269fd21de4bfbfbce3cf1cdbfde5e5e15d5c5316beb994c66af7363b1ea979e91803a46161 SHA512 126425aab2c54ef9a146a7488023073ac677c74e87abcc151749dd8ec99c99b13ede41f0dad6b3680dca4f8b4c715bde08d2808019eaa363920ff48fa6d3098c
+EBUILD diskdev_cmds-332.14_p1-r4.ebuild 1365 BLAKE2B 7c3d826f5dfcea2b57ad7ec286b6e49ffe91c336c46511ad91bf1947098f319e44f77def8286eb44e83a6e56bb33e6bb8cae1a2f94357c11b7ff80b6ad38ac32 SHA512 eac51622d965571b6bd9dd170d9b37015a8d9571e5ecceec7cbb84ac6077a941d815dd226a41c21f7278f2be27415793e805937473ac79539ae366d67ac6a727
 MISC metadata.xml 251 BLAKE2B 9785c4729d0751280d104965bab25a268219a7fee217dcd8c01a5642a13f8abc471a3dff54ae0d34d3cf3dc8267fb483d93bd3b16aa3617e8fa8e9abd1703dfe SHA512 cc2bd3977894946ee4ea5b739cc3998bcd6017b9e7a52aa501409d0988954339a9a22fe751d0a5e967ddac9225d9b23f20b4fb1e2c62ee91d1d23c383d9776dd
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
index 57753cb339ce..722b317a2d7c 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r4.ebuild
@@ -28,6 +28,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-respect-cflags.patch
 	"${FILESDIR}"/${P}-AR.patch
 	"${FILESDIR}"/${P}-no-sysctl.patch
+	"${FILESDIR}"/${P}-ldflags.patch
 )
 
 src_compile() {
diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-ldflags.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-ldflags.patch
new file mode 100644
index 000000000000..84b9c58417f9
--- /dev/null
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-ldflags.patch
@@ -0,0 +1,11 @@
+--- a/newfs_hfs.tproj/Makefile.lnx
++++ b/newfs_hfs.tproj/Makefile.lnx
+@@ -4,7 +4,7 @@ OFILES = $(CFILES:.c=.o)
+ all: newfs_hfs
+ 
+ newfs_hfs: $(OFILES)
+-	${CC} ${CFLAGS} -o newfs_hfs ${OFILES} -lcrypto
++	${CC} ${CFLAGS} -o newfs_hfs ${OFILES} ${LDFLAGS} -lcrypto
+ 
+ clean:
+ 	$(RM) newfs_hfs $(OFILES)
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index 951bdf3d7162..3948da5242bb 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1,6 +1,6 @@
-AUX dislocker-0.7.1-fix-find-ruby.patch 25942 BLAKE2B bd9d93c5eddcbade0039c1787dae36f5dd01f91cd435dfb9dbcfcb16f0f09cba7e73a3221c8b2f3843d0a68199fb9e38bdb91428fa784442659f7af53ab6d4dd SHA512 70f5a628659ef4645d757b899f3e6310e3a4d2ab89f429748c711177a0944e9b0eabf5341e394ab09216b0fa18e3c2b0832406b27f40c04510df937ffe5f65ef
+DIST dislocker-0.7.1-fix-find-ruby.patch 25942 BLAKE2B bd9d93c5eddcbade0039c1787dae36f5dd01f91cd435dfb9dbcfcb16f0f09cba7e73a3221c8b2f3843d0a68199fb9e38bdb91428fa784442659f7af53ab6d4dd SHA512 70f5a628659ef4645d757b899f3e6310e3a4d2ab89f429748c711177a0944e9b0eabf5341e394ab09216b0fa18e3c2b0832406b27f40c04510df937ffe5f65ef
 DIST dislocker-0.7.1.tar.gz 103194 BLAKE2B 05421b0d3e7686480e40a41e67086017c454b76e0852fef78a7b5d10134cf388b4bf7b9669d87b867418f4c074cc023ea9b0260dbdbc837322d04f217aa40b28 SHA512 8852ba3e363fdea992eebecfe1e4dad2b85404f57c57ce6b2937a9859d03cfa88d969926c9e11e6d22596c6d96805b7d1737893ae2c5a957448ab26708bce226
 EBUILD dislocker-0.7.1-r2.ebuild 1185 BLAKE2B 25249a42cd4a6fcc165de59306d7da01eb5ad2eb661dd92d38934f0b9bdc88286a68f6c9f05337ba31b5de3de2e23af8cb5863b4bfb7f307004aafd095158d6d SHA512 c921cd7034b7e7a48d636e9b6a6420d5eb16a0e5382a29c829762a7742409ae2f371765ac3218402e7f42eeac292fdba568a3d66a1487c3fa8480cd69951a4a5
-EBUILD dislocker-0.7.1-r3.ebuild 1621 BLAKE2B 43e89dd54b75bf9849f2d4091f6a48796a6c597dd0d7d933a3eab48a5ccdf4b009314960f3f80dfb8177d5b121a3fac532102285c741a5fce9e07869f14b7255 SHA512 4308136d2b048277dcadcba93fa797bcb2b09af58d7f9bf0604acc8552977aeda31c2cb8184434f1ff32894062ed071f6aec15eed468076088f741bd17ccae6e
-EBUILD dislocker-9999.ebuild 1621 BLAKE2B 43e89dd54b75bf9849f2d4091f6a48796a6c597dd0d7d933a3eab48a5ccdf4b009314960f3f80dfb8177d5b121a3fac532102285c741a5fce9e07869f14b7255 SHA512 4308136d2b048277dcadcba93fa797bcb2b09af58d7f9bf0604acc8552977aeda31c2cb8184434f1ff32894062ed071f6aec15eed468076088f741bd17ccae6e
+EBUILD dislocker-0.7.1-r3.ebuild 1703 BLAKE2B e5b61c9f2073fa2ae4e6b6d8c8e14ba6dd6a6de64f391522adfa216c4f7aa3bea18741c8cdcdd372e59df276b0e8a9b97ef5dd49eb2af8087fcb2f5fa046ceda SHA512 516beb16eadf29cafd5e4792bd4dfcd21b5b49d91faf0f58ce50500b8a945f509d176fe0cd8955afb037c8ef8b8901e66e056fd7dc90325b1a7239cae379a1db
+EBUILD dislocker-9999.ebuild 1703 BLAKE2B e5b61c9f2073fa2ae4e6b6d8c8e14ba6dd6a6de64f391522adfa216c4f7aa3bea18741c8cdcdd372e59df276b0e8a9b97ef5dd49eb2af8087fcb2f5fa046ceda SHA512 516beb16eadf29cafd5e4792bd4dfcd21b5b49d91faf0f58ce50500b8a945f509d176fe0cd8955afb037c8ef8b8901e66e056fd7dc90325b1a7239cae379a1db
 MISC metadata.xml 343 BLAKE2B edbbbf3c98bb40a48d9b39f6fbe579a306f44539eb9415585c3e8045f4bfa2c2b7864be18313f2dd50aa73c14aacb5e446d4eb94f4c7116a7c0407ec651f3d02 SHA512 479da4294232d9c49530e2ed2c936c824c697b08d722309addb64bc77dd083365b0d4ce063dd331e4dbd13a0185885dca7bf5d62a6a09dfc6e7a38fd7e25f448
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
index a15c39558ddc..73f3b33aa545 100644
--- a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
@@ -12,7 +12,8 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Aorimn/dislocker.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/dislocker-0.7.1-fix-find-ruby.patch"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -31,7 +32,7 @@ CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
 
 src_prepare() {
 	if use ruby && [[ ${PV} == "0.7.1" ]]; then
-		PATCHES=( "${FILESDIR}/${P}-fix-find-ruby.patch" )
+		PATCHES=( "${DISTDIR}/${P}-fix-find-ruby.patch" )
 	fi
 	cmake_src_prepare
 
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index a15c39558ddc..73f3b33aa545 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -12,7 +12,8 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/Aorimn/dislocker.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://dev.gentoo.org/~juippis/distfiles/tmp/dislocker-0.7.1-fix-find-ruby.patch"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -31,7 +32,7 @@ CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
 
 src_prepare() {
 	if use ruby && [[ ${PV} == "0.7.1" ]]; then
-		PATCHES=( "${FILESDIR}/${P}-fix-find-ruby.patch" )
+		PATCHES=( "${DISTDIR}/${P}-fix-find-ruby.patch" )
 	fi
 	cmake_src_prepare
 
diff --git a/sys-fs/dislocker/files/dislocker-0.7.1-fix-find-ruby.patch b/sys-fs/dislocker/files/dislocker-0.7.1-fix-find-ruby.patch
deleted file mode 100644
index b5659f062ccf..000000000000
--- a/sys-fs/dislocker/files/dislocker-0.7.1-fix-find-ruby.patch
+++ /dev/null
@@ -1,671 +0,0 @@
-diff -Nuar a/cmake/FindPackageHandleStandardArgs.cmake b/cmake/FindPackageHandleStandardArgs.cmake
---- a/cmake/FindPackageHandleStandardArgs.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ b/cmake/FindPackageHandleStandardArgs.cmake	2020-03-04 11:38:51.062021412 +0100
-@@ -0,0 +1,258 @@
-+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-+# file Copyright.txt or https://cmake.org/licensing for details.
-+
-+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake)
-+
-+# internal helper macro
-+macro(_FPHSA_FAILURE_MESSAGE _msg)
-+  if (${_NAME}_FIND_REQUIRED)
-+    message(FATAL_ERROR "${_msg}")
-+  else ()
-+    if (NOT ${_NAME}_FIND_QUIETLY)
-+      message(STATUS "${_msg}")
-+    endif ()
-+  endif ()
-+endmacro()
-+
-+
-+# internal helper macro to generate the failure message when used in CONFIG_MODE:
-+macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
-+  # <PackageName>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
-+  if(${_NAME}_CONFIG)
-+    _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing:${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})")
-+  else()
-+    # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version.
-+    # List them all in the error message:
-+    if(${_NAME}_CONSIDERED_CONFIGS)
-+      set(configsText "")
-+      list(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount)
-+      math(EXPR configsCount "${configsCount} - 1")
-+      foreach(currentConfigIndex RANGE ${configsCount})
-+        list(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename)
-+        list(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version)
-+        string(APPEND configsText "    ${filename} (version ${version})\n")
-+      endforeach()
-+      if (${_NAME}_NOT_FOUND_MESSAGE)
-+        string(APPEND configsText "    Reason given by package: ${${_NAME}_NOT_FOUND_MESSAGE}\n")
-+      endif()
-+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}")
-+
-+    else()
-+      # Simple case: No Config-file was found at all:
-+      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}")
-+    endif()
-+  endif()
-+endmacro()
-+
-+
-+function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
-+
-+# Set up the arguments for `cmake_parse_arguments`.
-+  set(options  CONFIG_MODE  HANDLE_COMPONENTS)
-+  set(oneValueArgs  FAIL_MESSAGE  VERSION_VAR  FOUND_VAR)
-+  set(multiValueArgs REQUIRED_VARS)
-+
-+# Check whether we are in 'simple' or 'extended' mode:
-+  set(_KEYWORDS_FOR_EXTENDED_MODE  ${options} ${oneValueArgs} ${multiValueArgs} )
-+  list(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
-+
-+  if(${INDEX} EQUAL -1)
-+    set(FPHSA_FAIL_MESSAGE ${_FIRST_ARG})
-+    set(FPHSA_REQUIRED_VARS ${ARGN})
-+    set(FPHSA_VERSION_VAR)
-+  else()
-+    cmake_parse_arguments(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}"  ${_FIRST_ARG} ${ARGN})
-+
-+    if(FPHSA_UNPARSED_ARGUMENTS)
-+      message(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"")
-+    endif()
-+
-+    if(NOT FPHSA_FAIL_MESSAGE)
-+      set(FPHSA_FAIL_MESSAGE  "DEFAULT_MSG")
-+    endif()
-+
-+    # In config-mode, we rely on the variable <PackageName>_CONFIG, which is set by find_package()
-+    # when it successfully found the config-file, including version checking:
-+    if(FPHSA_CONFIG_MODE)
-+      list(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG)
-+      list(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS)
-+      set(FPHSA_VERSION_VAR ${_NAME}_VERSION)
-+    endif()
-+
-+    if(NOT FPHSA_REQUIRED_VARS)
-+      message(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
-+    endif()
-+  endif()
-+
-+# now that we collected all arguments, process them
-+
-+  if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG")
-+    set(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
-+  endif()
-+
-+  list(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
-+
-+  string(TOUPPER ${_NAME} _NAME_UPPER)
-+  string(TOLOWER ${_NAME} _NAME_LOWER)
-+
-+  if(FPHSA_FOUND_VAR)
-+    if(FPHSA_FOUND_VAR MATCHES "^${_NAME}_FOUND$"  OR  FPHSA_FOUND_VAR MATCHES "^${_NAME_UPPER}_FOUND$")
-+      set(_FOUND_VAR ${FPHSA_FOUND_VAR})
-+    else()
-+      message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_NAME}_FOUND\" and \"${_NAME_UPPER}_FOUND\" are valid names.")
-+    endif()
-+  else()
-+    set(_FOUND_VAR ${_NAME_UPPER}_FOUND)
-+  endif()
-+
-+  # collect all variables which were not found, so they can be printed, so the
-+  # user knows better what went wrong (#6375)
-+  set(MISSING_VARS "")
-+  set(DETAILS "")
-+  # check if all passed variables are valid
-+  set(FPHSA_FOUND_${_NAME} TRUE)
-+  foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
-+    if(NOT ${_CURRENT_VAR})
-+      set(FPHSA_FOUND_${_NAME} FALSE)
-+      string(APPEND MISSING_VARS " ${_CURRENT_VAR}")
-+    else()
-+      string(APPEND DETAILS "[${${_CURRENT_VAR}}]")
-+    endif()
-+  endforeach()
-+  if(FPHSA_FOUND_${_NAME})
-+    set(${_NAME}_FOUND TRUE)
-+    set(${_NAME_UPPER}_FOUND TRUE)
-+  else()
-+    set(${_NAME}_FOUND FALSE)
-+    set(${_NAME_UPPER}_FOUND FALSE)
-+  endif()
-+
-+  # component handling
-+  unset(FOUND_COMPONENTS_MSG)
-+  unset(MISSING_COMPONENTS_MSG)
-+
-+  if(FPHSA_HANDLE_COMPONENTS)
-+    foreach(comp ${${_NAME}_FIND_COMPONENTS})
-+      if(${_NAME}_${comp}_FOUND)
-+
-+        if(NOT DEFINED FOUND_COMPONENTS_MSG)
-+          set(FOUND_COMPONENTS_MSG "found components: ")
-+        endif()
-+        string(APPEND FOUND_COMPONENTS_MSG " ${comp}")
-+
-+      else()
-+
-+        if(NOT DEFINED MISSING_COMPONENTS_MSG)
-+          set(MISSING_COMPONENTS_MSG "missing components: ")
-+        endif()
-+        string(APPEND MISSING_COMPONENTS_MSG " ${comp}")
-+
-+        if(${_NAME}_FIND_REQUIRED_${comp})
-+          set(${_NAME}_FOUND FALSE)
-+          string(APPEND MISSING_VARS " ${comp}")
-+        endif()
-+
-+      endif()
-+    endforeach()
-+    set(COMPONENT_MSG "${FOUND_COMPONENTS_MSG} ${MISSING_COMPONENTS_MSG}")
-+    string(APPEND DETAILS "[c${COMPONENT_MSG}]")
-+  endif()
-+
-+  # version handling:
-+  set(VERSION_MSG "")
-+  set(VERSION_OK TRUE)
-+
-+  # check with DEFINED here as the requested or found version may be "0"
-+  if (DEFINED ${_NAME}_FIND_VERSION)
-+    if(DEFINED ${FPHSA_VERSION_VAR})
-+      set(_FOUND_VERSION ${${FPHSA_VERSION_VAR}})
-+
-+      if(${_NAME}_FIND_VERSION_EXACT)       # exact version required
-+        # count the dots in the version string
-+        string(REGEX REPLACE "[^.]" "" _VERSION_DOTS "${_FOUND_VERSION}")
-+        # add one dot because there is one dot more than there are components
-+        string(LENGTH "${_VERSION_DOTS}." _VERSION_DOTS)
-+        if (_VERSION_DOTS GREATER ${_NAME}_FIND_VERSION_COUNT)
-+          # Because of the C++ implementation of find_package() ${_NAME}_FIND_VERSION_COUNT
-+          # is at most 4 here. Therefore a simple lookup table is used.
-+          if (${_NAME}_FIND_VERSION_COUNT EQUAL 1)
-+            set(_VERSION_REGEX "[^.]*")
-+          elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 2)
-+            set(_VERSION_REGEX "[^.]*\\.[^.]*")
-+          elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 3)
-+            set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*")
-+          else ()
-+            set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*\\.[^.]*")
-+          endif ()
-+          string(REGEX REPLACE "^(${_VERSION_REGEX})\\..*" "\\1" _VERSION_HEAD "${_FOUND_VERSION}")
-+          unset(_VERSION_REGEX)
-+          if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _VERSION_HEAD)
-+            set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
-+            set(VERSION_OK FALSE)
-+          else ()
-+            set(VERSION_MSG "(found suitable exact version \"${_FOUND_VERSION}\")")
-+          endif ()
-+          unset(_VERSION_HEAD)
-+        else ()
-+          if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _FOUND_VERSION)
-+            set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
-+            set(VERSION_OK FALSE)
-+          else ()
-+            set(VERSION_MSG "(found suitable exact version \"${_FOUND_VERSION}\")")
-+          endif ()
-+        endif ()
-+        unset(_VERSION_DOTS)
-+
-+      else()     # minimum version specified:
-+        if (${_NAME}_FIND_VERSION VERSION_GREATER _FOUND_VERSION)
-+          set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
-+          set(VERSION_OK FALSE)
-+        else ()
-+          set(VERSION_MSG "(found suitable version \"${_FOUND_VERSION}\", minimum required is \"${${_NAME}_FIND_VERSION}\")")
-+        endif ()
-+      endif()
-+
-+    else()
-+
-+      # if the package was not found, but a version was given, add that to the output:
-+      if(${_NAME}_FIND_VERSION_EXACT)
-+         set(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
-+      else()
-+         set(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")")
-+      endif()
-+
-+    endif()
-+  else ()
-+    # Check with DEFINED as the found version may be 0.
-+    if(DEFINED ${FPHSA_VERSION_VAR})
-+      set(VERSION_MSG "(found version \"${${FPHSA_VERSION_VAR}}\")")
-+    endif()
-+  endif ()
-+
-+  if(VERSION_OK)
-+    string(APPEND DETAILS "[v${${FPHSA_VERSION_VAR}}(${${_NAME}_FIND_VERSION})]")
-+  else()
-+    set(${_NAME}_FOUND FALSE)
-+  endif()
-+
-+
-+  # print the result:
-+  if (${_NAME}_FOUND)
-+    FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG} ${COMPONENT_MSG}" "${DETAILS}")
-+  else ()
-+
-+    if(FPHSA_CONFIG_MODE)
-+      _FPHSA_HANDLE_FAILURE_CONFIG_MODE()
-+    else()
-+      if(NOT VERSION_OK)
-+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})")
-+      else()
-+        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing:${MISSING_VARS}) ${VERSION_MSG}")
-+      endif()
-+    endif()
-+
-+  endif ()
-+
-+  set(${_NAME}_FOUND ${${_NAME}_FOUND} PARENT_SCOPE)
-+  set(${_NAME_UPPER}_FOUND ${${_NAME}_FOUND} PARENT_SCOPE)
-+endfunction()
-diff -Nuar a/cmake/FindPackageMessage.cmake b/cmake/FindPackageMessage.cmake
---- a/cmake/FindPackageMessage.cmake	1970-01-01 01:00:00.000000000 +0100
-+++ b/cmake/FindPackageMessage.cmake	2020-03-04 11:38:51.062021412 +0100
-@@ -0,0 +1,19 @@
-+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-+# file Copyright.txt or https://cmake.org/licensing for details.
-+
-+function(find_package_message pkg msg details)
-+  # Avoid printing a message repeatedly for the same find result.
-+  if(NOT ${pkg}_FIND_QUIETLY)
-+    string(REPLACE "\n" "" details "${details}")
-+    set(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg})
-+    if(NOT "${details}" STREQUAL "${${DETAILS_VAR}}")
-+      # The message has not yet been printed.
-+      message(STATUS "${msg}")
-+
-+      # Save the find details in the cache to avoid printing the same
-+      # message again.
-+      set("${DETAILS_VAR}" "${details}"
-+        CACHE INTERNAL "Details about finding ${pkg}")
-+    endif()
-+  endif()
-+endfunction()
-diff -Nuar a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake
---- a/cmake/FindRuby.cmake	2017-02-09 10:33:45.000000000 +0100
-+++ b/cmake/FindRuby.cmake	2020-03-04 11:38:51.062021412 +0100
-@@ -1,89 +1,297 @@
--# Ruby cmake package
--#
--# Returns
--# RUBY_FOUND
--# RUBY_INCLUDE_DIRS
--# RUBY_LIBRARIES
--# RUBY_VERSION_MAJOR
--# RUBY_VERSION_MINOR
--# RUBY_VERSION_STRING
--
--if(RUBY_FOUND)
--   set(RUBY_FIND_QUIETLY TRUE)
--endif()
--
--find_program(RUBY_EXECUTABLE
--  NAMES ruby2.2 ruby22 ruby2.1 ruby21 ruby2.0 ruby2 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
--  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
--  )
--if(RUBY_EXECUTABLE)
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['MAJOR']"
--    OUTPUT_VARIABLE RUBY_VERSION_MAJOR
--    )
--
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['MINOR']"
--    OUTPUT_VARIABLE RUBY_VERSION_MINOR
--    )
--
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['TEENY']"
--    OUTPUT_VARIABLE RUBY_VERSION_TEENY
--    )
--  set(RUBY_VERSION_STRING ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_TEENY})
--
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
--    OUTPUT_VARIABLE RUBY_ARCH_DIR
--    )
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['arch']"
--    OUTPUT_VARIABLE RUBY_ARCH
--    )
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
--    OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
--    )
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
--    OUTPUT_VARIABLE RUBY_LIB_PATH
--    )
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['archincludedir']"
--    OUTPUT_VARIABLE RUBY_ARCH_INC_DIR
--    )
--  execute_process(
--    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['RUBY_SO_NAME']"
--    OUTPUT_VARIABLE RUBY_SO_NAME
--    )
--
--  find_path(RUBY_INCLUDE_DIRS
--    NAMES ruby.h ruby/config.h
--    PATHS ${RUBY_ARCH_DIR}
--    )
--  set(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}")
--  find_library(RUBY_LIB
--    NAMES ${RUBY_SO_NAME}
--    PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
--    )
--
--  if(RUBY_LIB AND RUBY_INCLUDE_DIRS)
--    set(RUBY_FOUND TRUE)
--    set(RUBY_INCLUDE_DIRS "${RUBY_INCLUDE_DIRS};${RUBY_INCLUDE_ARCH};${RUBY_ARCH_INC_DIR}/ruby-${RUBY_VERSION_STRING}")
--    set(RUBY_LIBRARIES ${RUBY_LIB})
--  endif()
-+# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
-+# file Copyright.txt or https://cmake.org/licensing for details.
-+
-+#[[
-+FindRuby
-+--------
-+
-+This module finds if Ruby is installed and determines where the
-+include files and libraries are.  Ruby 1.8, 1.9, 2.0 through 2.5 are
-+supported.
-+
-+The minimum required version of Ruby can be specified using the
-+standard syntax, e.g.  find_package(Ruby 1.8)
-+
-+It also determines what the name of the library is.  This code sets
-+the following variables:
-+
-+RUBY_EXECUTABLE
-+    full path to the ruby binary
-+RUBY_INCLUDE_DIRS
-+    include dirs to be used when using the ruby library
-+RUBY_LIBRARY
-+    full path to the ruby library
-+RUBY_VERSION
-+    the version of ruby which was found, e.g. "1.8.7"
-+RUBY_FOUND
-+    set to true if ruby ws found successfully
- 
--  if(RUBY_OLD_VERSION)
--    set(RUBY_FOUND FALSE)
--    set(RUBY_NOT_FOUND TRUE)
-+Also:
-+
-+RUBY_INCLUDE_PATH
-+    same as RUBY_INCLUDE_DIRS, only provided for compatibility reasons, don't use it
-+#]]
-+
-+#   RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
-+#   RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
-+#   RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
-+#   RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
-+#   RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
-+
-+# uncomment the following line to get debug output for this file
-+set(_RUBY_DEBUG_OUTPUT TRUE)
-+
-+# Determine the list of possible names of the ruby executable depending
-+# on which version of ruby is required
-+set(_RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
-+
-+# if 1.9 is required, don't look for ruby18 and ruby1.8, default to version 1.8
-+if(DEFINED Ruby_FIND_VERSION_MAJOR AND DEFINED Ruby_FIND_VERSION_MINOR)
-+   set(Ruby_FIND_VERSION_SHORT_NODOT "${Ruby_FIND_VERSION_MAJOR}${RUBY_FIND_VERSION_MINOR}")
-+   # we can't construct that if only major version is given
-+   set(_RUBY_POSSIBLE_EXECUTABLE_NAMES
-+       ruby${Ruby_FIND_VERSION_MAJOR}.${Ruby_FIND_VERSION_MINOR}
-+       ruby${Ruby_FIND_VERSION_MAJOR}${Ruby_FIND_VERSION_MINOR}
-+       ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
-+else()
-+   set(Ruby_FIND_VERSION_SHORT_NODOT "18")
-+endif()
-+
-+if(NOT Ruby_FIND_VERSION_EXACT)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.5 ruby25)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.4 ruby24)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.3 ruby23)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.2 ruby22)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
-+  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
-+
-+  # if we want a version below 1.9, also look for ruby 1.8
-+  if("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19")
-+    list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.8 ruby18)
-   endif()
- 
--  mark_as_advanced(
--    RUBY_INCLUDE_DIRS
--    RUBY_LIBRARIES
--    RUBY_LIB
--    RUBY_VERSION_MAJOR RUBY_VERSION_MINOR
--    RUBY_VERSION_STRING
--    )
-+  list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES)
-+endif()
-+
-+find_program(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
-+
-+if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSION_MAJOR)
-+  function(_RUBY_CONFIG_VAR RBVAR OUTVAR)
-+    execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['${RBVAR}']"
-+      RESULT_VARIABLE _RUBY_SUCCESS
-+      OUTPUT_VARIABLE _RUBY_OUTPUT
-+      ERROR_QUIET)
-+    if(_RUBY_SUCCESS OR _RUBY_OUTPUT STREQUAL "")
-+      execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['${RBVAR}']"
-+        RESULT_VARIABLE _RUBY_SUCCESS
-+        OUTPUT_VARIABLE _RUBY_OUTPUT
-+        ERROR_QUIET)
-+    endif()
-+    set(${OUTVAR} "${_RUBY_OUTPUT}" PARENT_SCOPE)
-+  endfunction()
-+
-+
-+  # query the ruby version
-+   _RUBY_CONFIG_VAR("MAJOR" RUBY_VERSION_MAJOR)
-+   _RUBY_CONFIG_VAR("MINOR" RUBY_VERSION_MINOR)
-+   _RUBY_CONFIG_VAR("TEENY" RUBY_VERSION_PATCH)
-+
-+   # query the different directories
-+   _RUBY_CONFIG_VAR("archdir" RUBY_ARCH_DIR)
-+   _RUBY_CONFIG_VAR("arch" RUBY_ARCH)
-+   _RUBY_CONFIG_VAR("rubyhdrdir" RUBY_HDR_DIR)
-+   _RUBY_CONFIG_VAR("rubyarchhdrdir" RUBY_ARCHHDR_DIR)
-+   _RUBY_CONFIG_VAR("libdir" RUBY_POSSIBLE_LIB_DIR)
-+   _RUBY_CONFIG_VAR("rubylibdir" RUBY_RUBY_LIB_DIR)
-+
-+   # site_ruby
-+   _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
-+   _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
-+
-+   # vendor_ruby available ?
-+   execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
-+      OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY  ERROR_QUIET)
-+
-+   if(RUBY_HAS_VENDOR_RUBY)
-+      _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
-+      _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
-+   endif()
-+
-+   # save the results in the cache so we don't have to run ruby the next time again
-+   set(RUBY_VERSION_MAJOR    ${RUBY_VERSION_MAJOR}    CACHE PATH "The Ruby major version" FORCE)
-+   set(RUBY_VERSION_MINOR    ${RUBY_VERSION_MINOR}    CACHE PATH "The Ruby minor version" FORCE)
-+   set(RUBY_VERSION_PATCH    ${RUBY_VERSION_PATCH}    CACHE PATH "The Ruby patch version" FORCE)
-+   set(RUBY_ARCH_DIR         ${RUBY_ARCH_DIR}         CACHE PATH "The Ruby arch dir" FORCE)
-+   set(RUBY_HDR_DIR          ${RUBY_HDR_DIR}          CACHE PATH "The Ruby header dir (1.9+)" FORCE)
-+   set(RUBY_ARCHHDR_DIR      ${RUBY_ARCHHDR_DIR}      CACHE PATH "The Ruby arch header dir (2.0+)" FORCE)
-+   set(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir" FORCE)
-+   set(RUBY_RUBY_LIB_DIR     ${RUBY_RUBY_LIB_DIR}     CACHE PATH "The Ruby ruby-lib dir" FORCE)
-+   set(RUBY_SITEARCH_DIR     ${RUBY_SITEARCH_DIR}     CACHE PATH "The Ruby site arch dir" FORCE)
-+   set(RUBY_SITELIB_DIR      ${RUBY_SITELIB_DIR}      CACHE PATH "The Ruby site lib dir" FORCE)
-+   set(RUBY_HAS_VENDOR_RUBY  ${RUBY_HAS_VENDOR_RUBY}  CACHE BOOL "Vendor Ruby is available" FORCE)
-+   set(RUBY_VENDORARCH_DIR   ${RUBY_VENDORARCH_DIR}   CACHE PATH "The Ruby vendor arch dir" FORCE)
-+   set(RUBY_VENDORLIB_DIR    ${RUBY_VENDORLIB_DIR}    CACHE PATH "The Ruby vendor lib dir" FORCE)
-+
-+   mark_as_advanced(
-+     RUBY_ARCH_DIR
-+     RUBY_ARCH
-+     RUBY_HDR_DIR
-+     RUBY_ARCHHDR_DIR
-+     RUBY_POSSIBLE_LIB_DIR
-+     RUBY_RUBY_LIB_DIR
-+     RUBY_SITEARCH_DIR
-+     RUBY_SITELIB_DIR
-+     RUBY_HAS_VENDOR_RUBY
-+     RUBY_VENDORARCH_DIR
-+     RUBY_VENDORLIB_DIR
-+     RUBY_VERSION_MAJOR
-+     RUBY_VERSION_MINOR
-+     RUBY_VERSION_PATCH
-+     )
-+endif()
-+
-+# In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling)
-+# try to detect which version we found. This is not too good.
-+if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
-+   # by default assume 1.8.0
-+   set(RUBY_VERSION_MAJOR 1)
-+   set(RUBY_VERSION_MINOR 8)
-+   set(RUBY_VERSION_PATCH 0)
-+   # check whether we found 1.9.x
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby1\\.?9")
-+      set(RUBY_VERSION_MAJOR 1)
-+      set(RUBY_VERSION_MINOR 9)
-+   endif()
-+   # check whether we found 2.0.x
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?0")
-+      set(RUBY_VERSION_MAJOR 2)
-+      set(RUBY_VERSION_MINOR 0)
-+   endif()
-+   # check whether we found 2.1.x
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?1")
-+      set(RUBY_VERSION_MAJOR 2)
-+      set(RUBY_VERSION_MINOR 1)
-+   endif()
-+   # check whether we found 2.2.x
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?2")
-+      set(RUBY_VERSION_MAJOR 2)
-+      set(RUBY_VERSION_MINOR 2)
-+   endif()
-+   # check whether we found 2.3.x
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?3")
-+      set(RUBY_VERSION_MAJOR 2)
-+      set(RUBY_VERSION_MINOR 3)
-+   endif()
-+   # check whether we found 2.4.x
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?4")
-+      set(RUBY_VERSION_MAJOR 2)
-+      set(RUBY_VERSION_MINOR 4)
-+   endif()
-+   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?5")
-+      set(RUBY_VERSION_MAJOR 2)
-+      set(RUBY_VERSION_MINOR 5)
-+   endif()
- endif()
-+
-+if(RUBY_VERSION_MAJOR)
-+   set(RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
-+   set(_RUBY_VERSION_SHORT "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}")
-+   set(_RUBY_VERSION_SHORT_NODOT "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}")
-+   set(_RUBY_NODOT_VERSION "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH}")
-+endif()
-+
-+find_path(RUBY_INCLUDE_DIR
-+   NAMES ruby.h
-+   HINTS
-+   ${RUBY_HDR_DIR}
-+   ${RUBY_ARCH_DIR}
-+   /usr/lib/ruby/${_RUBY_VERSION_SHORT}/i586-linux-gnu/ )
-+
-+set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} )
-+
-+# if ruby > 1.8 is required or if ruby > 1.8 was found, search for the config.h dir
-+if( "${Ruby_FIND_VERSION_SHORT_NODOT}" GREATER 18  OR  "${_RUBY_VERSION_SHORT_NODOT}" GREATER 18  OR  RUBY_HDR_DIR)
-+   find_path(RUBY_CONFIG_INCLUDE_DIR
-+     NAMES ruby/config.h  config.h
-+     HINTS
-+     ${RUBY_HDR_DIR}/${RUBY_ARCH}
-+     ${RUBY_ARCH_DIR}
-+     ${RUBY_ARCHHDR_DIR}
-+     )
-+
-+   set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} )
-+endif()
-+
-+
-+# Determine the list of possible names for the ruby library
-+set(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION})
-+
-+if(WIN32)
-+   set( _RUBY_MSVC_RUNTIME "" )
-+   if( MSVC_VERSION EQUAL 1200 )
-+     set( _RUBY_MSVC_RUNTIME "60" )
-+   endif()
-+   if( MSVC_VERSION EQUAL 1300 )
-+     set( _RUBY_MSVC_RUNTIME "70" )
-+   endif()
-+   if( MSVC_VERSION EQUAL 1310 )
-+     set( _RUBY_MSVC_RUNTIME "71" )
-+   endif()
-+   if( MSVC_VERSION EQUAL 1400 )
-+     set( _RUBY_MSVC_RUNTIME "80" )
-+   endif()
-+   if( MSVC_VERSION EQUAL 1500 )
-+     set( _RUBY_MSVC_RUNTIME "90" )
-+   endif()
-+
-+   set(_RUBY_ARCH_PREFIX "")
-+   if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-+     set(_RUBY_ARCH_PREFIX "x64-")
-+   endif()
-+
-+   list(APPEND _RUBY_POSSIBLE_LIB_NAMES
-+               "${_RUBY_ARCH_PREFIX}msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}"
-+               "${_RUBY_ARCH_PREFIX}msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static"
-+               "${_RUBY_ARCH_PREFIX}msvcrt-ruby${_RUBY_NODOT_VERSION}"
-+               "${_RUBY_ARCH_PREFIX}msvcrt-ruby${_RUBY_NODOT_VERSION}-static" )
-+endif()
-+
-+find_library(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR} )
-+
-+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
-+set(_RUBY_REQUIRED_VARS RUBY_EXECUTABLE RUBY_INCLUDE_DIR RUBY_LIBRARY)
-+if(_RUBY_VERSION_SHORT_NODOT GREATER 18)
-+   list(APPEND _RUBY_REQUIRED_VARS RUBY_CONFIG_INCLUDE_DIR)
-+endif()
-+
-+if(_RUBY_DEBUG_OUTPUT)
-+   message(STATUS "--------FindRuby.cmake debug------------")
-+   message(STATUS "_RUBY_POSSIBLE_EXECUTABLE_NAMES: ${_RUBY_POSSIBLE_EXECUTABLE_NAMES}")
-+   message(STATUS "_RUBY_POSSIBLE_LIB_NAMES: ${_RUBY_POSSIBLE_LIB_NAMES}")
-+   message(STATUS "RUBY_ARCH_DIR: ${RUBY_ARCH_DIR}")
-+   message(STATUS "RUBY_HDR_DIR: ${RUBY_HDR_DIR}")
-+   message(STATUS "RUBY_POSSIBLE_LIB_DIR: ${RUBY_POSSIBLE_LIB_DIR}")
-+   message(STATUS "Found RUBY_VERSION: \"${RUBY_VERSION}\" , short: \"${_RUBY_VERSION_SHORT}\", nodot: \"${_RUBY_VERSION_SHORT_NODOT}\"")
-+   message(STATUS "_RUBY_REQUIRED_VARS: ${_RUBY_REQUIRED_VARS}")
-+   message(STATUS "RUBY_EXECUTABLE: ${RUBY_EXECUTABLE}")
-+   message(STATUS "RUBY_LIBRARY: ${RUBY_LIBRARY}")
-+   message(STATUS "RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}")
-+   message(STATUS "RUBY_CONFIG_INCLUDE_DIR: ${RUBY_CONFIG_INCLUDE_DIR}")
-+   message(STATUS "--------------------")
-+endif()
-+
-+FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ruby  REQUIRED_VARS  ${_RUBY_REQUIRED_VARS}
-+                                        VERSION_VAR RUBY_VERSION )
-+
-+mark_as_advanced(
-+  RUBY_EXECUTABLE
-+  RUBY_LIBRARY
-+  RUBY_INCLUDE_DIR
-+  RUBY_CONFIG_INCLUDE_DIR
-+  )
-+
-+# Set some variables for compatibility with previous version of this file
-+set(RUBY_POSSIBLE_LIB_PATH ${RUBY_POSSIBLE_LIB_DIR})
-+set(RUBY_RUBY_LIB_PATH ${RUBY_RUBY_LIB_DIR})
-+set(RUBY_INCLUDE_PATH ${RUBY_INCLUDE_DIRS})
diff --git a/sys-fs/duperemove/Manifest b/sys-fs/duperemove/Manifest
index da14afb19ea2..d5df96d7100a 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,3 +1,5 @@
 DIST duperemove-0.11.1.tar.gz 115740 BLAKE2B 7804f1c98cdeb349ae12425636575c9b2468613dfe908d8c9f1d9fb74aefb412142002a0fc899b8448ed1b255257569555264b9d9c172899f856a919d02dd1a8 SHA512 3c344b00b8fb58a259840aea977ba2e5123b651bb58ec84177bdfd8337a377361984b85c6325271b7d3e4ea216017fa6fda793136c83e9837a13ec041df326b9
+DIST duperemove-0.11.2.tar.gz 158001 BLAKE2B 743f59319424f7fcd400bc24de056fb79fddcb2600a707446c2f1c13c26cdae2ae24e1a91d9edadef55aaafb01b7ca217defc4c939053981bddaca12fcc230e9 SHA512 d2b24c912a3ae4a5b9730ba1369b6174cc6fe252710dc7dae2971816e931558ea68d664bf4c9497630dd9002a71fccc26848ad848831fa45d7a7715ba65378e5
 EBUILD duperemove-0.11.1.ebuild 621 BLAKE2B 71c3b85e3b46c60a90475364ec149b1e736ffa9216ae12228c57dc1f109109fccc3d3d26c6d7d11266daddf3f99e00e2ec61a7c5b3be81a9e6fcfa8ee8bdfe4f SHA512 e1e67d3fe8e6d0f7e9da7e8e90cf7958d72b23c3149c6b1e395de3873a810dc2c68f712082f75264b4d1e3dbc5392428ab8d5f6d93d0958b4f2c16e167e5fd51
+EBUILD duperemove-0.11.2.ebuild 703 BLAKE2B b7d82671d35866177afab78dffe2f852820bdd96f7356c6d0b9295c72286bc0e23890d308906207c0c856629b9a19cb98580f9745780cda4c7a59a9f4cf5f470 SHA512 fce7d95b1ef390b5120eefc2bc221f3d9a25ac79f943721e08090c23cc6ef50e9b80d684dffe941341da328983dd9891e6d96743662710660134128603119ef3
 MISC metadata.xml 333 BLAKE2B 0fee725be9a70cd4044f405f29806359d9e310aaf38915806ba1486424d7b55af23e052cb42d4e2583d5d11bf1be86b59a74e9c556bff985dad4e6c5ee5843f0 SHA512 686d9f84253b594161fecbe0693e1a88735ee928eb7683317e46317e746cd787790e27691b77f6df4da864aec5fb7ac76436de0dd3805f9707c2536daa3eb122
diff --git a/sys-fs/duperemove/duperemove-0.11.2.ebuild b/sys-fs/duperemove/duperemove-0.11.2.ebuild
new file mode 100644
index 000000000000..245dba098bcb
--- /dev/null
+++ b/sys-fs/duperemove/duperemove-0.11.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Btrfs and xfs deduplication utility"
+HOMEPAGE="https://github.com/markfasheh/duperemove"
+SRC_URI="https://github.com/markfasheh/duperemove/archive/v${PV/_/.}.tar.gz -> ${P/_/.}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-db/sqlite:3
+	dev-libs/glib:2"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${P/_/.}
+
+src_prepare() {
+	sed -i -e "/VER/s:0.12.dev:${PV}:" Makefile || die
+	default
+}
+
+src_compile() {
+	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Wall"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+}
diff --git a/sys-fs/encfs/Manifest b/sys-fs/encfs/Manifest
index 701ff993b822..f8f12e31c39e 100644
--- a/sys-fs/encfs/Manifest
+++ b/sys-fs/encfs/Manifest
@@ -1,3 +1,3 @@
 DIST encfs-1.9.5.tar.gz 2798888 BLAKE2B d95e0ea8b807e2cbf4c20907bcc1b163c5397402eea934a7155e83c9d18a84db3097e1d4266a5e632acf39ecadf9812d5104b1565d25a149979e0f72523bb09d SHA512 036e08ca9bc13b44742aebdee49bf7029d0c6b7e59cd6dedc9a09da2af99482859f6a79eddf07e3db296edaf45aafc48fe08488840e765682e9b192dd6ae4c46
-EBUILD encfs-1.9.5.ebuild 946 BLAKE2B fac85f87374c6804b7640f9dad130f89311ae6416860a361c46d748e9cb6432003b250c48dc62fd360b4260e28917124f496c6aafbf50eba5bfedfaa0554e863 SHA512 3f41700863bca65d1759d7aaa166a1dd2754b9aaabe949324ea11d7f3b2ca2209f95c6fdbd5e7334da85145775e7e6f34bd1ca4f5db4b8f31b92793e443d5ecc
+EBUILD encfs-1.9.5.ebuild 953 BLAKE2B fed8b13ebff3766ebe08594437398e541a1a71c373f98dea59b8c78ec584fcfa21d2cec3170b148f251e8cfff315b71f29bdcdeb250637ec0517a500b97b81f2 SHA512 e5d941c595dffe482f08ffd0d276bac80c93828a8dfa71bee1de1cb232e197f65a6b8206086eae407d7cef349173edc3cf6c3379a7390611f2bfc20ace2a99bd
 MISC metadata.xml 379 BLAKE2B 87ea00a89eb0bc59a7bd2df418d8ac3b04bd3560f1a47365235bd72dbb3cb342f8039cbade3524109bdba5139b1fd3adb5c6b6dd1ea1da45811cbacdd37ad803 SHA512 f94de3e423b8666aafc57201813f1b4e7a1be7da71736957aa70c4aa2d92d2b64a240e58c82bec472d97df0afefe5ba95e863243fda973804555e1625118b59f
diff --git a/sys-fs/encfs/encfs-1.9.5.ebuild b/sys-fs/encfs/encfs-1.9.5.ebuild
index 6fb74e919e15..3e339980e831 100644
--- a/sys-fs/encfs/encfs-1.9.5.ebuild
+++ b/sys-fs/encfs/encfs-1.9.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/vgough/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3 LGPL-3"
 SLOT="0"
-KEYWORDS="amd64 arm ~sparc x86"
+KEYWORDS="amd64 arm ~ppc64 ~sparc x86"
 IUSE="libressl nls"
 
 RDEPEND="
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 810e9e7f4a4f..9a1b53800d6e 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,5 +1,3 @@
-DIST f2fs-tools-1.13.0.tar.gz 356028 BLAKE2B 170ddd5825b4f0f6a42a623f01d332092172a385e07dffccca46eb2545c12db23799fdeca7458c0cef17c95989e35db5e617a1458f0c7b41eeccd93eae807167 SHA512 fd920a19e8705a65395809aeef55791c5678ed31c026cdf41fc173e0dbcacdef1db7e0e184ec1aae8637b1784e2ad6e0207583e918255483fe43c73f89bd7f7f
 DIST f2fs-tools-1.14.0.tar.gz 371225 BLAKE2B 4b015e751ca7a8df8769de7a49afa1351717581d09973537d80780ff83f64db9a6fbf454a9a85d8acb761a8d00443a94d09d83cfaba9e5203c0fd656a96d505a SHA512 951b74178f99722550e73f331be066f124f6ee6022710f6b47ae47390b978b08f12a7f2a268d82ca69a32bf440cd3ce3adddc8a4c49c32df83da87e7f659f98d
-EBUILD f2fs-tools-1.13.0.ebuild 823 BLAKE2B 0a08128e3b780e6827a7481e4fdae825b9c0ed473ad7e165ff61c30086d5a89726f21f68248d4f6de015042437d49510e3a47945ed82e83e73f4ad3d1560b6a4 SHA512 e9aebf633cc1951e215f33c9c184d2acc8e17a526843b16d1978a810c5c6d4244be589b7a5d2d0f55ae32a2ded12f1d41162f767d8ffd0cef3d994048e9bb8ed
-EBUILD f2fs-tools-1.14.0.ebuild 829 BLAKE2B 194d4f03b3368830c7fe3725fb7c5b58f2495994c5bb63dda6916c16897416999f03cd82d0721956638737e434caec49117a49f0c71cb774d6d61518cea28bed SHA512 5f80883b383a45249cb2109421d0c4057672836757b300c002e802c3e5e3b7f06188f6ec66a9ef06dadb7f7b6ddcedef68c85d3d8c3d05a2bcba7ec720bed3d7
+EBUILD f2fs-tools-1.14.0.ebuild 823 BLAKE2B 6ddd43860f467c53c5abbcf0b0755b9a0980eeb0848d66cd4d559b89040e03c48b5ffc1db6db8048110217338e6084ad25678038a17f34d1bc6fdada25676b30 SHA512 29c40a964b8a0273d1708a270a3d8f39323ff5e996d5487ba7c0d51e3c0613f7d79f75a305a04096a57070ff09e4d0bcb9a483d918b867410f637cdaff714c11
 MISC metadata.xml 438 BLAKE2B a3bb4e3293bcde65dc3b01fdf363738fc65f63f50756a390f5c0211ed7d252c305e386a913cfc9b016c198238ae0017c82d52d2ff20f79957de19d8db9f30b0a SHA512 d662e42e0da62d264cad5df63fd8f407798f8d396f74b17a2d5cdb20793753b450bb232b4320f9491126b71752a44a69ed11a22b0433786f9825e3941ab24578
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild
deleted file mode 100644
index bc688ca09793..000000000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
-SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/6"
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
-IUSE="selinux"
-
-RDEPEND="
-	selinux? ( sys-libs/libselinux )
-	elibc_musl? ( sys-libs/queue-standalone )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	#This is required to install to /sbin, bug #481110
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--disable-static \
-		$(use_with selinux)
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild
index 333752374ed2..91ca217cb65c 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.14.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/8"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="selinux"
 
 RDEPEND="
diff --git a/sys-fs/fatresize/Manifest b/sys-fs/fatresize/Manifest
index 78f3681139ef..a0f5f2bdd6ad 100644
--- a/sys-fs/fatresize/Manifest
+++ b/sys-fs/fatresize/Manifest
@@ -3,4 +3,4 @@ DIST fatresize-1.0.4.tar.gz 115159 BLAKE2B 16bdfc28bb58f9694adccc7d04dc7c26dc72c
 DIST fatresize-1.1.0.tar.gz 137090 BLAKE2B bdfd8e257fa0b40a1bf8dad4c6b8c91958d605a3c25596153808bf14e1e1b703c1fc7c458ddd444cdd15795c7721496d1e649d9ebc16d4693ad420285511784c SHA512 e4de417fffcceab071571c878f93bb68c7a7fa4f3ab89e272f533940669ffeaa0cb36967dc8fd7cdeda935ef352bce735dd4dac579a2291d9c01447648e8d40f
 EBUILD fatresize-1.0.4.ebuild 506 BLAKE2B 8c490c0683d312c2a6d853917d5a8af344b87f290e1a5294083c8198ddddfff4f551d6bd9f9ad0e573470286b08c15168d345ae82a782e0b17b02ca03a937875 SHA512 75379d9284cbceb844e0a86158093d6075f91ae49aa7aebc780af660bd8bef7e9f725808090f2755c60f4910fa2f4c0a70b31aff2ce850b5a8bc36cfd6c744b8
 EBUILD fatresize-1.1.0.ebuild 407 BLAKE2B 6b13170460321cf69d0b5a7bb297854dfd4609f1abb00c9e0d4c8f7ef3342262263c63a8357bef9731c4f92f154316f818ed2d9e1526422b7d87fd160220f3e4 SHA512 cf23f8e4a91ac9ffa79a3ff86bf6c63dc7222767b863543306d6ef29ecb081936cc39dce5775600b5a934ef7a8da887ecd235f0bd8dcecd914885cee4b4a9220
-MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-fs/fatresize/metadata.xml b/sys-fs/fatresize/metadata.xml
index 5ba62861f1c4..6f49eba8f496 100644
--- a/sys-fs/fatresize/metadata.xml
+++ b/sys-fs/fatresize/metadata.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-<email>jer@gentoo.org</email>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index 49a2fd01a092..b42a706c83c2 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1,6 +1,3 @@
-AUX fatsort-1.6.2.605-gcc10.patch 7400 BLAKE2B 05d9f3bc9c0118c9505e96f2766d27b142a61252f5ad21e3c106ac7afda9a69bddc1ec1dbb9f3b170bbc10315f04db06e80000ef0eb9c601db4b5b88da82e08a SHA512 bac23d94900f48f8fd331962f617b92250ff9cfc801a688526177ef24e571e341e124a2859cbf1ff8db80d1bcbb32ee99d1c9878abcdaa78b9dd0606f5689e28
-DIST fatsort-1.6.2.605.tar.xz 122928 BLAKE2B 2690233828e47a4809aac14a8d64dc8d95a824bec52f787190186adbe066d5d4e6f9c6d1873fc6b809c6df6879d12154430f44d412944963bdff49e673079d12 SHA512 0d119c99c5efff4c10367152fc6efe95e2cb1c39405ca02dd25b66cc68c7420b5b28c0daca1346b7928633bac8ace2d05d731502f989d39ca5c783dcec69ccc7
 DIST fatsort-1.6.3.622.tar.xz 123644 BLAKE2B 1db530753bdaee4ebda9ab36a47f6794584bc590de4cbf8d144a5baa770c080c9d27a1ecadd5a22de72538887c4e10f161f3c4fb3afb3e63bd18834897ebe905 SHA512 309c7424e53fb74f57d0c4272a1a4b3df57fa1130d7e7adae0ac73ac1c8b1900504e49efd0cc4dafea3efa2fbc9191f343b10bb97b647dd6124197356cd01c53
-EBUILD fatsort-1.6.2.605.ebuild 754 BLAKE2B 11850d6ad2ca62de3f7c110773fa216a5d5cf1b7df81e2fc8eaa81fae2e9f029f4ee7b40ddcd5a66991a98d5bbb35e48b9328591aa6ce93e2f305da588d98d6a SHA512 cc94184f60f4ed2c17a476c4ed0718caae60db2769129233b82f39c5d0d9eb41eed803377c1b38bcb6db3b720937f85f5e659ed51fccb2e5bb72b0562d7c9202
-EBUILD fatsort-1.6.3.622.ebuild 715 BLAKE2B d41dd107dc97485ba7d7225703dc813d81acb112fab52551d4360015873c806bbdee4b909fe180228db695a0493bd0d3a7b49bdcec4cd85006727d63af98ffce SHA512 764a8bff79153356dcea1c8fb746f5cc43af397441e114b4d92806769ee22e2a3f6d65f8ccd4445f1e7ffbc011681fc5a7004163776da6ae7abb1d3096f2cd8d
+EBUILD fatsort-1.6.3.622.ebuild 713 BLAKE2B 2713553a05a7084d80ab4d1e4172fcd710cb929a74eb1ef535e7a32b447fffb6e48d27424725009b29abd51568a8faba5e2b79f15323870164c10c42d7a52270 SHA512 d86118e29d272cc39d857c74303ae0e65cf6f95f1d83147ef9f69533f238e2c89bc95113e35fc0b31fe2a1a3a419fc04ccbefedd0742a01e2c5126fe7f066a16
 MISC metadata.xml 738 BLAKE2B b4ae8042af9b7a74705b42322ffcfba47aa18e3cb1bee693ff2db3fecb6555d516ec9a3f4746643ef37007e9d1b44ea79d5fa0e4bc12b6ca4ba813129d208dcd SHA512 42cb5be41b29129b17ea55591d352872ccd6078705068c6899d4f1f5a5b99ab5f6809e75ee6b49bd6b536f6b66632ce9e1859f4bbad764b966d5520a8aa5a228
diff --git a/sys-fs/fatsort/fatsort-1.6.2.605.ebuild b/sys-fs/fatsort/fatsort-1.6.2.605.ebuild
deleted file mode 100644
index 0f3cb645a3c3..000000000000
--- a/sys-fs/fatsort/fatsort-1.6.2.605.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players"
-HOMEPAGE="http://fatsort.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc10.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e 's|/usr/local|/usr|g' \
-		$(find ./ -name Makefile) || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) LD=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		DESTDIR="${D}"
-}
-
-src_test() {
-	# Tests require root permissions and mounting filesystems which does
-	# not work inside the ebuild environment
-	true
-}
diff --git a/sys-fs/fatsort/fatsort-1.6.3.622.ebuild b/sys-fs/fatsort/fatsort-1.6.3.622.ebuild
index 28d6fc9100bc..f04b31692aa8 100644
--- a/sys-fs/fatsort/fatsort-1.6.3.622.ebuild
+++ b/sys-fs/fatsort/fatsort-1.6.3.622.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 src_prepare() {
 	default
diff --git a/sys-fs/fatsort/files/fatsort-1.6.2.605-gcc10.patch b/sys-fs/fatsort/files/fatsort-1.6.2.605-gcc10.patch
deleted file mode 100644
index 0446fe3e09dc..000000000000
--- a/sys-fs/fatsort/files/fatsort-1.6.2.605-gcc10.patch
+++ /dev/null
@@ -1,256 +0,0 @@
-Index: tests/Makefile
-===================================================================
---- a/tests/Makefile	(revision 606)
-+++ b/tests/Makefile	(revision 613)
-@@ -19,7 +19,7 @@
- 		if [ ! -f $$i/passed ]; then \
- 			printf "%.70s" "Test case $$i...                                                                 "; \
- 			printf "[ \e[1;33mWAIT \e[0m]"; \
--			${MAKE} -C $$i &>> /dev/null; \
-+			${MAKE} -C $$i &> /dev/null; \
- 			ret=$$?; \
- 			printf "\r%.70s" "Test case $$i...                                                                 "; \
- 			if [ $$ret -eq 0 ]; then \
-Index: CHANGES.md
-===================================================================
---- a/CHANGES.md	(revision 606)
-+++ b/CHANGES.md	(revision 613)
-@@ -1,5 +1,11 @@
- # Changelog
- 
-+## v1.6.3 (xxx)
-+* fixed support for macOS (thanks to Max for the fix)
-+* declared OPT_LOCALE as extern
-+* fixed uninitialized variable
-+* avoided some string truncation compiler warnings
-+
- ## v1.6.2 (November 29, 2019)
- - FIX: multiple endianness issues with exFAT
- - now using /proc/self/mounts instead of /etc/mtab to check whether filesystem is mounted
-Index: src/FAT_fs.c
-===================================================================
---- a/src/FAT_fs.c	(revision 606)
-+++ b/src/FAT_fs.c	(revision 613)
-@@ -42,7 +42,7 @@
- // used to check if device is mounted
- #if defined(__LINUX__)
- #include <mntent.h>
--#elif defined (__BSD__)
-+#elif defined (__BSD__) || defined (__OSX__)
- #include <sys/ucred.h>
- #include <sys/mount.h>
- #endif
-@@ -85,7 +85,7 @@
- 
- 	return ret;
- 
--#elif defined(__BSD__)
-+#elif defined(__BSD__) || defined(__OSX__)
- 	struct statfs *mntbuf;
- 	int i, mntsize;
- 	int32_t ret = 0;
-Index: src/deviceio.c
-===================================================================
---- a/src/deviceio.c	(revision 606)
-+++ b/src/deviceio.c	(revision 613)
-@@ -24,7 +24,7 @@
- 
- #include "deviceio.h"
- 
--#if defined __LINUX__ || defined __BSD__
-+#if defined __LINUX__ || defined __BSD__ || defined __OSX__ 
- 
- #include <sys/types.h>
- #include <sys/stat.h>
-@@ -59,7 +59,7 @@
- #include "mallocv.h"
- #include "errors.h"
- 
--#if defined __LINUX__ || defined __BSD__
-+#if defined __LINUX__ || defined __BSD__ || defined __OSX__ 
- 
- DEVICE *device_open(const char *path) {
- 
-@@ -88,7 +88,7 @@
-   assert(device != NULL);
-   assert(offset >= 0);
- 
--#if defined __BSD__
-+#if defined __BSD__ || defined __OSX__ 
-   return lseek(device->fd, (off_t) offset, SEEK_SET);
- #else
-   return lseek64(device->fd, (off64_t) offset, SEEK_SET);
-Index: src/deviceio.h
-===================================================================
---- a/src/deviceio.h	(revision 606)
-+++ b/src/deviceio.h	(revision 613)
-@@ -27,7 +27,7 @@
- 
- #include <stdint.h>
- 
--#if defined __LINUX__ || defined __BSD__
-+#if defined __LINUX__ || defined __BSD__ || defined __OSX__ 
- 
- #define DIRECTORY_SEPARATOR '/'
- 
-Index: src/fatsort.c
-===================================================================
---- a/src/fatsort.c	(revision 606)
-+++ b/src/fatsort.c	(revision 613)
-@@ -45,7 +45,7 @@
- 
- // program information
- #define INFO_PROGRAM		"fatsort"
--#define INFO_VERSION		"1.6.2"
-+#define INFO_VERSION		"1.6.3"
- #define INFO_AUTHOR		"Written by Boris Leidner.\n"
- #define INFO_COPYRIGHT		"Copyright (C) 2004-2019 Boris Leidner.\n"
- #define INFO_LICENSE		"License GPLv2: GNU GPL version 2 (see LICENSE.txt)\n" \
-Index: src/sort.c
-===================================================================
---- a/src/sort.c	(revision 606)
-+++ b/src/sort.c	(revision 613)
-@@ -261,14 +261,15 @@
- 
- 	struct sExFATDirEntry de;
- 	struct sExFATDirEntrySet *des;
--	struct sExFATDirEntryList *del;
-+	struct sExFATDirEntryList *del=NULL;
- 
- 	char name[MAX_PATH_LEN+1];
--	char str[32];
-+	char str[31];
- 	char *outptr, *inptr;
- 	uint8_t nameLength=0;
- 
--	size_t outcount, incount, iret;
-+	size_t outcount=30;
-+	size_t incount, iret;
- 
- 	*direntrysets=0;
- 
-@@ -376,7 +377,7 @@
- 				        }
- 					outptr[0]='\0';
- 
--					strncat(name, str, 30);
-+					strncat(name, str, 31);
- 
- 					// we are done here
- 					if (entries == expected_entries) {
-@@ -512,7 +513,7 @@
- 	union sDirEntry de;
- 	struct sDirEntryList *lnde;
- 	struct sLongDirEntryList *llist;
--	char tmp[MAX_PATH_LEN+1], dummy[MAX_PATH_LEN*2+1], sname[MAX_PATH_LEN+1], lname[MAX_PATH_LEN+1];
-+	char tmp[MAX_PATH_LEN+1], dummy[MAX_PATH_LEN+1], sname[MAX_PATH_LEN+1], lname[MAX_PATH_LEN+1];
- 
- 	*direntries=0;
- 
-@@ -589,8 +590,11 @@
- 					return -1;
- 				}
- 
--				snprintf(dummy, MAX_PATH_LEN*2+1, "%s%s", tmp, lname);
--				strncpy(lname, dummy, MAX_PATH_LEN);
-+				strncpy(dummy, tmp, MAX_PATH_LEN);
-+				dummy[MAX_PATH_LEN]='\0';
-+				strncat(dummy, lname, MAX_PATH_LEN - strlen(dummy));
-+				dummy[MAX_PATH_LEN]='\0';
-+				strncpy(lname, dummy, MAX_PATH_LEN+1);
- 
- 				break;
- 			default:
-@@ -708,8 +712,8 @@
- 			dummy[MAX_PATH_LEN]='\0';
- 			strncat(dummy, lname, MAX_PATH_LEN - strlen(dummy));
- 			dummy[MAX_PATH_LEN]='\0';
--			strncpy(lname, dummy, MAX_PATH_LEN);
--			dummy[MAX_PATH_LEN]='\0';
-+			strncpy(lname, dummy, MAX_PATH_LEN+1);
-+			//dummy[MAX_PATH_LEN]='\0';
- 			break;
- 		default:
- 			myerror("Unhandled return code!");
-Index: src/options.c
-===================================================================
---- a/src/options.c	(revision 606)
-+++ b/src/options.c	(revision 613)
-@@ -55,7 +55,6 @@
- 	assert(stringList != NULL);
- 	assert(stringList->str == NULL);
- 	assert(str != NULL);
--	assert(strlen((char *)str) <= MAX_PATH_LEN);
- 
- 	char *newStr;
- 
-@@ -77,14 +76,16 @@
- 	// copy string to new structure including missing slashes
- 	newStr[0] = '\0';
- 	if (prefix) newStr[0] = DIRECTORY_SEPARATOR;
--	strncat(newStr, (const char*) str, len);
-+	memcpy(newStr+prefix, (const char*) str, len);
- 	if (suffix) newStr[prefix+len] = DIRECTORY_SEPARATOR; 
- 
-+/*
- 	if (prefix+len+suffix > MAX_PATH_LEN) {
- 		newStr[MAX_PATH_LEN] = '\0';
- 	} else {
- 		newStr[prefix+len+suffix] = '\0';
- 	}
-+*/
- 
- 	ret = addStringToStringList(stringList, newStr);
- 
-@@ -137,7 +138,7 @@
- 	parses command line options
- */
- 
--	int8_t c;
-+	int8_t c,len;
- 
- 	static struct option longOpts[] = {
- 		// name, has_arg, flag, val
-@@ -315,12 +316,13 @@
- 			case 't' : OPT_MODIFICATION = 1; break;
- 			case 'v' : OPT_VERSION = 1; break;
- 			case 'L' :
--				OPT_LOCALE=realloc(OPT_LOCALE, strlen(optarg)+1);
-+				len=strlen(optarg);
-+				OPT_LOCALE=realloc(OPT_LOCALE, len+1);
- 				if (OPT_LOCALE == NULL) {
- 					stderror();
- 					return -1;
- 				}
--				strncpy(OPT_LOCALE, optarg, strlen(optarg)+1);
-+				memcpy(OPT_LOCALE, optarg, len+1);
- 			break;
- 			default :
- 				myerror("Unknown option '%c'.", optopt);
-Index: src/stringlist.c
-===================================================================
---- a/src/stringlist.c	(revision 606)
-+++ b/src/stringlist.c	(revision 613)
-@@ -78,8 +78,7 @@
- 		return -1;
- 	}
- 
--	strncpy(stringList->next->str, str, len);
--	stringList->next->str[len] = '\0';
-+	memcpy(stringList->next->str, str, len+1);
- 
- 	return 0;
- 
-Index: src/options.h
-===================================================================
---- a/src/options.h	(revision 606)
-+++ b/src/options.h	(revision 613)
-@@ -35,7 +35,7 @@
- extern struct sStringList *OPT_INCL_DIRS, *OPT_EXCL_DIRS, *OPT_INCL_DIRS_REC, *OPT_EXCL_DIRS_REC, *OPT_IGNORE_PREFIXES_LIST;
- extern struct sRegExList *OPT_REGEX_INCL, *OPT_REGEX_EXCL;
- 
--char *OPT_LOCALE;
-+extern char *OPT_LOCALE;
- 
- // parses command line options
- int32_t parse_options(int argc, char *argv[]);
diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest
index 39acc198831e..bf0946a2997f 100644
--- a/sys-fs/fuse-overlayfs/Manifest
+++ b/sys-fs/fuse-overlayfs/Manifest
@@ -1,3 +1,5 @@
 DIST fuse-overlayfs-1.1.2.tar.gz 98055 BLAKE2B 04cee8052671431604031ddd3d0ebc254de0ba00a527b4a7caa24bf4a0b74be81c9d0f2c02e5eb583c3f6a61b540762b52617531f266341878cb54f40e087331 SHA512 41bb7ed21d0408af61820b9aebefb08ee6add0c9a15ff1cafd8abc7ff6fcc46afd53740c946c6835bbba8c58ee8bfcc8351cd2a1fe81d749dad81934ce44032b
-EBUILD fuse-overlayfs-1.1.2.ebuild 557 BLAKE2B 3c520126b339c8666d0f4b4c1443bef31352a9c1e0d77044ad38984f33aac5a3998d57941e2896a87be27a058a795acf4d5940b31efa31f99c2e3c111e0149aa SHA512 c72c29f1f5d8b269e4a3cff1440b76e8d02e7aa38f9418c628de67fab768729da6ce8e898f251085d836122b08d432721cd83a7f85604fcfe4db24387eb1defa
+DIST fuse-overlayfs-1.2.0.tar.gz 101375 BLAKE2B ff71ae8ad58396a8365fd65574145b45ae9632f407e2246096822cca12eb17d7a7ef9f5cc3546c83573b7af56b96d8800d6f390477cff2fe88c2858ed198740c SHA512 55aa7c92f964ab18b886607de705b98510c7f25cc0d90e4712fb8493a4baab9ea722d8966a9b7e8f8fd8e5d2163a54993e9e45dfa2699db6cec8b447bdc5399b
+EBUILD fuse-overlayfs-1.1.2.ebuild 564 BLAKE2B 1932eec0743d4360b15f3f487e337271b4b6befcb9365869dee089e31145926dc4be46c67c81caf3ed18ffafd26cd799f3126d62e8427abb8f6573fb083aeefa SHA512 d94880968425bf4c54aa40fae97744d72b8ac41427f7216f399e796ab771fb850bf72c7b890a80e69b3ab9e5c5b2d55d2086bfbf8e7442be877fbac4054a117d
+EBUILD fuse-overlayfs-1.2.0.ebuild 564 BLAKE2B 1932eec0743d4360b15f3f487e337271b4b6befcb9365869dee089e31145926dc4be46c67c81caf3ed18ffafd26cd799f3126d62e8427abb8f6573fb083aeefa SHA512 d94880968425bf4c54aa40fae97744d72b8ac41427f7216f399e796ab771fb850bf72c7b890a80e69b3ab9e5c5b2d55d2086bfbf8e7442be877fbac4054a117d
 MISC metadata.xml 334 BLAKE2B d159a1336d5c016f97f854c7dc8267a7df63d9352fc81670d09fb436aa1267c842a466bbe026443a57c3e910c927f361d0ad25e9785ea785e522500c966beca0 SHA512 c91863d890e5145d3e05d247455ee2d0bda70525dfbc15632e11df75ccdd40bdb0dca17b41d3f8485ad1768cf401915ada074ee05f739d74df93d440785b6fd5
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.1.2.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.1.2.ebuild
index d594f97bb55f..f8b399d715d2 100644
--- a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.1.2.ebuild
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.1.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~arm64"
 IUSE=""
 
 RDEPEND=">=sys-fs/fuse-3:="
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.2.0.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.2.0.ebuild
new file mode 100644
index 000000000000..f8b399d715d2
--- /dev/null
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.2.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="FUSE implementation for overlayfs"
+HOMEPAGE="https://github.com/containers/fuse-overlayfs"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE=""
+
+RDEPEND=">=sys-fs/fuse-3:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 8b5eccb77cb8..0bf29a347bac 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,9 +1,11 @@
 AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f977308c429858817fce81520291fd49fb58e6c863474a45a2e3a674da33b5678fcd784a7d1e8bc9472bbe0995ae3dc SHA512 909d43fbe190400d4beabd9801bf554e38a5bb5a3545930883976f42a2090c8768e485183949269639ddeae5bae5490b37dc23f031c48d6c4fd4c9facf08b66b
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
+DIST fuse-3.10.0.tar.xz 1899596 BLAKE2B 39f7c7caf3d7cd2807381ee968a6fd704b29e1171a811d918fe70b9fdf6891d553d97a70ac7b217e01c4776e3d8576c60bef0bd3f7b520685d7d0e4ee3b78bf9 SHA512 a59d430f46ad59d51848ab9a07a02940f167fd5552232067dbcc442717a444a2ab30b1743282a7839ae79c0a74949742cd54d09472449c90b5fcc89adc7eff35
 DIST fuse-3.9.1.tar.xz 1595308 BLAKE2B 3b1d5c8ac99e96183581d034889d8d6cab8feeee26cafd765dc4ab2cbeb655b3b162836c960ceacf08cd458bec2daaf0474877c9611ef6a6543795e4971ddc12 SHA512 295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329
 DIST fuse-3.9.2.tar.xz 1674292 BLAKE2B 42d796802d3ce2e072120153b695d1e64d160695714c58ffba7859281bfa2c1ff3d9f95b92a38c1a5443abe5a8468f0d9d285845b97a444ae1b64bf750e234ae SHA512 47795d2e0431c93ff36609247016a5ddfa631e4dcdc56cb579030bdb78497e3fa2db28b0cbadd0848024be39381c54f8441de28b0af51f8b800519e76c7af9ed
 DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
 EBUILD fuse-2.9.9-r1.ebuild 2070 BLAKE2B 2946ac81c95dbb8cc329247aaf0f123a45475113028b8d79a845ae71388d3fd639c1c660c784284436fc4f603a7a248f33f19687569fde508929f16ac9168822 SHA512 d005e464d34b1a0edb69c795440c56d74c2147cb04403f8067987964ae243bb122adcbacd6f330dd53ed0cd058fdaee2ca4642dd711dfb559903b30364927fde
+EBUILD fuse-3.10.0.ebuild 1833 BLAKE2B 8cdbc1017a8db4f635f9c6d281dcc9f012c4f330c4b31a9e47640d50e48a2185bb29214b0f86e723942aef0efc971d252054c036afececab6eb8d191a7095147 SHA512 7c8606182dc39280082c26d2c3b93b55b63c7b3bf047d70f9bc1ba72c9c5d829cf0d4d247861114db265342f9381bc8d9806ec5779205c16086fc089d6bd8779
 EBUILD fuse-3.9.1.ebuild 1951 BLAKE2B d77d30f658b18676242b9f12240da45cd10a6e320592dc8c742febcfd9ce046fe2a92fd89c1d7e4c01da5ed89cbcaa24550a7eb1a7475e9a1c6515b877886722 SHA512 a4e79858f9f94df3e7494eb79270246c6fd64c87e68974e960d661a6056b4acdd0990cd8faa0cf0f2e9703e87a7732acb27bf1f604949d23a1b44654fca53e15
 EBUILD fuse-3.9.2.ebuild 1959 BLAKE2B 9031d363fe452bd0daa3ae880b2026db1c58ca1a2547e486351f0121fa56f777cc681af5c5f8d32879e87b1832027c67cd112f57659312f6a02daa20c4ecd083 SHA512 dc61b7ad3b936d6d298c51bfca3bcfccc0da77e5d41eba9acae04a06a24195adb1d2b7e6eee7e4ff6d9da60f89e69fedc232fe543ee46f6a5577bb19971d0962
 EBUILD fuse-3.9.3.ebuild 1959 BLAKE2B 9031d363fe452bd0daa3ae880b2026db1c58ca1a2547e486351f0121fa56f777cc681af5c5f8d32879e87b1832027c67cd112f57659312f6a02daa20c4ecd083 SHA512 dc61b7ad3b936d6d298c51bfca3bcfccc0da77e5d41eba9acae04a06a24195adb1d2b7e6eee7e4ff6d9da60f89e69fedc232fe543ee46f6a5577bb19971d0962
diff --git a/sys-fs/fuse/fuse-3.10.0.ebuild b/sys-fs/fuse/fuse-3.10.0.ebuild
new file mode 100644
index 000000000000..a1bb3217aed0
--- /dev/null
+++ b/sys-fs/fuse/fuse-3.10.0.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson multilib-minimal flag-o-matic udev python-any-r1
+
+DESCRIPTION="An interface for filesystems implemented in userspace"
+HOMEPAGE="https://github.com/libfuse/libfuse"
+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 ~s390 ~sparc ~x86"
+IUSE="+suid test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
+
+DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
+
+python_check_deps() {
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python_setup
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dexamples=$(usex test true false)
+		-Duseroot=false
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+src_test() {
+	if [[ ${EUID} != 0 ]]; then
+		ewarn "Running as non-root user, skipping tests"
+	elif has sandbox ${FEATURES}; then
+		ewarn "Sandbox enabled, skipping tests"
+	else
+		multilib-minimal_src_test
+	fi
+}
+
+multilib_src_test() {
+	${EPYTHON} -m pytest test || die
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# installed via fuse-common
+	rm -r "${ED}"/{etc,$(get_udevdir)} || die
+
+	# useroot=false prevents the build system from doing this.
+	use suid && fperms u+s /usr/bin/fusermount3
+
+	# manually install man pages to respect compression
+	rm -r "${ED}"/usr/share/man || die
+	doman doc/{fusermount3.1,mount.fuse3.8}
+}
diff --git a/sys-fs/inotify-tools/Manifest b/sys-fs/inotify-tools/Manifest
index dbcae98cbe1b..3f1087419808 100644
--- a/sys-fs/inotify-tools/Manifest
+++ b/sys-fs/inotify-tools/Manifest
@@ -1,6 +1,8 @@
 AUX inotify-tools-3.20.1-rm-unused-cmd-arg.patch 495 BLAKE2B e838d5af6f64a1bc9b7693d61b822199de43afa79b071390df20fc301f5c1fd27c71d4470b0ad8844f2b3f9421382f3fba505336f5ba9433590b63017b62e896 SHA512 baf8805d3463f849dc6830177c2b72273dfde7baf025266d95b26662b69f003ca0fd9511561d523a59f37a2e9a2d23bf3e51d3687be000263ef60136af87b677
 DIST inotify-tools-3.20.1.tar.gz 79564 BLAKE2B 4b1235951f55ecb7c6c92b06b68dedebad8677c2265616dddd275bf627034b66b5756cf17a2f68f4201a78b043ec8a0800f115f3952c19875ae7f524b9b21382 SHA512 a97d27e6033036f0db5c0737bee3510206db9f4c843f0d18f1b2e179e838624ea33316c34fd9917c158dbb3580367908e90042fb1bfb146f150c32833b0b2ff2
+DIST inotify-tools-3.20.11.0.tar.gz 84827 BLAKE2B 1d3e25c4e213c9c6da74575677a6dc491405077b0544be79ee95e5ac2ee2ef2606ae2fd0264ad83228dc580447f15afd16e486bd5a8d51f6254ed805ed985260 SHA512 77b90e96efe0c90ab6ca4309c2f08303c2047ebddfad93ff62c616f30df8ca01102197867571047475b19b7dcc0fe369d9dd41425c2973cdc06467787098f672
 DIST inotify-tools-3.20.2.2.tar.gz 81006 BLAKE2B 7dd29985f68096fe2146a3ad84d619b3d1238b0db25eeb125f2fe9591fa678078351f00c7e09b526cf2251e4736201d5625ff0e477523cae370a307ccb667730 SHA512 72d6fdcc216d8083cd384c71c02dc8e800d3a9702613568b3c571f704aee3d42bf084c52f2141c9afb8d28e8b87ebb6391ed3d825b3d664ed51c552debeb1881
 EBUILD inotify-tools-3.20.1.ebuild 877 BLAKE2B e8c8831cd4596a80e1a2d0092489e3c0355086ff66d7cdbf5d0d3246539918e337b5679a169439aad4070a48f3ab7794966ff16e4c4b316bcdf4e45af0b7bc3f SHA512 fd7f3f20a5e087a6f3bedcc136f92fe2f320d08d2afe7b7a2a9c6dc5ac4307800595e300be71b2ec9aa6bdb24f60221cf7d0d6318075ff4a61356ae2e09178da
-EBUILD inotify-tools-3.20.2.2.ebuild 943 BLAKE2B ea876005b60646eb31877314dc40ec82d9c11a7724ba66d484abc1d4a93b71f30d5fd421aba745c0216514afb5cd2274210e47908db8677b0ea34de021489262 SHA512 a647b78df5863b7fd13f489879bef00c10467ff8b78f578153d87da03aa574ad88bf9b0fda6c012dce9b5b9d799a3e1438cc9b1695b012f32bea7b0df18d4996
+EBUILD inotify-tools-3.20.11.0.ebuild 940 BLAKE2B 6781dcd55ad545831371389cc9a824e1a6ef1873f09eeb34acb00010277a3929d78d2eda86b5dbbd0cbfbaa83e8862fb031790a2e0b4b1915bbaa90a54610142 SHA512 0c8f6e041fbb5730ff132d0cb7783b8137b161f18fefe77fee2444e862d1ecff856707b876ac966e585d4c4cdf88e7019bb3f0ec52e9c544080ef488e875a407
+EBUILD inotify-tools-3.20.2.2.ebuild 938 BLAKE2B 93c4f49d193ae111f89fa7e81d7521d2b2f0e4cdb9a8e6576b191fd9a2c6be3e472176c9aaa79b5a2177c349e4101ee7e5c2a2f789d3955dc11fe0ccb08be890 SHA512 4352194494970c7e589fc5342d0e50546d9a0af9a2b3b7ea4d9e7f2f37f8882a4a87edac0b50fc9776c812db1531ffcbd68c1e98540c67ae468e5069ff728f0a
 MISC metadata.xml 649 BLAKE2B 414281eb4ef1da7d9b3cbaf61603043a64c6b748b6d21f7693b1bc4e6fdb1c811fc59490c3246cdf0526de0658ada36251493ea9c5f00f5e700d8d4e68f99868 SHA512 62eaab525f91d97a37b526fb07b7ee4b5c7abcfdd9f785655d3252de2a4f545649da51341c5c0ff4201e0ea097bb7206d2dbe5285c9008a392c55e4802c229e7
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild
new file mode 100644
index 000000000000..5e89f2bc1ca7
--- /dev/null
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.11.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="a set of command-line programs providing a simple interface to inotify"
+HOMEPAGE="https://github.com/inotify-tools/inotify-tools"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86"
+IUSE="doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+src_prepare() {
+	default
+
+	# Remove -Werror from CFLAGS (#745069)
+	find -name "Makefile.am" -print0 \
+		| xargs --null sed 's@ -Werror@@' -i || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# only docs installed are doxygen ones, so use /html
+	local myeconfargs=(
+		--disable-static
+		--docdir='$(datarootdir)'/doc/${PF}/html
+		$(use_enable doc doxygen)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild b/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
index ff0369a04dea..e3ff5f5c7d04 100644
--- a/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
+++ b/sys-fs/inotify-tools/inotify-tools-3.20.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~sparc ~x86"
+KEYWORDS="amd64 arm ~arm64 hppa ~mips sparc x86"
 IUSE="doc"
 
 DEPEND="doc? ( app-doc/doxygen )"
diff --git a/sys-fs/jmtpfs/Manifest b/sys-fs/jmtpfs/Manifest
index ae16ef2df55e..9be4233423e5 100644
--- a/sys-fs/jmtpfs/Manifest
+++ b/sys-fs/jmtpfs/Manifest
@@ -1,3 +1,3 @@
 DIST jmtpfs-0.5.tar.gz 142914 BLAKE2B c6970df3f332b918792034d1da195601098c369a55b9ad4534961227fbc286da6a552ba5fad520474fb8b245f2df5c0b3f07f400d4d12fa5478286250f6e2881 SHA512 1997d202199af59ae2138701855864e4dab624fff4feac08ea98e3e4ed6c39e4181d8f9fec35db0e83570f48de204f3d00e1b0d2244ec677f77a99b1dc9c38b3
 EBUILD jmtpfs-0.5-r1.ebuild 565 BLAKE2B 15e6b1550f925aba7dc4aeb33ffe0b7e760b738c207c5e975ebce7f3e6c114055724bfbb9eab07e189291e6bfdcf63ea259c6be75164561934c5514f50b7260c SHA512 9339bc2c5962569e492f623e22fd3a60edf832954a4f94986999756817a068bf154449783effa362264e5626886cda7a30b47c618d95810369973e0d5b686af7
-MISC metadata.xml 298 BLAKE2B 26a4e6270ad510210e0f36c42bb2fa2b44ce328e86307222a4ce16db8d3f924b9f5f3577b092c6d5b62f892b94a411edc0d9909101231099636356e3a030abff SHA512 0164dff12990e4ab1cf98d21baf3d3f02354aec3827244112f1f6a7f02769d3d7210ffb0c190ddd5b193921df44237bb0e1a9a2cfc860fe5b3fd3be5ab6ab922
+MISC metadata.xml 251 BLAKE2B 40c1ddd3c734701f4ba14500456c2b5ac17f598da527c208c2480d13cca8a397f96aad800220c1217b42554bed2de5161cd7265a58b39e1363ec215f932c9a5a SHA512 0251e27bedbee8963847c2652a1d00e4530a6ce85dfd986c6b0614c3ebc193ba9e381815667fefd9c3f8c7c3c5461d574479337024b21bd24cdd69d4481c5fec
diff --git a/sys-fs/jmtpfs/metadata.xml b/sys-fs/jmtpfs/metadata.xml
index f268713ff9a5..fc467e691ea5 100644
--- a/sys-fs/jmtpfs/metadata.xml
+++ b/sys-fs/jmtpfs/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>jer@gentoo.org</email>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">JasonFerrara/jmtpfs</remote-id>
 	</upstream>
diff --git a/sys-fs/ldapfuse/Manifest b/sys-fs/ldapfuse/Manifest
index 6ac17ecefca5..9998fabe03e2 100644
--- a/sys-fs/ldapfuse/Manifest
+++ b/sys-fs/ldapfuse/Manifest
@@ -1,3 +1,3 @@
 DIST ldapfuse-1.0.tar.xz 76024 BLAKE2B fa7bb67637e069e013c5a0d849f196803466cdec82b538ccaa7852e589c8c1ec5e68d73e88c3d3c69237dce89fd62e10d949ddc8b84e3c72d4e0c9b43ec90c66 SHA512 ea9af757d69fe9931ac745039d75a52d3e590c16737a71e6d9a6a8654b5514a1c86e26925f5cbe117c5bedcef8888ce69bec3bec2c02fe4dd233fee7f3118e7f
-EBUILD ldapfuse-1.0-r2.ebuild 519 BLAKE2B a6287e6643af783f9fd6041f688750eb41ba7189c20f0a10213c2053ac9cf2e4bef340e4c8ea094424f1914e9c95452cea403ec49562ddb6e8d60401d5333392 SHA512 52bfa8e030d6065b641e363fe289285b80c955feb18653f6afe739e5dc7c7d1ad81f3d6d636ad7357694b71f5f99b07a543ea67bb66556b173505a7c713b731c
+EBUILD ldapfuse-1.0-r3.ebuild 521 BLAKE2B f84c94bb13f7610405b4f3b2633019e4bc522e006279a7785a7c6dbe6989378e5d8d5394ffda6f5fcddc09aaaee4e3cd0a71a52cbc41ec30ae474d11dbd94ec6 SHA512 369827ca4bda03e7d7a70da13f533543c7cf1a7d1589ed61ff708128e03cab72f7eee97e19da264e81770fcc0b7e4043711771083d62c207cfbdbf776373f41c
 MISC metadata.xml 245 BLAKE2B 387a8dc81084ffd6d2142e4736475f60137a133e899450ebb4fbae27dcbbe1db68bc530af14d2f1e266d83d2b0bc65e36c8f35b5c2338e6cf3d90a1305eda9d0 SHA512 6b8638887d57ae5e5377f3d1db187607bb64ede9f633367aa9ba9548638630ef738c420f67aa97989611e1ff5885062fbd4246ad3fb59c9021ec770b822de0ca
diff --git a/sys-fs/ldapfuse/ldapfuse-1.0-r2.ebuild b/sys-fs/ldapfuse/ldapfuse-1.0-r3.ebuild
index 22f15a54b35f..06bdb19e918f 100644
--- a/sys-fs/ldapfuse/ldapfuse-1.0-r2.ebuild
+++ b/sys-fs/ldapfuse/ldapfuse-1.0-r3.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64 ~x86"
 RDEPEND="
 	net-nds/openldap
 	sys-fs/fuse:0
-	>=sys-libs/libhx-3.12"
+	>=sys-libs/libhx-3.12:="
 
 DEPEND="
 	${RDEPEND}
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index 8076df6cdcde..0d31bf099d5f 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,5 +1,7 @@
 DIST loop-AES-v3.7n.tar.bz2 373901 BLAKE2B 5cac9bd55f35a6cf0c056a6a2e75a48f49c1d23b7ebe1821e10dab522508e64ed23e5993dbcc19dbdeaab6c315ee4e71c8ecc17d9da41a5ad0794abc92563d7e SHA512 d190561f92a47292285e44c728bf1fcf9b7dd9c54f970ebc11a2988686f409515687a22028187756baaa4622903564e2646971a63eba13557c6ce78dc1f0bb96
 DIST loop-AES-v3.7q.tar.bz2 376027 BLAKE2B 7f3206196fcb7ecc928bda4cd127042f61cd5ac7f39e483fb91db388572be1c8e252d5c4adb653e6fd00ff6a7ba4c1406c35f2b2659e9cb38fd817f1bdb2a15f SHA512 103869695f6b18bcc765804865468db4b24fc2fcce3ec97d8468fdc0bd37c480386960730e280cd93c707026dddc5e79d8d25e2601c3678330e016835166ad20
+DIST loop-AES-v3.7s.tar.bz2 376972 BLAKE2B 0a4dcc6aeadfad5c33b01b48c53d6df55925be2cc0f85c2e96b61b15a60d42d7868fa9c32ad5ef3a13caa5e1ab4407792aad32cd60a57b094348b355cd688b22 SHA512 25f7d9218ae83c4c1fb5294bc405267c3a4e20954fbd7a45effb70ebef4014625b8cc93c7d69be220da4a04f4cd4b429763273cdb6cda497a6a31888d47ca1d1
 EBUILD loop-aes-3.7n-r1.ebuild 2033 BLAKE2B b57cf91c8c11a96ac0259e904950aa6c20f9f7244cf1114b598fa90fc7deda16c87348bb223147aa003372bfe03d9627b60bccc9a3e398b196a4666b5a398e6b SHA512 907140e56ed3fb76630e8389764b3e776cbe9429ebd81899e8d33452415c6c0183b84060716d9ee1f85658334d8ae1647c9c3912c7cf92c8b8902f1db9db7e0a
 EBUILD loop-aes-3.7q-r1.ebuild 1751 BLAKE2B 1169b7659b99297cb22999f941fb0e164df1684f12fe548148adf6ff23ea72422227b85a1a0bb34345b92c4d7d55389a82bc63cba5f895c9480c2f81b5dc7612 SHA512 bf78deea9927612fac0d78e9bd15358b1f9c31c661a564d35064b10e1956db230d4f7b6b3a15cccbbb30f5e69a19cf6a81d9f26982c5f040abe943a9002e2461
+EBUILD loop-aes-3.7s.ebuild 1751 BLAKE2B 1169b7659b99297cb22999f941fb0e164df1684f12fe548148adf6ff23ea72422227b85a1a0bb34345b92c4d7d55389a82bc63cba5f895c9480c2f81b5dc7612 SHA512 bf78deea9927612fac0d78e9bd15358b1f9c31c661a564d35064b10e1956db230d4f7b6b3a15cccbbb30f5e69a19cf6a81d9f26982c5f040abe943a9002e2461
 MISC metadata.xml 617 BLAKE2B 58d3b691b322ec4ae5772e391ff255fb0bfdba6202d24dec70baa5543657dc07c473992ceccc61beb35ad710e6014ab692eb8856463e8d001446bd45e8a2d60c SHA512 dba8f0278839b705911377ab463c7662f85f6f7be1528c1d96f5bb5bcb96566fdb73756d035879ddd746550fe048c5a0552b14436bbb9a69789cf5f1d4f8414d
diff --git a/sys-fs/loop-aes/loop-aes-3.7s.ebuild b/sys-fs/loop-aes/loop-aes-3.7s.ebuild
new file mode 100644
index 000000000000..6879462d4158
--- /dev/null
+++ b/sys-fs/loop-aes/loop-aes-3.7s.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+MY_P="${PN/aes/AES}-v${PV}"
+
+DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
+HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
+SRC_URI="http://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
+
+DEPEND="app-crypt/loop-aes-losetup"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	CONFIG_CHECK="!BLK_DEV_LOOP"
+	MODULE_NAMES="loop(block::tmp-d-kbuild)"
+	BUILD_TARGETS="all"
+
+	BUILD_PARAMS=" \
+		V=1 \
+		LINUX_SOURCE=\"${KERNEL_DIR}\" \
+		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
+		USE_KBUILD=y MODINST=n RUNDM=n"
+	use cpu_flags_x86_aes && BUILD_PARAMS+=" INTELAES=y"
+	use keyscrub && BUILD_PARAMS+=" KEYSCRUB=y"
+	use cpu_flags_x86_padlock && BUILD_PARAMS+=" PADLOCK=y"
+
+	if use extra-ciphers; then
+		MODULE_NAMES="${MODULE_NAMES}
+			loop_blowfish(block::tmp-d-kbuild)
+			loop_serpent(block::tmp-d-kbuild)
+			loop_twofish(block::tmp-d-kbuild)"
+		BUILD_PARAMS+=" EXTRA_CIPHERS=y"
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README
+	dobin loop-aes-keygen
+	doman loop-aes-keygen.1
+
+	into /
+	dosbin build-initrd.sh
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo
+	einfo "For more instructions take a look at examples in README at:"
+	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
+	einfo
+	einfo "If you have a newer Intel processor (i5, i7), and you use AES"
+	einfo "you may want to consider using the aes-ni use flag. It will"
+	einfo "use your processors native AES instructions giving quite a speed"
+	einfo "increase."
+	einfo
+}
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 259fa3c0b01e..a7cd1dfa5462 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,6 +1,7 @@
 AUX lxcfs-4.0.0.confd 221 BLAKE2B 18924acc45506885e0f1795ffd4dd666d341abc2957c22a241909004ea988f1464b817939b450741bc77e413fb37d2e2dcd8f85405ab69f27d475567f48df2db SHA512 ebccfce0f865c8dbc1cff67712be4ac625b91ccc42aa78971c6619cf32553abe15ae82c6b3f320600cf3605f8b8c7ccbbcac3a399c6ae8261a08ea2793992e58
 AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061decfdf327a24cb1360dd08184d8cdc3936db26b6a50c47748f146414a1ae1ab61f963a9c7740c0ec3919 SHA512 755356e2a4f1e92803d8864c4edc223c183c81592562d6492d4b374174d4e5ca2d30fcdeb9861c46df795e6373ecf5f14c089c7ad22465d02516748c2c18aed7
 AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf
-DIST lxcfs-4.0.5.tar.gz 101842 BLAKE2B c916473e1b7ad42b8f69026a16810941c999d44ffcf1d456cb301411965f05e626338a5bde1e38fe99acd05f72bbcd5acbdcb2f65fa5ec183c967babcb8c70fd SHA512 5c44aa7f43071a4316cc8702928fde2c928bd5654c9ab4d540152839db0d7dd235a861f263da56f02611941d46d22eee98e0cdd52aeaeda99f3c79c754d420a1
-EBUILD lxcfs-4.0.5.ebuild 1129 BLAKE2B e70fa396777b48492042ade549ea7bf145872a81884ec992125e8fc69556f5ae19c4e30a7dc81b3559d6ba21ac9317ff73860b7e61440afe915010b5e3d56122 SHA512 61c3c09410a3e9f173847c3a6050fb589931fa7db15e9142b9d1fb71c9ca6fcb4d5732f4dd4c73f3229768175b920acfbfe21ac01edbe5578e2692191de828bd
+DIST lxcfs-4.0.6.tar.gz 451636 BLAKE2B 97de1825c4a91f4107dbee513246ff48a04956adce7a262a9744730067ac9c31fb6c7802757912640e58eb93504e12338e572acacf3ad300c1253eb517583226 SHA512 843ca196304efc963549c0e081bea4d58182887611da36232e875de4898d738111a967d89b4b49a9df51f25daf119ad2d488b8298cdef82926be03a7fa99a8a2
+DIST lxcfs-4.0.6.tar.gz.asc 833 BLAKE2B c5700c962a608fabc1a7ae4cd708c590a26dfebb72ea9c3db81500bb4e936e7f7358fbfb2c2a0e9531ffceb266d719bb3f6415f4d018ac1ba87b7b7ebddd21bf SHA512 ceffb3dfe3b2751b944be08df84dc30c465b8cde12e16d37e54ce616e5f2032f287a475ca280da51bc4fc518904e64ea7f4681dd6070e63ebd7ecba8b09600e5
+EBUILD lxcfs-4.0.6.ebuild 1363 BLAKE2B 82731f3940188d78b8503c3b050bedfd06d4c24f6742cd80c006487aeb481bde50b7b444bfef7b1860967da759840088977b2cc2b3cb20b3306f541d81698fba SHA512 a7effe7aec113adf8c48b4bbec38fb0e81a7f5568f6bbf84886ca7a7946648f6a5b427df2d3f567fb6d16ded5fc09ccc89698354db8c99abe0086189059a5a0a
 MISC metadata.xml 709 BLAKE2B 7c053869dc93fb8eea0b63604fa137736820ff1e2b8e6ee7d500ffd2a46ab381dc1321f2df0268d8f34eef10935f98959089b9f983c112b6809880b27f93eeb6 SHA512 bba720236a7d3fb0c4e71f624575c14a79abacea4441d672a151a3fe16c220fde0c03fa4bbdb2f7d0171920ccb787e1357a0c7aaa54bea4244e8e6771423f19c
diff --git a/sys-fs/lxcfs/lxcfs-4.0.5.ebuild b/sys-fs/lxcfs/lxcfs-4.0.6.ebuild
index 8c7b1f79d64f..2ac14261e39b 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.5.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.6.ebuild
@@ -3,24 +3,28 @@
 
 EAPI=7
 
-inherit autotools systemd
+inherit autotools systemd verify-sig
 
 DESCRIPTION="FUSE filesystem for LXC"
 HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
-SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
+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:0"
+	sys-fs/fuse:3"
 DEPEND="${RDEPEND}"
-BDEPEND="sys-apps/help2man"
+BDEPEND="sys-apps/help2man
+	verify-sig? ( app-crypt/openpgp-keys-linuxcontainers )"
 
 RESTRICT="test"
 
-S="${WORKDIR}/${PN}-${P}"
+#S="${WORKDIR}/${PN}-${P}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/linuxcontainers.asc
 
 src_prepare() {
 	default
@@ -46,6 +50,6 @@ src_install() {
 	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
 
 	# Provide our own service file (copy of upstream) due to paths being different from upstream,
-	# 728470
+	# #728470
 	systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service
 }
diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index d1b6e4737382..db7a0cd33c0e 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -2,7 +2,9 @@ AUX mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch 1874 BLAKE2B f1ed2
 DIST mergerfs-2.28.3.tar.gz 294065 BLAKE2B 2e59e00726aec53438d5a5df143ca204069794d68c663a130139102a19e118a54fede1c8eca99199a3e634ffa92cb21c25c30718ea0842826de8a64e876b2819 SHA512 5469b3515464680aa72fc393c218fb038bed31194a933e6736eec478d87a110979323308b642d7f100a5c506534ca75badf4a87a050007cdc77cd2a641217929
 DIST mergerfs-2.29.0.tar.gz 302391 BLAKE2B a7d051c63b12a95af2868d8b3be9b32aa1be3d9c4cc4e359914b07e18ed30dadece80861ad559d5cdd85b375f565b9e70dac9ad3e34b98c054dd54822897c1a6 SHA512 2c21dedffc2f261c6c8427af59cffcacacc9b67bce7bb9989bd5946aa645c68bac0f56250ec19710e586a00892f7198853390bea3ff5981035d5a492ae4569a2
 DIST mergerfs-2.30.0.tar.gz 316560 BLAKE2B 7e6be39cfa5f085aabbc928e1da9c0bf1f6442be1de4ccef1868832c852d138901071129cf7feff19b13dd5939c5fff56520c5292473b92c71a85430818ab25c SHA512 6914c5efa783d66293ebcce0a6a493267eedfa45ac058cd24b2024aea15a866b997f4474363e4ababa4af59d302466c5f8c6b9f07ee42f7661b335d4701315b4
+DIST mergerfs-2.31.0.tar.gz 314286 BLAKE2B 595dd05e7bd4e6b2fbc2b1901a0d752710c6efea9957c400b394594e5586607a88899bf9966a9406ca0a57e0059af214ce30b06d87db5871aa42b5443a872cdb SHA512 c4504a8f585ffc7f58b11df441755db821611d9754a630ec211aaf611657df82c72120737ba2a2480e1ebebcb0af05adef2e4b8c463b97f4fd98ab5630890253
 EBUILD mergerfs-2.28.3-r1.ebuild 1050 BLAKE2B 8b5ea7c3cdb6751b706c1a1f7917f3f6cd1d5bfd08848a711f99b32e1fb5ef594ed22488562a33f6c22bf42144b881fa97389b6f28420e9ed35337f4d1327b3e SHA512 79ce0ba08e48defd5d704be474c2be7fbe2588bdc343f921a71ce9f0b2c94483b141b6ec4f9322c4400bb3d03397166094e2d293f28741e930234bae250edb1b
 EBUILD mergerfs-2.29.0.ebuild 963 BLAKE2B 2df7a15e80299d35e0931db932b3af8d74d452e70eae97382fa28a75ac13cec48b62ef1bcfdacfb82fc04d4d3ef7bc3b148da806a6af1120c5ce73e60ab46a54 SHA512 226502ebd8e52f109039c7a3e6ccfd283f5212c1aa29f9b074eeeb4e81a001a004edc355bb7eb3d42e923990fcd260cc5ca9c7b992a2ffebf799f556d8dc0891
-EBUILD mergerfs-2.30.0.ebuild 1151 BLAKE2B 5232e20f48f6b79f9e5547d97af84930ece5608d808a0dbfe87eab956f6730643ddc59fd05e2e95f016f5ba1905f5fccc33a49c4176312636daa431a2ce42d98 SHA512 adf4b53a9189ceb371903304ed63bd3eca6938da757897159450b6e3f7fa4252ef5ecd2b420f195bc401bd8f62795db05c509235b19840db6f83ea79f6c207a6
+EBUILD mergerfs-2.30.0.ebuild 1149 BLAKE2B 2e935754ebac73c65dda54dfe817b00dbff4a2821928572850b59b21f29fd38260538f933325671f4c129005819c21d436aa1da0a0ea6c0dd3e1715cc8b36a86 SHA512 bc919fd0d49a2012bff05ab237728c4126a2fee4b0a3e4a711a0030671cf3322f18231bfd2664cc78ac840febf0b12d8678d55e96152970d9cd56030981aa0e0
+EBUILD mergerfs-2.31.0.ebuild 1065 BLAKE2B 67bed9a9fd98e4c0a92461a2300c6f7a723f8499e259f83a842ac8f06958e12a4166e19cb6cc6ea88d51d6bececd6e7a7333a444b0fbba3f029afe6b79e5b595 SHA512 a025cd4e920208b5aea87fa2b37d1d710769ad325162654f07797308a1c6d1c7d425bf9e72615c9d10042905cf320919bae0b94abd905b0bb7ed4273d44ed15c
 MISC metadata.xml 334 BLAKE2B e0f154866ccf08a8534567e5848aa41a0413a31cbd0fc92af2b873e77da2b007c222ab7431a81513e12f3cacd5e8bf8deb8a426e4cee2a64c8d02d0d9b56e4c2 SHA512 8b30ddda63065e140e02f4d3e79d933f46fd9460d2acc5b70e453f82eb6b5c204c810aa0019d183b256fcbde18239efbf01fccc40c5a1ddb632183418a596496
diff --git a/sys-fs/mergerfs/mergerfs-2.30.0.ebuild b/sys-fs/mergerfs/mergerfs-2.30.0.ebuild
index e18bed548895..09f2db8f49bb 100644
--- a/sys-fs/mergerfs/mergerfs-2.30.0.ebuild
+++ b/sys-fs/mergerfs/mergerfs-2.30.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="A featureful union filesystem"
 HOMEPAGE="https://github.com/trapexit/mergerfs"
 
 SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 # Vendorized libfuse that's bundled is under LGPL-2.1.
 LICENSE="ISC LGPL-2.1"
diff --git a/sys-fs/mergerfs/mergerfs-2.31.0.ebuild b/sys-fs/mergerfs/mergerfs-2.31.0.ebuild
new file mode 100644
index 000000000000..5d1e3ec0e4cf
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.31.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A featureful union filesystem"
+HOMEPAGE="https://github.com/trapexit/mergerfs"
+
+SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+# Vendorized libfuse that's bundled is under LGPL-2.1.
+LICENSE="ISC LGPL-2.1"
+SLOT="0"
+IUSE="+xattr"
+
+DEPEND="
+	xattr? ( sys-apps/attr )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="sys-devel/gettext"
+
+src_prepare() {
+	default
+
+	# Hand made build system at it's finest.
+	echo -e "#!/bin/sh\ntrue" >tools/update-version || die
+	echo "#pragma once" >src/version.hpp || die
+	echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die
+
+	if ! use xattr; then
+		sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die
+	fi
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/725978
+	tc-export AR
+
+	default
+}
+
+src_install() {
+	dobin build/mergerfs
+	dosym mergerfs /usr/bin/mount.mergerfs
+	dodoc README.md
+	doman man/mergerfs.1
+}
diff --git a/sys-fs/mhddfs/Manifest b/sys-fs/mhddfs/Manifest
index b5710beb1180..4da3db5b6a22 100644
--- a/sys-fs/mhddfs/Manifest
+++ b/sys-fs/mhddfs/Manifest
@@ -1,6 +1,6 @@
-AUX mhddfs-0.1.39-segfault-fix.patch 4711 BLAKE2B fc75c9e1fa8f3844feeb9d301a48aef977feeee14aadf8763c0abf9817b1a37e80c4421a9cd1b5be8f4ac9b3ed24c8cf563d1fd6d08cd70552b89ded7fb1b9d4 SHA512 4a2242c1d6344d651288c5f6c1c714d98d707b5d6b9c839f5100fd4b3476b74d681fb6502b6559959665470dfc7b00954a0781eedc461a96e972c8df1632a1fd
+AUX mhddfs-0.1.39-segfault-fix.patch 4237 BLAKE2B e97dcb4ee22cdf4a35aa74dd20daadfaa2428686950755131e4e7e09eccd3f5250f0d5c3da6232dfaf4c40a32f9b6f41d2005b3cafbe2456a74a06a0a7584ca4 SHA512 9fc611ba5771b04b8573db8b25556e15b2e37a1310c533f2b7a56323e887477c57820f62088100bed2784c14a6ffee3a0dfc2b8f88fa3c234d2a82f670eb07d2
 AUX mhddfs-0.1.39-xattr.patch 498 BLAKE2B e0a1a72c2883135956f885e974473fb3df10f4e1eb5e4781badde84d1545f4e2943583a62f3f93c68036aab83510d78970ead98ad45f24da1ac95620da4863c0 SHA512 5d2ffffea05499fbcacbae1d7b9062dd4bdbe7d0ee30b2e5ca30fcfc3e5a3de81a7664b09fe847b34f7e8016c7038b40a49a6f008fc8ea5bb377a0581c3d6bb7
-AUX mhddfs-respect-compiler-vars.patch 1556 BLAKE2B f032b6de368aa8c51ea743aa00a2561bc2bd29a652a4c6b34a2ce072345f2ada14995599ee5185a6ff5d06a0ca5dae2da33aa17199e2d6307ef3ff1ac8feb147 SHA512 91035e5474f333545236330ce46ee80e2c3cfed679d68588e22e9db64cb6d4af5c0019ea32972cc347e4b9f73300334f97828fae4b13c2e4de0e2b5f734246e5
+AUX mhddfs-respect-compiler-vars.patch 1614 BLAKE2B 281bf8643662f1b36cd33e4aa16de3d40a647e8feff7cca221a603f6dd726faa3098eb93097152735ef6389a4bf47d2e4fa6b6a824774641cb2e9e582e430bba SHA512 3c20a81010acc24c7ca1413adba5544c7d77c562861d9b33cb8423b4218f1a019d119996b62830add002e20fd9a618814b7338ca54a912ac35cb2cabd977c9e7
 DIST mhddfs_0.1.39.tar.gz 40665 BLAKE2B 5f7fa51d606985085fdb6346af5fdc6526d6f236b93a4deaad8143ac870cc3e85b5a6d9c94150567e2b34fd8ab0edaf4e0dfbf9c1cfc503f29386998bf84ed2d SHA512 cf1952e665e82a92ccfef9215d4faf78cd235566b67e6ebc3a60ab53089d9391bc41a08e6b203ad052e4a08bdd14428f2d9abe48f341aeb0c80ae1da80f83f89
 EBUILD mhddfs-0.1.39-r2.ebuild 1090 BLAKE2B e5e58d3e5ff317297ad83a765dbaa93ec137f21588f04615bb90d86ed9238fc154f5d853a31b6c8ae494653b9eeba80130a0109c172e90a983c3b92b7fd600f6 SHA512 e49f2d9dade5f202e3b9dc5a832811bb0e2be09ea8778da779a2773fb59fd7c310394696f8e6da55ceec5a9285d9d3177452052fd49f6858ecccee79f7d92d7b
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch b/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch
index 493a78396190..74132c158dc0 100644
--- a/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch
+++ b/sys-fs/mhddfs/files/mhddfs-0.1.39-segfault-fix.patch
@@ -178,23 +178,6 @@ Thanks to Gabor Kovari <gabor.kovari@gmail.com>
  		" mhddfs dir1,dir2.. mountpoint [ -o OPTIONS ]\n"
 --- a/Makefile	2016-01-05 16:45:10.184105001 +0100
 +++ b/Makefile	2015-12-21 16:32:29.000000000 +0100
-@@ -22,13 +22,13 @@
- 
- TARGET	=	mhddfs
- 
--CFLAGS	+=	-Wall $(shell pkg-config fuse --cflags) \
--			-DFUSE_USE_VERSION=26 -MMD
-+CFLAGS	=	-Wall $(shell pkg-config fuse glib-2.0 --cflags) \
-+			-DFUSE_USE_VERSION=26 -MMD -g -rdynamic -O0
- ifdef WITHOUT_XATTR
- CFLAGS	+=	-DWITHOUT_XATTR
- endif
- 
--LIBS		=	$(shell pkg-config fuse --libs)
-+LDFLAGS	=	$(shell pkg-config fuse glib-2.0 --libs)
- 
- FORTAR	=	src COPYING LICENSE README Makefile \
- 		README.ru.UTF-8 ChangeLog mhddfs.1 \
 @@ -53,7 +53,7 @@
  ifeq ($(DEBVERSION), $(VERSION))
  all: $(TARGET)
diff --git a/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch b/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch
index 0c6f24f4d1a7..278c9876da73 100644
--- a/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch
+++ b/sys-fs/mhddfs/files/mhddfs-respect-compiler-vars.patch
@@ -5,14 +5,15 @@
  TARGET	=	mhddfs
  
 -CFLAGS	=	-Wall $(shell pkg-config fuse --cflags) \
-+CFLAGS	+=	-Wall $(shell pkg-config fuse --cflags) \
- 			-DFUSE_USE_VERSION=26 -MMD
+-			-DFUSE_USE_VERSION=26 -MMD
++CFLAGS	+=	-Wall $(shell pkg-config fuse glib-2.0 --cflags) \
++			-DFUSE_USE_VERSION=26 -MMD -rdynamic
  ifdef WITHOUT_XATTR
  CFLAGS	+=	-DWITHOUT_XATTR
  endif
  
 -LDFLAGS	=	$(shell pkg-config fuse --libs)
-+LIBS		=	$(shell pkg-config fuse --libs)
++LIBS	=	$(shell pkg-config fuse glib-2.0 --libs)
  
  FORTAR	=	src COPYING LICENSE README Makefile \
  		README.ru.UTF-8 ChangeLog mhddfs.1 \
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 67c60ed19346..80e33c8123a8 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -4,5 +4,5 @@ DIST mtd-utils-2.0.2.tar.gz 355964 BLAKE2B 9a795ddac1287c7c44f52215faa4b6295cf5a
 DIST mtd-utils-2.1.2.tar.gz 380333 BLAKE2B 46cccf9cbe870f3415237deaa00a3ff57fbaacc019d4adc69e1ed516e752e58776ed5f53be0d46baef69dff8a0d90e1df5ca32a80ecbb620dd4bb0231f8c94dd SHA512 bd2d61d81f367a1d9f5345fa3985f5403e37fad1c1f811e2ab291b64339170514aa1fbceb89b78ba7a357f8cc3d7ade99796e9318c9624a40e2266fa0b3a9921
 EBUILD mtd-utils-1.5.2.ebuild 1577 BLAKE2B b180c7b895a621d8ee4078b5ab94ed92d3d41b0c88f47898fa8f0ecc42b85b446e7c92537d9417e03675f45925344c37af0cbc1be98e5116cda0ed7076e4bd5e SHA512 19af1ceda473ad24fc128c2f6704d9d33b630dc63aa4975b03cd5139978d55669210617597f2128d4fd192908428dcddadde2900749bf8db76408e4239ba5216
 EBUILD mtd-utils-2.0.2.ebuild 1334 BLAKE2B 5ba40d20c85da672c1c066bbae5b9ab2396aec08c97dd6688a08886c70f393c7004ca879860d3d9ce499db9835ae8305e38e75427a7bfc3d0c24451c2387241c SHA512 7d8e5bafe51f74121c167261c43023bc889baab53ba60e8c69cac792a0b9ca5011e8082d4d2bb59d0ef8b803fd9154e706301e05586b4760a1f730f34bcaef21
-EBUILD mtd-utils-2.1.2.ebuild 930 BLAKE2B 61c5deda559cde6f608d2d8370b8006391e52c8dde7107a0bf7cdb382100b2e7c9bfc09e6ef5b970c1d6a25973a69cd0e3ea2d973255bc0faab177ddcb285875 SHA512 1207a33fe6ed1c706d80732a925efaac891c71e5bc97f9c1c3342286c7444e3e2302f26e4b42f7f045d73538cd894d451ae7a75abaa7fdb0c398aebe0a9cc2ec
+EBUILD mtd-utils-2.1.2.ebuild 937 BLAKE2B e141ed661b76f446d363103893685ad88cb940f702929ecfd438a3de2ba6bae6ef339abc4d260b2b81937ddd76233cdab51b0d3a783c8e2ee3ceda976f79db0d SHA512 dd6a9fd6d4dc454cb82020c1bd5bb498c204be3669ca18536901d0b499c16471d9f8da75a0612fc6e0380b8acc5188b2edc471f14243119bf13def14b2b9a72e
 MISC metadata.xml 416 BLAKE2B 88cdc71a56448e05d3d8bba7b5bb031b043d7b798ad40a04d7ab416b5148fc9c27501366991d26a51f44186953fa6eb3a1214cc8d0872f6e3cd39861c532a672 SHA512 e75a4504c7558e19937f8f608a852905853f8efc2aef32ca3c383517fce86673aa3647a6ed5305d105f16be2c6a0f9667bb8326a9453050810b29b8f72fdc7ac
diff --git a/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild b/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
index 9e4be5334a33..297168afea61 100644
--- a/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
+++ b/sys-fs/mtd-utils/mtd-utils-2.1.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/sigma-star/mtd-utils/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="+lzo xattr +zstd"
 
 DEPEND="!sys-fs/mtd
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 631cb48d36db..db655eac52c7 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,10 +1,5 @@
-AUX mtools-4.0.18-attr.patch 1804 BLAKE2B dee4d21870fd9f633ef8966513960b74a1fdaf61b23e38e10b77a6ccb5240ca31cf985f56becd05f1880b5389b77476a432937e00dc04b0d9478b6d85df73f60 SHA512 45bc3d5baa37c634b8f97d55251a7dec2f7062515529c0dec65572826ff2d7673f189c544fa73d164156823cd3ae78bcb664b3fb22e5eac34198fdfe45c9e244
-AUX mtools-4.0.18-locking.patch 5744 BLAKE2B 509462f40e2a832d1a04358972d606d29d6a0b5d7d095438d1c17bb8b7636aac382f9bb0055e669aed661a89bd6e018f1d88a588f0bddf701e5c0eb88449f94e SHA512 0698b5c5f5d4c22f3439a835c3bb6f73a90c3030073f3497fa04a8e29241af867f664f253b37299d69ca043858b55e7290aaab1fa6f751084a52e7812cae4170
-AUX mtools-4.0.18-memset.patch 877 BLAKE2B 5a331eb50cca56c64c135974b56bcc651e6f7498740cad8dc4c5121efe23802a228bb73e5f18ee20b0e3ef81ea6ebd78cc19e037556f0294519b54a84697f993 SHA512 1e8d697c1cd98a7fedaed96e6019b6af96bf5ed6633f50f7c45649555a27727d93ba828e2852f23fb633832902bdb93c23afacd7022c72adf5c4a146f5b8a1a8
-DIST mtools-4.0.18.tar.bz2 420190 BLAKE2B 92fdf8b054287e3cb4eddb40c98f5ac4229a38473b633c25ab74a07a8a72d38c2767ae648a35cf0dac9dedfa2f7789afc4904a50e1328e2baa0a289d93b094fb SHA512 3981a4727aa4e2ec5c931201b236f52fcd1c9d55f888cb2fbdc5c4172402e2b229ede9a5005b972ffdad59bcb861e2fcc01404845e521116419079ae78239090
-DIST mtools-4.0.23.tar.bz2 418592 BLAKE2B 442f552087a5d53ef0ead6161cdad7997dc45a3e210c2cb442a8b2ba42866152f93e4a1f5b58df8d68316168374ea034b390bcf4c607ac3a1c477c4ec5e7842c SHA512 c8c48adedc3f3e4eeafead27ce80172c9cb9690b575618842001ed16aa0011dcd2bc517882ea4bf01a73810ba151aa4b86f8ce2f97d6e8a0177d09be71a6d1ed
 DIST mtools-4.0.24.tar.bz2 418178 BLAKE2B 96ccbde0e5ed5e304c73c7faaeb495751c43ae37970e5c2329299e0f7bf90f3a810f4ca95faea10a00e5af110be579a3b083043314e980bb0128226caffb5608 SHA512 b74becc4f696315cfabc016d1746e744b43e366de73bf1bffeec4fbab1e4815967594de8acb4af01f89d36a925f93672efbac205b89540161bd53ab7edebcf04
-EBUILD mtools-4.0.18-r2.ebuild 1440 BLAKE2B db5974fd44a2d94c73ff4a255f58b06daba7fd25479ed48357d06e5bf8592bebc6d7ab6add898b1537e500ef1b1531658525cf29d8a0cbe8f7476c0bed769faa SHA512 074e1aad4fba2b1533f8abf7bce994fb34004838f7be900abd81bf0574a278584ec3fc5e53357044a5f92a241eacd55d9b1b97b0efabde4b721a9b7f082387e2
-EBUILD mtools-4.0.23.ebuild 1171 BLAKE2B 7b5603db7542d25f187158aae1bc5cc798368ca25059e4bbf5a3dd7217b049f47bae48de397d4a675a2f2128ec311a582cccb8cff0596ded00a637cd5da4a9e7 SHA512 632df381993fc2622ac64ab296c6d0b5249ec3f1e02a4c2db91f5157524b74265f1f1254d88a6398c49d9eec8f2f597bb447d4e0a40f7d408a792ecdf4ab4354
+DIST mtools-4.0.25.tar.bz2 421807 BLAKE2B 54b0de421d5de003c6dff9a524af2a37d7fe0fb88361e195b000b8c8637ed894ec01ca295ea71ed0df781e9503d609f5e21b987a79c7e9d2c2e0c7176d5eb825 SHA512 91b879de6b41bf9fd6d9282d846e21fe58dbcd3461d97d2d6cae752a309a5129091a0e6ffda5b28ef062c33970a1c0a43ff1cf19106232866bdbdb762c64a143
 EBUILD mtools-4.0.24.ebuild 1045 BLAKE2B 2861833d297fdaf906239a2a52a5c922e0a195116ae73548c6d47212faa682b7b12f7bd20b68a167d86ecebfd2f6561236ff53bffcf093686bbf7c2c1893d6fa SHA512 dcb73024498715f8173c65076fa02a78873d01f22849fa568a6757384fc93e47981f1c95125a56646612f7dc4af39b4995ba0ef1ef41467f51eb60a99ee2b030
+EBUILD mtools-4.0.25.ebuild 1051 BLAKE2B 8bace5704234712bffd3c88ffce51534a6a141caa283501cf6599a96d0e6b99ae7bc40543ea064bb8385900e4bb6623c0005b8bde0b9a3beec510bd9cbbd8f01 SHA512 4ed910c39dd8683b28a2238e46bf015329a36f516761c486f9dfc987c919e8e3780270de173885b97eb9455232639d5dc1d83da5a24bfcffdeedb2bc637700c4
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/files/mtools-4.0.18-attr.patch b/sys-fs/mtools/files/mtools-4.0.18-attr.patch
deleted file mode 100644
index 3cd770be8bde..000000000000
--- a/sys-fs/mtools/files/mtools-4.0.18-attr.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From e8437f906ca86fd5b1cac20d240a0e114c5df7a9 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 9 Mar 2017 16:06:54 -0800
-Subject: [PATCH] fix unused attribute in func definition
-
-UNUSED is for wrapping variable decls, not for variables in a function
-definition.  It will insert a semi-colon into the mix which makes clang
-upset:
-x86_64-cros-linux-gnu-clang  -DHAVE_CONFIG_H -DSYSCONFDIR=\"/etc/mtools\" \
-	-DCPU_x86_64 -DVENDOR_cros -DOS_linux_gnu -O2 -pipe -O2 -pipe \
-	-march=x86-64 -msse3 -g -fno-exceptions -fno-unwind-tables \
-	-fno-asynchronous-unwind-tables  -clang-syntax -Wall \
-	-fno-strict-aliasing -I.  -I.  -c mainloop.c
-mainloop.c:89:15: error: expected ')'
-int unix_loop(UNUSED(Stream_t *Stream), MainParam_t *mp, char *arg,
-              ^
-./sysincludes.h:106:47: note: expanded from macro 'UNUSED'
-                                              ^
-
-Arguably this should fail on gcc too, but it doesn't today.
-
-URL: https://crbug.com/644387
----
- mainloop.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/mainloop.c b/mainloop.c
-index f5f8349f1472..69af9a80c3e4 100644
---- a/mainloop.c
-+++ b/mainloop.c
-@@ -86,7 +86,7 @@ static const char *fix_mcwd(char *ans)
- }
- 
- int unix_dir_loop(Stream_t *Stream, MainParam_t *mp); 
--int unix_loop(UNUSED(Stream_t *Stream), MainParam_t *mp, char *arg,
-+int unix_loop(Stream_t *Stream UNUSEDP, MainParam_t *mp, char *arg,
- 	      int follow_dir_link);
- 
- static int _unix_loop(Stream_t *Dir, MainParam_t *mp,
-@@ -95,7 +95,7 @@ static int _unix_loop(Stream_t *Dir, MainParam_t *mp,
- 	return unix_dir_loop(Dir, mp);
- }
- 
--int unix_loop(UNUSED(Stream_t *Stream), MainParam_t *mp,
-+int unix_loop(Stream_t *Stream UNUSEDP, MainParam_t *mp,
- 	      char *arg, int follow_dir_link)
- {
- 	int ret;
--- 
-2.12.0
-
diff --git a/sys-fs/mtools/files/mtools-4.0.18-locking.patch b/sys-fs/mtools/files/mtools-4.0.18-locking.patch
deleted file mode 100644
index 3b53c73c645c..000000000000
--- a/sys-fs/mtools/files/mtools-4.0.18-locking.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-https://crbug.com/508713
-https://lists.gnu.org/archive/html/info-mtools/2016-11/msg00000.html
-
-From 04df65ed797e47da5b423c7f9aec99d82dfde400 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@chromium.org>
-Date: Wed, 7 Sep 2016 12:33:42 -0400
-Subject: [PATCH] add support for retrying device locking
-
-When running syslinux's install phase, it will run a bunch of mtools
-commands in quick succession.  If you're on a fast enough machine, it
-can often fail with errors like:
-plain floppy: device "/proc/2908/fd/3" busy (Resource temporarily unavailable):
-Cannot initialize 'S:'
-Bad target s:/ldlinux.sys
-syslinux: failed to create ldlinux.sys
-
-The issue is that after some of the mtools calls, the kernel notices
-that the fs image has changed, so it notifies userspace.  This wakes
-up udev which grabs a lock on the device to rescan it for changes
-(e.g. updated fs metadata like UUID).  The udev phase does not finish
-before syslinux fires off another mtools call which means mtools now
-fails with a locking error.
-
-You can recreate this with a simple test:
-- loop mount a fat fs image
-- open the loop device for writing
-- generate a mtools.conf pointing the file to /proc/$pid/fd/$fd
-- run mattrib && mcopy
-- see udev open/lock the loop device after mattrib runs to probe it
-- see mcopy fail because udev is still holding the lock
-
-To fix things, we teach mtools to retry its locking calls temporarily.
-If it still fails after a timeout, we abort like normal.  We also make
-this behavior configurable by adding a new global timeout option.
----
- config.c      |  2 ++
- mtools.h      |  1 +
- mtools.texi   |  7 +++++++
- mtools.tmpl.5 |  4 ++++
- plain_io.c    | 10 ++++++++++
- xdf_io.c      | 11 +++++++++++
- 6 files changed, 35 insertions(+)
-
-diff --git a/config.c b/config.c
-index f08688399d1d..ea4178452f6a 100644
---- a/config.c
-+++ b/config.c
-@@ -63,6 +63,7 @@ unsigned int mtools_no_vfat=0;
- unsigned int mtools_numeric_tail=1;
- unsigned int mtools_dotted_dir=0;
- unsigned int mtools_twenty_four_hour_clock=1;
-+unsigned int mtools_lock_timeout=30;
- unsigned int mtools_default_codepage=850;
- const char *mtools_date_string="yyyy-mm-dd";
- char *country_string=0;
-@@ -90,6 +91,7 @@ static switches_t global_switches[] = {
-       (caddr_t) &mtools_twenty_four_hour_clock, T_UINT },
-     { "MTOOLS_DATE_STRING",
-       (caddr_t) &mtools_date_string, T_STRING },
-+    { "MTOOLS_LOCK_TIMEOUT", (caddr_t) &mtools_lock_timeout, T_UINT },
-     { "DEFAULT_CODEPAGE", (caddr_t) &mtools_default_codepage, T_UINT }
- };
- 
-diff --git a/mtools.h b/mtools.h
-index ef98e942ee2c..fa8c1bdc8a1b 100644
---- a/mtools.h
-+++ b/mtools.h
-@@ -188,6 +188,7 @@ extern unsigned int mtools_ignore_short_case;
- extern unsigned int mtools_no_vfat;
- extern unsigned int mtools_numeric_tail;
- extern unsigned int mtools_dotted_dir;
-+extern unsigned int mtools_lock_timeout;
- extern unsigned int mtools_twenty_four_hour_clock;
- extern const char *mtools_date_string;
- extern unsigned int mtools_rate_0, mtools_rate_any;
-diff --git a/mtools.texi b/mtools.texi
-index 1085789c1cb6..1c7ad94d40f9 100644
---- a/mtools.texi
-+++ b/mtools.texi
-@@ -658,6 +658,10 @@ DOSEMU image files.
- @vindex MTOOLS_FAT_COMPATIBILITY
- @vindex MTOOLS_LOWER_CASE
- @vindex MTOOLS_NO_VFAT
-+@vindex MTOOLS_DOTTED_DIR
-+@vindex MTOOLS_NAME_NUMERIC_TAIL
-+@vindex MTOOLS_TWENTY_FOUR_HOUR_CLOCK
-+@vindex MTOOLS_LOCK_TIMEOUT
- @cindex FreeDOS
- 
- Global flags may be set to 1 or to 0.
-@@ -692,6 +696,9 @@ clash would have happened.
- @item MTOOLS_TWENTY_FOUR_HOUR_CLOCK
- If 1, uses the European notation for times (twenty four hour clock),
- else uses the UK/US notation (am/pm)
-+@item MTOOLS_LOCK_TIMEOUT
-+How long, in seconds, to wait for a locked device to become free.
-+Defaults to 30.
- @end table
- 
- Example:
-diff --git a/mtools.tmpl.5 b/mtools.tmpl.5
-index 565fdd7513aa..8cdaaf2ba929 100644
---- a/mtools.tmpl.5
-+++ b/mtools.tmpl.5
-@@ -106,6 +106,10 @@ clash would have happened.
- \&\fR\&\f(CWMTOOLS_TWENTY_FOUR_HOUR_CLOCK\fR\ 
- If 1, uses the European notation for times (twenty four hour clock),
- else uses the UK/US notation (am/pm)
-+.TP
-+\&\fR\&\f(CWMTOOLS_LOCK_TIMEOUT\fR\ 
-+How long, in seconds, to wait for a locked device to become free.
-+Defaults to 30.
- .PP
- Example:
- Inserting the following line into your configuration file instructs
-diff --git a/plain_io.c b/plain_io.c
-index c9d8418b8b4d..3dc035c9ce92 100644
---- a/plain_io.c
-+++ b/plain_io.c
-@@ -632,7 +632,17 @@ APIRET rc;
- #ifndef __CYGWIN__
- #ifndef OS_mingw32msvc
- 	/* lock the device on writes */
-+ retry:
- 	if (locked && lock_dev(This->fd, mode == O_RDWR, dev)) {
-+		/* retry the lock in case another system process (e.g. udev)
-+		 * has temporarily locked the device.  this happens when you
-+		 * run multiple mtools commands at once which triggers the
-+		 * system to lock/rescan/unlock. */
-+		static int retries = 0;
-+		if (errno == EAGAIN && retries++ < mtools_lock_timeout * 10) {
-+			usleep(100);
-+			goto retry;
-+		}
- 		if(errmsg)
- #ifdef HAVE_SNPRINTF
- 			snprintf(errmsg,199,
-diff --git a/xdf_io.c b/xdf_io.c
-index f0db3b3d9f38..8f64f6348f0c 100644
---- a/xdf_io.c
-+++ b/xdf_io.c
-@@ -638,7 +638,18 @@ Stream_t *XdfOpen(struct device *dev, char *name,
- 		goto exit_2;
- 
- 	/* lock the device on writes */
-+ retry:
- 	if (lock_dev(This->fd, mode == O_RDWR, dev)) {
-+		/* retry the lock in case another system process (e.g. udev)
-+		 * has temporarily locked the device.  this happens when you
-+		 * run multiple mtools commands at once which triggers the
-+		 * system to lock/rescan/unlock. */
-+		static int retries = 0;
-+		if (errno == EAGAIN && retries++ < mtools_lock_timeout * 10) {
-+			usleep(100);
-+			goto retry;
-+		}
-+
- #ifdef HAVE_SNPRINTF
- 		snprintf(errmsg,199,"xdf floppy: device \"%s\" busy:", 
- 			dev->name);
--- 
-2.9.0
-
diff --git a/sys-fs/mtools/files/mtools-4.0.18-memset.patch b/sys-fs/mtools/files/mtools-4.0.18-memset.patch
deleted file mode 100644
index cf8d724406df..000000000000
--- a/sys-fs/mtools/files/mtools-4.0.18-memset.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From bafeabbc474a98314e8cecf42c8339e1da21fea2 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Thu, 9 Mar 2017 16:23:19 -0800
-Subject: [PATCH] fix typo in scsi_cmd setup
-
-The memset call ends up referring to the function scsi_cmd and
-clearing its memory instead of the local my_scsi_cmd variable.
----
- scsi.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scsi.c b/scsi.c
-index 7510edcefe95..85ff3bc3dc55 100644
---- a/scsi.c
-+++ b/scsi.c
-@@ -170,7 +170,7 @@ int scsi_cmd(int fd, unsigned char *cdb, int cmdlen, scsi_io_mode_t mode,
- 	/*
- 	** Init the command
- 	*/
--	memset(&scsi_cmd,0,sizeof(scsi_cmd));
-+	memset(&my_scsi_cmd,0,sizeof(my_scsi_cmd));
- 	my_scsi_cmd.interface_id    = 'S';
- 	my_scsi_cmd.dxfer_direction = (mode == SCSI_IO_READ)?(SG_DXFER_FROM_DEV):(SG_DXFER_TO_DEV);
- 	my_scsi_cmd.cmd_len         = cmdlen;
--- 
-2.12.0
-
diff --git a/sys-fs/mtools/mtools-4.0.18-r2.ebuild b/sys-fs/mtools/mtools-4.0.18-r2.ebuild
deleted file mode 100644
index 92c1a95bfe13..000000000000
--- a/sys-fs/mtools/mtools-4.0.18-r2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit flag-o-matic eutils
-
-DESCRIPTION="utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
-IUSE="X elibc_glibc"
-
-RDEPEND="
-	!elibc_glibc? ( virtual/libiconv )
-	X? (
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}
-	sys-apps/texinfo"
-# texinfo is required because we patch mtools.texi
-# drop it when mtools-4.0.18-locking.patch is no longer applied
-
-src_prepare() {
-	# Don't throw errors on existing directories
-	sed -i -e "s:mkdir:mkdir -p:" mkinstalldirs || die
-
-	epatch "${FILESDIR}"/${P}-locking.patch # https://crbug.com/508713
-	epatch "${FILESDIR}"/${P}-attr.patch # https://crbug.com/644387
-	epatch "${FILESDIR}"/${P}-memset.patch
-}
-
-src_configure() {
-	# 447688
-	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
-	econf \
-		--sysconfdir="${EPREFIX}"/etc/mtools \
-		$(use_with X x)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc README* Release.notes
-
-	insinto /etc/mtools
-	doins mtools.conf
-	# default is fine
-	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
-}
diff --git a/sys-fs/mtools/mtools-4.0.23.ebuild b/sys-fs/mtools/mtools-4.0.25.ebuild
index 03496c70b5bc..a10154dee9ba 100644
--- a/sys-fs/mtools/mtools-4.0.23.ebuild
+++ b/sys-fs/mtools/mtools-4.0.25.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~sparc x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
 IUSE="X elibc_glibc"
 
 RDEPEND="
@@ -25,13 +25,6 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	default
-
-	# Don't throw errors on existing directories
-	sed -i -e "s:mkdir:mkdir -p:" mkinstalldirs || die
-}
-
 src_configure() {
 	# 447688
 	use !elibc_glibc && use !elibc_musl && append-libs "-liconv"
@@ -50,5 +43,5 @@ src_install() {
 	doins mtools.conf
 
 	# default is fine
-	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED%/}"/etc/mtools/mtools.conf || die
+	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
 }
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 3a276e93f00e..fd0bae229b15 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -4,10 +4,13 @@ AUX multipath-tools-0.8.3-json-c-0.14.patch 1125 BLAKE2B 70d5d1eb8b96e92f9bd2ec6
 AUX multipath-tools-0.8.3-no-gziped-docs.patch 6302 BLAKE2B 4d571d856d47cbb7cf6cf421a142fdb5d93fb891ae3c0c15abe8d74e6aeb35b02cbb70a80cede18f1dbd615581744f4144c0b03791aa6268c10e8bc08922bbeb SHA512 126245660ba589635437be32c7a7e72636e0bdcd72c177a6252b8e0c71e90426d12e78c10314d878d2e5a5b37b51db488c5fab8c1aae4f655650539ef1d1cd83
 AUX multipath-tools-0.8.4-parallel_make_fix.patch 3422 BLAKE2B 763460e1ee8d5df6a6b3ad0b742b3cf617e3f49f7001f7d951ee1f335a94aae773be40712bff26c8d83e380908a3a46bb26d6cf476e7ba6c9f6d33cd78539e13 SHA512 b68b196a3bc833d05d871b5e8d9abb93922a610b86c66f40db8defe446ca741415bb2ffb9083b45159700f5b1d82ba494efdf2407a26d2956e57428d38d5f59a
 AUX multipath-tools-0.8.4-respect-flags.patch 736 BLAKE2B 43530a05c438385a90e198631effe0c90a7789b2ad441260788529bd5b9e9c7f3f085ad396211cf0fbe6842d95cd5f59ad6e358d5f9d302c72449b673660df72 SHA512 f9e3596518011fb8b96323b52292978c46a06ce4c6b273469077507b68bbb25aff087e5b170f8def4621a635676a4fc82ea960e3359b73c5a5d23786903724ed
+AUX multipath-tools-0.8.5-respect-flags.patch 542 BLAKE2B b60dda770d8441bfd4026bb4b0dbcea6590e71b8d3da0d5645983a6e8e4ef5c00c0283682f9de335b029d3817786e6512c852ae411efe0cdd40416eb970f33e0 SHA512 89d9b9ec971a7afd5f80e19d9b8b691763c3f8a093e99a229a09307e44e5661b4952eed86e732279c0820f15b8f4c48b803823cf27830d03ca7213f9a7364c47
 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
 AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e
 DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
 DIST multipath-tools-0.8.4.tar.gz 480994 BLAKE2B be8368df049218e2eaa1749e7b1c7a930da15f0311ab549b1bbba9c019dcfe39f90a05fd621e0703301ef1d55c98ac8cc74231d82950d9066f19d8764421704b SHA512 720823188c053c1c50269a30e34a9d69099098495bfd607076bcfa2c079565e3f0580c91783f19d42ed82290c0db98e4e19ef620eca4ee5ec7885c49c72d2307
+DIST multipath-tools-0.8.5.tar.gz 494750 BLAKE2B a42d17a47631107433a1d0a9da69a0bb10d2125cb242d2125d67da18f6bc6231c9233b163dc1d07d88dcba9f912830c047fdee5b42435f59ea2976598a72fd75 SHA512 f62a09107ccb18ffab97139fe2dba3dc22450836d8669c4381a8bce4072672a027a3a1e687f33e374429bffa49b3ba4a54d1e52294044d7bc1f82ed5d5aaf760
 EBUILD multipath-tools-0.8.3-r2.ebuild 2214 BLAKE2B bf6650365f7fe7548f6643e5935752851bc8b89ce0e3276f90d74398e8e198ef9cea082136781f2e89fb1447bdcdc8830478757fc347597af62d5b366ecd87fe SHA512 e01fe5c6c6ecd49c09afb3f9920a15d70d487d11c9a06a3214cd10a91170f557f152a847b867756cc61534edb0f9d3d21f75966e60fa77ca5b7fa7419e26e50c
 EBUILD multipath-tools-0.8.4.ebuild 2214 BLAKE2B 90daeab97f15ecfe9ffae2158825dce22578cf0d77c6bc576ad55d643a88759083c4270c3923d587ce7aa78709f2d14957c16209c745273ef085011b39e4f0aa SHA512 c748accc0babbe40ab7e8c5950a12df281bdf47a700e62d9b24c4737d5df967fbf23e5ca3902cf13c2d86fe9c26b9be8f15d1ac4b5f8d829e6a50382d5615409
+EBUILD multipath-tools-0.8.5.ebuild 2118 BLAKE2B 5020335e17c20232ca0d64aa6d80c089a94ecd85b62fc64bc02269bdb178927c1753df4674d85fb737cfcfbb7a1a67f700f438de7713be9d003a5dda2ba3f684 SHA512 6d94404ecc15976d43852cef103ed209151b17d1e16c78d1fe37fa7e81c0aabec04ae10f19308286a1876bbf5dae9c8363966add61e484b10dad8b68050a49c3
 MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch b/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
new file mode 100644
index 000000000000..20d9fef6f3f1
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipath-tools-0.8.5-respect-flags.patch
@@ -0,0 +1,12 @@
+--- multipath-tools-0.8.5-eecfcba/Makefile.inc
++++ multipath-tools-0.8.5-eecfcba/Makefile.inc
+@@ -98,7 +98,8 @@
+ 		  -Werror=implicit-function-declaration -Werror=format-security \
+ 		  $(WNOCLOBBERED) -Werror=cast-qual $(ERROR_DISCARDED_QUALIFIERS)
+ CPPFLAGS	:= -Wp,-D_FORTIFY_SOURCE=2 
+-CFLAGS		:= --std=gnu99 $(CFLAGS) $(OPTFLAGS) $(WARNFLAGS) -pipe \
++CFLAGS		?= $(OPTFLAGS) $(WARNFLAGS) -pipe
++CFLAGS		+= --std=gnu99 \
+ 		   -DBIN_DIR=\"$(bindir)\" -DLIB_STRING=\"${LIB}\" -DRUN_DIR=\"${RUN}\" \
+ 		   -MMD -MP
+ BIN_CFLAGS	= -fPIE -DPIE
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
new file mode 100644
index 000000000000..cd850ca74aec
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+BDEPEND="virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/json-c:=
+	dev-libs/libaio
+	dev-libs/userspace-rcu:=
+	>=sys-fs/lvm2-2.02.45
+	>=virtual/libudev-232-r3
+	sys-libs/readline:0=
+	rbd? ( sys-cluster/ceph )
+	systemd? ( sys-apps/systemd )
+"
+
+DEPEND="${RDEPEND}"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.8.5-respect-flags.patch
+	"${FILESDIR}"/${PN}-0.8.3-no-gziped-docs.patch
+)
+
+get_systemd_pv() {
+	use systemd && \
+		$(tc-getPKG_CONFIG) --modversion systemd
+}
+
+src_prepare() {
+	default
+
+	# The upstream lacks any way to configure the build at present
+	# and ceph is a huge dependency, so we're using sed to make it
+	# optional until the upstream has a proper configure system
+	if ! use rbd ; then
+		sed \
+			-e "s/libcheckrbd.so/# libcheckrbd.so/" \
+			-e "s/-lrados//" \
+			-i libmultipath/checkers/Makefile \
+			|| die
+	fi
+}
+
+src_compile() {
+	# LIBDM_API_FLUSH involves grepping files in /usr/include,
+	# so force the test to go the way we want #411337.
+	emake \
+		CC="$(tc-getCC)" \
+		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man{3,5,8}
+	emake \
+		DESTDIR="${D}" \
+		RUN=run \
+		SYSTEMD=$(get_systemd_pv) \
+		unitdir="$(systemd_get_systemunitdir)" \
+		libudevdir='${prefix}'/"$(get_udevdir)" \
+		pkgconfdir='${prefix}'/usr/'${LIB}'/pkgconfig \
+		install
+
+	newinitd "${FILESDIR}"/multipathd-r1.rc multipathd
+	newinitd "${FILESDIR}"/multipath.rc multipath
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "If you need multipath on your system, you must"
+		elog "add 'multipath' into your boot runlevel!"
+	fi
+}
diff --git a/sys-fs/owfs/Manifest b/sys-fs/owfs/Manifest
deleted file mode 100644
index 63e7748b9996..000000000000
--- a/sys-fs/owfs/Manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-AUX owfs-3.1-vendordir.patch 891 BLAKE2B def69d7f29b56ccf59098aa5b64a6c32eec8d016a9a34253f075652989a595b9af735905ac06b31b9d50bf3c0aae9e11ceb37996ae9c298dab373425d675afec SHA512 d7131a4500419976ff2e153c44fbafc6164441e9fd5abff0bc4923cbcf672893c1c93d76ae6d1fda8cd7b808feaf4cfa9da201020622c8b45131f68d6ead478b
-AUX owfs-3.1p4-sysmacros.patch 2913 BLAKE2B aac58472efa26662501be198cc69fd30c1b9d62377a5b58798f6ec450d50dcbdee2dccb7d4e12d951686876a39b9aeade9f039f273084a1acef2540f3f254c60 SHA512 9a634156f9de9c65bf13ab2a4395be086318feb77d15210484e757ca578ca0010f976b217bf696c4d65ae5b42b65cbd26236942a506355b49bc105685ac804c8
-AUX owfs.confd 86 BLAKE2B bb8e9e43dff7d8438d47791f3df93a20a74d66f2cb409217fff315975330a6f14504745dacc1e3ee94d6e5cbbebc81b84173d6f6952bf4ad6a512c93f088bd61 SHA512 7c23bd956d2e22cc3952eefa52bd6b5b08c1b24561d5ac9cfc5222595d083ea64ba26dd0b4826e0fad3e2eb5774cc06a7bb6c7afd9c4c0726ce2b4b6df4dbdcd
-AUX owfs.initd-r1 825 BLAKE2B bc0b1a1b243ffe09a58a22c0f58b5b28b3593ff88c3b263fe90e75a91bf1f3f5105b5e8c026113afa1b8490639ccc12ef5cb22cf57d0e0aa23b920ce84c806e2 SHA512 26623ab81bc3a1788ac2c4a51114f643bb18595a61f88856f25193b4c3c3723e785414448503ec89bc6cf9e16ea782890d56a6df4604711fe7eee06cd6613dad
-AUX owftpd.confd 121 BLAKE2B a99ee232bcfeb9e010e3e34f2c165351bd3d62c8f5fc7e816c8d67c913fc5c3da4d0b8e82148ea1a597d26681e86d93797ea39265fea04879f481e13c8981b40 SHA512 7b8baba17d576139e3a9a9640e3c2006d9f847061aeff8a1e79b32ff116936421eccf8b545d64fe294acde4d483c170c728e80479f55e015ef030cf3ee06154a
-AUX owftpd.initd-r1 853 BLAKE2B 0145c61acaf1cdf80bbec5a378f33d58f51dc99909087e11120a00302e18cea9aee9e4e227996b4e84d0cbd291aefa28e20669a45195bcbd9e4a2099708db5d9 SHA512 0736b5100684247828bb793873cf1112b3b2a87c5a74a8f65b6b115699892325fb12f3016482ce4f42deceab8fb0f5251851738736f68fb417f0c277dea6369d
-AUX owhttpd.confd 89 BLAKE2B 72a355cd1418b7d3c34fe765ff82d298a18c517404e61bfb0a5928c904e10a3f10566846da9a25f0037043157773ed020e1d51354c34a5e8f4152edd6082b8da SHA512 07a128115a830145c609a35813ba325b9b1ff3c2ecbbcece1e728a78971e1e7c4cf654054611c303ca47fd39ccfcff4707133a04fa8d689d3606ca7ceabd5a4f
-AUX owhttpd.initd-r1 820 BLAKE2B 4122ce01036f63083286162f33d576e2a953e7bff7e215093959d126f04d7d0e3c8a422f2b28d0dabcc160ba992e2f787d049e17860c0bc821894aaf8a5b5859 SHA512 79c0307bcb4913f563ca69e4a699b91a4e7a2133882d150694f6738eb8000175a7f840b5de9f07496c166c95fe71bb94c31ea167f6389dc9c37e0d08e2943bc9
-AUX owserver.confd 108 BLAKE2B 3279ee61b42a9573472657e4297a7988668c081cd66d0f64d53cbd2eb27248abfebd6c368d77a5a3eb84ccd95b41ce65c2f03e3cb8ee1f095e4b776b60e3283a SHA512 c10fb23a60d89348c82f6f5ee6b0ba1c5d59e506dcdf484fa0c9c8c6ae07064cafc39517670b5edb474bcc1921efddfce2e5dd879f59f3bb3a1f80d6df3c0411
-AUX owserver.initd-r1 802 BLAKE2B 8273790945eb4df7b8aadf7d19ac3397152d225495dba7e5e8a472ad7420f2e9e97ba35ec5e7655e0e5b3c37ed97ac740dbda8d1ae030dc9b75ba2bbf1dbf391 SHA512 3c2d186df7c3d4549333f90a87c80a44dd8ed67b10bacdc08edce2b45db35bd0bc7f0956bdee8f03a388ae8a5bab039f7bb19e3bad007632608f945c7e54c649
-DIST owfs-3.2p2.tar.gz 1491195 BLAKE2B 3e56b954fc61e097d6e39345d689d3ba5386f2ed4383bb7755da6a867d802fe56b9e920fe9b4f24cdd639543bad79a6d13bd549e7ce81afb8eab52372864565a SHA512 d64078639ce4c1c5c42735c720cfa6741a34b91297500d6a7cff6e48a0a87b6391e43fc0c5f6bf44cec27feffb9a2f9b5510e085c602666a5adf803bb8ba3338
-EBUILD owfs-3.2_p2-r2.ebuild 4782 BLAKE2B 05e42cf3d93fafcde9e875af9a91b16564846e9e7a487af8812a66c738bd66bf2600e9364864237c044379dec76eb48af9b9d9936695fb821a4ab86553fb1f08 SHA512 1aa74c96d39673636396e5ec76f5b829493a735542a86c4b7662f224e0d208ecf8bd4c579e9fa5740df0e6b59a5d439dcb53a151b9e5a25377c5427d9fd37d83
-MISC metadata.xml 1159 BLAKE2B 6a55584f7bf0ae7b11441169d59f53138a2e82a3ac38a53b9ab77c8a4e6baf5c268864e7f6897eb2fd9b35888f8373a6756b8760d894c5f4aeaae394f8cb3706 SHA512 4cff718d367711e5a99891caa7c19db9f50d885200841096f17ec3ee64cd01d3938fa34d1f2c5e6de575dd3cb36c5ea4f3625fa604b11cfdebe13362ea37cefe
diff --git a/sys-fs/owfs/files/owfs-3.1-vendordir.patch b/sys-fs/owfs/files/owfs-3.1-vendordir.patch
deleted file mode 100644
index 2592e8ad0fd7..000000000000
--- a/sys-fs/owfs/files/owfs-3.1-vendordir.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/module/ownet/perl5/Makefile.am b/module/ownet/perl5/Makefile.am
-index 5823f4b..cebe1e6 100644
---- a/module/ownet/perl5/Makefile.am
-+++ b/module/ownet/perl5/Makefile.am
-@@ -8,7 +8,7 @@ OWNet/Makefile: OWNet/Makefile.PL
- if HAVE_DEBIAN
- 	cd OWNet; $(PERL) Makefile.PL INSTALLDIRS=vendor
- else
--	cd OWNet; $(PERL) Makefile.PL
-+	cd OWNet; $(PERL) Makefile.PL INSTALLDIRS=vendor
- endif
- 
- install-data-local: OWNet/Makefile
-diff --git a/module/swig/perl5/Makefile.am b/module/swig/perl5/Makefile.am
-index 8e5f583..49cd252 100644
---- a/module/swig/perl5/Makefile.am
-+++ b/module/swig/perl5/Makefile.am
-@@ -19,7 +19,7 @@ else
- if HAVE_DEBIAN
- 	( cd OW; $(PERL) Makefile.PL INSTALLDIRS=vendor )
- else
--	( cd OW; $(PERL) Makefile.PL )
-+	( cd OW; $(PERL) Makefile.PL INSTALLDIRS=vendor )
- if HAVE_FREEBSD
- 	$(PERL) -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' OW/Makefile
- 
diff --git a/sys-fs/owfs/files/owfs-3.1p4-sysmacros.patch b/sys-fs/owfs/files/owfs-3.1p4-sysmacros.patch
deleted file mode 100644
index dcb67a6d19c7..000000000000
--- a/sys-fs/owfs/files/owfs-3.1p4-sysmacros.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 6565314e775232cf1682b35720b8b1b207a16f3e Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@gentoo.org>
-Date: Wed, 21 Sep 2016 15:38:52 +0200
-Subject: [PATCH] configure: Add AC_HEADER_MAJOR to find where major() is
- defined
-
-glibc currently pulls sys/sysmacros.h into sys/types.h, but this may
-change in a future release.
-
-https://sourceware.org/ml/libc-alpha/2015-11/msg00253.html
-
-Gentoo-Bug: https://bugs.gentoo.org/580922
----
- configure.ac                    | 4 +++-
- module/owlib/src/include/ow.h   | 7 +++++--
- module/ownet/c/src/include/ow.h | 8 ++++++--
- 3 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index c1e3d77..3b32fbe 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -180,10 +180,12 @@ m4_include([src/scripts/m4/acx_pthread.m4])
- # Checks for header files.
- AC_HEADER_DIRENT
- AC_HEADER_STDC
--AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/mkdev.h sys/socket.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h])
-+AC_CHECK_HEADERS([asm/types.h arpa/inet.h sys/ioctl.h sys/socket.h sys/time.h sys/times.h sys/types.h sys/param.h sys/uio.h feature_tests.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/file.h syslog.h termios.h unistd.h limits.h stdint.h features.h getopt.h resolv.h semaphore.h])
- AC_CHECK_HEADERS([linux/limits.h linux/types.h netdb.h dlfcn.h])
- AC_CHECK_HEADERS(sys/event.h sys/inotify.h)
- 
-+AC_HEADER_MAJOR
-+
- # Test if debugging out enabled
- ENABLE_DEBUG="true"
- AC_MSG_CHECKING([if debug-output is enabled])
-diff --git a/module/owlib/src/include/ow.h b/module/owlib/src/include/ow.h
-index 9dbec5f..2a6050d 100644
---- a/module/owlib/src/include/ow.h
-+++ b/module/owlib/src/include/ow.h
-@@ -188,9 +188,12 @@
- #include <netdb.h>				/* for getaddrinfo */
- #endif							/* HAVE_NETDB_H */
- 
--#ifdef HAVE_SYS_MKDEV_H
-+#ifdef MAJOR_IN_MKDEV
- #include <sys/mkdev.h>			/* for major() */
--#endif							/* HAVE_SYS_MKDEV_H */
-+#endif							/* MAJOR_IN_MKDEV */
-+#ifdef MAJOR_IN_SYSMACROS
-+#include <sys/sysmacros.h>		/* for major() */
-+#endif							/* MAJOR_IN_MKDEV */
- 
- #include <stddef.h> // for offsetof()
- 
-diff --git a/module/ownet/c/src/include/ow.h b/module/ownet/c/src/include/ow.h
-index c157a7c..aeeba8e 100644
---- a/module/ownet/c/src/include/ow.h
-+++ b/module/ownet/c/src/include/ow.h
-@@ -118,9 +118,13 @@
- 
- #include <netdb.h>				/* addrinfo */
- 
--#ifdef HAVE_SYS_MKDEV_H
-+#ifdef MAJOR_IN_MKDEV
- #include <sys/mkdev.h>			/* for major() */
--#endif							/* HAVE_SYS_MKDEV_H */
-+#endif							/* MAJOR_IN_MKDEV */
-+#ifdef MAJOR_IN_SYSMACROS
-+#include <sys/sysmacros.h>		/* for major() */
-+#endif							/* MAJOR_IN_MKDEV */
-+
- 
- /* Can't include search.h when compiling owperl on Fedora Core 1. */
- #ifndef SKIP_SEARCH_H
--- 
-2.10.0
-
diff --git a/sys-fs/owfs/files/owfs.confd b/sys-fs/owfs/files/owfs.confd
deleted file mode 100644
index f85d25e74f22..000000000000
--- a/sys-fs/owfs/files/owfs.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# owfs configuration
-OWFS_OPTS="-m /var/lib/owfs/mnt --allow_other -s 127.0.0.1:4304"
diff --git a/sys-fs/owfs/files/owfs.initd-r1 b/sys-fs/owfs/files/owfs.initd-r1
deleted file mode 100644
index fce0f5e52d4a..000000000000
--- a/sys-fs/owfs/files/owfs.initd-r1
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-INSTANCE=${SVCNAME#*.}
-PROGRAM=${SVCNAME%%.*}
-PIDFILE=${PIDFILE:-/run/owfs/${PROGRAM}.pid}
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-depend() {
-	need owserver
-	use logger
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o ${OWUID}:${OWGID} "$(dirname ${PIDFILE})"
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} --user ${OWUID}:${OWGID} -- \
-		--pid-file ${PIDFILE} \
-		--background --error_print 1 \
-		${OWFS_OPTS:--m /var/lib/owfs/mnt --allow_other -s 127.0.0.1:4304}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -u ${OWUID}
-	eend $?
-}
diff --git a/sys-fs/owfs/files/owftpd.confd b/sys-fs/owfs/files/owftpd.confd
deleted file mode 100644
index fc93d2fd7195..000000000000
--- a/sys-fs/owfs/files/owftpd.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# owfs owftpd configuration
-OWFTPD_OPTS="--nozero -p 127.0.0.1:4381 -s 127.0.0.1:4304 --max_clients 5 --timeout_ftp 600"
diff --git a/sys-fs/owfs/files/owftpd.initd-r1 b/sys-fs/owfs/files/owftpd.initd-r1
deleted file mode 100644
index 8bbf93b49dc8..000000000000
--- a/sys-fs/owfs/files/owftpd.initd-r1
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-INSTANCE=${SVCNAME#*.}
-PROGRAM=${SVCNAME%%.*}
-PIDFILE=${PIDFILE:-/run/owfs/${PROGRAM}.pid}
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-depend() {
-	need owserver
-	use logger
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o ${OWUID}:${OWGID} "$(dirname ${PIDFILE})"
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} --user ${OWUID}:${OWGID} -- \
-		--pid-file ${PIDFILE} \
-		--background --error_print 1 \
-		${OWFTPD_OPTS:---nozero -p 127.0.0.1:4381 -s 127.0.0.1:4304 --max_clients 5 --timeout_ftp 600}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -u ${OWUID}
-	eend $?
-}
diff --git a/sys-fs/owfs/files/owhttpd.confd b/sys-fs/owfs/files/owhttpd.confd
deleted file mode 100644
index 2a5200c31118..000000000000
--- a/sys-fs/owfs/files/owhttpd.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# owfs owhttpd configuration
-OWHTTPD_OPTS="--nozero -p 127.0.0.1:4380 -s 127.0.0.1:4304"
diff --git a/sys-fs/owfs/files/owhttpd.initd-r1 b/sys-fs/owfs/files/owhttpd.initd-r1
deleted file mode 100644
index cf3af54f50e9..000000000000
--- a/sys-fs/owfs/files/owhttpd.initd-r1
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-INSTANCE=${SVCNAME#*.}
-PROGRAM=${SVCNAME%%.*}
-PIDFILE=${PIDFILE:-/run/owfs/${PROGRAM}.pid}
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-depend() {
-	need owserver
-	use logger
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o ${OWUID}:${OWGID} "$(dirname ${PIDFILE})"
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} --user ${OWUID}:${OWGID} -- \
-		--pid-file ${PIDFILE} \
-		--background --error_print 1 \
-		${OWHTTPD_OPTS:---nozero -p 127.0.0.1:4380 -s 127.0.0.1:4304}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -u ${OWUID}
-	eend $?
-}
diff --git a/sys-fs/owfs/files/owserver.confd b/sys-fs/owfs/files/owserver.confd
deleted file mode 100644
index e764e2df10ec..000000000000
--- a/sys-fs/owfs/files/owserver.confd
+++ /dev/null
@@ -1,2 +0,0 @@
-# owfs owserver configuration
-OWSERVER_OPTS="--nozero -p 127.0.0.1:4304 -d /dev/ttyS0 --timeout_volatile 5"
diff --git a/sys-fs/owfs/files/owserver.initd-r1 b/sys-fs/owfs/files/owserver.initd-r1
deleted file mode 100644
index 88b9790882f5..000000000000
--- a/sys-fs/owfs/files/owserver.initd-r1
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-INSTANCE=${SVCNAME#*.}
-PROGRAM=${SVCNAME%%.*}
-PIDFILE=${PIDFILE:-/run/owfs/${PROGRAM}.pid}
-OWUID=${OWUID:-owfs}
-OWGID=${OWGID:-owfs}
-
-depend() {
-	use logger
-}
-
-start_pre() {
-	checkpath -d -m 0750 -o ${OWUID}:${OWGID} "$(dirname ${PIDFILE})"
-}
-
-start() {
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} --user ${OWUID}:${OWGID} -- \
-		--pid-file ${PIDFILE} \
-		--background --error_print 1 \
-		${OWSERVER_OPTS:---nozero -p 127.0.0.1:4304 -d /dev/ttyS0}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --exec /usr/bin/${PROGRAM} \
-		--pidfile ${PIDFILE} -u ${OWUID}
-	eend $?
-}
diff --git a/sys-fs/owfs/metadata.xml b/sys-fs/owfs/metadata.xml
deleted file mode 100644
index 3643be9f41d1..000000000000
--- a/sys-fs/owfs/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<longdescription lang="en">
-		OWFS (One Wire File System) is an easy way to use the powerful 1-wire system
-		of Dallas/Maxim. A simple and flexible program to monitor and control the
-		physical environment. You can write scripts to read temperature, flash
-		lights, write to an LCD, log and graph, ...
-	</longdescription>
-	<slots>
-		<subslots>Reflect ABI of libow.so.</subslots>
-	</slots>
-	<upstream>
-		<remote-id type="sourceforge">owfs</remote-id>
-	</upstream>
-	<use>
-		<flag name="ftdi">Enable support for USB FTDI chips via <pkg>dev-embedded/libftdi</pkg></flag>
-		<flag name="ftpd">Enable building the OWFS FTP server (owftpd)</flag>
-		<flag name="fuse">Enable building the FUSE-based OWFS client (owfs)</flag>
-		<flag name="httpd">Enable building the OWFS web server (owhttpd)</flag>
-		<flag name="parport">Enable support for the DS1410E parallel port adapter</flag>
-		<flag name="zeroconf">Enables support for zero-configuration networking via <pkg>net-dns/avahi</pkg></flag>
-	</use>
-</pkgmetadata>
diff --git a/sys-fs/owfs/owfs-3.2_p2-r2.ebuild b/sys-fs/owfs/owfs-3.2_p2-r2.ebuild
deleted file mode 100644
index 49482396596b..000000000000
--- a/sys-fs/owfs/owfs-3.2_p2-r2.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_OPTIONAL=1
-
-inherit autotools distutils-r1 linux-info perl-functions systemd user
-
-MY_P="${P/_/}"
-
-DESCRIPTION="Access 1-Wire devices like a filesystem"
-SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz"
-HOMEPAGE="https://owfs.org/ https://sourceforge.net/projects/owfs/"
-KEYWORDS="amd64 arm x86"
-
-# Upstream uses crazy SONAME, https://github.com/owfs/owfs/commit/c696fa9b9b44f49c96b9f1c2b3159d277e0c1273
-SLOT="0/${PV}"
-LICENSE="GPL-2"
-
-IUSE="debug ftdi ftpd fuse httpd parport perl python tcl usb zeroconf"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	ftdi? ( dev-embedded/libftdi:0 )
-	fuse? ( sys-fs/fuse:0= )
-	perl? ( dev-lang/perl:= )
-	parport? ( sys-kernel/linux-headers )
-	python? ( ${PYTHON_DEPS} )
-	tcl? ( dev-lang/tcl:0= )
-	usb? ( virtual/libusb:0 )
-	zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
-"
-
-DEPEND="${RDEPEND}
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1-vendordir.patch
-	"${FILESDIR}"/${PN}-3.1p4-sysmacros.patch
-)
-
-S="${WORKDIR}/${MY_P}"
-
-OWUID="${OWUID:-owfs}"
-OWGID="${OWGID:-owfs}"
-
-pkg_setup() {
-	if use kernel_linux; then
-		linux-info_pkg_setup
-
-		if linux_config_exists; then
-			if ! linux_chkconfig_present W1; then
-				ewarn "CONFIG_W1 isn't set. You will not be able to use 1-wire bus on this system!"
-			fi
-		else
-			elog "Cannot find a linux kernel configuration. Continuing anyway."
-		fi
-	fi
-
-	use perl && perl_set_version
-
-	enewgroup ${OWGID} 150
-	enewuser  ${OWUID} 150 -1 -1 ${OWGID}
-}
-
-src_prepare() {
-	default
-
-	# Support user's CFLAGS and LDFLAGS.
-	sed -i "s/@CPPFLAGS@/@CPPFLAGS@ ${CFLAGS}/" \
-		module/swig/perl5/OW/Makefile.linux.in || die
-	sed -i "s/@LIBS@/@LIBS@ ${LDFLAGS}/" \
-		module/swig/perl5/OW/Makefile.linux.in || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable owpython since we can build python anyway
-	# and without it, we don't have to fix the build ;)
-	# disable owphp because it is not compatible with PHP-7, bug #651106
-	local myeconf=(
-		$(use_enable debug)
-		$(use_enable fuse owfs)
-		$(use_enable ftdi)
-		$(use_enable ftpd owftpd)
-		$(use_enable httpd owhttpd)
-		$(use_enable parport)
-		$(use_enable perl owperl)
-		--disable-owphp
-		--disable-owpython
-		$(use_enable tcl owtcl)
-		$(use_enable zeroconf avahi)
-		$(use_enable zeroconf zero)
-		$(use_enable usb)
-		--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-	)
-
-	if use httpd || use ftpd || use fuse; then
-		myeconf+=( --enable-owserver )
-	else
-		myeconf+=( --disable-owserver )
-	fi
-
-	econf ${myeconf[@]}
-}
-
-src_compile() {
-	default
-
-	if use python; then
-		local CFLAGS="${CFLAGS} -fno-strict-aliasing"
-
-		pushd module/ownet/python > /dev/null || die
-		distutils-r1_src_compile
-		popd > /dev/null || die
-
-		pushd module/swig/python > /dev/null || die
-		emake ow_wrap.c
-		distutils-r1_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_test() { :; }
-
-src_install() {
-	default
-
-	if use httpd || use ftpd || use fuse; then
-		newinitd "${FILESDIR}"/owserver.initd-r1 owserver
-		newconfd "${FILESDIR}"/owserver.confd owserver
-
-		for i in httpd ftpd; do
-			if use ${i}; then
-				newinitd "${FILESDIR}"/ow${i}.initd-r1 ow${i}
-				newconfd "${FILESDIR}"/ow${i}.confd ow${i}
-			fi
-		done
-
-		if use fuse; then
-			dodir /var/lib/owfs
-			dodir /var/lib/owfs/mnt
-			newinitd "${FILESDIR}"/owfs.initd-r1 owfs
-			newconfd "${FILESDIR}"/owfs.confd owfs
-		fi
-	fi
-
-	use perl && perl_delete_localpod
-
-	if use python; then
-		pushd module/ownet/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-
-		pushd module/swig/python > /dev/null || die
-		distutils-r1_src_install
-		popd > /dev/null || die
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if use httpd || use ftpd || use fuse; then
-		echo
-		if [[ ${OWUID} != root ]]; then
-			ewarn
-			ewarn "In order to allow the OWFS daemon user '${OWUID}' to read"
-			ewarn "from and/or write to a 1 wire bus controller device, make"
-			ewarn "sure the user has appropriate permission to access the"
-			ewarn "corresponding device node/path (e.g. /dev/ttyS0), for example"
-			ewarn "by adding the user to the group 'uucp' (for serial devices)"
-			ewarn "or 'usb' (for USB devices accessed via usbfs on /proc/bus/usb),"
-			ewarn "or install an appropriate UDEV rules (see http://owfs.org/index.php?page=udev-and-usb"
-			ewarn "for more information)."
-			ewarn
-			if use fuse; then
-				ewarn "In order to allow regular users to read from and/or write to"
-				ewarn "1 wire bus devices accessible via the owfs FUSE filesystem"
-				ewarn "client and its filesystem mountpoint, make sure the user is"
-				ewarn "a member of the group '${OWGID}'."
-				ewarn
-			fi
-			echo
-		fi
-	fi
-}
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index 41c64efdcc93..cfa529d40e18 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -3,13 +3,11 @@ AUX ldap-scripts/edquota_editor 1243 BLAKE2B fbaf521aeda741ce3d2aabaa60609d914b6
 AUX ldap-scripts/quota.schema 552 BLAKE2B d9becd7bd0f66ba8a603e3b442bdd36748c059da8da9da0f8065e0bdd2dfa8c624787f860843d07e38caf301ccfc9b9d2dac2e978a68304abc037f375b4c647c SHA512 9e08e51834458885a046395002bb19a463533bc0e1fc23f1fda98c41ee48c0f122e284f4a520d6f6ef44d66142395c10f91e18076e0a54e57dd198f7da268748
 AUX ldap-scripts/setSystemQuotas.pl 3930 BLAKE2B 728956edd5f3e35939a068c92c5d94606d9b62943a6131502f235647a5251c3737a5307555dcaf98114946b8e9318a8f7c683d7bd066195d24c6542b95462fbd SHA512 8ecdd09500a849c4572411e904dc78ff967ed71f819969e0a27e697ca6607ca17906318784ccf1aca4fe066666dd2a21d800ce6f224478d0751db1a5c276a6ad
 AUX ldap-scripts/setquota-ldap.pl 6039 BLAKE2B 9603c6f7aaf842563af9c1b9a5680be126ead114e0e0bc19d123c9440604b4941e6d9353e62408155180edd39076d634c5150334f3fbffb649af7dc04eeb9bef SHA512 f046c45b09b8afa88d11b4d55e35877c1c7e6c8e87f41f4c2dfcb063a2bd972cf584f88fdea2b42442cb44e460a48f3c9b12c3f5f3a99f759bbdb4ca95ab8e5b
-AUX quota-4.04-Listen-on-a-TCP-socket.patch 2432 BLAKE2B cfc2d9d3e8200e0974ee98cf35600185e7331d659117fc4bc0c4f141523475af9c7625dd6b9754199357af212043591089727e7bb9234808aad75c61c345cff6 SHA512 3f6a567a271333d01b4aa81e90fa0fd68a32c7888813c8bd86f5847ad7d8b8f8575370ede313b9e5c922bcb81e1cca3211c18b4ac97a2dcbfca00e282f9fab11
-AUX quota-4.04-glibc226.patch 983 BLAKE2B 7d4dd586fb6731d62e8c442d849b33b537e3e93719261ac42889d8de04199286a1ac2a0a0ba32acc174573883288821797d291e33b2b4b57c7fb66e6cab07c90 SHA512 90bcfb9fbb881602cb01000cea691016e6c7c99a5d2fc22b114615fec9ef4752c07253eaeaf80023e6f0768ab95429aac10772f6d12547c43eba4300877f89b9
 AUX quota.confd 359 BLAKE2B 37d0cf75f96ca4ccd2d9be1ac3def62a3ac409873cfad33e1fafc515875e587a3ab3f869fd078994bef3174e70c10ce0311a307a808b3469cac73c7f3e8f1883 SHA512 3253b69932332eff2944753f687d780d651dc2b21b524b7055164b91292c13c346cd46443bd58267b239f72fd8918a7e113eec62871573ee94e33df5eb3c82f8
 AUX quota.rc7 688 BLAKE2B 18a3317da5360532d6e6d9051f674a7a8e0495fa08aae8511fc7b77d2b16adb36dcdd9e510cb7bd15444b1ae8b606d607cc1ebaa10afb064b052d31ed780afbd SHA512 6a0536285bb340779cf4989060ed5a10c9c4a24a48d334174cd84cd54938d042f7a4047f837f96fc7a3c88a1d20317f662c984bd88c00b32cbf48302ba82a529
 AUX rpc.rquotad.initd 448 BLAKE2B 59dc12ee73ddd0473f8122c780ef94c46dc8cfa0e15bd7a839b2d0360ea08d18d239b17b538b0ff9cd8110b8c29676aa93d06f25cf4acbc7f169ac545ab5248e SHA512 c6ab8d6e0e15032bbbee523c2550e7f23d48fb45035d37181e988f2f96cd1ece316681f1b529b51fd1aeb390c5f27a6911f5de52132e90b4cbcfb4c2dfc95954
-DIST quota-4.04.tar.gz 577303 BLAKE2B 8ee1e8f99b70f626ec051e4e9afe53c788b625a29f26afbe075039cf88dde9f6641c39e0ccfdbfcc6981fabe35e8fd15e7203989e9bbbdd1f1772949566531f6 SHA512 adc33863d2a966b4c46983fa3926e6b6ba75e260ed21bdff646584237840e6beb0dcfbfd2f655969aa5675c3c398ac2e483afb933f03f983756ebb3352d0eaad
 DIST quota-4.05.tar.gz 577313 BLAKE2B ab0adc04a2bee46f5b4f528c3a1b7f1dfbfc93cc153aebef91cf563e0b03344479b4d465f7d91cfee60c533052f27ce54f24a937c0c1ec312a5fff763cb82bd1 SHA512 a13ca93fb6fad032cb032874dda2f5d792e619b41e89b481e6aaa4f06ac5774e2728b09dd625addfbe22efccb1d85892b093736084c72f75675a60df168b92f2
-EBUILD quota-4.04-r3.ebuild 1658 BLAKE2B ebac2f79e9f2497f7bf900e2a66b4d4baf9fcad47841ed781fd82817df33c9cfaa1da46be94937847abbb2b4b770140281fef31116f4e3d8294e925b9a962dde SHA512 d01f8fbc83d7f766fbdbc01cac988f5b07408d1019c9156f83ef62794b87a868a75510afc6972917519761b702cac406004e8c02fa31178478669c181f98f399
+DIST quota-4.06.tar.gz 520448 BLAKE2B 2cbadeade228d0154f3a8d455cc1aa6e85c9ad7854007e3188c9035abe4d5fdbdf97985fd2fa6308f486ffbe60461e0fe1139f1ec0ca415ce08292d74e0ddde1 SHA512 cece46b8e3a82e8afcf8bfc9f6b310ec91afe034102cebc031bc7d7e04287fdbffb21ab1d3e6e1825175cffa4bad0a4ecbefec0efee028d961b14ac626d5c871
 EBUILD quota-4.05-r1.ebuild 1560 BLAKE2B e618e2d76a444f254a9edf3185e32616d8eaab8669c0d616316c57d60b88ff6fdb41f50f60747232451377927cf5f5f556929de5ef9c173eb3ad855ec094ec46 SHA512 19a9557d7f9fe22e7ed9eea549546f7dad50d69642753aa974f80a63d43b6962e375fd9b5ffb83b81eebe87ca51937be321ffc7b0a0676da4bd77d4b698881f6
+EBUILD quota-4.06.ebuild 1577 BLAKE2B 7a3ddaf149f29f4bd1f9228f27a9084dc72a96f03b8a4b7842e3bd4e0ed7a3b5c1c14d8f9469b67b715850b446b6394bed20480d65b2dd7b8f4beefa0a89c726 SHA512 8498b17c4852f96a4a508e26c4e9e71e297bbd93a21792d995671246c44abc3cb6d8f65e71b40a1673e166dc379cb8934125ab12ea1a3f8fe258d36f7789b9a2
 MISC metadata.xml 482 BLAKE2B 4b2afb537080bc15a4cd9756de6fcbb8df9a19a5a6ea3a7a4e024756be844415d46c07c3321c9dc6bfde8956ec4fb5f3ef87d0dcd090a3f4ed606e724d25fbf4 SHA512 50b2143425f8ab315784fab4d9e569d2f80893c91ba64b4c209947eb79688ed9e8e23955b9f04406d699de6f28e9c10dad78889853d05f84191af65911d7a38e
diff --git a/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch b/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch
deleted file mode 100644
index cf1bd4aad32f..000000000000
--- a/sys-fs/quota/files/quota-4.04-Listen-on-a-TCP-socket.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 31ecd29b3b3f51145fd78f63087c10e9fcadf999 Mon Sep 17 00:00:00 2001
-From: Steve Dickson <steved@redhat.com>
-Date: Tue, 22 May 2018 12:41:59 +0200
-Subject: [PATCH] Listen on a TCP socket
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-rpc.rquotad spins in libtirpc's rendezvous_request() on accepting TCP
-connections because the polled TCP socket is not listening:
-
-poll([{fd=4, events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=5,
-  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=6,
-  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}, {fd=7,
-  events=POLLIN|POLLPRI|POLLRDNORM|POLLRDBAND}], 4, -1) = 2 ([{fd=5,
-  revents=POLLHUP}, {fd=7, revents=POLLHUP}])
-accept(5, 0x7ffe61698700, [128])        = -1 EINVAL (Invalid argument)
-accept(7, 0x7ffe61698700, [128])        = -1 EINVAL (Invalid argument)
-
-The polled descriptors are:
-
-rpc.rquot 21981 root    4u  IPv4 80449159      0t0      UDP *:rquotad
-rpc.rquot 21981 root    5u  sock      0,9      0t0 80449162 protocol: TCP
-rpc.rquot 21981 root    6u  IPv6 80449165      0t0      UDP *:rquotad
-rpc.rquot 21981 root    7u  sock      0,9      0t0 80449168 protocol: TCPv6
-
-That results into a high CPU usage just after staring rpc.rquotad
-process.
-
-This patch adds a listen() call to svc_create_sock()
-routine which is needed with libtirpc version of svc_tli_create()
-as well as a needed IPv6 setsockopt().
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- svc_socket.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/svc_socket.c b/svc_socket.c
-index 8a44604..d2e3abf 100644
---- a/svc_socket.c
-+++ b/svc_socket.c
-@@ -118,6 +118,15 @@ static int svc_create_sock(struct addrinfo *ai)
- 		return -1;
- 	}
- 
-+	if (ai->ai_family == AF_INET6) {
-+		if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY,
-+				&optval, sizeof(optval)) < 0) {
-+			errstr(_("Cannot set IPv6 socket options: %s\n"), strerror(errno));
-+			close(fd);
-+			return -1;
-+		}
-+	}
-+
- 	if (setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)) < 0) {
- 		errstr(_("Cannot set socket options: %s\n"), strerror(errno));
- 		close(fd);
-@@ -129,6 +138,15 @@ static int svc_create_sock(struct addrinfo *ai)
- 		close(fd);
- 		return -1;
- 	}
-+
-+	if (ai->ai_protocol == IPPROTO_TCP) {
-+		if (listen(fd, SOMAXCONN) < 0) {
-+			errstr(_("Cannot listen to address: %s\n"), strerror(errno));
-+			close(fd);
-+			return -1;
-+		}
-+	}
-+
- 	return fd;
- }
- 
--- 
-2.14.3
-
diff --git a/sys-fs/quota/files/quota-4.04-glibc226.patch b/sys-fs/quota/files/quota-4.04-glibc226.patch
deleted file mode 100644
index 5f63cde7d426..000000000000
--- a/sys-fs/quota/files/quota-4.04-glibc226.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From bbb8819fc0f6ed379a05d635a61bcf9c8986079f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org>
-Date: Sat, 16 Sep 2017 13:09:43 +0200
-Subject: [PATCH] Add $(TIRPC_CFLAGS) globally to CFLAGS for RPC support,
- needed for libc 2.26
-
----
- Makefile.am | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 8d80bee..278290a 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -51,6 +51,8 @@ EXTRA_DIST = \
- noinst_LIBRARIES = libquota.a
- 
- if WITH_RPC
-+CFLAGS += $(TIRPC_CFLAGS)
-+
- rpcsvcdir = $(includedir)/rpcsvc
- rpcsvc_DATA = \
- 	rquota.h \
-@@ -100,8 +102,6 @@ libquota_a_SOURCES = \
- 	mntopt.h \
- 	pot.c \
- 	pot.h
--libquota_a_CFLAGS = \
--	$(TIRPC_CFLAGS)
- libquota_a_LIBADD = \
- 	$(RPCLIBS)
- 
-@@ -235,7 +235,6 @@ rpc_rquotad_SOURCES = \
- 	rquota_server.c \
- 	rquota_svc.c \
- 	svc_socket.c
--rpc_rquotad_CFLAGS = $(TIRPC_CFLAGS)
- rpc_rquotad_LDADD = \
- 	libquota.a \
- 	$(WRAP_LIBS) \
--- 
-2.14.1
-
diff --git a/sys-fs/quota/quota-4.04-r3.ebuild b/sys-fs/quota/quota-4.06.ebuild
index 9a208fb2b9a6..18e04a761974 100644
--- a/sys-fs/quota/quota-4.04-r3.ebuild
+++ b/sys-fs/quota/quota-4.06.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ldap netlink nls rpc tcpd"
 
 RDEPEND="
@@ -28,19 +28,14 @@ RDEPEND="
 	)
 	tcpd? ( sys-apps/tcp-wrappers )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	nls? ( sys-devel/gettext )
 "
 PDEPEND="
 	rpc? ( net-nds/rpcbind )
 "
 
-PATCHES=(
-	"${FILESDIR}/${P}-glibc226.patch"
-	"${FILESDIR}/${P}-Listen-on-a-TCP-socket.patch"
-)
-
 src_prepare() {
 	default
 	eautoreconf
diff --git a/sys-fs/rar2fs/Manifest b/sys-fs/rar2fs/Manifest
index c237ccebb822..f6c6926b52f8 100644
--- a/sys-fs/rar2fs/Manifest
+++ b/sys-fs/rar2fs/Manifest
@@ -1,7 +1,8 @@
-DIST rar2fs-1.27.2.tar.gz 259516 BLAKE2B ffa34fa5e38e22c0055c6a98442ad29a1ee62e215ff5e8fcc88a254a7de2d6c2842608adfeb22edece748dbc7173bba0574132cf8a9e735c5b84c53b0eb1b163 SHA512 7316198e1812cb88822e14c115d9dc0d98addeae3c6587888210197139046fb936ad3f1d599c45714c3d127535cf819311d314301249be78b91d66ebfc0fa453
+AUX rar2fs-1.29.1-no-compress-man.patch 312 BLAKE2B 3117878def7fdf738ed666f6662908aa5727ce0db48d5297767acc00de5b030bb9013c1d2e6d88687a40475e3527424d42bf547fd5b7cb285b6280f5e25a1f26 SHA512 4116da0458ca3d1333022e0c6e89463ddf98cf44e48a117b5b09421824806da3ef94e92a0d6aac62ed83b0483f573fee21eec971ad30127a47580bf290c35414
 DIST rar2fs-1.28.0.tar.gz 264753 BLAKE2B 7f1462fae6e869e64a8c75d85c50df2794f4bfd0b057e5c213eb28a8aa48da53961026c5b9fb752090052c25a02ef9bb2a90bc57cfd8c4097b4c3136f20e7fb1 SHA512 e50313d1dae57387f60520ed3ff1d610f4c8448fcff101a9735a4ac1471dc5aa6ac67d0ba5200310caf439cf60ab1e1b8328a7048904970c292f35f700ef5c03
 DIST rar2fs-1.29.0.tar.gz 267351 BLAKE2B cc71c038b32fcc5584234df60dae829486885485e78702bacf6e6da21377b399b65a8b4986a076e84915c65f4f03ff0084678854188b6cef261a66547d8417c1 SHA512 199767cf22a11a7afd53318d471138ed1d82b92dc6d4e0d20094262a2f2d8f9c03ac6b47ceff8318923e01228b33f12684b1664e4b1c28bf43fb0d81f3d044c5
-EBUILD rar2fs-1.27.2-r1.ebuild 809 BLAKE2B 44aa2834fdc6ac61d28b534d33aeb9b67f21b0a884c70176b5d9cacc3c41f27aa3db179f164d480e1de2721c7e15d2efaf08be7cd8de5d57031e1c5d577fb4ec SHA512 bad04944a110f8a9ee5bef4ebcc755e19b9c3d7a2bd89a7aa5ad89197682eb5af17c946c6d65ee2ccbe074f795d337e5d8f8d04878afafd7bba7b3e623ab7930
+DIST rar2fs-1.29.1.tar.gz 267860 BLAKE2B 2129dcfb860e56ea91dcea9d5af5e9a5c4513b7153673e366bfe3259ad12e1750507ffdd422ee6bad79afda950e5b08ee91a27012126d16c244dc146aee15a36 SHA512 c0cb4cca59e6adb450350a9730500bf9c569bb9ad835af0726ff05876a7a02c43e905293cc5582239b7a2564bf46bd02e6122934e0ad8c1785c326dbeff9c096
 EBUILD rar2fs-1.28.0.ebuild 809 BLAKE2B 44aa2834fdc6ac61d28b534d33aeb9b67f21b0a884c70176b5d9cacc3c41f27aa3db179f164d480e1de2721c7e15d2efaf08be7cd8de5d57031e1c5d577fb4ec SHA512 bad04944a110f8a9ee5bef4ebcc755e19b9c3d7a2bd89a7aa5ad89197682eb5af17c946c6d65ee2ccbe074f795d337e5d8f8d04878afafd7bba7b3e623ab7930
 EBUILD rar2fs-1.29.0.ebuild 809 BLAKE2B fe60f983d69d29bc33e8f001728e41b07ae0cd79dab8f7af653111964b1994c6a5ca2c61a6e27629ce005a51b2bc210b78da1ac924759ec85b0637046c6e245b SHA512 ff1ad7068e835104abc04b9100c46f1ced6859d6ecf4d080180d29ec08335c0ccf84c6eff4fa947c2f682e6e6e93b5e8029565ef95bc72a42ea2d4a0254cb114
+EBUILD rar2fs-1.29.1.ebuild 932 BLAKE2B 5eed7c95bb4479067dfbf8770f4c5b2c55b0ae5111bc751f024f4e845b9f1c76078d0b134e050201f29779a74cbb1056b01cf023b57fe1a4d9cc6f4a019d837b SHA512 3b2fcea6c201b6466f706f0805b0f22f379cea83e0c35555a45475424b188da45b78082aedea2f3ae7246e210d6f2ce65f29b455c5aef645edc1ca99bd3aed2a
 MISC metadata.xml 450 BLAKE2B 376df33314a93fca46449a3f491c4f6e31111a31fcbdd7be9cb6cd4207a45854ba70d7aeceaddc12c60b5b60d63080df5c4355aeeedff45c88605341f894d48f SHA512 c41759771363256abd1bfa7b1bab8dad7b2bdb721c74c7c2e279d94fda8fb68b98abf3f7a486ede01cf6ed6b7a4f9f048053438f414be5222ffad1542e5cf539
diff --git a/sys-fs/rar2fs/files/rar2fs-1.29.1-no-compress-man.patch b/sys-fs/rar2fs/files/rar2fs-1.29.1-no-compress-man.patch
new file mode 100644
index 000000000000..dac49db0e0fd
--- /dev/null
+++ b/sys-fs/rar2fs/files/rar2fs-1.29.1-no-compress-man.patch
@@ -0,0 +1,11 @@
+diff --git a/m4/m4_ac_prog_gzip.m4 b/m4/m4_ac_prog_gzip.m4
+index 32ffc37..f5589bc 100644
+--- a/m4/m4_ac_prog_gzip.m4
++++ b/m4/m4_ac_prog_gzip.m4
+@@ -1,5 +1,5 @@
+ AC_DEFUN([AC_PROG_GZIP],[
+-AC_CHECK_PROGS(gzip,[gzip],no)
++gzip="no"
+ export gzip;
+ AM_CONDITIONAL([HAVE_GZIP], [test x$gzip != xno])
+ AC_SUBST(gzip)
diff --git a/sys-fs/rar2fs/rar2fs-1.27.2-r1.ebuild b/sys-fs/rar2fs/rar2fs-1.29.1.ebuild
index d7d5e5f041b8..cc417da24599 100644
--- a/sys-fs/rar2fs/rar2fs-1.27.2-r1.ebuild
+++ b/sys-fs/rar2fs/rar2fs-1.29.1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
+inherit autotools
+
 DESCRIPTION="A FUSE based filesystem that can mount one or multiple RAR archive(s)"
 HOMEPAGE="https://hasse69.github.io/rar2fs/ https://github.com/hasse69/rar2fs"
 SRC_URI="https://github.com/hasse69/${PN}/releases/download/v${PV}/${P}.tar.gz"
@@ -19,6 +21,15 @@ RDEPEND=">=app-arch/unrar-5:=
 	sys-fs/fuse:0"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PN}-1.29.1-no-compress-man.patch"
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
 src_configure() {
 	export USER_CFLAGS="${CFLAGS}"
 
diff --git a/sys-fs/simple-mtpfs/Manifest b/sys-fs/simple-mtpfs/Manifest
index 14f132745519..c6344d977a70 100644
--- a/sys-fs/simple-mtpfs/Manifest
+++ b/sys-fs/simple-mtpfs/Manifest
@@ -1,5 +1,3 @@
-DIST simple-mtpfs-0.3.0.tar.gz 36655 BLAKE2B 3e3e625268fac9454f512ce592d84fde3b3e6d190f123b82bede13bc4119ad4c0cefb4ca3e5d8a81ddf9a020dc375be389853410b0147b419a255b6c0af6047b SHA512 7d2da152708c01ddd2a39c1b56cba6470bfd320b92507530cdd8fc4f25f9500ff817eac6a5d19c775f31029ae6a0baef693987c59453c60c688b84934378f772
 DIST simple-mtpfs-0.4.0.tar.gz 36234 BLAKE2B ec5739625286b63dc6285fb83a4c71f5ed9bb8ed757eab111e543e15efbc45a5fc3a2609382f01cf18d4c6160258800963c349b6d64b2648257cde99f9359432 SHA512 6f213f9df792f33cd3842357aecf444cdc8030c89e4abc19b56a2c60f58213b5545b3d7857b0d46cdd237d0c24d5d6eb3cbe59ba9fc3c32f91396c5724ac86d7
-EBUILD simple-mtpfs-0.3.0.ebuild 590 BLAKE2B ca37769d12403583490200c01da817db1856cddcc882c943b42dc3b2bf003dfe99f2db0df3de566da4828eaec369676c50c835a228b861df52e22ebcf8492725 SHA512 2e909dd230f69416557d0ec441ba23b845a6ccc6fd43d0ba93e0805cf571778514e747c14915503da31cf1bad013c399fb93d5d2728c64aa0be66aba9c5a747c
-EBUILD simple-mtpfs-0.4.0.ebuild 615 BLAKE2B 3ce16cfadcebb42d530982dc0ad6e630075b34f0ac054b91d79e5319f8ee6d76390f61fae97810b47398043eb5986fa1ed5837fae67f6eafba3284c5c82c67d4 SHA512 e26263b1f2f63f4144777b5e7d9bb3414894921efc15f9a61242e610b014c7b741cf0f788127631b8ff2120b83bf735026954b67315045e3020dcb346d8c60ea
+EBUILD simple-mtpfs-0.4.0.ebuild 613 BLAKE2B dcf466380e68d1fbaf22d9f0b402771511b2aaad81a34018675e2476e2d7c6029e6893e3289bb41cb26cf392a13b8a0de6e7f49ba1e3eff4c81393a3db011fb8 SHA512 3c30b37fdd28a0e35cea137c926cb90892ba800835678a36bb0cb59e4dbdb197c9978618201596a081e608bfe00a2ef8c41502233d4b55f34555abe759edac8b
 MISC metadata.xml 1002 BLAKE2B 146c014fef44cbca70892efa76c12f36a5f890742fcfc91801c995b9e7a78d4693a34fe7f1e1b708d2bc2d45e60ed7749904c10465de4d680e25456344644f9a SHA512 d5e83c61493b981f1871bc964e395877ac4adc6f75cca770140d364a9c1365f221dfe97f7e110338abea49afbc9313a5ca088dcb7899a18dc98386cb46c28430
diff --git a/sys-fs/simple-mtpfs/simple-mtpfs-0.3.0.ebuild b/sys-fs/simple-mtpfs/simple-mtpfs-0.3.0.ebuild
deleted file mode 100644
index a6b4baa1e071..000000000000
--- a/sys-fs/simple-mtpfs/simple-mtpfs-0.3.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="Simple MTP fuse filesystem driver"
-HOMEPAGE="https://github.com/phatina/simple-mtpfs"
-SRC_URI="https://github.com/phatina/simple-mtpfs/archive/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="media-libs/libmtp
-	sys-fs/fuse:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-
-	# The tarball doesn't contain ./configure, only configure.ac and
-	# autogen.sh.
-	eautoreconf
-}
diff --git a/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild b/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild
index a84aa51dbee4..1ba00bb3f09a 100644
--- a/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild
+++ b/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/phatina/simple-mtpfs/archive/v${PV}.tar.gz -> ${P}.t
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	media-libs/libmtp
diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index 2fe47a0e4e3b..f8f42c03d16a 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,6 +1,4 @@
-DIST squashfs-tools-ng-1.0.1.tar.xz 1079720 BLAKE2B efc4d715c65d42876d5ac51364d195267c6bc6c2219fea5746231bc4efbd9adac3fa23ea58f837da8610179f3d96ec9422efebe4ae231f4ab243cf948e64fa9b SHA512 3b597b7bf654c6897e04dc6c18cec6034a8f0c0fe070c8d6eb3c8f4a06f4ab2ea8c970ac18c12f05ccb3015cf911790e945798a34361fdb7d1a442a1ca646a04
-DIST squashfs-tools-ng-1.0.2.tar.xz 1085300 BLAKE2B 59331a131bda9b9bae9f162f80abaeb99a6a3ea49958c1d2ce84968d3f010cdf803821a6f2230a173fcd1e7f5224f06b82463b84e31419a7a10a5ede2bee1a61 SHA512 d23d886c7f13046cae8b0e16c380d0c6e681d8921428357f30da9660200332e3dee8b072449c45ab858b0d9fa388d62eb748fb03d6182da6a8839e5ca806176b
-EBUILD squashfs-tools-ng-1.0.1.ebuild 1122 BLAKE2B d7dd3c7314464d58d15f6229a52ee3336d853fae9f3238459202f385dbf253906b6a94fd4ea4469ccfd756abe4c504a3a40ad6c1f4442dd41b7b0448d29fde9e SHA512 d4c951eeb931881b710cdddafb381492b1698ac9b86506a73a73b346ace42f4048420bd035fff53a5bfa08bbd7ffcd958f254a4eef24316326c86fb92ae5214a
-EBUILD squashfs-tools-ng-1.0.2.ebuild 1122 BLAKE2B d7dd3c7314464d58d15f6229a52ee3336d853fae9f3238459202f385dbf253906b6a94fd4ea4469ccfd756abe4c504a3a40ad6c1f4442dd41b7b0448d29fde9e SHA512 d4c951eeb931881b710cdddafb381492b1698ac9b86506a73a73b346ace42f4048420bd035fff53a5bfa08bbd7ffcd958f254a4eef24316326c86fb92ae5214a
+DIST squashfs-tools-ng-1.0.3.tar.xz 1101820 BLAKE2B f21cef44d5dc3cae01733bb720ba472d02777d2b69a3e428dbf4d0f64ad46a18131dae807a9ef719e29698b06ff04a82de1906876c40aef336aa57a75eb3fde3 SHA512 32e0084b1343de07b450e5337398618475a57c91c6f351c73bb7aa3dd6b5dc83aeca924f3d624ce802c9e1d600389a76cbca7b841104259d32f3ef2c7f13db67
+EBUILD squashfs-tools-ng-1.0.3.ebuild 1122 BLAKE2B d7dd3c7314464d58d15f6229a52ee3336d853fae9f3238459202f385dbf253906b6a94fd4ea4469ccfd756abe4c504a3a40ad6c1f4442dd41b7b0448d29fde9e SHA512 d4c951eeb931881b710cdddafb381492b1698ac9b86506a73a73b346ace42f4048420bd035fff53a5bfa08bbd7ffcd958f254a4eef24316326c86fb92ae5214a
 EBUILD squashfs-tools-ng-9999.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
 MISC metadata.xml 556 BLAKE2B fcff50b7024c1743fb7d7e677c04865bba266c011305d701b4a27b1ce813eb492b6becb64b5f1d4d52a3efd5a80d3369ac88ac65c2665cb0121c6b59d592b966 SHA512 cd1de16571ec7651bf353e804c8f44cbe6a919c21577a832782d8213e7e956b5af1769889eb1631f1a97c44b89018d484122fee59bedef4409363901101df6e3
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.2.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.2.ebuild
deleted file mode 100644
index 79c567828ddc..000000000000
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A new set of tools for working with SquashFS images"
-HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"
-if [[ ${PV} = 9999* ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
-fi
-
-LICENSE="LGPL-3+ tools? ( GPL-3+ )"
-SLOT="0"
-IUSE="lz4 lzo selinux +tools +xz zstd"
-
-DEPEND="
-	sys-libs/zlib:=
-	lz4?     ( app-arch/lz4:= )
-	lzo?     ( dev-libs/lzo:= )
-	xz?      ( app-arch/xz-utils:= )
-	selinux? ( sys-libs/libselinux:= )
-	zstd?    ( app-arch/zstd:= )
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	default
-	[[ ${PV} == "9999" ]] && eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		$(use_with lz4)
-		$(use_with lzo)
-		$(use_with selinux)
-		$(use_with tools)
-		$(use_with xz)
-		$(use_with zstd)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.1.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.3.ebuild
index 79c567828ddc..79c567828ddc 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.1.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.3.ebuild
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 51a7cd094ccc..595d20d14786 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,5 +1,7 @@
 AUX squashfs-tools-4.4-fno-common.patch 456 BLAKE2B 6864eea963512705290c84e2c8ec57db59d0b96119469dae57a55c70f999446ca14ac7fbf7260540afd1656e1b50ba7ad174548b3972fba74ed530cfee1e5a7d SHA512 16da63201d5d1584401f3199a0f89d11d5e8d968a4e707215febf5910ec03425a7478d32a0a6e5e6cf7039f92300657d1797a525b38a817601ed0a8e698fb96d
+DIST squashfs-tools-4.4-git.1.tar.gz 241963 BLAKE2B 7a80c353efbbca851b2eb44e742f20b4cf59e91058b53b77c74d879dc18d882e3bb6de8a010a4469c0a53384ccf2968bba4cd1d6f10cfcede70fe07eebbf2409 SHA512 8d8cc3da7cbfc7b94d070021383413f3d1ef1261ba3fd9924dde4453558a8f8f14812c2f5614f87bef719496b0a023897de8d087c32a7344fa2eb9c1624563a0
 DIST squashfs-tools-4.4.tar.gz 241842 BLAKE2B 006e2d340bcf6e20873221fb51fa30e0808c4a4d9e1838ca71c11ddbff3bf472dffe730e9edf07c34f535650e6486a8a80a88f82d6c9ef7a7c19aa22098e9197 SHA512 133ce437fb8c929933d52cff710b61dd9181f6f8be58250b0d6a59a7bb79a2b350f68f456b06a0e17c469409a71272d586802d570248273ddcd5dad088c00308
+EBUILD squashfs-tools-4.4-r1.ebuild 1320 BLAKE2B 519be00eb2fe38a2be2a8722d75cf821cbc431d3af15d1138a279b1689f8e6060b017511314e772c9f6fee30ca7b3a28ef5ecc03f002181f4861565b01268edb SHA512 0b47634b8dc8eb2ea199fed7f1b044e8638d182995083cd8479e349cdc3c19920953d1996f7f32ec45c04904ac78eb3d9cc396a2e4c706eb1f9d4362f1787b6f
 EBUILD squashfs-tools-4.4.ebuild 1720 BLAKE2B 762f8c6f0b1ef784bda8a5f56c49be0410628dfa39402fe15c188d97775dd6c53608e1099004c958a1baf87afb6b82362415143f0756e50d168da671c26fccbb SHA512 dd8e639279641c15fc0a6eefc7690c546a135a6eb66a66f5efec57c02947fe5a871b03159f337e00a974a4d10ea3bf0578e53d556c9027b5092d760c5fc62a7e
-EBUILD squashfs-tools-9999.ebuild 1465 BLAKE2B 37c13584c36b531135beb21ae9f4d8fe3bedfa28fab542c8a552f52f79f9a4e233fe960ce6743d998e88551c7073ad481a04816e5e20349df902b7509c75f0de SHA512 dfcac3ec80c2aff4ffd2cbb123a991e86f3d7bfec11814bf3db953e7384579c38f22d1e608bb9c613cc0f2ab0a5b0a552232f467a75c8d564829c39a80dd5f65
-MISC metadata.xml 438 BLAKE2B 7bb1623378cbc91becb4e12f91bfdead33f1859c9a13e5dc53652a1202b0d5cdf4a7be46071e766fc932f15ab3223b889e6ff32063d67d50e8ef809e887221dc SHA512 985005bd45043f21efc64f544cc685e93a70dac00a869416aa93bbc91571461dae236d2b4bb3325c63c7c3515b88f32a84ab56d3405e84545053c86d164c7dc0
+EBUILD squashfs-tools-4.4_p1.ebuild 1322 BLAKE2B 26d26fa2be1f786874503557c939050cb9b586f08457b80fdb0cca23c420d612d6b951751e53bd795feea3aa2317e42fe96dc66f89a6a6f2c070b3cbe987b601 SHA512 d88f789760e425f16b47eb7a26c7862a8034c1693eb76185770e307dec7b2daf5b7d6746ed6b95ab5e78b43ef924d66e5578e0a6faafa7ba1a2c841a6a81d0f5
+MISC metadata.xml 454 BLAKE2B a4b9cd6ce3e032fdfee261126f4893ed9fb81a0008960774812361fe25a993f77c67353fcbc818aceb0c6c936a52bec3f13d5d9b5aebac00cf36f47cf1d74583 SHA512 b884abe3bfe270a305536f51b9e4c291e2acd5c848b0f1c1a996e208beba57ae29746701478ffbc6b4df2c9dd10b17756b4c077aa895e65a37c9a231401e820f
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index bf36ab7e6bbe..9e444d0bdc16 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -1,14 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-<email>livecd@gentoo.org</email>
-<name>Gentoo LiveCD Project</name>
-</maintainer>
-<use>
-<flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
-</use>
-<upstream>
-<remote-id type="sourceforge">squashfs</remote-id>
-</upstream>
+	<maintainer type="person">
+		<email>mgorny@gentoo.org</email>
+		<name>Michał Górny</name>
+	</maintainer>
+	<use>
+		<flag name="xz">
+			Enable support for XZ ("LZMA2") compression using
+			<pkg>app-arch/xz-utils</pkg>
+		</flag>
+	</use>
+	<upstream>
+		<remote-id type="sourceforge">squashfs</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild
new file mode 100644
index 000000000000..f330af3c97ac
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4-r1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs
+
+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}.tar.gz -> ${P}.tar.gz"
+
+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}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.4-fno-common.patch
+)
+
+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/squashfs-tools/squashfs-tools-4.4_p1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
new file mode 100644
index 000000000000..01661bc54be2
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4_p1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+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/squashfs-tools/squashfs-tools-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
deleted file mode 100644
index cb91a13dd1ef..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit flag-o-matic git-r3 toolchain-funcs
-
-DESCRIPTION="tools to create and extract Squashfs filesystems"
-HOMEPAGE="
-	http://squashfs.sourceforge.net
-	https://github.com/plougher/squashfs-tools
-"
-EGIT_REPO_URI="https://github.com/plougher/${PN}"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug lz4 lzma lzo static xattr +xz zstd"
-KEYWORDS=""
-
-LIB_DEPEND="
-	!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
-	lz4? ( app-arch/lz4[static-libs(+)] )
-	lzma? ( app-arch/xz-utils[static-libs(+)] )
-	lzo? ( dev-libs/lzo[static-libs(+)] )
-	sys-libs/zlib[static-libs(+)]
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xz? ( app-arch/xz-utils[static-libs(+)] )
-	zstd? ( app-arch/zstd[static-libs(+)] )
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-use10() { usex $1 1 0 ; }
-
-src_configure() {
-
-	# set up make command line variables in EMAKE_SQUASHFS_CONF
-	EMAKE_SQUASHFS_CONF=(
-		LZ4_SUPPORT=$(use10 lz4)
-		LZMA_XZ_SUPPORT=$(use10 lzma)
-		LZO_SUPPORT=$(use10 lzo)
-		XATTR_SUPPORT=$(use10 xattr)
-		XZ_SUPPORT=$(use10 xz)
-		ZSTD_SUPPORT=$(use10 zstd)
-	)
-
-	tc-export CC
-	use debug && append-cppflags -DSQUASHFS_TRACE
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	emake "${EMAKE_SQUASHFS_CONF[@]}" -C ${PN}
-}
-
-src_install() {
-	dobin ${PN}/{mksquashfs,unsquashfs}
-	dodoc CHANGES README RELEASE-READMEs/*
-}
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index 81dc2767d30d..7329ad58f83c 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -1,6 +1,6 @@
 DIST udev-init-scripts-33.tar.gz 3698 BLAKE2B fc79b3f6984131180324919f7be4309715976309ee582147662634bb020b8162b293e7fd0e675a9cc7a3b1630ce0fc49b29c899e393c7748d47cf924b1ca2809 SHA512 2119aace937da02f47a5adc9af720587d25c2852cf70a9bcb04138e3ee511308c8f30cf0301fbec58cf0432b7fd6672ae6a02d1740c774703959197b3511fbcc
 DIST udev-init-scripts-34.tar.gz 3660 BLAKE2B 954b003c78b31649fef69213a5424098f40e17e7ed11f4ec1443247950ea60db8536f37ca603caa06e5c9f8bab07b5ac3cb8c9435144532a97ff04836c24da49 SHA512 ed48bcd0815e235b2b3fa38f857cd97f164aac7c6ea805be87890eb06a0d52064bd733da240c6e2a34c8c73e10fd047b5e53096de06f17bc81d8266d70c0cc9d
 EBUILD udev-init-scripts-33.ebuild 1494 BLAKE2B 1acf9890fb8edb06696a0987da6c1d669466b93151098c4e8a8ef87f60fc90deab921dfdd2e2e3791e992009479d0b02117d7ddf57c25092c9e97a7473e24830 SHA512 cb0d39a1a39b2b98502a43d7f13d55b2e793c85eadaea67cdc0c78df6998116141feafde95213b29cbb4a546170b64b0c840bfbc0006165af5c49f8dd83e06c5
-EBUILD udev-init-scripts-34.ebuild 1495 BLAKE2B ca2257f7862c70eae56bcf2f700024376d18250fcb6883430533a808aa9acb88ac9d7fa953265e907a73382cf4d102b7c96673f466869a2accbfc6aa881a347d SHA512 9da240ce354aa1c523c0d7ce46f9853a032092efa620ab48e2063823261d4f451c92225a11e4fde59301c889a7bf1cc1ae6b617adc1c8309c4c913611f2fe1cf
+EBUILD udev-init-scripts-34.ebuild 1494 BLAKE2B 1acf9890fb8edb06696a0987da6c1d669466b93151098c4e8a8ef87f60fc90deab921dfdd2e2e3791e992009479d0b02117d7ddf57c25092c9e97a7473e24830 SHA512 cb0d39a1a39b2b98502a43d7f13d55b2e793c85eadaea67cdc0c78df6998116141feafde95213b29cbb4a546170b64b0c840bfbc0006165af5c49f8dd83e06c5
 EBUILD udev-init-scripts-9999.ebuild 1502 BLAKE2B 37464301789e4136261003f133a06b7f0f692ca30fa1a6509e621d4a7ab0dc4a300a9718e5c9dc4e9adf6818fac510729f381864b9d9d2453c095fa293cac187 SHA512 352ad2bbb4407cb664897de841345946856cad1adcb05a7c360cf52c98706d488c5ce1eaedad3e68304d04c2980c7a07b54227e50b6c33e5176cc9d84234b24b
 MISC metadata.xml 221 BLAKE2B 9e0d24573ec598eccd3ad7e41a38ead4192d9e757ff4b870b51b02a96f04a13596b15c5c05ee2a4d888c4b9b0b9b30aafe5ba96d39ff9faa157b58e30e91ba55 SHA512 accbe81ec1cf4c8d7c6eb99b7ceb7a8119eb1f2f55dcaf6d368610c255e7a21ff222e7c613ca4be37083ce9527ca325f3ee91515dadad7c5929f60f4fda334df
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild
index ac42fd3ce1d0..4dc6675505f4 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild
@@ -11,7 +11,7 @@ if [ "${PV}" = "9999" ]; then
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}/${OLD_P}"
-	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="udev startup scripts for openrc"
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index 15cbb7509f0d..b22f45f0d307 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -3,5 +3,5 @@ DIST udiskie-2.1.1.tar.gz 87216 BLAKE2B 4860e8ae7310c89d3292fe7fadcd49f6c92f0562
 DIST udiskie-2.2.0.tar.gz 88232 BLAKE2B ba037b0828b7bf42b00be481ecec807bc9ed591ad3990cb6b6f0db21b4894c184ff2fcb5410272a55f3f78caae999458cb159cd450ede540606138e5e9dab1af SHA512 7c6c096eeb52458a2e30415c1489a640ca679489a34729f5502ae35f178f810476111a17f082a092d61d6d08022cfd208cb1f71ab34d6b88ea7f1f4e4a1ae49c
 EBUILD udiskie-2.1.0.ebuild 1094 BLAKE2B 32f5aed7d312f8e5e03e9ff1ca9ef06338f2f9bbcd21c76a7f175f1ba9844cdf8c8b081daff9ef800fc1fa794e0f7292dc8dcf0537acdd280faafb8d60d598ea SHA512 3a91284b4bdb3eddc252be3513eb8d1512d7a40b1b0b19e478d618a253a187d6defb1062dc148362287e09889b7a7a734382ba82bfbee470b5693b7788558970
 EBUILD udiskie-2.1.1.ebuild 1060 BLAKE2B 537b294271d993616124655a924b2b4bf665271fd17507146b9ad59edc7fc6634ec8449f339466c1d1f493734e03765f1ea69e3586296a438dbaf049332cf59d SHA512 04827ea4f09649134f953482d1ac5b90f944e301ee1ffa21ab43695c2109c92cfe8ae1c3eb275fbc388a5f1dd5d80a9637425a35d422cc09df183f326db2e522
-EBUILD udiskie-2.2.0.ebuild 1004 BLAKE2B a47acfebc816b280a058e021bd552d048b2599cf098a29f897e282f1245298c23998cc26e923161c477fc27fccaac3f5eaa844d6b3651e24307058c70f2c4fff SHA512 a1f06f27ecc7035bb643fe3aac19294408e56ecbf31a4af471bd75621f45df3918ec85821a8d08271f82360b31d31ca74858d7eb1659e76e1bcc5552cbf498d1
+EBUILD udiskie-2.2.0.ebuild 1002 BLAKE2B c063298852b39093da4f4f1542e103549486f7ff79a5285c70747eb1ea4a370833e6f2bfe9aeeba333e7da6f06d3f6c3c9369b089cc2e105c694753c60b3c13e SHA512 841b5571a788189d63ba6aca2222b7f2043a8f1cad1bab1d6543442f04f7f7b766d1fe462662248a4c1eba4c1f38aa18e1ae061d7d26c194b02aa72bdc3f9407
 MISC metadata.xml 369 BLAKE2B 0241a847b1eb2f650f66bc3fd631ccdf1927562d510e08c7bcd3db850752b665894838d0c705b7d03690aeea0aa93372d1faae5b313c9136d46e4913c177b0a4 SHA512 0772b0fa065a42292268b9e6a6b99b7198f5923bcc4697913b6c432db4e206a28b0fb1bd6c14b6363591cca02108a8a91029233824c3ec5bd7fbc592a941137e
diff --git a/sys-fs/udiskie/udiskie-2.2.0.ebuild b/sys-fs/udiskie/udiskie-2.2.0.ebuild
index ee36f9185a25..21ed699c49aa 100644
--- a/sys-fs/udiskie/udiskie-2.2.0.ebuild
+++ b/sys-fs/udiskie/udiskie-2.2.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE=""
 
 RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
diff --git a/sys-fs/ufsutils/Manifest b/sys-fs/ufsutils/Manifest
deleted file mode 100644
index 33172e65cee6..000000000000
--- a/sys-fs/ufsutils/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST ufsutils_8.2-3.debian.tar.gz 23469 BLAKE2B 9afdef3af0f71ec1a75d9e7c3426fd62dd109cf2f5231bf910bb7cf7a55e800b11b4ec5319e6cff9b211259f46fd9730225c96f2f74067ade2b793eccedda04a SHA512 7bc925e742eaf4e1837ca4b46afa7966490234492eeb40ad8fabf71550a79890f3294780c2dbdf3593a82fc8e0708cf4c72baba81f4fec9a884cfa545c8895c8
-DIST ufsutils_8.2.orig.tar.gz 463499 BLAKE2B 94a02de50724e4a1f59a889dbb696a62c8bbbf0935537cff92cd0edb1c5a0e790be45bc1a9aa0a27a9443efe33ec081e5cb26465a3eeb5dbb7b176c91d3c66cc SHA512 f378372c2493c16fe8cb3977f4ed2d104e747895e97d7642d21b5e87a2a03ac696bbac093e534e13c2f1dc4638741edcbbb0ddec5abcbfa6b4f7401efbf7cf14
-EBUILD ufsutils-8.2_p3.ebuild 1315 BLAKE2B c8688331bd550056342e9933e106486208709f511b9a215fb4a0d4d13f594e06bc5213b72a595ecf7b7c29fb8e52881ecafba660210134d8628188f80f856f7a SHA512 52bef40151b229255b7dfa9a94d1feab379806de3f67b10eceb2b48e2d7b6b6b07ea3d7c3b71d92ebea9f5e752936275007463a17331a88f22c24afa923f0a2e
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-fs/ufsutils/metadata.xml b/sys-fs/ufsutils/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/sys-fs/ufsutils/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-fs/ufsutils/ufsutils-8.2_p3.ebuild b/sys-fs/ufsutils/ufsutils-8.2_p3.ebuild
deleted file mode 100644
index 92d1b917e8d8..000000000000
--- a/sys-fs/ufsutils/ufsutils-8.2_p3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils flag-o-matic toolchain-funcs
-
-DESCRIPTION="FFS/UFS/UFS2 filesystem utilities from FreeBSD"
-HOMEPAGE="http://packages.debian.org/source/sid/ufsutils"
-
-SRC_URI="mirror://debian/pool/main/u/${PN}/${PN}_${PV%_*}.orig.tar.gz
-	mirror://debian/pool/main/u/${PN}/${PN}_${PV%_*}-${PV##*_p}.debian.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="dev-libs/libbsd
-	dev-libs/libedit
-	sys-libs/ncurses"
-
-S="${WORKDIR}/${P%_*}"
-
-src_prepare() {
-	EPATCH_SOURCE="${WORKDIR}/debian/patches" EPATCH_SUFFIX="patch" \
-	EPATCH_OPTS="-p1" EPATCH_FORCE="yes" epatch
-
-	sed -i '1i#include <sys/sysmacros.h>' sbin/fsdb/fsdbutil.c || die #580292
-
-	# growfs is not properly ported
-	sed -e "s:sbin/growfs::" -i Makefile
-
-	sed -e "s:^\(prefix = \)\(.*\):\1${EPREFIX}usr:" \
-		-e "s:^\(libdir = \$(exec_prefix)\/\)\(.*\):\1$(get_libdir):" \
-		-e "/ar rcs/s:ar:\$(AR):" \
-		-i Makefile.common
-}
-
-src_configure() {
-	# globals are defined in header files and reused in multiple final
-	# binaries. bug #706696
-	append-cflags -fcommon
-
-	tc-export AR CC
-}
-
-src_compile() {
-	emake -j1
-}
-
-src_install() {
-	dodir /usr/$(get_libdir)
-	dodir /usr/sbin
-	dodir /usr/share/man/man8
-	emake DESTDIR="${ED}" install
-}
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 93e617646ebe..39a21a898954 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -4,8 +4,10 @@ DIST xfsprogs-5.4.0.tar.xz 1248688 BLAKE2B dd00083b62a4989ca94d117eabad3905dc487
 DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e0128701c40cdfa63c05fc85173c70da3f34c948b7791f12ac5bb8d5f0c634016dac71c328a8917d1065aa7fb4cac3291 SHA512 a6bee55b0a23316c73f3921234d1dbaa4cbe91c12e79264e5f9bfe1356a24baa0ab25270405a46e4613a7e48443ef21997ff4f5962663777bed373f89ca29701
 DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac10c7c6d471d3b32595eb27a76ec1fa20955a08d7c2e371a0d160bce741afad0998731d2fee497917e0d7a4e70f7 SHA512 6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231
 DIST xfsprogs-5.8.0.tar.xz 1260580 BLAKE2B d4efb81123d46fd7907dd81605922ba283642ead92f6270a3b0d93a0c7321963d5b8b0068a2b6b4cdb236da0653a6432b74056feff77354d2557e899b01f1a62 SHA512 11f2810402ecb83db204346c45ff9f7d643ff2390767794e311a06a10eb97118095e4c377d2b065be50611ec5fc82ac5cbc0a8c7122ee7e9820a2db4e9f177c1
+DIST xfsprogs-5.9.0.tar.xz 1263364 BLAKE2B 0504e06a9b2b664289fec3dbb083508438b4950c623e309f326954b81f2e9ca0e65d9eb0c9fa029c49f6708e7995db2e9cab0bc7f42aa048e7f9feb80fc7ec77 SHA512 76f7da8c57e859326b33bff4ceae9f73af485357252b2b1c09808ebb309af5abbafdceb874b9739a1aa87b8f130e42c5ee143fff117edde20844182e7babd0ce
 EBUILD xfsprogs-5.4.0-r1.ebuild 2847 BLAKE2B b81f15ddd470b549433942259ce7c7edb4f102a7903d361fd2ddc151b4d3ba1abcda491425d64d2cb5b50d1c034f4301e4350856a2e7df80f2690f065bc93c0d SHA512 962334a565a0b3686f28ec9c9091e1260df3f842da3f64ffdc3d524e6baed77663c8ee2100964471b44935661d60331e7b4c9688d151bcd2c16ef7208d1b9a54
 EBUILD xfsprogs-5.6.0.ebuild 2603 BLAKE2B bfa5d557473a872df4f5afd89aab9f7484fdd11c7d567dc1474bcfaa880c03eb7c9fb68cfcac81a9a21f1a5d32b7afe09f1af58b1f25e1669206df423fac394f SHA512 0ff4477ac23129c22f9bcec54fb4335dee11e0b759887909a269b6d01d4b27188f68661269b5b3907d1d84de0a8911f1ca1ff84075644e0eb3fb8df44578e73d
 EBUILD xfsprogs-5.7.0.ebuild 2255 BLAKE2B 5b64ed3ac748471d4f7131015707bd6f12efcbdfd139b3da96015861f2cdcee9d1662a5771f306af6106f60c66e80e60c5506454ee7b4cabcd08a5ead4a6de46 SHA512 4f45c3320bb13444ae2b0b1cd2990de0115dbc13c1dbea8894fb780b64016c70238fa3fe097350d7c77c2dfc5d594d052622ddca5f744ab9d38f3595fede8eaf
 EBUILD xfsprogs-5.8.0.ebuild 2255 BLAKE2B 5b64ed3ac748471d4f7131015707bd6f12efcbdfd139b3da96015861f2cdcee9d1662a5771f306af6106f60c66e80e60c5506454ee7b4cabcd08a5ead4a6de46 SHA512 4f45c3320bb13444ae2b0b1cd2990de0115dbc13c1dbea8894fb780b64016c70238fa3fe097350d7c77c2dfc5d594d052622ddca5f744ab9d38f3595fede8eaf
+EBUILD xfsprogs-5.9.0.ebuild 2255 BLAKE2B 5b64ed3ac748471d4f7131015707bd6f12efcbdfd139b3da96015861f2cdcee9d1662a5771f306af6106f60c66e80e60c5506454ee7b4cabcd08a5ead4a6de46 SHA512 4f45c3320bb13444ae2b0b1cd2990de0115dbc13c1dbea8894fb780b64016c70238fa3fe097350d7c77c2dfc5d594d052622ddca5f744ab9d38f3595fede8eaf
 MISC metadata.xml 338 BLAKE2B cdf07fec58a2401c154a3fdb7d5326065143eeac8dbe78078012d643dc3872bc2df79cc734c033c2030d356f2366dad8ad1da553bc268fd0318ab3ba971c4b5e SHA512 1a085c94d623db2cc55d987afb66265ab51e94c8868bc7c169cc669b58f8a8c5a1d81f503aa838d5c2a84f2a0bf923f73314048b49eb1e139d91eca6f71e119e
diff --git a/sys-fs/xfsprogs/xfsprogs-5.9.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.9.0.ebuild
new file mode 100644
index 000000000000..ca89c01e8930
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-5.9.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs systemd usr-ldscript
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="icu libedit nls"
+
+LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
+	icu? ( dev-libs/icu:=[static-libs(+)] )
+	libedit? ( dev-libs/libedit[static-libs(+)] )"
+RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
+	!<sys-fs/xfsdump-3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
+	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix doc dir
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+}
+
+src_configure() {
+	# include/builddefs.in will add FCFLAGS to CFLAGS which will
+	# unnecessarily clutter CFLAGS (and fortran isn't used)
+	unset FCFLAGS
+
+	export DEBUG=-DNDEBUG
+
+	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
+	# However, we have to provide an empty value to avoid default
+	# flags.
+	export OPTIMIZER=" "
+
+	unset PLATFORM # if set in user env, this breaks configure
+
+	# Avoid automagic on libdevmapper, #709694
+	export ac_cv_search_dm_task_create=no
+
+	# Build fails with -O3 (bug #712698)
+	replace-flags -O3 -O2
+
+	# Upstream does NOT support --disable-static anymore,
+	# https://www.spinics.net/lists/linux-xfs/msg30185.html
+	# https://www.spinics.net/lists/linux-xfs/msg30272.html
+	local myconf=(
+		--enable-blkid
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		$(use_enable icu libicu)
+		$(use_enable nls gettext)
+		$(use_enable libedit editline)
+	)
+
+	if is-flagq -flto ; then
+		myconf+=( --enable-lto )
+	else
+		myconf+=( --disable-lto )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" install
+	emake DIST_ROOT="${ED}" install-dev
+
+	gen_usr_ldscript -a handle
+}
diff --git a/sys-fs/zerofree/Manifest b/sys-fs/zerofree/Manifest
index db4708c50241..2086c9aaac7b 100644
--- a/sys-fs/zerofree/Manifest
+++ b/sys-fs/zerofree/Manifest
@@ -1,5 +1,4 @@
-DIST zerofree-1.0.4.tgz 8509 BLAKE2B d2d5872ad22e7c5f08e00083b0dadb5411023df9d129ec3bd08637e8a74f77f13a535e6f2c1a7cd4d390ed7a0d0b6e2433dacfa89336bb16ffb64c0d1c409929 SHA512 8172c8c43794eab1f751a700f847098343659ceabaf6ab78c3c902b34cf9b0db0dda75308b6bc80d22afccd11be25f35070ca6d715c3282c5c7c7106f598b42b
+AUX zerofree-include-sys_types.patch 284 BLAKE2B 45b375568b6bfc767a65d5d1082f44db4030ae687edb4d528f0000d1fc8dc78c10f98cd6bf57eaa9b9dd2d0ce96aee408ecddc1126ddd59faa737f7dcd236d7d SHA512 0cf3833271195c2f1da591af625928d8207d6bb39702cdc9f8ade0e7e773096e4f55860438863f06639f205283c0cccbaaf8b4d9ee98e3850a5075e38d06a187
 DIST zerofree-1.1.1.tgz 8710 BLAKE2B 76a84de7db60473c8824129a29515212acc74235e2139eb15fe7f41d1801c42c85378734fdf39a668f0a4eb285c55c49ce2281dda9444b2008557897428bc645 SHA512 2d7ee57a877bff2491c48054338a26d624ae75c238ac2b0568a75de88b6621c16cc1e7d65500879825d14d8ba44a5173587a061459072769c165bee47c3f9f1c
-EBUILD zerofree-1.0.4.ebuild 834 BLAKE2B 798366afa40e3a98e4ebc5b49e1158a459c2dc8c6542e8db42d2c028850fd548609b4c44c1641793997290b4c9a9cd60cfba3722834dee7b590aa31e0532ab87 SHA512 ebe03d80d9fd66c3c1003292ad24fc43c28bb4f4286382a3f986d06fe813173f0c811ce23015ba114c337e0f040092039c938d49893e4d19b479851b03a79d9d
-EBUILD zerofree-1.1.1.ebuild 834 BLAKE2B 798366afa40e3a98e4ebc5b49e1158a459c2dc8c6542e8db42d2c028850fd548609b4c44c1641793997290b4c9a9cd60cfba3722834dee7b590aa31e0532ab87 SHA512 ebe03d80d9fd66c3c1003292ad24fc43c28bb4f4286382a3f986d06fe813173f0c811ce23015ba114c337e0f040092039c938d49893e4d19b479851b03a79d9d
+EBUILD zerofree-1.1.1.ebuild 947 BLAKE2B f2d5575eda702b83c454889bfa54e816405c3037a983705a3ad1cc260a74b9cef35c9a3ba78af281d246853a23c3306bf76f7030ad032807fefd4a22a807bfa9 SHA512 f7750e84509daba6bb0242bc6f59744678c94c298384bffa54d03631d3aa267a1c0deeb3fb38e2300e20905d0e68cf0cbfea7de02bcd98129d88b68c7615c3af
 MISC metadata.xml 433 BLAKE2B aa623f9df641917cb34f2a028d4db98e33b241e89b94ac424045fb053bbe16b124f62329394d30cb6163689f8716a1eef4697115648f06f9834ee41c2914ae26 SHA512 c454915a2972c289341df97d9d8cb9bf26ea2f4c00ba4555a2d14e69e8f48f7bc8fc33c404ad19c175ff7e96900f3cead4dbaf32b0c36981c8a4926212a017e8
diff --git a/sys-fs/zerofree/files/zerofree-include-sys_types.patch b/sys-fs/zerofree/files/zerofree-include-sys_types.patch
new file mode 100644
index 000000000000..fecdbd49b0ac
--- /dev/null
+++ b/sys-fs/zerofree/files/zerofree-include-sys_types.patch
@@ -0,0 +1,10 @@
+--- zerofree-1.1.1/zerofree.c.orig	2019-05-05 19:22:49.000000000 -0500
++++ zerofree-1.1.1/zerofree.c	2019-05-05 19:21:50.000000000 -0500
+@@ -17,6 +17,7 @@
+  *             Jan Krämer.
+  */
+ 
++#include <sys/types.h>
+ #include <ext2fs/ext2fs.h>
+ #include <stdio.h>
+ #include <unistd.h>
diff --git a/sys-fs/zerofree/zerofree-1.0.4.ebuild b/sys-fs/zerofree/zerofree-1.0.4.ebuild
deleted file mode 100644
index 6e360c833a18..000000000000
--- a/sys-fs/zerofree/zerofree-1.0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Zeroes out all free space on a filesystem"
-HOMEPAGE="http://frippery.org/uml/index.html"
-SRC_URI="http://frippery.org/uml/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~x86"
-IUSE=""
-
-DEPEND="sys-libs/e2fsprogs-libs"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# Honor system CFLAGS.
-	# Use pipes for the sed delimiter to resolve #710818.
-	sed -i \
-		-e "s|CC=gcc|CC=$(tc-getCC)\nCFLAGS=${CFLAGS}\nLDFLAGS=${LDFLAGS}|g" \
-		-e "s|-o zerofree|\$(CFLAGS) \$(LDFLAGS) -o zerofree|g" \
-		-e "/-lext2fs/{ s|-lext2fs||g; s|$| -lext2fs|g; }" \
-		Makefile || die "Failed to sed the Makefile"
-
-	eapply_user
-}
-
-src_install() {
-	# Install into /sbin
-	into /
-	dosbin zerofree
-}
diff --git a/sys-fs/zerofree/zerofree-1.1.1.ebuild b/sys-fs/zerofree/zerofree-1.1.1.ebuild
index 6e360c833a18..d234d5d2144f 100644
--- a/sys-fs/zerofree/zerofree-1.1.1.ebuild
+++ b/sys-fs/zerofree/zerofree-1.1.1.ebuild
@@ -17,6 +17,11 @@ DEPEND="sys-libs/e2fsprogs-libs"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
+	default
+
+	# Bug #712582, fix compile in musl environments.
+	eapply "${FILESDIR}/${PN}-include-sys_types.patch"
+
 	# Honor system CFLAGS.
 	# Use pipes for the sed delimiter to resolve #710818.
 	sed -i \
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index f7e5590c9880..647fd7e18afc 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,7 +1,8 @@
-AUX 0.8.4-powerpc_jmp_weak.patch 1314 BLAKE2B 5cec0c5bf0e7c8ba4fb29539384eeb28e431956a94853d7c7722fc4dfc680f984c3e1567bc27effb28e94b1a411f9d7e57a26536fb4dee9446b12183558ab49b SHA512 dabea2f795e3ee2d7df13c803ac4cb21499e23d6663f14d52a7b270075176a4378cd15d04d051999aa7ec6b8cf49e645435363053e16640f28068c2764580047
-DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
-DIST zfs-2.0.0-rc2.tar.gz 12854085 BLAKE2B 73cabd565c11eef1bebbc391f8c4ba18acd1610f98f1b8afb507bc844f4b6a64ba32d9727e634c7f26c48fe365a841bf071513df234b9b7a87e954610a6d7f3b SHA512 14b17d06124890efef15b3b073e103c9faeecaea761779fff9a8420e3ab72fa611df9875fa766a323d69646e9025f8b19f918ded4c6705af116cf9f14eea4f40
-EBUILD zfs-kmod-0.8.4-r1.ebuild 4593 BLAKE2B cf8a545a1d016c6d9d80717b82b7ce4bfb8434fa8ac4d081b4c1c8c730381a812a645218d9447e9f44b51fd10d57dd900bddfe41157a32a35b250929d2e961c4 SHA512 7d25b489db7696178d59c6953377a023b6e254adfe0f08b33fdda72c936afee3b2421d6ec430c46973967e4d080489585213e147d42eee695c57b360d52e5d7f
-EBUILD zfs-kmod-2.0.0_rc2.ebuild 4312 BLAKE2B be95eaac5695ad30175fd32a9a95ca39376b82f667f91071b7e5d71c30c6c37d187fb137d93734b0c8ab21a70a8fd71317d5195db3452dcc09721c4df62a265c SHA512 cc6eac9ec1ee142b4fd2fabb7bb239374c5239a65222f45002b1e32c48a728ac936de398cecbd74b05669b8717579483ad1b4ba553d78e5dc205955bb52265e7
-EBUILD zfs-kmod-9999.ebuild 4312 BLAKE2B be95eaac5695ad30175fd32a9a95ca39376b82f667f91071b7e5d71c30c6c37d187fb137d93734b0c8ab21a70a8fd71317d5195db3452dcc09721c4df62a265c SHA512 cc6eac9ec1ee142b4fd2fabb7bb239374c5239a65222f45002b1e32c48a728ac936de398cecbd74b05669b8717579483ad1b4ba553d78e5dc205955bb52265e7
+DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
+DIST zfs-2.0.0-rc6.tar.gz 12896465 BLAKE2B e7a91d980940998a7312d48a43c07561e3b1aa72cc6f88eb534cb39b5e18de4280964ba7f690b63f5e2dd3cfdeb57d718d7389f8ab2062ff7bb6e8bb4174801a SHA512 5daf8d39766f8c8f8bca340585ae36c39507e33642a7cd2dadb74bbe1d529d5be40420057edc95814c0b554121128c0ebde59c3fbed17259870b123a56acd2e8
+DIST zfs-2.0.0-rc7.tar.gz 12994030 BLAKE2B 12dde3b935cddabd3d3e5874685cd914f0338526ba8d22aaba2b1ff09aae64a67cc66ea0acc7d08cdc438fd8dfc93a2727bab5e90c08c2a294074692f4189214 SHA512 fbef7bc76c2b913ef8c4af55e6feb46bcadbca856b8ba28c72432bb91b8dc88de191d657aaeb5efd67ee2d67a6ffcf5d3d53b4490f9a32211a571687694e7e65
+EBUILD zfs-kmod-0.8.5.ebuild 4537 BLAKE2B 4cc63f9a5645b5ea988f9a4ccc3aacb1d0e0091047192210a39273ba35cbf7bdde85c495194e9777c84478de2041ed4b44692bacfc82830c6105264d07c8076a SHA512 9bf1464089fa6b0b1dadf4799174ad87331c9f322b59dd234a01542714eabec8fefdc677cbfe7a7f14af0c0067e58599c7342ef0cfea1517aa913781cb62a322
+EBUILD zfs-kmod-2.0.0_rc6.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89
+EBUILD zfs-kmod-2.0.0_rc7.ebuild 4316 BLAKE2B 1e999fd68487f8fb2f4fa66210a530820858e89984985d069d9b4ec0668fc7d385a316ce724334d92893c30cf115a6c91c674f8f0ea06f4b1b10bb285afaf859 SHA512 18bb55ac74eb466d04832fcfab34b2f7e4d118d341314474f7d25b3fba6769161732d3bb50ac91845c8f6d71350ddf023911ddad2470c5331e1e7c04ef0a6c89
+EBUILD zfs-kmod-9999.ebuild 4317 BLAKE2B f805e2c20a65d928b89496aaff71f548c49594b5f4d7decf776339a173b16f39ea5a7e0bfca78f5b1fc01c08ea3a06fa11317458dc2cc4022bdf459d273d68ed SHA512 4ce6398c6ec3cb2015751b0deb6e8694afa22a6b19b0ca83661eed0e195f7ac06f5fb73eaa52a4d86ad2c039dd300de4d49c8901a51e1d80dd37b3e1b0185319
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch b/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch
deleted file mode 100644
index 1a2948a3158c..000000000000
--- a/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From bd0efd1f062bfba5dd2d6b1fe30b6949f8e0a8ef Mon Sep 17 00:00:00 2001
-From: sterlingjensen <5555776+sterlingjensen@users.noreply.github.com>
-Date: Mon, 24 Aug 2020 22:41:05 -0500
-Subject: [PATCH] Mark lua setjmp/longjmp for powerpc weak
-
-Linux already defines setjmp/longjmp for powerpc, which leads to
-duplicate symbols in a statically linked build.
-
-Signed-off-by: Sterlng Jensen <sterlingjensen@users.noreply.github.com>
----
- module/lua/setjmp/setjmp_ppc.S | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/module/lua/setjmp/setjmp_ppc.S b/module/lua/setjmp/setjmp_ppc.S
-index f787ef34913..72aa5d5ab5b 100644
---- a/module/lua/setjmp/setjmp_ppc.S
-+++ b/module/lua/setjmp/setjmp_ppc.S
-@@ -56,7 +56,7 @@
- #define	ENTRY(name) \
- 	.align 2 ; \
- 	.type name,@function; \
--	.globl name; \
-+	.weak name; \
- name:
- 
- #else /* PPC64_ELF_ABI_v1 */
-@@ -65,8 +65,8 @@ name:
- #define	GLUE(a,b) XGLUE(a,b)
- #define	ENTRY(name) \
- 	.align 2 ; \
--	.globl name; \
--	.globl GLUE(.,name); \
-+	.weak name; \
-+	.weak GLUE(.,name); \
- 	.pushsection ".opd","aw"; \
- name: \
- 	.quad GLUE(.,name); \
-@@ -83,8 +83,8 @@ GLUE(.,name):
- #define	ENTRY(name) \
- 	.text; \
- 	.p2align 4; \
--	.globl  name; \
--	.type   name,@function; \
-+	.weak name; \
-+	.type name,@function; \
- name:
- 
- #endif /* __powerpc64__ */
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.5.ebuild
index 18afe59c4a99..c5b1b6d6625d 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.5.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
 	KEYWORDS="amd64 arm64 ppc64"
 	S="${WORKDIR}/zfs-${PV}"
-	ZFS_KERNEL_COMPAT="5.6"
+	ZFS_KERNEL_COMPAT="5.9"
 fi
 
 LICENSE="CDDL debug? ( GPL-2+ )"
@@ -37,8 +37,6 @@ RESTRICT="debug? ( strip ) test"
 
 DOCS=( AUTHORS COPYRIGHT META README.md )
 
-PATCHES=( "${FILESDIR}/${PV}-powerpc_jmp_weak.patch" )
-
 pkg_setup() {
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc6.ebuild
index 689dcbc44941..81328da6d290 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc6.ebuild
@@ -16,10 +16,10 @@ else
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64"
 	S="${WORKDIR}/zfs-${PV%_rc?}"
-	ZFS_KERNEL_COMPAT="5.8"
+	ZFS_KERNEL_COMPAT="5.9"
 fi
 
-LICENSE="CDDL debug? ( GPL-2+ )"
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild
new file mode 100644
index 000000000000..81328da6d290
--- /dev/null
+++ b/sys-fs/zfs-kmod/zfs-kmod-2.0.0_rc7.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic linux-mod toolchain-funcs
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	MY_PV="${PV/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	S="${WORKDIR}/zfs-${PV%_rc?}"
+	ZFS_KERNEL_COMPAT="5.9"
+fi
+
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
+SLOT="0"
+IUSE="custom-cflags debug +rootfs"
+
+DEPEND=""
+
+RDEPEND="${DEPEND}
+	!sys-kernel/spl
+"
+
+BDEPEND="
+	dev-lang/perl
+	virtual/awk
+"
+
+RESTRICT="debug? ( strip ) test"
+
+DOCS=( AUTHORS COPYRIGHT META README.md )
+
+pkg_setup() {
+	CONFIG_CHECK="
+		!DEBUG_LOCK_ALLOC
+		EFI_PARTITION
+		MODULES
+		!PAX_KERNEXEC_PLUGIN_METHOD_OR
+		!TRIM_UNUSED_KSYMS
+		ZLIB_DEFLATE
+		ZLIB_INFLATE
+	"
+
+	use debug && CONFIG_CHECK="${CONFIG_CHECK}
+		FRAME_POINTER
+		DEBUG_INFO
+		!DEBUG_INFO_REDUCED
+	"
+
+	use rootfs && \
+		CONFIG_CHECK="${CONFIG_CHECK}
+			BLK_DEV_INITRD
+			DEVTMPFS
+	"
+
+	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
+
+	if [[ ${PV} != "9999" ]]; then
+		local kv_major_max kv_minor_max zcompat
+		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
+		kv_major_max="${zcompat%%.*}"
+		zcompat="${zcompat#*.}"
+		kv_minor_max="${zcompat%%.*}"
+		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
+			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
+
+	fi
+
+	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
+
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	else
+		# Set module revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+}
+
+src_configure() {
+	set_arch_to_kernel
+
+	use custom-cflags || strip-flags
+
+	filter-ldflags -Wl,*
+
+	local myconf=(
+		CROSS_COMPILE="${CHOST}-"
+		HOSTCC="$(tc-getBUILD_CC)"
+		--bindir="${EPREFIX}/bin"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=kernel
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		$(use_enable debug)
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	myemakeargs=(
+		CROSS_COMPILE="${CHOST}-"
+		HOSTCC="$(tc-getBUILD_CC)"
+		V=1
+	)
+
+	emake "${myemakeargs[@]}"
+}
+
+src_install() {
+	set_arch_to_kernel
+
+	myemakeargs+=(
+		DEPMOD="/bin/true"
+		DESTDIR="${D}"
+		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+	)
+
+	emake "${myemakeargs[@]}" install
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	# Remove old modules
+	if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
+		ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
+		ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
+		ewarn "Automatically removing old modules to avoid problems."
+		rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
+	fi
+
+	if use x86 || use arm; then
+		ewarn "32-bit kernels will likely require increasing vmalloc to"
+		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
+	fi
+
+	ewarn "This version of OpenZFS includes support for new feature flags"
+	ewarn "that are incompatible with previous versions. GRUB2 support for"
+	ewarn "/boot with the new feature flags is not yet available."
+	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
+	ewarn "Any new pools will be created with the new feature flags by default"
+	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
+	ewarn "create a newpool that is backward compatible wih GRUB2, use "
+	ewarn
+	ewarn "zpool create -d -o feature@async_destroy=enabled "
+	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
+	ewarn "	-o feature@spacemap_histogram=enabled"
+	ewarn "	-o feature@enabled_txg=enabled "
+	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
+	ewarn "	..."
+	ewarn
+	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
+	ewarn "developers do a tag or the Gentoo developers find time to backport"
+	ewarn "support from GRUB2 HEAD."
+}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 689dcbc44941..e0bcf6bac5bb 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -16,10 +16,10 @@ else
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64"
 	S="${WORKDIR}/zfs-${PV%_rc?}"
-	ZFS_KERNEL_COMPAT="5.8"
+	ZFS_KERNEL_COMPAT="5.10"
 fi
 
-LICENSE="CDDL debug? ( GPL-2+ )"
+LICENSE="CDDL MIT debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
 
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 5cc774d275a4..1c4bb2e0b701 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,9 +1,9 @@
-AUX 0.8.4-initconfdir.patch 1004 BLAKE2B fd4186b5f378f562098040a8e13a12e6fd7f0f37f3b981a8d46e0e3bc943eb8dd5fa474e6c65cefd8c03fc3c45a119f6a141d42753ce4729e3a234e7f57dc4b8 SHA512 c18e9cd03d537a3ad632e1aeb354b56f5db9a8ef51c30b2e728ea527b7e9017219b1a230374238ecdd24082d9f2c62510aea68b234df84961ada5dce2ed617cc
-AUX 2.0.0_rc2-exports-d-permissions.patch 5290 BLAKE2B 40973b72df805d4e8ef4d02acbfa05e70fbdcdc0484c9f69960800a3b354998ee179e2fad3553264ecd442ffcbd1c3c9a992e48f6b81dec199501b0d0aac1207 SHA512 0a23bb1ee709c9229297388252ea657d18d368952095eb6f4598b4b17c6f693d592abd466b8be2c92f343b8f2588fcb22704c935209e1e43ea7856ed17f5fa66
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
-DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
-DIST zfs-2.0.0-rc2.tar.gz 12854085 BLAKE2B 73cabd565c11eef1bebbc391f8c4ba18acd1610f98f1b8afb507bc844f4b6a64ba32d9727e634c7f26c48fe365a841bf071513df234b9b7a87e954610a6d7f3b SHA512 14b17d06124890efef15b3b073e103c9faeecaea761779fff9a8420e3ab72fa611df9875fa766a323d69646e9025f8b19f918ded4c6705af116cf9f14eea4f40
-EBUILD zfs-0.8.4-r2.ebuild 5645 BLAKE2B 162d5f2689b7842df19fa7ffb21579faa2f0c8d5a3ab5251cb6a427667957de78ca3c4228f51874851454e3b25613c13f32d179ce308194c4af3e75d8fa07a2e SHA512 57d265e0b9128e1d2a13863f87377ba00026bd0f8ff4dc42604b0efce167224be3fb32a051735da79ce303750913b7ab2444195fcfc33b497e8842fd12b7f3b3
-EBUILD zfs-2.0.0_rc2-r1.ebuild 5911 BLAKE2B b59fd2636f280632ad6ce84da9f6336028a5ce38d60d37c6c95d93fbef860e0e24b15c7b2ecd084af5de5727adf2377c0dd8e794475da96e24fc9e19399cab71 SHA512 abdff63d208e07dea79cb1c06f587762ba770e6f30cae2780211e235ab0da5dea96077f89776092adf453cf495200596f576348a4f9e59e489b323b88d393860
-EBUILD zfs-9999.ebuild 5861 BLAKE2B 1a235667de2aeb65ceca37e11867ffd75a35852e91ae0e0e1141530b1eec73bffa42acc01c29dff84d6cd21333cd41481e5c4c11f5772b96f65b83d0759ccda1 SHA512 3f7b2cf46e2508feaa6b7aa31733a8117a8d5ac11defaf60a7d33e201b932c742d84202044dfcb399bb916003ca9b50d5fbb57134af82485a5a0b018e62b5e32
+DIST zfs-0.8.5.tar.gz 9196381 BLAKE2B 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab SHA512 3e6e70b76f7cc5b018adb78ce7c3009f88faf5b3da0a03170b03577cd84a2937b6056621c41fc819fd08bf59b28053caf8fec375cf375816a6786bb5646ed773
+DIST zfs-2.0.0-rc6.tar.gz 12896465 BLAKE2B e7a91d980940998a7312d48a43c07561e3b1aa72cc6f88eb534cb39b5e18de4280964ba7f690b63f5e2dd3cfdeb57d718d7389f8ab2062ff7bb6e8bb4174801a SHA512 5daf8d39766f8c8f8bca340585ae36c39507e33642a7cd2dadb74bbe1d529d5be40420057edc95814c0b554121128c0ebde59c3fbed17259870b123a56acd2e8
+DIST zfs-2.0.0-rc7.tar.gz 12994030 BLAKE2B 12dde3b935cddabd3d3e5874685cd914f0338526ba8d22aaba2b1ff09aae64a67cc66ea0acc7d08cdc438fd8dfc93a2727bab5e90c08c2a294074692f4189214 SHA512 fbef7bc76c2b913ef8c4af55e6feb46bcadbca856b8ba28c72432bb91b8dc88de191d657aaeb5efd67ee2d67a6ffcf5d3d53b4490f9a32211a571687694e7e65
+EBUILD zfs-0.8.5.ebuild 5695 BLAKE2B 05e6a12ea2ab6c7655b2a62d642ed97a9acaa59959f648896a20f9b2336b81af79a60a398e5ad53844b7173abe95705b18fd420362f7e82182896ef0360a637f SHA512 f879e459304b5a2a3a53c5ebb01c0d54d822c3f1f1abb4d26c7a065bc5a184b744aab2777340b7bee9227a855cae4bf44e9cb1ab61b98031b1190d3b387a9367
+EBUILD zfs-2.0.0_rc6.ebuild 5952 BLAKE2B 617854bd385ad9f86e8c031c1e96771776d4fd0fb963fe22fc2580d6befd3008e19492ec0023dfdf073a229289c19fb2227f818e9ce5631b5c66f55c2dd55d60 SHA512 e2d6f029c687c32440a35069e22d8cb38c6677999c737ad32c8d73ea43d04fc1234314f55fdc0e072e4bcc967ed73fde6c66055b9153603d10cc3b0582f51cc4
+EBUILD zfs-2.0.0_rc7.ebuild 6017 BLAKE2B 7840d4202527a1ace8caeb8b0ef251e9ffc7382aac43338e4b8f786189be5a11ad06d7024f4c5acaa7aff042341391185e10092860d61b8dcaf262b3ddc42b26 SHA512 5256bec61f8e04e6f7eae77fb57c6d16bf95687a799a49ab51b84c1df9ad089ba94d36c5d08f3f5b1a7728a943b7e94c55521eae6ec813cf9790e9ad4e8deb8a
+EBUILD zfs-9999.ebuild 6017 BLAKE2B 7840d4202527a1ace8caeb8b0ef251e9ffc7382aac43338e4b8f786189be5a11ad06d7024f4c5acaa7aff042341391185e10092860d61b8dcaf262b3ddc42b26 SHA512 5256bec61f8e04e6f7eae77fb57c6d16bf95687a799a49ab51b84c1df9ad089ba94d36c5d08f3f5b1a7728a943b7e94c55521eae6ec813cf9790e9ad4e8deb8a
 MISC metadata.xml 1003 BLAKE2B 640ef6d6f178ae9c3f3281a8e8539980c4a263f6cf0c5f4e1de3f0572f2acfe409865e85a12473129eb026130c9b76b946ee7698bd990b05f14e6b26c40fcb22 SHA512 965eabb5488a3cb54b360b33c847a2eb0d326a2c6761d86d581e06c2f52db9478fe7df131f68cb57bf32a2a872ecc1597e2a1a6b457d254f578d684cf73810c5
diff --git a/sys-fs/zfs/files/0.8.4-initconfdir.patch b/sys-fs/zfs/files/0.8.4-initconfdir.patch
deleted file mode 100644
index aac40896f39b..000000000000
--- a/sys-fs/zfs/files/0.8.4-initconfdir.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5dbe98184278878746a5f548fead1d2ef1e98dbe Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Tue, 26 May 2020 16:44:54 -0700
-Subject: [PATCH] 0.8.4 initconfdir
-
-fix for https://github.com/openzfs/zfs/issues/10375
-
----
- etc/zfs/Makefile.am | 1 +
- etc/zfs/Makefile.in | 9 +++++----
- 2 files changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/etc/zfs/Makefile.am b/openzfs/etc/zfs/Makefile.am
-index 81567a4..5370f41 100644
---- a/etc/zfs/Makefile.am
-+++ b/etc/zfs/Makefile.am
-@@ -1,4 +1,5 @@
- pkgsysconfdir = $(sysconfdir)/zfs
-+initconfdir = $(DEFAULT_INITCONF_DIR)
- 
- pkgsysconf_DATA = \
- 	vdev_id.conf.alias.example \
-diff --git a/etc/zfs/Makefile.in b/etc/zfs/Makefile.in
-index fb02811..795d3b1 100644
-@@ -571,6 +571,7 @@ udevdir = @udevdir@
- udevruledir = @udevruledir@
- zfsexecdir = @zfsexecdir@
- pkgsysconfdir = $(sysconfdir)/zfs
-+initconfdir = $(DEFAULT_INITCONF_DIR)
- pkgsysconf_DATA = \
- 	vdev_id.conf.alias.example \
- 	vdev_id.conf.sas_direct.example \
--- 
-2.26.2
-
diff --git a/sys-fs/zfs/files/2.0.0_rc2-exports-d-permissions.patch b/sys-fs/zfs/files/2.0.0_rc2-exports-d-permissions.patch
deleted file mode 100644
index 4acaf465a7bc..000000000000
--- a/sys-fs/zfs/files/2.0.0_rc2-exports-d-permissions.patch
+++ /dev/null
@@ -1,189 +0,0 @@
-From fe413a4d901a243d98cfef16ea330f7114a104ea Mon Sep 17 00:00:00 2001
-From: George Wilson <george.wilson@delphix.com>
-Date: Tue, 15 Sep 2020 22:57:16 -0400
-Subject: [PATCH] zpool command complains about /etc/exports.d
-
-If the /etc/exports.d directory does not exist, then we should only
-create it when we're performing an action which already requires root
-privileges.
-
-This commit moves the directory creation to the enable/disable code
-path which ensures that we have the appropriate privileges.
-
-Signed-off-by: George Wilson <gwilson@delphix.com>
-Closes #10785
----
- lib/libshare/os/freebsd/nfs.c | 36 +++++++++++-------
- lib/libshare/os/linux/nfs.c   | 71 ++++++++++++++++++++---------------
- 2 files changed, 64 insertions(+), 43 deletions(-)
-
-diff --git a/lib/libshare/os/freebsd/nfs.c b/lib/libshare/os/freebsd/nfs.c
-index 65f3b11bf9b..5951b9eafa2 100644
---- a/lib/libshare/os/freebsd/nfs.c
-+++ b/lib/libshare/os/freebsd/nfs.c
-@@ -228,21 +228,33 @@ nfs_copy_entries(char *filename, const char *mountpoint)
- 	int error = SA_OK;
- 	char *line;
- 
--	/*
--	 * If the file doesn't exist then there is nothing more
--	 * we need to do.
--	 */
- 	FILE *oldfp = fopen(ZFS_EXPORTS_FILE, "r");
--	if (oldfp == NULL)
--		return (SA_OK);
--
- 	FILE *newfp = fopen(filename, "w+");
-+	if (newfp == NULL) {
-+		fprintf(stderr, "failed to open %s file: %s", filename,
-+		    strerror(errno));
-+		fclose(oldfp);
-+		return (SA_SYSTEM_ERR);
-+	}
- 	fputs(FILE_HEADER, newfp);
--	while ((line = zgetline(oldfp, mountpoint)) != NULL)
--		fprintf(newfp, "%s\n", line);
--	if (ferror(oldfp) != 0) {
--		error = ferror(oldfp);
-+
-+	/*
-+	 * The ZFS_EXPORTS_FILE may not exist yet. If that's the
-+	 * case then just write out the new file.
-+	 */
-+	if (oldfp != NULL) {
-+		while ((line = zgetline(oldfp, mountpoint)) != NULL)
-+			fprintf(newfp, "%s\n", line);
-+		if (ferror(oldfp) != 0) {
-+			error = ferror(oldfp);
-+		}
-+		if (fclose(oldfp) != 0) {
-+			fprintf(stderr, "Unable to close file %s: %s\n",
-+			    filename, strerror(errno));
-+			error = error != 0 ? error : SA_SYSTEM_ERR;
-+		}
- 	}
-+
- 	if (error == 0 && ferror(newfp) != 0) {
- 		error = ferror(newfp);
- 	}
-@@ -252,8 +264,6 @@ nfs_copy_entries(char *filename, const char *mountpoint)
- 		    filename, strerror(errno));
- 		error = error != 0 ? error : SA_SYSTEM_ERR;
- 	}
--	fclose(oldfp);
--
- 	return (error);
- }
- 
-diff --git a/lib/libshare/os/linux/nfs.c b/lib/libshare/os/linux/nfs.c
-index a6a9b33d765..1efa321b7bc 100644
---- a/lib/libshare/os/linux/nfs.c
-+++ b/lib/libshare/os/linux/nfs.c
-@@ -393,6 +393,14 @@ static char *
- nfs_init_tmpfile(void)
- {
- 	char *tmpfile = NULL;
-+	struct stat sb;
-+
-+	if (stat(ZFS_EXPORTS_DIR, &sb) < 0 &&
-+	    mkdir(ZFS_EXPORTS_DIR, 0755) < 0) {
-+		fprintf(stderr, "failed to create %s: %s\n",
-+		    ZFS_EXPORTS_DIR, strerror(errno));
-+		return (NULL);
-+	}
- 
- 	if (asprintf(&tmpfile, "%s%s", ZFS_EXPORTS_FILE, ".XXXXXXXX") == -1) {
- 		fprintf(stderr, "Unable to allocate temporary file\n");
-@@ -481,36 +489,49 @@ nfs_copy_entries(char *filename, const char *mountpoint)
- 	size_t buflen = 0;
- 	int error = SA_OK;
- 
--	/*
--	 * If the file doesn't exist then there is nothing more
--	 * we need to do.
--	 */
- 	FILE *oldfp = fopen(ZFS_EXPORTS_FILE, "r");
--	if (oldfp == NULL)
--		return (SA_OK);
--
- 	FILE *newfp = fopen(filename, "w+");
-+	if (newfp == NULL) {
-+		fprintf(stderr, "failed to open %s file: %s", filename,
-+		    strerror(errno));
-+		fclose(oldfp);
-+		return (SA_SYSTEM_ERR);
-+	}
- 	fputs(FILE_HEADER, newfp);
--	while ((getline(&buf, &buflen, oldfp)) != -1) {
--		char *space = NULL;
- 
--		if (buf[0] == '\n' || buf[0] == '#')
--			continue;
--
--		if ((space = strchr(buf, ' ')) != NULL) {
--			int mountpoint_len = strlen(mountpoint);
-+	/*
-+	 * The ZFS_EXPORTS_FILE may not exist yet. If that's the
-+	 * case then just write out the new file.
-+	 */
-+	if (oldfp != NULL) {
-+		while (getline(&buf, &buflen, oldfp) != -1) {
-+			char *space = NULL;
- 
--			if (space - buf == mountpoint_len &&
--			    strncmp(mountpoint, buf, mountpoint_len) == 0) {
-+			if (buf[0] == '\n' || buf[0] == '#')
- 				continue;
-+
-+			if ((space = strchr(buf, ' ')) != NULL) {
-+				int mountpoint_len = strlen(mountpoint);
-+
-+				if (space - buf == mountpoint_len &&
-+				    strncmp(mountpoint, buf,
-+				    mountpoint_len) == 0) {
-+					continue;
-+				}
- 			}
-+			fputs(buf, newfp);
- 		}
--		fputs(buf, newfp);
--	}
- 
--	if (oldfp != NULL && ferror(oldfp) != 0) {
--		error = ferror(oldfp);
-+		if (ferror(oldfp) != 0) {
-+			error = ferror(oldfp);
-+		}
-+		if (fclose(oldfp) != 0) {
-+			fprintf(stderr, "Unable to close file %s: %s\n",
-+			    filename, strerror(errno));
-+			error = error != 0 ? error : SA_SYSTEM_ERR;
-+		}
- 	}
-+
- 	if (error == 0 && ferror(newfp) != 0) {
- 		error = ferror(newfp);
- 	}
-@@ -521,8 +542,6 @@ nfs_copy_entries(char *filename, const char *mountpoint)
- 		    filename, strerror(errno));
- 		error = error != 0 ? error : SA_SYSTEM_ERR;
- 	}
--	fclose(oldfp);
--
- 	return (error);
- }
- 
-@@ -701,13 +720,5 @@ static const sa_share_ops_t nfs_shareops = {
- void
- libshare_nfs_init(void)
- {
--	struct stat sb;
--
- 	nfs_fstype = register_fstype("nfs", &nfs_shareops);
--
--	if (stat(ZFS_EXPORTS_DIR, &sb) < 0 &&
--	    mkdir(ZFS_EXPORTS_DIR, 0755) < 0) {
--		fprintf(stderr, "failed to create %s: %s\n",
--		    ZFS_EXPORTS_DIR, strerror(errno));
--	}
- }
diff --git a/sys-fs/zfs/zfs-0.8.4-r2.ebuild b/sys-fs/zfs/zfs-0.8.5.ebuild
index 3bcbb4af433c..62af0741a227 100644
--- a/sys-fs/zfs/zfs-0.8.4-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.8.5.ebuild
@@ -20,7 +20,7 @@ else
 fi
 
 LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
+SLOT="0/2" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair
 IUSE="custom-cflags debug kernel-builtin libressl minimal nls python +rootfs test-suite static-libs"
 
 DEPEND="
@@ -75,7 +75,6 @@ RESTRICT="test"
 
 PATCHES=(
 	"${FILESDIR}/bash-completion-sudo.patch"
-	"${FILESDIR}/${PV}-initconfdir.patch"
 )
 
 pkg_setup() {
diff --git a/sys-fs/zfs/zfs-2.0.0_rc2-r1.ebuild b/sys-fs/zfs/zfs-2.0.0_rc6.ebuild
index 1f9d81f16e60..e5684e2ff427 100644
--- a/sys-fs/zfs/zfs-2.0.0_rc2-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.0.0_rc6.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
 inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
 
@@ -22,7 +22,7 @@ else
 fi
 
 LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
+SLOT="0/4" # just libzfs soname major for now. possible candidates: libuutil, libzpool, libnvpair
 IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
 
 DEPEND="
@@ -76,10 +76,7 @@ REQUIRED_USE="
 
 RESTRICT="test"
 
-PATCHES=(
-	"${FILESDIR}/bash-completion-sudo.patch"
-	"${FILESDIR}/${PV}-exports-d-permissions.patch"
-)
+PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
 
 pkg_setup() {
 	if use kernel_linux && use test-suite; then
diff --git a/sys-fs/zfs/zfs-2.0.0_rc7.ebuild b/sys-fs/zfs/zfs-2.0.0_rc7.ebuild
new file mode 100644
index 000000000000..83e1b87f58a5
--- /dev/null
+++ b/sys-fs/zfs/zfs-2.0.0_rc7.ebuild
@@ -0,0 +1,231 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
+
+DESCRIPTION="Userland utilities for ZFS Linux kernel module"
+HOMEPAGE="https://github.com/openzfs/zfs"
+
+if [[ ${PV} == "9999" ]] ; then
+	inherit git-r3 linux-mod
+	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
+else
+	MY_P="${P/_rc/-rc}"
+	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	S="${WORKDIR}/${P%_rc?}"
+fi
+
+LICENSE="BSD-2 CDDL MIT"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
+SLOT="0/4"
+IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
+
+DEPEND="
+	net-libs/libtirpc[static-libs?]
+	sys-apps/util-linux[static-libs?]
+	sys-libs/zlib[static-libs(+)?]
+	virtual/awk
+	virtual/libudev[static-libs(-)?]
+	libressl? ( dev-libs/libressl:0=[static-libs?] )
+	!libressl? ( dev-libs/openssl:0=[static-libs?] )
+	!minimal? ( ${PYTHON_DEPS} )
+	pam? ( sys-libs/pam )
+	python? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
+"
+
+BDEPEND="virtual/awk
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+"
+
+RDEPEND="${DEPEND}
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
+	!prefix? ( virtual/udev )
+	sys-fs/udev-init-scripts
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-kernel/genkernel-3.5.1.1
+	)
+	test-suite? (
+		sys-apps/kmod[tools]
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+	)
+"
+
+REQUIRED_USE="
+	!minimal? ( ${PYTHON_REQUIRED_USE} )
+	python? ( !minimal )
+	test-suite? ( !minimal )
+"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
+
+pkg_setup() {
+	if use kernel_linux && use test-suite; then
+		linux-info_pkg_setup
+
+		if  ! linux_config_exists; then
+			ewarn "Cannot check the linux kernel configuration."
+		else
+			if use test-suite; then
+				if linux_chkconfig_present BLK_DEV_LOOP; then
+					eerror "The ZFS test suite requires loop device support enabled."
+					eerror "Please enable it:"
+					eerror "    CONFIG_BLK_DEV_LOOP=y"
+					eerror "in /usr/src/linux/.config or"
+					eerror "    Device Drivers --->"
+					eerror "        Block devices --->"
+					eerror "            [X] Loopback device support"
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	else
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
+
+	# prevent errors showing up on zfs-mount stop, #647688
+	# openrc will unmount all filesystems anyway.
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" "etc/default/zfs.in" || die
+}
+
+src_configure() {
+	use custom-cflags || strip-flags
+	use minimal || python_setup
+
+	local myconf=(
+		--bindir="${EPREFIX}/bin"
+		--enable-shared
+		--enable-systemd
+		--enable-sysvinit
+		--localstatedir="${EPREFIX}/var"
+		--sbindir="${EPREFIX}/sbin"
+		--with-config=user
+		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
+		--with-linux="${KV_DIR}"
+		--with-linux-obj="${KV_OUT_DIR}"
+		--with-udevdir="$(get_udevdir)"
+		--with-pamconfigsdir="${EPREFIX}/unwanted_files"
+		--with-pammoduledir="$(getpam_mod_dir)"
+		--with-systemdunitdir="$(systemd_get_systemunitdir)"
+		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
+		--with-vendor=gentoo
+		$(use_enable debug)
+		$(use_enable nls)
+		$(use_enable pam)
+		$(use_enable python pyzfs)
+		$(use_enable static-libs static)
+		$(usex minimal --without-python --with-python="${EPYTHON}")
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
+}
+
+src_install() {
+	default
+
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
+
+	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
+
+	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
+
+	if ! use static-libs; then
+		find "${ED}/" -name '*.la' -delete || die
+	fi
+
+	dobashcomp contrib/bash_completion.d/zfs
+	bashcomp_alias zfs zpool
+
+	# strip executable bit from conf.d file
+	fperms 0644 /etc/conf.d/zfs
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	# enforce best available python implementation
+	use minimal || python_fix_shebang "${ED}/bin"
+}
+
+pkg_postinst() {
+	if use rootfs; then
+		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
+			elog "root on zfs requires initramfs to boot"
+			elog "the following packages known to provide one and tested on regular basis:"
+			elog "  sys-kernel/dracut"
+			elog "  sys-kernel/genkernel"
+		fi
+	fi
+
+	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
+		einfo "Adding ${P} to the module database to ensure that the"
+		einfo "kernel modules and userland utilities stay in sync."
+		update_moduledb
+	fi
+
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		einfo "Please refer to ${EROOT}/lib/systemd/system-preset/50-zfs.preset"
+		einfo "for default zfs systemd service configuration"
+	else
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+			einfo "You should add zfs-import to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+			einfo "You should add zfs-mount to the boot runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+			einfo "You should add zfs-share to the default runlevel."
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+			einfo "You should add zfs-zed to the default runlevel."
+	fi
+}
+
+pkg_postrm() {
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+		remove_moduledb
+	fi
+}
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index d2f00419b0c7..83e1b87f58a5 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
 
 inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
 
@@ -22,7 +22,9 @@ else
 fi
 
 LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
+# just libzfs soname major for now.
+# possible candidates: libuutil, libzpool, libnvpair. Those do not provide stable abi, but are considered.
+SLOT="0/4"
 IUSE="custom-cflags debug kernel-builtin libressl minimal nls pam python +rootfs test-suite static-libs"
 
 DEPEND="
@@ -165,7 +167,7 @@ src_compile() {
 src_install() {
 	default
 
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+	gen_usr_ldscript -a nvpair uutil zfsbootenv zfs zfs_core zpool
 
 	use pam && { rm -rv "${ED}/unwanted_files" || die ; }
author	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-11-25 22:39:15 +0000
commit	d934827bf44b7cfcf6711964418148fa60877668 (patch)
tree	0625f358789b5e015e49db139cc1dbc9be00428f /sys-fs
parent	2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)