gentoo resync : 03.11.2019

64 files changed, 921 insertions, 971 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 8623d4b1fa63..b2ff1cdc504e 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index f530cadc809c..e68d5ebba7c9 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -8,8 +8,9 @@ DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b09
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
 DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5
 DIST btrfs-progs-v5.1.1.tar.xz 2041940 BLAKE2B ca032cf17e78e5892788b677b5a0fead7cf1108fd464facb48e713b259c8c75f8b7714377f75e7b9e595c7c8fa5927fa37d11f43f51e4d898698f9fc5d26a808 SHA512 0f7582893e76d73ac7c0061dd43f65c465ca6308d3447a4e12f95397edcf3b74cc4dd3fad4a139739322650a0d228c4b2d43eb6eb9a09eb92f8fa2a5ef1519cd
-DIST btrfs-progs-v5.2.1.tar.xz 2049856 BLAKE2B 841a506f07f1d965c3443fbea39c81a833c41ce1215db3feb41650c964a3a6ba8f5f964c61838921f2df90f6de7fdb057f0d41856549f26b9c4d580b4707d18f SHA512 7da495df7dd2ef1c7961eda132c5f587785c7a91d2531a0c5ed3917f07c708d02acd48681520c10c375edd7a8a7ecab371e806077ccae7899eb41a5ddea89c59
 DIST btrfs-progs-v5.2.2.tar.xz 2073592 BLAKE2B 6c477ad2599a2f629b5d85a28dee7286af744e4d684ff9a0e9b5ae433b7b1450ac66caa41103781d159c172d8c6fdf26f4590d1476e457f09d7f52d6ea87e481 SHA512 97eaf3dd8ce1629f0acace23f3eedc7c6942299ddb65cdc3b0a7b623026db1063d72f3c1b6297782705e08dfc4c361384e17b5e27a16e756cd0a81e35e79aa9c
+DIST btrfs-progs-v5.3.1.tar.xz 2077644 BLAKE2B f2943fd2215cfc65095e361824deb862c1934bb734c0f3073d8d0a7cb40c606e9e8054e36ae467f6d67f3ed58120493b9515f6a1d0d1062f864dd44521d1bab1 SHA512 7e7ac18a1ced5a8e5db7c0651ac438a48242fb4ca045b944527ed07ac91e87397dbab62b99d67d782501a632f4178db605e81912dfa48ac831d07177f96876fa
+DIST btrfs-progs-v5.3.tar.xz 2076996 BLAKE2B 31bfb9b1fd12cc4607e565c58ea674050b89b4f5730da59254dc84e99ea1b8c40132be3025b7ac3e0b9a74db3ff9fc5b4d9afa2dce7604f2df7915114c0e37b0 SHA512 a1676a5f7d978bc32a5967de7be4b1010acf62350f44199a1595d50bfe83a79c790ed5cfa2b81656982c9ab7fc4a753786c909d59f9b0b068e772f1ffafe0bca
 EBUILD btrfs-progs-3.18.2.ebuild 1264 BLAKE2B 097f4c5717fb4824868811c82bae7a382a4fa7afe15eafe647945e5ba9e72a0157ab9d5bef694bd8836ef46396e79382ceac74c341b26b2a5cc957fef03a94f1 SHA512 152cd4da549f7b2af7fb90b4e06bfa52e1cc06f64a704e72e1172fd39b667fb6e083367901f857334590018845243ec56c4cd03a9886faa80fdc054f1586a148
 EBUILD btrfs-progs-4.1.2.ebuild 1891 BLAKE2B 6164d918d4452a4d91ee812a84fe7a2859fd303396ccacde0fa2dcd5fe7ed1e974bee47e9deece3b621e62d8176379d45b12c2ce6b52497d406425781cb35a3a SHA512 9f0771068eae7ec9bd54545d1f7d1146e9c1a221599dacb40c15106f73ea15bded433adc13dda8d2f7e302b2b4a989fd3a4442904ab222901eab70652e43d28c
 EBUILD btrfs-progs-4.10.2.ebuild 2195 BLAKE2B b2fc7318648463c6a9dd12fdca7f92fd4e6f03c85b84cc5e25f6f7ce8c471e8c2830cae58125145a794f42f17724edd82aaf0de71ad73db05b6e4b32da0ea177 SHA512 ad7aee9448e252f09291ddf82ca9e4c992cbb7b3cf25dfe968b3ed1d5a3958b6c63289f49d829621f2d08bbe3fe75f8e8a1888a6802c186db2a1617576a5b2c8
@@ -19,7 +20,8 @@ EBUILD btrfs-progs-4.19.ebuild 2895 BLAKE2B abdc15e7c275830ef675616ca76117145b21
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
 EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
 EBUILD btrfs-progs-5.1.1.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
-EBUILD btrfs-progs-5.2.1.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
 EBUILD btrfs-progs-5.2.2.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
+EBUILD btrfs-progs-5.3.1.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
+EBUILD btrfs-progs-5.3.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
 EBUILD btrfs-progs-9999.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
 MISC metadata.xml 759 BLAKE2B 3f94ebaadb23c54121e8ffa1b80549b9e8a9d977d26ddcfdd8772e549e55fc762fcca5c8e2374a562dd9992086949eff626be71aa6da8326f8847cbc4f791fb7 SHA512 ababf03834be253af5402e167e7883fc73c6ad47198369eba02557e07ec8baaa81140837315e98979dc4b95ca160d2d984e970acdbf0ea4db9c2a9e9deddc9a8
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.2.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.3.1.ebuild
index 4680b387969c..4680b387969c 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.2.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.3.1.ebuild
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.3.ebuild
new file mode 100644
index 000000000000..4680b387969c
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.3.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-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/cryfs/Manifest b/sys-fs/cryfs/Manifest
index f0f9e765f913..3ede03d59c76 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 2176 BLAKE2B 0d5d52ad79243859d2cd741db459d79d3ac9f5c69c8a77c3b5c0b60f5ea7e53e05f40075d9c45167e62c59667cbdc93439d3b82eee46c9cda1f361bccf328b8c SHA512 2fb435ce767b2844185fecc504adc2af1037c9048bfc64e2feb906c1312c36a98d1a09c12480deb810273ec6f34325597daf44e324fbe90fbb1763ef17b22757
-EBUILD cryfs-0.9.9.ebuild 2416 BLAKE2B 3ae72de8b7e913cbda42205d4eb60038e63b036cccf8924bb40c182c2bf89e18c672ce128d536aa61209b7c87c7de32c8a01daca968040ff2b8b8ea9cfc5692b SHA512 2c46dac9921a85eaf5a848a6a8cc84972f94713dc7af73fdc61f17f65b6adbdc07d698d2123bd9b0d00da479821981eabf3313d094af0cc2c61b9e5f3e590fd7
-EBUILD cryfs-9999.ebuild 2226 BLAKE2B 944388cd9bd2679567c2ee1b986a24b6b2b9781daa887329d4a2f9a457cf71dfe93bcbcdc66fc0d75a0e061c5b5440bfdb2bae13b5e58845ae54ccd1f97c5d09 SHA512 9d2397a6a4ef1cfc684fb751d891f725cba405509088805a4da1f8c5c32e6d00496b722140ecafca36ebf123dc116d89ec58df1625a0ffdc84bb697c3461c5b7
+EBUILD cryfs-0.10.2.ebuild 2256 BLAKE2B 2e9805db0bea6aecdf7c423dbd28e04ff2bd05037e93d7d7d5be3e4f3c06747edeee53a2fe6ff1f68a61d095a7155495d16612b7f47949e4fd9fbbeaa8ede1c5 SHA512 f589cee37d595d567248579d701e88ed36560aa767d8b468e7c98b2bccce602417fe2c1105af9a40d43257e74bcb35860221404124ba2bc06ff8acc1d0ca1659
+EBUILD cryfs-0.9.9-r1.ebuild 2417 BLAKE2B 64ea74e6da4876f568c2d419958c24f52f6be192034885517470557f06e2431ed43a87e24d02d7e73fee72b2f6c8cd81c11ed0f6a01a2a96a6055a987527070f SHA512 d69ffe66b45080e33b5ea58b33cf36541f6fe723387ba0a83d6ca7cdad55c46bbbc6002bcba882b9c18472ad109531083a258ea3228b36135785a95aba007cb1
+EBUILD cryfs-9999.ebuild 2308 BLAKE2B 1bded931f5fc1d0ab2d518e67100db4e4acbfdfcfee31481e2e16cf213542fced29d9704119fa606eea2d4419a5c403a0c843c742ff919adb7a0f112279be3f5 SHA512 5650bea45fd38dd81eeb5ead4eea51d2b6e9259f25c85ef4fb37e611cd5142ad93d6b11d2e1cd63f7b91b1802b5f46e7b9c336a86a4bc364b493465ac636c5b7
 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 56ffbdfc5458..c9fb983741fd 100644
--- a/sys-fs/cryfs/cryfs-0.10.2.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
 else
 	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	S="${WORKDIR}"
 fi
 
