gentoo resync : 06.08.2019

38 files changed, 396 insertions, 394 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 275c3e31875e..225925ecbf43 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest
index 401bbcaa3159..1c9c7e68cc4a 100644
--- a/sys-fs/avfs/Manifest
+++ b/sys-fs/avfs/Manifest
@@ -1,9 +1,7 @@
-DIST avfs-1.0.4.tar.bz2 719761 BLAKE2B 6bbe47136a6aedd399800ea3ee16f82c367e11f723785ebacf4ef7bd12319ad2f8fe528580e20f368934423ee41afc75b9a73ce7389a100f70e42180e2fb2dcc SHA512 3cfda7a471b5e696984acf9101312e898bc68fe16196bfee8e6a255bd182c279a6ad53fee09c0d6554a968f837e97652e95d794fa46f0d384dd41ae426d49516
-DIST avfs-1.0.5.tar.bz2 723937 BLAKE2B 49a7ba0f88e126804c8ae12d1ad9a2924311198baee85f56a17c1e9dd810bdac8d519f0fc8a8cf23b5e4d7319460108e3e27cb28a1dc7320760c42f7257460d0 SHA512 d50d8fc31a56a0dac17a14c19de3f1bae2519feb965768810d19192eba6dbe24ab181c4574ff8982883d9b76f77241a1e27f3ef12d05ab8112f3caf14e59bd3c
 DIST avfs-1.0.6.tar.bz2 729592 BLAKE2B 41c703e92921ba9393d95455f7d3dd18587b2d7f2ff46de02d290515cf6c8182d19ff117a7ce040ccaab491240b4f27a3ebd58026045ae9b0d69f47a8beeabc7 SHA512 6b9c070896c5d5abbb6a8c14a7dfd39d9b58d13a6db122b5bf1756b2da7435dfbc00a1fd04bedf99b94b76d9ec7f8c05fccc21de6b9e713fc60cfe0ec88064b4
 DIST avfs-1.1.0.tar.bz2 605637 BLAKE2B c9c64d1fdcda84ede92e0a8896e0b6508f6f2b2f086acd1edeacc87d01ba431d052d51535abd483a0652cf999df842432d02a8e90049ddeb7c5d9a269e2e5885 SHA512 415a52bfecb58cc67818a7e247e0cc40892c81431cdf13a607b4a233aa312ac900f1d33c060aa7495df50c3dda553115ab0b159950811318ca6850847ddbd4fa
-EBUILD avfs-1.0.4.ebuild 1491 BLAKE2B 44b686e4f157e63704afe64ceee6d000b81665e2e66263eaefb104baa63906dae2471b54e4b18514dbbf90658eb25ad8f8e5cf45e23f19c97143ca6ff0fd98aa SHA512 1428602ce6a1770e82b1a958e35f9fcb51dc244cafc6bd9dbecff1d5f4b8a0748fb23dc517c2703e19096c1a48f2ad8e671d33ed217ed41415ffb9b352da2f5c
-EBUILD avfs-1.0.5.ebuild 1495 BLAKE2B 6e3ba071c4ff9722a71fd3886798565145b62fbbb298a7199153814eac56ae2c13536032e260c8733dccf585d40442e5d50c8d82854ac674e67d22c612378a87 SHA512 59fc962e1989ad8759dbe8c93511c738dd4fdc276a462348249a7dfee8b6a93adc9a3f4978ddc317dc6e424888d2ea95299d052fd1bd4c3d4cf10c506b97bebc
+DIST avfs-1.1.1.tar.bz2 606819 BLAKE2B 240bb342dc9f993ac8deb60941411b1419c190f9909b5b1bde65777b82f622e121f44f238d2bd8ddc303c86ef376950d4af773c8fae79848b466ec3a3c5aafc1 SHA512 0707f8e746d8d3633755b1a1efb944a400c095b517a7befd75de4d25e2fad1a1b5132b9cf94285b05ad1344bfc138ec75e9cb5f8a5d7775a69595b9b35266f92
 EBUILD avfs-1.0.6.ebuild 1493 BLAKE2B d362bed34a4ad4b28ec669ba4e87b3762adc824e3a6b9014aee0b4d8bc0fb711b7be80221f9a7619fed5f834e108aeeda7566a8be650a56971919539562cda17 SHA512 ca67c66c16f0a4a5e12aef9bd9dce0379b6c5da25626168f6b536658613452bedae198c502bc119a64640210611c47a2b58ac595a95950d4911a4f6aa40a0af7
 EBUILD avfs-1.1.0.ebuild 1485 BLAKE2B 0d6c8890fd19de44803b8c8b271b167e8f1e82349cdfe5b5a303846cb6aa450ab6be18904a1fc37525e68320543b2902bd0dedc5457a64cfd95fd8b1dcb24ee2 SHA512 a654908b37c840774128d6c77b397346d812b0c7d00d937594e4d89f1d8f5abf0a761b66b4d7c24fc2838a6c6889245c7b57feac65a2995f10d772c088102a2b
+EBUILD avfs-1.1.1.ebuild 1494 BLAKE2B a9076c09d451277a427871db0d1d502f76714c2f0f3fb4c1dcc7cb0617bb9335f948917afad05c723a09c6b21a9caa0d80bd1f5218c94d078a3c3520b2072621 SHA512 c49eb991267b1610f7c2d87d51fe19d5efdccf967a1af4b958e58b285b554b10162c6624c8e96067383ae803b1fe23c9297fcbea6c84e5c08ece76ccb2df1999
 MISC metadata.xml 319 BLAKE2B d0597cca90871778d014601140806702319a3a34784c9864d4e70a5b72fd04ec566622d8be8ba1fa3363ca5964ba63822af72ef524767c86b2f9f5535ed846b3 SHA512 805edf3205c69e9bb435c3b86d259e08044da746dfa6205343ccf4e2c2f802c8b51324d140e567a32019f79b5dc63203222221ddc9bc881683d8c9d511a38540
diff --git a/sys-fs/avfs/avfs-1.0.4.ebuild b/sys-fs/avfs/avfs-1.0.4.ebuild
deleted file mode 100644
index a96449ae56b2..000000000000
--- a/sys-fs/avfs/avfs-1.0.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit ltprune
-
-DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files"
-HOMEPAGE="https://sourceforge.net/projects/avf"
-SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 x86"
-IUSE="static-libs +lzma"
-
-RDEPEND=">=sys-fs/fuse-2.4:0
-	sys-libs/zlib
-	app-arch/bzip2
-	lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		--enable-fuse \
-		--enable-library \
-		--enable-shared \
-		--with-system-zlib \
-		--with-system-bzlib \
-		$(use_enable static-libs static) \
-		$(use_with lzma xz)
-}
-
-src_install() {
-	default
-
-	# remove cruft
-	rm "${D}"/usr/bin/{davpass,ftppass} || die
-
-	# install docs
-	dodoc doc/{api-overview,background,FORMAT,INSTALL.*,README.avfs-fuse}
-	dosym ../../../$(get_libdir)/avfs/extfs/README /usr/share/doc/${PF}/README.extfs
-
-	docinto scripts
-	dodoc scripts/{avfscoda*,*pass}
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		einfo "This version of AVFS includes FUSE support. It is user-based."
-		einfo "To execute:"
-		einfo "1) as user, mkdir ~/.avfs"
-		einfo "2) make sure fuse is either compiled into the kernel OR"
-		einfo "   modprobe fuse or add to startup."
-		einfo "3) run mountavfs"
-		einfo "To unload daemon, type umountavfs"
-		einfo
-		einfo "READ the documentation! Enjoy :)"
-	fi
-}
diff --git a/sys-fs/avfs/avfs-1.0.5.ebuild b/sys-fs/avfs/avfs-1.1.1.ebuild
index 141208a376cf..b89cc6aa4b34 100644
--- a/sys-fs/avfs/avfs-1.0.5.ebuild
+++ b/sys-fs/avfs/avfs-1.1.1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit ltprune
+EAPI=7
 
 DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files"
 HOMEPAGE="https://sourceforge.net/projects/avf"
