gentoo resync : 15.12.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-12-15 18:09:03 +0000
commit: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree: 4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /sys-fs
parent: b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)
120 files changed, 1166 insertions, 2178 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 6bf04c7b70a2..8c61bcf6dd21 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bees/Manifest b/sys-fs/bees/Manifest
index 67aed4358fc7..a38c6dd507b9 100644
--- a/sys-fs/bees/Manifest
+++ b/sys-fs/bees/Manifest
@@ -1,4 +1,7 @@
+AUX 6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch 1281 BLAKE2B 07eb31ec5abbc62edd8edec111a3f3174f62c587ceeb80736f6cd7992357e41af4976ef528a8668064ddad7e0ccea5ab281f41e8e062bd2606e6cc7c376a90c4 SHA512 ebf16d968acd8a22135c08f4c6e68bebf30651bc93c1e27453b1d7ca35d09d755dd36064b7e42204e6d8fe9b06d6c316cc8c7362df0ff548cff181830e7375ee
+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.ebuild 2163 BLAKE2B ff19324ee3197e256b0d51a2665daed49f0daaaf5c6fee8949535d8d7a1b4cc898bd6e0c431484c5417cbb46c8ace4b0c422d170aad937a66cb3f85acee6dd1a SHA512 d138eac94780292ee369468d03c71d122f531e8a2a26b7e70ad1e82bbe3b10e5ab72f8752f9b97d81e0cfd924f0a9d68c024173e220ae988f5bf2dc0a8fad5c0
-EBUILD bees-9999.ebuild 2099 BLAKE2B 88a9e370419db85e8f459626489a4dd06fbc55abd59ad367229d0aa4eb360bbbca0d4f46e4feada0d01d434a360bdac4015c3bfc063af3eb1940c3ada6a34665 SHA512 65745b2e09d1b7231a9ea29d78479f68f2d3a628353032ccaaf43245376e526721fae5f0a22a3586462634271a9798feb4608bc2349a48d2c5e7df7052bf5970
+EBUILD bees-0.6.1-r2.ebuild 3457 BLAKE2B febaf40d1f788f0cf9ee9f29b00451ad0fb7966ee350805fa5b45da6200cde0313bf739b2ba679a4d048ea4b4d574b1b2e7162ec8948e75c1b4c68513543606f SHA512 dc2499510acbf17a630a638f31bc7a176f6e16397f3e623b3c6c12f7f7816878302b4a3829de03415551f626722d91d093ea66eae151c316facbd7d43fb62b42
+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.ebuild b/sys-fs/bees/bees-0.6.1-r2.ebuild
index a232eb5d07fd..38c83939e49a 100644
--- a/sys-fs/bees/bees-0.6.1.ebuild
+++ b/sys-fs/bees/bees-0.6.1-r2.ebuild
@@ -22,13 +22,19 @@ IUSE="tools"
 
 DEPEND="
 	>=sys-apps/util-linux-2.30.2
-	>=sys-fs/btrfs-progs-4.1
+	>=sys-fs/btrfs-progs-4.20.2
 "
 RDEPEND="${DEPEND}"
 
 CONFIG_CHECK="~BTRFS_FS"
 ERROR_BTRFS_FS="CONFIG_BTRFS_FS: bees does currently only work with btrfs"
 
+PATCHES=(
+	"${FILESDIR}/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch"
+	"${FILESDIR}/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch"
+	"${FILESDIR}/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch"
+)
+
 pkg_pretend() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
 		if kernel_is -lt 4 4 3; then
@@ -48,7 +54,27 @@ pkg_pretend() {
 			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
 			ewarn
 		fi
-		elog "Bees recommends to run the latest current kernel for performance and"
+
+		if kernel_is -lt 5 3 4; then
+			ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running"
+			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
+			ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
+			ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
+			ewarn "the device RO without writing corrupted meta-data. More details:"
+			ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
+			ewarn
+		fi
+
+		if kernel_is -lt 5 0 4; then
+			ewarn "IMPORTANT: With kernel versions below 5.0.4, you may experience data corruption"
+			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
+			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
+			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
+			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
+			ewarn
+		fi
+
+		elog "Bees recommends running the latest current kernel for performance and"
 		elog "reliability reasons, see README.md."
 	fi
 }
diff --git a/sys-fs/bees/bees-9999.ebuild b/sys-fs/bees/bees-9999.ebuild
index 22a1b0a48880..0bfb2654d893 100644
--- a/sys-fs/bees/bees-9999.ebuild
+++ b/sys-fs/bees/bees-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,7 +22,7 @@ IUSE="tools"
 
 DEPEND="
 	>=sys-apps/util-linux-2.30.2
-	>=sys-fs/btrfs-progs-4.1
+	>=sys-fs/btrfs-progs-4.20.2
 "
 RDEPEND="${DEPEND}"
 
@@ -48,7 +48,27 @@ pkg_pretend() {
 			ewarn "# WARNING: CPU: 3 PID: 18172 at fs/btrfs/backref.c:1391 find_parent_nodes+0xc41/0x14e0"
 			ewarn
 		fi
-		elog "Bees recommends to run the latest current kernel for performance and"
+
+		if kernel_is -lt 5 3 4; then
+			ewarn "With kernel versions below 5.3.4, bees may trigger a btrfs bug when running"
+			ewarn "btrfs-balance in parallel. This may lead to meta-data corruption in the worst"
+			ewarn "case. Especially, kernels 5.1.21 and 5.2.21 should be avoided. Kernels 5.0.x"
+			ewarn "after 5.0.21 should be safe. In the best case, affected kernels may force"
+			ewarn "the device RO without writing corrupted meta-data. More details:"
+			ewarn "https://github.com/Zygo/bees/blob/master/docs/btrfs-kernel.md"
+			ewarn
+		fi
+
+		if kernel_is -lt 5 0 4; then
+			ewarn "IMPORTANT: With kernel versions below 5.0.4, you may experience data corruption"
+			ewarn "due to bees using compression in btrfs. You are adviced to use a chronologically"
+			ewarn "later kernel, that includes older LTS versions released after 5.0.4:"
+			ewarn "Fixed in: 5.1+, 5.0.4+, 4.19.31+, 4.14.108+, 4.9.165+, 4.4.177+, 3.18.137+"
+			ewarn "# commit 8e92821 btrfs: fix corruption reading shared and compressed extents after hole punching"
+			ewarn
+		fi
+
+		elog "Bees recommends running the latest current kernel for performance and"
 		elog "reliability reasons, see README.md."
 	fi
 }