@@ -57,6 +57,10 @@ src_prepare() {
 	# remove tests that require internet access to comply with Gentoo policy
 	sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \
 		-i test/cpp-utils/CMakeLists.txt || die
+
+	# /dev/fuse access denied
+	sed -e "/CliTest_IntegrityCheck/d" \
+		-i test/cryfs-cli/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -74,16 +78,13 @@ src_configure() {
 
 src_test() {
 	local TMPDIR="${T}"
-	addread /dev/fuse
-	addwrite /dev/fuse
 	local tests_failed=()
 
-	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore fspp cryfs cryfs-cli ; do
+	# fspp fuse tests hang, bug # 699044
+	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore cryfs cryfs-cli ; do
 		"${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" )
 	done
 
-	adddeny /dev/fuse
-
 	if [[ -n ${tests_failed[@]} ]] ; then
 		eerror "The following tests failed:"
 		eerror "${tests_failed[@]}"
diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild
index 6410d2cde5d7..d3e493e3ecb9 100644
--- a/sys-fs/cryfs/cryfs-0.9.9.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild
@@ -27,10 +27,10 @@ else
 	S="${WORKDIR}"
 fi
 
-RDEPEND="<dev-libs/boost-1.70:=
+RDEPEND=">=dev-libs/boost-1.56:=
 	>=dev-libs/crypto++-5.6.3:=
 	net-misc/curl:=
-	>=sys-fs/fuse-2.8.6:=
+	>=sys-fs/fuse-2.8.6:0
 	!libressl? ( dev-libs/openssl:0= )
 	libressl? ( dev-libs/libressl:= )"
 DEPEND="${RDEPEND}
diff --git a/sys-fs/cryfs/cryfs-9999.ebuild b/sys-fs/cryfs/cryfs-9999.ebuild
index d401918aecc4..5cd7961f3996 100644
--- a/sys-fs/cryfs/cryfs-9999.ebuild
+++ b/sys-fs/cryfs/cryfs-9999.ebuild
@@ -53,6 +53,10 @@ src_prepare() {
 	# remove tests that require internet access to comply with Gentoo policy
 	sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \
 		-i test/cpp-utils/CMakeLists.txt || die
+
+	# /dev/fuse access denied
+	sed -e "/CliTest_IntegrityCheck/d" \
+		-i test/cryfs-cli/CMakeLists.txt || die
 }
 
 src_configure() {
@@ -69,16 +73,13 @@ src_configure() {
 
 src_test() {
 	local TMPDIR="${T}"
-	addread /dev/fuse
-	addwrite /dev/fuse
 	local tests_failed=()
 
-	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore fspp cryfs cryfs-cli ; do
+	# fspp fuse tests hang, bug # 699044
+	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore cryfs cryfs-cli ; do
 		"${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" )
 	done
 
-	adddeny /dev/fuse
-
 	if [[ -n ${tests_failed[@]} ]] ; then
 		eerror "The following tests failed:"
 		eerror "${tests_failed[@]}"
diff --git a/sys-fs/cryptmount/Manifest b/sys-fs/cryptmount/Manifest
index 4c1b3224c6b5..88b36a93e906 100644
--- a/sys-fs/cryptmount/Manifest
+++ b/sys-fs/cryptmount/Manifest
@@ -1,3 +1,3 @@
 DIST cryptmount-5.3.1.tar.gz 748020 BLAKE2B 63c66717ed8a8ede983894564576d26720a571b47bd33f3cd160596d831c017c7239b307eb9fb8112c6a51f91799117a47392675f9fe53c0286ada84887d528e SHA512 c4bfb7a2bd2f672dfed014d3a4b1feaa4d20237f9b658ea981a0a054e83ad4d0282089a006ceb769ee05e0cf6ecd004c97b48d69973ed630330e77bf13925680
-EBUILD cryptmount-5.3.1.ebuild 1710 BLAKE2B b456d128fa175c855938b09c308d273b8f1e520f108b2bf6d3a56669f833a1c220aaefe15b01799a89ef0b6174ab792fa36e4afa82b59a2354653d63da6bb38e SHA512 133b17fa9557d9084954441a6bedf63f6b538f96b7ca3beb22cd298c75cdff1bec0e0bead8afcecaae1f15ef0ffc35ac36736bfeeb5a8204ed4d1a0eebfed2dd
+EBUILD cryptmount-5.3.1.ebuild 1709 BLAKE2B da79362593365d5f651db76728d597190f648206ac4f161bafb9bf378f2b0534d597bdac335a1e56e5ce4a852de0227bf96d9fb233bd9326d643e8d9873fb76e SHA512 10dfe4ef20e77839695313678635133a5f0bbf74e13017e6b787af60c46b3b29e0114ae64cb7aaa476351558054e91f538a8e7f2818a67992589c90c961ad52e
 MISC metadata.xml 2231 BLAKE2B f4b90363aa03426bcbf4a908d226ae1c5a1256fc62007005c58e97607bc2d0a984b9fd1fe78460d236c1d11ffd2bc3dd387fc5b97910c32fc7d21d67556379b2 SHA512 ff5bb67a85f5312b1df9be3a596fcfa08a7e7089df44d50efb63603946c8cfac9e6061519469b1b7126222b6ad7479110f092f629ea05ce9e0692caf52e463c4
diff --git a/sys-fs/cryptmount/cryptmount-5.3.1.ebuild b/sys-fs/cryptmount/cryptmount-5.3.1.ebuild
index 26f6030e5f5c..68573f304edb 100644
--- a/sys-fs/cryptmount/cryptmount-5.3.1.ebuild
+++ b/sys-fs/cryptmount/cryptmount-5.3.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="argv0switch cswap fsck +gcrypt +largefile mount +nls +luks +openssl selinux systemd udev"
 REQUIRED_USE="
 	luks? ( gcrypt )
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index edf547dd63fd..d72025c842b0 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -5,15 +5,9 @@ AUX 2.0.5-dmcrypt.rc 8827 BLAKE2B d4604b8f78d6ab6b4b64b6be64f8706b01aec320ef0c61
 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
-DIST cryptsetup-2.0.5.tar.xz 10476304 BLAKE2B cf1e335fce48a7bf835b2008dfc0a96ef35d344e2c9f6a0a5a2ff45644f9015311e99b8f9e05b0b23cad69d74f91dd1b7cdd766560fb6504e7453d6e46bea186 SHA512 bac3f5fde1be02d325c097f85e77aef44ce764c1bca7f0554cedd69b9444e5a5529f11b9ae74d36dc1977e88e11422a58dfa17e48559eac7f5e6c4ce332409ae
-DIST cryptsetup-2.0.6.tar.xz 10621424 BLAKE2B ecda2cb3c0a8a46b69519ab9ea9a1ece44fb21602cbce0751e52a16e5e493c7772fdc62c1151b95a783a847d9afd5a64f64bcac6673acba4bb90a417047c93cb SHA512 1fdb9068fe2b5825cef65323a9b788b5e043c1000e614e47e2b21ab3969e416653580aba639755ba936718ad612b986768029df5e07f3fa191db2bf29d2501ef
-DIST cryptsetup-2.1.0.tar.xz 10662576 BLAKE2B c79b24c986d5925aed31eddf8f271c3d0f12c89b3f99f953cfa39fe0d9dca2ab3dd2f6ea22141aca0148d6d533d197378b011561075ca26a14ca2e90500a1689 SHA512 f1b68e4d9d0ca2361fe9bdd51c60630dd4ab7a689b7be7756edf4dee12929d2356dd0658c9b940ffe27c033ef289efaf49daf21d250d37fdfa15394b5d821928
-DIST cryptsetup-2.2.0.tar.xz 10763072 BLAKE2B 0ffc228bde15e3427f38402b7411207d1402dcd648903d9c1565689462103c07ab23c4d5c1439674693cf7ed6d14cf62c8a2d19e266da60658c91a37549ba74e SHA512 903ef5811999ce3836bc348334192a432a971f94aa9c850491c8ba856a2c87385f75abc9296b0913ee6785149b8a7bd40457ad07e01f4ac7a1e62e97c7b18e6e
 DIST cryptsetup-2.2.1.tar.xz 10803072 BLAKE2B 00ee2eff11e3054a40a4d9036c1786422288ff4c61ff497cb7039721dde80ca337cab067faa4f70721de3aded465f612e9328a6b533ff7c9b67d1069fe435bed SHA512 e4b45b24ad63cc4c22cb816f04cf4af71431e15134a8208af1a24e64ded54c07aba6c43521c063f03429304e0610b6cce849332564d69a46934fb7bae8e99718
-EBUILD cryptsetup-1.7.5-r1.ebuild 4044 BLAKE2B 32e22e5295e0035b6cbd01e7e6751928ac1c2b7343695155d306678512d19d8dadc7325fbbdace89d3c0bb6b01e5a3bc73054915cba2487c4de042ca7ec510dd SHA512 a71a061ba0107f07def2bb5a8eda505263229459ef868cfe2257743cc747241e9dbcd4c9293432c823b34b8d31f852a209a323d49c8df90b838c10707cda3938
-EBUILD cryptsetup-2.0.5-r1.ebuild 4162 BLAKE2B 5b65ac3c68dac41411627ab39557d964d6a3425f575b306646bf24f0fe60bd35a2f3222dfbd7e0c568fcc7d1549c84715bfbdc407f64165813c76702453a68b3 SHA512 19a9bf2bdadfdd9b4b96044e8dac2bda5d8aa2336f5424824aa0b2e3dad89b9852520e1854c090e0b9ba7c12611646b741d7de2bd4bf8f730a204f1a7f9281ac
-EBUILD cryptsetup-2.0.6.ebuild 4178 BLAKE2B 53304004ace97b7d46f69a0181e935dde8835ab331a21bf060c0245b7be2d2424596aee9d9aa8e0831cb8350985fdd261299bdac65e17cc2fe48936f3aef17ed SHA512 1dd6b68fa11edd8a4fa0605c4811b720d8e813e4570e93d622889f1af71eb99964c0f32b375b3050f891bc8386a95035406586a27640e04f9128ae6381b35614
-EBUILD cryptsetup-2.1.0.ebuild 4422 BLAKE2B 0f433ed9010922a7f0ba6438a8d3eb170188f7f587882f70b40d5b171a80cfc5f4d30338eff4f3232672ad9319a5bd793bced759cc872c95843be19e1f1d2aa9 SHA512 1322207a156465b6c685f35cd88bdb6b1800992471221f85165db2842b30cd8f376c885bf73016b3c614d94cebac02794a51d768d7505093cb91ec49ecfc81d4
-EBUILD cryptsetup-2.2.0.ebuild 4241 BLAKE2B 918f60d68ee495816e7ab396f3d85468fa563cc7ea4d465610750b8b089920c21cb2a96d721083ba3f40d733fb0213f5ed2c2b5e0b626813a59f8d2a8b45c544 SHA512 f915c809be5f46f91c04d120444851231312f8ccb9d079d227be215a3bc81c114711d1ccf24cc7e3ba6560eebe29552d39f4a2d73ed915b793721531b6648515
-EBUILD cryptsetup-2.2.1.ebuild 4231 BLAKE2B 594250d2986eb59d30149b5bda650853a29c10ef140950318b77baaf20e489e9ea7f1d5cd7437fcb77d8729a9001a41932c46fc1fc4f620c75a4cfbcf79905be SHA512 5ceff9d12bce92d3d227f9efbe72322367a76239a5f1bf1c90f28ca7f8ce174da421d9e99ee8ad1872045451c37948e5f20ed40cabecbff17e7b962a3e4d9fae
+DIST cryptsetup-2.2.2.tar.xz 10808684 BLAKE2B d8d864d9ec2a5d646706d3ba003a21aa83d2373ca7afed5663c5167172116ea9342704483559f49c06979cbe0f6ac5670f4e9baae88ab908423b793043ba4a68 SHA512 d04123a622438ecbee28145cbdc71886b6f13db87df1c67522bff6e6e3cba817e895e2d085bdb08c78f9cafba557b1203177811a0c316ccd9b7c19939f3fc851
+EBUILD cryptsetup-1.7.5-r1.ebuild 4047 BLAKE2B 89298062a22226a385555fe6f65c6f0f24f36b6c749f95e76122f05f5974cae26ca0a4c36cd1a1521239626cdadf89ad9087486ddcffce725f7f41f6fd0b4c74 SHA512 84dbcf22be795fe9c4b9f958dc0df5c99c8597c4d618673ac30e2f5597a60e44c09fcbc830c9f691a999ae019fe1af92066e7ecd5f858a0ee3c95451eea8788b
+EBUILD cryptsetup-2.2.1-r1.ebuild 4233 BLAKE2B e407b1f989ea25d86f535387e580f82584b3e123fccae3e059721b0fb341b716d4f667d3b0319206dec4b3cf4b867fad7f521573f254a83e322eb8319d8017de SHA512 eaba899c59dde9e345f00bbdbaa27218aaad44a75401716aed663dfef1e273136cd205087468c73fe9aeec7ad0c39c8d788d451a08ea48c0c5547d7db0eed802
+EBUILD cryptsetup-2.2.2.ebuild 4244 BLAKE2B c3ea10ab5824f1f60e19256a19c1726025f277d968203db89043adbd6289ad88ce786547540ad58a21acf51695e842ea0e9f6730e3f34f6e1315a0c26a6331ad SHA512 a723ce4032546dc97d58bcfa3845fa8d6aa6a7c437674778056f23c644d0b5c1020c4cb91e2f7d5ca8a5d6a0e94ac24840519b29d281bc0308cfb6bbea2a66b8
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
index 7a00cb362ff9..b37162bcba61 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
@@ -34,12 +34,12 @@ LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
 	)
 	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
 	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
+	udev? ( virtual/libudev[static-libs(-)] )"
 # We have to always depend on ${LIB_DEPEND} rather than put behind
 # !static? () because we provide a shared library which links against
 # these other packages. #414665
 RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\(+\)\]}
+	${LIB_DEPEND//\[static-libs\([+-]\)\]}
 	python? ( ${PYTHON_DEPS} )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
deleted file mode 100644
index c5983da88110..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit autotools python-single-r1 linux-info libtool eapi7-ver
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~amd64 ~arm64 ~hppa ~mips ~ppc64 ~s390 ~sh ~sparc ~x86"
-CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality python reencrypt static static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-	dev-libs/json-c:=[static-libs(+)]
-	dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
-	argon2? ( app-crypt/argon2:=[static-libs(+)] )
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? (
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:=[static-libs(+)] )
-	)
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\(+\)\]}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	use python && python_setup
-
-	# We disable autotool python integration so we can use eclasses
-	# for proper integration with multiple python versions.
-	local myeconfargs=(
-		--disable-internal-argon2
-		--enable-shared
-		--sbindir=/sbin
-		# for later use
-		# --with-default-luks-format=LUKS2
-		--with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
-		$(use_enable argon2 libargon2)
-		$(use_enable nls)
-		$(use_enable pwquality)
-		$(use_enable python)
-		$(use_enable reencrypt cryptsetup-reencrypt)
-		$(use_enable static static-cryptsetup)
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable !urandom dev-random)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-
-	default
-}
-
-src_install() {
-	default
-
-	if use static ; then
-		mv "${ED%}"/sbin/cryptsetup{.static,} || die
-		mv "${ED%}"/sbin/veritysetup{.static,} || die
-		use reencrypt && { mv "${ED%}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
-	fi
-	find "${ED}" -name "*.la" -delete || die
-
-	dodoc docs/v*ReleaseNotes
-
-	newconfd "${FILESDIR}"/2.0.5-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/2.0.5-dmcrypt.rc dmcrypt
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
deleted file mode 100644
index 4a4c85f4721e..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
-
-inherit autotools python-single-r1 linux-info libtool eapi7-ver
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-CRYPTO_BACKENDS="+gcrypt kernel nettle openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality python reencrypt static static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-	dev-libs/json-c:=[static-libs(+)]
-	dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
-	argon2? ( app-crypt/argon2:=[static-libs(+)] )
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? (
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:=[static-libs(+)] )
-	)
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\(+\)\]}
-	python? ( ${PYTHON_DEPS} )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	use python && python_setup
-
-	# We disable autotool python integration so we can use eclasses
-	# for proper integration with multiple python versions.
-	local myeconfargs=(
-		--disable-internal-argon2
-		--enable-shared
-		--sbindir=/sbin
-		# for later use
-		# --with-default-luks-format=LUKS2
-		--with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
-		$(use_enable argon2 libargon2)
-		$(use_enable nls)
-		$(use_enable pwquality)
-		$(use_enable python)
-		$(use_enable reencrypt cryptsetup-reencrypt)
-		$(use_enable static static-cryptsetup)
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable !urandom dev-random)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-
-	default
-}
-
-src_install() {
-	default
-
-	if use static ; then
-		mv "${ED%}"/sbin/cryptsetup{.static,} || die
-		mv "${ED%}"/sbin/veritysetup{.static,} || die
-		use reencrypt && { mv "${ED%}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
-	fi
-	find "${ED}" -name "*.la" -delete || die
-
-	dodoc docs/v*ReleaseNotes
-
-	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild
deleted file mode 100644
index 5bd8ce20ba61..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools linux-info libtool eapi7-ver
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="https://gitlab.com/cryptsetup/cryptsetup/blob/master/README.md"
-SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0/12" # libcryptsetup.so version
-[[ ${PV} != *_rc* ]] && \
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
-# cryptsetup does _not_ have a libressl backend. We only have this for REQUIRED_USE
-# and change "libressl" to "openssl" in our econf call.
-CRYPTO_BACKENDS="gcrypt kernel libressl nettle +openssl"
-# we don't support nss since it doesn't allow cryptsetup to be built statically
-# and it's missing ripemd160 support so it can't provide full backward compatibility
-IUSE="${CRYPTO_BACKENDS} +argon2 libressl +luks1_default nls pwquality reencrypt static static-libs +udev urandom"
-REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
-	static? ( !gcrypt )" #496612
-
-LIB_DEPEND="
-	dev-libs/json-c:=[static-libs(+)]
-	dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	>=sys-apps/util-linux-2.31-r1[static-libs(+)]
-	argon2? ( app-crypt/argon2:=[static-libs(+)] )
-	gcrypt? ( dev-libs/libgcrypt:0=[static-libs(+)] )
-	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
-	openssl? (
-		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:=[static-libs(+)] )
-	)
-	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
-	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# !static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\(+\)\]}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	static? ( ${LIB_DEPEND} )"
-
-S="${WORKDIR}/${P/_/-}"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.4-fix-static-pwquality-build.patch )
-
-pkg_pretend() {
-	if ! use luks1_default ; then
-		ewarn "WARNING! WARNING! WARNING!"
-		ewarn "You have chosen LUKS2 as your default format."
-		ewarn "This can break LUKS1 backwards compatibility."
-		ewarn "Enable \"luks1_default\" USE flag if you need backwards compatibility."
-	fi
-}
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC ~CRYPTO_SHA256"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_SHA256="CONFIG_CRYPTO_SHA256:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	default
-	eautoreconf
-}
-
-src_configure() {
-	if use kernel ; then
-		ewarn "Note that kernel backend is very slow for this type of operation"
-		ewarn "and is provided mainly for embedded systems wanting to avoid"
-		ewarn "userspace crypto libraries."
-	fi
-
-	local x cryptobackend
-	for x in ${CRYPTO_BACKENDS//+/} ; do
-		use ${x} && cryptobackend="${x/libressl/openssl}"
-	done
-
-	local myeconfargs=(
-		--disable-internal-argon2
-		--enable-shared
-		--sbindir=/sbin
-		# for later use
-		--with-default-luks-format=LUKS$(usex luks1_default 1 2)
-		--with-tmpfilesdir="${EPREFIX%/}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=${cryptobackend}
-		$(use_enable argon2 libargon2)
-		$(use_enable nls)
-		$(use_enable pwquality)
-		$(use_enable reencrypt cryptsetup-reencrypt)
-		$(use_enable static static-cryptsetup)
-		$(use_enable static-libs static)
-		$(use_enable udev)
-		$(use_enable !urandom dev-random)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-
-	default
-}
-
-src_install() {
-	default
-
-	if use static ; then
-		mv "${ED%}"/sbin/cryptsetup{.static,} || die
-		mv "${ED%}"/sbin/veritysetup{.static,} || die
-		use reencrypt && { mv "${ED%}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
-	fi
-	find "${ED}" -name "*.la" -delete || die
-
-	dodoc docs/v*ReleaseNotes
-
-	newconfd "${FILESDIR}"/1.6.7-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.6.7-dmcrypt.rc dmcrypt
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild
index 6852efda5b51..ae160fa8d7fe 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.2.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.2.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.t
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
@@ -35,12 +35,12 @@ LIB_DEPEND="
 	)
 	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
 	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
+	udev? ( virtual/libudev[static-libs(-)] )"
 # We have to always depend on ${LIB_DEPEND} rather than put behind
 # !static? () because we provide a shared library which links against
 # these other packages. #414665
 RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\(+\)\]}"
+	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 BDEPEND="
diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
index 7ddcc20c3bcd..9c8f2b108340 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.2.2.ebuild
@@ -35,12 +35,12 @@ LIB_DEPEND="
 	)
 	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
 	sys-fs/lvm2[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
+	udev? ( virtual/libudev[static-libs(-)] )"
 # We have to always depend on ${LIB_DEPEND} rather than put behind
 # !static? () because we provide a shared library which links against
 # these other packages. #414665
 RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs\(+\)\]}"