@@ -17,8 +16,8 @@ RDEPEND=">=sys-fs/fuse-2.4:0
 	sys-libs/zlib
 	app-arch/bzip2
 	lzma? ( app-arch/xz-utils )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 src_configure() {
 	econf \
@@ -42,9 +41,9 @@ src_install() {
 	dosym ../../../$(get_libdir)/avfs/extfs/README /usr/share/doc/${PF}/README.extfs
 
 	docinto scripts
-	dodoc scripts/{avfscoda*,*pass}
+	dodoc scripts/*pass
 
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 }
 
 pkg_postinst() {
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 12c85f1a01ed..f530cadc809c 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -9,7 +9,7 @@ DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186
 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.tar.xz 2047448 BLAKE2B 5b30e82036c33d0fb7b562c3fcd512247cd7946eb0679a5389e6891b205e8b06ed9d4c29fdd1f13f13a5dd30c4204a94ffa78843f9e5001dbb715e67f2efb46a SHA512 a62d3977aa62d7bd71a589525b7dde140fa8f5f2d484d6bd0546606be124b9776667ef3a5e9a084a1ea2b905b6a9125e5892637fcf9cabc79f0707b967aac9c0
+DIST btrfs-progs-v5.2.2.tar.xz 2073592 BLAKE2B 6c477ad2599a2f629b5d85a28dee7286af744e4d684ff9a0e9b5ae433b7b1450ac66caa41103781d159c172d8c6fdf26f4590d1476e457f09d7f52d6ea87e481 SHA512 97eaf3dd8ce1629f0acace23f3eedc7c6942299ddb65cdc3b0a7b623026db1063d72f3c1b6297782705e08dfc4c361384e17b5e27a16e756cd0a81e35e79aa9c
 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
@@ -20,6 +20,6 @@ EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb33
 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.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
+EBUILD btrfs-progs-5.2.2.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.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.2.2.ebuild
index 4680b387969c..4680b387969c 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.2.2.ebuild
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 6c24d8ede072..a304f73da90d 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -13,5 +13,5 @@ EBUILD cryptsetup-1.7.5-r1.ebuild 4033 BLAKE2B 77146c613eefaf677f4a0f77cb773b488
 EBUILD cryptsetup-2.0.5-r1.ebuild 4151 BLAKE2B eb67cb9e3424b5444bf298fafeb3cbf050e5420b4a2137c75e437a13b2b8a1ff642b40186d37f10ee92785074833f833cad44eca3bc3e9c0f91fd710ac9fcc50 SHA512 71c6948ff51c919ac6052ad65355ffb620049049ef21fe6545d39bb6d56adb843d5de25b722911d979becca9945f7d05d7cf1b240bb0d5448513a4fa7baad8cd
 EBUILD cryptsetup-2.0.6.ebuild 4167 BLAKE2B 0aaa413b365a5b3986e3908709e54af38af8191c2086168076d380321c8577cc686826b7f57fb1671bdf45adf141630f65e815842f0cf4703636a8caf7cee46b SHA512 c707d533fcfc71e5adcd3eacd9556ae0d87c65b9e283008daafe5aaa29056ed175bf5354c08638454677b75e99f0f77d51a0ea76a0006bb8812d721a46e8cef7
 EBUILD cryptsetup-2.1.0.ebuild 4411 BLAKE2B 4098102c4571866c9030bb68c489d078b590fe0e7b5cac6e134a90ecff3e083277d82cb9bad9778eaec098268d3ce5b8d89dcbf34f4108334536cc5e7529c789 SHA512 4fc4743afac269525e2bd108bf7bf033719df987acf5d1431be98d75f4af1fee9a3abb07397ec9cba2bb527cbf7f225e235142ed4bb6968eb3a2a721c9f25579
-EBUILD cryptsetup-2.2.0.ebuild 4435 BLAKE2B caca1edde30b54c6617434cf975406cd5d6f8ee6f272bc40f2cd9c6aed31756b6cfc88dcf8160e70abc33f2833843a630b68b8ef1fbcf10473968ec8aa837ecd SHA512 14141c72fe9d5bed000a20d0775e5e001604e94b2b8ef02949bdd987d12af765d0cbbabc01842da1d9115eeb891d521267eb154761cb2076882924661f3823d7
+EBUILD cryptsetup-2.2.0.ebuild 4230 BLAKE2B b79655191d45d68eeece99538db185206cfe825042e98e055d83149d04c538b813ae350733b1bc7ab77fcbdeb6092f47cf10b67124b6f8199d94c39202c1704a SHA512 d1c10829bf880cb841b622819d16148e606f7654758f2e0943143d85292d074c1a52e756151e0a0526aeee5908f782d55d36f44b7c89855e9f38c916272dac2d
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild
index 49cad800b719..8cb062389bc5 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.2.0.ebuild
@@ -13,13 +13,12 @@ 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"
+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 +luks1_default nls pwquality reencrypt static static-libs +udev urandom"
 REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	libressl? ( openssl )
 	static? ( !gcrypt )" #496612
 
 LIB_DEPEND="
@@ -32,7 +31,7 @@ LIB_DEPEND="
 	nettle? ( >=dev-libs/nettle-2.4[static-libs(+)] )
 	openssl? (
 		!libressl? ( dev-libs/openssl:0=[static-libs(+)] )
-		libressl? ( dev-libs/libressl:=[static-libs(+)] )
+		libressl? ( dev-libs/libressl:0=[static-libs(+)] )
 	)
 	pwquality? ( dev-libs/libpwquality[static-libs(+)] )
 	sys-fs/lvm2[static-libs(+)]
@@ -83,11 +82,6 @@ src_configure() {
 		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
@@ -95,7 +89,7 @@ src_configure() {
 		# for later use
 		--with-default-luks-format=LUKS$(usex luks1_default 1 2)
 		--with-tmpfilesdir="${EPREFIX}/usr/lib/tmpfiles.d"
-		--with-crypto_backend=${cryptobackend}
+		--with-crypto_backend=$(for x in ${CRYPTO_BACKENDS//+/} ; do usev ${x} ; done)
 		$(use_enable argon2 libargon2)
 		$(use_enable nls)
 		$(use_enable pwquality)
diff --git a/sys-fs/hfsplusutils/Manifest b/sys-fs/hfsplusutils/Manifest
index b30576b85096..edd7688ac86f 100644
--- a/sys-fs/hfsplusutils/Manifest
+++ b/sys-fs/hfsplusutils/Manifest
@@ -1,9 +1,9 @@
 AUX hfsplusutils-1.0.4-cflags.patch 702 BLAKE2B 90c41a588979dc7966aa9a889d5c200f44e513b5cc04eaef0da904a5f635f325deeae6b68b99436b6e7ccefdb883dc3e8531e08ae81ccaab4024bdc5f1e31317 SHA512 b66a64a085abdb2c6c2b1f8008019ea41e9e4ee4b58ecbbf96aad4500392d1935a9aa9bd2694fc62af7cf196ddf556e754908bbcdeb64842e8e72a3cbb125a05
-AUX hfsplusutils-1.0.4-errno.patch 445 BLAKE2B dd029daea33967741613d5946950686efaf71a4ef8509f74937e0879735ba9872e7e044ea413aebb647058532fb059b10fad0a48c4f50464f2f02d98440f1241 SHA512 c8df462d82870f027c4c9af5e5c8036d8a9eab89f04d46f6bbdd4679325f751296b99f4f48aa36dcf6dde5b4db3a15f6791e6984f9f02f0e58e8cc47516bb8fd
-AUX hfsplusutils-1.0.4-gcc4.patch 6221 BLAKE2B d21d178149a31e19dced7a030bc3d1f5362a477a5128c6ebb37cbaade0b867ad40140f7b94aba049b2c1b16a9a8deb9f00b214b5908a71949ef428273051c384 SHA512 a1919c6aaee1369cf1d99fd0ee5a47051318f624960a52528d546cec5fe6a6c57f4b3f8ce9824457ec9be9b0d8cd3aca816c990542aae50f140bd22d93153616
-AUX hfsplusutils-1.0.4-glob.patch 288 BLAKE2B 2d7366907b417f087ca4965190b5d349d16387d44043aa5864259971adc32e2d071eeb2bdaf63fd1f2e6047a3663d3310f2f95b3a648f5cd83b4223c7fa3dcd9 SHA512 43f2c51977193d4ac1d9f4d056a6bf1bee2d9b82d27e50edfaa35545710e5a8f8010a6606e868c6670e8958fb52a605e3618299fa61dcf943f8a729186a59291
+AUX hfsplusutils-1.0.4-errno.patch 214 BLAKE2B a2b48502ac7789a0d035f5d68bdd2834e93348c2e0463c0043fbef64a7d2a4d7434c3b34fa96765e26d5131351ebe8ea37022bd70d486a05800a75dfb339e8bc SHA512 97cb9d90d57f3ddc1b9083198664db6da755cc40f416d79d7ded4e94846302e1ea9b0ebc389dfc8996c1c30931d686e09abd908d44fc92044081c75a61d57d24
+AUX hfsplusutils-1.0.4-gcc4.patch 5736 BLAKE2B c88d82b15ae7126d61bee78a5f10cab757ae462f73dfa5b7892290e8bd8405c11309162cb72159620e38ed47add63c41b43a0e370e53d712a0bd9311393cee6b SHA512 fb357a52452f6f8b16a9f3c9f02f1a7c213f6b8adfaf7fd7da70a15cb6ec3469ca8705f3dcd6419385a340e7b5644c17c323c6b951f0c56f4776b86ee86b267d
+AUX hfsplusutils-1.0.4-glob.patch 215 BLAKE2B bd1aed8730e8695efc713908d33c64be14cbb24adbc0aa26b01ced08f741f1f8c3af1cd545fe556e1c6c89e0baf26a94b4317653e795103dc058c1ab6cb710c4 SHA512 da53dc8f18f77b15bb8b76bff371515da0fac03ae79bdd8450dad60063fd18f47d0e95577451ff5da285acf167e547ec392aa42ae254d77fc1789ba4cf2025aa
 AUX hfsplusutils-1.0.4-stdlib.patch 403 BLAKE2B 20ee7a1c8d96d8a4aee549a24b0795b0a9f0d4b5e5d3102b50962d03147b7a26f7f29e6f3652c55df912ccc68db104c4565ea2d563b97d7c67abade7affea437 SHA512 23361a4cae07b679cb5c6122cf1a74aac19a11b0b892a369683881ed1bed63cfb1369aa84762b0447f2c91b1226a73c9f42b06fe8cb25a40dd7fc58fbf22806a
 AUX hfsplusutils-1.0.4-string.patch 606 BLAKE2B a9c789fe631c94577c32a330803c490b882c7cccbec213882a297a16e5ef5e0cc4fa805f9df454d4b278ed460eca42189ae1d65c00c4555e0df129bffe68c902 SHA512 5f7d4a7bbbb15479d00d3ff49fac08328b5d3fb4549d3278b43c73025ab4f0f5657c7b084b2671a5e1524a88bbcf5bc459b88c8d944cdc98fbf0c2ba4e6b0339
 DIST hfsplus_1.0.4.src.tar.bz2 185461 BLAKE2B 81b93f59c4e57d80a979b9d9c56b841bcc32747136d01dc0e90afa0af486e527bda241d7c21f0f3f61a5d2efe6215e29499405aad9623a7ec9906b876aa6303f SHA512 94cf6bc8e9d561dea5e8b5860c4ef979f21349d6546c767b43c18156fa1f805e843fae8a64096c147a28886467f5e2012b06b93918773457eaf486b85958b2ee
-EBUILD hfsplusutils-1.0.4-r1.ebuild 1023 BLAKE2B 854bcb31d3f54ab713e87f8d756ac7eb3d335c884a4e8f6918bd9fcda3537851641f5cb0cf4eaa74f57760bb3638e2c617b4dc79c68dc6b5061c255ec12f30be SHA512 f1f59aa8d9e938cbc4b72529eb5474b272d34c1dae30d08fe77ca4e2ce4879d2fd19181c7a14ba369a0870a21b257b8bff9dc2636b4a892104bc22ffd3ac7199
-MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
+EBUILD hfsplusutils-1.0.4-r2.ebuild 1006 BLAKE2B b12ebfcd380b5e741e1ded3f506930b44c17986a09621a69ce5643e81f661ab91519e05cac95159e486f5c72a2582509f01ec26a9e601554534c6c279a213c14 SHA512 726d8386f0945644b7d34161a00c9b3f7c5d6c128cc124d5a24d0ccdf760d091aef6cb1cc3c739844379e46877bcb495a98692a60d4b31751b00bf72d65dd804
+MISC metadata.xml 244 BLAKE2B bd2c6209566a4936a38d9109a9a533aa1669dd50701ff8a96d2a65411aa692517ab70cafd98afcad7058979d62f1a7ac796c5b99a520c0f6ca1ed92cf9e0e207 SHA512 57959095dc10704e073e5517ac49ceee80e42fb1cc3f26b1b7308f872ffda810ce42e0b80ea6da57faa7a759878a9b8d2476fe351fecac1450f9c83751802787
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch
index c9caeb4208fb..f15e56cc1d91 100644
--- a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-errno.patch
@@ -1,6 +1,5 @@
-diff -ruN hfsplus.orig/src/hpmkdir.c hfsplus-1.0.4/src/hpmkdir.c
---- hfsplus.orig/src/hpmkdir.c	2003-03-30 20:09:59.000000000 +0200
-+++ hfsplus-1.0.4/src/hpmkdir.c	2003-03-30 20:11:15.000000000 +0200
+--- a/src/hpmkdir.c
++++ b/src/hpmkdir.c
 @@ -46,8 +46,9 @@
  # include <string.h>
  # include <time.h>
@@ -12,8 +11,3 @@ diff -ruN hfsplus.orig/src/hpmkdir.c hfsplus-1.0.4/src/hpmkdir.c
  # include <stdio.h>
  # include <stdlib.h>
  
-@@ -164,3 +165,4 @@
-     hfsputil_perrorp(argv0);
-     return -1;
- }
-+
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch
index 04724440ddbf..6f633454d3d5 100644
--- a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-gcc4.patch
@@ -1,5 +1,5 @@
---- hfsplus-1.0.4/libhfsp/src/btree.c~	2002-03-05 19:50:28.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/btree.c	2005-04-30 12:48:48.000000000 +0100
+--- a/libhfsp/src/btree.c
++++ b/libhfsp/src/btree.c
 @@ -393,7 +393,7 @@ static int btree_init(btree* bt, volume*
  	{
  	    p = volume_readfromfork(vol, nodebuf, fork, 0, bt->blkpernode,
@@ -9,8 +9,8 @@
  	}
  	
  	bt->alloc_bits = malloc(alloc_size);
---- hfsplus-1.0.4/libhfsp/src/swab.h~	2002-03-05 19:50:29.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/swab.h	2005-04-30 12:48:05.000000000 +0100
+--- a/libhfsp/src/swab.h
++++ b/libhfsp/src/swab.h
 @@ -36,28 +36,28 @@
  
  #define bswabU16(val) bswap_16(val)
@@ -56,8 +56,8 @@
 -#define bstoreU8_inc(ptr,val)	(*((UInt8*) (ptr))++) = val
 +#define bswabU8_inc(ptr)	(*(*((UInt8**) (void *)(&ptr)))++)
 +#define bstoreU8_inc(ptr,val)	(*(*((UInt8**) (void *)(&ptr)))++) = val
---- hfsplus-1.0.4/libhfsp/src/btreecheck.c~	2002-03-05 19:50:29.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/btreecheck.c	2005-04-30 12:49:22.000000000 +0100
+--- a/libhfsp/src/btreecheck.c
++++ b/libhfsp/src/btreecheck.c
 @@ -264,7 +264,7 @@ static int fscheck_btree_init(btree* bt,
  	{
  	    p = volume_readfromfork(vol, nodebuf, fork, 0, bt->blkpernode,
@@ -67,8 +67,8 @@
  	}
  	
  	bt->alloc_bits = malloc(alloc_size);
---- hfsplus-1.0.4/libhfsp/src/fscheck.c~	2002-03-25 15:48:37.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/fscheck.c	2005-04-30 12:50:26.000000000 +0100
+--- a/libhfsp/src/fscheck.c
++++ b/libhfsp/src/fscheck.c
 @@ -230,7 +230,7 @@ static int fscheck_volume_readbuf(volume
      vh->write_count	= bswabU32_inc(p);
      vh->encodings_bmp	= bswabU64_inc(p);
@@ -94,8 +94,8 @@
  	signature = bswabU16_inc(p);	/* offset 0x7C, drEmbedSigWord */
  	if (signature != HFSP_VOLHEAD_SIG)
  	    HFSP_ERROR(-1, "This looks like a normal HFS volume");
---- hfsplus-1.0.4/libhfsp/src/volume.c~	2002-03-26 18:00:29.000000000 +0000
-+++ hfsplus-1.0.4/libhfsp/src/volume.c	2005-04-30 12:51:41.000000000 +0100
+--- a/libhfsp/src/volume.c
++++ b/libhfsp/src/volume.c
 @@ -345,7 +345,7 @@ static int volume_readbuf(hfsp_vh* vh, v
      vh->write_count	= bswabU32_inc(p);
      vh->encodings_bmp	= bswabU64_inc(p);
diff --git a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch
index cd92d0a0a86d..776d69ed825d 100644
--- a/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch
+++ b/sys-fs/hfsplusutils/files/hfsplusutils-1.0.4-glob.patch
@@ -1,5 +1,5 @@
---- src/glob.c.orig	2002-10-09 08:02:31.000000000 -0500
-+++ src/glob.c	2002-10-09 08:02:46.000000000 -0500
+--- a/src/glob.c
++++ b/src/glob.c
 @@ -48,7 +48,7 @@
  
  	switch (*pat)
diff --git a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
index 71cc51b2ebaa..4e624f1b33c8 100644
--- a/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r1.ebuild
+++ b/sys-fs/hfsplusutils/hfsplusutils-1.0.4-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-inherit autotools eutils flag-o-matic
+inherit autotools flag-o-matic
 
 MY_P="hfsplus_${PV}"
 DESCRIPTION="HFS+ Filesystem Access Utilities (a PPC filesystem)"
@@ -12,33 +12,38 @@ SRC_URI="http://penguinppc.org/historical/hfsplus/${MY_P}.src.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc ppc64 x86"
+KEYWORDS="~amd64 ppc ppc64 x86"
 IUSE="static-libs"
 
-DEPEND="app-arch/bzip2"
-RDEPEND=""
+S="${WORKDIR}/hfsplus-${PV}"
 
-S=${WORKDIR}/hfsplus-${PV}
+PATCHES=(
+	"${FILESDIR}"/${P}-glob.patch
+	"${FILESDIR}"/${P}-errno.patch
+	"${FILESDIR}"/${P}-gcc4.patch
+	"${FILESDIR}"/${P}-string.patch
+	"${FILESDIR}"/${P}-stdlib.patch
+	"${FILESDIR}"/${P}-cflags.patch
+)
 
 src_prepare() {
-	epatch "${FILESDIR}/${P}-glob.patch"
-	epatch "${FILESDIR}/${P}-errno.patch"
-	epatch "${FILESDIR}/${P}-gcc4.patch"
-	epatch "${FILESDIR}/${P}-string.patch"
-	epatch "${FILESDIR}/${P}-stdlib.patch"
-	epatch "${FILESDIR}/${P}-cflags.patch"
+	default
+
 	# let's avoid the Makefile.cvs since isn't working for us
+	mv configure.{in,ac} || die
 	eautoreconf
-
-	append-flags -fgnu89-inline
 }
 
 src_configure() {
+	# bug 580620
+	append-flags -fgnu89-inline
+
 	econf $(use_enable static-libs static)
 }
 
 src_install() {
 	default
-	find "${ED}"/usr/ -name libhfsp.la -delete
 	newman doc/man/hfsp.man hfsp.1
+
+	find "${D}" -name '*.la' -delete || die
 }
diff --git a/sys-fs/hfsplusutils/metadata.xml b/sys-fs/hfsplusutils/metadata.xml
index 5eb05198076b..70f78a5392df 100644
--- a/sys-fs/hfsplusutils/metadata.xml
+++ b/sys-fs/hfsplusutils/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-	<email>ppc@gentoo.org</email>
-	<name>Gentoo Linux PowerPC Development</name>
-</maintainer>
+	<maintainer type="person">
+		<email>soap@gentoo.org</email>
+		<name>David Seifert</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/sys-fs/pytagsfs/Manifest b/sys-fs/pytagsfs/Manifest
deleted file mode 100644
index 7c0185e1fb0f..000000000000
--- a/sys-fs/pytagsfs/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pytagsfs-0.9.2.tar.gz 221155 BLAKE2B 6ed2aaa52ba7b970ecb909988ddb69cfbd666360fd4bc5136747b373e9304617b016296cfe870e44c35053020d791fe383c095d7dcb195bd2b974dd2bff97895 SHA512 1c9b8e1e6b40ac2114435b8c973168442ff125560f37cfae36e2bf70da229dc57eec74de77b8a3e35d28a5bd92cec6e559ff6d59b49fd09ba94599409805cac8
-EBUILD pytagsfs-0.9.2.ebuild 976 BLAKE2B df5989ade3c5de5fbb12229b3962d2a803ffc596d974503429ac39a5d54378ecb955f2af961061d0c135bd0f718f8820947d00fb5fdc74308d70690b519ab808 SHA512 0bbd2aff1745e56a32b167a3a17eace9e93e8b42c6b385f1109498e8009056dd42aae4abb977033d7aea831d25280615eb0feab1d924caf4898438892536cc4b
-MISC metadata.xml 325 BLAKE2B 60fe6be54e87bc23253adf6157d9cce5f1b34115d658e4c241c8d870de1185361c714613d6b808321dfabc6a75e5be117d77f48558b54427e7067bdac2c87701 SHA512 e399ddcc17a2686321126a4ad4cbf90c79aa721ecc15ba9e1dfab55cee23ae4f8b10ddd71f4c6de7af39dc0a5a7546a1f7a3fdb028287e4791c7133dcd7aefd5
diff --git a/sys-fs/pytagsfs/metadata.xml b/sys-fs/pytagsfs/metadata.xml
deleted file mode 100644
index 031cc7f8beb0..000000000000
--- a/sys-fs/pytagsfs/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>sping@gentoo.org</email>
-		<name>Sebastian Pipping</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="launchpad">pytagsfs</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/sys-fs/pytagsfs/pytagsfs-0.9.2.ebuild b/sys-fs/pytagsfs/pytagsfs-0.9.2.ebuild
deleted file mode 100644
index 9128fcc77f67..000000000000
--- a/sys-fs/pytagsfs/pytagsfs-0.9.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-DISTUTILS_IN_SOURCE_BUILD=yes
-
-inherit distutils-r1
-
-MY_PV="${PV/_/}"
-MY_P="${PN}-${MY_PV}"
-DESCRIPTION="File system that arranges media files based their tags"
-HOMEPAGE="https://launchpad.net/pytagsfs"
-SRC_URI="http://www.alittletooquiet.net/media/release/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-S="${WORKDIR}/${MY_P}"
-
-RDEPEND=">=dev-python/fuse-python-0.2-r1
-	>=dev-python/sclapp-0.5.2
-	|| ( dev-python/inotifyx
-		( dev-libs/libgamin[python]
-			app-admin/gam-server ) )
-	media-libs/mutagen"
-DEPEND="${RDEPEND}
-	dev-libs/libxml2[python]
-	dev-libs/libxslt
-	app-text/docbook-xsl-stylesheets
-	test? ( dev-python/inotifyx
-		dev-libs/libgamin[python]
-		app-admin/gam-server
-		media-sound/madplay
-		media-sound/vorbis-tools
-		media-libs/flac )"
-
-python_test() {
-	${PYTHON} setup.py test || die
-}
diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index fcd9270dc6fe..9b834d2f9710 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,4 +1,6 @@
 DIST squashfs-tools-ng-0.5.tar.xz 158048 BLAKE2B e8d53336a0955875eaf5a301329f620f6efd27d27d985c760a7eaaded94a60e1a7384f076311101b4a6de36b1330d7b42866079b074b6af1829d4162c1f62b38 SHA512 b39cd6e9627e71eb0fcc59a587612fe062c3f437e11342e6ec1a1fee1e6a51b38dcc881bf9a1d69578ad4686f939ece8ec02ed79a6cc6c69afe06bc6753390bf
+DIST squashfs-tools-ng-0.6.1.tar.xz 203756 BLAKE2B 94d20ed11f53df4b9d6a413ad52e3d968bdbacaa0a68988672eab07664a0b3681f0de916288fdf6ce5f6d4eea4b77af08fe2da3fbbf19cc745a3a24c7ac23ba2 SHA512 f82506d298be4fbf878f68e118dbcf8377fe72ef89d8cb9a24b8cecc23c6d431b021f6b3d5312c0da155ab148a3c55aacb962e8215ac28511b203b5c5dbfb855
 EBUILD squashfs-tools-ng-0.5.ebuild 1069 BLAKE2B fe678e7d13fffbaaeb7722b78db10a16d37f38788ac3850b785ad59aed89787cdc9cb6b867549f78532835e269684efaa74aa7ed6d4f6a5fb2ded18cae5fc380 SHA512 d332d401829b10aac7518df6717ee53f0152380a49789d893b489f8b8895fcda4bc76114346caae218403ba5470a8f4696bec8be22454f94b3cc8207f938c047
-EBUILD squashfs-tools-ng-9999.ebuild 1069 BLAKE2B fe678e7d13fffbaaeb7722b78db10a16d37f38788ac3850b785ad59aed89787cdc9cb6b867549f78532835e269684efaa74aa7ed6d4f6a5fb2ded18cae5fc380 SHA512 d332d401829b10aac7518df6717ee53f0152380a49789d893b489f8b8895fcda4bc76114346caae218403ba5470a8f4696bec8be22454f94b3cc8207f938c047
+EBUILD squashfs-tools-ng-0.6.1.ebuild 983 BLAKE2B af83b5bade10a52a5429ba33672ac17bca57ecfd2f88a3a4b93197a786913f2bada77d0b509ff4bb5719400afa3f764b71826665adb5b9887f49b6bb03b7ef0d SHA512 1b0b2367c3bb73aa284955b93b68f258bfd4c3727036ed4d0a083a60306c74077734ce7b560663d7972bff239115722c13f5a83c75bc5a7e41f0332aac4ec2b9
+EBUILD squashfs-tools-ng-9999.ebuild 983 BLAKE2B af83b5bade10a52a5429ba33672ac17bca57ecfd2f88a3a4b93197a786913f2bada77d0b509ff4bb5719400afa3f764b71826665adb5b9887f49b6bb03b7ef0d SHA512 1b0b2367c3bb73aa284955b93b68f258bfd4c3727036ed4d0a083a60306c74077734ce7b560663d7972bff239115722c13f5a83c75bc5a7e41f0332aac4ec2b9
 MISC metadata.xml 545 BLAKE2B 23c96d1109e1a1e89bba2c00bbbd80954b900f6a40aa45a97d29d15aa31ec10ee1020f43013bdfebba29df7cc1dff106ef7f56b65d175953992629edbdbc79c6 SHA512 0de80916d5a7a88a356533ce0194542e5e26792c0c2d0fc0336ac3d0524e1d78c47b2f0870a2c34d886a83ed2017eab2f56edce325c8344c31865a426016d485
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.1.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.1.ebuild
new file mode 100644
index 000000000000..b77878296fdf
--- /dev/null
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.6.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A new set of tools for working with SquashFS images"
+HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"
+if [[ ${PV} = 9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
+fi
+
+LICENSE="GPL-3+"
+SLOT="0"
+IUSE="lz4 lzo selinux +xz zstd"
+
+DEPEND="
+	sys-libs/zlib:=
+	lz4?     ( app-arch/lz4:= )
+	lzo?     ( dev-libs/lzo:= )
+	xz?      ( app-arch/xz-utils:= )
+	selinux? ( sys-libs/libselinux:= )
+	zstd?    ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		$(use_with lz4)
+		$(use_with lzo)
+		$(use_with selinux)
+		$(use_with xz)
+		$(use_with zstd)
+	)
+	econf "${myconf[@]}"
+}
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
index fc732972175d..b77878296fdf 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-9999.ebuild
@@ -15,15 +15,14 @@ fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-IUSE="lz4 lzo selinux +xz +zlib zstd"
-REQUIRED_USE="|| ( lz4 lzo xz zlib zstd )"
+IUSE="lz4 lzo selinux +xz zstd"
 
 DEPEND="
+	sys-libs/zlib:=
 	lz4?     ( app-arch/lz4:= )
 	lzo?     ( dev-libs/lzo:= )
 	xz?      ( app-arch/xz-utils:= )
 	selinux? ( sys-libs/libselinux:= )
-	zlib?    ( sys-libs/zlib:= )
 	zstd?    ( app-arch/zstd:= )
 "
 RDEPEND="${DEPEND}"
@@ -39,7 +38,6 @@ src_configure() {
 		$(use_with lzo)
 		$(use_with selinux)
 		$(use_with xz)
-		$(use_with zlib gzip)
 		$(use_with zstd)
 	)
 	econf "${myconf[@]}"
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 4300627dea45..15de8c70e2ab 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -6,15 +6,14 @@ AUX squashfs-tools-4.3-mem-overflow.patch 981 BLAKE2B 135d7a985ae0e795e2d2464059
 AUX squashfs-tools-4.3-musl.patch 688 BLAKE2B c5c7dc479fe50e581c7546265be622a88cca5973a56efc1ad2896034d5fe071461da2d947a1d9009fa354e49f668ee56b4cb900af1842be8dad34a51bdb4c8e9 SHA512 61fb8eaedc4e649eb8fb362150cf5faef2289cb42514300f63448d164a12c9b21539ae49f6dc0d78fa1e4a3be01b26cb9084cec7f0159fe026fc1caa19df18dd
 AUX squashfs-tools-4.3-sysmacros.patch 611 BLAKE2B eb4a634987a902329d1debcb992b5ed60e1b70feae03860b09267d76abfb19c817887e613b0cedc9d02e265c10f34f8b697e9f390fdb011d2931f13705b30804 SHA512 c21466b2f0aa6d6ae65b3693148274250bc42d8e7ea5142d6d4048d663ff4343dc539822320cf732d88c5bac048766a9771e1d2b739b1176cb9fafa96c4d306a
 AUX squashfs-tools-4.3-xattrs.patch 1076 BLAKE2B deca0eb05d6ac4302b82193b333dec531c0165041af2777d914039671d228d426a2576ae06f6edf86886bd59e7a76fc3a6443337976d7c96b40a1c5dbd7ea8be SHA512 3899bb72cabeb296eb12fdd1c2e77e82a4354e58c91c69be918950c7fc88f56fbc0265c915b7363704579b710a69a35312fa9ab3d43236900774ae97efd473a8
-DIST squashfs-tools_4.3-11.debian.tar.xz 27108 BLAKE2B 948a69f79fbec6af2467a56457410253676d693e1d67efef034f85523c17e6db6d85f1f9e9b2f8ae391ac5783d37b7d2cdb3434acee96c19880bbf6a5b771e40 SHA512 ef22436a6da925f8ac0c61ae4450b4cc9a87930b456035dd2588c3edf0d7530cd1a9d1e7bde90c9462e39687a9a8d0caedea5f181cd2414e4caa8af1d3965b0a
+DIST squashfs-tools-4.4.tar.gz 241842 BLAKE2B 006e2d340bcf6e20873221fb51fa30e0808c4a4d9e1838ca71c11ddbff3bf472dffe730e9edf07c34f535650e6486a8a80a88f82d6c9ef7a7c19aa22098e9197 SHA512 133ce437fb8c929933d52cff710b61dd9181f6f8be58250b0d6a59a7bb79a2b350f68f456b06a0e17c469409a71272d586802d570248273ddcd5dad088c00308
 DIST squashfs-tools_4.3-12.debian.tar.xz 27300 BLAKE2B 60e127f0ab2fde08c58bf255926b47812b8103793ee187633bf0ee12c9b74ae55faf930f992be3eee87b998da9ed7bb42b1150e58903b2855b159b861b542669 SHA512 13b04a85b1237b5a88a0e01f82b992d98e1b29e3a90a29230607c5232e0188d5402de55a08b6cf78b09f7da2eea05ccc6d15ac0de375af8004c468cfac1fe940
 DIST squashfs-tools_4.3-3.debian.tar.xz 15252 BLAKE2B 5273eb8007192190786513f49be68eded38a7acae80d0c84067e8d239d53304a79be454cc4970af0d1c1eff6e58b75403201497dfd18d175f9d5aae5e0102834 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae
 DIST squashfs-tools_4.3-7.debian.tar.xz 19612 BLAKE2B 7894b6fa27e7e46aec82b680a1ce521c895436ccb1cafcfd3d95e09f56546e08539a7c152854ee14e9516e217339617d25e68c0cc1a4c41b3bdd689caeefa94a SHA512 88df37e0c13483c5591f925156628b3ae27279f56d2453f7f1f82558da1bc3338e23e9481d704b785a40846c6dedc6b0a0e1dd2ea70fe26ea2f1e855fd6d6fdf
 DIST squashfs4.3.tar.gz 182550 BLAKE2B f56ff33a505f7d60cced11224526bfce003bc06184ad7e8cb9cd08b14854164da8d2ecc64694d44085c46bcfa3aaa85939c97820415345053f7956af04066fdb SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79
 EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c528665123ab08b9d2fc212faea1f460d8be277ff26f7d9f58c4fd912d1b3a4d2a36d8a65028d922e9e50fbc2198859207ee44103 SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec
-EBUILD squashfs-tools-4.3_p11-r1.ebuild 2261 BLAKE2B 621d709448cb692443f1719d2337b6f1e275d70c381aa07291aba2cd9e9c06b04ec1fb30770567983cf8d14034586e56373c09a7e239e41e1e74a03dc6859101 SHA512 d1f85f6eb6fc21d2da1ef708d8a823de71f6e014196cbd9f97ffc93a2c9dc87b87244b7a841529bb1939c244c914d45239619ca1162ac4124c267b2fe8aaebf8
-EBUILD squashfs-tools-4.3_p11.ebuild 2169 BLAKE2B efc0e6110c461d7a36415f782e07d2b5f6681b2ac5271c185c62a573bb5c1df36d18bf967fccdb959851c5de3518fd433022b8aa59f3cd6ce5c59fb43812b58f SHA512 78315a8b0617dcaff29805f05b0245b32e86665a3c3e554e7545219800776bccdf03e3a5b05794c64e6938ad22187cd2e81f96222f6103ad69d222d3b9c3f77b
 EBUILD squashfs-tools-4.3_p12.ebuild 2176 BLAKE2B b55b7e215becdd233a43fbd2abfb4676b694270257b87f49b9a301c2271fb7de29f6a4e41ec1af4c89ed777e000d2bb27025c1314e74e4ea263d8928f6896f89 SHA512 13537ed71d3c8f4a599107eed5efb20f3a70633bb1e4cd193f98febfa89ddc4c38b2fd6eadfec2c0aca187044a40198d01c0d16b33685db85e7a9433e9b625b6
-EBUILD squashfs-tools-4.3_p7.ebuild 2082 BLAKE2B d601c94217cec7ddfcc5cbb43801b1b5c68bc0e7710ecf7959e03a5a07990a9fb3964330eb8aed711c7c71e65654553ec69869af89405785edab87852ec7f681 SHA512 7e84bef886c2d10573c86aca5221f4012917fae4ae87fb959bc36d03da9528cef71cb376cd588fd0a3d78804a8ddff4c8529a48659c2f74aca6ed5c342862a13
+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
 MISC metadata.xml 527 BLAKE2B 05e98989ffc60b95f4436d733483025dd1b60dd108aa9116d99b7c6e219a30344815ce1c9a269424f0e0e42b587f08b43ad76bc49a95b0e835f71be097259db5 SHA512 802855b76ddf5d220fbc6f8b6562a27d8f32a43e8dde7ec451fd6c2d1aefb5362d79db35023634a9b6d4ec94588f12e06ba29d9bd0b434cad93d4e34ea043cf1
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11-r1.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p11-r1.ebuild
deleted file mode 100644
index b0c96a39261a..000000000000
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11-r1.ebuild
+++ /dev/null
@@ -1,85 +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
-
-DESCRIPTION="tools to create and extract Squashfs filesystems"
-HOMEPAGE="http://squashfs.sourceforge.net"
-SRC_URI="
-	mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug lz4 lzma lzo static xattr +xz zstd"
-
-LIB_DEPEND="
-	sys-libs/zlib[static-libs(+)]
-	!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
-	lz4? ( app-arch/lz4[static-libs(+)] )
-	lzma? ( app-arch/xz-utils[static-libs(+)] )
-	lzo? ( dev-libs/lzo[static-libs(+)] )
-	xattr? ( sys-apps/attr[static-libs(+)] )
-	xz? ( app-arch/xz-utils[static-libs(+)] )
-	zstd? ( app-arch/zstd[static-libs(+)] )
-"
-RDEPEND="
-	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-PATCHES=(
-	"${FILESDIR}"/${P/_p*}-sysmacros.patch
-	"${FILESDIR}"/${P/_p*}-aligned-data.patch
-	"${FILESDIR}"/${P/_p*}-local-cve-fix.patch
-	"${FILESDIR}"/${P/_p*}-mem-overflow.patch
-	"${FILESDIR}"/${P/_p*}-extmatch.patch
-	"${FILESDIR}"/${P/_p*}-musl.patch
-)
-
-S="${WORKDIR}/squashfs${PV/_p*}/${PN}"
-
-src_prepare() {
-	mv "${WORKDIR}"/debian/patches/0016-remove-frag_deflator_thread.patch "${WORKDIR}"/ || die
-	eapply -p2 "${WORKDIR}"/debian/patches/*.patch
-	eapply -p2 ${PATCHES[@]}
-	eapply_user
-}
-
-use10() { usex $1 1 0 ; }
-
-src_configure() {
-	# restore GNU89 inline semantics to
-	# emit function symbols, bug 595290
-	append-cflags -std=gnu89
-
-	# set up make command line variables in EMAKE_SQUASHFS_CONF
-	EMAKE_SQUASHFS_CONF=(
-		LZMA_XZ_SUPPORT=$(use10 lzma)
-		LZO_SUPPORT=$(use10 lzo)
-		LZ4_SUPPORT=$(use10 lz4)
-		XATTR_SUPPORT=$(use10 xattr)
-		XZ_SUPPORT=$(use10 xz)
-		ZSTD_SUPPORT=$(use10 zstd)
-	)
-
-	tc-export CC
-	use debug && append-cppflags -DSQUASHFS_TRACE
-	use static && append-ldflags -static
-}
-
-src_compile() {
-	emake "${EMAKE_SQUASHFS_CONF[@]}"
-}
-
-src_install() {
-	dobin mksquashfs unsquashfs
-	cd ..
-	dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
-	doman "${WORKDIR}"/debian/manpages/*.[0-9]
-}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
index 623cbad1b177..48fb0075411c 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 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 s390 sh sparc x86"
 IUSE="debug lz4 lzma lzo static xattr +xz"
 
 LIB_DEPEND="
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
index 48c56a335453..fc9ce8107b27 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p11.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
@@ -5,15 +5,12 @@ EAPI=7
 inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="tools to create and extract Squashfs filesystems"
-HOMEPAGE="http://squashfs.sourceforge.net"
-SRC_URI="
-	mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz
-	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
-"
+HOMEPAGE="https://github.com/plougher/squashfs-tools"
+SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
 IUSE="debug lz4 lzma lzo static xattr +xz zstd"
 
 LIB_DEPEND="
@@ -33,22 +30,7 @@ DEPEND="
 	${RDEPEND}
 	static? ( ${LIB_DEPEND} )
 "
-PATCHES=(
-	"${FILESDIR}"/${P/_p*}-sysmacros.patch
-	"${FILESDIR}"/${P/_p*}-aligned-data.patch
-	"${FILESDIR}"/${P/_p*}-local-cve-fix.patch
-	"${FILESDIR}"/${P/_p*}-mem-overflow.patch
-	"${FILESDIR}"/${P/_p*}-extmatch.patch
-	"${FILESDIR}"/${P/_p*}-musl.patch
-)
-
-S="${WORKDIR}/squashfs${PV/_p*}/${PN}"
-
-src_prepare() {
-	eapply -p2 "${WORKDIR}"/debian/patches/*.patch
-	eapply -p2 ${PATCHES[@]}
-	eapply_user
-}
+S=${WORKDIR}/${P}/${PN}
 
 use10() { usex $1 1 0 ; }
 
@@ -79,6 +61,6 @@ src_compile() {
 src_install() {
 	dobin mksquashfs unsquashfs
 	cd ..
-	dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
-	doman "${WORKDIR}"/debian/manpages/*.[0-9]
+	dodoc ACKNOWLEDGEMENTS CHANGES README*
+	dodoc -r RELEASE-READMEs
 }
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index df4be83b350e..e3c58376d098 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -1,6 +1,4 @@
-DIST udev-init-scripts-32.tar.gz 3661 BLAKE2B 11736f1e6c44bf032571008e907f97d5c64afafa7fe7fcd4fa5f398fce1fa6698adc66c933a0a451adde31c44fc09339129d6352cc2fd0389fecee8d34c095f6 SHA512 da6291ae5c2aa1e8e41656fbe2ed6700e46360809119c0f8a26bf6c3f23f05c861b2c2943b55e47140462049474725e96105e68b204f3d931050409f34d19699
 DIST udev-init-scripts-33.tar.gz 3698 BLAKE2B fc79b3f6984131180324919f7be4309715976309ee582147662634bb020b8162b293e7fd0e675a9cc7a3b1630ce0fc49b29c899e393c7748d47cf924b1ca2809 SHA512 2119aace937da02f47a5adc9af720587d25c2852cf70a9bcb04138e3ee511308c8f30cf0301fbec58cf0432b7fd6672ae6a02d1740c774703959197b3511fbcc
-EBUILD udev-init-scripts-32.ebuild 1312 BLAKE2B 6ee1cd14dacb4401e13def376869418219823a4302eb5c6c55a5c426626209d708bff30cf7bd5fc816a778dbed836ccbf4faf7430ea83a5d1ca97ca77a043d1d SHA512 e17028b8d8ea22f44e595835bfe882d59a7314098eb33203b23e555bd886f282aa183356cbb6a1aca925cd1b7267f290f15b8a1f98198db0ed29237ef33f745a
-EBUILD udev-init-scripts-33.ebuild 1400 BLAKE2B e9e386e567aa782c97025e3b6a5babe14efdfa58c6c31fce761c504bfb7b114557352cdd459a0620be0abe4a134c60f2c01279ab0f6a559d22ca05a7dfe0fd57 SHA512 d35c600eb8b0f1829f926fc4a9a26e9990c31bdfc20c06be9cbd4b02ba6dabb09801322bcf56daa5bbd97aab8cce2fb75ddd60fbbb08385053f522f5db168a46
-EBUILD udev-init-scripts-9999.ebuild 1410 BLAKE2B d0e3393b484a9bd399709a500310f6f8a0126d24a8b294afde04c7b1886212c48e5c547b67434bb7cddea857ebf5d2863a968f2e331acb54ab7316b531eec76e SHA512 36a24933ff3c43a9061801c2085b3f02997e446910c113b8241c5b6fa9144ff4b98cf75859715a859cfe8e38338a3c9151fc61151bdf8c6e11ffe316274f4ac4
+EBUILD udev-init-scripts-33.ebuild 1478 BLAKE2B ed3c40f6c759369e8af632b330d62e0e562af23f82266430032a92a78b28d9158da9f266ef9d7c95dc471c4f401c943dfa7e44a09fd881644d6281630961e85d SHA512 a706664d4d3d2c8aa6dfa6596a5ed41fc1c06e48ccba7c1d5fbcb9e75af357ac7d1de910f9c9bf097b94ec44b47d1eb5e707e5cb1aedd50b230ea0b5dbfb85f8
+EBUILD udev-init-scripts-9999.ebuild 1488 BLAKE2B a0e3675e423214b4b96f52aea796d215497222367669fcecef0fb5d0d0a13a748485e24abbcba34979026e0814d8005c9a295eafe4ac379cc45ed94713d3378b SHA512 2974bb69e988f43dc66eb83bb2e4148c1df74dee5c1ae4af0bc3224e0120349f70730cdd4b594edafc5cad99b8579ee0577f458129e22de030266368b518166b
 MISC metadata.xml 221 BLAKE2B 9e0d24573ec598eccd3ad7e41a38ead4192d9e757ff4b870b51b02a96f04a13596b15c5c05ee2a4d888c4b9b0b9b30aafe5ba96d39ff9faa157b58e30e91ba55 SHA512 accbe81ec1cf4c8d7c6eb99b7ceb7a8119eb1f2f55dcaf6d368610c255e7a21ff222e7c613ca4be37083ce9527ca325f3ee91515dadad7c5929f60f4fda334df
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild
deleted file mode 100644
index 400159dfab88..000000000000
--- a/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/udev-gentoo-scripts.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-fi
-
-DESCRIPTION="udev startup scripts for openrc"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=">=virtual/udev-217
-	!<sys-apps/openrc-0.14"
-
-pkg_postinst() {
-	# Add udev and udev-trigger to the sysinit runlevel automatically.
-	for f in udev udev-trigger; do
-		if [[ -x ${ROOT%/}/etc/init.d/${f} &&
-			-d ${ROOT%/}/etc/runlevels/sysinit &&
-			! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then
-			ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f}
-			ewarn "Adding ${f} to the sysinit runlevel"
-		fi
-	done
-
-	if ! has_version "sys-fs/eudev[rule-generator]" && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
-		ewarn "The udev-postmount service has been removed because the reasons for"
-		ewarn "its existance have been removed upstream."
-		ewarn "Please remove it from your runlevels."
-	fi
-}
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
index 2090016f2a50..1646e4a87e88 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
@@ -25,13 +25,18 @@ RESTRICT="test"
 RDEPEND=">=virtual/udev-217
 	!<sys-apps/openrc-0.14"
 
+src_install() {
+	local -x SYSCONFDIR="${EPREFIX}/etc"
+	default
+}
+
 pkg_postinst() {
 	# Add udev and udev-trigger to the sysinit runlevel automatically.
 	for f in udev udev-trigger; do
-		if [[ -x ${ROOT%/}/etc/init.d/${f} &&
-			-d ${ROOT%/}/etc/runlevels/sysinit &&
-			! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then
-			ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f}
+		if [[ -x "${EROOT}/etc/init.d/${f}" &&
+			-d "${EROOT}/etc/runlevels/sysinit" &&
+			! -L "${EROOT}/etc/runlevels/sysinit/${f}" ]]; then
+			ln -snf "${EPREFIX}/etc/init.d/${f}" "${EROOT}/etc/runlevels/sysinit/${f}"
 			ewarn "Adding ${f} to the sysinit runlevel"
 		fi
 	done
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
index b514fc5923dd..4ce4b403509b 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -25,13 +25,18 @@ RESTRICT="test"
 RDEPEND=">=virtual/udev-217
 	!<sys-apps/openrc-0.14"
 
+src_install() {
+	local -x SYSCONFDIR="${EPREFIX}/etc"
+	default
+}
+
 pkg_postinst() {
 	# Add udev and udev-trigger to the sysinit runlevel automatically.
 	for f in udev udev-trigger; do
-		if [[ -x ${ROOT%/}/etc/init.d/${f} &&
-			-d ${ROOT%/}/etc/runlevels/sysinit &&
-			! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then
-			ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f}
+		if [[ -x "${EROOT}/etc/init.d/${f}" &&
+			-d "${EROOT}/etc/runlevels/sysinit" &&
+			! -L "${EROOT}/etc/runlevels/sysinit/${f}" ]]; then
+			ln -snf "${EPREFIX}/etc/init.d/${f}" "${EROOT}/etc/runlevels/sysinit/${f}"
 			ewarn "Adding ${f} to the sysinit runlevel"
 		fi
 	done
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index e3a69c3fee15..30b70a607bc8 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -22,6 +22,6 @@ EBUILD udev-240-r3.ebuild 9664 BLAKE2B 2daaa3124df1ce0ea5b3247200a55020d75b92383
 EBUILD udev-241.ebuild 9673 BLAKE2B 33c6d4cf7c1d58645481dcb957f1a3e28587911dc5a2ead16d1a91d2b0eca5ad0765203661a8088fac4699e501162759cc927f2692bfb170c98394b8e03e7978 SHA512 f1d6f1aa6d131605b6a63aea994bd7c7c2354714a41f0de85fe884389d0893d737ebbacea2a34d9a15f7173cf10f0d225125aacef33725684565044c6d1edcd8
 EBUILD udev-241_rc1.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
 EBUILD udev-241_rc2.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
-EBUILD udev-242.ebuild 9611 BLAKE2B 44037308847edaa3d7050392784e10e17dabb1b6d2b906b62ec815a6daf394b7d99d02b85ca8fe1c096ae1cd25bc53dae57738e1a16bb859bb72961d037efb67 SHA512 6f24c9c2b115ba77c09911080795b2d9c8e40f5a111ff5e91da58d125f3235cc66e9e885c5fe343990f2130de5fdf3a517ebf20090ecf94b978bc2aeb751d06a
+EBUILD udev-242.ebuild 9610 BLAKE2B 03c9d20e26bf3da9a397fcad196d9c9a037776cc8f121c1bd1ed4d1a01e6e9189ed512e5aa7c8c74c5d4a17446459a24f3c77b02bcdec2c15878c69ee2a7ec5c SHA512 1a8b87cd84bd431b2e8bc483285c9700a5f0cda8d372779da7da728dd4589f416eea15e1009a281b2568a099cdc733ef711c2b6801834630a4289d2b0665f3c2
 EBUILD udev-9999.ebuild 9591 BLAKE2B 72ccdcaf7791558859483b8d161908a040cae8284e01b3c3f333ce55715d5c61f4173a34fdbf3b910a8b258a5d6f4feff5880b3366853f5b2c39c3b3ed5eafbb SHA512 f8d7823de0ff335ea169c312a5e79111463005714858ccd248de73df76fce4dfab872b5387bef596f4113dfb4c3a97c0c4d14680c53fe194aaa37816fcab79bf
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-242.ebuild b/sys-fs/udev/udev-242.ebuild
index 6aa2af42bb05..b678d66aaffa 100644
--- a/sys-fs/udev/udev-242.ebuild
+++ b/sys-fs/udev/udev-242.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P=systemd-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index f14fe3ecc090..db22426a5d0a 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,3 +1,7 @@
 DIST vhba-module-20190410.tar.bz2 15741 BLAKE2B 6d513877c771b1c4c5805231cf8bb13333d29dd3c6de7d91879ef1898fdc424df026b0835a772f398dcdc7d8900db462164a40e46c9b66b38ed70f5b5f6a0e7e SHA512 e4b30bea8464d8ac24fd2fddca9d41052af2f5b3dc9e054ead47991bff41366be377600075627c40261722c88c20ed2eaf65fa7afb34690ef09a6f4ea6f9351f
+DIST vhba-module-20190827.tar.bz2 15570 BLAKE2B 54a50f14659e388c0d53edce842633a3d85bae66483d27e458a83fcc7c547a804e83d34bba0e9a11a0b7e4e533f78c7014ac8e1235a83a7dc6aa13671cb9a823 SHA512 e84ffbbace9964b5fda844d3dd5201ae969ca017886a709d814670a371631376ebb2b1f05775c14ace43e84ed7fc0340638e485ac2a386db530cc25a9fa6e534
+DIST vhba-module-20190831.tar.bz2 15570 BLAKE2B 202f28a0729eddce907f5fc46f99a52b116948a376c0f2aaab3b9340f88fc248151c3ec592f2f60e52a07eeed4f551d6f270b4464605bce9df4badf9fa8ed322 SHA512 f43cb9b5730c4d634b58d3dd204610dbc86fdc520d4cfee6c9efbae3bb2acb88f5663e5fbd2b11b5ef9e3b6ad7d4dd0ecf9728dc36ac0b492bd06e0806223591
 EBUILD vhba-20190410.ebuild 2146 BLAKE2B 7b02077e20c319d2d9197719c00e115119b3e825c706fbfbc64de6a018b374605a5d06e4ac7d830c365b3ee1cae7299a207a49eb8d55385d775a73a0bc3f8c8f SHA512 ab5fc77641921817989917b9b47e0f4766db4e02238c8826d2eeb90d6a23c7ef7a1fc21d4ed99ddd1ea002f06d4ff7f63c7df660923cd71db5ab34d9a8b0dc5c
+EBUILD vhba-20190827.ebuild 1116 BLAKE2B a670b0a7448539bb06a02947d1ba7a60569314e385d52d620e962356cd738ab669012a6429c6d0b6d8a4d397f33c8e00d4ad80dc15ca5890b54eae9235090832 SHA512 ef147e91d85a526786b0df3fe8d4e1b4208877b97d5724dfb11f89cdd3bde8091c00b185c67baac72e8f5ffc799fbb6712f6c35f81ba2a4f505fdd100ed01fad
+EBUILD vhba-20190831.ebuild 1152 BLAKE2B 647af5526d5e9fa94d7872ccd9d4ddc0231667416eda790346df121a22d0cb7cd5b218eee2f681c4ad095692e7ef2a89c3c99d6af478b41a8b7e4ddc00839c4f SHA512 e54af6afcd856f417ece53880bce3f0c6611c7375b4b99f4ee85743f9a08904dfc967fb5cba76bbf0b9958eebb75532ed77572ac4c6b6d82be1417bcceceec67
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/sys-fs/vhba/vhba-20190827.ebuild b/sys-fs/vhba/vhba-20190827.ebuild
new file mode 100644
index 000000000000..a049dfd927d2
--- /dev/null
+++ b/sys-fs/vhba/vhba-20190827.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils linux-mod udev
+
+MY_P=vhba-module-${PV}
+DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
+HOMEPAGE="http://cdemu.org"
+SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/udev"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+MODULE_NAMES="vhba(block:${S})"
+BUILD_TARGETS=modules
+
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
+	check_extra_config
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	# Avoid -Werror problems
+	sed -i -e '/ccflags/s/-Werror/-Wall/' Makefile || die "sed failed"
+
+	eapply_user
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog README
+	linux-mod_src_install
+
+	einfo "Generating udev rules ..."
+	dodir "$(get_udevdir)"/rules.d
+	cat > "${D}$(get_udevdir)"/rules.d/69-vhba.rules <<-EOF || die
+		# do not edit this file, it will be overwritten on update
+		#
+		KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"
+	EOF
+}
diff --git a/sys-fs/vhba/vhba-20190831.ebuild b/sys-fs/vhba/vhba-20190831.ebuild
new file mode 100644
index 000000000000..5dea07de5793
--- /dev/null
+++ b/sys-fs/vhba/vhba-20190831.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils linux-mod udev
+
+MY_P=vhba-module-${PV}
+DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
+HOMEPAGE="https://cdemu.sourceforge.io"
+SRC_URI="https://download.sourceforge.net/cdemu/vhba-module/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/udev"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+MODULE_NAMES="vhba(block:${S})"
+BUILD_TARGETS=modules
+
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
+	check_extra_config
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	# Avoid -Werror problems
+	sed -i -e '/ccflags/s/-Werror/-Wall/' Makefile || die "sed failed"
+
+	eapply_user
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog README
+	linux-mod_src_install
+
+	einfo "Generating udev rules ..."
+	dodir "$(get_udevdir)"/rules.d
+	cat > "${D}$(get_udevdir)"/rules.d/69-vhba.rules <<-EOF || die
+		# do not edit this file, it will be overwritten on update
+		#
+		KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"
+	EOF
+}
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index cbb56325e9ed..9a4f31858ed8 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -2,9 +2,11 @@ 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.0.0.tar.xz 1218476 BLAKE2B ef6eaab43531f696f739972c362e31c3304baaecb3485b45c16441a8bf7f1da7f47cd74a21660ba2c2bb45858a2b13b7af41c94671135f6a32a36eb745c024a0 SHA512 cebe3d2ea80676a99cc7f9cc014894398fbe3bdaf237829e9c7aa0404558c1ab16f2055acb5afd8234b2bc8475117bcef3c7500c553adb12bbaf3262bd077d18
 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.0.0.ebuild 2446 BLAKE2B 56b0df730592b592b2fec03628d77b23c85fa83c327aa79576a4e7a3ade9eeb2b7ce37c94ec28372cfd90ca627e975aaeb9410d3b92976e40b7efa046a6ce613 SHA512 0346edc9cca81230879dd85b7eec3db552c48ae14cc97d2ca00c7a47e743c360b5a7a66533705f302e6062368e4497df7bbc114294cc0693c02acb804f4221a9
 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
 MISC metadata.xml 257 BLAKE2B f8a00f23163e58c310fa0e4ab94b2e6b5638ec569a5e93ea2efec8c7bdd97c1629e9bc0e9bf04917f5ca4fea4085855b281c30ced2f09548e96b12e6bb1d5a40 SHA512 9c7759d33e1bbc8be0da5b4f59fc720266e40f4116d7db0c17c5ad800a7bb638f33a1308e1554092af781f06df6f6cb55db41fc22207cd3edc2e159840e3a3b1
diff --git a/sys-fs/xfsprogs/xfsprogs-5.0.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.2.0.ebuild
index 79a212d5e50d..22a5cc55eeaa 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.0.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit toolchain-funcs multilib systemd usr-ldscript
+inherit flag-o-matic toolchain-funcs systemd
 
 DESCRIPTION="xfs filesystem utilities"
 HOMEPAGE="https://xfs.wiki.kernel.org/"
@@ -12,7 +12,7 @@ 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"
+IUSE="icu libedit nls readline"
 
 LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
 	icu? ( dev-libs/icu:=[static-libs(+)] )
@@ -20,8 +20,10 @@ LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
 	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
 RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
 	!<sys-fs/xfsdump-3"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
@@ -39,14 +41,13 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	# Clear out -static from all flags since we want to link against dynamic xfs libs.
+	# 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
-	find -name Makefile -exec \
-		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
 }
 
 src_configure() {
@@ -54,8 +55,10 @@ src_configure() {
 	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=(
-		--disable-lto #655638
 		--enable-blkid
 		--with-crond-dir="${EPREFIX}/etc/cron.d"
 		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
@@ -63,12 +66,34 @@ src_configure() {
 		$(use_enable nls gettext)
 		$(use_enable readline)
 		$(usex readline --disable-editline $(use_enable libedit editline))
-		$(use_enable static-libs static)
 	)
 
+	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
 
-	MAKEOPTS+=" V=1"
+	emake V=1
 }
 
 src_install() {
@@ -76,10 +101,6 @@ src_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}" -name '*.la' -delete || die
-	fi
+	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
new file mode 100644
index 000000000000..a546b735ad7c
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-5.2.1.ebuild
@@ -0,0 +1,105 @@
+# 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 
+	emake 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/zfs/Manifest b/sys-fs/zfs/Manifest
index 54baf330e6a0..538b4a130bf2 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -6,5 +6,5 @@ DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d
 DIST zfs-0.8.1.tar.gz 8668360 BLAKE2B f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b SHA512 1fb3957f65dbe94edaffcedb5b2694390dc14e472c11f7e63184a9ea6a774e79a43d47a2d789b7ced233fc67c76583bf7d5c1bda0692bb07929673e2a57f4667
 EBUILD zfs-0.7.13.ebuild 6286 BLAKE2B 8ff2c44069a13fe26b02a7a490ffcf1cb9833f5d5ba9ca1b151e1ed6bcc706bc46083a86663c073660d7a80792989335f8a1f4d71d162fcc8a16a635336ef175 SHA512 35127bc47361845a18bba3b60b27ae900a16ad2b94c1c479a62b30079b6688236b2feccb9d902ce93e3d8ff0a95504bc00d52fba6120b763d69057227e50a8a6
 EBUILD zfs-0.8.1.ebuild 6818 BLAKE2B b787b718b658937297f35acda6b41c0eaa5b9a41398eb19b0617e2faba0fa41c54d19e96d1ceaab3367e46235f54286d95212cc4de9bb1306f25d5f2ec1b260a SHA512 8719b4b46066a3a2c2bf5f9518082814aba9ecba5e1d977c412432213c1baad89922b13eaf13e3e422fbb4001dc92602444f182847e2e08375d38c812496fe10
-EBUILD zfs-9999.ebuild 5790 BLAKE2B 1197983ec254f6b49f1b60a2f40a10d00b85efb86238b60de241a1c7370e68b3bc73d6def21a8a0b9d045f9b82f250dbbe89922390eb02e89f2496dc076689c1 SHA512 ba4504fe1c70997433b4c08aa2e1850721799a681e62cfbcff0a53c62bd1d2cb700b42edc4ccbab91240dfdf9c5643989eae68f95e6a442fe135a233184bdccb
+EBUILD zfs-9999.ebuild 5587 BLAKE2B 4645ed8a61534158c7420c707876c009a81b176f9e21df817844c8019f2768dbf67f254532260c6a21694e304598beb7260941670ac8aefffbf9834e928e82d6 SHA512 6c232d76438b42149c517f50421ad6e12c63c01a09446b012ed77e10d56d4349e89d95c9c2a45e0b68835ce2ea70ed8459d8d2c2cd1d5e049eb854ed138aaf3a
 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 267450980af8..4c9ec8687286 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -108,22 +108,15 @@ src_prepare() {
 		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
 	fi
 
-	# Update paths
-	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
-		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
-		-e "s|/sbin/parted|/usr/sbin/parted|" \
-		-i scripts/common.sh.in || die
-
 	if use python; then
 		pushd contrib/pyzfs >/dev/null || die
 		distutils-r1_src_prepare
 		popd >/dev/null || die
 	fi
 
-	# prevent errors showing up on zfs-mount stop, openrc will unmount all filesystems anyway
-	if use rootfs; then
-		sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/init.d/zfs.in || die
-	fi
+	# prevent errors showing up on zfs-mount stop, #647688
+	# openrc will unmount all filesystems anyway.
+	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/init.d/zfs.in || die
 }
 
 src_configure() {