diff --git a/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch b/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch
new file mode 100644
index 000000000000..60ab748eb2b6
--- /dev/null
+++ b/sys-fs/bees/files/6001-lib-fix-non-local-lambda-expression-cannot-have-a-ca.patch
@@ -0,0 +1,38 @@
+From 566df54a3f7458559b75455a95b1991b515ba6bf Mon Sep 17 00:00:00 2001
+From: Zygo Blaxell <zblaxell@thirteen.furryterror.org>
+Date: Wed, 12 Jun 2019 21:27:50 -0400
+Subject: [PATCH 1/2] lib: fix non-local lambda expression cannot have a
+ capture-default
+
+We got away with this because GCC 4.8 (and apparently every GCC prior
+to 9) didn't notice or care, and because there is nothing referenced
+inside the lambda function body that isn't accessible from any other
+kind of function body (i.e. the capture wasn't needed at all).
+
+GCC 9 now enforces what the C++ standard said all along:  there is
+no need to allow capture-default in this case, so it is not.
+
+Fix by removing the offending capture-default.
+
+Fixes: https://github.com/Zygo/bees/issues/112
+Signed-off-by: Zygo Blaxell <bees@furryterror.org>
+---
+ lib/error.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/error.cc b/lib/error.cc
+index f2a6db0..1d16a0a 100644
+--- a/lib/error.cc
++++ b/lib/error.cc
+@@ -32,7 +32,7 @@ namespace crucible {
+ 
+ 	// FIXME:  could probably avoid some of these levels of indirection
+ 	static
+-	function<void(string s)> current_catch_explainer = [&](string s) {
++	function<void(string s)> current_catch_explainer = [](string s) {
+ 		cerr << s << endl;
+ 	};
+ 
+-- 
+2.23.0
+
diff --git a/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch b/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch
new file mode 100644
index 000000000000..6d8d2ea530d5
--- /dev/null
+++ b/sys-fs/bees/files/6002-context-workaround-to-prevent-LOGICAL_INO-and-btrfs-.patch
@@ -0,0 +1,95 @@
+From f731ea8016c570243c783adef96681b535d9c927 Mon Sep 17 00:00:00 2001
+From: Zygo Blaxell <bees@furryterror.org>
+Date: Tue, 19 Nov 2019 16:01:31 -0500
+Subject: [PATCH 2/2] context: workaround to prevent LOGICAL_INO and btrfs
+ balance from running concurrently
+
+This avoids some kernel bugs.  One of them is fixed in 5.3.4 and later:
+
+	efad8a853a "Btrfs: fix use-after-free when using the tree modification log"
+
+There are apparently others in current kernels, so for now just put bees
+on pause until the balance is done.
+
+At some point we may want to provide an option to disable this
+workaround; however, running bees and balance at the same time makes
+neither particularly fast, so maybe we'll just leave it this way.
+
+Signed-off-by: Zygo Blaxell <bees@furryterror.org>
+---
+ src/bees-context.cc | 31 +++++++++++++++++++++++++++++++
+ src/bees.h          |  4 ++++
+ 2 files changed, 35 insertions(+)
+
+diff --git a/src/bees-context.cc b/src/bees-context.cc
+index 4e0a43e..0665019 100644
+--- a/src/bees-context.cc
++++ b/src/bees-context.cc
+@@ -760,11 +760,42 @@ BeesResolveAddrResult::BeesResolveAddrResult()
+ {
+ }
+ 
++void
++BeesContext::wait_for_balance()
++{
++	Timer balance_timer;
++	BEESNOTE("WORKAROUND: waiting for balance to stop");
++	while (true) {
++		btrfs_ioctl_balance_args args;
++		memset_zero<btrfs_ioctl_balance_args>(&args);
++		const int ret = ioctl(root_fd(), BTRFS_IOC_BALANCE_PROGRESS, &args);
++		if (ret < 0) {
++			// Either can't get balance status or not running, exit either way
++			break;
++		}
++
++		if (!(args.state & BTRFS_BALANCE_STATE_RUNNING)) {
++			// Balance not running, doesn't matter if paused or cancelled
++			break;
++		}
++
++		BEESLOGDEBUG("WORKAROUND: Waiting " << balance_timer << "s for balance to stop");
++		sleep(BEES_BALANCE_POLL_INTERVAL);
++	}
++}
++
+ BeesResolveAddrResult
+ BeesContext::resolve_addr_uncached(BeesAddress addr)
+ {
+ 	THROW_CHECK1(invalid_argument, addr, !addr.is_magic());
+ 	THROW_CHECK0(invalid_argument, !!root_fd());
++
++	// Is there a bug where resolve and balance cause a crash (BUG_ON at fs/btrfs/ctree.c:1227)?
++	// Apparently yes, and more than one.
++	// Wait for the balance to finish before we run LOGICAL_INO
++	wait_for_balance();
++
++	// Time how long this takes
+ 	Timer resolve_timer;
+ 
+ 	// There is no performance benefit if we restrict the buffer size.
+diff --git a/src/bees.h b/src/bees.h
+index da87d88..5c9375c 100644
+--- a/src/bees.h
++++ b/src/bees.h
+@@ -114,6 +114,9 @@ const size_t BEES_TRANSID_FACTOR = 10;
+ // The actual limit in LOGICAL_INO seems to be 2730, but let's leave a little headroom
+ const size_t BEES_MAX_EXTENT_REF_COUNT = 2560;
+ 
++// Wait this long for a balance to stop
++const double BEES_BALANCE_POLL_INTERVAL = 60.0;
++
+ // Flags
+ const int FLAGS_OPEN_COMMON   = O_NOFOLLOW | O_NONBLOCK | O_CLOEXEC | O_NOATIME | O_LARGEFILE | O_NOCTTY;
+ const int FLAGS_OPEN_DIR      = FLAGS_OPEN_COMMON | O_RDONLY | O_DIRECTORY;
+@@ -708,6 +711,7 @@ class BeesContext : public enable_shared_from_this<BeesContext> {
+ 	void set_root_fd(Fd fd);
+ 
+ 	BeesResolveAddrResult resolve_addr_uncached(BeesAddress addr);
++	void wait_for_balance();
+ 
+ 	BeesFileRange scan_one_extent(const BeesFileRange &bfr, const Extent &e);
+ 	void rewrite_file_range(const BeesFileRange &bfr);
+-- 
+2.23.0
+
diff --git a/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch b/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch
new file mode 100644
index 000000000000..9f53e5b37da3
--- /dev/null
+++ b/sys-fs/bees/files/6003-process-Fix-gettid-ambiguity-with-glibc-2.30.patch
@@ -0,0 +1,97 @@
+From 0b7cf9c0f11722c7cb8a816e9118602b43d9a3f5 Mon Sep 17 00:00:00 2001
+From: Zygo Blaxell <bees@furryterror.org>
+Date: Tue, 29 Oct 2019 23:34:36 -0400
+Subject: [PATCH 3/3] process: Fix gettid() ambiguity with glibc >= 2.30
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In version 2.30 glibc added it's own gettid() function. This resulted in
+"error: call of overloaded ‘gettid()’ is ambiguous" because gettid()
+now exists in both namespace crucible and std.
+
+For now, use explicit references to namespace crucible.  This continues
+to work with new and old libc without having to test specific library
+versions.
+
+At some point, glibc gettid() will be deployed widely enough that we can
+remove the crucible version entirely.
+
+Signed-off-by: Zygo Blaxell <bees@furryterror.org>
+---
+ include/crucible/lockset.h | 4 ++--
+ lib/chatter.cc             | 4 ++--
+ src/bees.cc                | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/include/crucible/lockset.h b/include/crucible/lockset.h
+index 856c55e..99500b7 100644
+--- a/include/crucible/lockset.h
++++ b/include/crucible/lockset.h
+@@ -117,7 +117,7 @@ namespace crucible {
+ 		while (full() || locked(name)) {
+ 			m_condvar.wait(lock);
+ 		}
+-		auto rv = m_set.insert(make_pair(name, gettid()));
++		auto rv = m_set.insert(make_pair(name, crucible::gettid()));
+ 		THROW_CHECK0(runtime_error, rv.second);
+ 	}
+ 
+@@ -129,7 +129,7 @@ namespace crucible {
+ 		if (full() || locked(name)) {
+ 			return false;
+ 		}
+-		auto rv = m_set.insert(make_pair(name, gettid()));
++		auto rv = m_set.insert(make_pair(name, crucible::gettid()));
+ 		THROW_CHECK1(runtime_error, name, rv.second);
+ 		return true;
+ 	}
+diff --git a/lib/chatter.cc b/lib/chatter.cc
+index cbd5adb..e5a24f9 100644
+--- a/lib/chatter.cc
++++ b/lib/chatter.cc
+@@ -69,14 +69,14 @@ namespace crucible {
+ 			DIE_IF_ZERO(strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", &ltm));
+ 
+ 			header_stream << buf;
+-			header_stream << " " << getpid() << "." << gettid() << "<" << m_loglevel << ">";
++			header_stream << " " << getpid() << "." << crucible::gettid() << "<" << m_loglevel << ">";
+ 			if (!m_name.empty()) {
+ 				header_stream << " " << m_name;
+ 			}
+ 		} else {
+ 			header_stream << "<" << m_loglevel << ">";
+ 			header_stream << (m_name.empty() ? "thread" : m_name);
+-			header_stream << "[" << gettid() << "]";
++			header_stream << "[" << crucible::gettid() << "]";
+ 		}
+ 
+ 		header_stream << ": ";
+diff --git a/src/bees.cc b/src/bees.cc
+index 08c3fd7..aa55af0 100644
+--- a/src/bees.cc
++++ b/src/bees.cc
+@@ -115,9 +115,9 @@ BeesNote::~BeesNote()
+ 	tl_next = m_prev;
+ 	unique_lock<mutex> lock(s_mutex);
+ 	if (tl_next) {
+-		s_status[gettid()] = tl_next;
++		s_status[crucible::gettid()] = tl_next;
+ 	} else {
+-		s_status.erase(gettid());
++		s_status.erase(crucible::gettid());
+ 	}
+ }
+ 
+@@ -128,7 +128,7 @@ BeesNote::BeesNote(function<void(ostream &os)> f) :
+ 	m_prev = tl_next;
+ 	tl_next = this;
+ 	unique_lock<mutex> lock(s_mutex);
+-	s_status[gettid()] = tl_next;
++	s_status[crucible::gettid()] = tl_next;
+ }
+ 
+ void
+-- 
+2.23.0
+
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 12d2fc836704..d0d4ec583be9 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -2,8 +2,10 @@ AUX btrfs-progs-4.19-be-bswap.patch 1035 BLAKE2B 153ffa73bf79eca3172bd566d7daffd
 DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b098108f7363fc3c015d73bf9afcda9d579831fe0e324125893cdb2510873d052522b15843c461e640a546900e535ce76 SHA512 e5abf637a9c811973422ca05a5530f6cd18263013d141277e2a70099cf8ab7e0eb8781df56368da4321c90f21d1022ad852b661adc4877e9a9ba5c60ccbefdee
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v5.3.1.tar.xz 2077644 BLAKE2B f2943fd2215cfc65095e361824deb862c1934bb734c0f3073d8d0a7cb40c606e9e8054e36ae467f6d67f3ed58120493b9515f6a1d0d1062f864dd44521d1bab1 SHA512 7e7ac18a1ced5a8e5db7c0651ac438a48242fb4ca045b944527ed07ac91e87397dbab62b99d67d782501a632f4178db605e81912dfa48ac831d07177f96876fa
-EBUILD btrfs-progs-4.19.ebuild 2895 BLAKE2B abdc15e7c275830ef675616ca76117145b21c0105569b8bd9010949f21b5a9b85adf76ca6a0d2652e6ffffa8fd2b706cfe479659b33731d66da21d1bc9fe9d6e SHA512 2a1ff36eb7f79f8eea312821c729af96de045fd5d1032b224713a2fecfe9266e322f92dae27147d3a0a3fc43dd0e6a05759fe0ea9cac565b0f8db9f1537ab970
-EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
-EBUILD btrfs-progs-5.3.1.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
-EBUILD btrfs-progs-9999.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
+DIST btrfs-progs-v5.4.tar.xz 2103432 BLAKE2B 8ed1321c61d73b66bd27b37a255056e601302dacdcf2dd3122d1b7c41e537ebd1aa5df51100e61458084ec15efd6a1aa478d13f424d45d33d7454d886214a994 SHA512 cc445b9e2b7c5a0adeaa0c467de797f240e4ee9b58c6ac51b9dad51bc0ba0c580fd265efebc04fa46dc23e5b3c4d6baf3ad0b8e2e82728cf34ef51973f028a90
+EBUILD btrfs-progs-4.19.ebuild 2895 BLAKE2B 319a48ec9c610dfd28ccd91dbc11a978e6faf21f764da675d3ab5ed568d1d4beee4aacdea6e51dad68d5c17eddcd0081cbfe23ca862eeff576668c3c71182336 SHA512 3d34478a49484d2bf9cf4309c728886b7dc99f08a5d42f65225bd836f3e12411bec8140f3860e3b48cd7a6695212314fa5a4bdb75d9f5a2419e0a88e933763e1
+EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3aebd699880baa42196d1fc632ef36023401fa142d46f3d919c256a0b49209fee96f96b3a9e858e67c6b35f3298044c556ecdfcbf883532f134e4a3874b6e193 SHA512 af818f7c469477dd83fa3129d4f7065aaec0652fda04498c7f1aeeb03a3c60e4dd502545efdc24e37839d73d22a7fc4f82023a302f77a03c01ce016bd43b4aad
+EBUILD btrfs-progs-5.3.1.ebuild 3023 BLAKE2B cc4ecbb80df68e9fd2c714c53321a0599518461eed995e99a9af0792bf8fc4e739a7b930f3be8db6f8b271bc02d2fdd1c9fce6d7e24ea04c5aaa4e0d52db65d5 SHA512 3de10575039286ff068d01bdaae9ebf368e433476fc04fa03e9a88cad9e0f379a97760f2e3a52cf00ca9afb5f1d8e9867787cf9a610337a87952a4fe4bfac376
+EBUILD btrfs-progs-5.4.ebuild 3023 BLAKE2B cc4ecbb80df68e9fd2c714c53321a0599518461eed995e99a9af0792bf8fc4e739a7b930f3be8db6f8b271bc02d2fdd1c9fce6d7e24ea04c5aaa4e0d52db65d5 SHA512 3de10575039286ff068d01bdaae9ebf368e433476fc04fa03e9a88cad9e0f379a97760f2e3a52cf00ca9afb5f1d8e9867787cf9a610337a87952a4fe4bfac376
+EBUILD btrfs-progs-9999.ebuild 3023 BLAKE2B cc4ecbb80df68e9fd2c714c53321a0599518461eed995e99a9af0792bf8fc4e739a7b930f3be8db6f8b271bc02d2fdd1c9fce6d7e24ea04c5aaa4e0d52db65d5 SHA512 3de10575039286ff068d01bdaae9ebf368e433476fc04fa03e9a88cad9e0f379a97760f2e3a52cf00ca9afb5f1d8e9867787cf9a610337a87952a4fe4bfac376
 MISC metadata.xml 759 BLAKE2B 3f94ebaadb23c54121e8ffa1b80549b9e8a9d977d26ddcfdd8772e549e55fc762fcca5c8e2374a562dd9992086949eff626be71aa6da8326f8847cbc4f791fb7 SHA512 ababf03834be253af5402e167e7883fc73c6ad47198369eba02557e07ec8baaa81140837315e98979dc4b95ca160d2d984e970acdbf0ea4db9c2a9e9deddc9a8
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
index 72c6c1c855bf..895c7e396bd2 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild
index 5d5fe5103ac9..66404e352aa2 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 2008-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.3.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.3.1.ebuild
index 4680b387969c..d9472cc887d7 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.3.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild
new file mode 100644
index 000000000000..d9472cc887d7
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild
@@ -0,0 +1,125 @@
+# Copyright 2008-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{5,6,7} )
+
+inherit bash-completion-r1 python-single-r1
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV="v${PV/_/-}"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+	S="${WORKDIR}/${PN}-${MY_PV}"
+else
+	WANT_LIBTOOL=none
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert doc python reiserfs static static-libs +zstd"
+
+RESTRICT=test # tries to mount repared filesystems
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-apps/util-linux:0=[static-libs(+)?]
+	sys-libs/zlib:0=
+	convert? (
+		sys-fs/e2fsprogs:0=
+		sys-libs/e2fsprogs-libs:0=
+		reiserfs? (
+			>=sys-fs/reiserfsprogs-3.6.27
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	zstd? ( app-arch/zstd:0= )
+"
+DEPEND="${RDEPEND}
+	convert? ( sys-apps/acl )
+	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs:0[static-libs(+)]
+			sys-libs/e2fsprogs-libs:0[static-libs(+)]
+			reiserfs? (
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+			)
+		)
+		zstd? ( app-arch/zstd:0[static-libs(+)] )
+	)
+"
+BDEPEND="
+	doc? (
+		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
+		app-text/docbook-xml-dtd:4.5
+		app-text/xmlto
+	)
+"
+
+if [[ ${PV} == 9999 ]]; then
+	DEPEND+=" sys-devel/gnuconfig"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	if [[ ${PV} == 9999 ]]; then
+		AT_M4DIR=m4 eautoreconf
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+		$(use_enable convert)
+		$(use_enable doc documentation)
+		$(use_enable elibc_glibc backtrace)
+		$(use_enable python)
+		$(use_enable static-libs static)
+		$(use_enable zstd)
+		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_install() {
+	local makeargs=(
+		$(usex python install_python '')
+		$(usex static install-static '')
+	)
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+	newbashcomp btrfs-completion btrfs
+	use python && python_optimize
+
+	# install prebuilt subset of manuals
+	use doc || doman Documentation/*.[58]
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 4680b387969c..d9472cc887d7 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 2008-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 7c0f6e810991..ff65c0d9675f 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -2,7 +2,7 @@ AUX cryfs-0.10.2-install-targets.patch 1296 BLAKE2B d43ada858124c67242fdf537ae3d
 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
 DIST cryfs-0.9.9.tar.xz 977928 BLAKE2B 927d5f61be99a6400cfd53de6291e14ae32f446d281485901e758341f138a2efdfb7385b6c205db6f865dc83f6fbd9ede8fd1bb5a7957fb242624d78d2523eaf SHA512 18f0ce954dc9958b52a77aac85d4d30d03409e4f88c27ec3e904a6014f5257e12fe47a4f3bb628f6ebf3b5aa8cb9d3a59e0aee76d83a3f6bdd4ef864b66898aa
-EBUILD cryfs-0.10.2.ebuild 2255 BLAKE2B 0cd3cc3674854a332ecc01d68e7027181a76ad10a6f1ca025e597f629d2c48460f3677c5260cacdf684fb61c7cf463439423e5c55edd657e4f438765ad848898 SHA512 56dc18550bd54c1775470f3afe3add69d18668f0ccd3384fe6296886dc16f3e29167e044c41df658dd72759aa522b12cbd2d472c2ac49a8270036aa2db136ad9
-EBUILD cryfs-0.9.9-r1.ebuild 2417 BLAKE2B 64ea74e6da4876f568c2d419958c24f52f6be192034885517470557f06e2431ed43a87e24d02d7e73fee72b2f6c8cd81c11ed0f6a01a2a96a6055a987527070f SHA512 d69ffe66b45080e33b5ea58b33cf36541f6fe723387ba0a83d6ca7cdad55c46bbbc6002bcba882b9c18472ad109531083a258ea3228b36135785a95aba007cb1
-EBUILD cryfs-9999.ebuild 2308 BLAKE2B 1bded931f5fc1d0ab2d518e67100db4e4acbfdfcfee31481e2e16cf213542fced29d9704119fa606eea2d4419a5c403a0c843c742ff919adb7a0f112279be3f5 SHA512 5650bea45fd38dd81eeb5ead4eea51d2b6e9259f25c85ef4fb37e611cd5142ad93d6b11d2e1cd63f7b91b1802b5f46e7b9c336a86a4bc364b493465ac636c5b7
+EBUILD cryfs-0.10.2.ebuild 2282 BLAKE2B d96f7737c0b29bcb3884c5f70fc8f233b6cce44e2fbf4e28b83189bd6fda2f149a410fe98637318ff5c165796b8d5f6a69fd37d507e70bb879d854d091da06f9 SHA512 e272ef3c1ad24f2a0da51c6256ea6077a0086cb77d72eeae99bdbb37263438b83c07d6af288404889f90e2158a25badb18fc80e4c0e83854c9cc441fb1548dd6
+EBUILD cryfs-0.9.9-r1.ebuild 2444 BLAKE2B a981f4eb4c12024d8ca880e3affe8097f12dd68d3188320b0959c51a343e43052be1cf1e25cdd3f893baded41a6c66df55e61f9e4c72597bb69bb1e28b39be6a SHA512 8b3f8b7458e967324ff819ad62e3ca86fee76f4d89cbf78b9c075fb5b324785808d44ffc2ac0ef2e0818e837b7b797b3e4128720265c9e5a8e8efa1b48dd357e
+EBUILD cryfs-9999.ebuild 2335 BLAKE2B c7d37ff9619607f7cf585295ae95316fe5fea02253c931a742ae7a1831c4405688f5b4a83002c2f865808bce54758f336dad3f40581f17d4e2cec52f9a100486 SHA512 34bf3ab0f15ccc7e3d43bc2e0256d042c7909083bd27645b51c57b5b5517838ee0e1a75b31612401a0a8c0347c06fb98c4791896a23ad2c47b41befb127df5d2
 MISC metadata.xml 605 BLAKE2B cfbabba2fc835d75ab64ff6ea27f87639d27b0d8591d5d318e2c1768f68cb48a50995b7a96b045ba6da3491c4a50219a8a69de6a2efc28325b3bc852b4abf213 SHA512 e7b1aba09cebc2786c664b1f9dbbfeb7baff97536af721953c4eb2dc10d84c97e02277fa5c4532f8bb022a344731d6ea65be81cb3cc88c25d4dea70dcd6ce250
diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild
index 4844d38e7188..3be99d5e1469 100644
--- a/sys-fs/cryfs/cryfs-0.10.2.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="https://www.cryfs.org/"
 LICENSE="LGPL-3 MIT"
 SLOT="0"
 IUSE="custom-optimization debug libressl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/boost-1.65.1:=
diff --git a/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild b/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild
index d3e493e3ecb9..7465d202882d 100644
--- a/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild
@@ -12,6 +12,7 @@ HOMEPAGE="https://www.cryfs.org/"
 
 SLOT=0
 IUSE="custom-optimization libressl test update-check"
+RESTRICT="!test? ( test )"
 
 LICENSE="LGPL-3 BSD-2 MIT"
 # cryfs - LGPL-3
diff --git a/sys-fs/cryfs/cryfs-9999.ebuild b/sys-fs/cryfs/cryfs-9999.ebuild
index 5cd7961f3996..0201a999cbce 100644
--- a/sys-fs/cryfs/cryfs-9999.ebuild
+++ b/sys-fs/cryfs/cryfs-9999.ebuild
@@ -25,6 +25,7 @@ HOMEPAGE="https://www.cryfs.org/"
 LICENSE="LGPL-3 MIT Boost-1.0"
 SLOT="0"
 IUSE="custom-optimization debug libressl test"
+RESTRICT="!test? ( test )"
 
 RDEPEND="
 	>=dev-libs/boost-1.65.1:=
diff --git a/sys-fs/cryptmount/Manifest b/sys-fs/cryptmount/Manifest
index 88b36a93e906..1cc7e9691d2a 100644
--- a/sys-fs/cryptmount/Manifest
+++ b/sys-fs/cryptmount/Manifest
@@ -1,3 +1,5 @@
 DIST cryptmount-5.3.1.tar.gz 748020 BLAKE2B 63c66717ed8a8ede983894564576d26720a571b47bd33f3cd160596d831c017c7239b307eb9fb8112c6a51f91799117a47392675f9fe53c0286ada84887d528e SHA512 c4bfb7a2bd2f672dfed014d3a4b1feaa4d20237f9b658ea981a0a054e83ad4d0282089a006ceb769ee05e0cf6ecd004c97b48d69973ed630330e77bf13925680
+DIST cryptmount-5.3.2.tar.gz 545190 BLAKE2B 708c6ba33060c0698361de7bcdc5e0a5932e063c9178c0a6b9cfb1cba9ec236337dbda0664e8755cc017113ee8ef0149c47fc85019a57ac84bf240790d5d798c SHA512 972c7fefadb86bb82cdeb96b185f45bec08ac07d39474a4c7e2a473bc2453624ffcc387b6836a02260dcd0d1176a5a743c45bdf3d7e78d2f519f02a48c62a6b8
 EBUILD cryptmount-5.3.1.ebuild 1709 BLAKE2B da79362593365d5f651db76728d597190f648206ac4f161bafb9bf378f2b0534d597bdac335a1e56e5ce4a852de0227bf96d9fb233bd9326d643e8d9873fb76e SHA512 10dfe4ef20e77839695313678635133a5f0bbf74e13017e6b787af60c46b3b29e0114ae64cb7aaa476351558054e91f538a8e7f2818a67992589c90c961ad52e
-MISC metadata.xml 2231 BLAKE2B f4b90363aa03426bcbf4a908d226ae1c5a1256fc62007005c58e97607bc2d0a984b9fd1fe78460d236c1d11ffd2bc3dd387fc5b97910c32fc7d21d67556379b2 SHA512 ff5bb67a85f5312b1df9be3a596fcfa08a7e7089df44d50efb63603946c8cfac9e6061519469b1b7126222b6ad7479110f092f629ea05ce9e0692caf52e463c4
+EBUILD cryptmount-5.3.2.ebuild 1704 BLAKE2B e1365296fb0b0a3790a114f938f3255cf24b59b00df84ecb7c2fbdd3653e9586de35cfcf69fd382d3551eba969c7a09604cd1e7a69e9759aae69724072e4c173 SHA512 9d223d7484a2fc7380686b3c6389cf50dba95eb99cd0286a25891e1861b60a1180eddabc647dfba8971454a0e3895e3901b7861a51fc775ce519ebadb38ccfa0
+MISC metadata.xml 2145 BLAKE2B 6249f6be21900ffb75bb15d01232626fa43a92894208af23c8e9e50b771fe7f259dfb607a96907c70606da90b35c515d67436a50b83c2627b01aecb8bd07dd41 SHA512 e84164de214f81cf728615e7a68d8c9ac9daf707b585240d2a3c16212cbc0b0fe47f0096d35e6d98ccd8e3f1e984af4e5d820c7508b91625b6d4e356ca9cbde4
diff --git a/sys-fs/cryptmount/cryptmount-5.3.2.ebuild b/sys-fs/cryptmount/cryptmount-5.3.2.ebuild
new file mode 100644
index 000000000000..76c9f7fce27a
--- /dev/null
+++ b/sys-fs/cryptmount/cryptmount-5.3.2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-info systemd
+
+DESCRIPTION="A utility for management and user-mode mounting of encrypted filesystems"
+HOMEPAGE="http://cryptmount.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl selinux systemd udev"
+REQUIRED_USE="
+	luks? ( gcrypt )
+	openssl? ( gcrypt )
+"
+
+RDEPEND="
+	gcrypt? ( dev-libs/libgcrypt:0= )
+	luks? ( sys-fs/cryptsetup )
+	openssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd )
+	udev? ( virtual/udev )
+	virtual/libiconv
+	virtual/libintl
+"
+
+DEPEND="
+	${RDEPEND}
+	sys-kernel/linux-headers
+"
+
+BDEPEND="nls? ( sys-devel/gettext )"
+
+DOCS=( "AUTHORS" "ChangeLog" "NEWS" "README" "README.sshfs" "RELNOTES" "ToDo" )
+
+CONFIG_CHECK="BLK_DEV_DM"
+ERROR_BLK_DEV_DM="
+	Please enable Device Mapper support in your kernel config
+	-> Device Drivers
+		-> Multiple devices driver support (RAID and LVM)
+			-> Multiple devices driver support (RAID and LVM)
+				<*>/<M> Device mapper support
+"
+
+src_prepare() {
+	default
+
+	# Since SELinux is hardcoded, remove it on disabled SELinux profile
+	if ! use selinux; then
+		sed -e '/selinux/d' -i dmutils.c || die
+	fi
+}
+
+src_configure() {
+	local myeconf=(
+		--disable-rpath
+		$(use_enable argv0switch)
+		$(use_enable cswap)
+		$(use_enable fsck)
+		$(use_with gcrypt libgcrypt)
+		$(use_enable largefile)
+		$(use_enable mount delegation)
+		$(use_enable nls)
+		$(use_enable luks)
+		$(use_enable openssl openssl-compat)
+		$(use_with systemd)
+		$(use_enable udev libudev)
+
+	)
+
+	econf "${myeconf[@]}"
+}
diff --git a/sys-fs/cryptmount/metadata.xml b/sys-fs/cryptmount/metadata.xml
index 8468e05cbbe7..766e5db5d561 100644
--- a/sys-fs/cryptmount/metadata.xml
+++ b/sys-fs/cryptmount/metadata.xml
@@ -2,12 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>ck+gentoo@bl4ckb0x.de</email>
+		<email>conikost@gentoo.org</email>
 		<name>Conrad Kostecki</name>
 	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-	</maintainer>
 	<longdescription>
 		Cryptmount was written to make it as easy for ordinary users
 		to access encrypted filesystems on-demand using the newer devmapper
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index d72025c842b0..4869103c91a6 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,7 +1,5 @@
 AUX 1.6.7-dmcrypt.confd 3919 BLAKE2B 99e81cfe932dda45062966ada065da418500e58499af0f5ed18b7367cb6bc1b3fae1d4a0d4094ebf36c00292a4d4e2606026a65df66d5a96d01a0b9d5f6aa5e5 SHA512 74422d5e1614b43af894ea01da1ea80d805ec7f77981cbb80a6b1a4becad737a8825d7269812499095a7f50d39fa7da5bf4e4edae63529b1fe87b9176943a733
 AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2f41f74fe8640163ac272d44bfbbfeb0befb1af337f88d2711f27003575758d16c5f8104db0fabc2cb9 SHA512 fdbf44f7508ca10ab89e858c206fd9dc397a11d8a553045584ab95046c309a84dd6c7ab0c0ea63c66f7d52b31ed3a1ce46d5ce2ce2588f0d6593a1c4cc1c4194
-AUX 2.0.5-dmcrypt.confd 4061 BLAKE2B b2868ccb99dd172cf0bed8caefb96cabec324122c29fb79fa8112727a53f6f0ae518ddcf88d1b4b2d9cfe7e8f39799e68cd381ecac39a010bed76b5f4f0efb49 SHA512 fcb697e2b95c124d2c5524d0c66435e09dc3a93641e09eda8bedb437fb26f727137e5c9a62bbce465f951e774ac12a18a1f1f3ff5803e9b45c7ccf07227ea3b5
-AUX 2.0.5-dmcrypt.rc 8827 BLAKE2B d4604b8f78d6ab6b4b64b6be64f8706b01aec320ef0c61d8d7d789dc49c42f5b1d2ed606ecbcff7bc654c73460987b4610e92f790b356ad02da2b05eb55851a9 SHA512 946c76a16e327bbe48b83866123e1f797add485583241b9190e63fd537e478f4163b8c1c383dc16241e9c35ad561baf771024c517343522b212bd2132f8d056a
 AUX cryptsetup-2.0.4-fix-static-pwquality-build.patch 427 BLAKE2B dfdc56c6627084732973254cd52c48f0869aa7b4c58e466840a87f77c1d4fb09ae37295fb54e980abccfdfe51dc63161e188a0be9bb4bf3c69d7731120f84bac SHA512 23b5f9b21ec86c92787bfc8744682ce0777dfa87e1de97afbb8db33c4587f1e2c8e5f8c9d0fa56ca801d7795739f9a66f14633d8a3904ea68ddd58ddc3863adf
 AUX setup-1.7.0.py 788 BLAKE2B dc7a2dbc2187f233f4fae9d85bbec9e2152259a45094f10ab043b36e31d80d40772795cb5f9911b0e9a3aa41d8f1773c0e60aa6da1a530165a26384c65532117 SHA512 823fe8a90a76de9f259a5b69425601b78a0b6c1204cda613e224cc21e4eebc2b22b4be9f53efe843156c45a20a099385bc4dad6d653a26749336023d3ae5de89
 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
diff --git a/sys-fs/cryptsetup/files/2.0.5-dmcrypt.confd b/sys-fs/cryptsetup/files/2.0.5-dmcrypt.confd
deleted file mode 100644
index 977d4b3172d7..000000000000
--- a/sys-fs/cryptsetup/files/2.0.5-dmcrypt.confd
+++ /dev/null
@@ -1,115 +0,0 @@
-# /etc/conf.d/dmcrypt
-
-# For people who run dmcrypt on top of some other layer (like raid),
-# use rc_need to specify that requirement.  See the runscript(8) man
-# page for more information.
-
-# Along the same lines, if  dmcrypt needs to be running before
-# localmount or netmount, please use rc_before to specify this
-# requirement.
-
-#--------------------
-# Instructions
-#--------------------
-
-# Note regarding the syntax of this file.  This file is *almost* bash,
-# but each line is evaluated separately.  Separate swaps/targets can be
-# specified.  The init-script which reads this file assumes that a
-# swap= or target= line starts a new section, similar to lilo or grub
-# configuration.
-
-# Note when using gpg keys and /usr on a separate partition, you will
-# have to copy /usr/bin/gpg to /bin/gpg so that it will work properly
-# and ensure that gpg has been compiled statically.
-# See http://bugs.gentoo.org/90482 for more information.
-
-# Note that the init-script which reads this file detects whether your
-# partition is LUKS or not. No mkfs is run unless you specify a makefs
-# option.
-
-# Global options:
-#----------------
-
-# How long to wait for each timeout (in seconds).
-dmcrypt_key_timeout=1
-
-# Max number of checks to perform (see dmcrypt_key_timeout).
-#dmcrypt_max_timeout=300
-
-# Number of password retries.
-dmcrypt_retries=5
-
-# Arguments:
-#-----------
-# target=<name>                      == Mapping name for partition.
-# swap=<name>                        == Mapping name for swap partition.
-# source='<dev>'                     == Real device for partition.
-#                                    Note: You can (and should) specify a tag like UUID
-#                                    for blkid (see -t option).  This is safer than using
-#                                    the full path to the device.
-# key='</path/to/keyfile>[:<mode>]'  == Fullpath from / or from inside removable media.
-# remdev='<dev>'                     == Device that will be assigned to removable media.
-# gpg_options='<opts>'               == Default are --quiet --decrypt
-# options='<opts>'                   == cryptsetup, for LUKS you can only use --readonly
-# loop_file='<file>'                 == Loopback file.
-#                                    Note: If you omit $source, then a free loopback will
-#                                    be looked up automatically.
-# pre_mount='cmds'                   == commands to execute before mounting partition.
-# post_mount='cmds'                  == commands to execute after mounting partition.
-#-----------
-# Supported Modes
-# gpg					== decrypt and pipe key into cryptsetup.
-#						Note: new-line character must not be part of key.
-#						Command to erase \n char: 'cat key | tr -d '\n' > cleanKey'
-
-#--------------------
-# dm-crypt examples
-#--------------------
-
-## swap
-# Swap partitions. These should come first so that no keys make their
-# way into unencrypted swap.
-# If no options are given, they will default to: -c aes -h sha1 -d /dev/urandom
-# If no makefs is given then mkswap will be assumed
-#swap=crypt-swap
-#source='/dev/hda2'
-
-## /home with passphrase
-#target=crypt-home
-#source='/dev/hda5'
-
-## /home with regular keyfile
-#target=crypt-home
-#source='/dev/hda5'
-#key='/full/path/to/homekey'
-
-## /home with gpg protected key
-#target=crypt-home
-#source='/dev/hda5'
-#key='/full/path/to/homekey:gpg'
-
-## /home with regular keyfile on removable media(such as usb-stick)
-#target=crypt-home
-#source='/dev/hda5'
-#key='/full/path/to/homekey'
-#remdev='/dev/sda1'
-
-## /home with gpg protected key on removable media(such as usb-stick)
-#target=crypt-home
-#source='/dev/hda5'
-#key='/full/path/to/homekey:gpg'
-#remdev='/dev/sda1'
-
-## /tmp with regular keyfile
-#target=crypt-tmp
-#source='/dev/hda6'
-#key='/full/path/to/tmpkey'
-#pre_mount='/sbin/mkreiserfs -f -f ${dev}'
-#post_mount='chown root:root ${mount_point}; chmod 1777 ${mount_point}'
-
-## Loopback file example
-#target='crypt-loop-home'
-#source='/dev/loop0'
-#loop_file='/mnt/crypt/home'
-
-# The file must be terminated by a newline.  Or leave this comment last.
diff --git a/sys-fs/cryptsetup/files/2.0.5-dmcrypt.rc b/sys-fs/cryptsetup/files/2.0.5-dmcrypt.rc
deleted file mode 100644
index 555d216b50d2..000000000000
--- a/sys-fs/cryptsetup/files/2.0.5-dmcrypt.rc
+++ /dev/null
@@ -1,340 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-	after keymaps
-	before checkfs fsck
-
-	if grep -qs ^swap= "${conf_file}" ; then
-		before swap
-	fi
-}
-
-# We support multiple dmcrypt instances based on $SVCNAME
-conf_file="/etc/conf.d/${SVCNAME}"
-
-# Get splash helpers if available.
-if [ -e /sbin/splash-functions.sh ] ; then
-	. /sbin/splash-functions.sh
-fi
-
-# Setup mappings for an individual target/swap
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute() {
-	local dev ret mode foo
-
-	if [ -z "${target}" -a -z "${swap}" ] ; then
-		return
-	fi
-
-	# Set up default values.
-	: ${dmcrypt_key_timeout:=1}
-	: ${dmcrypt_max_timeout:=300}
-	: ${dmcrypt_retries:=5}
-
-	# Handle automatic look up of the source path.
-	if [ -z "${source}" -a -n "${loop_file}" ] ; then
-		source=$(losetup --show -f "${loop_file}")
-	fi
-	case ${source} in
-	*=*)
-		source=$(blkid -l -t "${source}" -o device)
-		;;
-	esac
-	if [ -z "${source}" ] || [ ! -e "${source}" ] ; then
-		ewarn "source \"${source}\" for ${target} missing, skipping..."
-		return
-	fi
-
-	if [ -n "${target}" ] ; then
-		# let user set options, otherwise leave empty
-		: ${options:=' '}
-	elif [ -n "${swap}" ] ; then
-		if cryptsetup isLuks ${source} 2>/dev/null ; then
-			ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
-			return
-		fi
-		target=${swap}
-		# swap contents do not need to be preserved between boots, luks not required.
-		# suspend2 users should have initramfs's init handling their swap partition either way.
-		: ${options:='-c aes -h sha1 -d /dev/urandom'}
-		: ${pre_mount:='mkswap ${dev}'}
-	fi
-
-	if [ -n "${loop_file}" ] ; then
-		dev="/dev/mapper/${target}"
-		ebegin "  Setting up loop device ${source}"
-		losetup ${source} ${loop_file}
-	fi
-
-	# cryptsetup:
-	# open   <device> <name>      # <device> is $source
-	# create <name>   <device>    # <name>   is $target
-	local arg1="create" arg2="${target}" arg3="${source}"
-	if cryptsetup isLuks ${source} 2>/dev/null ; then
-		arg1="open"
-		arg2="${source}"
-		arg3="${target}"
-	fi
-
-	# Older versions reported:
-	#	${target} is active:
-	# Newer versions report:
-	#	${target} is active[ and is in use.]
-	if cryptsetup status ${target} | egrep -q ' is active' ; then
-		einfo "dm-crypt mapping ${target} is already configured"
-		return
-	fi
-	splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
-
-	# Handle keys
-	if [ -n "${key}" ] ; then
-		read_abort() {
-			# some colors
-			local ans savetty resettty
-			[ -z "${NORMAL}" ] && eval $(eval_ecolors)
-			einfon "  $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) "
-			shift
-			# This is ugly as s**t.  But POSIX doesn't provide `read -t`, so
-			# we end up having to implement our own crap with stty/etc...
-			savetty=$(stty -g)
-			resettty='stty ${savetty}; trap - EXIT HUP INT TERM'
-			trap 'eval "${resettty}"' EXIT HUP INT TERM
-			stty -icanon
-			stty min 0 time "$(( $2 * 10 ))"
-			ans=$(dd count=1 bs=1 2>/dev/null) || ans=''
-			eval "${resettty}"
-			if [ -z "${ans}" ] ; then
-				printf '\r'
-			else
-				echo
-			fi
-			case ${ans} in
-				[yY]) return 0;;
-				*) return 1;;
-			esac
-		}
-
-		# Notes: sed not used to avoid case where /usr partition is encrypted.
-		mode=${key##*:} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg
-		key=${key%:*}
-		case "${mode}" in
-		gpg|reg)
-			# handle key on removable device
-			if [ -n "${remdev}" ] ; then
-				# temp directory to mount removable device
-				local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$"
-				if [ ! -d "${mntrem}" ] ; then
-					if ! mkdir -p "${mntrem}" ; then
-						ewarn "${source} will not be decrypted ..."
-						einfo "Reason: Unable to create temporary mount point '${mntrem}'"
-						return
-					fi
-				fi
-				i=0
-				einfo "Please insert removable device for ${target}"
-				while [ ${i} -lt ${dmcrypt_max_timeout} ] ; do
-					foo=""
-					if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then
-						# keyfile exists?
-						if [ ! -e "${mntrem}${key}" ] ; then
-							umount -n "${mntrem}"
-							rmdir "${mntrem}"
-							einfo "Cannot find ${key} on removable media."
-							read_abort "Abort" ${dmcrypt_key_timeout} && return
-						else
-							key="${mntrem}${key}"
-							break
-						fi
-					else
-						[ -e "${remdev}" ] \
-							&& foo="mount failed" \
-							|| foo="mount source not found"
-					fi
-					: $((i += 1))
-					read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
-				done
-			else    # keyfile ! on removable device
-				if [ ! -e "${key}" ] ; then
-					ewarn "${source} will not be decrypted ..."
-					einfo "Reason: keyfile ${key} does not exist."
-					return
-				fi
-			fi
-			;;
-		*)
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: mode ${mode} is invalid."
-			return
-			;;
-		esac
-	else
-		mode=none
-	fi
-	ebegin "  ${target} using: ${options} ${arg1} ${arg2} ${arg3}"
-	if [ "${mode}" = "gpg" ] ; then
-		: ${gpg_options:='-q -d'}
-		# gpg available ?
-		if command -v gpg >/dev/null ; then
-			i=0
-			while [ ${i} -lt ${dmcrypt_retries} ] ; do
-				# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
-				# save stdin stdout stderr "values"
-				timeout ${dmcrypt_max_timeout} gpg ${gpg_options} ${key} 2>/dev/null | \
-					cryptsetup --key-file - ${options} ${arg1} ${arg2} ${arg3}
-				ret=$?
-				# The timeout command exits 124 when it times out.
-				[ ${ret} -eq 0 -o ${ret} -eq 124 ] && break
-				: $(( i += 1 ))
-			done
-			eend ${ret} "failure running cryptsetup"
-		else
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: cannot find gpg application."
-			einfo "You have to install app-crypt/gnupg first."
-			einfo "If you have /usr on its own partition, try copying gpg to /bin ."
-		fi
-	else
-		if [ "${mode}" = "reg" ] ; then
-			cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
-			ret=$?
-			eend ${ret} "failure running cryptsetup"
-		else
-			cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-			ret=$?
-			eend ${ret} "failure running cryptsetup"
-		fi
-	fi
-	if [ -d "${mntrem}" ] ; then
-		umount -n ${mntrem} 2>/dev/null >/dev/null
-		rmdir ${mntrem} 2>/dev/null >/dev/null
-	fi
-	splash svc_input_end ${SVCNAME} >/dev/null 2>&1
-
-	if [ ${ret} -ne 0 ] ; then
-		cryptfs_status=1
-	else
-		if [ -n "${pre_mount}" ] ; then
-			dev="/dev/mapper/${target}"
-			eval ebegin \""    pre_mount: ${pre_mount}"\"
-			eval "${pre_mount}" > /dev/null
-			ewend $? || cryptfs_status=1
-		fi
-	fi
-}
-
-# Lookup optional bootparams
-get_bootparam_val() {
-	# We're given something like:
-	#    foo=bar=cow
-	# Return the "bar=cow" part.
-	case $1 in
-	*=*)
-		echo "${1#*=}"
-		;;
-	esac
-}
-
-start() {
-	local header=true cryptfs_status=0
-	local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
-
-	local x
-	for x in $(cat /proc/cmdline) ; do
-		case "${x}" in
-		key_timeout=*)
-			dmcrypt_key_timeout=$(get_bootparam_val "${x}")
-			;;
-		esac
-	done
-
-	while read targetline <&3 ; do
-		case ${targetline} in
-		# skip comments and blank lines
-		""|"#"*) continue ;;
-		# skip service-specific openrc configs #377927
-		rc_*) continue ;;
-		esac
-
-		${header} && ebegin "Setting up dm-crypt mappings"
-		header=false
-
-		# check for the start of a new target/swap
-		case ${targetline} in
-		target=*|swap=*)
-			# If we have a target queued up, then execute it
-			dm_crypt_execute
-
-			# Prepare for the next target/swap by resetting variables
-			unset gpg_options key loop_file target options pre_mount post_mount source swap remdev
-			;;
-
-		gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
-			if [ -z "${target}${swap}" ] ; then
-				ewarn "Ignoring setting outside target/swap section: ${targetline}"
-				continue
-			fi
-			;;
-
-		dmcrypt_*=*)
-			# ignore global options
-			continue
-			;;
-
-		*)
-			ewarn "Skipping invalid line in ${conf_file}: ${targetline}"
-			;;
-		esac
-
-		# Queue this setting for the next call to dm_crypt_execute
-		eval "${targetline}"
-	done 3< ${conf_file}
-
-	# If we have a target queued up, then execute it
-	dm_crypt_execute
-
-	ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
-}
-
-stop() {
-	local line header
-
-	# Break down all mappings
-	header=true
-	egrep "^(target|swap)=" ${conf_file} | \
-	while read line ; do
-		${header} && einfo "Removing dm-crypt mappings"
-		header=false
-
-		target= swap=
-		eval ${line}
-
-		[ -n "${swap}" ] && target=${swap}
-		if [ -z "${target}" ] ; then
-			ewarn "invalid line in ${conf_file}: ${line}"
-			continue
-		fi
-
-		ebegin "  ${target}"
-		cryptsetup remove ${target}
-		eend $?
-	done
-
-	# Break down loop devices
-	header=true
-	grep '^source=./dev/loop' ${conf_file} | \
-	while read line ; do
-		${header} && einfo "Detaching dm-crypt loop devices"
-		header=false
-
-		source=
-		eval ${line}
-
-		ebegin "  ${source}"
-		losetup -d "${source}"
-		eend $?
-	done
-
-	return 0
-}
diff --git a/sys-fs/ddrescue/Manifest b/sys-fs/ddrescue/Manifest
index 571e0215570c..b3922e039958 100644
--- a/sys-fs/ddrescue/Manifest
+++ b/sys-fs/ddrescue/Manifest
@@ -3,5 +3,5 @@ DIST ddrescue-1.23.tar.lz 82451 BLAKE2B ed9d71894d4c8466e3ca56d853ae5a6c4f7cf195
 DIST ddrescue-1.24.tar.lz 85244 BLAKE2B e8b5ca5c89a65bed6126737125d78b2af9cdd7fe9b20f1f03636d58249d33dc08cb1907eca35c35d3ff81dd031290177084ae5dcc1cac20e79cb6c182cb894e4 SHA512 2c6a86c80bad122e0c44d6f8da49239e10362fbfbdb70acf39055ce02637daa05cce4f24adac732a1bb3a6fc97cf6985dd20827e99ab3bf6bad4db015a00fbaa
 EBUILD ddrescue-1.21-r1.ebuild 895 BLAKE2B 3b0a7ed0bb4c1b0e9a58bf4acb3aacd62ecb08787a156dd647c1893cfa99b16011e6665034e0c21dba772f248b99efa31c1f075b4e4d4b6a6e7b557de866e66f SHA512 64b7d0cf4ca44de210739cc83952b22bd3767200cea0f9e3f24d66517746eef5dc7b531befab9ea61604afb85b262633687037368aedff493e3b821ef3414208
 EBUILD ddrescue-1.23.ebuild 879 BLAKE2B fa277364e7e9772dc9e69e0802e890e4e931bbb4851aaa0b1e66c76771831bb8b2540fa5387e61f9c063583919c07e3226cc66c96fc5e35d03e6e9cdcb076fe2 SHA512 ae858b2e1c831119ab7a3a779a6d02225f361fd6ea9ae246dda424af299c8174b77869f1319e7a4766fe7bf9a53b0ff7276e80d38d91d76b70a3242346cc4c40
-EBUILD ddrescue-1.24.ebuild 879 BLAKE2B fb2c553ec947a590dea017fbec3745780525bdd5a0a634f36aa3704a1d7ac2e4166073c1b5180e6d2643e4d5a5dc8a9d376ae99db3ba61fae3417c51f45dcbda SHA512 be26d3c6b73f8af70d08340affbfb72ae81031f38ab576c14fc4c2167b70c9a8eaee3e591b3e01349904ffca49196626314f5afb90dccc9cf7333d8cbd9b1dc8
+EBUILD ddrescue-1.24.ebuild 876 BLAKE2B d1b367a518857ec0c06c2312b055e2870b2b7bd605c3b2a0fd691f943bfb158f00b8daf596ca7cd027898511ed4be8830e356f82eb5d4f7a9f6c73539bd71e17 SHA512 3ff3bf7c2f806443f43d363325f682c9bd52f2ad79943858c22ebe7148a20084730995469db7e87608031ef346e6e2fb897ae70b8b85a4158f1290b40a87ccdd
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/sys-fs/ddrescue/ddrescue-1.24.ebuild b/sys-fs/ddrescue/ddrescue-1.24.ebuild
index 692566cd46ed..59f6344f714c 100644
--- a/sys-fs/ddrescue/ddrescue-1.24.ebuild
+++ b/sys-fs/ddrescue/ddrescue-1.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux"
 IUSE="static"
 
 DEPEND="$(unpacker_src_uri_depends)"
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index ed1ee39f5d1d..df0a7c6a40f7 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1,4 +1,4 @@
 DIST dislocker-0.7.1.tar.gz 103194 BLAKE2B 05421b0d3e7686480e40a41e67086017c454b76e0852fef78a7b5d10134cf388b4bf7b9669d87b867418f4c074cc023ea9b0260dbdbc837322d04f217aa40b28 SHA512 8852ba3e363fdea992eebecfe1e4dad2b85404f57c57ce6b2937a9859d03cfa88d969926c9e11e6d22596c6d96805b7d1737893ae2c5a957448ab26708bce226
-EBUILD dislocker-0.7.1-r1.ebuild 1188 BLAKE2B ee9ddbe35f996b6c8baa8fb253ac6b069560849757303c9ef2c25a2506e61135e25eb2cb4df58d2b7f0405f18316c696d5cefe2027568c91b9f79ab9e48e6f9e SHA512 036333b6a1b80649ec8a23fbb44a7951a7c5ecefde2ee99adf33b37004b9391f9c0c37986fe05836197619d1e1054cae6590a6c11932107d87e4d1454a0efcbe
-EBUILD dislocker-9999.ebuild 1188 BLAKE2B 7c98a212dc010d26b82f073ba52c21e4e49492406373cc8034d42dc752d21a50fda1c5a5e2f55ab83b75cd40af2dbf5c8e9d44ce3c1d0be60fa2cba2e7e761e0 SHA512 687d3ddadcb6e3f0af7b536a495f199314db3dba238d56afb4b27bb55293eb4353bc5305d4cec65e1bf9cff72138be332286d7d70cd1e3c149872605e7743899
+EBUILD dislocker-0.7.1-r2.ebuild 1185 BLAKE2B 25249a42cd4a6fcc165de59306d7da01eb5ad2eb661dd92d38934f0b9bdc88286a68f6c9f05337ba31b5de3de2e23af8cb5863b4bfb7f307004aafd095158d6d SHA512 c921cd7034b7e7a48d636e9b6a6420d5eb16a0e5382a29c829762a7742409ae2f371765ac3218402e7f42eeac292fdba568a3d66a1487c3fa8480cd69951a4a5
+EBUILD dislocker-9999.ebuild 1185 BLAKE2B 25249a42cd4a6fcc165de59306d7da01eb5ad2eb661dd92d38934f0b9bdc88286a68f6c9f05337ba31b5de3de2e23af8cb5863b4bfb7f307004aafd095158d6d SHA512 c921cd7034b7e7a48d636e9b6a6420d5eb16a0e5382a29c829762a7742409ae2f371765ac3218402e7f42eeac292fdba568a3d66a1487c3fa8480cd69951a4a5
 MISC metadata.xml 343 BLAKE2B edbbbf3c98bb40a48d9b39f6fbe579a306f44539eb9415585c3e8045f4bfa2c2b7864be18313f2dd50aa73c14aacb5e446d4eb94f4c7116a7c0407ec651f3d02 SHA512 479da4294232d9c49530e2ed2c936c824c697b08d722309addb64bc77dd083365b0d4ce063dd331e4dbd13a0185885dca7bf5d62a6a09dfc6e7a38fd7e25f448
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r2.ebuild
index 5fa3c3fa942f..08e0e54087af 100644
--- a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r2.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic
 
 DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
 HOMEPAGE="https://github.com/Aorimn/dislocker"
@@ -20,10 +20,11 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="ruby"
 
-DEPEND="sys-fs/fuse:*
-	net-libs/mbedtls
-	ruby? ( dev-lang/ruby:2.4 )"
-
+DEPEND="
+	sys-fs/fuse:0=
+	net-libs/mbedtls:0=
+	ruby? ( dev-lang/ruby:* )
+"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index c92236b7a126..08e0e54087af 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit eutils cmake-utils flag-o-matic
+inherit cmake-utils flag-o-matic
 
 DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
 HOMEPAGE="https://github.com/Aorimn/dislocker"
@@ -20,10 +20,11 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="ruby"
 
-DEPEND="sys-fs/fuse:*
-	net-libs/mbedtls
-	ruby? ( dev-lang/ruby:2.3 )"
-
+DEPEND="
+	sys-fs/fuse:0=
+	net-libs/mbedtls:0=
+	ruby? ( dev-lang/ruby:* )
+"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index 9f240f8adb07..316530b2d0a9 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,3 +1,3 @@
 DIST dosfstools-4.1.tar.xz 172936 BLAKE2B d8ef617d9dbdc21318c4f43e2fd6dca1d3452ab46253b055d8fef09aa693bcf63ef58076a49f305bb21de87298bae5be6b626065dfcbd90935af68709e2c3c6a SHA512 e7a8aab34255d15e6865a7b031971352af1255134fab83389673bcc3cbd6ba255241bd2429070aeb4b927f8d7d73ccf1aeafe94566b133e88e7586897c317b78
-EBUILD dosfstools-4.1.ebuild 998 BLAKE2B d3916e58c7b0db551e58bcbb44e210b80ca331bbf71ef6fdf2109712a35c9c41beed04543b1510054796089e4839f4691bb3629c1d56ef4ed61617774d3df6ef SHA512 f0efd8f779406dfae4dfdf45c75b61b87287cf3ef401ea4b6de5de56cbf628a43e75e87968c2a837092bd3bcc98b27abd17df7f6a4252331282fc5f53f04e16d
+EBUILD dosfstools-4.1.ebuild 1025 BLAKE2B f4bbf135bd3f1ec8b0c52cf4a1fe5fb7222f1b4126f35e48689a5b983f6d1c46f370a008fe9d58a9eb74f579dfae7917bb3c30cd18b97ee3ce99a6d7e72f938c SHA512 339f93f59adad2da584e1e8cbd89184e887fe4fc0cadc099f0dddce427c5f365d4746cb69ac778d4e7293d9cf73110a395928299a50db26a135f7c8080cd60fe
 MISC metadata.xml 496 BLAKE2B 32b7ed76d0385441b8a40fff8ca15d6848fce7cf1ae511a6905d3c12b8a7593bbc11494f7ca720c465f61175d8d84cd9e6d41f084a140fce88513c6b95965615 SHA512 40b886dc36d892d733a6a6528eed5dec3977eecb71a22b5cee2ea6c0417401951b966509c3816ed5a2761eae4b8c5def7ef5e99d9aedab2e09000a3f3de6b354
diff --git a/sys-fs/dosfstools/dosfstools-4.1.ebuild b/sys-fs/dosfstools/dosfstools-4.1.ebuild
index b13192136d08..42d9bb0807ed 100644
--- a/sys-fs/dosfstools/dosfstools-4.1.ebuild
+++ b/sys-fs/dosfstools/dosfstools-4.1.ebuild
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="compat test +udev"
+RESTRICT="!test? ( test )"
 
 CDEPEND="udev? ( virtual/libudev )"
 DEPEND="${CDEPEND}
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 6d401d2caad7..ee8b95907447 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -4,10 +4,10 @@ DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d1810
 DIST eudev-3.2.7.tar.gz 1892931 BLAKE2B 9ae903d624e8fb1b334735527329e6074a194dd6e22073c54acc58010d0f8f2d29bdc42d3e6d72dd388c1012be273ca27626ffe1173382d7dde9ad3aee942cd0 SHA512 e6c8ec86ae434c967f6a568fa0b281229bb87be7e3fec025dc3e0225de7843ffaa5dd65bdeffefbc91e9e2911aa3de9df84c76148fe8863ff60fba4c88653c40
 DIST eudev-3.2.8.tar.gz 1894193 BLAKE2B 8709a13031744d5dd2f57853375b920bdaa6ea028624111dc96be9d46748de8423ac749f27183c668336701c16735d7ca2db4566621e0e741a2604785c14c64f SHA512 13221e6f9696a8630d867eb7d73f3bf5dd1bc2dfd80d62af00342be4cbf39a862e644ea3776fa4d91463e594ca50c5deecbeb7e05d161097e889ea58a66ccc42
 DIST eudev-3.2.9.tar.gz 1959836 BLAKE2B 8792ded8a7d1dfbc16fae249283b58251656961cf360d72932c3fc6ea3e752f6334c21e9ebd9ee3ad0da03a590f8405b3bb7413eec3f964984225f7813311ef6 SHA512 09e49fff9848e72507ef14b9d4cfab2d1443f16d5b3d54d2b0e4f6b04c471ca41f09200cb8772e9f850f0dc4a574a7ec7eede7ce11cbabda65e210a89287531f
-EBUILD eudev-3.2.5.ebuild 6766 BLAKE2B 7007467747f127831b358fdc62a559a209a9b49d643c4eb1f3c9a44d11e1ed62ec00fadf8b939ec0b27fe20dc6b01a28f7d2e9c3e1f884af8b5b62b93e2d9ffb SHA512 eee2fa087a18778225b053d21a3ef091370a9f960676d68baa4b2d7094641c2906de6dbd0345af6de25316188817bf2ea0b9e223da152a39dd055eccdf70cf79
-EBUILD eudev-3.2.7-r2.ebuild 6931 BLAKE2B 3c75f45f6cd87110ce66b8e2f644178fb913670c6434dccff6a96dcd8afb7ef1097c1af7761d99ec9c9acba08c312f96f38b55dffa01f47dcd0cb24649bf4054 SHA512 c9c3067d102107ed5fb58027738eda2f608b80323473f16f438feb30aa2c0b0819954267edf240d82b21be2abbcb54ea98ea55affb400f7af539422b1141c215
-EBUILD eudev-3.2.8.ebuild 6931 BLAKE2B 3c75f45f6cd87110ce66b8e2f644178fb913670c6434dccff6a96dcd8afb7ef1097c1af7761d99ec9c9acba08c312f96f38b55dffa01f47dcd0cb24649bf4054 SHA512 c9c3067d102107ed5fb58027738eda2f608b80323473f16f438feb30aa2c0b0819954267edf240d82b21be2abbcb54ea98ea55affb400f7af539422b1141c215
-EBUILD eudev-3.2.9.ebuild 6922 BLAKE2B bdba6660059491398b98bad7ac03bf2568ecb02a4d80fae8d84d6e1fcec2cdf4ba6f84cd1d9a3ea948c9af8d79a5e4533a9ed6941a49e7e135ce795fe09d11af SHA512 21a5e52c92a7232068407373f153ea7e765759770df8a1af71f6585dca784622071e45a000a082d771b209769e1d6c4c7e9506910b56caa27a0724d709293700
-EBUILD eudev-4.9999.ebuild 6068 BLAKE2B 129380de118a1bb7389ffda2b3954f1cd3b64e92ab41e23eb0de153a338f6e7e74bcf0e06125061b22bdc2f48fdb5202a43cc212d87090cf7306e59a2b9ceafd SHA512 fcbfc2635093d4c88e95f413a39ee7b08c473797b2b8afc50a5f73b84e58c67e96b316f996c3f2ce7be90304c14139ec813bf877c9374583509a29df2451de83
-EBUILD eudev-9999.ebuild 6931 BLAKE2B 3c75f45f6cd87110ce66b8e2f644178fb913670c6434dccff6a96dcd8afb7ef1097c1af7761d99ec9c9acba08c312f96f38b55dffa01f47dcd0cb24649bf4054 SHA512 c9c3067d102107ed5fb58027738eda2f608b80323473f16f438feb30aa2c0b0819954267edf240d82b21be2abbcb54ea98ea55affb400f7af539422b1141c215
+EBUILD eudev-3.2.5.ebuild 6793 BLAKE2B 967dde69503f575de505b7802d56ecb3e58f9a674b93df8f7f736a5f0f78f1626c5f0ddf5159b3e79109ef04f91fe58230aaaf96960771f8c8aeccd1bf3f10f9 SHA512 e81e049881e7c035d7a7490484b41a3cee319b9060b4febc6bd957cb3eee3f1a35e5b0c23a4c1c3a20ef018979c564661dca6a9909f57596f8b4aea9f4a7986c
+EBUILD eudev-3.2.7-r2.ebuild 6958 BLAKE2B d6481639b485dbad37bc5b2fe66e350fdc38dc92542f72bdffbeee06c9aca68770c3414865a9f9d0eb06efbf25c453574317c3f91e715836ba61620b2e3f664b SHA512 375ecabb617ca2d74eb2fd7108d9f492c4b62e5c9ed3b865451f6bf25cc6489b6cdc8b6bc372092ebd1cf6d14e19752755e4b9ed2b011c55e19b75a9021048ea
+EBUILD eudev-3.2.8.ebuild 6958 BLAKE2B d6481639b485dbad37bc5b2fe66e350fdc38dc92542f72bdffbeee06c9aca68770c3414865a9f9d0eb06efbf25c453574317c3f91e715836ba61620b2e3f664b SHA512 375ecabb617ca2d74eb2fd7108d9f492c4b62e5c9ed3b865451f6bf25cc6489b6cdc8b6bc372092ebd1cf6d14e19752755e4b9ed2b011c55e19b75a9021048ea
+EBUILD eudev-3.2.9.ebuild 6962 BLAKE2B e0f0507e540184cfa4614795ad16c8e625a8af62697f4d376112e428702ce1817c1406daa6cfe98a27e89a4718d0ad1336a905c255c8112b3e81d5c29a9f688b SHA512 fbc0e1deb60c70a6ce22cce58e0ee79aa6c9b9b6e850a48b0e78f81194ff15ffcdbcfde4a406440f0d377440cdf8f951e4c8ec1db9024da0631ba3f6cc2e5226
+EBUILD eudev-4.9999.ebuild 6095 BLAKE2B 185f542d846604e82c81665358180f5aa7facf39349708104687f093505676f3caab5dd1704bb4fef728a59ee8ab3d0f3de56009dcb0f6da0bd5b5cf8cf1ae59 SHA512 0ce195bf01bea41255ecf3e4c879104209e06fc168d52041d2014afe2a4746a2de14a2c1faea1a32a45175ff4bc6d7a6da154fb860650008995000918af4878b
+EBUILD eudev-9999.ebuild 6958 BLAKE2B d6481639b485dbad37bc5b2fe66e350fdc38dc92542f72bdffbeee06c9aca68770c3414865a9f9d0eb06efbf25c453574317c3f91e715836ba61620b2e3f664b SHA512 375ecabb617ca2d74eb2fd7108d9f492c4b62e5c9ed3b865451f6bf25cc6489b6cdc8b6bc372092ebd1cf6d14e19752755e4b9ed2b011c55e19b75a9021048ea
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.2.5.ebuild b/sys-fs/eudev/eudev-3.2.5.ebuild
index 292095d63780..23b3ca125196 100644
--- a/sys-fs/eudev/eudev-3.2.5.ebuild
+++ b/sys-fs/eudev/eudev-3.2.5.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="https://github.com/gentoo/eudev"
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
 IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
diff --git a/sys-fs/eudev/eudev-3.2.7-r2.ebuild b/sys-fs/eudev/eudev-3.2.7-r2.ebuild
index a9b3e55a1b92..b8f4365b8521 100644
--- a/sys-fs/eudev/eudev-3.2.7-r2.ebuild
+++ b/sys-fs/eudev/eudev-3.2.7-r2.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="https://github.com/gentoo/eudev"
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
 IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
diff --git a/sys-fs/eudev/eudev-3.2.8.ebuild b/sys-fs/eudev/eudev-3.2.8.ebuild
index a9b3e55a1b92..b8f4365b8521 100644
--- a/sys-fs/eudev/eudev-3.2.8.ebuild
+++ b/sys-fs/eudev/eudev-3.2.8.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="https://github.com/gentoo/eudev"
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
 IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
diff --git a/sys-fs/eudev/eudev-3.2.9.ebuild b/sys-fs/eudev/eudev-3.2.9.ebuild
index 0dc63e06431e..3152f10509ba 100644
--- a/sys-fs/eudev/eudev-3.2.9.ebuild
+++ b/sys-fs/eudev/eudev-3.2.9.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -21,6 +21,7 @@ HOMEPAGE="https://github.com/gentoo/eudev"
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
 IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
diff --git a/sys-fs/eudev/eudev-4.9999.ebuild b/sys-fs/eudev/eudev-4.9999.ebuild
index da2372754cf1..ac45032c4807 100644
--- a/sys-fs/eudev/eudev-4.9999.ebuild
+++ b/sys-fs/eudev/eudev-4.9999.ebuild
@@ -23,6 +23,7 @@ HOMEPAGE="https://github.com/gentoo/eudev"
 LICENSE="LGPL-2.1 GPL-2"
 SLOT="0"
 IUSE="+blkid efi +hwdb +kmod selinux smack test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	kmod? ( >=sys-apps/kmod-16 )
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index a9b3e55a1b92..b8f4365b8521 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -21,6 +21,7 @@ HOMEPAGE="https://github.com/gentoo/eudev"
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
 IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
+RESTRICT="!test? ( test )"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	introspection? ( >=dev-libs/gobject-introspection-1.38 )
diff --git a/sys-fs/exfat-utils/Manifest b/sys-fs/exfat-utils/Manifest
index 48ce62194fc7..543c71bb446c 100644
--- a/sys-fs/exfat-utils/Manifest
+++ b/sys-fs/exfat-utils/Manifest
@@ -1,5 +1,3 @@
-DIST exfat-utils-1.2.8.tar.gz 181121 BLAKE2B 679b7662d14d9caa26b6d0aff1007130f6d7ad7a3eb36238847f9cb735011fe69fb367e013126419b780ad1fa61c6ad1fdb163e8c5727c4dcff50db85959b7b2 SHA512 98acebf74fe5f5181098cdd880303d6c78d5aa88aa7a87d5371c887e4614536b19a24d48526b235de034fad26b68ddaf4f286b68b5963e95cc1cf7cee1c7b58c
 DIST exfat-utils-1.3.0.tar.gz 188943 BLAKE2B 07af437fc21ae2f7d99db778069135c7391554f964a05eb6df715bcb5135003ecdc1257c541a61e0c140bfcffbc0802dd4118413f8d11a175be3f8adf5f5b83f SHA512 e1c5b708f22e878d7521e3299866bba127145757e3620696ff11b18c8c7d4830522974e8ee4771234b70aa9718295d3433779cf34ca990e28ccc06cbf9325f7e
-EBUILD exfat-utils-1.2.8.ebuild 638 BLAKE2B 5de4958b72b4d8522ab9eed8e45f56fc74511ae09c3de7b75ab605b83a055cfbe40a3bda8b67676758e69dcd43335f10f81953f18166ebe89b6369fcb701e210 SHA512 322012c9bf1ad9281cb7d3319703bc9a3a3db6f79548a1edfb49e8ffd4cc0b176e71eefdde6e83a386e51ffd6ba337baa00fb053d6cf8bbc2fa53b97bdcb7975
 EBUILD exfat-utils-1.3.0.ebuild 620 BLAKE2B 1648c06ba38db8712c4b5a79396c03e02120467af9661cc1353e80e35636f8c3ccbf986014576f8cbad45409738bd5f1850bd800667e0131305979e6ea5ab5a3 SHA512 b6020897bb9596a2aa450ee22f4eea190809e6514031908aba0f40cd1d58cb1de32fce79c957d70127dc77d17b514b221dddce88ea50b76acf0f7a620e365316
 MISC metadata.xml 513 BLAKE2B f7192dfbeb1f77cdb3d85592d6706c50fd5b84c93ad8516611b641784fbc794256c1f102e5269df5cb37316681a7df0a8860a687b47104c017c82af654ea3fe4 SHA512 622380a436001db3795c658dc36ad2fcd35e380f6987943fa0281f0190b2000cbefefa4e28e9cb4552285c77481e1230eadef800797520718d68bcc372d868bb
diff --git a/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild b/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild
deleted file mode 100644
index 3952f64c133b..000000000000
--- a/sys-fs/exfat-utils/exfat-utils-1.2.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="exFAT filesystem utilities"
-HOMEPAGE="https://github.com/relan/exfat"
-SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
-
-# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
-
-DOCS=( ChangeLog )
-
-src_install() {
-	default
-	dosym exfatfsck.8 /usr/share/man/man8/fsck.exfat.8
-	dosym mkexfatfs.8 /usr/share/man/man8/mkfs.exfat.8
-}
diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest
index 10107ed9e36d..4a8160fe767f 100644
--- a/sys-fs/fuse-common/Manifest
+++ b/sys-fs/fuse-common/Manifest
@@ -1,9 +1,7 @@
 AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c031586ec6da49f8f13c0593754ce6f6a92fc35ed4ce2f0f6d9c53089e08bf3ee960df577543bba49 SHA512 c8ae0e1932e34e2078bb8a1ab47c6d2d489f832f7adb118668624d3f0695ebf8b3ac2468a8db98579ef30078eac6989421aae7d7893e30a50e5c35d0a00ad6a9
 AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1
 DIST fuse-3.2.6.tar.xz 1456220 BLAKE2B 9b09504ed04abd0134188c28f3908e69e3416c345a96aefbca0f64447f3c3a8907550874f5fec9cd8f65fbaa892be6cc0213a7f61d7ad51c955ce3acf955ee17 SHA512 3a1ef77ab4c79a24aad0b259e17f568a30a5faf53ac17eb25d05f30dc7423f0081583f5b3c284ca9196a01885843e97c323a84231272b7e2b55c8e73848a61b8
-DIST fuse-3.3.0.tar.xz 1010840 BLAKE2B 56422879c7a87351deb731b3e5f950c1d7f584f730e5d595f5b3f1b5dea960cd26c875d8921ae6495c7fd99b3525b76a65b9c866c5f19e653c04f9ae4bd98b13 SHA512 fa6ee83c4ccdea797e37c9413d504ebe3cbc2bfef9526d485519144714f7b7163bbae9be26ec8a471aa76e98958779bd9d702083be272abaa3b6f1694816e913
-DIST fuse-3.4.1.tar.xz 1016436 BLAKE2B 50a35039d7302741239736f2e62f4603c147d49947580fb92f7ac6b46aa8dbcd1cbb16ba35719e198dc3b693b11c215ee8123d02a0c96154d6c905541eb35936 SHA512 45e56346b6d4c90055168254cd8508339d5b428ec58f1d9e287439e3d48fce344498826f099de89051e6529e45a45e0990a0e07fc8a9acbae1f76f4d6c72dd0d
+DIST fuse-3.8.0.tar.xz 1416716 BLAKE2B f921b739489e8eb8b2a78b719c9761f330de839f151f787a6db37d8d004ef9b90022bfe3c5d24ceab333cde8741340ede0315a5b92cabdaf87fb1b291f72e292 SHA512 46d2b1494c73f8b6b2be4e8969bb9906ea35620fb4081edc3176f7ba34e6ed815d5f9c5c6f06604fb37836460e25d0ce51619853288bb881362f04cba6b31812
 EBUILD fuse-common-3.2.6.ebuild 1255 BLAKE2B fc0e83b952ef21e22ae91fdde4e51cb06558b904660af2b6a8ae95904faf7dd46093ce8fd73086c5c9a44ee51ab489519c5a65cea5086909fca5b09d6de07ec2 SHA512 296f5904a0835f6645841809c12d22d7fa8a9921ae6231c211ff5a07e2532c1f87f5728e64721b50452f46d687420a092a5caa08482315a1abe237e8100a17b9
-EBUILD fuse-common-3.3.0-r1.ebuild 882 BLAKE2B 1c160f4ee9fe4855263ec009d1a14fc8a27d47de6951515bcaf71493a51231afd03bcc0afbe9c426fc912d056fc7fac88e6ffe6545d84601b0822a13926e42b0 SHA512 886597787d42d27b204e5786c0aa70c46b70bdbcd1cfaaa75fab9be0ff57179948235976f552ac3b443974e62f4df0922970a078d0ae6a5bdfc4cd655f8031ef
-EBUILD fuse-common-3.4.1.ebuild 889 BLAKE2B dc6fb48c03d1e44f07c80016552dbd240eb0f22af5c95b297e6ddc1906b02c6d70b0df683c6710f952962b6bf191401807248ef0eebbcaa89fe690fbc3be5ae3 SHA512 8660c7f0d65eab742af816e41e0f56ef803292e4f26a13dde2119ed634e003f75ecd1a676c7f173c2f6ec2bda984f76eaa03b1705f228e2546d220defb5dab8c
-MISC metadata.xml 326 BLAKE2B e3a863aeff43218beaba67d6ca4692dad0b3854a706213db47880058af990e02655a30a55eb16dc3cbe546382f6e55989d0d8321eb115b8270a016d2c1c62ab8 SHA512 fcb872557acd0b8478fd8afe48c408a6dc08fda8eeba46f6db89470b6b3aa5d1287d4be9c5ec2aee80137901d4a1d943b61b22117849d283eafd3bd587c05eae
+EBUILD fuse-common-3.8.0.ebuild 890 BLAKE2B a30aa5a43f66fab1a13dce2ed4e2c623be8acff88199aac8f02b9d8d24ba8cf3daac3c016d3c0e6f2bb737bb87f691d6bad62b922ed1b84c7264c0918e67bd40 SHA512 cdc290308b5f33d81284280b1e71f07b9bbb24f2b01011f0613ae24b9a5841474b531eefb9477ab8c3f71b2d6e2c05e9459010a6da4b5c4a46c7402f93b59f42
+MISC metadata.xml 408 BLAKE2B 20a23e1ce0b234dcedcf095ccbef63413420ab0490a2e0b98f9dffcb43508bc7c770b0180e2cb9ac501764bc85f286b7e9bf81848e34257b414ed78c7de0877c SHA512 6bfd1910124508d1a555213adcd9509b19b28184fd5eb5346d84531370414194a6f18ac2ce7d726b4341018b058e02cf2805146fa1747aba21c6b9d8c2371020
diff --git a/sys-fs/fuse-common/fuse-common-3.3.0-r1.ebuild b/sys-fs/fuse-common/fuse-common-3.3.0-r1.ebuild
deleted file mode 100644
index 5bfc1b515372..000000000000
--- a/sys-fs/fuse-common/fuse-common-3.3.0-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit udev
-
-DESCRIPTION="Common files for multiple slots of sys-fs/fuse"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-
-DEPEND="virtual/pkgconfig"
-RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
-
-S=${WORKDIR}/fuse-${PV}
-
-src_install() {
-	udev_newrules util/udev.rules 99-fuse.rules
-
-	if use kernel_linux ; then
-		newinitd "${FILESDIR}"/fuse.init fuse
-	elif use kernel_FreeBSD ; then
-		newinitd "${FILESDIR}"/fuse-fbsd.init fuse
-	else
-		die "We don't know what init code install for your kernel, please file a bug."
-	fi
-
-	insinto /etc
-	doins util/fuse.conf
-}
diff --git a/sys-fs/fuse-common/fuse-common-3.4.1.ebuild b/sys-fs/fuse-common/fuse-common-3.8.0.ebuild
index 93ecce7e5f62..b775eb8fb168 100644
--- a/sys-fs/fuse-common/fuse-common-3.4.1.ebuild
+++ b/sys-fs/fuse-common/fuse-common-3.8.0.ebuild
@@ -13,7 +13,7 @@ LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 
-DEPEND="virtual/pkgconfig"
+BDEPEND="virtual/pkgconfig"
 RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
 
 S=${WORKDIR}/fuse-${PV}
diff --git a/sys-fs/fuse-common/metadata.xml b/sys-fs/fuse-common/metadata.xml
index b8fe5aef6d9a..8badbeef7062 100644
--- a/sys-fs/fuse-common/metadata.xml
+++ b/sys-fs/fuse-common/metadata.xml
@@ -2,8 +2,11 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>radhermit@gentoo.org</email>
-		<name>Tim Harder</name>
+		<email>bman@gentoo.org</email>
+		<name>Aaron BaumanM</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">libfuse/libfuse</remote-id>
diff --git a/sys-fs/fuse-exfat/Manifest b/sys-fs/fuse-exfat/Manifest
index dc94b0876626..b5bd3691cf0a 100644
--- a/sys-fs/fuse-exfat/Manifest
+++ b/sys-fs/fuse-exfat/Manifest
@@ -1,5 +1,3 @@
-DIST fuse-exfat-1.2.8.tar.gz 159588 BLAKE2B 929fb87ee75aa70ba68814763c085c76fa1e263451bc3cd388b67dc6e793383c8eede1ea754a55c7ce7f14b38b7ec40f503acd28b0709d1ef58b10cb977a1d58 SHA512 ce81f15121b9f21bdaaacb09bdeeccdc8d556585967b85f1ab57534a8da07ea45434541fc571069b5795bae0f2ba5f090bbe7a0d5881dd35de06b706abe6d395
 DIST fuse-exfat-1.3.0.tar.gz 161278 BLAKE2B 864eed57d5ae70eac03464899ac7c63f5d55254b61b69064592bb7ae04f6c164b8113c568946103c407867c1b53511bf2b88bd6b25cf75aa3a1a9a2a7d4f12ae SHA512 90d2b89322590199012b035b88ae01559f1824172793d9e7845603940e2807e788c687e4958f1ef76678bd214bb03671b91fd2537901b6d6acf2e8c525a3f1f3
-EBUILD fuse-exfat-1.2.8.ebuild 660 BLAKE2B 0312977cba4bc43838eefe3c0e2134f7de980dc2e37334c7ccb82cb10a2af2aa71d4c6de209ea7041cb9e8257f26f2e697ab41451fa716899ef45dc45ced26cd SHA512 e05ba0abcb4734cfd01d8910b724440a6e5ea415c726254bcaaa835caccadf3d5dfa9884e5dc4a4eaaf639ee121a7486ab60472920945b5d34fa5f08ddbe3079
-EBUILD fuse-exfat-1.3.0.ebuild 651 BLAKE2B 40e0422951ea53eb4c347074ce2521e14852f56ab72f7bda604ed20e2c89001d5b5a9ecdc9888127bb22ba45a82317b21ffa70d843eea70c25bb17cba623dd45 SHA512 187bb2dab983d9dabd47045d17a23666013895905af9a0f9bfa2f77aed4da333b55d549ec06f4151ba3b872dc07cb7db776f624aabd850bf93255b0b4214df56
+EBUILD fuse-exfat-1.3.0.ebuild 714 BLAKE2B f80ff172eb4fd5e18986e63e035b84b6ff7db022d015ef1aef4ea6076907a6e755651df2d16085d2ace44ae6ac4662bf5c558ac09c219933263444106c3fa24d SHA512 9a3b69cd1d5e078e1bfc58a172be36e52b24cd4ad856ac60b0d4d7f3216ff46a24084a2ec27088670d1e6b32ae7a2820ff95a76ca9c09cb53d586bdff1b4a7a3
 MISC metadata.xml 451 BLAKE2B 89f419f995928b9d29c5aed14e20792fde2bc90cae84ad31b2df25eedfca4bbe23fef0845989616b5e6f0a44bc50941879bd5928e4f0dfbdb8a2ed4db97b95a0 SHA512 e9b06c7885b8f6d5d114042e9fa8946583b2a481ef74d4269e0d462ff995fb7da3d4ef171d401c48f517c93ca8b954f7f72f1fc0a9ac294b232e7d8a5da228c9
diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild
deleted file mode 100644
index 729d41d9a216..000000000000
--- a/sys-fs/fuse-exfat/fuse-exfat-1.2.8.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="exFAT filesystem FUSE module"
-HOMEPAGE="https://github.com/relan/exfat"
-SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
-
-# COPYING is GPL-2 but ChangeLog says "Relicensed the project from GPLv3+ to GPLv2+"
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
-
-RDEPEND="sys-fs/fuse:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-DOCS=( ChangeLog )
-
-src_install() {
-	default
-	dosym mount.exfat-fuse.8 /usr/share/man/man8/mount.exfat.8
-}
diff --git a/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild b/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
index ae1eb6cb731f..e9825ca85a4e 100644
--- a/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
+++ b/sys-fs/fuse-exfat/fuse-exfat-1.3.0.ebuild
@@ -11,6 +11,7 @@ SRC_URI="https://github.com/relan/exfat/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+IUSE="suid"
 
 RDEPEND="sys-fs/fuse:0"
 DEPEND="${RDEPEND}"
@@ -18,5 +19,6 @@ BDEPEND="virtual/pkgconfig"
 
 src_install() {
 	default
+	use suid && fperms u+s /usr/sbin/mount.exfat-fuse
 	dosym mount.exfat-fuse.8 /usr/share/man/man8/mount.exfat.8
 }
diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest
new file mode 100644
index 000000000000..235d76742eeb
--- /dev/null
+++ b/sys-fs/fuse-overlayfs/Manifest
@@ -0,0 +1,3 @@
+DIST fuse-overlayfs-0.7.tar.gz 94259 BLAKE2B b6e887165c08023a41e2490a58fbd3ff39acb5a35c78160c52ad206e647872232883a70b1b9417164900560b20c42b611e6f2747d06acda746d3c7a4cdd5e6d4 SHA512 ccca7d081c71529537f644a477c034a15e142c371c89a1595a77c2f96b1bfb5aa996a4bf108a589eab02f012666fbfd2946bc196734ee6f0a08f0301def886bd
+EBUILD fuse-overlayfs-0.7.ebuild 484 BLAKE2B f3106dd650e7909cafa93eaa113d25387cb4b914e655994d715f39d2f4e3d7f29e022c3cb7ff2949b44b25e5e00f692888200075ad2af84016d23cc30243c040 SHA512 c8d5cd16aa39b051de981c0141766161bcb51dd22d8e99521d0ccbf693ae17b92e724500bc4918445aacbb74111da1f815929bcb50d9df12f7f2fd79712cd0db
+MISC metadata.xml 334 BLAKE2B d159a1336d5c016f97f854c7dc8267a7df63d9352fc81670d09fb436aa1267c842a466bbe026443a57c3e910c927f361d0ad25e9785ea785e522500c966beca0 SHA512 c91863d890e5145d3e05d247455ee2d0bda70525dfbc15632e11df75ccdd40bdb0dca17b41d3f8485ad1768cf401915ada074ee05f739d74df93d440785b6fd5
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-0.7.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-0.7.ebuild
new file mode 100644
index 000000000000..cd3e55f7cc02
--- /dev/null
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-0.7.ebuild
@@ -0,0 +1,24 @@
+# Copyright 2019 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"
+SRC_URI="https://github.com/containers/fuse-overlayfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=sys-fs/fuse-3:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-fs/fuse-overlayfs/metadata.xml b/sys-fs/fuse-overlayfs/metadata.xml
new file mode 100644
index 000000000000..9553f7721ef2
--- /dev/null
+++ b/sys-fs/fuse-overlayfs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<upstream>
+		<remote-id type="github">containers/fuse-overlayfs</remote-id>
+	</upstream>
+	<maintainer type="person">
+		<email>zmedico@gentoo.org</email>
+		<name>Zac Medico</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index b4b35af3199e..7fa30c5fa267 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,9 +1,8 @@
 AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f977308c429858817fce81520291fd49fb58e6c863474a45a2e3a674da33b5678fcd784a7d1e8bc9472bbe0995ae3dc SHA512 909d43fbe190400d4beabd9801bf554e38a5bb5a3545930883976f42a2090c8768e485183949269639ddeae5bae5490b37dc23f031c48d6c4fd4c9facf08b66b
 DIST fuse-2.9.8.tar.gz 4610904 BLAKE2B 803eebea510834676379df8c9514050efcf47d83c06ba1f5b5756d27f5c32d3a0cc199d826b0c041118c5d2260ff023f58432a0d7b623807c0a4af4da7c34eff SHA512 0a9b14d96c6f98f5c903baf00114bfff72f9aeb97224702bbed370516b2b582401d5b436fcef979918ffd85d69ba4a82c8f722c0b35ebd50f7aa5f4ddfdcf8ad
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
-DIST fuse-3.6.2.tar.xz 1255556 BLAKE2B a48caee0e2b8b7948caff3a8c226fb87a56aa37fb2d4da08cae2f64da274df5636bf15cf8f2a15a87c3138f9a11d34fa287b371d53ddaed5b0f18e9defb4c8e9 SHA512 e5eb10c66e8585d47430e289d059a3a58ebf3823304fa35e9be413c8d194401ff5093fac82c7c6911b3c5afde6c1c156aa671d333b193d2d739a7ed1632c4bd8
+DIST fuse-3.8.0.tar.xz 1416716 BLAKE2B f921b739489e8eb8b2a78b719c9761f330de839f151f787a6db37d8d004ef9b90022bfe3c5d24ceab333cde8741340ede0315a5b92cabdaf87fb1b291f72e292 SHA512 46d2b1494c73f8b6b2be4e8969bb9906ea35620fb4081edc3176f7ba34e6ed815d5f9c5c6f06604fb37836460e25d0ce51619853288bb881362f04cba6b31812
 EBUILD fuse-2.9.8.ebuild 1942 BLAKE2B 160c38daa8321d980347079e0ab8677526c639e0d6f20b8fffaa481b7072146f1aced7f61cfc5ae05b483d7178beed551e6df44d5e319c9274a3c1c5cb530e58 SHA512 35efa56282f0a9a4aca7e284af1da587d6a5545439c50258ecc31c47159fa777c70400f28b4fd9c8392a39d1b43ba8c3c1935e0860d7689dc7ad40f5134e7da8
 EBUILD fuse-2.9.9-r1.ebuild 2082 BLAKE2B cd76adedf8a5674cf7b6071d150b0d6ac15a3895998d50aa78f8392a6dbbcf00bab6dae4e53905c879506c01e1a06bcfffc1ba584369af26ba669a8e488da101 SHA512 bc85964d55375dfe4d44ee29879281d06c94641763e9e2f855f74693f5a81bd051f129f8fdb8aa439bc0b456989d763ee597235b4f83d6aadd25fd26b5f29c04
-EBUILD fuse-2.9.9.ebuild 1882 BLAKE2B 4f789ad332f80dbd3c012aeb7286e2d0615717f2afc8dd7078c0148f607cdf4fbac5fd1c515d7c49c189f2eb7e1ec9a79a1e2a25b9ded1a4e79e5e705772912e SHA512 834caa3c39f615fa440688c8bad60b725358ba9c3ac88fbabceeaa86f0027b2a6cea3bc563435cd430adda5f16e76efa86fff46b8ecfbe025ebbd33940a098eb
-EBUILD fuse-3.6.2.ebuild 1677 BLAKE2B 290c6d918897e2a5ce9d7307e3dc35c094400f88908ea994de2c057dc63204d29c3dbbaaf602f64d6cba5f73eafebc5466cd3211b47e6a8f5a5a005dae21c061 SHA512 30569fefccdf6234b2f10d8573614800bc276072061e34b1b029fb738db93549fd7795e1aa008986ff569e97a9949e07dfe021b1d701f5380c35b3d8eec21974
-MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180
+EBUILD fuse-3.8.0.ebuild 1776 BLAKE2B 1f51840daa80da2d456a9e74e197d4cf408af8ff76ccd1a1c5f895a7a1ef17479f8250c937da8c2c1c0ef42b6a2fa6a6ca168fe909f8b0d978ad657a2aeed1a2 SHA512 5a8db47b6b99685140129edaa0f57acb99f8cf1ca21deca186b00ee84415b63be7a32717b13dde4c2245ca5955f4e9118d8f9cb2a3619cb114f5320ba1086e21
+MISC metadata.xml 461 BLAKE2B 5886a41fed2f941b52933f1b2b83f7a6dfaf20a34721862a8ede36b573b6de79b3ac30fe25bf46e39047bf3d67b35bd44ae9747eccf566aa4d81f8bdee3d3a11 SHA512 66c7c7e08946aa12f78d09162654cb3da545a273e1a846b66a745bdb1767384c07bee4c8eccafce1615192d50cf783bddffcfd38783cc379afbae94a0b47e568
diff --git a/sys-fs/fuse/fuse-2.9.9.ebuild b/sys-fs/fuse/fuse-2.9.9.ebuild
deleted file mode 100644
index c2933b58a93e..000000000000
--- a/sys-fs/fuse/fuse-2.9.9.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit libtool linux-info udev toolchain-funcs
-
-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.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples kernel_linux kernel_FreeBSD static-libs"
-
-PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
-DEPEND="virtual/pkgconfig"
-RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
-
-pkg_setup() {
-	if use kernel_linux ; then
-		if kernel_is lt 2 6 9 ; then
-			die "Your kernel is too old."
-		fi
-		CONFIG_CHECK="~FUSE_FS"
-		WARNING_FUSE_FS="You need to have FUSE module built to use user-mode utils"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	local PATCHES=( "${FILESDIR}"/${PN}-2.9.3-kernel-types.patch )
-	# sandbox violation with mtab writability wrt #438250
-	# don't sed configure.in without eautoreconf because of maintainer mode
-	sed -i 's:umount --fake:true --fake:' configure || die
-	elibtoolize
-
-	default
-}
-
-src_configure() {
-	econf \
-		INIT_D_PATH="${EPREFIX}/etc/init.d" \
-		MOUNT_FUSE_PATH="${EPREFIX}/sbin" \
-		UDEV_RULES_PATH="${EPREFIX}/$(get_udevdir)/rules.d" \
-		$(use_enable static-libs static) \
-		--disable-example
-}
-
-src_install() {
-	local DOCS=( AUTHORS ChangeLog README.md README.NFS NEWS doc/how-fuse-works doc/kernel.txt )
-	default
-
-	if use examples ; then
-		docinto examples
-		dodoc example/*
-	fi
-
-	if use kernel_FreeBSD ; then
-		insinto /usr/include/fuse
-		doins include/fuse_kernel.h
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# installed via fuse-common
-	rm -r "${ED}"/{etc,$(get_udevdir)} || die
-
-	# handled by the device manager
-	rm -r "${D}"/dev || die
-}
diff --git a/sys-fs/fuse/fuse-3.6.2.ebuild b/sys-fs/fuse/fuse-3.8.0.ebuild
index 89893637d630..4e75898ead75 100644
--- a/sys-fs/fuse/fuse-3.6.2.ebuild
+++ b/sys-fs/fuse/fuse-3.8.0.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7,8} )
 
 inherit meson multilib-minimal flag-o-matic udev python-any-r1
 
@@ -13,10 +13,10 @@ 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 ~sh ~sparc ~x86"
-IUSE="test"
+IUSE="+suid test"
 RESTRICT="!test? ( test )"
 
-DEPEND="virtual/pkgconfig
+BDEPEND="virtual/pkgconfig
 	test? (
 		${PYTHON_DEPS}
 		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
@@ -37,13 +37,16 @@ src_prepare() {
 	default
 
 	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
-	filter-flags -flto*
+	filter-flags '-flto*'
 
 	# passthough_ll is broken on systems with 32-bit pointers
 	cat /dev/null > example/meson.build || die
 }
 
 multilib_src_configure() {
+	local emesonargs=(
+		-Duseroot=false
+	)
 	meson_src_configure
 }
 
@@ -65,8 +68,8 @@ multilib_src_install_all() {
 	# installed via fuse-common
 	rm -r "${ED}"/{etc,$(get_udevdir)} || die
 
-	# handled by the device manager
-	rm -r "${D}"/dev || 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
diff --git a/sys-fs/fuse/metadata.xml b/sys-fs/fuse/metadata.xml
index 42343713afc0..b64588b9eb7e 100644
--- a/sys-fs/fuse/metadata.xml
+++ b/sys-fs/fuse/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>radhermit@gentoo.org</email>
-    <name>Tim Harder</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="cpe">cpe:/a:fuse:fuse</remote-id>
-    <remote-id type="github">libfuse/libfuse</remote-id>
-  </upstream>
+	<maintainer type="person">
+		<email>bman@gentoo.org</email>
+		<name>Aaron BaumanM</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="cpe">cpe:/a:fuse:fuse</remote-id>
+		<remote-id type="github">libfuse/libfuse</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/jdiskreport-bin/Manifest b/sys-fs/jdiskreport-bin/Manifest
index 734fc7318482..2254b56ae9cb 100644
--- a/sys-fs/jdiskreport-bin/Manifest
+++ b/sys-fs/jdiskreport-bin/Manifest
@@ -1,7 +1,7 @@
 DIST jdiskreport-1_2_5.zip 613585 BLAKE2B f78ea7b0449c89b966e810dda3515a502187aff07b5cc008a5d3e110f4506aebef9cb2f2c3302d9e7e3e22e25fcbff16c381404acc0356311a8a05f72592af5c SHA512 d23641610a9fba6b7b2c5d529244229e807d89bd2b4c339e59522547f3b45a32415d6819a4ee8d5bd4a8789ea4610887428bfd5a5a4c56b11911da035a560993
 DIST jdiskreport-1_3_0.zip 650433 BLAKE2B 4edeec05f53bf10c3b1a911790a56f8f3e591b36b29b645a3378e357c6b0e835d4530753058541d712727111dd91a3dbf07664bc52c4cb1b330086fa5ae59af1 SHA512 9d57e7db810117a27c1d8d2aef40113652f25055e3512500fdf5f8806b1d68f4be8b4231e281d690108301afde3cc6b70f061c71d3fafef06689ca3228dd44ea
 DIST jdiskreport-1_4_1.zip 864613 BLAKE2B 9f10a10e54f0553e9130bdaf801380b40982a48e308fff5418308a37a4e02a886961d5ff2787b9bc3d1dfa1db087409e0447b275f6419b5e775716d20843fa98 SHA512 c1e17bdaab739561ae46475d69805e18be271a0d41b555e981cde59091d6c46fe3cf6775bdd992200edbb4646b7a04003a6b67bfedc18161952a20e47b18ea38
-EBUILD jdiskreport-bin-1.2.5-r1.ebuild 657 BLAKE2B d5b1fd2644a777d44382fae17cb80d1d884ccb2f0738b16dce46e610dc3624ba71901dd2c50848b76d7dc08f3f0180310552a7078b05261830413a8a220d4a71 SHA512 5e94bcc6854fd35be214e1b0d743dc5e8a9e1dd9e1cc6605a8b98681065a4869416019a42cac4ca7a3a4b5147754951c06f5f5772f830f3214348c68af04cf1a
-EBUILD jdiskreport-bin-1.3.0.ebuild 657 BLAKE2B d5b1fd2644a777d44382fae17cb80d1d884ccb2f0738b16dce46e610dc3624ba71901dd2c50848b76d7dc08f3f0180310552a7078b05261830413a8a220d4a71 SHA512 5e94bcc6854fd35be214e1b0d743dc5e8a9e1dd9e1cc6605a8b98681065a4869416019a42cac4ca7a3a4b5147754951c06f5f5772f830f3214348c68af04cf1a
-EBUILD jdiskreport-bin-1.4.1.ebuild 657 BLAKE2B 342c3d60eb5c556480ac7524490b2dc6885fcf7585fed69e11758b530bebecf954f419068400d999fe87bdd1fd3f08b62ce7d131701950051d296cbe6a060b7f SHA512 297b8db83f118f37e79981ba32a8884923cf73ed662fe51c2b1c3641f8dd9e32f526b59f90d32a24b6994a9058e47aa3f43f1defbced835a2c0d4510e2b69ebb
+EBUILD jdiskreport-bin-1.2.5-r1.ebuild 650 BLAKE2B cb2701aefc30a2e887aae5e0d72c396005911268a8b765d95b7724db50263a7a27c5e5382f54a36e071f4fe8ab421b37e8ed13b9dc1fd1c0f7dbdb3fa6d92690 SHA512 774e2b2c278511825066dab5fb2c24ed64df33bf907e3eb5eac1abbf7bb5c2c83e09ba9be4a43acae08b3170279aae82174dfab80ba72ca84e53f8ad0164a3c5
+EBUILD jdiskreport-bin-1.3.0.ebuild 650 BLAKE2B cb2701aefc30a2e887aae5e0d72c396005911268a8b765d95b7724db50263a7a27c5e5382f54a36e071f4fe8ab421b37e8ed13b9dc1fd1c0f7dbdb3fa6d92690 SHA512 774e2b2c278511825066dab5fb2c24ed64df33bf907e3eb5eac1abbf7bb5c2c83e09ba9be4a43acae08b3170279aae82174dfab80ba72ca84e53f8ad0164a3c5
+EBUILD jdiskreport-bin-1.4.1.ebuild 650 BLAKE2B 9cd7263ccfac9331c0c7730335741aec623418a7073fa02082d15957edb90a9f8759e3682c0a6bdc337522e3d7b6d940e825c8a68094ce1c986216eb26877516 SHA512 e0006eb4794e244f18d4ba53d4088de3d9967797d92b74e50a2d7cacd6ebf878497eea2015d338fe3d8b4e071a0a67bc52edbcf35c5dbb2eae5cbb8a25063c6e
 MISC metadata.xml 449 BLAKE2B 93a22d95c04e27c440815e9440a6a3928462826412c94e718939cbfa9dc8a93496dc4b5ccdc3408d1b8a2c328aa01cc85d8b9f9fb92ccc9a3f5215f50e245c36 SHA512 d0192d871b568d54810f2d2d973666fc309f8855c18b53e89631fb9495770978bfc1b583094151e6dc0916444b6594f3c588db5a070762b3c5b844848752673c
diff --git a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild
index 050e68827747..7eefac0eba94 100644
--- a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild
+++ b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.2.5-r1.ebuild
@@ -27,5 +27,5 @@ src_install() {
 	java-pkg_newjar ${MY_PN}-${PV}.jar
 	java-pkg_dolauncher ${MY_PN}
 
-	dodoc README.txt RELEASE-NOTES.txt || die
+	dodoc README.txt RELEASE-NOTES.txt
 }
diff --git a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.3.0.ebuild b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.3.0.ebuild
index 050e68827747..7eefac0eba94 100644
--- a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.3.0.ebuild
+++ b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.3.0.ebuild
@@ -27,5 +27,5 @@ src_install() {
 	java-pkg_newjar ${MY_PN}-${PV}.jar
 	java-pkg_dolauncher ${MY_PN}
 
-	dodoc README.txt RELEASE-NOTES.txt || die
+	dodoc README.txt RELEASE-NOTES.txt
 }
diff --git a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1.ebuild b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1.ebuild
index 287bb83f39ad..69ad393e3a39 100644
--- a/sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1.ebuild
+++ b/sys-fs/jdiskreport-bin/jdiskreport-bin-1.4.1.ebuild
@@ -27,5 +27,5 @@ src_install() {
 	java-pkg_newjar ${MY_PN}-${PV}.jar
 	java-pkg_dolauncher ${MY_PN}
 
-	dodoc README.txt RELEASE-NOTES.txt || die
+	dodoc README.txt RELEASE-NOTES.txt
 }
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 7d53677f5402..d65ced321f93 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -7,9 +7,6 @@ AUX lvm-monitoring.initd-2.02.105-r2 960 BLAKE2B 82e1d55032827b7b330bbdb09c74ffb
 AUX lvm.confd-2.02.184-r3 282 BLAKE2B dcc65a1e9634becb8a79d74fbadc5fa9880a1e497546817418f0df7668454d8cad1f52c9516f251833874ca5bac1a530970b8a94860057b05361c736935047ce SHA512 05818e09fc6d8fe8287283b832fa73b4d3ef539837f956b9bfa394d206c1e379a3227148040934ac690d77524f3f7b16ba0d262a11de268914b1d11afe3a3c97
 AUX lvm.confd-2.02.28-r2 173 BLAKE2B 4b9d115ed31b3777bd3c925b75bd0ebb186bace92b6d294e6a1ff7cdb7c206374a06738a73edc401a5547016a08721013fe3ad66b52d8cf08de75d030813ab2d SHA512 67b153cbc5c2327c15f042b3b5590c1d8fdf9823efb19c80192ac4dcf98e530efea8ecae0aaaa4a54b0e3e4907565aa21455b364df1dbe8f2e7dffa1c5d355d0
 AUX lvm.rc-2.02.105-r2 2957 BLAKE2B 14496c663accdaada8d921c4e1d65fdcddd2208c5be6acc150794da72d21175663e358a3412eb0a74b0c64d0ebe3d443cc49ed06cac1696ad0edeab0ec9f1e04 SHA512 4237e3f9e748742d1bff7c3fb6e1fb1d6f2d21dce58e4aa74f0202d0aa7fd11d51ece61ba37a72142b4349506ab45067d20e181f7a20220f9203ba3a823ec606
-AUX lvm.rc-2.02.116-r6 3780 BLAKE2B e5a293e9f493a49776b539e30e6a8452e93ea3723e365042efd37480b07ded9ed818fb025ab44cce51cb8717513a9df170127025609f5e52e1dfae9c305100f5 SHA512 822213a67a1b326ffcd5f67d57f3eea87e5ee6b4c81836ab72ce79a56f5a2e7c80d47a61808cfda56e9ff77699d0da0324b931f0236609e8623f7613681baa32
-AUX lvm.rc-2.02.172 4266 BLAKE2B 50d2bee47ee2fd6f4a56eaed7df4fc736c5a2158353af113bd8ee6915055f2a196b9feb37678d928d7e73a71783f6918219e9e6143ae53bd09839cd1560ff35f SHA512 718ac4495623c495c6697c992d07f618459748d03a960566896cea981639c655ecb3ddcb876150f9129d0b6bc1bd90ef1092a3326ac7234519702675bdb1db6a
-AUX lvm.rc-2.02.183 4363 BLAKE2B b80351d20a87937f331b34c2007b2ccd27543273b672d002607b02f56d5a15fb142111c5f0939fcc40c52b3123b3b3fc15aa39424139bd00692158f20784489b SHA512 7cd6aa621d022190cd45c44e39ac48445f244643e5c537adbe61e4fbc2d688ce450bfddece92853cc324b0bb2c52c32c4169fc251914eda429de418a0ffe8aba
 AUX lvm.rc-2.02.184-r3 4474 BLAKE2B c08e1c338b8b788927d05f87eb83b2f3a95d35dad9b86e5f9be8809b2883bac56c973c9c2dc8f7775c6e05c3c2ea66dd5268699af3dba47e9a842262e659a121 SHA512 ca7fef98fd074018223be65f6aa20a0abfbb78afbf3d8ff50e1f2656a1cbb7a54570381c9a5328f3766774dce819c1f48e4433c0e7bec69f6bf70747a3375699
 AUX lvm.rc-2.03.05 3923 BLAKE2B bbb17f64ba56e4f2eaa75020116fff637d13f35ebccf27c2bfa98a9bb7d0e9b53e4afc5d2d1266db61486281d09a2a1c3ec3540edac9dcccd8655bcb17cb44bb SHA512 eb9f76aaf8af5bee7315481de2aa99091150c69f281f58d07e8955856316a7ef41c7f0e3e5c5b4ee14c76108f03a7a396c6f1113fafec49883a09b5049a85e93
 AUX lvm2-2.02.106-pthread-pkgconfig.patch 860 BLAKE2B 73c23ba460787dccc1412a8fdba9cdf60172fecab9a732b154af7e7bc4c927a751fbd1107c86cd997221b963748644885a4f525eae351aa2857c4d7e1498f755 SHA512 ae073936ee15fdeabde4d3948a65f6a435b82e62aa0ddadbad399b69bd5c9bfc181d5e0be1beae9f6e899a6e8b9d7c21add13f7a1606cb5ed4762ed5aa5aa223
@@ -30,6 +27,7 @@ AUX lvm2-2.02.178-static-pkgconfig-libs.patch 3495 BLAKE2B 85869e4f46b001c4a8d43
 AUX lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch 2748 BLAKE2B 40b64eb5937ba162b6084f1cf8cdd977146593573127eea6635d389777d5620db1daa7133299445b56b7dba0444b5958d1107f097ec94e5d17014fbb17419d8e SHA512 632080b067a68f65b20d3e96f36616a494d1aabbbc1465a83058574bb0ec49b72f9413e60175d599137a85674f6bb3a9c0e89296101314fe0e127a843b5578c0
 AUX lvm2-2.02.184-dmeventd-no-idle-exit.patch 2468 BLAKE2B e59873c7da99a8e62f71c78b1e93d54c342258949719fabdf2b08b0fcbf00ddcd3c8eb2a937416c646a948dda91474d2ad2187fcb880152986c7f6936bbee1ee SHA512 02a82cde3affd8e84b9800ad06c0c2ec9562f9412157e4f9ba96ef502a22d7870ece3d867684cf90c32ebc77bad8ae3beef5a3fe606ef7c30ad1b2b73e81de1a
 AUX lvm2-2.02.184-mksh_build.patch 505 BLAKE2B c54a78589a409488a3356a3e0c3de251a1315e5e9497bed3480781cd0bf40ffbd05c97c9025fab0b43014c501771b8db4358aaff2a12a07a881fb87573b1e5c0 SHA512 20bd0cc039d113ad63608a0eb56bb9000d38c29a5ed64b88ca89aa20411d2ba77e6f5f34b99815ed3cc1ea8cf90b2d9bfb82c4d80a5944f2fc9a631a781bc0d3
+AUX lvm2-2.02.186-udev_remove_unsupported_option.patch 1149 BLAKE2B c2faaec3f9cc899515ae189e1c91bd2dc6b48f9e27fd267030fcb60d0dc61bce3062e25568052246f3981a5ac18dc7f88990db856df83e4fa88d11a8c3df0736 SHA512 1e8623368add4f9ce6278568fe98b7cc90da6b7c313345fe26c4a59ef07c000b5d3175e157989a0065f03d4186f679c2c81ec8265143dba91ceecee6cebdccf4
 AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 BLAKE2B 5533ceb7a601d58995e7a90b1355508907edb30d14704b397a8c8ba0d66dbcd3d6b02ace1cadef1dfbb1d927449403f76f0f38e5d034344b3232deb512507cb6 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de
 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 BLAKE2B baf7010b5965f5c2b9a32ec812cb259cb3ceccea0d56e48d75e9f8e872634913f160fcfff0c2c77854ddfeaafb3b48bbca16d569041ab6f45aecb950f8e5bf4a SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c
 AUX lvm2-2.02.67-createinitrd.patch 660 BLAKE2B 23e784e6769bc1f47fa57d690e6bebdf16d784d775a06af1c8eb7c54dd63a12abb0edd8331c8d033d7a0dda058252453a46dd35bd820fd47ba1407e9568b3858 SHA512 17fbba5d34ece5c1c25ef35fa3bbc3d6fcd20b44bd766c049bbc120853a8d60c9544db5790645a7814db5c272fd12d383699a8a9be6f4e9c56a7c0a1bb29ade2
@@ -46,16 +44,12 @@ AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c9725
 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.02.116.tgz 1538340 BLAKE2B 718261b60626f2eca5ba13011646bf551523ed8e59aaceceb9097221c000268b7533ac43151ff1d9229911d87e764fbdb29ffa1d305f2aae99220a68e301559a SHA512 992541339637d597257850b4ff7f5348fb7cdcccf806ac8d986a3be1ad1edc5f6bfaedeed5128690c541d1a485cdc75742e90a766363c39867901003518fb84d
 DIST LVM2.2.02.145.tgz 1986370 BLAKE2B 0c9e5efae17f26ff86152cecbf0b11a74e85007b2fa9491f44dec03ac8c11375bacf6685213b4be19037c8fbf70e13549516716ecf8fa262919a44625e6aab34 SHA512 84e28b3efc940837ea9da70fce620744aea0945ba29383b76ad7bcd4b5259b897c714162a8e8b7cfe26ae736a3ad2eca633a3e0df4d6280a32b28bd4cf472d27
-DIST LVM2.2.02.183.tgz 2380574 BLAKE2B b1fe71b6cdb8ee20dd53d0ad3399c553487baafa12657ec81a794c84ad161988afdb8693ac247877a2645d693a0740c74c8b991047ed2ba4adc9ec75f1c261a9 SHA512 3947523c6b0862ada40677ed171ed0cf95e070119e377296fc5ccb153e9c4212d34c0b16a887dbd68ccf265525345dabfed2aa59fb3604555429a7e2ecfff4d7
 DIST LVM2.2.02.184.tgz 2383698 BLAKE2B b6e308d76d541b9461dfcc6e82db256a175ccdabfae9c9d57d84eabd0d5ea50e3e09954b34741903e027412c2c26f72a5005fe934261576337a810738139deb8 SHA512 9db74f675e7c58f663a39afb79b6f33a33ad2cfbda63e9783ef5027f33977b4a1262a2e6754aa67c586eed083ee119a2e837c32a7746dcc53f13877c9d65c390
-DIST LVM2.2.02.185.tgz 2386328 BLAKE2B d2e31de3eedd7518ea2d239cb9b36b38e351d7fc070097a1fc4e7934e3636195da3247fba57d684bb0b31b7f3dbdfe29161bd121b2962b2c35c8c9d7914b4506 SHA512 f421505551aec2a09bc862f2fcc1ee825bc4d94c53a01d13265631e99308d60fbca40112be5bc7824cce3ef223c0775d2f6c345f6a3f227229a0566c903841bf
 DIST LVM2.2.02.186.tgz 2389759 BLAKE2B e094c0135d455386ea5789208899d4dbdd5e78bebf52e49ab5587f881fbc2b94c6accecacf1b4ed182b0c87046402c00a47a1b724795a94fe3ec998b580a77ae SHA512 06a1c00142ee41d8a576a5e06a5beae70baced3020e753ce3b612355cc4d9e33be4acf58569d49436c4ee1118d288d884c7301b7d886074eaf9f2fa6b0248c03
-DIST LVM2.2.03.06.tgz 2453672 BLAKE2B 3d39bef4915ddb15c51011c131afcd2735723fc3e880e01fb863d82ccac0c34b7d71f6a3a126c6bb53fbf2dd923ccf0443e4e02a492fc0660ee1ef168dbb0e79 SHA512 2a01d34fa58348b0fac3d40a9ce736aa499af18c7e9bf96a3eeefc6a2de6a73460c83b6c67be20e9bd440998cbf847bc3e7a028385f38d715e221a5a857d391f
+DIST LVM2.2.03.07.tgz 2469455 BLAKE2B b00eb39b8d5558fc0c681148a5a32ab1d0151b80a3a88b86aee6a7de5099475e619d4a737ef8fa040da1d76316e65a65f55bf43206847ac7173943a5e4959a03 SHA512 f1cefde32370140ccc802c467fe1e7e40b2ab99c1367fc03457e34640bdc9c0481523c2360e6ac18d6ae5ae9e80bc5dff61b3d13d20b1592bbee27e04fe1fd24
 EBUILD lvm2-2.02.116.ebuild 8362 BLAKE2B 7a675d987f35e9bb1ba3a26ee0c5d3997ea9da3f8c4456565199a6086f4aa0b2b89d483803772a2fd8816cf8f1725eb756b597ce635a2d11cd410c75e4fc7fb7 SHA512 04254d5cfbad2b9baee55e5d62b04850b05878cb5009b66fffe862966567e7dfb7bec743cea2de2c34c4d5699da8914a44f58cee60aad7fda713ed57d806c466
 EBUILD lvm2-2.02.145-r2.ebuild 8547 BLAKE2B fb156582ad70f43300ddc838da48f814a56327a4ec06754b48c6ec7c9e053504acfff4866ab532ef64ff9d7a6cb136b94151d032512a2a8a11a2bb872dd04ea3 SHA512 1f64d2c7ec4c021bf1d9adea321825264de9ddd3f8bd03e6021c95a715a716316af0c2cc26a34095073de90c2556bb87943f7b39f42863c29081f06efabbfe81
-EBUILD lvm2-2.02.183.ebuild 8798 BLAKE2B 815bc2a3b83c4c1db9b71dc32cd8baa393e099af01b9f06567fbf7ad36b1e7a64f0e741dde0ec3f64178a420758e89baf8ebc24cc8b745adbc125cdb6f607ab2 SHA512 ec1808c50e39e1a29b22ecc2583fa05bc74669231e45069f483ac73bb723d378a56287bf45f9bc32844f5f4c83259e60b0e0160c1033b92e83fb8523b0684075
 EBUILD lvm2-2.02.184-r5.ebuild 9336 BLAKE2B d67986b27e670bbd6de3e4cfc0fd6fc9fef0cd5d2011ff2a53ffd3fd5eaa0636aa6034cf87140254a493540f38163e646cd38450c2f0eecae9d56f7c035c4e80 SHA512 993e2d809cd7c7e1ac320d038c5744c0d0c4c13e15d7aa8c63cde211c58747094991eb016bbe048696cb09e3c886cc53ef9bfd7b951e9fc2c0749ca9693ac8f0
-EBUILD lvm2-2.02.185-r1.ebuild 9526 BLAKE2B 2220f25e36b4f0a71433eceed724d6f89f755e059a2296896a15c0e508cb437e7f3c8886cc9844eab252f647a9befa056a34c608758061e99a0c1d203e66b6cd SHA512 dccaba648223d68381e83ac0fe1795b7fa0f47bace02f434e9f8292e979aef1280e384a0c3cf614f54421c72570e8c168a3720c469caedb50d3c0c3aa5916c3b
-EBUILD lvm2-2.02.186-r1.ebuild 9526 BLAKE2B 2220f25e36b4f0a71433eceed724d6f89f755e059a2296896a15c0e508cb437e7f3c8886cc9844eab252f647a9befa056a34c608758061e99a0c1d203e66b6cd SHA512 dccaba648223d68381e83ac0fe1795b7fa0f47bace02f434e9f8292e979aef1280e384a0c3cf614f54421c72570e8c168a3720c469caedb50d3c0c3aa5916c3b
-EBUILD lvm2-2.03.06.ebuild 8905 BLAKE2B cdc29d8003234f0631f1865331a2828c21ff4b81e57a95fd8f560ea4450fee33972ff81e7334ac419f29eaab556a0a7c9a264f2e4cdb16212f9aa760b5f8b8a6 SHA512 274c7cc14b5a2177cef630ba36d475d47781f14ad4ae7101ad82dc30061a8b02a4696374faf2677357a8c9827c72f53d4cbddf59df2733b694ea5fe5a320e8cf
-MISC metadata.xml 973 BLAKE2B d44e826563738ba8b14ba0a31756f66551bae97866c66da94bcfb6f763ab45d8217e92e4a7c2ad07bba41285470c7dbca617af598a8ef765f9d30e409c3ae12d SHA512 d85b652879e6fae8e2fc9fe796c3f7e70fa5edefff6c33f858fac73c165c658493efc1fde61cccefccac80e0b9b2f50f6b8de0dbe9e432055fd218552911f403
+EBUILD lvm2-2.02.186-r2.ebuild 9601 BLAKE2B adef0b59955206ef539f5d8d5768a53cda16eaabdffaebf4728fafb674b02f70998cdae599cba6c4b40376e7204a6e3e513c8ae87a6947f888d959149a97898a SHA512 41592035cd84f0e1d7e79829838257d1519080cf2693f15ad2f4d1f522f6cfe7c192f116f8d9ba03272c3f8d856ccea613c15d9f9bed57dffba9aca579c8257d
+EBUILD lvm2-2.03.07.ebuild 8905 BLAKE2B cdc29d8003234f0631f1865331a2828c21ff4b81e57a95fd8f560ea4450fee33972ff81e7334ac419f29eaab556a0a7c9a264f2e4cdb16212f9aa760b5f8b8a6 SHA512 274c7cc14b5a2177cef630ba36d475d47781f14ad4ae7101ad82dc30061a8b02a4696374faf2677357a8c9827c72f53d4cbddf59df2733b694ea5fe5a320e8cf
+MISC metadata.xml 1159 BLAKE2B cf99f1de288acaa1ee96ef7f4dec4923deca28852f9273bb9852cd3e819f75201952653c2ceab738fbaab6eade9597a16d80dbdefdd8ad5fe3c58f03db699a53 SHA512 d8004f2a09fcef53cfab1a698e744096fc082f0d9411ebc30a4160a233e8056225c36473bb0aa815d7e29bacd7640653de0e3ba0e306f9155b0e3006953c98f7
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.116-r6 b/sys-fs/lvm2/files/lvm.rc-2.02.116-r6
deleted file mode 100644
index cf430c6654db..000000000000
--- a/sys-fs/lvm2/files/lvm.rc-2.02.116-r6
+++ /dev/null
@@ -1,132 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-_get_lvm_path() {
-	local lvm_path=
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	echo "${lvm_path}"
-}
-
-_need_lvmetad()
-{
-	local lvm_path="$(_get_lvm_path)"
-	[ ! -x "${lvm_path}" ] && return 1
-	${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmetad=1'
-}
-
-depend() {
-	before checkfs fsck
-	after modules device-mapper
-	# We may use lvmetad based on the configuration. If we added lvmetad
-	# support while lvm2 is running then we aren't dependent on it. For the
-	# more common case, if its disabled in the config we aren't dependent
-	# on it.
-	config /etc/lvm/lvm.conf
-	local _need=
-	if service_started; then
-		_need=$(service_get_value need)
-	else
-		if _need_lvmetad; then
-			_need="${_need} lvmetad"
-		fi
-	fi
-	need sysfs ${_need}
-}
-
-config='global { locking_dir = "/run/lock/lvm" }'
-
-dm_in_proc() {
-	local retval=0
-	for x in devices misc ; do
-		grep -qs 'device-mapper' /proc/${x}
-		retval=$((${retval} + $?))
-	done
-	return ${retval}
-}
-
-start() {
-	# LVM support for /usr, /home, /opt ....
-	# This should be done *before* checking local
-	# volumes, or they never get checked.
-
-	# NOTE: Add needed modules for LVM or RAID, etc
-	#       to /etc/modules.autoload if needed
-	lvm_path="$(_get_lvm_path)"
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	if [ ! -x "$lvm_path" ]; then
-		eerror "Cannot find lvm binary in /sbin or /bin!"
-		return 1
-	fi
-	if [ -z "${CDBOOT}" ] ; then
-		if [ -e /proc/modules ] && ! dm_in_proc ; then
-			modprobe dm-mod 2>/dev/null
-		fi
-		if [ -d /proc/lvm ] || dm_in_proc ; then
-			ebegin "Setting up the Logical Volume Manager"
-			#still echo stderr for debugging
-			lvm_commands="#! ${lvm_path} --config '${config}'\n"
-			# Extra PV find pass because some devices might not have been available until very recently
-			lvm_commands="${lvm_commands}pvscan\n"
-			# Now make the nodes
-			lvm_commands="${lvm_commands}vgscan --mknodes\n"
-			# And turn them on!
-			lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n"
-			# Order of this is important, have to work around dash and LVM readline
-			printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
-			eend $? "Failed to setup the LVM"
-		fi
-	fi
-}
-
-start_post()
-{
-	# Save if we needed lvmetad
-	if _need_lvmetad; then
-		service_set_value need lvmetad
-	fi
-}
-
-stop() {
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	if [ ! -x "$lvm_path" ]; then
-		eerror "Cannot find lvm binary in /sbin or /bin!"
-		return 1
-	fi
-# Stop LVM2
-if [ -x /sbin/vgs ] && \
-   [ -x /sbin/vgchange ] && \
-   [ -x /sbin/lvchange ] && \
-   [ -f /etc/lvmtab -o -d /etc/lvm ] && \
-   [ -d /proc/lvm  -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
-then
-	einfo "Shutting down the Logical Volume Manager"
-
-        VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
-
-        if [ "$VGS" ]
-        then
-            ebegin "  Shutting Down LVs & VGs"
-			#still echo stderr for debugging
-			lvm_commands="#! ${lvm_path} --config '${config}'\n"
-			# Extra PV find pass because some devices might not have been available until very recently
-			lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n"
-			# Now make the nodes
-			lvm_commands="${lvm_commands}vgchange --sysinit -a ln ${VGS}\n"
-			# Order of this is important, have to work around dash and LVM readline
-			printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
-			eend $? "Failed (possibly some LVs still needed for /usr or root)"
-        fi
-
-	einfo "Finished shutting down the Logical Volume Manager"
-	return 0
-fi
-}
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.172 b/sys-fs/lvm2/files/lvm.rc-2.02.172
deleted file mode 100644
index 82037b28adf9..000000000000
--- a/sys-fs/lvm2/files/lvm.rc-2.02.172
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-_get_lvm_path() {
-	local lvm_path=
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	echo "${lvm_path}"
-}
-
-_need_lvmetad()
-{
-	local lvm_path="$(_get_lvm_path)"
-	[ ! -x "${lvm_path}" ] && return 1
-	${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmetad=1'
-}
-
-_need_lvmlockd()
-{
-	local lvm_path="$(_get_lvm_path)"
-	[ ! -x "${lvm_path}" ] && return 1
-	${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmlockd=1'
-}
-
-depend() {
-	before checkfs fsck
-	after modules device-mapper
-	# We may use lvmetad based on the configuration. If we added lvmetad
-	# support while lvm2 is running then we aren't dependent on it. For the
-	# more common case, if its disabled in the config we aren't dependent
-	# on it.
-	config /etc/lvm/lvm.conf
-	local _need=
-	if service_started; then
-		_need=$(service_get_value need)
-	else
-		if _need_lvmetad; then
-			_need="${_need} lvmetad"
-		fi
-		if _need_lvmlockd; then
-			_need="${_need} lvmlockd"
-		fi
-	fi
-	need sysfs ${_need}
-}
-
-config='global { locking_dir = "/run/lock/lvm" }'
-
-dm_in_proc() {
-	local retval=0
-	for x in devices misc ; do
-		grep -qs 'device-mapper' /proc/${x}
-		retval=$((${retval} + $?))
-	done
-	return ${retval}
-}
-
-start() {
-	# LVM support for /usr, /home, /opt ....
-	# This should be done *before* checking local
-	# volumes, or they never get checked.
-
-	# NOTE: Add needed modules for LVM or RAID, etc
-	#       to /etc/modules.autoload if needed
-	lvm_path="$(_get_lvm_path)"
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	if [ ! -x "$lvm_path" ]; then
-		eerror "Cannot find lvm binary in /sbin or /bin!"
-		return 1
-	fi
-	if [ -z "${CDBOOT}" ] ; then
-		if [ -e /proc/modules ] && ! dm_in_proc ; then
-			modprobe dm-mod 2>/dev/null
-		fi
-		if [ -d /proc/lvm ] || dm_in_proc ; then
-			ebegin "Setting up the Logical Volume Manager"
-			#still echo stderr for debugging
-			lvm_commands="#!${lvm_path}\n"
-			# Extra PV find pass because some devices might not have been available until very recently
-			lvm_commands="${lvm_commands}pvscan --config '${config}'\n"
-			# Now make the nodes
-			lvm_commands="${lvm_commands}vgscan --config '${config}' --mknodes\n"
-			# And turn them on!
-			lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ly\n"
-			if _need_lvmlockd; then
-				# Start lockd VGs as required
-				lvm_commands="${lvm_commands}vgchange --config '${config}' --lock-start --lock-opt auto\n"
-			fi
-			# Order of this is important, have to work around dash and LVM readline
-			printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 >/dev/null
-			eend $? "Failed to setup the LVM"
-		fi
-	fi
-}
-
-start_post()
-{
-	# Save if we needed lvmetad
-	if _need_lvmetad; then
-		service_set_value need lvmetad
-	fi
-}
-
-stop() {
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	if [ ! -x "$lvm_path" ]; then
-		eerror "Cannot find lvm binary in /sbin or /bin!"
-		return 1
-	fi
-
-	# Stop LVM2
-	if [ -x /sbin/vgs ] && \
-		[ -x /sbin/vgchange ] && \
-		[ -x /sbin/lvchange ] && \
-		[ -f /etc/lvmtab -o -d /etc/lvm ] && \
-		[ -d /proc/lvm  -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
-	then
-		einfo "Shutting down the Logical Volume Manager"
-
-		VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
-
-		if [ "$VGS" ]
-		then
-			local _ending="eend"
-			[ "$RC_RUNLEVEL" = shutdown ] && _ending="ewend"
-			ebegin "  Shutting Down LVs & VGs"
-				#still echo stderr for debugging
-				lvm_commands="#!${lvm_path}\n"
-				# Extra PV find pass because some devices might not have been available until very recently
-				lvm_commands="${lvm_commands}lvchange --config '${config}' --sysinit -a ln ${VGS}\n"
-				# Now make the nodes
-				lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ln ${VGS}\n"
-				# Order of this is important, have to work around dash and LVM readline
-				printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
-			${_ending} $? "Failed (possibly some LVs still needed for /usr or root)"
-		fi
-
-		einfo "Finished shutting down the Logical Volume Manager"
-		return 0
-	fi
-}
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.183 b/sys-fs/lvm2/files/lvm.rc-2.02.183
deleted file mode 100644
index ce499a6dd21b..000000000000
--- a/sys-fs/lvm2/files/lvm.rc-2.02.183
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-_get_lvm_path() {
-	local lvm_path=
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	echo "${lvm_path}"
-}
-
-_need_lvmetad()
-{
-	local lvm_path="$(_get_lvm_path)"
-	[ ! -x "${lvm_path}" ] && return 1
-	${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmetad=1'
-}
-
-_need_lvmlockd()
-{
-	local lvm_path="$(_get_lvm_path)"
-	[ ! -x "${lvm_path}" ] && return 1
-	${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmlockd=1'
-}
-
-depend() {
-	before checkfs fsck
-	after modules device-mapper
-	# We may use lvmetad based on the configuration. If we added lvmetad
-	# support while lvm2 is running then we aren't dependent on it. For the
-	# more common case, if its disabled in the config we aren't dependent
-	# on it.
-	config /etc/lvm/lvm.conf
-	local _need=
-	if service_started; then
-		_need=$(service_get_value need)
-	else
-		if _need_lvmetad; then
-			_need="${_need} lvmetad"
-		fi
-		if _need_lvmlockd; then
-			_need="${_need} lvmlockd"
-		fi
-	fi
-	need sysfs udev ${_need}
-}
-
-config='global { locking_dir = "/run/lock/lvm" }'
-
-dm_in_proc() {
-	local retval=0
-	for x in devices misc ; do
-		grep -qs 'device-mapper' /proc/${x}
-		retval=$((${retval} + $?))
-	done
-	return ${retval}
-}
-
-start() {
-	# LVM support for /usr, /home, /opt ....
-	# This should be done *before* checking local
-	# volumes, or they never get checked.
-
-	# NOTE: Add needed modules for LVM or RAID, etc
-	#       to /etc/modules.autoload if needed
-	lvm_path="$(_get_lvm_path)"
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	if [ ! -x "$lvm_path" ]; then
-		eerror "Cannot find lvm binary in /sbin or /bin!"
-		return 1
-	fi
-	if [ -z "${CDBOOT}" ] ; then
-		if [ -e /proc/modules ] && ! dm_in_proc ; then
-			modprobe dm-mod 2>/dev/null
-		fi
-		if [ -d /proc/lvm ] || dm_in_proc ; then
-			ebegin "Setting up the Logical Volume Manager"
-			#still echo stderr for debugging
-			lvm_commands="#!${lvm_path}\n"
-			# Extra PV find pass because some devices might not have been available until very recently
-			lvm_commands="${lvm_commands}pvscan --config '${config}'\n"
-			# Now make the nodes
-			lvm_commands="${lvm_commands}vgscan --config '${config}' --mknodes\n"
-			# And turn them on!
-			lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ly\n"
-			if _need_lvmlockd; then
-				# Start lockd VGs as required
-				lvm_commands="${lvm_commands}vgchange --config '${config}' --lock-start --lock-opt auto\n"
-			fi
-			# Order of this is important, have to work around dash and LVM readline
-			printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 >/dev/null
-			eend $? "Failed to setup the LVM"
-		fi
-	fi
-}
-
-start_post()
-{
-	# Save if we needed lvmetad
-	if _need_lvmetad; then
-		service_set_value need lvmetad
-	fi
-}
-
-stop() {
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	if [ ! -x "$lvm_path" ]; then
-		eerror "Cannot find lvm binary in /sbin or /bin!"
-		return 1
-	fi
-
-	# Stop LVM2
-	if [ -x /sbin/vgs ] && \
-		[ -x /sbin/vgchange ] && \
-		[ -x /sbin/lvchange ] && \
-		[ -f /etc/lvmtab -o -d /etc/lvm ] && \
-		[ -d /proc/lvm  -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
-	then
-		einfo "Shutting down the Logical Volume Manager"
-
-		VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
-
-		if [ "$VGS" ]
-		then
-			local _ending="eend"
-			[ "$RC_RUNLEVEL" = shutdown ] && _ending="ewend"
-			ebegin "  Shutting Down LVs & VGs"
-				#still echo stderr for debugging
-				lvm_commands="#!${lvm_path}\n"
-				# Extra PV find pass because some devices might not have been available until very recently
-				lvm_commands="${lvm_commands}lvchange --config '${config}' --sysinit -a ln ${VGS}\n"
-				# Now make the nodes
-				lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ln ${VGS}\n"
-				# Order of this is important, have to work around dash and LVM readline
-				printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
-			rc=$?
-			msg="Failed (possibly some LVs still needed for /usr or root)"
-			[ "$RC_RUNLEVEL" = shutdown ] && msg="${msg} [rc=$rc]" && rc=0
-			${_ending} $rc "${msg}"
-		fi
-
-		einfo "Finished shutting down the Logical Volume Manager"
-		return 0
-	fi
-}
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm2-2.02.186-udev_remove_unsupported_option.patch b/sys-fs/lvm2/files/lvm2-2.02.186-udev_remove_unsupported_option.patch
new file mode 100644
index 000000000000..f895e1921e09
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.186-udev_remove_unsupported_option.patch
@@ -0,0 +1,34 @@
+From f98f79a047dd1c4980008e0ed6c9ad4e18596cdc Mon Sep 17 00:00:00 2001
+From: Peter Rajnoha <prajnoha@redhat.com>
+Date: Tue, 13 Aug 2019 15:18:30 +0200
+Subject: [PATCH] udev: remove unsupported OPTIONS+="event_timeout" rule
+
+The OPTIONS+="event_timeout" is Unsupported since systemd/udev version 216,
+that is ~5 years ago.
+
+Since systemd/udev version 243, there's a new message printed if unsupported
+OPTIONS value is used:
+
+  Invalid value for OPTIONS key, ignoring: 'event_timeout=180'
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1740666
+---
+ udev/11-dm-lvm.rules.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/udev/11-dm-lvm.rules.in b/udev/11-dm-lvm.rules.in
+index 91cb991df9..7c589943b7 100644
+--- a/udev/11-dm-lvm.rules.in
++++ b/udev/11-dm-lvm.rules.in
+@@ -37,8 +37,6 @@ ENV{DM_SUBSYSTEM_UDEV_FLAG0}!="1", ENV{DM_NOSCAN}=="1", ENV{DM_UDEV_DISABLE_OTHE
+ 
+ ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end"
+ 
+-OPTIONS+="event_timeout=180"
+-
+ # Do not create symlinks for inappropriate subdevices.
+ ENV{DM_LV_NAME}=="pvmove?*|?*_vorigin", GOTO="lvm_disable"
+ ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable"
+-- 
+2.24.0
+
diff --git a/sys-fs/lvm2/lvm2-2.02.183.ebuild b/sys-fs/lvm2/lvm2-2.02.183.ebuild
deleted file mode 100644
index 24737eaf33f0..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.183.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="https://sourceware.org/lvm2/"
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
-	ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
-	systemd? ( udev )"
-
-DEPEND_COMMON="
-	dev-libs/libaio[static-libs?]
-	static? ( dev-libs/libaio[static-libs] )
-	!static? ( dev-libs/libaio[static-libs?] )
-	readline? ( sys-libs/readline:0= )
-	sanlock? ( sys-cluster/sanlock )
-	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:=[static-libs(-)?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	!<sys-apps/openrc-0.11
-	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/lvm-user
-	>=sys-apps/util-linux-2.16
-	lvm2create_initrd? ( sys-apps/makedev )
-	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-# USE 'static' currently only works with eudev, bug 520450
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig
-	>=sys-devel/binutils-2.20.1-r1
-	sys-devel/autoconf-archive
-	static? (
-		selinux? ( sys-libs/libselinux[static-libs] )
-		udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
-		>=sys-apps/util-linux-2.16[static-libs]
-	)"
-
-S=${WORKDIR}/${PN/lvm/LVM}.${PV}
-
-PATCHES=(
-	# Gentoo specific modification(s):
-	"${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch
-
-	# For upstream -- review and forward:
-	"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	"${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
-	"${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905
-	"${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	"${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450
-	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
-	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
-	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "1iAR = $(tc-getAR)" \
-		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
-		make.tmpl.in || die #444082
-
-	sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212
-
-	if use udev && ! use device-mapper-only; then
-		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
-		elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
-		elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
-		elog "if it was previously disabled."
-	fi
-
-	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
-
-	# Without thin-privision-tools, there is nothing to install for target install_man7:
-	if ! use thin ; then
-		sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -flto
-	local myeconfargs=()
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	myeconfargs+=(
-		$(use_enable !device-mapper-only dmeventd)
-		$(use_enable !device-mapper-only cmdlib)
-		$(use_enable !device-mapper-only applib)
-		$(use_enable !device-mapper-only fsadm)
-		$(use_enable !device-mapper-only lvmetad)
-		$(usex device-mapper-only --disable-udev-systemd-background-jobs '')
-
-		# This only causes the .static versions to become available
-		$(usex static --enable-static_link '')
-
-		# dmeventd requires mirrors to be internal, and snapshot available
-		# so we cannot disable them
-		--with-mirrors="$(usex device-mapper-only none internal)"
-		--with-snapshots="$(usex device-mapper-only none internal)"
-
-		# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-		$(usex hppa --disable-o_direct '')
-	)
-
-	if use thin; then
-		myeconfargs+=( --with-thin=internal --with-cache=internal )
-		local texec
-		for texec in check dump repair restore; do
-			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
-			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
-		done
-	else
-		myeconfargs+=( --with-thin=none --with-cache=none )
-	fi
-
-	myeconfargs+=( --with-clvmd=none --with-cluster=none )
-
-	myeconfargs+=(
-		$(use_enable readline)
-		$(use_enable selinux)
-		--enable-pkgconfig
-		--with-confdir="${EPREFIX}"/etc
-		--exec-prefix="${EPREFIX}"
-		--sbindir="${EPREFIX}/sbin"
-		--with-staticdir="${EPREFIX}"/sbin
-		--libdir="${EPREFIX}/$(get_libdir)"
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
-		--with-default-dm-run-dir=/run
-		--with-default-run-dir=/run/lvm
-		--with-default-locking-dir=/run/lock/lvm
-		--with-default-pid-dir=/run
-		$(use_enable udev udev_rules)
-		$(use_enable udev udev_sync)
-		$(use_with udev udevdir "$(get_udevdir)"/rules.d)
-		$(use_enable sanlock lvmlockd-sanlock)
-		$(use_enable systemd udev-systemd-background-jobs)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		CLDFLAGS="${LDFLAGS}"
-	)
-	# Hard-wire this to bash as some shells (dash) don't know
-	# "-o pipefail" #682404
-	CONFIG_SHELL="/bin/bash" \
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	pushd include >/dev/null
-	emake
-	popd >/dev/null
-
-	if use device-mapper-only ; then
-		emake device-mapper
-	else
-		emake
-		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
-	fi
-}
-
-src_install() {
-	local inst INSTALL_TARGETS
-	INSTALL_TARGETS=( install install_tmpfiles_configuration )
-	# install systemd related files only when requested, bug #522430
-	use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators )
-	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
-	for inst in ${INSTALL_TARGETS[@]}; do
-		emake DESTDIR="${D}" ${inst}
-	done
-
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
-	if use !device-mapper-only ; then
-		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
-		newinitd "${FILESDIR}"/lvm.rc-2.02.172 lvm
-		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
-
-		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
-		newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
-	fi
-
-	if use sanlock; then
-		newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		dolib.a libdaemon/client/libdaemonclient.a #462908
-		dolib.a daemons/dmeventd/libdevmapper-event.a
-	else
-		rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
-	fi
-
-	if use lvm2create_initrd; then
-		dosbin scripts/lvm2create_initrd/lvm2create_initrd
-		doman scripts/lvm2create_initrd/lvm2create_initrd.8
-		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
-	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-	ewarn "# rc-update add lvm boot"
-	ewarn
-	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
-	ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.186-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.186-r1.ebuild
deleted file mode 100644
index ec678f7044b5..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.186-r1.ebuild
+++ /dev/null
@@ -1,278 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="https://sourceware.org/lvm2/"
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
-	ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
-	systemd? ( udev )"
-
-DEPEND_COMMON="
-	dev-libs/libaio[static-libs?]
-	static? ( dev-libs/libaio[static-libs] )
-	!static? ( dev-libs/libaio[static-libs?] )
-	readline? ( sys-libs/readline:0= )
-	sanlock? ( sys-cluster/sanlock )
-	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:=[static-libs(-)?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	!<sys-apps/openrc-0.11
-	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/lvm-user
-	>=sys-apps/util-linux-2.16
-	lvm2create_initrd? ( sys-apps/makedev )
-	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-# USE 'static' currently only works with eudev, bug 520450
-DEPEND="${DEPEND_COMMON}
-	>=sys-devel/binutils-2.20.1-r1
-	static? (
-		selinux? ( sys-libs/libselinux[static-libs] )
-		udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
-		>=sys-apps/util-linux-2.16[static-libs]
-	)"
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-PATCHES=(
-	# Gentoo specific modification(s):
-	"${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch
-
-	# For upstream -- review and forward:
-	"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	"${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
-	"${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905
-	"${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	"${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450
-	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
-	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
-	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
-	"${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch
-	#"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 # merged upstream
-	"${FILESDIR}"/${PN}-2.02.184-mksh_build.patch #686652
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "1iAR = $(tc-getAR)" \
-		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
-		make.tmpl.in || die #444082
-
-	sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212
-
-	if use udev && ! use device-mapper-only; then
-		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
-		elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
-		elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
-		elog "if it was previously disabled."
-	fi
-
-	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
-
-	# Don't install thin man page when not requested
-	if ! use thin ; then
-		sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -flto
-	local myeconfargs=()
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	myeconfargs+=(
-		$(use_enable !device-mapper-only dmfilemapd)
-		$(use_enable !device-mapper-only dmeventd)
-		$(use_enable !device-mapper-only cmdlib)
-		$(use_enable !device-mapper-only applib)
-		$(use_enable !device-mapper-only fsadm)
-		$(use_enable !device-mapper-only lvmetad)
-		$(use_enable !device-mapper-only lvmpolld)
-		$(usex device-mapper-only --disable-udev-systemd-background-jobs '')
-
-		# This only causes the .static versions to become available
-		$(usex static --enable-static_link '')
-
-		# dmeventd requires mirrors to be internal, and snapshot available
-		# so we cannot disable them
-		--with-mirrors="$(usex device-mapper-only none internal)"
-		--with-snapshots="$(usex device-mapper-only none internal)"
-
-		# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-		$(usex hppa --disable-o_direct '')
-	)
-
-	if use thin; then
-		myeconfargs+=( --with-thin=internal --with-cache=internal )
-		local texec
-		for texec in check dump repair restore; do
-			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
-			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
-		done
-	else
-		myeconfargs+=( --with-thin=none --with-cache=none )
-	fi
-
-	myeconfargs+=( --with-clvmd=none --with-cluster=none )
-
-	myeconfargs+=(
-		$(use_enable readline)
-		$(use_enable selinux)
-		--enable-pkgconfig
-		--with-confdir="${EPREFIX}"/etc
-		--exec-prefix="${EPREFIX}"
-		--sbindir="${EPREFIX}/sbin"
-		--with-staticdir="${EPREFIX}"/sbin
-		--libdir="${EPREFIX}/$(get_libdir)"
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
-		--with-default-dm-run-dir=/run
-		--with-default-run-dir=/run/lvm
-		--with-default-locking-dir=/run/lock/lvm
-		--with-default-pid-dir=/run
-		$(use_enable udev udev_rules)
-		$(use_enable udev udev_sync)
-		$(use_with udev udevdir "$(get_udevdir)"/rules.d)
-		$(use_enable sanlock lvmlockd-sanlock)
-		$(use_enable systemd udev-systemd-background-jobs)
-		$(use_enable systemd notify-dbus)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		CLDFLAGS="${LDFLAGS}"
-	)
-	# Hard-wire this to bash as some shells (dash) don't know
-	# "-o pipefail" #682404
-	CONFIG_SHELL="/bin/bash" \
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	pushd include >/dev/null
-	emake V=1
-	popd >/dev/null
-
-	if use device-mapper-only ; then
-		emake V=1 device-mapper
-	else
-		emake V=1
-		emake V=1 CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
-	fi
-}
-
-src_install() {
-	local inst INSTALL_TARGETS
-	INSTALL_TARGETS=( install install_tmpfiles_configuration )
-	# install systemd related files only when requested, bug #522430
-	use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators )
-	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
-	for inst in ${INSTALL_TARGETS[@]}; do
-		emake V=1 DESTDIR="${D}" ${inst}
-	done
-
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
-	if use !device-mapper-only ; then
-		newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
-		newinitd "${FILESDIR}"/lvm.rc-2.02.184-r3 lvm
-		newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
-		if ! use udev ; then
-			# We keep the variable but remove udev from it.
-			sed -r -i \
-				-e '/^rc_need=/s/\<udev\>//g' \
-				"${ED}/etc/conf.d/lvm" || die "Could not drop udev from rc_need"
-		fi
-
-		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
-		newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
-		newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
-	fi
-
-	if use sanlock; then
-		newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		if use !device-mapper-only; then
-			# depends on lvmetad
-			dolib.a libdaemon/client/libdaemonclient.a #462908
-			# depends on dmeventd
-			dolib.a daemons/dmeventd/libdevmapper-event.a
-		fi
-	else
-		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
-	fi
-
-	if use lvm2create_initrd; then
-		dosbin scripts/lvm2create_initrd/lvm2create_initrd
-		doman scripts/lvm2create_initrd/lvm2create_initrd.8
-		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
-	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-	ewarn "# rc-update add lvm boot"
-	ewarn
-	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
-	ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.185-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.186-r2.ebuild
index ec678f7044b5..759415d9d98b 100644
--- a/sys-fs/lvm2/lvm2-2.02.185-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.186-r2.ebuild
@@ -70,6 +70,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch
 	#"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 # merged upstream
 	"${FILESDIR}"/${PN}-2.02.184-mksh_build.patch #686652
+	"${FILESDIR}"/${PN}-2.02.186-udev_remove_unsupported_option.patch #700160
 )
 
 pkg_setup() {
diff --git a/sys-fs/lvm2/lvm2-2.03.06.ebuild b/sys-fs/lvm2/lvm2-2.03.07.ebuild
index 415ac2bd5a37..415ac2bd5a37 100644
--- a/sys-fs/lvm2/lvm2-2.03.06.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.07.ebuild
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml
index 40ead9259ea7..019c533da756 100644
--- a/sys-fs/lvm2/metadata.xml
+++ b/sys-fs/lvm2/metadata.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+		<description>Please assign bugs to this mail alias.</description>
+	</maintainer>
 	<maintainer type="person">
 		<email>robbat2@gentoo.org</email>
 		<name>Robin H. Johnson</name>
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 83af6a02b76c..9bdb3cab4c11 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -6,6 +6,6 @@ AUX mdadm.weekly 187 BLAKE2B 50048d84cd57b384b98fcdb6b2a4a18380aab6e76877ee9edd4
 AUX mdraid.confd 383 BLAKE2B c61fd2c072a0d12ca21ad4f8a60a55101b4e452f9acc8cdcdf9a6069060b11bf90387830f516b69d266fef061112ba41f903b9371fff91c94c9332b12e436145 SHA512 37fe70f5df0fb2b68be01ee774e3a943cfb280322f2db0c5d6892e701fb58be26a225b78448814294bf68f154cca697278fcf9572a47b6201920d95ad05189d6
 AUX mdraid.rc 759 BLAKE2B 41f1b4cb9dd29411d56bea656dddc2cb2fd3cc14b183d05c502fb5e29407d1d816de9595e13349ef7e03240308cf4395578be31149f59d1960d1feee0165506d SHA512 d76190646b393d1480607b0d89d08ce4196738295fbb7790fa1035c53a041b5cb88fe857bb2070920a9c3ae21b9fb8f7838dde240fa0e275e5915add9c113021
 DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433
-DIST mdadm_4.1~rc1-4.debian.tar.xz 104716 BLAKE2B d3f5def44de4e83ba302c25438b0f4b2cba0ea1d65964482d6ad1fe1c9e7847e04ef5068859fbefba7125b0931a6473746eef18f1152d02ca604a6fe01e39c99 SHA512 25f60d6bb789ecc8db64dd1fdc750f0cf875f52e28fe82b10bf870e39f751b7e819d45e85c13252ce1b4b728e957216fb28ccd41d04dc8d7386cbd8cdd113fac
-EBUILD mdadm-4.1.ebuild 2300 BLAKE2B e878ca47bbc85fbfe2d390cc1b6653166317c92a405cf18bcd38a106bc54479ca48d3a679c82df49074092702afb1f703b3274b08b59f783d5dc84b73f269124 SHA512 0c99f80bac276cabb9164001eac02522edbcf1b3990f6b0966fe9e9afc7384551c302a265483c2499bceceb96f7f82eeedeeead63936bdbd18c943a1b5e36fab
+DIST mdadm_4.1-3.debian.tar.xz 89640 BLAKE2B 3cb5e42dcbd218a71e55127cecda6f2594a1b1691e17c05f52a8cd0ba05b556d2812772e53d78de025738d7c2de059df3f878b8290ba3906b3d75ef435bfb698 SHA512 e9b04abf195d7bda9fb0197eb926c01a69b879ef82c72af6497116cea9be8f0823408dddbe5c6c033f5fae554a8fec17299e361fa48045e033c87dcee1a0bb63
+EBUILD mdadm-4.1.ebuild 2296 BLAKE2B 9bd80dd53eb8fa830ee80a03c0f19c142f1d6caee7be799ae70304be7c385dcb065b98e6dac72322cd84f273be7ab4497e53cc5f10969c8b97b2c84095a863a5 SHA512 a91882c41ea2f0b586acfe4870da347f9de52b66bfd4b4d92ed826ee7a2b7d60da95db7e4b1f2a7ec14f7ef41c411419f5ecf688622d58e0ef4fd7eb750325a1
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/mdadm/mdadm-4.1.ebuild b/sys-fs/mdadm/mdadm-4.1.ebuild
index 1619b6db1cd1..bb9d930ae341 100644
--- a/sys-fs/mdadm/mdadm-4.1.ebuild
+++ b/sys-fs/mdadm/mdadm-4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ inherit flag-o-matic multilib systemd toolchain-funcs udev
 
 DESCRIPTION="Tool for running RAID systems - replacement for the raidtools"
 HOMEPAGE="https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/"
-DEB_PF="4.1~rc1-4"
+DEB_PF="4.1-3"
 SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
 		mirror://debian/pool/main/m/mdadm/${PN}_${DEB_PF}.debian.tar.xz"
 
diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
new file mode 100644
index 000000000000..a96fc0f20ff0
--- /dev/null
+++ b/sys-fs/mergerfs/Manifest
@@ -0,0 +1,3 @@
+DIST mergerfs-2.28.3.tar.gz 294065 BLAKE2B 2e59e00726aec53438d5a5df143ca204069794d68c663a130139102a19e118a54fede1c8eca99199a3e634ffa92cb21c25c30718ea0842826de8a64e876b2819 SHA512 5469b3515464680aa72fc393c218fb038bed31194a933e6736eec478d87a110979323308b642d7f100a5c506534ca75badf4a87a050007cdc77cd2a641217929
+EBUILD mergerfs-2.28.3-r1.ebuild 1052 BLAKE2B e465ed82a76b54500683b111e57e2d4072541e12e7a4e2ccfcaea8d816f93cf5a3f0abb7db5b44ad74e5834c96ea58cd65daab22ac8c96ec3ab418fb0df1ea26 SHA512 fbdeb503a490665295a0b5202a5caaf1e802abb3139eec4ed925432161ed69ca973a38e47a970e13bea751bc88ba947e4b610b9c07a1cc7fc5a338e752931a14
+MISC metadata.xml 334 BLAKE2B e0f154866ccf08a8534567e5848aa41a0413a31cbd0fc92af2b873e77da2b007c222ab7431a81513e12f3cacd5e8bf8deb8a426e4cee2a64c8d02d0d9b56e4c2 SHA512 8b30ddda63065e140e02f4d3e79d933f46fd9460d2acc5b70e453f82eb6b5c204c810aa0019d183b256fcbde18239efbf01fccc40c5a1ddb632183418a596496
diff --git a/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild b/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
new file mode 100644
index 000000000000..00bac72e756f
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.28.3-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=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"
+
+# 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
+
+	# drop -O2 from those handmade Makefiles.
+	sed -r '/^OPTS[ \t]*=/d' -i Makefile || die
+
+	# 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_install() {
+	dobin build/mergerfs
+	dosym mergerfs /usr/bin/mount.mergerfs
+	dodoc README.md
+	doman man/mergerfs.1
+}
diff --git a/sys-fs/mergerfs/metadata.xml b/sys-fs/mergerfs/metadata.xml
new file mode 100644
index 000000000000..964e6eaa3390
--- /dev/null
+++ b/sys-fs/mergerfs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>slashbeast@gentoo.org</email>
+		<name>Piotr Karbowski</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">trapexit/mergerfs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 8f7852956a6a..f5b66d3676c5 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -3,6 +3,7 @@ AUX multipath-tools-0.6.4-sysmacros.patch 1554 BLAKE2B d293a6a72fbf0480c711af66b
 AUX multipath-tools-0.7.5-respect-flags.patch 660 BLAKE2B 1efc793d9741b1a732895cbd7cfb4fbf04026db24f834a5bec25c33413132b39e0afe46f8851a6dfd6bd05fe88bfc15fd8cc24f03df435f75c209c401bd68b6a SHA512 58a44988a5c9a82affa3fdc969eaac87b5672a743434f2c8cab269b0b526f1c150bc10655bccccc1e8a26e3237350d4824b0497bb29c925cd42a084f84268fcf
 AUX multipath-tools-0.8.3-no-gziped-docs.patch 6302 BLAKE2B 4d571d856d47cbb7cf6cf421a142fdb5d93fb891ae3c0c15abe8d74e6aeb35b02cbb70a80cede18f1dbd615581744f4144c0b03791aa6268c10e8bc08922bbeb SHA512 126245660ba589635437be32c7a7e72636e0bdcd72c177a6252b8e0c71e90426d12e78c10314d878d2e5a5b37b51db488c5fab8c1aae4f655650539ef1d1cd83
 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
+AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e
 AUX rc-multipathd 402 BLAKE2B c44befc14ff361d27278bd7850aada4fb8e309c0459d9d1bdb3ca1a670929b2d8b40275c73cd937ab3245b95460b3e9e12ecf199532ec916e1cf5f3e634d3bbb SHA512 466296ff69c0f56c312a8b88445ca0719c8c6b794511f7e228812d63b859bd120b965301c8923e3411a3e1b196e7fb9c48dd7dbe004efe4c65ee7f9798cc3e11
 DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea
 DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379 SHA512 6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
@@ -13,5 +14,6 @@ EBUILD multipath-tools-0.6.4-r1.ebuild 2545 BLAKE2B f22afaabe21080d64175063c82e5
 EBUILD multipath-tools-0.7.9.ebuild 2068 BLAKE2B ec54d156a55c25a9c7cc9c6c3854a48c8bb1d404119398bfdb9defcb5c011e1824ce82f53cd5cc4d8e81a63bb412d11cb79ac276406e140f2808b911f7912947 SHA512 8e1fff8d8c71b2cac948e5501edef63acb7e0ba760e7b56a22644e0e08ce3cb9b70c29e69550f6a356113154f740a4e95199ac14e44b3d2db338605954d19be4
 EBUILD multipath-tools-0.8.1.ebuild 2068 BLAKE2B 5c9ca01560d80aeb6a2bb008f029f3782e539f41b5705c2cfacc428203572d5f343555b41107964c5082c476230f4b270293c49d2553ffb8f1e972ee1b54dcb7 SHA512 e23cdd535e66844c1ec622b896449184f950112a28e603361c76ad44b6e35591b0c8d0600758611be157ce49f919167b893d5b7346756902925bc3c39d8e578f
 EBUILD multipath-tools-0.8.2.ebuild 2077 BLAKE2B f6ec67513e237d0c85116baf9fc020bc32354682ca1cfb2bef0bd14df783d2b3ad2a832ef7cada9e47dfa23111f6eee53acc8cf82c928b1b5fff3278e640903c SHA512 44bb10811f8f7595ab32e6770b12cfe4d666cdea0c480453c5a9d7ce3af0fddc34974433d43000714b34baa7f428c1f8d2dcf8dc9325b6537732cc0b3c74baee
+EBUILD multipath-tools-0.8.3-r1.ebuild 2116 BLAKE2B aa717fcf5827ba3b15129c38cde240737647817c709ec2f670512a26150436f99ae2823887358bdf5e9e54f2f3297bcb2619a19d88cb84a81c43af9a5ecec38a SHA512 2094b50a0d0aabb690f92528f9709c3e10924e2f46001668bb11666661f0b945e178d1ba5b8581ada3472386d180a90471b8d150f4ff71c4e350958a91f8e41a
 EBUILD multipath-tools-0.8.3.ebuild 2046 BLAKE2B 3e791221e228741e0bb937c3bd14d9d2a688e8d8eae244ef92e980fbc5e35a784fe435e03c0a34b3802eb6869e711bfd9fcdc3876430cc6b535a6a4477c67ea9 SHA512 72662ebf3c684dbe19ef4b64b204f985f1c918b2d1c9ad162fbf964b5f2ecce64c121961fb6d02f1ad74324869a1319c984f4fa63b75176b53b9282fe70dd83b
 MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134
diff --git a/sys-fs/multipath-tools/files/multipathd-r1.rc b/sys-fs/multipath-tools/files/multipathd-r1.rc
new file mode 100644
index 000000000000..59de1e6f71ac
--- /dev/null
+++ b/sys-fs/multipath-tools/files/multipathd-r1.rc
@@ -0,0 +1,12 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="/sbin/multipathd"
+pidfile="/run/multipathd.pid"
+start_stop_daemon_args="--wait 1000"
+
+depend() {
+	need localmount
+	after modules
+}
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.3-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..ac5a16737ab5
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.3-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 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.7.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{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/ncdu/Manifest b/sys-fs/ncdu/Manifest
index f3831f732643..6fb9297542b6 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -2,6 +2,6 @@ DIST ncdu-1.13.tar.gz 143819 BLAKE2B 8ba489dab1cbafec5b1d9b437b44aa7aa5d79ed7b69
 DIST ncdu-1.14.1.tar.gz 146346 BLAKE2B 50152647389cb08c236a47c8f85b93c7a42ba9a94b84dee313b7887614e5612ad9c0158a878872e08ffc3e85f4a7b91d292dfa0ae0471e194e6cec2b25a9355e SHA512 7db9115f7ba20d43c47bc7187347658d7a4dc36da6ffdc54308d3966a431c24b87c3266854d69685c3ea5e29805b5a631805a783d6431e30bd83c411b398515d
 DIST ncdu-1.14.tar.gz 145911 BLAKE2B 27b9350d5f12bb0c3a972b81e325e305fce2ffb73194e26a70a4fcac79805e5addfe18483e56dcfcb1e24bad4c3ef418ffba5a0c15d49199996db5aa0961aec6 SHA512 9583d86f66ae9ab19e5d373d90e0d85504807f726fe6656e593ab09f83ba4ff22c0bec6fcfec216c4d9ac0b3725899ff1d9fe6cca1e3d5fd1c76cd4636b65c1f
 EBUILD ncdu-1.13.ebuild 429 BLAKE2B b437604c81314a3aba39cc8e502e4c680aa09b153a8ad52006a0bec74deb03fbe73aaaa9efe2cdd4b2a84eb73e3b47dd8b851dc56483f36ace9290328d8023e3 SHA512 5e0208e5c53aa232f2a611e7784a6b18165156c71a7e2011186b4fa4f7d40a3b127452d531be8412ac8b193b464c8bd0adade8ca1f8bcd066417257e21ac5a38
-EBUILD ncdu-1.14.1.ebuild 438 BLAKE2B 96c9ddbecc06a9bb7b3692b6bfe2f1a6f145d8977f05daeb7f13bfdb83184ee568eb3feb7381654db5b98a11288946c3a27f450c430d68f5e81642cb4d644da7 SHA512 13c7b99e659c9ed88d996adf57c22f80d2d00f782a85e56599d4e41ab94ea78ba92c9b42ad630019d1cc1876c17269d444caced02731902d8881645916619f64
+EBUILD ncdu-1.14.1.ebuild 433 BLAKE2B 27b9ed7ec4894b03c11e8adca1cb280cb8ff1d171e003c5a4a6b0c4bb77a2373ecc8addc68279d07200f3e76e79921914df9cd7bedfc9924a5d25c82293708f8 SHA512 716f050cbbf479d23d065ccf04b7b1ac344d6b5ca478aa58996f1d0ca6c2c1b84ac79bd94995b91b7542c5db5b17c08ec5de7de269e58efd13d339a2e8e6591c
 EBUILD ncdu-1.14.ebuild 438 BLAKE2B 96c9ddbecc06a9bb7b3692b6bfe2f1a6f145d8977f05daeb7f13bfdb83184ee568eb3feb7381654db5b98a11288946c3a27f450c430d68f5e81642cb4d644da7 SHA512 13c7b99e659c9ed88d996adf57c22f80d2d00f782a85e56599d4e41ab94ea78ba92c9b42ad630019d1cc1876c17269d444caced02731902d8881645916619f64
 MISC metadata.xml 589 BLAKE2B 9915d839320066570a64eb949ce52f48af51689617cdb6cdbac0fb6094a3923900bb940ae84be99fcd52618db5ba8a2de698c5c0515f4e5f0a6a3dbf73a42165 SHA512 2c3cf9225fafe928e442ef61f3ec10b810051843c801f3901fe8cf97d0a22e6c2354c9b3517b0c9439fad6e5829fa223ec36c6c295f426aa8a8a89a06b637d21
diff --git a/sys-fs/ncdu/ncdu-1.14.1.ebuild b/sys-fs/ncdu/ncdu-1.14.1.ebuild
index 27a003fb9d22..7a56047b0345 100644
--- a/sys-fs/ncdu/ncdu-1.14.1.ebuild
+++ b/sys-fs/ncdu/ncdu-1.14.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]
diff --git a/sys-fs/safecopy/Manifest b/sys-fs/safecopy/Manifest
index 0817a883b36f..32f68270d29d 100644
--- a/sys-fs/safecopy/Manifest
+++ b/sys-fs/safecopy/Manifest
@@ -1,3 +1,3 @@
 DIST safecopy-1.7.tar.gz 398465 BLAKE2B f51a164e4213441e497fc7be3f39eacd1aa8ee8064a3ad777c835e9a605eb6d6f0076b655e7a0f699be2682af59d5f61c8c33dd4c166a795fdec4a654651b216 SHA512 ecba54ecc0e0dc13dd6339f8c8dc311fc3ad41ef23318c1aa2a7f6bb7f1529389bedf7b58ea72486c083d39032a6e4a775e5a555a1ff96c669fa7fbd6c1fb868
-EBUILD safecopy-1.7.ebuild 728 BLAKE2B ba6bf7ff578d64aee96dca85a33c6411c19c5088b17a4a4ba5d0286e8f54f1774012046cd3886373863269876f8e4682a4da11ea67ce588f116352a91bca5900 SHA512 cb2230c4414cf1bd9c6a3603b3864ea82335aee45045244baac6401ce632a965466902ef539e0f89ae460ec12b95188bb2b1c181962932bd97097366cafd3b5a
+EBUILD safecopy-1.7.ebuild 752 BLAKE2B bab1efb2e4c3b6447d897718a51a0ef3aa2052acefaa84df6dd6d4203fcbd4638096b615d61221552baf96efde3c70692008cb8bf94046fb7976f19fab1e8d73 SHA512 8ec30e0ba7c954e1f5dbe256f4978190a7bd964dc479126d3804816cf17bb6231edd8ea73cbfff2d405f04d66123a41fbf604aee5a1cf819c0c3cf1e8fcc3a22
 MISC metadata.xml 615 BLAKE2B 296bc37f029c836bf495b07a3cf4113d7aca9e9b4d90292c2efa1f9ef14d562dbf6a87261362de774418eb66afa86b5ac23d2c091ac7a62599caece5f152f0cb SHA512 19be4af38e35c1ddc44b6d4429011cf0888713bf6ee3a3cd05b52ae24578f9eb486fb176733b1916a39521e2055e5d6072288bdf3a417f5c4c4514675ecb6112
diff --git a/sys-fs/safecopy/safecopy-1.7.ebuild b/sys-fs/safecopy/safecopy-1.7.ebuild
index 6f164039b078..dbfe2a87a2aa 100644
--- a/sys-fs/safecopy/safecopy-1.7.ebuild
+++ b/sys-fs/safecopy/safecopy-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -13,6 +13,7 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 RDEPEND=""
 DEPEND=""
diff --git a/sys-fs/snapraid/Manifest b/sys-fs/snapraid/Manifest
index c1a6745360f0..92854808235f 100644
--- a/sys-fs/snapraid/Manifest
+++ b/sys-fs/snapraid/Manifest
@@ -7,12 +7,12 @@ DIST snapraid-6.3.tar.gz 615262 BLAKE2B 792dc96ec7937c66e84362d328ebef82cbd24d16
 DIST snapraid-7.0.tar.gz 633959 BLAKE2B 87e5e7ca1723dafc7bc1a62f9887342e6d4f4e810ab6d32c3482ab0408907c4bfbb0336a587875ced3efc363c38c4ba11aa98ca0ad4c7cbd0b081635c9cc755b SHA512 36acea57e277047f26380c3d97f6f2bb7907f046ff4001a59705c51c9e4184c4ea7d4f2d0c4eb767d9e395ab97453acbac73183ae6dd99e0ac0f12897cbad32c
 DIST snapraid-7.1.tar.gz 634036 BLAKE2B 424d633f69703c092fac64ced31233290533f26fd5d6c10fe9e274995b3b3caf3d94e5ebe109f3596f422898a969938266276c96edd7920f8779b793b464e401 SHA512 3f8f822c8937a66c17677a4d52c0b45ee73eeb032654b98c3012905ae436945276f127c43a48d07f5a4eb128d6bedbc3bdc4166e8a867ec12c7992726c6e6045
 DIST snapraid-8.1.tar.gz 669318 BLAKE2B b21a3eb68b4d432fc6bf4d172b3e09f515efa4a0223cbe824cfd1630e39574c10e792f1002913b9690030ce1ba76bfe4154bb00d5470ff6ad1313e177b40a279 SHA512 a505b85f80e2d06dbb0ad6f8680e1ce8178eafacc9be2fd232dbff853dcbd59389ae29e8a0144ba958d2180b4ddee5a50aa54d4ac5655f4fb2ed729a32bcae89
-EBUILD snapraid-10.0.ebuild 442 BLAKE2B 645114b4fcde0416134dba8651c485684b1ccd0bca46c4062d9f2d0e4876de789a4f3111f936dd105f616a7277a82a8fa39148f36948bd5fd8ef59abe56f957b SHA512 0544c6e592c814f8fe7d0765271b8244c34d5ddb4b0384b295403937ab8ad8278b76e60de169cbe91fdb85d65c9ac164658fbe4a740e0e50c7248e782078564a
-EBUILD snapraid-11.0-r1.ebuild 546 BLAKE2B 16eb0bee942cf8cc564c59e4a6c001cb67604b42e825992a038785a2a07c73b7222304dd6a42997be2e2b4969f2d342adc6290d4550d503f75298db20c2e736d SHA512 bcd768cd63c9763790ae464065b7a2826052708dc6bf40104d9f4b10d8e27357c4693fdcbb07b2c91ed83812046bf56b5c3439d793d967e5a877e5f27224c1f4
-EBUILD snapraid-11.2.ebuild 489 BLAKE2B 3e8785bcfa53c6eb4f43cd2eaeb1b6c69c984a582309b545eb1fd36bba23d1ef2813e2878aadfe82930aafa6a6f6556509c5c805ec6c4d2af4b866cad40df520 SHA512 8b6b3c894c28cbbc1f162ee63ffb7cb363b440570bf71129aa8ce6290e3ce6f24a499c3ef4026b0c4121934bae47277718e3c75cd8f0a947f313776e88ef71e3
-EBUILD snapraid-6.2.ebuild 465 BLAKE2B eebd4f26ce0c8e441ad816cd6f99690d8b17d9eb074d7cf2572f44e245134542625d8d760f0da7194716ceca377b282a05c71be6d85f4efd120ae07fc92b3707 SHA512 07616bf1f4cc2ab18d9853ff16a6db1e9dfbec3309daf329e559918297a1c64a5a22fbda269323cf867b4af7f4539ad27f455f173c2b7c953ad1435431c8ce6e
-EBUILD snapraid-6.3.ebuild 465 BLAKE2B eebd4f26ce0c8e441ad816cd6f99690d8b17d9eb074d7cf2572f44e245134542625d8d760f0da7194716ceca377b282a05c71be6d85f4efd120ae07fc92b3707 SHA512 07616bf1f4cc2ab18d9853ff16a6db1e9dfbec3309daf329e559918297a1c64a5a22fbda269323cf867b4af7f4539ad27f455f173c2b7c953ad1435431c8ce6e
-EBUILD snapraid-7.0.ebuild 494 BLAKE2B 9aa699766a077910edbf9ce87e9d93a99aab31bb485c09f0c6fd89d8a135434fc606a6a0dba2525e1a50f961d67db70bc3eefae8476330f1cd5a0f8df691c3bd SHA512 1fb3f3ecd7e895389516a05e703d4b4206313609b981188b24fcfaa4c1ca6b0cc6b8718ad6d4e4819a1b24ce6985fc608aaa9c741028063e5696accd4025c2f1
-EBUILD snapraid-7.1.ebuild 434 BLAKE2B 63608fa3ae779c9f626acd84c53d92ac25aca700fbf8f3cf71888f679ec814875c74552dc305f50cee0a565bd242b555cc806cde0155218a7b4e6b9ef1207ba0 SHA512 e6831cbc31e23b09b4ba589394c33d5f058db9b617ccad92561ba50b795ccd6b9b65650316840539ae9897e452acc9904994de2bc344d50555535cb592c3cc36
-EBUILD snapraid-8.1.ebuild 434 BLAKE2B 63608fa3ae779c9f626acd84c53d92ac25aca700fbf8f3cf71888f679ec814875c74552dc305f50cee0a565bd242b555cc806cde0155218a7b4e6b9ef1207ba0 SHA512 e6831cbc31e23b09b4ba589394c33d5f058db9b617ccad92561ba50b795ccd6b9b65650316840539ae9897e452acc9904994de2bc344d50555535cb592c3cc36
+EBUILD snapraid-10.0.ebuild 466 BLAKE2B 1cadaeda3f88fe78ed89772534e6522f7b80f6ad3e100cdf40b9d8c06d294592d98d3fdbe768c56faf5334500c09b20c4504f5dca1b5d4c76fb17b1dd9efdaed SHA512 2a9daa87e15ee31246383a6b58429d00a6af06db8f44d01b628230eb9fd8ff693d5f40c9003cf71bc31ddffd36a88d59b728fd1f6f3f39709891eb3effa7688c
+EBUILD snapraid-11.0-r1.ebuild 570 BLAKE2B 3b4187e35df16d54c62d0026f19e32cb091b56eb7860ac0277bce10fcf14605f46818f35e0def845d85af931a3f856921b226a81bdb7493bdb1eb44269929579 SHA512 5bff13bd534116b49804e8992164ed57e67e4e4b8b14fad5e14fb8e95151b7776984cb1378713965208c74a0e1bc6817ed5c4ce75a841f3e6534c7b507e2a121
+EBUILD snapraid-11.2.ebuild 513 BLAKE2B 35b85972d74b40296d65dad5f8bfbf862f4f33e821c13dc1f959ce507989a9bf1a1d556de634b4abb74f102bb522b059e73c4d8379b8a59ccee797a6a676dc38 SHA512 b189b49887f3d7bac7abeacc1e81ebcdb7079c81d73f5994790811a249803349909145f180bb257859329d3019229d80bd2c512ad0d513d01d112abd27b2b4a2
+EBUILD snapraid-6.2.ebuild 489 BLAKE2B 3869bf9e12c9e5d5d523251ed56c320b7ad237e7730eb3a8d0105bd6f2406bfe102e16bad26e49666a871b1a1990437c79b57d50f6df02bf30f444de12d5e56a SHA512 9bfdeb1161fd1bdd6fa31269454e306622eaf6077b85c86e3d412615ff928b7769f44c1f2fb688b72a94b95a31494a4e53031f2a9eab2d27a7477f324b33e055
+EBUILD snapraid-6.3.ebuild 489 BLAKE2B 3869bf9e12c9e5d5d523251ed56c320b7ad237e7730eb3a8d0105bd6f2406bfe102e16bad26e49666a871b1a1990437c79b57d50f6df02bf30f444de12d5e56a SHA512 9bfdeb1161fd1bdd6fa31269454e306622eaf6077b85c86e3d412615ff928b7769f44c1f2fb688b72a94b95a31494a4e53031f2a9eab2d27a7477f324b33e055
+EBUILD snapraid-7.0.ebuild 518 BLAKE2B f9f3876bb94ada4551c8764e7ee7c9d8bf7fdd80ef35ef2c0bbd9532ee6ca421ef32812aff140d1c398068e7842fab56d0a419b2b10b43c39fdfa66808a196a7 SHA512 b32167dc244e320f1afa5f13239c27cd6e880fc7ed30c5fb0a5407b0e6fa115a45ab8da65d745d72e992358d7d78b90a10936e65905f8d65a447682dc0477d5f
+EBUILD snapraid-7.1.ebuild 458 BLAKE2B 94dd348f6f113c53d823ef41b050a24cb8b41c3fe25120525301a9570e232fcc7afba53d2c209f3c9dfa9ebef842a4bace1a2edc920ee1e25cb12f306c6d8ea6 SHA512 3a63f09795a8a871c44febbe5b5535f30c6bd46a97f8e33eb6fa11512c5efe85146e94a285a96f627be12d0d844855bd78d092d0532e6f0758ac0cddb786bc61
+EBUILD snapraid-8.1.ebuild 458 BLAKE2B 94dd348f6f113c53d823ef41b050a24cb8b41c3fe25120525301a9570e232fcc7afba53d2c209f3c9dfa9ebef842a4bace1a2edc920ee1e25cb12f306c6d8ea6 SHA512 3a63f09795a8a871c44febbe5b5535f30c6bd46a97f8e33eb6fa11512c5efe85146e94a285a96f627be12d0d844855bd78d092d0532e6f0758ac0cddb786bc61
 MISC metadata.xml 389 BLAKE2B 41df9e24ef77da16ca5862651df220173b879fac61803d3ac52981403815c280c6db1a78726fa8ebc1044335f71116da7df08fce4a89f9ebb8b2cf4a828ee507 SHA512 896180bead566fa0ba5f107a0d2e55b0cbf437405cb4a2ac9119880011cc8befa0bc6a58c39ce09998e6288575e4d0e50476e14373d3cc39e534693a32e6d3fa
diff --git a/sys-fs/snapraid/snapraid-10.0.ebuild b/sys-fs/snapraid/snapraid-10.0.ebuild
index 365a2b3e3b77..98f521f8559d 100644
--- a/sys-fs/snapraid/snapraid-10.0.ebuild
+++ b/sys-fs/snapraid/snapraid-10.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,5 +11,6 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DOCS=( "AUTHORS" "HISTORY" "README" "TODO" "snapraid.conf.example" )
diff --git a/sys-fs/snapraid/snapraid-11.0-r1.ebuild b/sys-fs/snapraid/snapraid-11.0-r1.ebuild
index 616bd2007353..57a03c45a1a0 100644
--- a/sys-fs/snapraid/snapraid-11.0-r1.ebuild
+++ b/sys-fs/snapraid/snapraid-11.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DOCS=( "AUTHORS" "HISTORY" "README" "TODO" "snapraid.conf.example" )
 
diff --git a/sys-fs/snapraid/snapraid-11.2.ebuild b/sys-fs/snapraid/snapraid-11.2.ebuild
index 3784113b2d7a..35f69f087034 100644
--- a/sys-fs/snapraid/snapraid-11.2.ebuild
+++ b/sys-fs/snapraid/snapraid-11.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DOCS=( "AUTHORS" "HISTORY" "README" "TODO" "snapraid.conf.example" )
 
diff --git a/sys-fs/snapraid/snapraid-6.2.ebuild b/sys-fs/snapraid/snapraid-6.2.ebuild
index 7ebac664aa91..97ee8d31b0c1 100644
--- a/sys-fs/snapraid/snapraid-6.2.ebuild
+++ b/sys-fs/snapraid/snapraid-6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/sys-fs/snapraid/snapraid-6.3.ebuild b/sys-fs/snapraid/snapraid-6.3.ebuild
index 7ebac664aa91..97ee8d31b0c1 100644
--- a/sys-fs/snapraid/snapraid-6.3.ebuild
+++ b/sys-fs/snapraid/snapraid-6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/sys-fs/snapraid/snapraid-7.0.ebuild b/sys-fs/snapraid/snapraid-7.0.ebuild
index 4268c953a344..c8f3100ca6d2 100644
--- a/sys-fs/snapraid/snapraid-7.0.ebuild
+++ b/sys-fs/snapraid/snapraid-7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,6 +13,7 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DEPEND=""
 RDEPEND="${DEPEND}"
diff --git a/sys-fs/snapraid/snapraid-7.1.ebuild b/sys-fs/snapraid/snapraid-7.1.ebuild
index c4608373e996..e33402715818 100644
--- a/sys-fs/snapraid/snapraid-7.1.ebuild
+++ b/sys-fs/snapraid/snapraid-7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,5 +13,6 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DOCS=( "AUTHORS" "HISTORY" "README" "TODO" "snapraid.conf.example" )
diff --git a/sys-fs/snapraid/snapraid-8.1.ebuild b/sys-fs/snapraid/snapraid-8.1.ebuild
index c4608373e996..e33402715818 100644
--- a/sys-fs/snapraid/snapraid-8.1.ebuild
+++ b/sys-fs/snapraid/snapraid-8.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,5 +13,6 @@ LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
+RESTRICT="!test? ( test )"
 
 DOCS=( "AUTHORS" "HISTORY" "README" "TODO" "snapraid.conf.example" )
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 67a39b9bd11c..389350323e0f 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -14,6 +14,6 @@ DIST squashfs4.3.tar.gz 182550 BLAKE2B f56ff33a505f7d60cced11224526bfce003bc0618
 EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c528665123ab08b9d2fc212faea1f460d8be277ff26f7d9f58c4fd912d1b3a4d2a36d8a65028d922e9e50fbc2198859207ee44103 SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec
 EBUILD squashfs-tools-4.3_p12.ebuild 2176 BLAKE2B b55b7e215becdd233a43fbd2abfb4676b694270257b87f49b9a301c2271fb7de29f6a4e41ec1af4c89ed777e000d2bb27025c1314e74e4ea263d8928f6896f89 SHA512 13537ed71d3c8f4a599107eed5efb20f3a70633bb1e4cd193f98febfa89ddc4c38b2fd6eadfec2c0aca187044a40198d01c0d16b33685db85e7a9433e9b625b6
 EBUILD squashfs-tools-4.3_p7.ebuild 2081 BLAKE2B 4a8dd3b2d9aeab4dd62e837ccad73c3978a38cc6eab1bed7b325cae5df5b86eb07a72c7fb41d15c6f3c8d359e7f737e42378bf1f8cd27449fbdee0feabe3e757 SHA512 7502683661d1ce9dceae275695f727153fa3215735e8d65089f3953244ec9e4a37e0be4df02300001d8ea49e1819e4d9a14529b6a6f654ee6332b6bbc2ce63f8
-EBUILD squashfs-tools-4.4.ebuild 1662 BLAKE2B d4fc1fcbcfdb32722d5c5b6d9106f29c92d30f33073d4f4fc054a80cef6fb51c8a16f811e7ad46937aa9c91fc0b9851aadf5a1255a3fbc27bb53189505889b43 SHA512 29801eda9ea12f4fdba8d2ce967049af5cbcbfb3ed5d4ba1b47dab6a24386f37a9ae62b20af5567342e6353b39957aee93fcfaff9c0359f2f6c896463cdc0135
+EBUILD squashfs-tools-4.4.ebuild 1655 BLAKE2B c4bf73f98ee35f5b4477908824f3586f1171f68bf80c17c1595d20734d00248a72b5e03bad824df3b730daa0240a0de09e61039205bb955fc33f49fd559106a7 SHA512 016adb7773bf58153291369f1ff44efbd0b69f54bc26c6cda4de2ad717c7d7878e60651dccbb042f8f7b9e2d7c212ac0f99317db8015c5463112efa5cfc96b90
 EBUILD squashfs-tools-9999.ebuild 1598 BLAKE2B 99811ee72ca38123b68e575076e88abd43353143a399039347608d5c28ac32c0bc1b095811af3571ef63dd157a28ff7c330b851f6874f052ae79da524982bed7 SHA512 4c6339bcd651802945f61d20c881836936fb99e0eb3c4b21ca7766805db1c5bb031e221a171c2f02e2d761b6659669ca97d43e82b0c3c74e2cfc1beea6440858
 MISC metadata.xml 438 BLAKE2B 7bb1623378cbc91becb4e12f91bfdead33f1859c9a13e5dc53652a1202b0d5cdf4a7be46071e766fc932f15ab3223b889e6ff32063d67d50e8ef809e887221dc SHA512 985005bd45043f21efc64f544cc685e93a70dac00a869416aa93bbc91571461dae236d2b4bb3325c63c7c3515b88f32a84ab56d3405e84545053c86d164c7dc0
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
index fc9ce8107b27..3f7f548b7f0d 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="${HOMEPAGE}/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 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 IUSE="debug lz4 lzma lzo static xattr +xz zstd"
 
 LIB_DEPEND="
diff --git a/sys-fs/tmsu/Manifest b/sys-fs/tmsu/Manifest
index f5076c759fa1..788362c1e6df 100644
--- a/sys-fs/tmsu/Manifest
+++ b/sys-fs/tmsu/Manifest
@@ -1,5 +1,5 @@
 DIST tmsu-0.6.1.tar.gz 92874 BLAKE2B 492145376c1e96dfab5be2692ae98d5171e6a3797bd132151ecf34db27c223be429fb7ca675f6724f875884b30e2887e0c357f9ed0020de7a2fda6718280dd5d SHA512 53bc9d880f9138e9d88b25a151f72a5a3110418002c2a1a6101d2794c0b6fd854ebd52e589f3b1ffa18f1b5c2f2298550246fc6cb1bfebbfd0131692c2fa5512
 DIST tmsu-0.7.0.tar.gz 98108 BLAKE2B 560d7a241d6e6ca3a0e3cde4a446af458bebf83ae8449d043789756bca56c1cbe03453d23dbc397ae205df68c38e14e9ffff7ebfec107b45a7fc4671a527dbb5 SHA512 c3f719f4962291a9701d2438381aeb65ea470b896ab6acf5a0871b1984bbb2758380a73ddc94c2b37ea2a45477fb66eb1a2afcae3f1e7ca3e469913f7562bd66
-EBUILD tmsu-0.6.1.ebuild 802 BLAKE2B 2b61c94d2818e2bb3290549bb452c15f946d40d9e785971119a818f99d3bd7ed80cb814c576c1e9d93a847ab1a452cb8ffca07cfde46a4ef8e7d9c8ed361c1a5 SHA512 04ce11db2184fb4bba4f4e37358e77f5a352010bb05c81270edd22a6e880a5bbb8a022a28b8c167e846146f88706fdc98fca836c9c663ff5170bb0b5de748cd8
-EBUILD tmsu-0.7.0.ebuild 802 BLAKE2B 2b61c94d2818e2bb3290549bb452c15f946d40d9e785971119a818f99d3bd7ed80cb814c576c1e9d93a847ab1a452cb8ffca07cfde46a4ef8e7d9c8ed361c1a5 SHA512 04ce11db2184fb4bba4f4e37358e77f5a352010bb05c81270edd22a6e880a5bbb8a022a28b8c167e846146f88706fdc98fca836c9c663ff5170bb0b5de748cd8
+EBUILD tmsu-0.6.1.ebuild 828 BLAKE2B 544356fcf009e348278680947a1fa071e7afc74b2406021957353d51ff9bcde27025a97fe02a6c2d314498dd14224fdae0912632f47b1491fd72c6452e31406c SHA512 95b03475431a7d9c539e6bc3a5e49110515cdbb23fb91693ca7d92ae749419a3619f22497581fd0199d6105f2ac785a46798d7ace764026415b2d2216f35767f
+EBUILD tmsu-0.7.0.ebuild 828 BLAKE2B 544356fcf009e348278680947a1fa071e7afc74b2406021957353d51ff9bcde27025a97fe02a6c2d314498dd14224fdae0912632f47b1491fd72c6452e31406c SHA512 95b03475431a7d9c539e6bc3a5e49110515cdbb23fb91693ca7d92ae749419a3619f22497581fd0199d6105f2ac785a46798d7ace764026415b2d2216f35767f
 MISC metadata.xml 694 BLAKE2B 3004756ca4f4822d9a1e5bc854e92c8f7beb449150754990c4a54bb00a20e79e20801854d655a81ae246c995ccccbe48b3b63a5761548d44e5b5cfcaf7617c87 SHA512 78e596dce79201090c19568ea1a36badb92b26420114a319f062c02465f4410e26e8811203fb723bb740ad5c20e0563a83ec5b646c407b5201ca622902bcf856
diff --git a/sys-fs/tmsu/tmsu-0.6.1.ebuild b/sys-fs/tmsu/tmsu-0.6.1.ebuild
index d37b33711282..425fb4cc2359 100644
--- a/sys-fs/tmsu/tmsu-0.6.1.ebuild
+++ b/sys-fs/tmsu/tmsu-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test zsh-completion"
+RESTRICT+=" !test? ( test )"
 
 RDEPEND="
 	zsh-completion? ( app-shells/zsh )
diff --git a/sys-fs/tmsu/tmsu-0.7.0.ebuild b/sys-fs/tmsu/tmsu-0.7.0.ebuild
index d37b33711282..425fb4cc2359 100644
--- a/sys-fs/tmsu/tmsu-0.7.0.ebuild
+++ b/sys-fs/tmsu/tmsu-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,6 +14,7 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64"
 IUSE="test zsh-completion"
+RESTRICT+=" !test? ( test )"
 
 RDEPEND="
 	zsh-completion? ( app-shells/zsh )
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 8232b4580ca4..f746f9701763 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -2,7 +2,7 @@ AUX 242-gcc-9.patch 7672 BLAKE2B 1cd98213f70e6813582706e7b523925fd7956507bd5bf11
 DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 EBUILD udev-242.ebuild 9610 BLAKE2B 03c9d20e26bf3da9a397fcad196d9c9a037776cc8f121c1bd1ed4d1a01e6e9189ed512e5aa7c8c74c5d4a17446459a24f3c77b02bcdec2c15878c69ee2a7ec5c SHA512 1a8b87cd84bd431b2e8bc483285c9700a5f0cda8d372779da7da728dd4589f416eea15e1009a281b2568a099cdc733ef711c2b6801834630a4289d2b0665f3c2
-EBUILD udev-243-r2.ebuild 9811 BLAKE2B cf0baedba655bf83319029506b47a80da8003b5673a41f16c7bb4b4a6cb0eaa7b5f5a2c03dda79dd612cbb63b5918569655adde71035ef6442badc7d1f531d20 SHA512 3f506debfaa4b27d97ee49a0becebb92cb131cb7354fc202dbc3a25bc7cb7eafa4326924f78edfdc8612c72e075ef19bc14a081294e4e5e92fb221d464a7e32d
+EBUILD udev-243-r2.ebuild 9810 BLAKE2B c9cf7802630e724ee7815dc78481e3971aa8d1ac9a0e9bf13060a356ae6ef1acc4761320663177f0468bf880baf428255f63a372af4dcf0d121b337a085ea49e SHA512 f936abdbf7a9d21a1b3b0bb558b2ebb272f43e57521ef4bcdd1282b41d9aedc97874aaf5dda495984c7251af19a0a146d337e90992dea04b5c985615a73a7bc1
 EBUILD udev-243.ebuild 9570 BLAKE2B 020a845640cb14fd9ddff78b8e5526df69964d35c6eef33ab39fa30c4001558170d89e256641f9a394ebaeba7e81bc764d8765b8fe6583fe05aefb35dfcefed2 SHA512 1644eeff8e645f5514a80cffd8f357f0077514c35d489a77d088f1006e6e43930984aabc0195576be392b83bdec9ecf02c36062084471be368798a4b81891f53
 EBUILD udev-9999.ebuild 9847 BLAKE2B 7f94e3a34b82cdffe6b2a233b9197570e4af9ca4eaa7df5a49156905d21893867b569d9dec6d350eb280b5848f101364dd96d410f3c4d47d77416951de7b7ba5 SHA512 2ed67940af79cbb0bd5743e6edeb16215371a1903eaa11e0ac48de7d030404e056a5f63d7a62f12dd6b6da39f46d44835684bf0286dc83a44e406155b8d7845e
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-243-r2.ebuild b/sys-fs/udev/udev-243-r2.ebuild
index 0fd7e2a6f45b..96cb445a0a97 100644
--- a/sys-fs/udev/udev-243-r2.ebuild
+++ b/sys-fs/udev/udev-243-r2.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P=systemd-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index dbe2949eba5a..1b9ffa446c73 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -9,5 +9,5 @@ DIST udisks-2.8.4.tar.bz2 1619051 BLAKE2B 4fdf3d5ea8ae02eb74efd552afee2dbe941377
 EBUILD udisks-1.0.5-r3.ebuild 2796 BLAKE2B f0b07eb68d352b40101ad6c320b0ea93811c49e4cf36690881ccbe7b0dcb5f15a2810a43a0c722accc4549c68ecc17e0c79eea9f27114590da00e0b5200d3fbe SHA512 9095b305e94d48cbf9564ffc5dceaccc2ffc3108e3239d3cac59ef0defb16b4bf0fcdcd7638209865a816e9593e61d4a652c510e7b86daa8faa2b16130539dbc
 EBUILD udisks-2.8.2.ebuild 3232 BLAKE2B 9e10f4fc309e3b38e0277055cb9c98730b8ee5c67d79f8289e09e93033f73146b64757a7dc05a0303722ff7c3f399b8b09b825a8aafb22f366752939ea71b76d SHA512 8e8cfddf57fffc8dedc23dd3bb1f915e7322377c0bfd432e9c96de05821f2841bf6613b54f8f3c739acb8d91489510a10795790ee8dc7a51770268d09825c113
 EBUILD udisks-2.8.3.ebuild 3292 BLAKE2B ba199f539f63d699312ec5d4b556557d7c0d561c79f062f2905ca06f2be6bbf898205c9ec1c801f39d0565c93f9181bd19dae3ccf1c5904d8012c7d73e7f7619 SHA512 d514649cdb2610e19a45390d598ccfb8eaefc90afcf0ae448972dadb6746534351517fc4bbee51b55ecbb7f7253471fcb0c9baa5f6c7b007a0f373324e3fe82d
-EBUILD udisks-2.8.4.ebuild 3292 BLAKE2B ba199f539f63d699312ec5d4b556557d7c0d561c79f062f2905ca06f2be6bbf898205c9ec1c801f39d0565c93f9181bd19dae3ccf1c5904d8012c7d73e7f7619 SHA512 d514649cdb2610e19a45390d598ccfb8eaefc90afcf0ae448972dadb6746534351517fc4bbee51b55ecbb7f7253471fcb0c9baa5f6c7b007a0f373324e3fe82d
+EBUILD udisks-2.8.4.ebuild 3285 BLAKE2B 143cd117d5667519c2878d601cc1f7a4b8ae7a7159509671248afef0787ffcca3e232578ad1ffb253585b71cc3666b694803d7f357f665cb5ed5842a12434e84 SHA512 47d65963d5b13bcd5420dc76c3524522f2f2f335dd90e16641c4274c22544d8c1db954265a33621ebd62449660435eb3de378b48d1cb94a73470463e8a61a051
 MISC metadata.xml 666 BLAKE2B 901164cd5d79ae10dedfe4905228912e88f38d9c555f512a31a55dfd5c61a5156f2498af7e1aef59713afda07e7218e922757f8ced95443557e0b8e8d088ceea SHA512 f2f854b15d66c994008195a9b24a6a98db493e3faf38da7324c7ed780df4f34bd029ae5083b0f52e46e5c6ada490e1427ce45cb1a56c07059789c7b12fe4863e
diff --git a/sys-fs/udisks/udisks-2.8.4.ebuild b/sys-fs/udisks/udisks-2.8.4.ebuild
index b49a758bd22f..a93cdbe5abb4 100644
--- a/sys-fs/udisks/udisks-2.8.4.ebuild
+++ b/sys-fs/udisks/udisks-2.8.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sparc x86"
 IUSE="acl debug elogind +introspection lvm nls selinux systemd vdo"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest
index 527b03fe94a2..b11c6352e194 100644
--- a/sys-fs/unionfs-fuse/Manifest
+++ b/sys-fs/unionfs-fuse/Manifest
@@ -1,6 +1,6 @@
 DIST unionfs-fuse-1.0.tar.gz 48149 BLAKE2B d1ef74980158f4710f5b545c3e98abd27eb4eb610cbe141fa1befaa2a0efc3cce3cead1a405ecdea7dd0f02fab2d2f030d96a7b1d5068a1cd5de4e2f5bfe3aec SHA512 805151acaeae8526fba430701a1690f6eb0ad8331a9e730095ee538dc2b148d02fe996a63e8a7f6471d1ef622cc5c03d82bd2b2faad1ebe3b614ec343c2f55de
 DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea4a9a5f2f3809fc724af43cf2a4b309e4220e46647e3f3fc9b19d48c8d62692e190cf8536182abfe551bfacfcc24 SHA512 5b60204632f498931fff7671cc9f40b1800d34cb8c0d0de0773626e2653eb0a36647566c92c1d0cf79543e01b934602ef5603a06508407f352e48ef27a7ee758
-EBUILD unionfs-fuse-1.0.ebuild 530 BLAKE2B 39d1c542f294201174c14f799a8b08582fc11daab33b76081fd339b0ae44a7581e409375632d49d2125c54598c3006ac6192d42a6fc2d6c9830224e5724e4261 SHA512 453dfab62acc5d559a5b384212157fd4f8826489bcf69a259af9be41f6edfb6ef43d66d43d4d8a828d14a2f2dd1fee376c46d550ddecdf90ad5e107ecd31476c
-EBUILD unionfs-fuse-2.0.ebuild 530 BLAKE2B 2e4bfa320ee23a868b0071d26c9f5952c33ad409cf09c039dbaefd8a1b0fff051223a07ffc8d7f2fc30e9b45c82ebdbf7156276bee09a89d23f4281daf7975a2 SHA512 9691be4e73be4436c437b4d2db5b05b1d16e8bea0505a742a9600663bf65fe53b1d378f22b4824e3179c2ba34068014b2f12cbadaa2bc38cf2eedeae8c1b2d28
-EBUILD unionfs-fuse-9999.ebuild 504 BLAKE2B 28185ae5a22246fe002ae0cd44e0783786741b91e3e1f939e6d169dc593eb3f10cad0d1e56e55696c848bc6f2a2edec69da82d41f20a9f72524e139e8b0c8500 SHA512 8538c150241cf9a6c974422f16982de7245eb7c4571dcd8225369368786e2a16008734f8ef90c4ed1a68daa61d8f9b08ce295872fc46e0736e4a2e9986787426
+EBUILD unionfs-fuse-1.0.ebuild 500 BLAKE2B 76060a23c99f96ee5d491dbad82ed1939bd72b364f656fdd58de737ac2c7388f8e177b46176e2ab4d1d0add262130faf492b3cce47ce4f12797e105b453c5477 SHA512 0ab0d5efdde62268f38cc319f972dd058586d312baf992b68ed5b05e4c6c0a63c4da8d0e0efdd5f9c598ecb9f71bca2f418cfe36a6506968597d9ec95b35ff92
+EBUILD unionfs-fuse-2.0.ebuild 500 BLAKE2B 86562c039d231ff38a14252b22eb1126d53ad533adea0c15eb9565e3c55545afa4f1affeddfc6da72b09b838eb4c9af3d37f4e15918888aecbd70a52af34358f SHA512 7a1d69a0f8fc0d96e1abb5e041f9bd9a1f2c8973c64be26b6f7c526c77b82d8ff2eb7ed11635847b7237d8076b8134ce0b08f7ffd3f061a2ae02f3cfd9477818
+EBUILD unionfs-fuse-9999.ebuild 474 BLAKE2B af1254d441f4fe441bfcb76a40ed0a7dca57eb86c20d0367b52ae4460e382daab51b6779d48c8aaf785833ffac14f205d6f02420ddb687123d1aa9d259cd6a04 SHA512 9df4c76eaec9d78ee846da0f7d8d09f3d52f646a5d3fca088d62892a72b337457007ddc55b551353a7dbbd28ca57e4ad13d3611083c75752ddd8a4d08589982d
 MISC metadata.xml 336 BLAKE2B f9d55c17815e8d3179029c92fd758b0811b455b4d375aa31c44d7643f9d792a70dae915ae25d069e9967fbac2954c197b1ebcd85828b744a9924dc719eeb6f40 SHA512 54597ecd53cfe8d92d717481a533df32cb5fa7272cd64a42a0cd4b4803024b10e3451845569e3d7b199ed63f4070023468dd7528cb438f155539e5e752144197
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild
index e9658f33fb12..1dd309e439f7 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-1.0.ebuild
@@ -17,5 +17,5 @@ DEPEND="sys-fs/fuse:0"
 RDEPEND="${DEPEND}"
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || die "emake install failed"
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 }
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild
index fe5a7ef6d178..bf4a922ce675 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-2.0.ebuild
@@ -17,5 +17,5 @@ DEPEND="sys-fs/fuse:0"
 RDEPEND="${DEPEND}"
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || die "emake install failed"
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 }
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
index bf42f96d4078..76d6d822dd89 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
@@ -19,5 +19,5 @@ DEPEND="sys-fs/fuse:0"
 RDEPEND="${DEPEND}"
 
 src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install || die "emake install failed"
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 }
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index 257554ba4008..403a8cd3fb2d 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,7 +1,3 @@
-DIST vhba-module-20190410.tar.bz2 15741 BLAKE2B 6d513877c771b1c4c5805231cf8bb13333d29dd3c6de7d91879ef1898fdc424df026b0835a772f398dcdc7d8900db462164a40e46c9b66b38ed70f5b5f6a0e7e SHA512 e4b30bea8464d8ac24fd2fddca9d41052af2f5b3dc9e054ead47991bff41366be377600075627c40261722c88c20ed2eaf65fa7afb34690ef09a6f4ea6f9351f
-DIST vhba-module-20190827.tar.bz2 15570 BLAKE2B 54a50f14659e388c0d53edce842633a3d85bae66483d27e458a83fcc7c547a804e83d34bba0e9a11a0b7e4e533f78c7014ac8e1235a83a7dc6aa13671cb9a823 SHA512 e84ffbbace9964b5fda844d3dd5201ae969ca017886a709d814670a371631376ebb2b1f05775c14ace43e84ed7fc0340638e485ac2a386db530cc25a9fa6e534
 DIST vhba-module-20190831.tar.bz2 15570 BLAKE2B 202f28a0729eddce907f5fc46f99a52b116948a376c0f2aaab3b9340f88fc248151c3ec592f2f60e52a07eeed4f551d6f270b4464605bce9df4badf9fa8ed322 SHA512 f43cb9b5730c4d634b58d3dd204610dbc86fdc520d4cfee6c9efbae3bb2acb88f5663e5fbd2b11b5ef9e3b6ad7d4dd0ecf9728dc36ac0b492bd06e0806223591
-EBUILD vhba-20190410.ebuild 2146 BLAKE2B 7b02077e20c319d2d9197719c00e115119b3e825c706fbfbc64de6a018b374605a5d06e4ac7d830c365b3ee1cae7299a207a49eb8d55385d775a73a0bc3f8c8f SHA512 ab5fc77641921817989917b9b47e0f4766db4e02238c8826d2eeb90d6a23c7ef7a1fc21d4ed99ddd1ea002f06d4ff7f63c7df660923cd71db5ab34d9a8b0dc5c
-EBUILD vhba-20190827.ebuild 1116 BLAKE2B a670b0a7448539bb06a02947d1ba7a60569314e385d52d620e962356cd738ab669012a6429c6d0b6d8a4d397f33c8e00d4ad80dc15ca5890b54eae9235090832 SHA512 ef147e91d85a526786b0df3fe8d4e1b4208877b97d5724dfb11f89cdd3bde8091c00b185c67baac72e8f5ffc799fbb6712f6c35f81ba2a4f505fdd100ed01fad
 EBUILD vhba-20190831.ebuild 1150 BLAKE2B 46336ede854af6c25154a1a352894892231872df26e83d07c61a093e56c0af78b0b2bd209616ff74c739a1653cdc6fccdfcebc90b993d4fff66928f7d84e9593 SHA512 ee3277b42dd44cc3d8c5cdc5705c3ab05b4d90448b0f39a091631abbf30cb27772838b5e9167b33848700f38333d678ffb73225a95a8bcd80a7469e4ea15418a
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/sys-fs/vhba/vhba-20190410.ebuild b/sys-fs/vhba/vhba-20190410.ebuild
deleted file mode 100644
index 157ae2ff9f9d..000000000000
--- a/sys-fs/vhba/vhba-20190410.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils linux-mod udev
-
-MY_P=vhba-module-${PV}
-DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-MODULE_NAMES="vhba(block:${S})"
-BUILD_TARGETS=modules
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
-	check_extra_config
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	# Avoid "make jobserver unavailable" warning and -Werror problems
-	sed -e '/ccflags/s/-Werror$/-Wall/' \
-		-i Makefile || die "sed failed"
-
-	eapply_user
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README
-	linux-mod_src_install
-
-	einfo "Generating udev rules ..."
-	dodir "$(get_udevdir)"/rules.d
-	cat > "${D}/$(get_udevdir)"/rules.d/69-vhba.rules <<-EOF || die
-	# do not edit this file, it will be overwritten on update
-	#
-	KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"
-	EOF
-}
-
-pkg_postinst() {
-	# Older versions of vhba installed their rule file in /etc/udev/rules.d,
-	# which overrides rules in /lib/udev/rules.d. We remove the old file
-	# automatically if it is identical to the default one installed by
-	# vhba-1.2.1 or 20101015-r1. Note that the comment at the top of the rules
-	# file states that it can be automatically overwritten by the system.
-	old_rules="${ROOT}etc/udev/rules.d/70-vhba.rules"
-	if [[ -f "${old_rules}" ]]; then
-		case "$(md5sum ${old_rules})" in
-		  2959b3cf61cfe6e466cc3516a7bc19de* | 1e7a7e5d6d28c811eeec98ec26ed5d28* )
-		  	elog
-			elog "Removing old ${old_rules} ..."
-			rm -f "${old_rules}" ||
-				eerror "Failed, please remove ${old_rules} manually."
-			;;
-		  * )
-			ewarn
-			ewarn "The ${old_rules} file from a previous"
-			ewarn "installation of ${PN} is overriding ${P}'s"
-			ewarn "udev rules. Unless you had deliberately customized it,"
-			ewarn "you should remove it."
-			ewarn
-			;;
-		esac
-	fi
-
-	linux-mod_pkg_postinst
-}
diff --git a/sys-fs/vhba/vhba-20190827.ebuild b/sys-fs/vhba/vhba-20190827.ebuild
deleted file mode 100644
index a049dfd927d2..000000000000
--- a/sys-fs/vhba/vhba-20190827.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit eutils linux-mod udev
-
-MY_P=vhba-module-${PV}
-DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
-HOMEPAGE="http://cdemu.org"
-SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="virtual/udev"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_P}
-MODULE_NAMES="vhba(block:${S})"
-BUILD_TARGETS=modules
-
-pkg_setup() {
-	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
-	check_extra_config
-	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	# Avoid -Werror problems
-	sed -i -e '/ccflags/s/-Werror/-Wall/' Makefile || die "sed failed"
-
-	eapply_user
-}
-
-src_install() {
-	dodoc AUTHORS ChangeLog README
-	linux-mod_src_install
-
-	einfo "Generating udev rules ..."
-	dodir "$(get_udevdir)"/rules.d
-	cat > "${D}$(get_udevdir)"/rules.d/69-vhba.rules <<-EOF || die
-		# do not edit this file, it will be overwritten on update
-		#
-		KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"
-	EOF
-}
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index fef4de7c9be3..09efac2e6485 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,8 +1,9 @@
 AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e
 AUX xfsprogs-4.15.0-sharedlibs.patch 3022 BLAKE2B cfa23520a55750af375ada8c35fb9f4b3ea2f401ddebd95aef6d46f9195ac6ab3fb38f5f9d08529d3c2658623a49eadc7db0be68159753025310605fdfc35a6b SHA512 5a6e62f2914e372f2bf679b10c32fe65f60677b4bf0e58f60c40a297ed8974d5ec0af3bcba5801ba19cadbb689a6dad62c1e2cd88587f6f3d30f21f1472f3ac0
 AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13fe3d217a6c4c8dd21fce1986793cefaa4777e827945adb3807f2d644665fbf66e7fbd5318d6f5c58d37c49260c24ca46181 SHA512 2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7
+AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
 DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775 SHA512 a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58
-DIST xfsprogs-5.2.1.tar.xz 1227012 BLAKE2B af6c25d88d0a50fc82ecb2d9d00545ffdf906d6e85361360130b5a2b0d362e566c097f15be04a61023bd5c7815b77d0bab6258d8f188c5afe68098c51ae26ee0 SHA512 a2ecd8e2ae8a4e7357b4133beaeffeae4d6c9d0ece9855d9780a84c2d4072e3d4e0b8ffa3baa995862ec38dcbc5dd74205f7f4456676826082c4811867508a43
+DIST xfsprogs-5.3.0.tar.xz 1247636 BLAKE2B 0f8b2eafa1b1c91ff8bbcf8f79f61a8bea47123b859ec7a181dea37891ca0345a79a0cc714f003fbe560b00c0c2fc76e6bf6a3a1465f51c44b2df3a3dcbe6415 SHA512 308202eba3765e416c43877ad68d528f6c7d03ca024b89709aa3ca818f6c6692e3b90a809cbb81ff886624300c0e548925e70b34c30c47bac8dcfe4bb9c18857
 EBUILD xfsprogs-4.19.0.ebuild 2434 BLAKE2B cc6ca0e0425994414497bb9ac27541408958d9da936a659028b38cdaf3ed6527c741efeff812b023ce513b091b301723fa21fce1a4512939c5d3f6ddb8f42ab4 SHA512 bcef5fcc339809950886dd2a37fa696892216e1ddc5fc85b773ba40fe94fd1430a0b34b71a1ea22ce5d3cb947a8de23c800993067b5f909358ed037a2c18a198
-EBUILD xfsprogs-5.2.1.ebuild 2781 BLAKE2B 5de2467f44d58ccdbf060143464002ba7bbd3b26da7bf47879dd56f2f161357e3e732283d7ec64e64ad11b98018ccb0b6ecc6f1e53b3d74935572689aff935b4 SHA512 a99e84cf41b7d1ab16a85e3a77bbb9c4cc2cd4f43725ed62fe62042f55e2c30dba63dafc4ed977b03082492dc267351687d0687c5a5fe375f9e34f08c9b2dd8c
+EBUILD xfsprogs-5.3.0.ebuild 2776 BLAKE2B 4833f2c95cde504f429095702217d63be549413933dc97dbf13e9206db943ab95e7f7c579eb522578a1092f508b30f5dd76d780fee62e609611549ea36d3b1fd SHA512 a3b116e1420b4e21aa3eb051f6c6ed9e7d8278db24ae43b3d61be79ed53fec14ad678b1148f55f55e3c162be8b08c85996028e64b01923a75c2105b52cba4af5
 MISC metadata.xml 338 BLAKE2B cdf07fec58a2401c154a3fdb7d5326065143eeac8dbe78078012d643dc3872bc2df79cc734c033c2030d356f2366dad8ad1da553bc268fd0318ab3ba971c4b5e SHA512 1a085c94d623db2cc55d987afb66265ab51e94c8868bc7c169cc669b58f8a8c5a1d81f503aa838d5c2a84f2a0bf923f73314048b49eb1e139d91eca6f71e119e
diff --git a/sys-fs/xfsprogs/files/xfsprogs-5.3.0-libdir.patch b/sys-fs/xfsprogs/files/xfsprogs-5.3.0-libdir.patch
new file mode 100644
index 000000000000..f943817df487
--- /dev/null
+++ b/sys-fs/xfsprogs/files/xfsprogs-5.3.0-libdir.patch
@@ -0,0 +1,28 @@
+In Gentoo we install libs to /usr/lib* and let gen_usr_ldscript
+handle /lib*.
+
+--- a/include/buildmacros
++++ b/include/buildmacros
+@@ -57,9 +57,10 @@ endif
+ ifeq ($(ENABLE_SHARED),yes)
+ INSTALL_LTLIB = \
+ 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+-	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
+-	../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
+-	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_ROOT_LIB_DIR)
++	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
++	../$(INSTALL) -m 755 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
++	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR); \
++	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_LIB_DIR)
+ endif
+ 
+ # Libtool thinks the static and shared libs should be in the same dir, so
+@@ -68,7 +69,7 @@ endif
+ # Other things want the shared libs to appear in /usr/lib, else they'll
+ # link with the static libs there.  So, another symlink to get the .so into
+ # /usr/lib.
+-ifeq ($(ENABLE_SHARED),yes)
++ifeq ($(ENABLE_SHARED_HANDLED_BY_gen_usr_ldscript),yes)
+ INSTALL_LTLIB_DEV = \
+ 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
+ 	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
diff --git a/sys-fs/xfsprogs/xfsprogs-5.2.1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.3.0.ebuild
index 9aea191d9021..6058992139d6 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.2.1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs systemd
+inherit flag-o-matic toolchain-funcs systemd usr-ldscript
 
 DESCRIPTION="xfs filesystem utilities"
 HOMEPAGE="https://xfs.wiki.kernel.org/"
@@ -26,9 +26,8 @@ BDEPEND="
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
-	"${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
 	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
+	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
 )
 
 pkg_setup() {
@@ -51,8 +50,17 @@ src_prepare() {
 }
 
 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
-	export OPTIMIZER=${CFLAGS}
+
+	# 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
 
 	# Upstream does NOT support --disable-static anymore,
@@ -88,11 +96,6 @@ src_configure() {
 }
 
 src_compile() {
-	# Unset {CF,LD}FLAGS which are already set via configure
-	# but will cause problems when available during make.
-	# Fixed in >=xfsprogs-5.3.0.
-	unset CFLAGS LDFLAGS
-
 	emake V=1
 }
 
@@ -100,6 +103,5 @@ src_install() {
 	emake DIST_ROOT="${ED}" install
 	emake DIST_ROOT="${ED}" install-dev
 
-	# removing unnecessary .la files if not needed
-	find "${ED}" -type f -name '*.la' -delete || die
+	gen_usr_ldscript -a handle
 }
diff --git a/sys-fs/zfs-auto-snapshot/Manifest b/sys-fs/zfs-auto-snapshot/Manifest
index 5f2bd8e5af26..473b6bb836da 100644
--- a/sys-fs/zfs-auto-snapshot/Manifest
+++ b/sys-fs/zfs-auto-snapshot/Manifest
@@ -1,5 +1,5 @@
 AUX README.gentoo 684 BLAKE2B 7175ddfbb8dd5b209fa4fa5e5a3aeecac3fdd102e240f93b640f91bbf0204f9101801a94087383d7087bec08ae490e9769dfcf4f7f218d6daa4779087a8a0d23 SHA512 e77c3a573c2d4499df902b68909c186e4c80ba8b451b493c7e08e5e96ebe281933ce4b5fc11c201e33f27b14a02a35fd85270baf7ddece42a2fcbc6c3c421146
 DIST zfs-auto-snapshot-upstream-1.2.4.tar.gz 13375 BLAKE2B 2a44cdecb7c4bb432c1804dba9a6674289aced9664ae0fcc6a33b604b128d852fce459367316f11961747594516916da51072ed10f84d0c01ea8cca553ce7eec SHA512 26382303fce8b90dfb40f69fcab92308e88c17c147b4a566c5d32f2e9aa241d64f5da56ad82b4becb824ba01a470037a724460d35676a1d46de9c578c02a57d9
-EBUILD zfs-auto-snapshot-1.2.4.ebuild 1379 BLAKE2B 1471a99fa769c947ce39c433c2f46362a7bae719c9cb07134cfa2e3a1d0aa76f824b02e7af7059206e31a05e0b72f432faa6ac452c01659e4f2ba88ead7e8351 SHA512 19a50df99e5b5716f62b5c2ed5e0dbdd404ed66f3615fa6620cf3e529f0851f6e18d8c440ad50a91c8d003d47d664c78af5965e92ffe93b6c0bd6baa10597db6
-EBUILD zfs-auto-snapshot-9999.ebuild 1379 BLAKE2B 1471a99fa769c947ce39c433c2f46362a7bae719c9cb07134cfa2e3a1d0aa76f824b02e7af7059206e31a05e0b72f432faa6ac452c01659e4f2ba88ead7e8351 SHA512 19a50df99e5b5716f62b5c2ed5e0dbdd404ed66f3615fa6620cf3e529f0851f6e18d8c440ad50a91c8d003d47d664c78af5965e92ffe93b6c0bd6baa10597db6
+EBUILD zfs-auto-snapshot-1.2.4.ebuild 1383 BLAKE2B 93d60c4935d00caa51d48a98dfc730672b65bbdde7423829f29150845d2d9894a97255fd0f8b9d798ea37dd88faa04d1ef3258cb4abcba20fa557a7a790f7efc SHA512 f62394d8054bd6b4442f69a81cb0c605aee70ef1b1854dbfea0c1debd477cf28894aa3de51260be54486d0245a88dc841d212ca8a1a0127c29cc7845f7d17524
+EBUILD zfs-auto-snapshot-9999.ebuild 1383 BLAKE2B 93d60c4935d00caa51d48a98dfc730672b65bbdde7423829f29150845d2d9894a97255fd0f8b9d798ea37dd88faa04d1ef3258cb4abcba20fa557a7a790f7efc SHA512 f62394d8054bd6b4442f69a81cb0c605aee70ef1b1854dbfea0c1debd477cf28894aa3de51260be54486d0245a88dc841d212ca8a1a0127c29cc7845f7d17524
 MISC metadata.xml 909 BLAKE2B 74eeac781ab385dfd962c316d6792c79ebdffed9084f3c7b071a13b502edb881555e4e9525a1c8c5f2fe0ca51241afbe430f7ce07fdbd4b2554c841f1837af85 SHA512 d98be1718d600b6a04af37294de1eb47e814c74ddf24d4e119d037554baf3f9b551ab43dabd1dcd70b35b65e9fb687325c04371d078757d26c07385ac72143c8
diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
index e9006a5b9aac..d8170b5cfc1c 100644
--- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
+++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="${PN}-upstream-${PV}"
 	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild
index e9006a5b9aac..d8170b5cfc1c 100644
--- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild
+++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="${PN}-upstream-${PV}"
 	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~ppc64"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 6f16b03b0bd6..2d9a299b5187 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,8 +1,7 @@
+AUX 0.8.2-umask_O_TMPFILE.patch 1188 BLAKE2B 19cb2b42e5ca7e0f29ecb9b0f725375ce60c510961d4744b34e93c7fb323ceb3b5ede85c9bbab4d3b894b111f9ab16d1648677adf73691062c8c552b72e6ca46 SHA512 7290597e0c74c54db09c4c97800bf5fa8744bb4686de65c71ef52e77d6832b245650d580a12c60c5dd04ace5063c156379462f2f6be53976ba0a271c46548dfa
 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
-DIST zfs-0.8.1.tar.gz 8668360 BLAKE2B f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b SHA512 1fb3957f65dbe94edaffcedb5b2694390dc14e472c11f7e63184a9ea6a774e79a43d47a2d789b7ced233fc67c76583bf7d5c1bda0692bb07929673e2a57f4667
 DIST zfs-0.8.2.tar.gz 8738111 BLAKE2B 5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0 SHA512 1424b1a030b814f812b5da422100669db5b8c3ccae14c2fdd62a5e0df28e7255247fe5ca99c95a14f08c92cc1574c22dd132093e4a1dd81e38c95b10cc5e2496
 EBUILD zfs-kmod-0.7.13.ebuild 4119 BLAKE2B f8d921251bc94644a7331762054935518bb9fb68425b404572876466bff118b9ae20cf297f34d9267c933d7ea28840c84fe8e4a867e9a9f191b627f29207798b SHA512 8e4eb43e5b4edd7dcb8b0ecb13a809340ee20247017e7cb141b8489dc4c9988b84b40e866028e8d3b73aea69981a923e4fc4b237389115fb8e72d8b6ed450340
-EBUILD zfs-kmod-0.8.1.ebuild 4390 BLAKE2B aa8f7a575bbb367b4cfa9e41e7aabe96a25a3192fe3af70fc49dc1c9722cd48b91cdabd0a9089ee347c75fe9c921e3c7f5d08aa30e5a2cb2c9c0d611d0533f33 SHA512 bb422bf5fa963e67bace35c56dd42232f98029b792d5b0428d26bd56c8b972ac5e5c7cf632e8cfe8e21ccf89f9e78ce7bdce133770795ce7c7852ccec5e2dbc5
-EBUILD zfs-kmod-0.8.2.ebuild 4428 BLAKE2B 411554e73a280bfc1a06ee382f4632e341d4b85a76fba6605c95fd187e96da21487d588042759110544e5d12ee8dcf6419b212f697ed200d8a703f49ea1f2d5f SHA512 e42afc1874dacba274ae0c45c6a4e7f5ff627cd63ac5f2cd1ecb539905a9f947b569eba2df37443c516fe574164729294efbd24f269fdb3afd61f15ca55db659
-EBUILD zfs-kmod-9999.ebuild 4428 BLAKE2B 55ac5f6d3bc7530ed723033d8829696be87c8ca2b3a9a022a11f82725fb147b0ae3c249b48399dc9fdfdcd8f72c6b26dc450d783404be8c72eef745b664754a7 SHA512 71f8bade7df5f2f7f8a434c8cbfbb9ddebf490a42ae289ba7539808de653ae58ec9af4afea2d7006853cac6d46ba072abd47b80512249f04316c0d08f2b7aabc
+EBUILD zfs-kmod-0.8.2-r2.ebuild 4483 BLAKE2B 6fed0585a7ef9c6d22b0787e7da013cba40c7121ab79eca2ac85b56005bfd34d80d1f635d4c052c7e4f63e19c247ed6d81b77a83bef7ecf5f2bb943c1b431fbe SHA512 946f096ea68965171b55806c1274dfa3935de4850966a8b6a5acd6ea385ca442daab89623697c7a687e41f8a7716622f0c3b234f93921dd7b25cbea22cc6f7d0
+EBUILD zfs-kmod-9999.ebuild 4424 BLAKE2B 06e992b94cb387e0d133dd01fda648bfd1a0b22079d09749befee7cb4c58024943b4bca325100c74097f204706620e6ac0028cae5bb0ce8ecdb5e1812d792a8f SHA512 76e34d95098a8df75d01b150a39c1a00178434a9fc4998719bca4ce8b480b43dece50a65d239238f875f7e19c7a7e5e47d3e3b6ff9cd155ad5aba626973c6408
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/files/0.8.2-umask_O_TMPFILE.patch b/sys-fs/zfs-kmod/files/0.8.2-umask_O_TMPFILE.patch
new file mode 100644
index 000000000000..9252b6e7815c
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/0.8.2-umask_O_TMPFILE.patch
@@ -0,0 +1,34 @@
+From ddb4e69db5eb0ed741dc4e32714af3e0f054086c Mon Sep 17 00:00:00 2001
+From: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
+Date: Sat, 14 Dec 2019 08:02:23 +0900
+Subject: [PATCH] Don't fail to apply umask for O_TMPFILE files
+
+Apply umask to `mode` which will eventually be applied to inode.
+This is needed since VFS doesn't apply umask for O_TMPFILE files.
+
+(Note that zpl_init_acl() applies `ip->i_mode &= ~current_umask();`
+only when POSIX ACL is used.)
+
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Reviewed-by: Tony Hutter <hutter2@llnl.gov>
+Signed-off-by: Tomohiro Kusumi <kusumi.tomohiro@gmail.com>
+Closes #8997
+Closes #8998
+
+diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c
+index 264c5d2b1cf..e1c6ce7b705 100644
+--- a/module/zfs/zpl_inode.c
++++ b/module/zfs/zpl_inode.c
+@@ -218,6 +218,12 @@ zpl_tmpfile(struct inode *dir, struct dentry *dentry, umode_t mode)
+ 
+ 	crhold(cr);
+ 	vap = kmem_zalloc(sizeof (vattr_t), KM_SLEEP);
++	/*
++	 * The VFS does not apply the umask, therefore it is applied here
++	 * when POSIX ACLs are not enabled.
++	 */
++	if (!IS_POSIXACL(dir))
++		mode &= ~current_umask();
+ 	zpl_vap_init(vap, dir, mode, cr);
+ 
+ 	cookie = spl_fstrans_mark();
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.1.ebuild
deleted file mode 100644
index 1a185742e27d..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.1.ebuild
+++ /dev/null
@@ -1,175 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://zfsonlinux.org/"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
-	S="${WORKDIR}/zfs-${PV}"
-	ZFS_KERNEL_COMPAT="5.1"
-fi
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	!sys-fs/zfs-fuse
-	!sys-kernel/spl
-"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/awk
-"
-
-RESTRICT="debug? ( strip ) test"
-
-DOCS=( AUTHORS COPYRIGHT META README.md )
-
-pkg_setup() {
-	linux-info_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
-	"
-
-	use arm64 && CONFIG_CHECK="${CONFIG_CHECK} !PREEMPT"
-
-	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
-
-	kernel_is -ge 2 6 32 || die "Linux 2.6.32 or newer required"
-
-	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
-
-	check_extra_config
-}
-
-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
-
-	# Remove GPLv2-licensed ZPIOS unless we are debugging
-	use debug || sed -e 's/^subdir-m += zpios$//' -i module/Makefile.in
-}
-
-src_configure() {
-	set_arch_to_kernel
-
-	use custom-cflags || strip-flags
-
-	filter-ldflags -Wl,*
-
-	local myconf=(
-		--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=( 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 ZFSOnLinux 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-0.8.2.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.2-r2.ebuild
index c14dbf915241..961ee269f06b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.2.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.2-r2.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64"
 	S="${WORKDIR}/zfs-${PV}"
-	ZFS_KERNEL_COMPAT="5.3"
+	ZFS_KERNEL_COMPAT="5.4"
 fi
 
 LICENSE="CDDL debug? ( GPL-2+ )"
@@ -38,6 +38,8 @@ RESTRICT="debug? ( strip ) test"
 
 DOCS=( AUTHORS COPYRIGHT META README.md )
 
+PATCHES=( "${FILESDIR}/${PV}-umask_O_TMPFILE.patch" )
+
 pkg_setup() {
 	linux-info_pkg_setup
 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 743338031070..6bced727e3b9 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -15,7 +15,7 @@ else
 	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~ppc64"
 	S="${WORKDIR}/zfs-${PV}"
-	ZFS_KERNEL_COMPAT="5.1"
+	ZFS_KERNEL_COMPAT="5.4"
 fi
 
 LICENSE="CDDL debug? ( GPL-2+ )"
@@ -69,7 +69,7 @@ pkg_setup() {
 
 	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
 
-	kernel_is -ge 2 6 32 || die "Linux 2.6.32 or newer required"
+	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
 
 	if [[ ${PV} != "9999" ]]; then
 		local kv_major_max kv_minor_max zcompat
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index bf38f2e37725..6c2109925417 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,13 +1,13 @@
-AUX 0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch 2580 BLAKE2B db47d8024954eae996aec81eea63c0adf400675649a7d93d93a4a423329dc36d9fa21a753c4a5d0363e1ad513c8ecb5891188cf4c33a4d575b2cd80ccea0f689 SHA512 31330c43507d82279a521b8cbee0ea43cecf4496c932f4589ef80fa3f6df009655fc337cbf4a2ee93f646001d7f2780beff5c747367f9a94939b70cebe0fbfd2
+AUX 0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch 1945 BLAKE2B db5d094bcac52a3b53bae9df4b0444f656858dd83f21994cbefe4900554a2579c67b5058d149d226ca354bd45d9e24c12244186da3232064233b74ec590187dc SHA512 71a009336fdcac8e5813001fd6741f4310c3e792b20650ebad73ba0049730acb5188587dc8e706846e886bf9ac241d2163b9558150eb389c99d7910a730542d0
+AUX 0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch 3386 BLAKE2B fd12c67ae3d481dda5a6bcf3c3815ac752f7f22834aadc02ee11a592b7114bccc7fc8b494763f80999428d90c9903cbf4df5e544443c2cec0bfc91a942f5c708 SHA512 739d1e050d8894e3d92a995500d1f70e128cf33de941eacdb0b3ad8e743fedf464a02ba4a5ac85f43e302d53302ce866d88ab836dd60b861914cb5b7a190f376
 AUX bash-completion-r1 11310 BLAKE2B f6c105fef1737d4be0e76967fdec62aa52fa7665bfc1e9aa4c944dd6442d64d7d31b8af54f92f5db25542f968ecf83da46db8c2a8f978577526bf9f90d8bccf3 SHA512 03be521e2c646196766d5fd049f241cb97f290abf0409881ea6ba709934984deda402c8513009e62a5787e0648023b55c040e5f99baef27709e81c3bc9c8f56e
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
 AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c93a2cd7134016a8d07d68483126d60e46ed4ff5cbaeb87f050e9c9fb5bff5352d5dc32b4d94db7b4 SHA512 bed7eae5f902f13489241782d3d560b53a5a3258de492763b7b25783ca9417975afb9000f68f58be5c2057e1db50a569374ed0ff572140aa65e401e20e646461
 AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b9243f111c6c882c3480eb6396e347eac91670e3a67d7f122953d6fa82ec61a6467163b788b31858 SHA512 7a167b389723e5f55fea6956e5546e46c89ebf3e2d1c25f6b56c357e6d3ffc765226549d78cdeb79b4dc90c798ec6326a13996215b40eb49179376e32c3c3287
 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
-DIST zfs-0.8.1.tar.gz 8668360 BLAKE2B f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b SHA512 1fb3957f65dbe94edaffcedb5b2694390dc14e472c11f7e63184a9ea6a774e79a43d47a2d789b7ced233fc67c76583bf7d5c1bda0692bb07929673e2a57f4667
 DIST zfs-0.8.2.tar.gz 8738111 BLAKE2B 5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0 SHA512 1424b1a030b814f812b5da422100669db5b8c3ccae14c2fdd62a5e0df28e7255247fe5ca99c95a14f08c92cc1574c22dd132093e4a1dd81e38c95b10cc5e2496
 EBUILD zfs-0.7.13-r1.ebuild 6286 BLAKE2B 8ff2c44069a13fe26b02a7a490ffcf1cb9833f5d5ba9ca1b151e1ed6bcc706bc46083a86663c073660d7a80792989335f8a1f4d71d162fcc8a16a635336ef175 SHA512 35127bc47361845a18bba3b60b27ae900a16ad2b94c1c479a62b30079b6688236b2feccb9d902ce93e3d8ff0a95504bc00d52fba6120b763d69057227e50a8a6
-EBUILD zfs-0.8.1.ebuild 6818 BLAKE2B b787b718b658937297f35acda6b41c0eaa5b9a41398eb19b0617e2faba0fa41c54d19e96d1ceaab3367e46235f54286d95212cc4de9bb1306f25d5f2ec1b260a SHA512 8719b4b46066a3a2c2bf5f9518082814aba9ecba5e1d977c412432213c1baad89922b13eaf13e3e422fbb4001dc92602444f182847e2e08375d38c812496fe10
-EBUILD zfs-0.8.2-r1.ebuild 5674 BLAKE2B a902bd8be17dfbb3291c75a8f7a26e262c4631ce3f3754ca28403b6c7b46ac8527b71a7f0d356d04f0f633f8cac861169416919bbd73e4ec54ae38b1a8a8a91e SHA512 bc5991a96d9fa25eaf8aa8e05535975c7456d45a956c7bc1db60355454a5ea3ca9eb040e9d75e60941fbb19fee5b88cc70b72c1fed257df9b71db5a2781100a6
+EBUILD zfs-0.7.13-r2.ebuild 6350 BLAKE2B 3196bdde32d4264117bf7e5a1f81d07703b5a519fb3429438b67c314128ae583ed5cc33fa3184c1739eda7db3429eee9fa6cc38f1c2f750311e230ad87b2b282 SHA512 c5af6b806b932508de1d8724ae84d461dcbba3987fa822ed8bbc7db608df625baee7bbd5c3a695699bd3415c62be3034e70618f399fe13a4286039308ea18898
+EBUILD zfs-0.8.2-r2.ebuild 5674 BLAKE2B a902bd8be17dfbb3291c75a8f7a26e262c4631ce3f3754ca28403b6c7b46ac8527b71a7f0d356d04f0f633f8cac861169416919bbd73e4ec54ae38b1a8a8a91e SHA512 bc5991a96d9fa25eaf8aa8e05535975c7456d45a956c7bc1db60355454a5ea3ca9eb040e9d75e60941fbb19fee5b88cc70b72c1fed257df9b71db5a2781100a6
 EBUILD zfs-9999.ebuild 5571 BLAKE2B 4e550701988684482311a50c2c78120d19570b45c927e881e655323625f1ee5d8db81f98568f823c6b1a274c63dfc37504a827e8a7d64cc87c563a2041d23a87 SHA512 7af3c13954b927b34e52a5221fdf1c1ec7b36b73bda8b69fce806365a2d16d361412c1e6143a493d72411ae77fdeaa85d17e641842ac31681d1dc1d8162141ff
 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/files/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch b/sys-fs/zfs/files/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch
new file mode 100644
index 000000000000..922e5951bdf0
--- /dev/null
+++ b/sys-fs/zfs/files/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch
@@ -0,0 +1,70 @@
+From a0767672aac01f41516550e3808ff72da893102f Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Tue, 26 Nov 2019 12:07:36 -0800
+Subject: [PATCH] backport udev timeout patch
+
+https://github.com/zfsonlinux/zfs/commit/803884217f9b9b5fb235d7c5e78a809d271f6387
+---
+ lib/libzfs/libzfs_import.c | 11 ++++++++++-
+ man/man8/zpool.8           |  6 ++++++
+ 2 files changed, 16 insertions(+), 1 deletion(-)
+
+diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c
+index 9dbf207..cd08806 100644
+--- a/lib/libzfs/libzfs_import.c
++++ b/lib/libzfs/libzfs_import.c
+@@ -53,6 +53,7 @@
+ #endif
+ #include <stddef.h>
+ #include <stdlib.h>
++#include <stdio.h>
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
+@@ -1594,17 +1595,25 @@ zpool_open_func(void *arg)
+ 	if (rn->rn_labelpaths) {
+ 		char *path = NULL;
+ 		char *devid = NULL;
++		char *env = NULL;
+ 		rdsk_node_t *slice;
+ 		avl_index_t where;
++		int timeout;
+ 		int error;
+ 
+ 		if (label_paths(rn->rn_hdl, rn->rn_config, &path, &devid))
+ 			return;
+ 
++		env = getenv("ZPOOL_IMPORT_UDEV_TIMEOUT_MS");
++		if ((env == NULL) || sscanf(env, "%d", &timeout) != 1 ||
++		    timeout < 0) {
++			timeout = DISK_LABEL_WAIT;
++		}
++
+ 		/*
+ 		 * Allow devlinks to stabilize so all paths are available.
+ 		 */
+-		zpool_label_disk_wait(rn->rn_name, DISK_LABEL_WAIT);
++		zpool_label_disk_wait(rn->rn_name, timeout);
+ 
+ 		if (path != NULL) {
+ 			slice = zfs_alloc(hdl, sizeof (rdsk_node_t));
+diff --git a/man/man8/zpool.8 b/man/man8/zpool.8
+index 46e531e..10a19b5 100644
+--- a/man/man8/zpool.8
++++ b/man/man8/zpool.8
+@@ -2291,6 +2291,12 @@ Similar to the
+ option in
+ .Nm zpool import .
+ .El
++.Bl -tag -width "ZPOOL_IMPORT_UDEV_TIMEOUT_MS"
++.It Ev ZPOOL_IMPORT_UDEV_TIMEOUT_MS
++The maximum time in milliseconds that
++.Nm zpool import
++will wait for an expected device to be available.
++.El
+ .Bl -tag -width "ZPOOL_VDEV_NAME_GUID"
+ .It Ev ZPOOL_VDEV_NAME_GUID
+ Cause
+-- 
+2.24.0
+
diff --git a/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch b/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch
index 6c4054ddb668..00dda6de55c4 100644
--- a/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch
+++ b/sys-fs/zfs/files/0.8.2-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch
@@ -1,6 +1,6 @@
-From d7037d2a2fd57504070eba14634b8a7ea159de32 Mon Sep 17 00:00:00 2001
+From 803884217f9b9b5fb235d7c5e78a809d271f6387 Mon Sep 17 00:00:00 2001
 From: Richard Yao <ryao@gentoo.org>
-Date: Thu, 1 Aug 2019 15:54:30 -0400
+Date: Wed, 9 Oct 2019 12:16:12 -0700
 Subject: [PATCH] Implement ZPOOL_IMPORT_UDEV_TIMEOUT_MS
 
 Since 0.7.0, zpool import would unconditionally block on udev for 30
@@ -15,38 +15,45 @@ have their own mechanisms for blocking until device nodes are ready
 zpool import to block on a non-existent udev until a timeout is reached
 inside of them.
 
-Rather than trying to intelligently determine whether udev is avaliable
+Rather than trying to intelligently determine whether udev is available
 on the system to avoid unnecessarily blocking in such environments, it
 seems best to just allow the environment to override the timeout.  I
 propose that we add an environment variable called
 ZPOOL_IMPORT_UDEV_TIMEOUT_MS. Setting it to 0 would restore the 0.6.x
-behavior that was more desireable in mdev based initramfs environments.
-This allows the system userland utilities to be reused when building
+behavior that was more desirable in mdev based initramfs environments.
+This allows the system user land utilities to be reused when building
 mdev-based initramfs archives.
 
+Reviewed-by: Igor Kozhukhov <igor@dilos.org>
+Reviewed-by: Jorgen Lundman <lundman@lundman.net>
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
 Reviewed-by: Georgy Yakovlev <gyakovlev@gentoo.org>
 Signed-off-by: Richard Yao <ryao@gentoo.org>
+Closes #9436
 ---
- lib/libzutil/zutil_import.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
+ lib/libzutil/os/linux/zutil_import_os.c | 11 ++++++++++-
+ man/man8/zpool.8                        |  6 ++++++
+ 2 files changed, 16 insertions(+), 1 deletion(-)
 
 diff --git a/lib/libzutil/zutil_import.c b/lib/libzutil/zutil_import.c
-index e82744383dc..8c4d8c5cb5c 100644
+index 811eae397c9..e51004edc68 100644
 --- a/lib/libzutil/zutil_import.c
 +++ b/lib/libzutil/zutil_import.c
-@@ -58,6 +58,7 @@
- #endif
+@@ -53,6 +53,7 @@
+ #include <libgen.h>
  #include <stddef.h>
  #include <stdlib.h>
 +#include <stdio.h>
  #include <string.h>
  #include <sys/stat.h>
  #include <unistd.h>
-@@ -1653,15 +1654,22 @@ zpool_open_func(void *arg)
+@@ -181,17 +182,25 @@ zpool_open_func(void *arg)
+ 	if (rn->rn_labelpaths) {
+ 		char *path = NULL;
  		char *devid = NULL;
++		char *env = NULL;
  		rdsk_node_t *slice;
  		avl_index_t where;
-+		char *env;
 +		int timeout;
  		int error;
  
@@ -54,9 +61,10 @@ index e82744383dc..8c4d8c5cb5c 100644
  			return;
  
 +		env = getenv("ZPOOL_IMPORT_UDEV_TIMEOUT_MS");
-+
-+		if ((env == NULL) || sscanf(env, "%d", &timeout) != 1)
++		if ((env == NULL) || sscanf(env, "%d", &timeout) != 1 ||
++		    timeout < 0) {
 +			timeout = DISK_LABEL_WAIT;
++		}
 +
  		/*
  		 * Allow devlinks to stabilize so all paths are available.
@@ -65,4 +73,21 @@ index e82744383dc..8c4d8c5cb5c 100644
 +		zpool_label_disk_wait(rn->rn_name, timeout);
  
  		if (path != NULL) {
- 			slice = zfs_alloc(hdl, sizeof (rdsk_node_t));
+ 			slice = zutil_alloc(hdl, sizeof (rdsk_node_t));
+diff --git a/man/man8/zpool.8 b/man/man8/zpool.8
+index 467d2411d40..df30b7ca05c 100644
+--- a/man/man8/zpool.8
++++ b/man/man8/zpool.8
+@@ -2813,6 +2813,12 @@ Similar to the
+ option in
+ .Nm zpool import .
+ .El
++.Bl -tag -width "ZPOOL_IMPORT_UDEV_TIMEOUT_MS"
++.It Ev ZPOOL_IMPORT_UDEV_TIMEOUT_MS
++The maximum time in milliseconds that
++.Nm zpool import
++will wait for an expected device to be available.
++.El
+ .Bl -tag -width "ZPOOL_VDEV_NAME_GUID"
+ .It Ev ZPOOL_VDEV_NAME_GUID
+ Cause
diff --git a/sys-fs/zfs/zfs-0.8.1.ebuild b/sys-fs/zfs/zfs-0.7.13-r2.ebuild
index fdb0ed3deb3f..928b6e1c5327 100644
--- a/sys-fs/zfs/zfs-0.8.1.ebuild
+++ b/sys-fs/zfs/zfs-0.7.13-r2.ebuild
@@ -1,61 +1,44 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+if [ ${PV} == "9999" ] ; then
+	inherit git-r3 linux-mod
+	AUTOTOOLS_AUTORECONF="1"
+	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
+else
+	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
+	KEYWORDS=""
+fi
 
-inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev usr-ldscript
+inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-single-r1 systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://zfsonlinux.org/"
 
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
-fi
-
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
-IUSE="custom-cflags debug kernel-builtin python +rootfs test-suite static-libs"
+IUSE="custom-cflags debug kernel-builtin +rootfs systemd test-suite static-libs"
+RESTRICT="test"
 
 COMMON_DEPEND="
-	${PYTHON_DEPS}
 	net-libs/libtirpc
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
 	virtual/awk
-	python? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
 "
-
-BDEPEND="${COMMON_DEPEND}
+DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
 "
 
 RDEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
 	!=sys-apps/grep-2.13*
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
+	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
 	!sys-fs/zfs-fuse
 	!prefix? ( virtual/udev )
-	sys-fs/udev-init-scripts
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-boot/grub-2.00-r2:2
-		!<sys-kernel/genkernel-3.5.1.1
-		!<sys-kernel/genkernel-next-67
-		!<sys-kernel/bliss-initramfs-7.1.0
-		!<sys-kernel/dracut-044-r1
-	)
 	test-suite? (
 		sys-apps/util-linux
 		sys-devel/bc
@@ -64,22 +47,34 @@ RDEPEND="${COMMON_DEPEND}
 		sys-fs/mdadm
 		sys-process/procps
 		virtual/modutils
-	)
+		)
+	rootfs? (
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-boot/grub-2.00-r2:2
+		!<sys-kernel/genkernel-3.5.1.1
+		!<sys-kernel/genkernel-next-67
+		!<sys-kernel/bliss-initramfs-7.1.0
+		!<sys-kernel/dracut-044-r1
+		)
+	sys-fs/udev-init-scripts
 "
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RESTRICT="test"
+AT_M4DIR="config"
+AUTOTOOLS_IN_SOURCE_BUILD="1"
 
-PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
+PATCHES=( "${FILESDIR}/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch" )
 
 pkg_setup() {
+	python-single-r1_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
+			# recheck that we don't have usblp to collide with libusb
 			if use test-suite; then
 				if linux_chkconfig_present BLK_DEV_LOOP; then
 					eerror "The ZFS test suite requires loop device support enabled."
@@ -88,7 +83,7 @@ pkg_setup() {
 					eerror "in /usr/src/linux/.config or"
 					eerror "    Device Drivers --->"
 					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
+					eerror "            [ ] Loopback device support"
 				fi
 			fi
 		fi
@@ -96,36 +91,19 @@ pkg_setup() {
 }
 
 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
-
 	# Update paths
 	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
 		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
 		-e "s|/sbin/parted|/usr/sbin/parted|" \
 		-i scripts/common.sh.in || die
 
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
+	autotools-utils_src_prepare
 }
 
 src_configure() {
 	use custom-cflags || strip-flags
-
-	local myconf=(
+	local myeconfargs=(
 		--bindir="${EPREFIX}/bin"
-		--enable-systemd
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
 		--sbindir="${EPREFIX}/sbin"
 		--with-config=user
 		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
@@ -135,59 +113,47 @@ src_configure() {
 		--with-systemdunitdir="$(systemd_get_systemunitdir)"
 		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
 		$(use_enable debug)
-		$(use_enable python pyzfs)
+		$(use_enable systemd)
 	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
+	autotools-utils_src_configure
+
+	# prepare systemd unit and helper script
+	cat "${FILESDIR}/zfs.service.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs.service" || die
+	cat "${FILESDIR}/zfs-init.sh.in" | \
+		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
+			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
+		> "${T}/zfs-init.sh" || die
 }
 
 src_install() {
-	default
-
+	autotools-utils_src_install
 	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
+	use test-suite || rm -rf "${ED}usr/share/zfs"
 
-	use test-suite || rm -rf "${ED}/usr/share/zfs"
-
-	dobashcomp contrib/bash_completion.d/zfs
+	newbashcomp "${FILESDIR}/bash-completion-r1" 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
+	exeinto /usr/libexec
+	doexe "${T}/zfs-init.sh"
+	systemd_dounit "${T}/zfs.service"
 
-	# enforce best available python implementation
-	python_setup
+	# enforce selected python implementation
 	python_fix_shebang "${ED}/bin"
 }
 
 pkg_postinst() {
-	if has_version "<=sys-kernel/genkernel-3.5.3.3"; then
-		einfo "genkernel version 3.5.3.3 and earlier does NOT support"
-		einfo " unlocking pools with native zfs encryption enabled at boot"
-		einfo " use dracut or genkernel-9999 if you requre this functionality"
-	fi
-
-	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
+	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 [[ -e "${EROOT}/etc/runlevels/boot/zfs" ]]; then
+	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
+	then
 		einfo 'The zfs boot script has been split into the zfs-import,'
 		einfo 'zfs-mount and zfs-share scripts.'
 		einfo
@@ -197,23 +163,24 @@ pkg_postinst() {
 		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
 		einfo 'runlevel while the zfs-share script is in the default runlevel.'
 
-		rm "${EROOT}/etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}/etc/init.d/zfs-import" \
-			"${EROOT}/etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}/etc/init.d/zfs-mount" \
-			"${EROOT}/etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}/etc/init.d/zfs-share" \
-			"${EROOT}/etc/runlevels/default/zfs-share"
+		rm "${EROOT}etc/runlevels/boot/zfs"
+		ln -snf "${EROOT}etc/init.d/zfs-import" \
+			"${EROOT}etc/runlevels/boot/zfs-import"
+		ln -snf "${EROOT}etc/init.d/zfs-mount" \
+			"${EROOT}etc/runlevels/boot/zfs-mount"
+		ln -snf "${EROOT}etc/init.d/zfs-share" \
+			"${EROOT}etc/runlevels/default/zfs-share"
 	else
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
+		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
 			einfo "You should add zfs-import to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
+		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
 			einfo "You should add zfs-mount to the boot runlevel."
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
+		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
 			einfo "You should add zfs-share to the default runlevel."
 	fi
 
-	if [[ -e "${EROOT}/etc/runlevels/default/zed" ]]; then
+	if [ -e "${EROOT}etc/runlevels/default/zed" ]
+	then
 		einfo 'The downstream OpenRC zed script has replaced by the upstream'
 		einfo 'OpenRC zfs-zed script.'
 		einfo
@@ -221,17 +188,18 @@ pkg_postinst() {
 		einfo 'convenience, it has been automatically removed and the zfs-zed'
 		einfo 'script that replaced it has been configured to start.'
 
-		rm "${EROOT}/etc/runlevels/boot/zed"
-		ln -snf "${EROOT}/etc/init.d/zfs-zed" \
-			"${EROOT}/etc/runlevels/default/zfs-zed"
+		rm "${EROOT}etc/runlevels/boot/zed"
+		ln -snf "${EROOT}etc/init.d/zfs-sed" \
+			"${EROOT}etc/runlevels/default/zfs-zed"
 	else
-		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
+		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
 			einfo "You should add zfs-zed to the default runlevel."
 	fi
 
-	if [[ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]]; then
+	if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
+	then
 		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
-		rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
+		rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
 	fi
 
 	systemd_reenable zfs-zed.service
@@ -241,10 +209,12 @@ pkg_postinst() {
 	systemd_reenable zfs-share.service
 	systemd_reenable zfs-import.target
 	systemd_reenable zfs.target
+	systemd_reenable zfs.service
 }
 
 pkg_postrm() {
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
+	if ! use kernel-builtin && [ ${PV} = "9999" ]
+	then
 		remove_moduledb
 	fi
 }
diff --git a/sys-fs/zfs/zfs-0.8.2-r1.ebuild b/sys-fs/zfs/zfs-0.8.2-r2.ebuild
index 55c311aac94b..55c311aac94b 100644
--- a/sys-fs/zfs/zfs-0.8.2-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.8.2-r2.ebuild
author	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-12-15 18:09:03 +0000
commit	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (patch)
tree	4a67d50a439e9af63947e5f8b6ba3719af98b6c9 /sys-fs
parent	b284a3168fa91a038925d2ecf5e4791011ea5e7d (diff)