+	${LIB_DEPEND//\[static-libs\([+-]\)\]}"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 BDEPEND="
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 99216393c05c..ad30fe48a366 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -14,5 +14,5 @@ DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bac
 EBUILD e2fsprogs-1.44.5.ebuild 3929 BLAKE2B 31e29eb9610406b1dc0c10e43be042976371be51ed6d17e28a09fdd6bc0fce2edf1c26abb931a891302e0dfc48aff681cd3eca31b5dfaa6dd54f001642f9ec5d SHA512 579423805a574f91fa6a3444e93fb23ca03914fceba3d27f33430472a2fb6b125f8b563227ccf9f4fa3ad0e658696350312f235207f0ca4cb69f59c497cccad7
 EBUILD e2fsprogs-1.45.2.ebuild 4095 BLAKE2B 6d34711ed7b09788c37ca2e3f7f9ba19a38277cfdbab4133e213eb3a7823c0f64c8aa5c233c69ee7581521cf650f13b9d5642a6273d1649d58090348d58dfb14 SHA512 b7bcab130d875d7302e3fea99687c47e06afc035e5c353495ebf8bfacbaf59723c6d546eca168ff1110f56f449e8a70067325f0e41d220a045eae4695acb6207
 EBUILD e2fsprogs-1.45.3.ebuild 4108 BLAKE2B 8f6aeb8fcac2bf80dc03baae754d68f3a0365bb9b9ffaf1db28971b73f87f77b551c7337545b7ae077ed17da3fa12cb635b7291d3ae71cebce6ca88aa918fecc SHA512 ba0c7c0a0ebfa2dab25bb4f5dda2834a7243c3d8a7d105bfcb41f7608da1b330578524c714fc476537ddfafccc042286d89b26e3d5d00f9e0a11f96ab09b20dd
-EBUILD e2fsprogs-1.45.4.ebuild 4096 BLAKE2B fb286104f103cf8866a1dd34bad382dca4d071abfccaa5efbb0d49a6f29232e1a8fb75d20dc40ffca344672f23946a7ae7f2267c43699f343b29523612efb7d3 SHA512 5531c90ec15a83376393276ed55f54b87c8cbf9d84d82b8e4ba90281059d99295a40bf45f487e903e0a6dc7b47ff9a21fb5aac682f78ce77a9ee601aff6e6a7a
+EBUILD e2fsprogs-1.45.4.ebuild 4095 BLAKE2B 6d34711ed7b09788c37ca2e3f7f9ba19a38277cfdbab4133e213eb3a7823c0f64c8aa5c233c69ee7581521cf650f13b9d5642a6273d1649d58090348d58dfb14 SHA512 b7bcab130d875d7302e3fea99687c47e06afc035e5c353495ebf8bfacbaf59723c6d546eca168ff1110f56f449e8a70067325f0e41d220a045eae4695acb6207
 MISC metadata.xml 569 BLAKE2B 0a09eb03e2d5f07a24f33d71a16d0e4cb7e12e5a03356b44127e964c712addfb5bb9d5bc3b26dc66c608544639b6a92ebe0dcc18c03b8820f50b6fabcc9c231b SHA512 fa3e24f0db835a5fb475d42874d3197bd30f0c1f606b66b1b3f285e61dd32624ae56014b37ee0de0a9ebfaf51dd2f06cc2f73f91a011c5314809f5d495d65e67
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild
index a8832433d81d..901d0170ae23 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="cron fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index f7ae3b283c27..895907194722 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,3 +1,5 @@
+DIST ecryptfs-utils-111_p20170609.tar.gz 1433722 BLAKE2B eeb8840e0b369d2eb420e7853629086cbf430daed2dbf3ed620f5c2489de711c9d8dc5c2b555db5d09b968df6d07da19b93ca46add3b7987d3ff1ad9f06adc69 SHA512 4788a35d68bbb6b769803754adad14d063564e6285edcec4d68df076e96c61550ab6487a1b84498e24e3f56f8c9fda6eb63a66d469d3e654834357c5e2b4c781
 DIST ecryptfs-utils_108.orig.tar.gz 659465 BLAKE2B a4497470e1aeb3122da1c612a4bb9a32bbae960fad165b5d30543ccaf5682d877927b881956e109c2910eb46e456470ffc0f8fc1f3766f6767741d28d05dc802 SHA512 856d8fac587921f1b5cd0b4ff269c7db8941b6b183506c5bc2e640a77994293f3e09ecfaef94f12c00f2378e756ecec252d3f59eebbabb4229105f8be87653ba
 EBUILD ecryptfs-utils-108-r3.ebuild 2028 BLAKE2B 49d699aab2800b77577054c730bc77c3bdb60c9284ab59f484220eda3e6038f42cece942233a92c150b8d2959c47df9813a1c8f0e6b20f5d747e56e35939f8d5 SHA512 d2cfaa289bc89df391c8a2f85fcf5bdd1134a5c497bb804e12f8ea968547e03741a5d86e9ecca1818ab98b05c868b06cf163709f231928d6d0b858adce9293de
+EBUILD ecryptfs-utils-111_p20170609.ebuild 2151 BLAKE2B 5ea76bd1ffbbfa7d70850dff7d0ff964c90710c55f05d7697590f729556c7f32c6b49dbe57a05d0ddc1076a29f5ea0eb86d903f5a1918cadcc5a593451009782 SHA512 d64c6fd9a37694dd4c7f1b88679d4442a49100672911310181b0b116c434d212a067e2c9ac01fbba7a97bcfa33aa0b51e3ea56216a695b037d5c79353e14a237
 MISC metadata.xml 727 BLAKE2B f84dadf31a97d3f4e30ba3ede03ace3ed2a327c94b8a30e25dd1e391c197a231924361d2c31fec85bd893e64540925d6ca943fde1c26b95d9db077a7615b768b SHA512 87eaf8fc34e2f5ca0a2c60aa0d051901f6353e65eb6f63e29e26594588c69dd5f14039a6153bd5bc295a06674d8bb625fa43ccfd7f334188d8333f307405ab5a
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609.ebuild
new file mode 100644
index 000000000000..10ff82ed8b3a
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic pam python-single-r1 linux-info autotools
+
+DESCRIPTION="eCryptfs userspace utilities"
+HOMEPAGE="https://launchpad.net/ecryptfs"
+SRC_URI="https://dev.gentoo.org/~bkohler/dist/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="doc gpg gtk nls openssl pam pkcs11 python suid tpm"
+
+RDEPEND=">=sys-apps/keyutils-1.5.11-r1:=
+	>=dev-libs/libgcrypt-1.2.0:0
+	dev-libs/nss
+	gpg? ( app-crypt/gpgme )
+	gtk? ( x11-libs/gtk+:2 )
+	openssl? ( >=dev-libs/openssl-0.9.7:= )
+	pam? ( sys-libs/pam )
+	pkcs11? (
+		>=dev-libs/openssl-0.9.7:=
+		>=dev-libs/pkcs11-helper-1.04
+	)
+	python? ( ${PYTHON_DEPS} )
+	tpm? ( app-crypt/trousers )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/gettext
+	>=dev-util/intltool-0.41.0
+	python? ( dev-lang/swig )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+
+	CONFIG_CHECK="~ECRYPT_FS"
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	mkdir -p "${S}" || die
+	tar -xf "${DISTDIR}/${P}.tar.gz" --strip-components=3 -C "${S}"
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cppflags -D_FILE_OFFSET_BITS=64
+
+	econf \
+		--enable-nss \
+		--with-pamdir=$(getpam_mod_dir) \
+		$(use_enable doc docs) \
+		$(use_enable gpg) \
+		$(use_enable gtk gui) \
+		$(use_enable nls) \
+		$(use_enable openssl) \
+		$(use_enable pam) \
+		$(use_enable pkcs11 pkcs11-helper) \
+		$(use_enable python pywrap) \
+		$(use_enable tpm tspi)
+}
+
+src_install(){
+	emake DESTDIR="${D}" install
+
+	if use python; then
+		echo "ecryptfs-utils" > "${D}$(python_get_sitedir)/ecryptfs-utils.pth" || die
+	fi
+
+	use suid && fperms u+s /sbin/mount.ecryptfs_private
+
+	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
+}
+
+pkg_postinst() {
+	if use suid; then
+		ewarn
+		ewarn "You have chosen to install ${PN} with the binary setuid root. This"
+		ewarn "means that if there are any undetected vulnerabilities in the binary,"
+		ewarn "then local users may be able to gain root access on your machine."
+		ewarn
+	fi
+}
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index fad2ee8bba88..6b9ff4fd5af7 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -3,9 +3,11 @@ AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a
 DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c
 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 6926 BLAKE2B a7f424f2b655b35a7dee09351d6f87fe80c78bd0e53a8fffd00e8c32eacf62d9ace8e3bcc0bc00bc9c1423a0da2069e85335a4a524ab28d8e742f80530a7c035 SHA512 23d849d0746905937c4cdf5c7bd69dbb48ac10c7f321976f44a9f85477f3a6c4ea71e9950b4166643f4004aa684d5ba9b381643817489b62df62850fcdab5798
 EBUILD eudev-4.9999.ebuild 6068 BLAKE2B 129380de118a1bb7389ffda2b3954f1cd3b64e92ab41e23eb0de153a338f6e7e74bcf0e06125061b22bdc2f48fdb5202a43cc212d87090cf7306e59a2b9ceafd SHA512 fcbfc2635093d4c88e95f413a39ee7b08c473797b2b8afc50a5f73b84e58c67e96b316f996c3f2ce7be90304c14139ec813bf877c9374583509a29df2451de83
 EBUILD eudev-9999.ebuild 6931 BLAKE2B 3c75f45f6cd87110ce66b8e2f644178fb913670c6434dccff6a96dcd8afb7ef1097c1af7761d99ec9c9acba08c312f96f38b55dffa01f47dcd0cb24649bf4054 SHA512 c9c3067d102107ed5fb58027738eda2f608b80323473f16f438feb30aa2c0b0819954267edf240d82b21be2abbcb54ea98ea55affb400f7af539422b1141c215
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.2.9.ebuild b/sys-fs/eudev/eudev-3.2.9.ebuild
new file mode 100644
index 000000000000..d7c517b3cd24
--- /dev/null
+++ b/sys-fs/eudev/eudev-3.2.9.ebuild
@@ -0,0 +1,235 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+KV_min=2.6.39
+
+inherit autotools linux-info multilib multilib-minimal
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/gentoo/eudev.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
+	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://github.com/gentoo/eudev"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="+hwdb +kmod introspection rule-generator selinux static-libs test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.20
+	introspection? ( >=dev-libs/gobject-introspection-1.38 )
+	kmod? ( >=sys-apps/kmod-16 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-devel/make-3.82-r4
+	>=sys-kernel/linux-headers-${KV_min}
+	>=dev-util/intltool-0.50
+	test? ( app-text/tree dev-lang/perl )"
+
+RDEPEND="${COMMON_DEPEND}
+	acct-group/input
+	acct-group/kvm
+	acct-group/render
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10
+	!sys-fs/udev
+	!sys-apps/systemd"
+
+PDEPEND=">=sys-fs/udev-init-scripts-26
+	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/udev.h
+)
+
+pkg_pretend() {
+	ewarn
+	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
+	ewarn "as described in the URL below:"
+	ewarn "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	ewarn
+	ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
+	ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
+	ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
+	ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
+	ewarn
+}
+
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~UNIX"
+	linux-info_pkg_setup
+	get_running_version
+
+	# These are required kernel options, but we don't error out on them
+	# because you can build under one kernel and run under another.
+	if kernel_is lt ${KV_min//./ }; then
+		ewarn
+		ewarn "Your current running kernel version ${KV_FULL} is too old to run ${P}."
+		ewarn "Make sure to run udev under kernel version ${KV_min} or above."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	# change rules back to group uucp instead of dialout for now
+	sed -e 's/GROUP="dialout"/GROUP="uucp"/' -i rules/*.rules \
+	|| die "failed to change group dialout to uucp"
+
+	eapply_user
+	eautoreconf
+}
+
+multilib_src_configure() {
+	tc-export CC #463846
+	export cc_cv_CFLAGS__flto=no #502950
+
+	# Keep sorted by ./configure --help and only pass --disable flags
+	# when *required* to avoid external deps or unnecessary compile
+	local econf_args
+	econf_args=(
+		ac_cv_search_cap_init=
+		ac_cv_header_sys_capability_h=yes
+		DBUS_CFLAGS=' '
+		DBUS_LIBS=' '
+		--with-rootprefix=
+		--with-rootrundir=/run
+		--exec-prefix="${EPREFIX}"
+		--bindir="${EPREFIX}"/bin
+		--includedir="${EPREFIX}"/usr/include
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--with-rootlibexecdir="${EPREFIX}"/lib/udev
+		--enable-split-usr
+		--enable-manpages
+		--disable-hwdb
+	)
+
+	# Only build libudev for non-native_abi, and only install it to libdir,
+	# that means all options only apply to native_abi
+	if multilib_is_native_abi; then
+		econf_args+=(
+			--with-rootlibdir="${EPREFIX}"/$(get_libdir)
+			$(use_enable introspection)
+			$(use_enable kmod)
+			$(use_enable static-libs static)
+			$(use_enable selinux)
+			$(use_enable rule-generator)
+		)
+	else
+		econf_args+=(
+			--disable-static
+			--disable-introspection
+			--disable-kmod
+			--disable-selinux
+			--disable-rule-generator
+		)
+	fi
+	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		emake
+	else
+		emake -C src/shared
+		emake -C src/libudev
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+	else
+		emake -C src/libudev DESTDIR="${D}" install
+	fi
+}
+
+multilib_src_test() {
+	# make sandbox get out of the way
+	# these are safe because there is a fake root filesystem put in place,
+	# but sandbox seems to evaluate the paths of the test i/o instead of the
+	# paths of the actual i/o that results.
+	# also only test for native abi
+	if multilib_is_native_abi; then
+		addread /sys
+		addwrite /dev
+		addwrite /run
+		default_src_test
+	fi
+}
+
+multilib_src_install_all() {
+	find "${D}" -name '*.la' -delete || die
+
+	insinto /lib/udev/rules.d
+	doins "${FILESDIR}"/40-gentoo.rules
+
+	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
+}
+
+pkg_postinst() {
+	mkdir -p "${EROOT}"run
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${EROOT}"dev/loop 2>/dev/null
+	if [[ -d ${EROOT}dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
+	# process it as a list.  We only care about the zero case (new install) or the case where
+	# the same version is being re-emerged.  If there is a second version, allow it to abort.
+	local rv rvres=doitnew
+	for rv in ${REPLACING_VERSIONS} ; do
+		if [[ ${rvres} == doit* ]]; then
+			if [[ ${rv%-r*} == ${PV} ]]; then
+				rvres=doit
+			else
+				rvres=${rv}
+			fi
+		fi
+	done
+
+	if use hwdb && has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+
+		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		# reload database after it has be rebuilt, but only if we are not upgrading
+		# also pass if we are -9999 since who knows what hwdb related changes there might be
+		if [[ ${rvres} == doit* ]] && [[ ${ROOT%/} == "" ]] && [[ ${PV} != "9999" ]]; then
+			udevadm control --reload
+		fi
+	fi
+	if [[ ${rvres} != doitnew ]]; then
+		ewarn
+		ewarn "You need to restart eudev as soon as possible to make the"
+		ewarn "upgrade go into effect:"
+		ewarn "\t/etc/init.d/udev --nodeps restart"
+	fi
+
+	if use rule-generator && \
+	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
+		ewarn
+		ewarn "Please add the udev-postmount init script to your default runlevel"
+		ewarn "to ensure the legacy rule-generator functionality works as reliably"
+		ewarn "as possible."
+		ewarn "\trc-update add udev-postmount default"
+	fi
+
+	elog
+	elog "For more information on eudev on Gentoo, writing udev rules, and"
+	elog "fixing known issues visit: https://wiki.gentoo.org/wiki/Eudev"
+}
diff --git a/sys-fs/fatcat/Manifest b/sys-fs/fatcat/Manifest
index 40472749a6af..b4cc11d73bc4 100644
--- a/sys-fs/fatcat/Manifest
+++ b/sys-fs/fatcat/Manifest
@@ -1,3 +1,5 @@
 DIST fatcat-1.0.6.tar.gz 50447 BLAKE2B f33c479ec9482a7cf7113d1fa0d02c8bde0c58c5162e392867c18ec157f23d9891e90c9571892fe48b22b5c6d713404bdbd822ac07f4bba9243fcb1ead6932c3 SHA512 5a0eedad9c3d3f8dc6d7230c74669082a33850bd0a91310dccb080f4a2351ca75be6af7bbb6610c71030d5f97cf63f98f43891084171a82e07ef70064a8bce7b
+DIST fatcat-1.1.0.tar.gz 57104 BLAKE2B 9ff69f576258a39b767db67e6934a35175af218a184516681300c646ce1ec508652cf1113bf61f9e2f628849de2b53152345ca12fe84e8a9a7f51799bb3e13a2 SHA512 f5bcffcb46b77e950241a9f957133083ea5d43f4e0f3e038c84310da926cc017048d22f85f3c8e90a2745ce26f513079997717c5b758649b7090694006be0078
 EBUILD fatcat-1.0.6.ebuild 468 BLAKE2B f99c0b10c95dd3c3cbda988286e3bdad2152c4c95962b780f2d9cdcb00031b12acb69d6450ec25c737faabd1711a419a6e546b2340956b4815faf4cf0d3a7dd6 SHA512 5571b2b8d9dd87e16f0e9abee2b9f5524c5c47ab9cb9be661abec684387df16d96cedbb1b22d68476d749caefe88ef8026675419b9032012e61bacebe4427d13
+EBUILD fatcat-1.1.0.ebuild 469 BLAKE2B 48a6760ee0b46d4cdd1bf58abc03ea5bb6924848855607b980b1e7f965e15677ed204e3f6f4b8df58797d369dddd91ba9459ac29d884d2930e9d187cb2bd221c SHA512 fdbc251d0e0686ec61b3f929c790f79e2308e1b0141846712122425225de7eab154dc49c3edb83c3d375a35cb535a97f8cd91958fcb11249e8dfe0b532020263
 MISC metadata.xml 240 BLAKE2B 5caea4abbcf161615353b1f5ec499ae37ae67f08f6f1d48829d145694359169508d62173c091700e9a65d8ed461216caf12cc6728760784aa364d610250369ca SHA512 ee5c2cad860daff025c5d2bbc7e210767432dd09d1a74fc7b1d5994686d48739b9bfd446bf1ab7b1b92532f82767e722ea3e38d7a502a7a941f6ac5028000ce8
diff --git a/sys-fs/fatcat/fatcat-1.1.0.ebuild b/sys-fs/fatcat/fatcat-1.1.0.ebuild
new file mode 100644
index 000000000000..75961d0164b5
--- /dev/null
+++ b/sys-fs/fatcat/fatcat-1.1.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils
+
+DESCRIPTION="FAT filesystems explore, extract, repair, and forensic tool"
+HOMEPAGE="https://github.com/Gregwar/fatcat"
+SRC_URI="https://github.com/Gregwar/fatcat/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+src_install() {
+	cmake-utils_src_install
+	doman man/${PN}.1
+	dodoc docs/*.md
+}
diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest
index c45981f745da..10107ed9e36d 100644
--- a/sys-fs/fuse-common/Manifest
+++ b/sys-fs/fuse-common/Manifest
@@ -5,5 +5,5 @@ DIST fuse-3.3.0.tar.xz 1010840 BLAKE2B 56422879c7a87351deb731b3e5f950c1d7f584f73
 DIST fuse-3.4.1.tar.xz 1016436 BLAKE2B 50a35039d7302741239736f2e62f4603c147d49947580fb92f7ac6b46aa8dbcd1cbb16ba35719e198dc3b693b11c215ee8123d02a0c96154d6c905541eb35936 SHA512 45e56346b6d4c90055168254cd8508339d5b428ec58f1d9e287439e3d48fce344498826f099de89051e6529e45a45e0990a0e07fc8a9acbae1f76f4d6c72dd0d
 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 882 BLAKE2B c160fa9e872d8a705b52a935324cc80f1147f8b23221fb819ead793a742bd3d01c4b71a57bffd6aa7096714a43e433343efff327a295b264b19e9af8223d8283 SHA512 ceec795c2ac2800132fa875997534e29eece406acb30c50733a5baba33dcc35d31761caf489536c6b19d199b6b3af7760aca0114d2cb7f273ee2619879850180
+EBUILD fuse-common-3.4.1.ebuild 889 BLAKE2B dc6fb48c03d1e44f07c80016552dbd240eb0f22af5c95b297e6ddc1906b02c6d70b0df683c6710f952962b6bf191401807248ef0eebbcaa89fe690fbc3be5ae3 SHA512 8660c7f0d65eab742af816e41e0f56ef803292e4f26a13dde2119ed634e003f75ecd1a676c7f173c2f6ec2bda984f76eaa03b1705f228e2546d220defb5dab8c
 MISC metadata.xml 326 BLAKE2B e3a863aeff43218beaba67d6ca4692dad0b3854a706213db47880058af990e02655a30a55eb16dc3cbe546382f6e55989d0d8321eb115b8270a016d2c1c62ab8 SHA512 fcb872557acd0b8478fd8afe48c408a6dc08fda8eeba46f6db89470b6b3aa5d1287d4be9c5ec2aee80137901d4a1d943b61b22117849d283eafd3bd587c05eae
diff --git a/sys-fs/fuse-common/fuse-common-3.4.1.ebuild b/sys-fs/fuse-common/fuse-common-3.4.1.ebuild
index 1bee8df8257a..93ecce7e5f62 100644
--- a/sys-fs/fuse-common/fuse-common-3.4.1.ebuild
+++ b/sys-fs/fuse-common/fuse-common-3.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=7
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-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 ~riscv ~s390 ~sh ~sparc ~x86"
 
 DEPEND="virtual/pkgconfig"
 RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index e7ad2a2bc669..b4b35af3199e 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -3,7 +3,7 @@ DIST fuse-2.9.8.tar.gz 4610904 BLAKE2B 803eebea510834676379df8c9514050efcf47d83c
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST fuse-3.6.2.tar.xz 1255556 BLAKE2B a48caee0e2b8b7948caff3a8c226fb87a56aa37fb2d4da08cae2f64da274df5636bf15cf8f2a15a87c3138f9a11d34fa287b371d53ddaed5b0f18e9defb4c8e9 SHA512 e5eb10c66e8585d47430e289d059a3a58ebf3823304fa35e9be413c8d194401ff5093fac82c7c6911b3c5afde6c1c156aa671d333b193d2d739a7ed1632c4bd8
 EBUILD fuse-2.9.8.ebuild 1942 BLAKE2B 160c38daa8321d980347079e0ab8677526c639e0d6f20b8fffaa481b7072146f1aced7f61cfc5ae05b483d7178beed551e6df44d5e319c9274a3c1c5cb530e58 SHA512 35efa56282f0a9a4aca7e284af1da587d6a5545439c50258ecc31c47159fa777c70400f28b4fd9c8392a39d1b43ba8c3c1935e0860d7689dc7ad40f5134e7da8
-EBUILD fuse-2.9.9-r1.ebuild 2075 BLAKE2B 25a38d5adb7eede2818119f880ce4ec89946693ab335ba676062eae347e3338a1b9ef462ceb254a2eb46dac281edfebf3ed39708f4114c19b158b419cde9fa4a SHA512 162085b0253c8fd052bc3f9869aec8c3424c00ceab3e1682ee748f038cdec2481957e19410773b637f240fdb612a6f241b71dea144600fc3241d36ff192372fb
+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
diff --git a/sys-fs/fuse/fuse-2.9.9-r1.ebuild b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
index 49c872088c72..5ad8a0105f23 100644
--- a/sys-fs/fuse/fuse-2.9.9-r1.ebuild
+++ b/sys-fs/fuse/fuse-2.9.9-r1.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="examples kernel_linux kernel_FreeBSD static-libs"
 
 PDEPEND="kernel_FreeBSD? ( sys-fs/fuse4bsd )"
diff --git a/sys-fs/genext2fs/Manifest b/sys-fs/genext2fs/Manifest
index e4f37c74d7d7..d16888a2f7c7 100644
--- a/sys-fs/genext2fs/Manifest
+++ b/sys-fs/genext2fs/Manifest
@@ -1,3 +1,3 @@
 DIST genext2fs-1.4.1.tar.gz 103283 BLAKE2B cacb6e5e5e69f9fbb8550e2b9d79e41d4dd58e2bcc5516a79476918203e5b8ebee0d12a6a6463ff4ec659249a6647881b2728a8d6936fadc298a1e0e68833bdc SHA512 1b9ec7044014423345ae6b09862ba6903f5b3e0f68fb8bbcf97daf2705471cc1633a9fdbc5e00afe1b191e1af7bed87bde2e538bc7365469218f2a00b062845c
-EBUILD genext2fs-1.4.1.ebuild 455 BLAKE2B 307010396b46e9c17b3548cc035381da2409bd5e3601187cf281dc9b5b0fd387bebe9328b7e7b6513646d79c26ff4201f597e62a1fbdffdd0b4017a90c7d3787 SHA512 b5bf6f82ff1ff7afe62824bb19643b4bbcfee42d4eff6ae68b42fff33b7728c2df36ed8c26ce3e844cb0a5325ca84d615f2c436821e845c974558eefb28a56bb
+EBUILD genext2fs-1.4.1.ebuild 335 BLAKE2B acbbbb1d0a34514ed657487569e38b95487f0851ab9e6a14eb42e1e33ab976c4ff9d156e8be96d324960cb07b30ba5627e129421339475456518b59969a40e55 SHA512 d43a5c7b5aebf5f79056a00a19d30362b97730a5d30a1009c6017b239b633c73eac9ff1b0669800ac41f72ba5bde1bc2ccea4ce8bd0ef78b3c7970ef0b9e4522
 MISC metadata.xml 330 BLAKE2B b21c94403f0372dce68388b52978890823a6a6b50bd20c2b1ff4691b713f9a29b66018401773ffec48c9bd1c4a4528977e9b3a1c89e9e097ad53d79f85a92f52 SHA512 8e48e07c5c2ca3b935067bbf1b66524f1c9d83393df4efe704afdd37abd7041688a63ba59b3a3441fdf62dc97d75da625b89a0125f2872e63f9643f2f1845dbf
diff --git a/sys-fs/genext2fs/genext2fs-1.4.1.ebuild b/sys-fs/genext2fs/genext2fs-1.4.1.ebuild
index 7702d2c004c2..792f5152ff8c 100644
--- a/sys-fs/genext2fs/genext2fs-1.4.1.ebuild
+++ b/sys-fs/genext2fs/genext2fs-1.4.1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
 DESCRIPTION="generate ext2 file systems"
 HOMEPAGE="https://sourceforge.net/projects/genext2fs"
@@ -10,11 +10,3 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ~mips ppc sparc x86"
-IUSE=""
-
-DEPEND=""
-
-src_install() {
-	emake install DESTDIR="${D}" || die
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index f871f2690545..7d53677f5402 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -38,8 +38,8 @@ AUX lvm2-2.02.92-dynamic-static-ldflags.patch 3031 BLAKE2B 4e0e8bf8335420087470c
 AUX lvm2-2.02.99-locale-muck.patch 405 BLAKE2B 07ac7c7f54d06dbdeae1c6bf0959fd0c223b30cbd67c08f853e02f520d212f7b6dcf7c3b6c3d3b7370bb004adbb23b226bf0d0792b5799ddbaff5ab655124ca2 SHA512 1c898693f71d165d55458ab87886a25206930c202b5aea95eba394ad06162cc710c1435e598acb9bcd3fbf46abf5409be972f6ce73bd02b2e177e1af780ae7ad
 AUX lvm2-2.03.05-dmeventd-no-idle-exit.patch 2737 BLAKE2B 957f51a45f41920e73141cff56612e1bc334ef455fe262f1563d7c476ed534922f8f7a5f99d4f8ad69bb8830b7b1b97cf7afeb9a628058d54ffcef9d6497956f SHA512 c8ba4930114d8f6af230c21840e966def269e064c2236db6402a527f4e4050762082f37a770c551d3dab8d1b21642cfee701e48231f2bf42d50e41056725b711
 AUX lvm2-2.03.05-dynamic-static-ldflags.patch 2696 BLAKE2B 7464ee428e2cb8834181d3023399f2f913912bc58cb69af1fe9bb4418aecea1e4815c79d349e335cf60a7566052a34eb48db75f4f69bc0b0c2454def45edb18d SHA512 cb8e517967501fe11fe6c19543c37b26ada300bc06156b9f84e96fed96818e4a63e5a4322736d8e1eff4025a268dfb5570c4ec514bdf92df219a626f8bacd607
-AUX lvm2-2.03.05-example.conf.in.patch 1831 BLAKE2B aac73c92dfc81df0a7144f5c91cc74a162539030b2e576e21abf5588de386a1ef8173a28b3a47ad5474fb58afcb6f263f281f94abc7c442ddc03a20bc0645907 SHA512 d538b05769a92c4cac5ff39d21cf8975602b55e859e3f6e439b641de103a1097d703cbc133069e30cc9d512bc7d091c64b223af7012d5d47dc7ac724d2e3b18d
 AUX lvm2-2.03.05-pthread-pkgconfig.patch 1442 BLAKE2B 6d2864c91fc38ba3c8e97641610c028bcd67b16bccf380b9fa8d7c5d18b714f91e35a4eeaa668f6b07dd057a663ac8c9f7e0936fb040d6ab258652327ca9bf22 SHA512 f20104a2f78900211bfadca486961039ce3e153dba9a242e4a2400c7e7efe06d061a76a4691f45233cc85aa15858cb8f44bf7bacb44007a8026c7c4794de4873
+AUX lvm2-2.03.06-example.conf.in.patch 1833 BLAKE2B 21f9d51be4a704417dc35ed7d5ae385dab1376e3f25c030d215fd3b5d0a495f97d4230dd13cf88472b9699321f091ce90ac7162644f9c7f04ed9d8c5fd0eafe9 SHA512 49b0db05552be36153986322e28098ffc006ff2bad3fc91de99ce63f75207b0bbdfd8e4cdb5fb07decb4a84c883b552135a8b203186a10f2360a3616caf10957
 AUX lvmetad.initd-2.02.105-r2 284 BLAKE2B 6be707673353492efd5030958b42e6d4f388d2edc367e6c4964d5d88c9d1dd43e3e69e00f755bd801d7e39ea6c99d8717552c6d3d96f9cb3d4f3f9f0d8c5df18 SHA512 af87eb77cc3091b55fcac51398ad3a489c0a4e34d4d5274596b8504bfb69b37e10d432fe314e3d65de5e6de23df95d0476855cb85dabfa2ac8a61a25aef68226
 AUX lvmetad.initd-2.02.116-r3 345 BLAKE2B d458efd01fa08debe0857072c880adf951477445dd619a052f50cab9da39d8a38c9d480fc2d20fe899e01dcbcdaea0696d5c3e65af128652feea3186857d206e SHA512 f3143c6e1d00893009c68141f5ffd7e1e6bcf5b7ef0ff8505bc6c7049d83b2f9ddd2dc5a3cfdc2641a20603830b5dba07d73740cc5ce82e6b1b602a9b737a241
 AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc
@@ -50,12 +50,12 @@ DIST LVM2.2.02.183.tgz 2380574 BLAKE2B b1fe71b6cdb8ee20dd53d0ad3399c553487baafa1
 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.05.tgz 2427412 BLAKE2B a66f199b6b9b593746ff7738657d80c3dc6201b417736e8136e8c894532611d9a4b44c3c791cb7dac539e6e2683b348ba17917a2a9ba539ec15cac5c25713816 SHA512 3b00f53771e99faa6459ae73353bff06ae37c64bd2659586ec25d0bb43bc3ff8ba5f713c68617fd7662a5f6cb65bca1ad0aea554819048d79c1cce20bf67c50a
-EBUILD lvm2-2.02.116.ebuild 8359 BLAKE2B 664a994314d72a762c1e048373200ba6a07949f222cfa402aafe2f11dc4cb7430a2f2b8bd40a8e4f0c40a78a5c0814fd7a2c06297f1f6b12ab3225dab443eee0 SHA512 647ec89384494e27b93a13943d127659ac0d3528b5cdccc62f421d765884b887650c9da0a888f22322dfae5e558be7e16ffe7e3705881e06e4ccd47d953bbecf
-EBUILD lvm2-2.02.145-r2.ebuild 8544 BLAKE2B 7f234281ad898cba25b6dfb797f5a66ddb35695e67211a5dbcc43b4d2028a863957065e123b558dcbceb1415c1a27f32783aa9471e84c4492c74c9aacb026ba7 SHA512 e5ff07acdd559ce743003da72ccc35a370b6002cc07a26b021bd3f5da44ec32290ff79b04b6edf7e11cc0b7b30b8e9df437fe25456bbc2bf7d9c988fbfe12233
-EBUILD lvm2-2.02.183.ebuild 8795 BLAKE2B a3593fba8a0aa2f7567804fd66b06288ef56cc44b66c347589d30fd393d900d3db9fc09a2f9841141b18c79a2dc700182a8727443ae944770caaed926d6ae223 SHA512 f4d66395ac3ccf044b50f693d414e25bdb5430c0a268ac4087a8349b17a95bac16dc72e11493d7708dada2abc770080af955ef2e3d7b24d0961b8a38610f62d5
-EBUILD lvm2-2.02.184-r4.ebuild 9333 BLAKE2B 9594a9e268f8b27d04007218b930b67e8d6b2c929d25e6850b66a7a13b202f4cc74a8049504ba4adf6e6a0911834fe3b7fa12bcf686b3d9426d314fcb7153316 SHA512 44833fc31b7b6dbd582d6342ddd8a5ec9326ce15e49b2f8746e9ea9203c0ca3df487c2137b4713a9a97eac4838ea1301568db5ceb0b1057b60df1f718cb87e0c
-EBUILD lvm2-2.02.185-r1.ebuild 9523 BLAKE2B f3f2c8cbb0bb54b265e62c302481e8d66fd21dca562762af920f48797d21189d8cc7018e531aeeb29fea4a59f19def2b5531d099747e3728b2f66aa3dc4e890e SHA512 560345964724d79c18db900ae1ee6aaea3bc23994722d9a505bc2658e394593e5b329271c8878770c833bc2017a0bbd2d6770295e98bca055b526ed315f9f886
-EBUILD lvm2-2.02.186.ebuild 9523 BLAKE2B f3f2c8cbb0bb54b265e62c302481e8d66fd21dca562762af920f48797d21189d8cc7018e531aeeb29fea4a59f19def2b5531d099747e3728b2f66aa3dc4e890e SHA512 560345964724d79c18db900ae1ee6aaea3bc23994722d9a505bc2658e394593e5b329271c8878770c833bc2017a0bbd2d6770295e98bca055b526ed315f9f886
-EBUILD lvm2-2.03.05-r1.ebuild 8902 BLAKE2B 6b6e07d8e50de31b4d92d0bf7f9810f0fc9e5cba19f61b206b4bbe95445241cbb0a237e2356cf4b447fccd984ca06467874ea1982a2a5c4e7517126a021dff6e SHA512 2dc836e69c621a1c0e60dfc1df53eb76aceb6f15d9e8ee3ccc355592221330e7c761a5e56f376a6419b3cc2ca689718c8b3e642bc3b089a80030b5c72d4586f6
+DIST LVM2.2.03.06.tgz 2453672 BLAKE2B 3d39bef4915ddb15c51011c131afcd2735723fc3e880e01fb863d82ccac0c34b7d71f6a3a126c6bb53fbf2dd923ccf0443e4e02a492fc0660ee1ef168dbb0e79 SHA512 2a01d34fa58348b0fac3d40a9ce736aa499af18c7e9bf96a3eeefc6a2de6a73460c83b6c67be20e9bd440998cbf847bc3e7a028385f38d715e221a5a857d391f
+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
diff --git a/sys-fs/lvm2/files/lvm2-2.03.05-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.03.06-example.conf.in.patch
index a79250b8b4fd..329bfde6ca91 100644
--- a/sys-fs/lvm2/files/lvm2-2.03.05-example.conf.in.patch
+++ b/sys-fs/lvm2/files/lvm2-2.03.06-example.conf.in.patch
@@ -1,29 +1,29 @@
-From d5755288f23fdeaca4c6d317583f5f119ea8801c Mon Sep 17 00:00:00 2001
+From a26cc1e7e299b61d1877ead03aacafef9fbe81ff Mon Sep 17 00:00:00 2001
 From: "Robin H. Johnson" <robbat2@gentoo.org>
-Date: Wed, 24 Jul 2019 11:01:03 +0200
+Date: Fri, 25 Oct 2019 08:45:17 +0200
 Subject: [PATCH] Add Gentoo specific changes
 
-Forward-ported from 2.02.178 to 2.03.05
+Forward-ported from 2.03.05 to 2.03.06
 Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
 ---
  conf/example.conf.in | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
 
 diff --git a/conf/example.conf.in b/conf/example.conf.in
-index 154f621bcf..83124ddea3 100644
+index 05b0857920..33ffb0097c 100644
 --- a/conf/example.conf.in
 +++ b/conf/example.conf.in
 @@ -143,6 +143,9 @@ devices {
  	# Example
  	# Accept every block device:
- 	# filter = [ "a|.*/|" ]
+ 	# filter = [ "a|.*|" ]
 +	# Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
 +	# noise when you probed while not available.
-+	filter = [ "r|/dev/nbd.*|", "a/.*/" ]
++	filter = [ "r|/dev/nbd.*|", "a|.*|" ]
  	# Reject the cdrom drive:
  	# filter = [ "r|/dev/cdrom|" ]
  	# Work with just loopback devices, e.g. for testing:
-@@ -1677,7 +1680,7 @@ activation {
+@@ -1680,7 +1683,7 @@ activation {
  
  # Configuration section metadata.
  # This configuration section has an automatic default value.
@@ -32,7 +32,7 @@ index 154f621bcf..83124ddea3 100644
  
  	# Configuration option metadata/check_pv_device_sizes.
  	# Check device sizes are not smaller than corresponding PV sizes.
-@@ -1722,7 +1725,8 @@ activation {
+@@ -1725,7 +1728,8 @@ activation {
  	# 
  	# This configuration option is advanced.
  	# This configuration option has an automatic default value.
@@ -42,7 +42,7 @@ index 154f621bcf..83124ddea3 100644
  
  	# Configuration option metadata/vgmetadatacopies.
  	# Number of copies of metadata to maintain for each VG.
-@@ -1766,7 +1770,7 @@ activation {
+@@ -1768,7 +1772,7 @@ activation {
  	# This configuration option is advanced.
  	# This configuration option has an automatic default value.
  	# stripesize = 64
@@ -52,5 +52,5 @@ index 154f621bcf..83124ddea3 100644
  # Configuration section report.
  # LVM report command output formatting.
 -- 
-2.22.0
+2.24.0.rc1
 
diff --git a/sys-fs/lvm2/lvm2-2.02.116.ebuild b/sys-fs/lvm2/lvm2-2.02.116.ebuild
index f7e83264dbc1..cc91bf62af52 100644
--- a/sys-fs/lvm2/lvm2-2.02.116.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.116.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="device-mapper-only? ( !lvm1 !lvm2create_initrd !thin )
 
 DEPEND_COMMON="
 	readline? ( sys-libs/readline:0= )
-	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+	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.
diff --git a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
index d014bed6e223..70a95fcb0f78 100644
--- a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
@@ -19,7 +19,7 @@ REQUIRED_USE="device-mapper-only? ( !lvm1 !lvm2create_initrd !thin )
 DEPEND_COMMON="
 	readline? ( sys-libs/readline:0= )
 	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+	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.
diff --git a/sys-fs/lvm2/lvm2-2.02.183.ebuild b/sys-fs/lvm2/lvm2-2.02.183.ebuild
index 1438959ea365..24737eaf33f0 100644
--- a/sys-fs/lvm2/lvm2-2.02.183.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.183.ebuild
@@ -23,7 +23,7 @@ DEPEND_COMMON="
 	readline? ( sys-libs/readline:0= )
 	sanlock? ( sys-cluster/sanlock )
 	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+	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.
diff --git a/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild b/sys-fs/lvm2/lvm2-2.02.184-r5.ebuild
index 0c4acb77beb2..e677ed82e74b 100644
--- a/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.184-r5.ebuild
@@ -23,7 +23,7 @@ DEPEND_COMMON="
 	readline? ( sys-libs/readline:0= )
 	sanlock? ( sys-cluster/sanlock )
 	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+	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.
diff --git a/sys-fs/lvm2/lvm2-2.02.185-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.185-r1.ebuild
index de7273ad6448..ec678f7044b5 100644
--- a/sys-fs/lvm2/lvm2-2.02.185-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.185-r1.ebuild
@@ -23,7 +23,7 @@ DEPEND_COMMON="
 	readline? ( sys-libs/readline:0= )
 	sanlock? ( sys-cluster/sanlock )
 	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+	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.
diff --git a/sys-fs/lvm2/lvm2-2.02.186.ebuild b/sys-fs/lvm2/lvm2-2.02.186-r1.ebuild
index de7273ad6448..ec678f7044b5 100644
--- a/sys-fs/lvm2/lvm2-2.02.186.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.186-r1.ebuild
@@ -23,7 +23,7 @@ DEPEND_COMMON="
 	readline? ( sys-libs/readline:0= )
 	sanlock? ( sys-cluster/sanlock )
 	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+	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.
diff --git a/sys-fs/lvm2/lvm2-2.03.05-r1.ebuild b/sys-fs/lvm2/lvm2-2.03.06.ebuild
index aa341d835815..415ac2bd5a37 100644
--- a/sys-fs/lvm2/lvm2-2.03.05-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.06.ebuild
@@ -23,7 +23,7 @@ DEPEND_COMMON="
 	readline? ( sys-libs/readline:0= )
 	sanlock? ( sys-cluster/sanlock )
 	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+	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.
@@ -53,7 +53,7 @@ S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
 
 PATCHES=(
 	# Gentoo specific modification(s):
-	"${FILESDIR}"/${PN}-2.03.05-example.conf.in.patch
+	"${FILESDIR}"/${PN}-2.03.06-example.conf.in.patch
 
 	# For upstream -- review and forward:
 	#"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch # FIXME: breaks libdm/dm-tools build
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index c1de94d2b495..67a39b9bd11c 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -15,5 +15,5 @@ EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c5286651
 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-9999.ebuild 1657 BLAKE2B ad5692c2f5cc0ab9a33b47cfcba96361a26fd07ea36d2f8ca23826deedc563978ae74aeb52884806db45b531f3b9b9c6691b2462ae7546e27be8188683c0b484 SHA512 2a90c73888a9f7295ba19a884eabf52d97b562741f015df5bf6a712ea7bbc18c39af6c03c57735a60462e3cca83d4ed1c8a5951eb87789d9d1c06bf708dc5257
+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-9999.ebuild b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
index 4a4833de6e17..56e2a3332c0b 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-9999.ebuild
@@ -34,7 +34,6 @@ DEPEND="
 "
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.3-sysmacros.patch
-	"${FILESDIR}"/${PN}-4.3-aligned-data.patch
 )
 
 use10() { usex $1 1 0 ; }
@@ -64,5 +63,5 @@ src_compile() {
 
 src_install() {
 	dobin "${WORKDIR}"/${P}/${PN}/{mksquashfs,unsquashfs}
-	dodoc CHANGES README RELEASE-README RELEASE-READMEs/*
+	dodoc CHANGES README RELEASE-READMEs/*
 }
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 3c9e1ab8dc9d..4768510bc108 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -2,6 +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 9815 BLAKE2B 80c66df7f1dc24e6436c42f8a0aa01d60362ae3b571a3dac7a03aaa8dcde187a79f250b8a98f1e7f5cc51635f58b2cd3581c7bd69a3c434939936a4151c781ed SHA512 cc5b1bc6828184389edac77573a469c375328b33555e39e9d1d1596543a397eed1d954a679ed6be990fbf2e4bc21b7765e4e8a5eb7abcd6625666b4c819dc8ab
 EBUILD udev-243.ebuild 9570 BLAKE2B 020a845640cb14fd9ddff78b8e5526df69964d35c6eef33ab39fa30c4001558170d89e256641f9a394ebaeba7e81bc764d8765b8fe6583fe05aefb35dfcefed2 SHA512 1644eeff8e645f5514a80cffd8f357f0077514c35d489a77d088f1006e6e43930984aabc0195576be392b83bdec9ecf02c36062084471be368798a4b81891f53
-EBUILD udev-9999.ebuild 9591 BLAKE2B 72ccdcaf7791558859483b8d161908a040cae8284e01b3c3f333ce55715d5c61f4173a34fdbf3b910a8b258a5d6f4feff5880b3366853f5b2c39c3b3ed5eafbb SHA512 f8d7823de0ff335ea169c312a5e79111463005714858ccd248de73df76fce4dfab872b5387bef596f4113dfb4c3a97c0c4d14680c53fe194aaa37816fcab79bf
+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
new file mode 100644
index 000000000000..44fb2b07b2ec
--- /dev/null
+++ b/sys-fs/udev/udev-243-r2.ebuild
@@ -0,0 +1,335 @@
+# Copyright 2003-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev usr-ldscript
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
+	inherit git-r3
+else
+	MY_PV=${PV/_/-}
+	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"
+fi
+
+DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
+
+LICENSE="LGPL-2.1 MIT GPL-2"
+SLOT="0"
+IUSE="acl +kmod selinux static-libs"
+
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
+	sys-libs/libcap[${MULTILIB_USEDEP}]
+	acl? ( sys-apps/acl )
+	kmod? ( >=sys-apps/kmod-16 )
+	selinux? ( >=sys-libs/libselinux-2.1.9 )
+	!<sys-libs/glibc-2.11
+	!sys-apps/gentoo-systemd-integration
+	!sys-apps/systemd"
+DEPEND="${COMMON_DEPEND}
+	dev-util/gperf
+	>=dev-util/intltool-0.50
+	>=dev-util/meson-0.40.0
+	dev-util/ninja
+	>=sys-apps/coreutils-8.16
+	virtual/os-headers
+	virtual/pkgconfig
+	>=sys-kernel/linux-headers-3.9
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt"
+RDEPEND="${COMMON_DEPEND}
+	acct-group/kmem
+	acct-group/tty
+	acct-group/audio
+	acct-group/cdrom
+	acct-group/dialout
+	acct-group/disk
+	acct-group/input
+	acct-group/kvm
+	acct-group/lp
+	acct-group/render
+	acct-group/tape
+	acct-group/video
+	!<sys-fs/lvm2-2.02.103
+	!<sec-policy/selinux-base-2.20120725-r10"
+PDEPEND=">=sys-apps/hwids-20140304[udev]
+	>=sys-fs/udev-init-scripts-26"
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != buildonly ]]; then
+		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
+		linux-info_pkg_setup
+
+		# CONFIG_FHANDLE was introduced by 2.6.39
+		local MINKV=2.6.39
+
+		if kernel_is -lt ${MINKV//./ }; then
+			eerror "Your running kernel is too old to run this version of ${P}"
+			eerror "You need to upgrade kernel at least to ${MINKV}"
+		fi
+
+		if kernel_is -lt 3 7; then
+			ewarn "Your running kernel is too old to have firmware loader and"
+			ewarn "this version of ${P} doesn't have userspace firmware loader"
+			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
+		fi
+	fi
+}
+
+src_prepare() {
+	cat <<-EOF > "${T}"/40-gentoo.rules
+	# Gentoo specific floppy and usb groups
+	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
+	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
+	EOF
+
+	if [[ -d "${WORKDIR}/patches" ]]; then
+		eapply "${WORKDIR}/patches"
+	fi
+
+	default
+}
+
+meson_multilib_native_use() {
+	if multilib_is_native_abi && use "$1"; then
+		echo true
+	else
+		echo false
+	fi
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dacl=$(meson_multilib_native_use acl)
+		-Defi=false
+		-Dkmod=$(meson_multilib_native_use kmod)
+		-Dselinux=$(meson_multilib_native_use selinux)
+		-Dlink-udev-shared=false
+		-Dsplit-usr=true
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dstatic-libudev=$(usex static-libs true false)
+
+		# Prevent automagic deps
+		-Dgcrypt=false
+		-Dlibcryptsetup=false
+		-Dlibidn=false
+		-Dlibidn2=false
+		-Dlibiptc=false
+		-Dseccomp=false
+		-Dlz4=false
+		-Dxz=false
+	)
+	meson_src_configure
+}
+
+src_configure() {
+	# Prevent conflicts with i686 cross toolchain, bug 559726
+	tc-export AR CC NM OBJCOPY RANLIB
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	# meson creates this link
+	local libudev=$(readlink src/udev/libudev.so.1)
+
+	local targets=(
+		src/udev/${libudev}
+	)
+	if use static-libs; then
+		targets+=( src/udev/libudev.a )
+	fi
+	if multilib_is_native_abi; then
+		targets+=(
+			systemd-udevd
+			udevadm
+			src/udev/ata_id
+			src/udev/cdrom_id
+			src/udev/mtd_probe
+			src/udev/scsi_id
+			src/udev/v4l_id
+			man/udev.conf.5
+			man/systemd.link.5
+			man/hwdb.7
+			man/udev.7
+			man/systemd-udevd.service.8
+			man/udevadm.8
+		)
+	fi
+	eninja "${targets[@]}"
+}
+
+multilib_src_install() {
+	local libudev=$(readlink src/udev/libudev.so.1)
+
+	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
+	gen_usr_ldscript -a udev
+	use static-libs && dolib.a src/udev/libudev.a
+
+	insinto "/usr/$(get_libdir)/pkgconfig"
+	doins src/libudev/libudev.pc
+
+	if multilib_is_native_abi; then
+		into /
+		dobin udevadm
+
+		exeinto /lib/systemd
+		doexe systemd-udevd
+
+		exeinto /lib/udev
+		doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
+
+		rm rules/99-systemd.rules || die
+		insinto /lib/udev/rules.d
+		doins rules/*.rules
+
+		insinto /usr/share/pkgconfig
+		doins src/udev/udev.pc
+
+		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
+		rm man/systemd-udevd-{control,kernel}.socket.8 || die
+		doman man/*.[0-9]
+	fi
+}
+
+multilib_src_install_all() {
+	doheader src/libudev/libudev.h
+
+	insinto /etc/udev
+	doins src/udev/udev.conf
+	keepdir /etc/udev/{hwdb.d,rules.d}
+
+	insinto /lib/systemd/network
+	doins network/99-default.link
+
+	# see src_prepare() for content of 40-gentoo.rules
+	insinto /lib/udev/rules.d
+	doins "${T}"/40-gentoo.rules
+	doins "${S}"/rules/*.rules
+
+	dobashcomp shell-completion/bash/udevadm
+
+	insinto /usr/share/zsh/site-functions
+	doins shell-completion/zsh/_udevadm
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	mkdir -p "${ROOT%/}"/run
+
+	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
+	# So try to remove it here (will only work if empty).
+	rmdir "${ROOT%/}"/dev/loop 2>/dev/null
+	if [[ -d ${ROOT%/}/dev/loop ]]; then
+		ewarn "Please make sure your remove /dev/loop,"
+		ewarn "else losetup may be confused when looking for unused devices."
+	fi
+
+	local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
+	while read -r dev path fstype rest; do
+		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
+			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
+			ewarn "filesystem. Otherwise udev won't be able to boot."
+			ewarn "See, https://bugs.gentoo.org/453186"
+		fi
+	done < "${fstab}"
+
+	if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
+		ewarn
+		ewarn "Please re-emerge all packages on your system which install"
+		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
+		ewarn "/lib/udev."
+		ewarn
+		ewarn "One way to do this is to run the following command:"
+		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
+		ewarn "Note that qfile can be found in app-portage/portage-utils"
+	fi
+
+	local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
+	local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
+	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
+		if [[ -f ${old_rules} ]]; then
+			ewarn
+			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
+			ewarn "rename it to something else starting with 70- to silence this deprecation"
+			ewarn "warning."
+		fi
+	done
+
+	elog
+	elog "Starting from version >= 197 the new predictable network interface names are"
+	elog "used by default, see:"
+	elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
+	elog
+	elog "Example command to get the information for the new interface name before booting"
+	elog "(replace <ifname> with, for example, eth0):"
+	elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
+	elog
+	elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
+	elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
+	elog "to disable the feature."
+
+	if has_version 'sys-apps/biosdevname'; then
+		ewarn
+		ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
+		ewarn "detected to be installed with the new predictable network interface names."
+	fi
+
+	ewarn
+	ewarn "You need to restart udev as soon as possible to make the upgrade go"
+	ewarn "into effect."
+	ewarn "The method you use to do this depends on your init system."
+	if has_version 'sys-apps/openrc'; then
+		ewarn "For sys-apps/openrc users it is:"
+		ewarn "# /etc/init.d/udev --nodeps restart"
+	fi
+
+	elog
+	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
+	elog "fixing known issues visit:"
+	elog "https://wiki.gentoo.org/wiki/Udev"
+	elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
+
+	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
+	# do the same for 80-net-setup-link.rules to keep the old behavior
+	local net_move=no
+	local net_name_slot_sym=no
+	local net_rules_path="${ROOT%/}"/etc/udev/rules.d
+	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
+	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
+	if [[ ! -e ${net_setup_link} ]]; then
+		[[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
+		if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
+			net_move=yes
+			net_name_slot_sym=yes
+		fi
+	fi
+	if [[ ${net_move} == yes ]]; then
+		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
+
+		if [[ ${net_name_slot_sym} == yes ]]; then
+			ln -nfs /dev/null "${net_setup_link}"
+		else
+			cp "${net_name_slot}" "${net_setup_link}"
+		fi
+		eend $?
+	fi
+
+	# Update hwdb database in case the format is changed by udev version.
+	if has_version 'sys-apps/hwids[udev]'; then
+		udevadm hwdb --update --root="${ROOT%/}"
+		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
+		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
+		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
+	fi
+}
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 0490d5f1dea2..e5fad94c8e4a 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev
+inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev usr-ldscript
 
 if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
@@ -21,7 +21,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="acl +kmod selinux"
+IUSE="acl +kmod selinux static-libs"
 
 RESTRICT="test"
 
@@ -118,6 +118,8 @@ multilib_src_configure() {
 		-Dselinux=$(meson_multilib_native_use selinux)
 		-Dlink-udev-shared=false
 		-Dsplit-usr=true
+		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
+		-Dstatic-libudev=$(usex static-libs true false)
 
 		# Prevent automagic deps
 		-Dgcrypt=false
@@ -145,6 +147,9 @@ multilib_src_compile() {
 	local targets=(
 		src/udev/${libudev}
 	)
+	if use static-libs; then
+		targets+=( src/udev/libudev.a )
+	fi
 	if multilib_is_native_abi; then
 		targets+=(
 			systemd-udevd
@@ -168,8 +173,9 @@ multilib_src_compile() {
 multilib_src_install() {
 	local libudev=$(readlink src/udev/libudev.so.1)
 
-	into /
 	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
+	gen_usr_ldscript -a udev
+	use static-libs && dolib.a src/udev/libudev.a
 
 	insinto "/usr/$(get_libdir)/pkgconfig"
 	doins src/libudev/libudev.pc
@@ -184,9 +190,9 @@ multilib_src_install() {
 		exeinto /lib/udev
 		doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
 
-		rm rules/99-systemd.rules || die
+		rm rules.d/99-systemd.rules || die
 		insinto /lib/udev/rules.d
-		doins rules/*.rules
+		doins rules.d/*.rules
 
 		insinto /usr/share/pkgconfig
 		doins src/udev/udev.pc
@@ -210,7 +216,7 @@ multilib_src_install_all() {
 	# see src_prepare() for content of 40-gentoo.rules
 	insinto /lib/udev/rules.d
 	doins "${T}"/40-gentoo.rules
-	doins "${S}"/rules/*.rules
+	doins "${S}"/rules.d/*.rules
 
 	dobashcomp shell-completion/bash/udevadm
 
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index c6939dac6aa5..dbe2949eba5a 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -6,8 +6,8 @@ DIST udisks-1.0.5.tar.gz 736221 BLAKE2B 9a709c5d4fcd390d9a52ac764d0e3c678983a146
 DIST udisks-2.8.2.tar.bz2 1589149 BLAKE2B eaa9d95e175bbdd4255c627a0dcd93ff6f0a3660134d2117551c2d61298733570409481393ceeafc92ff26b74277b3a754b70d9359ed402c19d73fea2f39ec04 SHA512 dc0087ed2d3ab71dc66f63f868a6e2cd0e4e7578c40b2240739cecaffd6f50f5a2cecfc7ef7df9304e291d84ab12f59a940b9fb42b34a5a60d12061e6aaffc1a
 DIST udisks-2.8.3.tar.bz2 1613373 BLAKE2B d2f5e145ee0fefaafab71ff2cfec40962d835c7df22fee47702bc8406760b2463cbe334404e8d27b21e0c05134c67d336d24a6de7b19c0dc5d16ea78553a2738 SHA512 6d1d9ed18cb1742de13aad48709356f3dd9b8324967fd47107bd0f1e16b697d0928bd722397062495bdea51190774a25309834d27a5160feb7915becb474468f
 DIST udisks-2.8.4.tar.bz2 1619051 BLAKE2B 4fdf3d5ea8ae02eb74efd552afee2dbe94137767c343034dd68f1553b224871a51bb2382eda00de90d45bad18b4088b4812e1f3fbb004cd29e753e92afb34e05 SHA512 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c
-EBUILD udisks-1.0.5-r3.ebuild 2795 BLAKE2B 45da28dd3571bad3921197cb8aa68487067a58e905a6802581924d54a64bc39b4a203129c2bdb7a69bbfa63da6259ab48aeb21e039799bce547f6c4c58ff31d6 SHA512 d795d5a8c564afccb2f41c1062ad5485074db7daa4416e2c4babd8665633a21038107e8e8c5356c9d49edb7108a7126a905b57420741239de41b9925a320e80d
-EBUILD udisks-2.8.2.ebuild 3231 BLAKE2B 671706422d94397c4d211acf03518dc83b63e11f67f40a616df99913b34ea4c8e31a990d36a2db709367a04d9b065a55d7d67dee295e70fcb995812610cc93c9 SHA512 5dce9091a7a57365258d2c26e03f484133817ae428a3489dac15a1fda2fcb66a33a16318d6b4c224e81bd35838f596ebfd2aa6395c095c31e0779aa647eb6475
-EBUILD udisks-2.8.3.ebuild 3291 BLAKE2B 1ab8b3a8da16d0dc5a1b6ab9367ed6eaf5403248febf05e9625b06dadb1745ac751f893e3318642323716388c6d5c1f807e7a1f31ed8a02a48c6c8f0a5af0655 SHA512 701e97a14015902892c2ea414bbcd61b0d579b53048839a79304fe9d874f5939ba996cd0680fee4fbfb74dfb69d4ad08763fb22ae37e5bcc30226780ed8dbccd
-EBUILD udisks-2.8.4.ebuild 3291 BLAKE2B 1ab8b3a8da16d0dc5a1b6ab9367ed6eaf5403248febf05e9625b06dadb1745ac751f893e3318642323716388c6d5c1f807e7a1f31ed8a02a48c6c8f0a5af0655 SHA512 701e97a14015902892c2ea414bbcd61b0d579b53048839a79304fe9d874f5939ba996cd0680fee4fbfb74dfb69d4ad08763fb22ae37e5bcc30226780ed8dbccd
+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
 MISC metadata.xml 666 BLAKE2B 901164cd5d79ae10dedfe4905228912e88f38d9c555f512a31a55dfd5c61a5156f2498af7e1aef59713afda07e7218e922757f8ced95443557e0b8e8d088ceea SHA512 f2f854b15d66c994008195a9b24a6a98db493e3faf38da7324c7ed780df4f34bd029ae5083b0f52e46e5c6ada490e1427ce45cb1a56c07059789c7b12fe4863e
diff --git a/sys-fs/udisks/udisks-1.0.5-r3.ebuild b/sys-fs/udisks/udisks-1.0.5-r3.ebuild
index 74ffc984dd33..9b9799bc30af 100644
--- a/sys-fs/udisks/udisks-1.0.5-r3.ebuild
+++ b/sys-fs/udisks/udisks-1.0.5-r3.ebuild
@@ -16,6 +16,7 @@ IUSE="debug +lvm nls remote-access selinux"
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
 	>=dev-libs/glib-2.30
 	>=dev-libs/libatasmart-0.19
+	dev-libs/libgudev:=
 	>=sys-auth/polkit-0.110
 	>=sys-apps/dbus-1.6
 	>=sys-apps/sg3_utils-1.27.20090411
@@ -24,7 +25,6 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
 		>=sys-fs/lvm2-2.02.66
 		<sys-fs/lvm2-2.02.183
 	)
-	virtual/libgudev:=
 	virtual/libudev:=
 	virtual/udev
 	selinux? ( sec-policy/selinux-devicekit )"
diff --git a/sys-fs/udisks/udisks-2.8.2.ebuild b/sys-fs/udisks/udisks-2.8.2.ebuild
index 61965b270ccd..134f857287de 100644
--- a/sys-fs/udisks/udisks-2.8.2.ebuild
+++ b/sys-fs/udisks/udisks-2.8.2.ebuild
@@ -18,9 +18,9 @@ REQUIRED_USE="?? ( elogind systemd )"
 COMMON_DEPEND="
 	>=dev-libs/glib-2.50:2
 	>=dev-libs/libatasmart-0.19
+	>=dev-libs/libgudev-165:=
 	>=sys-auth/polkit-0.110
 	>=sys-libs/libblockdev-2.19[cryptsetup,lvm?,vdo?]
-	>=virtual/libgudev-165:=
 	virtual/udev
 	acl? ( virtual/acl )
 	elogind? ( >=sys-auth/elogind-219 )
diff --git a/sys-fs/udisks/udisks-2.8.3.ebuild b/sys-fs/udisks/udisks-2.8.3.ebuild
index 2db934f25193..b49a758bd22f 100644
--- a/sys-fs/udisks/udisks-2.8.3.ebuild
+++ b/sys-fs/udisks/udisks-2.8.3.ebuild
@@ -18,9 +18,9 @@ REQUIRED_USE="?? ( elogind systemd )"
 COMMON_DEPEND="
 	>=dev-libs/glib-2.50:2
 	>=dev-libs/libatasmart-0.19
+	>=dev-libs/libgudev-165:=
 	>=sys-auth/polkit-0.110
 	>=sys-libs/libblockdev-2.19[cryptsetup,lvm?,vdo?]
-	>=virtual/libgudev-165:=
 	virtual/udev
 	acl? ( virtual/acl )
 	elogind? ( >=sys-auth/elogind-219 )
diff --git a/sys-fs/udisks/udisks-2.8.4.ebuild b/sys-fs/udisks/udisks-2.8.4.ebuild
index 2db934f25193..b49a758bd22f 100644
--- a/sys-fs/udisks/udisks-2.8.4.ebuild
+++ b/sys-fs/udisks/udisks-2.8.4.ebuild
@@ -18,9 +18,9 @@ REQUIRED_USE="?? ( elogind systemd )"
 COMMON_DEPEND="
 	>=dev-libs/glib-2.50:2
 	>=dev-libs/libatasmart-0.19
+	>=dev-libs/libgudev-165:=
 	>=sys-auth/polkit-0.110
 	>=sys-libs/libblockdev-2.19[cryptsetup,lvm?,vdo?]
-	>=virtual/libgudev-165:=
 	virtual/udev
 	acl? ( virtual/acl )
 	elogind? ( >=sys-auth/elogind-219 )
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index db22426a5d0a..f79504ec0030 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -3,5 +3,5 @@ DIST vhba-module-20190827.tar.bz2 15570 BLAKE2B 54a50f14659e388c0d53edce842633a3
 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 1152 BLAKE2B 647af5526d5e9fa94d7872ccd9d4ddc0231667416eda790346df121a22d0cb7cd5b218eee2f681c4ad095692e7ef2a89c3c99d6af478b41a8b7e4ddc00839c4f SHA512 e54af6afcd856f417ece53880bce3f0c6611c7375b4b99f4ee85743f9a08904dfc967fb5cba76bbf0b9958eebb75532ed77572ac4c6b6d82be1417bcceceec67
+EBUILD vhba-20190831.ebuild 1151 BLAKE2B fffe1bb91f6716ce6029744de204d9c321f9cd8faa693c0bcf26dc00c8c3b8b0a2df3f0114f2501a0d05a21d3b38d3daad3a3b03032a8b89a449eb76a6956e46 SHA512 4b5c50ac0fe34a29644f8a136a79834469258c2ccac7ccc135b22fb80a187986e66cfcd21f6b6bc106d6dfd1621dfc245285faa5213712c9dfceb3f0d161e781
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/sys-fs/vhba/vhba-20190831.ebuild b/sys-fs/vhba/vhba-20190831.ebuild
index 5dea07de5793..a30a5eb38cc0 100644
--- a/sys-fs/vhba/vhba-20190831.ebuild
+++ b/sys-fs/vhba/vhba-20190831.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://download.sourceforge.net/cdemu/vhba-module/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE=""
 
 RDEPEND="virtual/udev"
diff --git a/sys-fs/wpflash/Manifest b/sys-fs/wpflash/Manifest
deleted file mode 100644
index c42e6b889eb8..000000000000
--- a/sys-fs/wpflash/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX wpflash-gentoo.patch 5050 BLAKE2B 528241546947b4cee097d1b41a9a9aff2b1b14857ab88eb10a0d23ea6fd408ca897ed3f63158400a2f3c22c3e45316c23d5c46d34ee0d7206d165ea48719bacb SHA512 1d6be3acd401a27917ed8da6a773505a3a54983db0e958422d3f75f2042f50d43ef1c5cf6f81a73a9a109f2cbaf5cc0179a5651ff47a224855cbd12583030cee
-DIST wpflash.c 25813 BLAKE2B 904eb93626db284ec16a790f301473f7a5d7b1f6fc5e281ff7f7c0eba121554199c9a8edd129136f85db75eab9310caa83618578db9993193a28a3666c30a33f SHA512 b0605b15d29a96d8dae052131f0a55b09eb230d05543c8a25a727ac3820397459d108c9b19fa95726ca7df12b4a733480f5c01587deee24a5fb8be9d1a0beeba
-EBUILD wpflash-0.ebuild 568 BLAKE2B 00273ba05aeb0fff25828ebf89cc7eb1db5a8cf607c1bf6358cff5dac03a89a592e333c42d3ce4a3e103f4089350e98d2fb41a920e6d4ecfe6487d6a168ea03a SHA512 5da5354095a13b39acbcaf49d79c8b4046973a2ed00c9ac729c2d8c28f59667fd36dc2c64cc990be7e9f2a3550ba7f2dcbb88c5ebf29c4150d4568bc6c7c0acc
-MISC metadata.xml 255 BLAKE2B a9541f4bfab6e4a12975e8b3d56e433e65828b6376510448f11930d35451e23cad5bbf264180f150629ce9c1dea24eb7fb4f2b3f950ee5ff5d345811e017773a SHA512 4408b5018e974df4d7508f29e255f318bbd09b4056927cae6406ff1f427c06d5d655f677a28440cb84af04e411c88e4582f9ad1ea76829afeee0bbe4e3841c2f
diff --git a/sys-fs/wpflash/files/wpflash-gentoo.patch b/sys-fs/wpflash/files/wpflash-gentoo.patch
deleted file mode 100644
index 8706b9ceec36..000000000000
--- a/sys-fs/wpflash/files/wpflash-gentoo.patch
+++ /dev/null
@@ -1,223 +0,0 @@
---- wpflash.c
-+++ wpflash.c
-@@ -5,6 +5,9 @@
- #include        <termios.h>
- #include	<linux/ppdev.h>
- #include	<sys/ioctl.h>
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <string.h>
- 
- int do_write(int, void *, int);
- int do_read(int, void *, int);
-@@ -74,6 +77,13 @@ struct partition_table {
- struct partition modified;
- struct partition *find_partition(char *);
- 	
-+void usage();
-+void bad_partition(char *name);
-+int erase_sector(int addr);	
-+int read_object(char *filename, char *memory, int rom_size);
-+int read_raw(char *filename, char *memory, int rom_size);
-+int write_flash(int addr, char *buffer, int length);
-+int read_flash(int addr, char *buffer, int length);
- 
- /* This structure defines the sectors
-    on the FLASH */
-@@ -199,7 +209,8 @@ find_partition(char *name)
- 			return fixup_partition(partition);
- 		partition++;
- 	}
--	bad_partition();
-+	bad_partition(name);
-+	return NULL;
- }
- 
- /* Initialize a "cmd" structure */
-@@ -224,6 +235,7 @@ set_cmd(struct cmd *cmd, char type, int 
-    waiting for "CONTROL-A" to signal it should jump
-    to the programming code */
- 
-+void
- wait_boot_prompt()
- {
- 	char line[256], *s;
-@@ -236,7 +248,7 @@ wait_boot_prompt()
- 		else if (*s == '\n') {
- 			*s = 0;
- 			if (strcmp(line, "Enter CTRL-A to enter programmer.") == 0)
--				return 1;
-+				return;
- 			s = line;
- 		} else {
- 			s++;
-@@ -246,6 +258,7 @@ wait_boot_prompt()
- 
- /* Erase a partition */
- 
-+int
- erase_partition(char *name) {
- 
- 	struct partition *partition = find_partition(name);
-@@ -328,16 +341,18 @@ erase_partition(char *name) {
- 		}
- 	}
- 	printf("done.\n");
-+
-+	return 0;
- }
- 
- /* Program a partition */
- 
- 
-+int
- program_partition(char *name, char *filename, int hexdump)
- {
- 	struct partition *partition = find_partition(name);
- 	int addr, maxaddr, maxpgm, addrincr, startaddr;
--	int i;
- 
- 	/* Load data to be programmed in either hex or binary
-            format */
-@@ -384,6 +399,7 @@ program_partition(char *name, char *file
- 
- /* Read a partition */
- 
-+int
- read_partition(char *name, char *filename)
- {
- 	struct partition *partition = find_partition(name);
-@@ -421,13 +437,17 @@ read_partition(char *name, char *filenam
- 	return(0);
- }
- 
-+int pp_open();
-+int hello();
-+int initialize();
-+int device_id(int *deviceID1, int *deviceID2);
-+int device_id_v0(int *deviceID1, int *deviceID2);
-+int double_wide();
-+int parse_flash_params(char *filename);
-+
-+int
- main(int argc, char **argv) {
--        struct termios termios;
--        char c;
--        int i;
--        int cpid;
--	int count;
-- 	int maxcount;
-+	struct termios termios;
- 	int version;
- 	int deviceID1, deviceID2;
- 	struct flash_chip *f;
-@@ -607,6 +627,8 @@ main(int argc, char **argv) {
- 	/* If we got to here, an invalid operation was specified */
- 
- 	usage();
-+
-+	return 0;
- }
- 
- /* Reads a block of data from the flash.
-@@ -632,7 +654,7 @@ read_flash(int addr, char *buffer, int l
- 	for (count = 0; count < length + 1; count = count + readl) {
- 		readl = do_read(sfd, buffer+count, length+1-count);
- 		if (readl == 0)
--			exit;
-+			exit(0);
- 	}
- 
- 	/* Check checksum at end of data */
-@@ -662,7 +684,6 @@ write_flash(int addr, char *buffer, int 
- 	struct cmd cmd;
- 	int count;
- 	int checksum;
--	int readl;
- 	char checksumbuf[1];
- 
- 	/* Build and send "W" command to programmer.
-@@ -705,6 +726,7 @@ write_flash(int addr, char *buffer, int 
- 
- /* Send initialize command */
- 
-+int
- initialize() {
- 	struct cmd cmd;
- 	char checksumbuf[1]; 
-@@ -770,6 +792,7 @@ int device_id_v0(int *deviceID1, int *de
-    Note supported on Version 0 programmers. */
- 
- 
-+int
- double_wide() {
- 	struct cmd cmd;
- 	char checksumbuf[1]; 
-@@ -835,6 +858,7 @@ hello() {
- 
- /* Send erase (whole flash) command */
- 
-+int
- erase() {
- 	struct cmd cmd;
- 	char checksumbuf[1]; 
-@@ -857,6 +881,7 @@ erase() {
- 
- /* Send erase sector command */
- 
-+int
- erase_sector(int addr) {
- 	struct cmd cmd;
- 	char checksumbuf[1]; 
-@@ -900,7 +925,7 @@ hex(char c) {
- 
- int parse_line(char *buffer, char *mem, int rom_size, int *max_mem) {
-    char *c = buffer;
--   unsigned int address, word_addr;
-+   unsigned int address;
-    unsigned int length,type;
-    unsigned int checksum = 0;
-    int count = 0;
-@@ -1020,10 +1045,7 @@ int
- read_raw(char *filename, char *memory, int rom_size)
- {
-    FILE *f;
--   char line[80];
--   int lines_read = 0;
-    int count = 0;
--   int bytes ;
-    static int max_mem;
- 
-    max_mem = 0;
-@@ -1042,7 +1064,7 @@ read_raw(char *filename, char *memory, i
-       exit(1);
-    }
- 
--   while (count = fread(memory, 1, 1024, f)) { 
-+   while ((count = fread(memory, 1, 1024, f))) { 
-       memory += count;
-       max_mem += count;
-     }
-@@ -1053,12 +1075,13 @@ read_raw(char *filename, char *memory, i
-    return max_mem;  //return highest memory address used
- }
- 
--bad_partition(char *name)
-+void bad_partition(char *name)
- {
- 	fprintf(stderr, "Unknown partition: %s\n\n", name);
- 	usage();
- }
-   
-+void
- usage() {
- 	struct partition *partition = partition_table;
- 
-@@ -1077,6 +1100,7 @@ usage() {
- 	exit(1);
- }
- 
-+void
- pp_write(int fd, char value)
- {
- 	u_char d = value;
diff --git a/sys-fs/wpflash/metadata.xml b/sys-fs/wpflash/metadata.xml
deleted file mode 100644
index 3101c4efc863..000000000000
--- a/sys-fs/wpflash/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>arm@gentoo.org</email>
-	<name>Gentoo Linux ARM Development</name>
-</maintainer>
-</pkgmetadata>
diff --git a/sys-fs/wpflash/wpflash-0.ebuild b/sys-fs/wpflash/wpflash-0.ebuild
deleted file mode 100644
index c50fd6d7e3b9..000000000000
--- a/sys-fs/wpflash/wpflash-0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-inherit eutils
-
-DESCRIPTION="flash the firmware on a Webpal"
-HOMEPAGE="http://webpal.bigbrd.com/"
-SRC_URI="http://webpal.bigbrd.com/wpflash.c"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
-RESTRICT="bindist mirror"
-
-DEPEND=""
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}"/${A} "${WORKDIR}"/ || die
-	epatch "${FILESDIR}"/${PN}-gentoo.patch
-}
-
-src_compile() {
-	emake wpflash || die
-}
-
-src_install() {
-	dosbin wpflash || die
-}
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 1f40f8de61c0..fef4de7c9be3 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -2,11 +2,7 @@ AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b
 AUX xfsprogs-4.15.0-sharedlibs.patch 3022 BLAKE2B cfa23520a55750af375ada8c35fb9f4b3ea2f401ddebd95aef6d46f9195ac6ab3fb38f5f9d08529d3c2658623a49eadc7db0be68159753025310605fdfc35a6b SHA512 5a6e62f2914e372f2bf679b10c32fe65f60677b4bf0e58f60c40a297ed8974d5ec0af3bcba5801ba19cadbb689a6dad62c1e2cd88587f6f3d30f21f1472f3ac0
 AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13fe3d217a6c4c8dd21fce1986793cefaa4777e827945adb3807f2d644665fbf66e7fbd5318d6f5c58d37c49260c24ca46181 SHA512 2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7
 DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775 SHA512 a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58
-DIST xfsprogs-5.1.0.tar.xz 1223736 BLAKE2B bfadb13cf3a4f9231eb13f4e7d3c803c2143abb776c0fee758ea7257097ef3fb79253c16133942041c20ff6078a1704fa18d08866c6a2e1a61b63f4de11d00c7 SHA512 ca5959edb299be8574b2ca51e907a418fab796ae92f588075a2aab0c2a3cf8dae49e2b68679c65c361201223e8f8ac29b1e5618eb1e519496c3aca9218620881
-DIST xfsprogs-5.2.0.tar.xz 1225884 BLAKE2B bec075d2adbafc5f6be215b658b8617141ade481558477525251c8547162f462af5464af5ac25d9498aca99b960a59071cc6651c36c6d30e5757e8d177c1b898 SHA512 b65ffb4d293f1ee0a9ec5aa35bf7a9491c2d536ad0da7f8e1d533743caebd98abffd1b93508969bac4135dc15434a9e170a516cedd373466ef762b65029f013f
 DIST xfsprogs-5.2.1.tar.xz 1227012 BLAKE2B af6c25d88d0a50fc82ecb2d9d00545ffdf906d6e85361360130b5a2b0d362e566c097f15be04a61023bd5c7815b77d0bab6258d8f188c5afe68098c51ae26ee0 SHA512 a2ecd8e2ae8a4e7357b4133beaeffeae4d6c9d0ece9855d9780a84c2d4072e3d4e0b8ffa3baa995862ec38dcbc5dd74205f7f4456676826082c4811867508a43
 EBUILD xfsprogs-4.19.0.ebuild 2434 BLAKE2B cc6ca0e0425994414497bb9ac27541408958d9da936a659028b38cdaf3ed6527c741efeff812b023ce513b091b301723fa21fce1a4512939c5d3f6ddb8f42ab4 SHA512 bcef5fcc339809950886dd2a37fa696892216e1ddc5fc85b773ba40fe94fd1430a0b34b71a1ea22ce5d3cb947a8de23c800993067b5f909358ed037a2c18a198
-EBUILD xfsprogs-5.1.0.ebuild 2466 BLAKE2B 568609a5a361342a9eba9c591910ef0304f0a362dcddd3c4629671bcc28600b9155e17a59111bdd28e90d4be51f26d9e0ca4c313b0daea82fe4eafd4af77813e SHA512 5a4c27c82ea4e20c0e8a1428cbbff72e58c84e72281dbe2e5a91fb52ab3e6824fe778e375c0c8318df1ebf83975c5bef637b4749e21fc5f5309d8b82743867a0
-EBUILD xfsprogs-5.2.0.ebuild 2847 BLAKE2B 21b2d3dd8fb503e435a97af0bec0b2a6d4c51dc3be92bf1bc12c41e568e154b44d41e5c559c5893da7962ad05d9a08f25ee3f9f51983ece8631c8601d942a7f6 SHA512 c76c5830628b64bbed2af76f3529e6354bcc9c89667836c107c7f8f25bbac48de6ef5b36b55b71273441a0a17289f51ee12017c23ed0c2bf16448e5f16160466
-EBUILD xfsprogs-5.2.1.ebuild 2782 BLAKE2B 13add8a58236a489688016d3d58800be7542c8ae31d334c72999fc7bc280063112ce5c642da5b01cd922d9c54706899e72c8af7b9becd8c910c4314cb30f39f3 SHA512 9c51e3b40019277aeb1751bc5686157601cdb9b477e086584d5d68866b1f2062690ad2e85f4140d4f5a9f13468609df041007c5e077e848da300083c62d051d7
+EBUILD xfsprogs-5.2.1.ebuild 2781 BLAKE2B 5de2467f44d58ccdbf060143464002ba7bbd3b26da7bf47879dd56f2f161357e3e732283d7ec64e64ad11b98018ccb0b6ecc6f1e53b3d74935572689aff935b4 SHA512 a99e84cf41b7d1ab16a85e3a77bbb9c4cc2cd4f43725ed62fe62042f55e2c30dba63dafc4ed977b03082492dc267351687d0687c5a5fe375f9e34f08c9b2dd8c
 MISC metadata.xml 338 BLAKE2B cdf07fec58a2401c154a3fdb7d5326065143eeac8dbe78078012d643dc3872bc2df79cc734c033c2030d356f2366dad8ad1da553bc268fd0318ab3ba971c4b5e SHA512 1a085c94d623db2cc55d987afb66265ab51e94c8868bc7c169cc669b58f8a8c5a1d81f503aa838d5c2a84f2a0bf923f73314048b49eb1e139d91eca6f71e119e
diff --git a/sys-fs/xfsprogs/xfsprogs-5.1.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.1.0.ebuild
deleted file mode 100644
index 2bba45900dee..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-5.1.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib systemd usr-ldscript
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="icu libedit nls readline static-libs"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-	icu? ( dev-libs/icu:=[static-libs(+)] )
-	readline? ( sys-libs/readline:0=[static-libs(+)] )
-	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
-	"${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
-	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
-)
-
-pkg_setup() {
-	if use readline && use libedit ; then
-		ewarn "You have USE='readline libedit' but these are exclusive."
-		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Clear out -static from all flags since we want to link against dynamic xfs libs.
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-	# Don't install compressed docs
-	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
-	find -name Makefile -exec \
-		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-}
-
-src_configure() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-
-	local myconf=(
-		--disable-lto #655638
-		--enable-blkid
-		--with-crond-dir="${EPREFIX}/etc/cron.d"
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		$(use_enable icu libicu)
-		$(use_enable nls gettext)
-		$(use_enable readline)
-		$(usex readline --disable-editline $(use_enable libedit editline))
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-
-	MAKEOPTS+=" V=1"
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" install
-	# parallel install fails on this target for >=xfsprogs-3.2.0
-	emake -j1 DIST_ROOT="${ED}" install-dev
-
-	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a handle xcmd xfs xlog frog
-	# removing unnecessary .la files if not needed
-	if ! use static-libs ; then
-		find "${ED}" -type f -name '*.la' -delete || die
-	fi
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-5.2.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.2.0.ebuild
deleted file mode 100644
index 22a5cc55eeaa..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-5.2.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs systemd
-
-DESCRIPTION="xfs filesystem utilities"
-HOMEPAGE="https://xfs.wiki.kernel.org/"
-SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="icu libedit nls readline"
-
-LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
-	icu? ( dev-libs/icu:=[static-libs(+)] )
-	readline? ( sys-libs/readline:0=[static-libs(+)] )
-	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
-RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
-	"${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
-	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
-)
-
-pkg_setup() {
-	if use readline && use libedit ; then
-		ewarn "You have USE='readline libedit' but these are exclusive."
-		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
-	fi
-}
-
-src_prepare() {
-	default
-
-	# Fix doc dir
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		include/builddefs.in || die
-
-	# Don't install compressed docs
-	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
-}
-
-src_configure() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-
-	# Upstream does NOT support --disable-static anymore,
-	# https://www.spinics.net/lists/linux-xfs/msg30185.html
-	# https://www.spinics.net/lists/linux-xfs/msg30272.html
-	local myconf=(
-		--enable-blkid
-		--with-crond-dir="${EPREFIX}/etc/cron.d"
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		$(use_enable icu libicu)
-		$(use_enable nls gettext)
-		$(use_enable readline)
-		$(usex readline --disable-editline $(use_enable libedit editline))
-	)
-
-	if is-flagq -fno-lto ; then
-		einfo "LTO disabled via {C,CXX,F,FC}FLAGS"
-		myconf+=( --disable-lto )
-	else
-		if is-flagq -flto ; then
-			einfo "LTO forced via {C,CXX,F,FC}FLAGS"
-			myconf+=( --enable-lto )
-		elif use amd64 || use x86  ; then
-			# match upstream default
-			myconf+=( --enable-lto )
-		else
-			# LTO can cause problems on some architectures, bug 655638
-			myconf+=( --disable-lto )
-		fi
-	fi
-
-	econf "${myconf[@]}"
-}
-
-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
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" install
-	# parallel install fails on this target for >=xfsprogs-3.2.0
-	emake -j1 DIST_ROOT="${ED}" install-dev
-
-	# removing unnecessary .la files if not needed
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-5.2.1.ebuild b/sys-fs/xfsprogs/xfsprogs-5.2.1.ebuild
index a546b735ad7c..9aea191d9021 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.2.1.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.2.1.ebuild
@@ -97,7 +97,7 @@ src_compile() {
 }
 
 src_install() {
-	emake DIST_ROOT="${ED}" install 
+	emake DIST_ROOT="${ED}" install
 	emake DIST_ROOT="${ED}" install-dev
 
 	# removing unnecessary .la files if not needed
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 23c81b78d684..bf38f2e37725 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -6,8 +6,8 @@ AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b
 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.ebuild 6286 BLAKE2B 8ff2c44069a13fe26b02a7a490ffcf1cb9833f5d5ba9ca1b151e1ed6bcc706bc46083a86663c073660d7a80792989335f8a1f4d71d162fcc8a16a635336ef175 SHA512 35127bc47361845a18bba3b60b27ae900a16ad2b94c1c479a62b30079b6688236b2feccb9d902ce93e3d8ff0a95504bc00d52fba6120b763d69057227e50a8a6
+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.ebuild 5671 BLAKE2B 97ef4ebe3e70b2973c85b8dff5479d305fce75724651b713502947c738dee5eadac56410ce1f5fc30be5a2988a5e65c4ce80a274113e4e5da338e78c09816108 SHA512 d16a6c746dff79e7c73315a6ca1923af354efe0cea660a25bfd667e9b71dd3888d8c624a8c75fb869b67128a2cb384f58b0bad0b5084cbae5259109e4575db69
-EBUILD zfs-9999.ebuild 5568 BLAKE2B ef7d928b722c7463c15b801f00547e626a706f7d48cdee04e68fc011e8684181c34dce9c7fa633514e1973a3f38537c3d5f23e6319f4d54b5291e30e29a77a6a SHA512 ab819d02e7b537c8c18e32bd2b657ca4c6e566b9cd5b1a17f242a925258a2b88d6c828274c83d5e252bbd7e979f27776243508cb2408bdb6035b3c4fec157faa
+EBUILD zfs-0.8.2-r1.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/zfs-0.7.13.ebuild b/sys-fs/zfs/zfs-0.7.13-r1.ebuild
index 18349e7f7c5b..18349e7f7c5b 100644
--- a/sys-fs/zfs/zfs-0.7.13.ebuild
+++ b/sys-fs/zfs/zfs-0.7.13-r1.ebuild
diff --git a/sys-fs/zfs/zfs-0.8.2.ebuild b/sys-fs/zfs/zfs-0.8.2-r1.ebuild
index dd0ca35654dc..55c311aac94b 100644
--- a/sys-fs/zfs/zfs-0.8.2.ebuild
+++ b/sys-fs/zfs/zfs-0.8.2-r1.ebuild
@@ -29,7 +29,7 @@ DEPEND="
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
 	virtual/awk
-	virtual/libudev[static-libs?]
+	virtual/libudev[static-libs(-)?]
 	libressl? ( dev-libs/libressl:0=[static-libs?] )
 	!libressl? ( dev-libs/openssl:0=[static-libs?] )
 	python? (
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 220b7d7b8ebd..a29a5f7f0679 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -29,7 +29,7 @@ DEPEND="
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
 	virtual/awk
-	virtual/libudev[static-libs?]
+	virtual/libudev[static-libs(-)?]
 	libressl? ( dev-libs/libressl:0=[static-libs?] )
 	!libressl? ( dev-libs/openssl:0=[static-libs?] )
 	python? (