gentoo resync : 16.09.2020

42 files changed, 429 insertions, 407 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 8afa62ef8516..a1621900ee3c 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index cbbe0ede3fa4..ba04009ac333 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -1,5 +1,5 @@
 DIST btrfsmaintenance-0.4.2.tar.gz 21826 BLAKE2B 0efc06b6780d7e75573958cd979b991580d518ab756ae80c9f4328f113ab7de87367c6730c23b408298919ac740da3b0ec85ae76face60ad97bf75d9aaa2a178 SHA512 802c131edfbc07bca13b89cd8bfc90923b2f23ba780dcb07009a4c4991a588c66a6ffe780938e66ab632201980e5087cd0751cd9185a8bae1a5faba84bf87233
 DIST btrfsmaintenance-0.5.tar.gz 24602 BLAKE2B 313c904aa53fc237472256ae74c9eafaf2305b437e280b6bb9c79c2bbaffb6b273304e57d096a911e658fa41fe80308f2a7ad76ded62d79a7f72439163b36444 SHA512 fadab1cf33992c42d476649fd017ac4ae26d6bf6a814dc49d0b7b38e04861474c4e54e6ebe429a83e662b8e5c7be7f460b551c65788d960e2f8f0c7512deef41
 EBUILD btrfsmaintenance-0.4.2.ebuild 2014 BLAKE2B 21e7ca9e7ef23f8baaceb2058fb5308b8059e6f7e8a2280967280651558806a9fca93274a125a5e25b1257e43b57e12d4b577a48c1364ce6e1e96436fa994126 SHA512 17de5b583a6626c6f5fac7118354cd130f740daadd18a71272c9ce7e5b97b644e4be1312845ef2884baf607e9ff69cfdcf1cbce3762f1a33402b3bab4ee042ca
-EBUILD btrfsmaintenance-0.5.ebuild 2154 BLAKE2B 920f0293198963d2a2d5d3ca9612862b7d2b2c31b354f265daad6a2f1392506d048d09624d2ca0b77b61c02a41a0344a7f8fcd1060bab0aecf1d6af15ae8422c SHA512 109e6e1aa4971a07d41e38c6ba78aa67f6267157d6a22cf3d405c545643bb44193fcdbeca6313a00afe095ad65eff196bf3a017cf33513252514eaa6fb8fc46f
+EBUILD btrfsmaintenance-0.5.ebuild 2153 BLAKE2B d1b459d875df362be26daabcddd03e98143af295643aa7bdb99b6756369e02be8807da8face8749563be5a0adc1c6348be19505a64d8c987c9ddfee826ef352e SHA512 d3c83a73dee317c092c355142318ed185cddf7c6021d01b92d820f18034948c85c2c5e0b00134495ba357334f6ae4136f23c03a6311e93fb502d2626a1a4892f
 MISC metadata.xml 564 BLAKE2B a54366a1b7a22e5b6f7ba8814ebcc75e4fb6185a5ce49f021bc2dec51277f31f82cafd4cf2de29918b97aa9276485bdc0dcf42d21e65d71636d3ab6ea4bf78da SHA512 6affb15730bb1ec7d8601c46ac5ea9f48b603d36825b364831459025764080641f51644af6c838d0e6de9edca766236662d068ee5893ba811687c4a1d7585bdc
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild
index 3c44355dfc46..e0c4253d47ac 100644
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 IUSE="systemd"
 
 RDEPEND="
diff --git a/sys-fs/compsize/Manifest b/sys-fs/compsize/Manifest
index d0f884598977..fcaea01166da 100644
--- a/sys-fs/compsize/Manifest
+++ b/sys-fs/compsize/Manifest
@@ -1,4 +1,6 @@
 DIST compsize-1.1.tar.gz 14345 BLAKE2B 8b35e6f3526b8b2395972ea1a595011b867fbc076d79c90c66a19853f1b101dbe3decedab8244d893b20d6cc9ff3ecfa2b3320fc12c583415b2d446a9298fcb1 SHA512 1c7de5156b695ffa4be9b634fd6224214d3de1653eb23e5d85b250e27146fe655883bed17ed458bae1b448ed9ae8a254d2a673fdb3860e69c99f8676daea0d8b
+DIST compsize-1.3.tar.gz 14782 BLAKE2B 738ff0e2b936f5974064759914284e495c895d22d95b705e1b8fac4b3189891771b0e5be7e0eeac0883dd92f9cef276400bb7ee79840fd7db14a5269e7f78f11 SHA512 411b92651fdc3d03deccbf38f72936fee95cf80c67d6368efbc0dafacfe9793815a23ef0d02f7feadf31391e415df3d90cd19fb3acc8cce94f37cb3e4eed623d
 EBUILD compsize-1.1.ebuild 940 BLAKE2B aae5bb225b287ece48d4bffc921d95837bcc5c48affc88ccf55eb6565943994bfa08eaf8be6cfeaf4c86cde3aca37946d6cc50ea10fa679d10e557c2b207090f SHA512 b97df62447581e46b6b7276044861ab1900b77055e0a8f0989fa46dce204bd52ad000d66a1662133fe581d8aa354b4c1214596c83547267997628f54c2172c5e
-EBUILD compsize-9999.ebuild 940 BLAKE2B aae5bb225b287ece48d4bffc921d95837bcc5c48affc88ccf55eb6565943994bfa08eaf8be6cfeaf4c86cde3aca37946d6cc50ea10fa679d10e557c2b207090f SHA512 b97df62447581e46b6b7276044861ab1900b77055e0a8f0989fa46dce204bd52ad000d66a1662133fe581d8aa354b4c1214596c83547267997628f54c2172c5e
-MISC metadata.xml 166 BLAKE2B df899de61ee57cf9c2d5822a8ca4cb62c697c6da7142003688afbdd1261a8623d48058189ebe005c053ffddcb9f7275f19a0e48fc47ce1890341e276400f1d8f SHA512 12bfcd38af9dc9fe67b866a4ae090e26873d363409efc5949cca4b4a59ba0d770b09ebec8a108482b29b94c922bcdb8ce3f5ccbb578137b44e35bd783b4c9472
+EBUILD compsize-1.3.ebuild 962 BLAKE2B 6a1acd0d8c62796e6c0159f453bac412f57ae4afdc9c20f8794518f9a12f25961f55ffc493916496455b7f9d5e253de9c02379e28b73f17fd2cf50c4c250aacd SHA512 d1a5530f238ff30fd311d38a47e30ba9e0db668b426c789de6dd0c2654f94d910cbae423e49042fec940daf8e557d2872f6c7514b15fdbb37e5cc23ef3672ae5
+EBUILD compsize-9999.ebuild 1086 BLAKE2B 99aa3fe99ee99f19ee8beb7328dc9bb1af8288111a6b8e52b0551ecc1cf818f9d2ff7e939ed88a40493e421e1afe2c56cd69a64e92bd5d788517d0ea997c31ba SHA512 4e54a226690115710a9ea85d05a77448b593e5657a9392f52570ef1f4d70770d8b7bfa5a666c6fda50270fafaba9f7009059fb8e4a30230e7e4c5c7d5d2c0259
+MISC metadata.xml 444 BLAKE2B 0eacf312059aaec47fa5f5036bc09afccf3275819b8e2890a02130d9e142020945f68d3e155cee27e18d6c061ddbbd6de71231beeab8a4b29e5535ad84db308c SHA512 1c03b76ef3eae52b3212d7f1a8b2e822ac24dcad2a95ed078d4819a7084e6e701f76ce3c17e38efaaeaede24357126cbf54e311c6b2a5c26e75299971ac7649e
diff --git a/sys-fs/compsize/compsize-1.3.ebuild b/sys-fs/compsize/compsize-1.3.ebuild
new file mode 100644
index 000000000000..df2657574f74
--- /dev/null
+++ b/sys-fs/compsize/compsize-1.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic
+
+DESCRIPTION="Utility to find btrfs compression type/ratio on a file or set of files"
+HOMEPAGE="https://github.com/kilobyte/compsize"
+
+if [[ ${PV} = 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kilobyte/compsize.git"
+else
+	SRC_URI="https://github.com/kilobyte/compsize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2+"
+IUSE="debug"
+SLOT="0"
+
+DEPEND="sys-fs/btrfs-progs"
+
+src_prepare() {
+	default
+	# Don't try to install a gzipped manfile during emake install
+	sed -i -e $'s/\.gz//' -e $'s/gzip.*/install \-Dm755 \$\< \$\@/' Makefile || die
+}
+
+src_configure() {
+	# Used in upstream Makefile, but clobbered by portage's CFLAGS
+	append-cflags -Wall -std=gnu90
+	use debug && append-cflags -DDEBUG -g
+	default
+}
+
+src_install() {
+	emake PREFIX="${D}" install
+	dodoc "README.md"
+}
diff --git a/sys-fs/compsize/compsize-9999.ebuild b/sys-fs/compsize/compsize-9999.ebuild
index ad73046823bd..3144e142c1e2 100644
--- a/sys-fs/compsize/compsize-9999.ebuild
+++ b/sys-fs/compsize/compsize-9999.ebuild
@@ -1,41 +1,43 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
+
 inherit flag-o-matic
 
-DESCRIPTION="Utility to find btrfs compression ratio"
+DESCRIPTION="Utility to find btrfs compression type/ratio on a file or set of files"
 HOMEPAGE="https://github.com/kilobyte/compsize"
 
 if [[ ${PV} = 9999 ]] ; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/kilobyte/compsize"
+	EGIT_REPO_URI="https://github.com/kilobyte/compsize.git"
 else
-	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/kilobyte/compsize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="GPL-2+"
-SLOT=0
+IUSE="debug"
+SLOT="0"
 
-RDEPEND=""
 DEPEND="sys-fs/btrfs-progs"
 
 src_prepare() {
-	eapply_user
-	# Don't try to install a gzipped manfile during make install, instead
-	# use doman in src_install to ensure that PORTAGE_COMPRESS is used
-	sed -i $'/^\tgzip /d' Makefile || die
+	default
+	# Don't try to install a gzipped manfile during emake install
+	sed -i -e $'s/\.gz//' -e $'s/gzip.*/install \-Dm755 \$\< \$\@/' Makefile || die
+	# sys-fs/compsize > 1.3 removes '/usr' from install paths in Makefile
+	sed -i $'s/(PREFIX)/(PREFIX)\/usr/' Makefile || die
 }
 
 src_configure() {
 	# Used in upstream Makefile, but clobbered by portage's CFLAGS
 	append-cflags -Wall -std=gnu90
+	use debug && append-cflags -DDEBUG -g
 	default
 }
 
 src_install() {
-	emake PREFIX="${ED%/}" install
-	doman compsize.8
-	einstalldocs
+	emake PREFIX="${D}" install
+	dodoc "README.md"
 }
diff --git a/sys-fs/compsize/metadata.xml b/sys-fs/compsize/metadata.xml
index c1744fe7fc5b..289d3a1d5b6a 100644
--- a/sys-fs/compsize/metadata.xml
+++ b/sys-fs/compsize/metadata.xml
@@ -1,5 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!--maintainer-needed-->
+	<maintainer type="person">
+		<email>telans@posteo.de</email>
+		<name>Theo Anderson</name>
+	</maintainer>
+	<maintainer type="project">
+		<name>Proxy Maintainers</name>
+		<email>proxy-maint@gentoo.org</email>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">kilobyte/compsize</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 0c61276b905e..373db4603517 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -3,6 +3,8 @@ AUX 1.6.7-dmcrypt.rc 8815 BLAKE2B 9e88475af36f7ab3c7b48672ecf64e885e7be4b1af27c2
 AUX cryptsetup-2.0.4-fix-static-pwquality-build.patch 427 BLAKE2B dfdc56c6627084732973254cd52c48f0869aa7b4c58e466840a87f77c1d4fb09ae37295fb54e980abccfdfe51dc63161e188a0be9bb4bf3c69d7731120f84bac SHA512 23b5f9b21ec86c92787bfc8744682ce0777dfa87e1de97afbb8db33c4587f1e2c8e5f8c9d0fa56ca801d7795739f9a66f14633d8a3904ea68ddd58ddc3863adf
 DIST cryptsetup-2.3.2.tar.xz 11037076 BLAKE2B b0f8a1a274e6b95b12aa7172dbdd41e512aea2c87a98d62b8b4d4cbb898b2d4b82e250368e385c4d4acc8e77046ea4b4f7be730750587569572c4b9490815bc1 SHA512 c5eb41751ca64ff906187f40805705570c261816b014dfcdbf2777f42e53668e32966197092a2235b8f6a7a4e7f9c3f301d82f17c45cfbcff96b9818631d7e5f
 DIST cryptsetup-2.3.3.tar.xz 11104768 BLAKE2B 54aa6f087c5366e843c1f9b649fd77ec8be8c4e65c783a2a84a036b4ef460c9d070bdd8aff72f87a7a3136f13581e84534940b435f0b49eb1951d1a755cab47a SHA512 d613efb80e003364a21832da3fefe3891d36a891119cc0efa970aad40ba135dfcd42b32a0c19c31ad879d4eddf27864beccbea1d4b31a47a4e075bc0f756365c
+DIST cryptsetup-2.3.4.tar.xz 11114004 BLAKE2B 680e6eeb594737aeb8330b0ac8638e94941bdcc56fc3441b6f1bc4f3d209d768096e23a7f840dc1012f9e63fae0fdbc0e72d735d89e92a621cec88ea59560f19 SHA512 db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d
 EBUILD cryptsetup-2.3.2.ebuild 4237 BLAKE2B 162a44538c0e962723b53de1e1c62252b2ba18d102724572d97c7a769d2a3298fe9c02170c0a6569d8f915c5987e4ebcd3cbe5d03c093d7181b8dbb8f98d8abc SHA512 6fd1de10c444320888ec5b0d4378c45001afae613f501c89914647a210cf3bb1ac8414325aa79d32fbfd4d4b6954b77ffcd50e06a3867c9fa43d8b044c9e59f9
 EBUILD cryptsetup-2.3.3.ebuild 4246 BLAKE2B fd0847b15440e36bcce552f84678dc995e06722938e64f4700d51c545f77dfc60fe08f0e4cabd8ac5bf02496ae3d42f13f413f75b4b1dfc484559263dc7d0b9b SHA512 388e9da18c262989e564a3cc8c5d0bababa3620b9ad13e1b49aa63d0082d1837460845e626e839befe07dda48b32c8c41248e77156dc46909ff5c70c41be8323
+EBUILD cryptsetup-2.3.4.ebuild 3924 BLAKE2B cb9f482303c7ac087bd11eb7e891a592f274026b4282f1fa12d92a7b156bc0d2d9e6507d730ea4592a15af5beb7ed2abb78fc2117e77a5ac3ecfb2559eef69dc SHA512 2aa95e79b0e0c494d5aef3d5dfcde47ff38f600e93059a0175f15f9677350da0b4fcae8d3c29d987d261c44c9f3a9fa74a197e5bb98408a3d3ee9449fcd747df
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
new file mode 100644
index 000000000000..78f20a6fafb3
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-2.3.4.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools linux-info libtool
+
+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 ~riscv ~s390 ~sparc ~x86"
+CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
+# we don't support nss since it doesn't allow cryptsetup to be built statically
+# and it's missing ripemd160 support so it can't provide full backward compatibility
+IUSE="${CRYPTO_BACKENDS} +argon2 libressl nls pwquality reencrypt static static-libs +udev urandom"
+REQUIRED_USE="^^ ( ${CRYPTO_BACKENDS//+/} )
+	libressl? ( openssl )
+	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:0=[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}
+	static? ( ${LIB_DEPEND} )"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+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
+
+	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 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
+		if use reencrypt ; then
+			mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die
+		fi
+	fi
+	find "${ED}" -type f -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/duperemove/Manifest b/sys-fs/duperemove/Manifest
index 5d6a3211f136..da14afb19ea2 100644
--- a/sys-fs/duperemove/Manifest
+++ b/sys-fs/duperemove/Manifest
@@ -1,3 +1,3 @@
 DIST duperemove-0.11.1.tar.gz 115740 BLAKE2B 7804f1c98cdeb349ae12425636575c9b2468613dfe908d8c9f1d9fb74aefb412142002a0fc899b8448ed1b255257569555264b9d9c172899f856a919d02dd1a8 SHA512 3c344b00b8fb58a259840aea977ba2e5123b651bb58ec84177bdfd8337a377361984b85c6325271b7d3e4ea216017fa6fda793136c83e9837a13ec041df326b9
 EBUILD duperemove-0.11.1.ebuild 621 BLAKE2B 71c3b85e3b46c60a90475364ec149b1e736ffa9216ae12228c57dc1f109109fccc3d3d26c6d7d11266daddf3f99e00e2ec61a7c5b3be81a9e6fcfa8ee8bdfe4f SHA512 e1e67d3fe8e6d0f7e9da7e8e90cf7958d72b23c3149c6b1e395de3873a810dc2c68f712082f75264b4d1e3dbc5392428ab8d5f6d93d0958b4f2c16e167e5fd51
-MISC metadata.xml 398 BLAKE2B 66ebf93590acaefd277a034949ef134ad7c50f48eff1bfaf2d19adc2d24be299c0b16b4b1d4426152ed230a4ad4c27d42aed7381f4e9b5a8c900c90424919c26 SHA512 cfa597d075150b0839764b07214574642257d1e406918bbf587c14a93595050e6b73a04ebc180c8c2dbdc5be8b868844d7409b5b7459d77db1bbd6803499470b
+MISC metadata.xml 333 BLAKE2B 0fee725be9a70cd4044f405f29806359d9e310aaf38915806ba1486424d7b55af23e052cb42d4e2583d5d11bf1be86b59a74e9c556bff985dad4e6c5ee5843f0 SHA512 686d9f84253b594161fecbe0693e1a88735ee928eb7683317e46317e746cd787790e27691b77f6df4da864aec5fb7ac76436de0dd3805f9707c2536daa3eb122
diff --git a/sys-fs/duperemove/metadata.xml b/sys-fs/duperemove/metadata.xml
index 8fbce67b26b5..2820a4f7ee56 100644
--- a/sys-fs/duperemove/metadata.xml
+++ b/sys-fs/duperemove/metadata.xml
@@ -5,7 +5,6 @@
 		<email>mgorny@gentoo.org</email>
 		<name>Michał Górny</name>
 	</maintainer>
-	<longdescription>Btrfs deduplication utility.</longdescription>
 	<upstream>
 		<remote-id type="github">markfasheh/duperemove</remote-id>
 	</upstream>
diff --git a/sys-fs/fatresize/Manifest b/sys-fs/fatresize/Manifest
index 9be38a62f060..78f3681139ef 100644
--- a/sys-fs/fatresize/Manifest
+++ b/sys-fs/fatresize/Manifest
@@ -1,4 +1,6 @@
 AUX fatresize-1.0.4-version.patch 203 BLAKE2B 1d9b66cadb04b4deb8798997db50b03abcebbe110c103817805eccd1a2c29331644b90b80aa7ae7091a75f2b7359437151ecfba26638c5f40386014f2a61b7ca SHA512 e1ee0ac7fc08be32c7b34cc8ea27da9baa9e6d5d38b10f2cd9be3614820cab4a8d787fd503ffd85cd65d8de065fa920f0dd5937b861eda48487e0759155957f6
 DIST fatresize-1.0.4.tar.gz 115159 BLAKE2B 16bdfc28bb58f9694adccc7d04dc7c26dc72ce0e859787f66c2aa9c560ce987f20374e9f5166b79ac9501878e06f072c9102ce2f4e3bc2afa694e2a13ecb8e07 SHA512 36b67f7d5e4ccb03b98fb8a788c40f430464a40765a9092deab3292ff736fcb07288c4b5b30143a18125f4b3de1225ce32b5643b344ec207ca332a87981fe18f
+DIST fatresize-1.1.0.tar.gz 137090 BLAKE2B bdfd8e257fa0b40a1bf8dad4c6b8c91958d605a3c25596153808bf14e1e1b703c1fc7c458ddd444cdd15795c7721496d1e649d9ebc16d4693ad420285511784c SHA512 e4de417fffcceab071571c878f93bb68c7a7fa4f3ab89e272f533940669ffeaa0cb36967dc8fd7cdeda935ef352bce735dd4dac579a2291d9c01447648e8d40f
 EBUILD fatresize-1.0.4.ebuild 506 BLAKE2B 8c490c0683d312c2a6d853917d5a8af344b87f290e1a5294083c8198ddddfff4f551d6bd9f9ad0e573470286b08c15168d345ae82a782e0b17b02ca03a937875 SHA512 75379d9284cbceb844e0a86158093d6075f91ae49aa7aebc780af660bd8bef7e9f725808090f2755c60f4910fa2f4c0a70b31aff2ce850b5a8bc36cfd6c744b8
+EBUILD fatresize-1.1.0.ebuild 407 BLAKE2B 6b13170460321cf69d0b5a7bb297854dfd4609f1abb00c9e0d4c8f7ef3342262263c63a8357bef9731c4f92f154316f818ed2d9e1526422b7d87fd160220f3e4 SHA512 cf23f8e4a91ac9ffa79a3ff86bf6c63dc7222767b863543306d6ef29ecb081936cc39dce5775600b5a934ef7a8da887ecd235f0bd8dcecd914885cee4b4a9220
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/sys-fs/fatresize/fatresize-1.1.0.ebuild b/sys-fs/fatresize/fatresize-1.1.0.ebuild
new file mode 100644
index 000000000000..a40d7a93a917
--- /dev/null
+++ b/sys-fs/fatresize/fatresize-1.1.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Resize FAT partitions using libparted"
+HOMEPAGE="https://github.com/ya-mouse/fatresize"
+SRC_URI="https://github.com/ya-mouse/fatresize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=sys-block/parted-2.4
+"
+RDEPEND="
+	${DEPEND}
+"
diff --git a/sys-fs/growpart/Manifest b/sys-fs/growpart/Manifest
index d785a3f2fb93..3ded656163ba 100644
--- a/sys-fs/growpart/Manifest
+++ b/sys-fs/growpart/Manifest
@@ -2,4 +2,4 @@ DIST growpart-0.0.1.gz 7731 BLAKE2B 187a532f87a0c5caefb4877e9a629e154e75f857299c
 DIST growpart-0.0.30.gz 7897 BLAKE2B b8f28615578c1b19a7cd2eff9cb60c37929c2d3767d9f98b07b1040f7f5d2687f41ed051b9899573119b4de9c2e04dcb91d76fc70fcff7a6e6dde0335959681f SHA512 ed6cf92149c0802c4a08427fa025ce2666dd7c32c5d1f362f4d14973f709dfd73124fd85b7eaf179daad5dfb1d126e86d7db0fb1fe7e2d496e17bf0bc1bc9c58
 EBUILD growpart-0.0.1.ebuild 504 BLAKE2B fcc63c7029c1ece4878609248046e5dc82e00427dbdeb885888bee281f6f94a0b9f253e7dbf4ccaeb57652312021767385c856ee21c1d5e8d0610a6f90b509c5 SHA512 3f4bf22da670ed117992c1ae8ea32f54633f4ba5fc1c849b58c1c9fe4abe89c49617102a027d4581214dc96bde2d74c80645836a72e9e3c26a63847d1b5ee3c7
 EBUILD growpart-0.0.30.ebuild 512 BLAKE2B b9121f0240fb8b2eee6cf9e2b33ab2e678610a74c1bd295e06096b52b38d654cea9d82212a330cc48a1eafcb6350c546ccaca93f16710b226469fa6e7e28a6f8 SHA512 14148542f813a66c27c9a5b3fe5b2e3cc9a0a2fc1db0b773e9b091d8135a543023acd05a5e173fe43d9c42d0503b6dc2b4ffe667784a030c9c479d33ad6fafea
-MISC metadata.xml 330 BLAKE2B d3ec3cf8acc79aef659e1818315a7e1c94b15cc3e75cbc7acc605a78350ad93cf20dbbf7c2ffb5a819cb8b6f09f83e380407d943bea3accd09fba665e47a970a SHA512 dc5e3efe296cfb0fd207d93ba4279d325fe50f52d9aa932a57d0cb0eb9bdc3a46c0d46be76115bcfe1db74f55c87a195c1a21b71f92b6b5a3b707577a54366e9
+MISC metadata.xml 254 BLAKE2B 731c7015b1415180253ab851fc24ad031153050aa0feff41781a5c16ced70787ca132b4fe53adaa8a189de944dda987c65081162895f1f03d68dc77405308fa7 SHA512 49faa8aa0aef31db638fe291aa55ff114f96fd9f9b2c733f88b326b44f3e9dbf627e825de7c41d45f208b2b7e5e6cd5c03e6fee3fa6013625ce7ce158bbc9a31
diff --git a/sys-fs/growpart/metadata.xml b/sys-fs/growpart/metadata.xml
index ef2b3b755493..3ffdeb4af3b5 100644
--- a/sys-fs/growpart/metadata.xml
+++ b/sys-fs/growpart/metadata.xml
@@ -5,7 +5,4 @@
 		<email>prometheanfire@gentoo.org</email>
 		<name>Matthew Thode</name>
 	</maintainer>
-	<longdescription lang="en">
-		grow your root partition
-	</longdescription>
 </pkgmetadata>
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index f4815a8c8232..f4cd769e4bc5 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,9 +1,6 @@
 AUX lxcfs-4.0.0.confd 221 BLAKE2B 18924acc45506885e0f1795ffd4dd666d341abc2957c22a241909004ea988f1464b817939b450741bc77e413fb37d2e2dcd8f85405ab69f27d475567f48df2db SHA512 ebccfce0f865c8dbc1cff67712be4ac625b91ccc42aa78971c6619cf32553abe15ae82c6b3f320600cf3605f8b8c7ccbbcac3a399c6ae8261a08ea2793992e58
 AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061decfdf327a24cb1360dd08184d8cdc3936db26b6a50c47748f146414a1ae1ab61f963a9c7740c0ec3919 SHA512 755356e2a4f1e92803d8864c4edc223c183c81592562d6492d4b374174d4e5ca2d30fcdeb9861c46df795e6373ecf5f14c089c7ad22465d02516748c2c18aed7
 AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf
-AUX lxcfs.service 350 BLAKE2B 654b9053265ac16b28e0e5d04e0278070e8f6f2bc08be55f6a896c372f1b6c98c8872a0386c0dc71dee0a3afcf7cb3a7f5049d8f5a192dda983d7273eb2bdacf SHA512 3c8f44bdc2f9e5e23fa0a44b77ce3cb0cd5fd90fea6e82a46e7bac77d22a1d52a66c3d052ca9ea7319d1debe1a1808e01a34adb79fa4fd9f1024ab60139afc6c
-DIST lxcfs-4.0.3.tar.gz 100719 BLAKE2B 24371b921ad635f97c51ac8406c949e81330ae358b0166c2af295cb1f630594bb72da802aad41971c11303f393fd05bc9f1b109bd4da4953db2c3bb7e5189315 SHA512 0aaedfe826d982b9464dfb60fb57c58e34ea6022b8503bc858538b6634dc7d0845f65832d6f814043dbc0677f887e1b559549a8f3865c755970c6b47ba65eb2b
 DIST lxcfs-4.0.5.tar.gz 101842 BLAKE2B c916473e1b7ad42b8f69026a16810941c999d44ffcf1d456cb301411965f05e626338a5bde1e38fe99acd05f72bbcd5acbdcb2f65fa5ec183c967babcb8c70fd SHA512 5c44aa7f43071a4316cc8702928fde2c928bd5654c9ab4d540152839db0d7dd235a861f263da56f02611941d46d22eee98e0cdd52aeaeda99f3c79c754d420a1
-EBUILD lxcfs-4.0.3.ebuild 1248 BLAKE2B 0e37ad8f8b904f2fa2aead5fc24e316bd8d9f0b9a67c8db8f2351750f8308a7688bc4e78d662a533d16aa58b871fccfd21b33624e295a36de4fd32e1277ab8de SHA512 ea98650d13885fe5d5217ea2486c4042636377e862b71509a5de74ca028a27c7fe89c05ba663397164bea8bbd1ab845a97cfd910327b61e11879ccce2102cdd2
-EBUILD lxcfs-4.0.5.ebuild 1130 BLAKE2B 5b3b52a533f18cb23fd226189145bb2482918e67e0cfdde4c3b9398f83262df9cae1053fe6e2e0597e912606fa1cfd4ec53293feb480f5adf1b666ec761b7098 SHA512 bd182c749df79c21e2e5ea0a8742660d99b3c82c07f530b0a71a4d75313c078d198bdc49f43cd35f5ee5443983e13b2e72ca428e4331a98928c559a94a5a6965
-MISC metadata.xml 808 BLAKE2B b8b8be1a8fd8a1a9614dbfeddd97cd322bcf0ed4d11a97bc6680bde28faa0bdaabbf8b5a92242e0da09845f6a08280dd0d6681e3932a7319117c186f167bf6fd SHA512 dfb81661c2feb5abb3397c93eabf26c12af51099f6676d8fec346c83ca3edea788745e4a59ea05035b16b1baf21edd16d9537f66fbd10d0c8da8a7933b35c528
+EBUILD lxcfs-4.0.5.ebuild 1129 BLAKE2B e70fa396777b48492042ade549ea7bf145872a81884ec992125e8fc69556f5ae19c4e30a7dc81b3559d6ba21ac9317ff73860b7e61440afe915010b5e3d56122 SHA512 61c3c09410a3e9f173847c3a6050fb589931fa7db15e9142b9d1fb71c9ca6fcb4d5732f4dd4c73f3229768175b920acfbfe21ac01edbe5578e2692191de828bd
+MISC metadata.xml 710 BLAKE2B d82ae0c425bf378faf05f11f4b1a22194ffaca6b94f9e7ac500bd8f72c62459706ac58562d2631b3983e06398313cce80c131b940cee50869ea911141785e6e1 SHA512 217ea0081e2829394781ebe266960f1a9c2a6162f8afad0b915284471d5657065d93845b518d8f1d280df085bd2a7d80f4f1a30e91964d91bda1e71f5cda90f9
diff --git a/sys-fs/lxcfs/files/lxcfs.service b/sys-fs/lxcfs/files/lxcfs.service
deleted file mode 100644
index aea0d6d920fc..000000000000
--- a/sys-fs/lxcfs/files/lxcfs.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=FUSE filesystem for LXC
-ConditionVirtualization=!container
-Before=lxc.service
-Documentation=man:lxcfs(1)
-
-[Service]
-ExecStart=/usr/bin/lxcfs /var/lib/lxcfs
-KillMode=process
-Restart=on-failure
-ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
-Delegate=yes
-ExecReload=/bin/kill -USR1 $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
deleted file mode 100644
index de32fe294cb3..000000000000
--- a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd
-
-DESCRIPTION="FUSE filesystem for LXC"
-HOMEPAGE="https://linuxcontainers.org/lxcfs/introduction/ https://github.com/lxc/lxcfs/"
-SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64"
-
-# Omit all dbus.  Upstream appears to require it because systemd, but
-# lxcfs makes no direct use of dbus.
-# acct-group/lxd needed for the fowners below.
-RDEPEND="dev-libs/glib:2
-	sys-fs/fuse:0"
-DEPEND="${RDEPEND}"
-BDEPEND="sys-apps/help2man"
-
-RESTRICT="test"
-
-S="${WORKDIR}/${PN}-${P}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Without the localstatedir the filesystem isn't mounted correctly
-	# Without with-distro ./configure will fail when cross-compiling
-	econf --localstatedir=/var --with-distro=gentoo
-}
-
-src_test() {
-	emake tests
-	tests/main.sh || die "Tests failed"
-}
-
-src_install() {
-	default
-
-	# Getting weird file collisions, 
-	# keepdir /var/lib/lxcfs
-	# fowners -R root:lxd /var/lib/lxcfs
-
-	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
-	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
-	systemd_dounit config/init/systemd/lxcfs.service
-}
diff --git a/sys-fs/lxcfs/lxcfs-4.0.5.ebuild b/sys-fs/lxcfs/lxcfs-4.0.5.ebuild
index 3f5a924ec104..8c7b1f79d64f 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.5.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lxc/lxcfs/archive/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="dev-libs/glib:2
 	sys-fs/fuse:0"
diff --git a/sys-fs/lxcfs/metadata.xml b/sys-fs/lxcfs/metadata.xml
index 9ed77f5faf52..b40dcc8519b4 100644
--- a/sys-fs/lxcfs/metadata.xml
+++ b/sys-fs/lxcfs/metadata.xml
@@ -5,10 +5,6 @@
 		<email>stasibear@gentoo.org</email>
 		<name>Erik Mackdanz</name>
 	</maintainer>
-	<maintainer type="person">
-		<email>john@irc.tm</email>
-		<name>John Cooke</name>
-	</maintainer>
 	<maintainer type="project">
 		<email>virtualization@gentoo.org</email>
 		<name>Gentoo Virtualization Project</name>
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 1f1c5133793c..091615503a5e 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -1,5 +1,3 @@
-AUX multipath-tools-0.6.2-ignore-modprobe-failures.patch 831 BLAKE2B e30f06a67f8e5f00156f35abf4c60dec71f5b3f8487b8a6822a0a5eae32f6b034fd2be98da34aad085db933a0cef592d0056075819a9e8985a8aab7b3743cfd4 SHA512 62e40c6577bc7cd24f3283de94692cc7550d39a9caa255ca5d77c2d3c324a85c0364fca73b154f17197cf38b82b171eae759f9eb1ecf8ab5801afafd42b1b156
-AUX multipath-tools-0.6.4-sysmacros.patch 1554 BLAKE2B d293a6a72fbf0480c711af66b8bbb78da3584270c766cbcdd096bbd46b2f34170a68c459c5cc9b4d472359a80aeb108498209ac926623eb09277af18a5ff1170 SHA512 1f6c862e0fc73859b670d2917b2e0d63731714edb07098929dbd46e7cc61f9d354f30558034993c8e719de103d4b37c16a34483236a040db28a983416772634e
 AUX multipath-tools-0.7.5-respect-flags.patch 660 BLAKE2B 1efc793d9741b1a732895cbd7cfb4fbf04026db24f834a5bec25c33413132b39e0afe46f8851a6dfd6bd05fe88bfc15fd8cc24f03df435f75c209c401bd68b6a SHA512 58a44988a5c9a82affa3fdc969eaac87b5672a743434f2c8cab269b0b526f1c150bc10655bccccc1e8a26e3237350d4824b0497bb29c925cd42a084f84268fcf
 AUX multipath-tools-0.8.3-fix-gcc-10-compatibility.patch 434 BLAKE2B 2ebda2c60d3f2dd1152a1a6291d2ef476ad7e2ec96aa05a31353dedd22be7383e93f792498e7d73a017f1a66856caab582946b27df7bcdc50485816c97090710 SHA512 97bba4b041bac4cfa934148136cdd4795a09136d3671ba9c508f1e08516dc7515e3d7ff5ec5c79187f530afc22c46c8a7817449a763b200062f821c168fcb352
 AUX multipath-tools-0.8.3-json-c-0.14.patch 1125 BLAKE2B 70d5d1eb8b96e92f9bd2ec637b460784759e9a68970400d3007a21fcdd4e9ea4d27a9b2ced6c14d6a02d6331f38bce35ca13e5ca13284077f04d701c021b5b69 SHA512 d743ee4f31949ca8c65c536e379781394ab5de79e47e59b0ccef92d5581243edde0de641756ca28c902f6cba0d3c0fd0d51029e0fe3985fb3a353f7e3cf10c77
@@ -9,12 +7,8 @@ AUX multipath-tools-0.8.4-respect-flags.patch 736 BLAKE2B 43530a05c438385a90e198
 AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6d55997d25de9a3dbf0d032c977593c2ee8d447539a34be0294ee3a80a80fb004dc2c51c8c64b5 SHA512 f08833fc3c928900f8c29438208b9715581bae426b1f45c246e8c418b210f7f9d35517ef9ad44db3d88944183b34e3411ece909b56892a9f3b7250fed49e43fe
 AUX multipathd-r1.rc 264 BLAKE2B f08733746c702da27e002b2cb07bbc1a1925002b1592c2f566aa8d66c71da5fd39fd6389636fc49b602f9051190ee5f7f85ad9ff35b924f51a2698e1a6654f0e SHA512 8cf764b59ed4bb13c3c2143cd83ee39bc87eca85c40acb3ed1dcd7cf4c39ecbdea7974b9705231d48377266c034a8623157648b9a99b6cef73617e4b37ad377e
 AUX rc-multipathd 402 BLAKE2B c44befc14ff361d27278bd7850aada4fb8e309c0459d9d1bdb3ca1a670929b2d8b40275c73cd937ab3245b95460b3e9e12ecf199532ec916e1cf5f3e634d3bbb SHA512 466296ff69c0f56c312a8b88445ca0719c8c6b794511f7e228812d63b859bd120b965301c8923e3411a3e1b196e7fb9c48dd7dbe004efe4c65ee7f9798cc3e11
-DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea
-DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379 SHA512 6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
 DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f491845eb06928ab74e631df8c6b3c110d10f43f75b9f8289a7134826c923b7ba58ce54c40497c3b7e6211e53902c8a1b5f SHA512 d9fdc2763f5a1efa15ee07c5d863008c9694623935f62a0e0b56f941df4e0d0ca3f86056fefc9b5ca828b47782127e3d55f2f925b1ed957e02b675bef36f4cae
 DIST multipath-tools-0.8.4.tar.gz 480994 BLAKE2B be8368df049218e2eaa1749e7b1c7a930da15f0311ab549b1bbba9c019dcfe39f90a05fd621e0703301ef1d55c98ac8cc74231d82950d9066f19d8764421704b SHA512 720823188c053c1c50269a30e34a9d69099098495bfd607076bcfa2c079565e3f0580c91783f19d42ed82290c0db98e4e19ef620eca4ee5ec7885c49c72d2307
-EBUILD multipath-tools-0.6.4-r1.ebuild 2545 BLAKE2B f22afaabe21080d64175063c82e5a731d9e789968d1502b3771ade1eeb3ba3bf539d9cd1d100b75875a5f86fe85ef1ed77b8fee5178829ae301df23eadb0765c SHA512 21c5474be753c3762af2e1b73aab89d666d6f477d04b612360925ff10d994b1fd1152204a5254a39d87438cce274c0d57cb7003e37679b49d22b159fe5c0cfce
-EBUILD multipath-tools-0.7.9.ebuild 2068 BLAKE2B ec54d156a55c25a9c7cc9c6c3854a48c8bb1d404119398bfdb9defcb5c011e1824ce82f53cd5cc4d8e81a63bb412d11cb79ac276406e140f2808b911f7912947 SHA512 8e1fff8d8c71b2cac948e5501edef63acb7e0ba760e7b56a22644e0e08ce3cb9b70c29e69550f6a356113154f740a4e95199ac14e44b3d2db338605954d19be4
 EBUILD multipath-tools-0.8.3-r2.ebuild 2214 BLAKE2B bf6650365f7fe7548f6643e5935752851bc8b89ce0e3276f90d74398e8e198ef9cea082136781f2e89fb1447bdcdc8830478757fc347597af62d5b366ecd87fe SHA512 e01fe5c6c6ecd49c09afb3f9920a15d70d487d11c9a06a3214cd10a91170f557f152a847b867756cc61534edb0f9d3d21f75966e60fa77ca5b7fa7419e26e50c
 EBUILD multipath-tools-0.8.4.ebuild 2214 BLAKE2B 90daeab97f15ecfe9ffae2158825dce22578cf0d77c6bc576ad55d643a88759083c4270c3923d587ce7aa78709f2d14957c16209c745273ef085011b39e4f0aa SHA512 c748accc0babbe40ab7e8c5950a12df281bdf47a700e62d9b24c4737d5df967fbf23e5ca3902cf13c2d86fe9c26b9be8f15d1ac4b5f8d829e6a50382d5615409
 MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch b/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch
deleted file mode 100644
index cb785899c2ed..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.6.2-ignore-modprobe-failures.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 100588046ad59176b9779c73212aea63be5aace4 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 12 Sep 2016 17:26:38 -0400
-Subject: [PATCH] multipathd.service: ignore modprobe failures
-
----
- multipathd/multipathd.service | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/multipathd/multipathd.service b/multipathd/multipathd.service
-index e3d6f91..d26577f 100644
---- a/multipathd/multipathd.service
-+++ b/multipathd/multipathd.service
-@@ -11,7 +11,7 @@ Conflicts=shutdown.target
- Type=notify
- NotifyAccess=main
- LimitCORE=infinity
--ExecStartPre=/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath
-+ExecStartPre=-/sbin/modprobe -a scsi_dh_alua scsi_dh_emc scsi_dh_rdac dm-multipath
- ExecStart=/sbin/multipathd -d -s
- ExecReload=/sbin/multipathd reconfigure
- 
--- 
-2.10.0
-
diff --git a/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch b/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch
deleted file mode 100644
index 99a12fc7b784..000000000000
--- a/sys-fs/multipath-tools/files/multipath-tools-0.6.4-sysmacros.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/kpartx/dasd.c b/kpartx/dasd.c
-index 1206e45..f50c1bd 100644
---- a/kpartx/dasd.c
-+++ b/kpartx/dasd.c
-@@ -28,6 +28,7 @@
- #include <inttypes.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/ioctl.h>
- #include <linux/hdreg.h>
- #include <errno.h>
-diff --git a/kpartx/kpartx.c b/kpartx/kpartx.c
-index d31fea8..3452787 100644
---- a/kpartx/kpartx.c
-+++ b/kpartx/kpartx.c
-@@ -28,6 +28,7 @@
- #include <stdint.h>
- #include <sys/ioctl.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <ctype.h>
- #include <libdevmapper.h>
-diff --git a/libmultipath/checkers/tur.c b/libmultipath/checkers/tur.c
-index 4d6c3c2..d9a9e67 100644
---- a/libmultipath/checkers/tur.c
-+++ b/libmultipath/checkers/tur.c
-@@ -11,6 +11,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <sys/sysmacros.h>
- #include <errno.h>
- #include <sys/time.h>
- #include <pthread.h>
-diff --git a/libmultipath/devmapper.c b/libmultipath/devmapper.c
-index 4f8ef13..9c0b240 100644
---- a/libmultipath/devmapper.c
-+++ b/libmultipath/devmapper.c
-@@ -12,6 +12,7 @@
- #include <ctype.h>
- #include <unistd.h>
- #include <errno.h>
-+#include <sys/sysmacros.h>
- 
- #include "checkers.h"
- #include "vector.h"
-diff --git a/libmultipath/util.c b/libmultipath/util.c
-index 03a5738..1841f35 100644
---- a/libmultipath/util.c
-+++ b/libmultipath/util.c
-@@ -4,6 +4,7 @@
- #include <pthread.h>
- #include <string.h>
- #include <sys/stat.h>
-+#include <sys/sysmacros.h>
- #include <sys/types.h>
- #include <unistd.h>
- 
diff --git a/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild
deleted file mode 100644
index 59c081dc6d95..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="http://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
-IUSE="systemd rbd"
-
-RDEPEND=">=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	sys-libs/readline:0=
-	rbd? ( sys-cluster/ceph )
-	systemd? ( sys-apps/systemd )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-PATCHES=(
-	# modprobe fails when modules are compiled statically into the kernel
-	# https://www.redhat.com/archives/dm-devel/2017-January/msg00043.html
-	"${FILESDIR}"/${PN}-0.6.2-ignore-modprobe-failures.patch
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=604228
-	# https://www.redhat.com/archives/dm-devel/2017-January/msg00022.html
-	"${FILESDIR}"/${P}-sysmacros.patch
-)
-
-get_systemd_pv() {
-	use systemd && \
-		$(tc-getPKG_CONFIG) --modversion systemd
-}
-
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# Fix for bug #624884
-	if grep -qF DM_TABLE_STATE kpartx/kpartx.rules ; then
-		sed '/DM_TABLE_STATE/d' -i kpartx/kpartx.rules || die
-	else
-		elog "DM_TABLE_STATE sed hack is no longer necessary."
-	fi
-
-	# The upstream lacks any way to configure the build at present
-	# and ceph is a huge dependency, so we're using sed to make it
-	# optional until the upstream has a proer configure system
-	if ! use rbd ; then
-		sed -i -e "s/libcheckrbd.so/# libcheckrbd.so/" libmultipath/checkers/Makefile
-		sed -i -e "s/-lrados//" libmultipath/checkers/Makefile
-	fi
-}
-
-src_compile() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man{5,8}
-	emake \
-		DESTDIR="${D}" \
-		SYSTEMD=$(get_systemd_pv) \
-		unitdir="$(systemd_get_systemunitdir)" \
-		libudevdir='${prefix}'/"$(get_udevdir)" \
-		install
-
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "If you need multipath on your system, you must"
-		elog "add 'multipath' into your boot runlevel!"
-	fi
-}
diff --git a/sys-fs/multipath-tools/multipath-tools-0.7.9.ebuild b/sys-fs/multipath-tools/multipath-tools-0.7.9.ebuild
deleted file mode 100644
index c4898d34da40..000000000000
--- a/sys-fs/multipath-tools/multipath-tools-0.7.9.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
-
-DESCRIPTION="Device mapper target autoconfig"
-HOMEPAGE="http://christophe.varoqui.free.fr/"
-SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="systemd rbd"
-
-RDEPEND="
-	dev-libs/json-c:=
-	dev-libs/libaio
-	dev-libs/userspace-rcu:=
-	>=sys-fs/lvm2-2.02.45
-	>=virtual/udev-171
-	sys-libs/readline:0=
-	rbd? ( sys-cluster/ceph )
-	systemd? ( sys-apps/systemd )
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
-
-CONFIG_CHECK="~DM_MULTIPATH"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch )
-
-get_systemd_pv() {
-	use systemd && \
-		$(tc-getPKG_CONFIG) --modversion systemd
-}
-
-pkg_pretend() {
-	linux-info_pkg_setup
-}
-
-pkg_setup() {
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# The upstream lacks any way to configure the build at present
-	# and ceph is a huge dependency, so we're using sed to make it
-	# optional until the upstream has a proper configure system
-	if ! use rbd ; then
-		sed \
-			-e "s/libcheckrbd.so/# libcheckrbd.so/" \
-			-e "s/-lrados//" \
-			-i libmultipath/checkers/Makefile \
-			|| die
-	fi
-}
-
-src_compile() {
-	# LIBDM_API_FLUSH involves grepping files in /usr/include,
-	# so force the test to go the way we want #411337.
-	emake \
-		CC="$(tc-getCC)" \
-		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
-}
-
-src_install() {
-	dodir /sbin /usr/share/man/man{5,8}
-	emake \
-		DESTDIR="${D}" \
-		SYSTEMD=$(get_systemd_pv) \
-		unitdir="$(systemd_get_systemunitdir)" \
-		libudevdir='${prefix}'/"$(get_udevdir)" \
-		install
-
-	newinitd "${FILESDIR}"/rc-multipathd multipathd
-	newinitd "${FILESDIR}"/multipath.rc multipath
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "If you need multipath on your system, you must"
-		elog "add 'multipath' into your boot runlevel!"
-	fi
-}
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index 4bff3fcde9f1..581bd251c366 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -5,4 +5,4 @@ DIST reiser4progs-2.0.3.tar.gz 995921 BLAKE2B fa38c8998603ca0c26a17c75240d07afec
 EBUILD reiser4progs-1.2.1.ebuild 1295 BLAKE2B 8ef4781ad4a121a92f6c732ba92eb8d6adb51f918eb975eb7cb97969135d1380e41bb1b010788ebd970805d29d8ca7267387ed3da75943922ac0fad729066ef1 SHA512 81f2db7655fe926394e628cacc97ef1d1749a4387393a7c04575cff245268f42b8e9fa58c974a5a8647b9d34f9e73b4f9b596dc70bf512f53b90fd3022af9fdd
 EBUILD reiser4progs-2.0.2.ebuild 1341 BLAKE2B dd6207a5efd9f565c717ae0fc1517a1c2208e9efdddc71fed1d3b83ff0c890def4681029e828208009fd5c5f0fc7dab22c2ed488893921817b2bcd9cc17f331a SHA512 1d14e1acf510629aa32e6b7a50dcdb962e332ae7f5c8402b63e97ab2b5d16d244835a7a858cd477143b5d1a085db3534903c183e2cb81b113c4987840a1cc5a4
 EBUILD reiser4progs-2.0.3.ebuild 1341 BLAKE2B dd6207a5efd9f565c717ae0fc1517a1c2208e9efdddc71fed1d3b83ff0c890def4681029e828208009fd5c5f0fc7dab22c2ed488893921817b2bcd9cc17f331a SHA512 1d14e1acf510629aa32e6b7a50dcdb962e332ae7f5c8402b63e97ab2b5d16d244835a7a858cd477143b5d1a085db3534903c183e2cb81b113c4987840a1cc5a4
-MISC metadata.xml 440 BLAKE2B ccaa949c04b37b13f2b7d11a4ab6586de239bc61be58e772f160e797e6da6c102b66be660e57e7888ca5960911b0dd2455978709de0d6e75b615a37bd870e8de SHA512 f12899412ca119abba07a6012e55f243ea069e1132c7dd9786aeb399f7d543ff82cba92f0957443ec08f230e68bc257729b789519ef52337ebc5679ee63b3ddc
+MISC metadata.xml 327 BLAKE2B dcc63f48d652f59288d08c38c2f0e430bc15f4224e2b5cf8b690e4e2cb1bcbd7ff97151d2e13f7482f21c1e9a92f45b867beef2aded7bb090f9011532c401e93 SHA512 f578c1f4305a1e24c06dfc53231a053cffde7ddebdbd7f61dd0fd58b650dadc8bc1cefa48213ca9734e081d30436bb7e5a093682eccc1a4a1a9e5bf707d61846
diff --git a/sys-fs/reiser4progs/metadata.xml b/sys-fs/reiser4progs/metadata.xml
index 0b1c10d7263b..beb7d59cfa8e 100644
--- a/sys-fs/reiser4progs/metadata.xml
+++ b/sys-fs/reiser4progs/metadata.xml
@@ -5,9 +5,6 @@
 	<email>base-system@gentoo.org</email>
 	<name>Gentoo Base System</name>
 </maintainer>
-<longdescription lang="en">
-This is a library for reiser4 filesystem access and manipulation.
-</longdescription>
 <upstream>
 	<remote-id type="sourceforge">reiser4</remote-id>
 </upstream>
diff --git a/sys-fs/simple-mtpfs/Manifest b/sys-fs/simple-mtpfs/Manifest
index 882bf62e1942..14f132745519 100644
--- a/sys-fs/simple-mtpfs/Manifest
+++ b/sys-fs/simple-mtpfs/Manifest
@@ -1,3 +1,5 @@
 DIST simple-mtpfs-0.3.0.tar.gz 36655 BLAKE2B 3e3e625268fac9454f512ce592d84fde3b3e6d190f123b82bede13bc4119ad4c0cefb4ca3e5d8a81ddf9a020dc375be389853410b0147b419a255b6c0af6047b SHA512 7d2da152708c01ddd2a39c1b56cba6470bfd320b92507530cdd8fc4f25f9500ff817eac6a5d19c775f31029ae6a0baef693987c59453c60c688b84934378f772
+DIST simple-mtpfs-0.4.0.tar.gz 36234 BLAKE2B ec5739625286b63dc6285fb83a4c71f5ed9bb8ed757eab111e543e15efbc45a5fc3a2609382f01cf18d4c6160258800963c349b6d64b2648257cde99f9359432 SHA512 6f213f9df792f33cd3842357aecf444cdc8030c89e4abc19b56a2c60f58213b5545b3d7857b0d46cdd237d0c24d5d6eb3cbe59ba9fc3c32f91396c5724ac86d7
 EBUILD simple-mtpfs-0.3.0.ebuild 590 BLAKE2B ca37769d12403583490200c01da817db1856cddcc882c943b42dc3b2bf003dfe99f2db0df3de566da4828eaec369676c50c835a228b861df52e22ebcf8492725 SHA512 2e909dd230f69416557d0ec441ba23b845a6ccc6fd43d0ba93e0805cf571778514e747c14915503da31cf1bad013c399fb93d5d2728c64aa0be66aba9c5a747c
-MISC metadata.xml 799 BLAKE2B 0e57ff1e7dab7129a637ae9b978d448cc7e10932c3d1d9407a6e68465d45b433d427fa1ca2d3953d9b8c631fd69b58902c2b7503ee27599445db0b1452c2fc8a SHA512 5957d316d1df4e24a79c54f68f1814f6d3d8766c4324c1664ad29da6534d8e7a25652033be1472a61992e76d6cc0c6d07683f30c7e496e894629587620693b7e
+EBUILD simple-mtpfs-0.4.0.ebuild 615 BLAKE2B 3ce16cfadcebb42d530982dc0ad6e630075b34f0ac054b91d79e5319f8ee6d76390f61fae97810b47398043eb5986fa1ed5837fae67f6eafba3284c5c82c67d4 SHA512 e26263b1f2f63f4144777b5e7d9bb3414894921efc15f9a61242e610b014c7b741cf0f788127631b8ff2120b83bf735026954b67315045e3020dcb346d8c60ea
+MISC metadata.xml 1002 BLAKE2B 146c014fef44cbca70892efa76c12f36a5f890742fcfc91801c995b9e7a78d4693a34fe7f1e1b708d2bc2d45e60ed7749904c10465de4d680e25456344644f9a SHA512 d5e83c61493b981f1871bc964e395877ac4adc6f75cca770140d364a9c1365f221dfe97f7e110338abea49afbc9313a5ca088dcb7899a18dc98386cb46c28430
diff --git a/sys-fs/simple-mtpfs/metadata.xml b/sys-fs/simple-mtpfs/metadata.xml
index e5874b54e75f..775fec66c3ba 100644
--- a/sys-fs/simple-mtpfs/metadata.xml
+++ b/sys-fs/simple-mtpfs/metadata.xml
@@ -1,7 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<!--maintainer-needed-->
+	<maintainer type="person">
+		<email>jakov.smolic@sartura.hr</email>
+		<name>Jakov Smolic</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<longdescription lang="en">
 		SIMPLE-MTPFS (Simple Media Transfer Protocol FileSystem) is a file system for
 		Linux (and other operating systems with a FUSE implementation, such as Mac OS X
diff --git a/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild b/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild
new file mode 100644
index 000000000000..a84aa51dbee4
--- /dev/null
+++ b/sys-fs/simple-mtpfs/simple-mtpfs-0.4.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Simple MTP fuse filesystem driver"
+HOMEPAGE="https://github.com/phatina/simple-mtpfs"
+SRC_URI="https://github.com/phatina/simple-mtpfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	media-libs/libmtp
+	sys-fs/fuse:0"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	sys-devel/autoconf-archive
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# The tarball doesn't contain ./configure, only configure.ac and
+	# autogen.sh.
+	eautoreconf
+}
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 3f14f1a6c484..93e617646ebe 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -3,7 +3,9 @@ AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31
 DIST xfsprogs-5.4.0.tar.xz 1248688 BLAKE2B dd00083b62a4989ca94d117eabad3905dc487c3e6d4f20bbe855399e99e2195c1a45f2be3b117048e2a7f2374c7e6258e7c1edd63d12a405c88f4c9fa6cd5e8e SHA512 c0973fcf97e2666385b46c80cd1398728702cb34fd7e0f89e2a63686300573405d09a81d3ae43d79c2e9710ccf6b6bd6ed1c3f3f831c75cd0916f094f203aaa7
 DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e0128701c40cdfa63c05fc85173c70da3f34c948b7791f12ac5bb8d5f0c634016dac71c328a8917d1065aa7fb4cac3291 SHA512 a6bee55b0a23316c73f3921234d1dbaa4cbe91c12e79264e5f9bfe1356a24baa0ab25270405a46e4613a7e48443ef21997ff4f5962663777bed373f89ca29701
 DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac10c7c6d471d3b32595eb27a76ec1fa20955a08d7c2e371a0d160bce741afad0998731d2fee497917e0d7a4e70f7 SHA512 6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231
+DIST xfsprogs-5.8.0.tar.xz 1260580 BLAKE2B d4efb81123d46fd7907dd81605922ba283642ead92f6270a3b0d93a0c7321963d5b8b0068a2b6b4cdb236da0653a6432b74056feff77354d2557e899b01f1a62 SHA512 11f2810402ecb83db204346c45ff9f7d643ff2390767794e311a06a10eb97118095e4c377d2b065be50611ec5fc82ac5cbc0a8c7122ee7e9820a2db4e9f177c1
 EBUILD xfsprogs-5.4.0-r1.ebuild 2847 BLAKE2B b81f15ddd470b549433942259ce7c7edb4f102a7903d361fd2ddc151b4d3ba1abcda491425d64d2cb5b50d1c034f4301e4350856a2e7df80f2690f065bc93c0d SHA512 962334a565a0b3686f28ec9c9091e1260df3f842da3f64ffdc3d524e6baed77663c8ee2100964471b44935661d60331e7b4c9688d151bcd2c16ef7208d1b9a54
 EBUILD xfsprogs-5.6.0.ebuild 2603 BLAKE2B bfa5d557473a872df4f5afd89aab9f7484fdd11c7d567dc1474bcfaa880c03eb7c9fb68cfcac81a9a21f1a5d32b7afe09f1af58b1f25e1669206df423fac394f SHA512 0ff4477ac23129c22f9bcec54fb4335dee11e0b759887909a269b6d01d4b27188f68661269b5b3907d1d84de0a8911f1ca1ff84075644e0eb3fb8df44578e73d
 EBUILD xfsprogs-5.7.0.ebuild 2255 BLAKE2B 5b64ed3ac748471d4f7131015707bd6f12efcbdfd139b3da96015861f2cdcee9d1662a5771f306af6106f60c66e80e60c5506454ee7b4cabcd08a5ead4a6de46 SHA512 4f45c3320bb13444ae2b0b1cd2990de0115dbc13c1dbea8894fb780b64016c70238fa3fe097350d7c77c2dfc5d594d052622ddca5f744ab9d38f3595fede8eaf
+EBUILD xfsprogs-5.8.0.ebuild 2255 BLAKE2B 5b64ed3ac748471d4f7131015707bd6f12efcbdfd139b3da96015861f2cdcee9d1662a5771f306af6106f60c66e80e60c5506454ee7b4cabcd08a5ead4a6de46 SHA512 4f45c3320bb13444ae2b0b1cd2990de0115dbc13c1dbea8894fb780b64016c70238fa3fe097350d7c77c2dfc5d594d052622ddca5f744ab9d38f3595fede8eaf
 MISC metadata.xml 338 BLAKE2B cdf07fec58a2401c154a3fdb7d5326065143eeac8dbe78078012d643dc3872bc2df79cc734c033c2030d356f2366dad8ad1da553bc268fd0318ab3ba971c4b5e SHA512 1a085c94d623db2cc55d987afb66265ab51e94c8868bc7c169cc669b58f8a8c5a1d81f503aa838d5c2a84f2a0bf923f73314048b49eb1e139d91eca6f71e119e
diff --git a/sys-fs/xfsprogs/xfsprogs-5.8.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.8.0.ebuild
new file mode 100644
index 000000000000..ca89c01e8930
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-5.8.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs systemd usr-ldscript
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="icu libedit nls"
+
+LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
+	icu? ( dev-libs/icu:=[static-libs(+)] )
+	libedit? ( dev-libs/libedit[static-libs(+)] )"
+RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
+	!<sys-fs/xfsdump-3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
+	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
+)
+
+src_prepare() {
+	default
+
+	# Fix doc dir
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+}
+
+src_configure() {
+	# include/builddefs.in will add FCFLAGS to CFLAGS which will
+	# unnecessarily clutter CFLAGS (and fortran isn't used)
+	unset FCFLAGS
+
+	export DEBUG=-DNDEBUG
+
+	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
+	# However, we have to provide an empty value to avoid default
+	# flags.
+	export OPTIMIZER=" "
+
+	unset PLATFORM # if set in user env, this breaks configure
+
+	# Avoid automagic on libdevmapper, #709694
+	export ac_cv_search_dm_task_create=no
+
+	# Build fails with -O3 (bug #712698)
+	replace-flags -O3 -O2
+
+	# Upstream does NOT support --disable-static anymore,
+	# https://www.spinics.net/lists/linux-xfs/msg30185.html
+	# https://www.spinics.net/lists/linux-xfs/msg30272.html
+	local myconf=(
+		--enable-blkid
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		$(use_enable icu libicu)
+		$(use_enable nls gettext)
+		$(use_enable libedit editline)
+	)
+
+	if is-flagq -flto ; then
+		myconf+=( --enable-lto )
+	else
+		myconf+=( --disable-lto )
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" install
+	emake DIST_ROOT="${ED}" install-dev
+
+	gen_usr_ldscript -a handle
+}
diff --git a/sys-fs/zfs-auto-snapshot/Manifest b/sys-fs/zfs-auto-snapshot/Manifest
index 16b0364353bb..01464528c1cc 100644
--- a/sys-fs/zfs-auto-snapshot/Manifest
+++ b/sys-fs/zfs-auto-snapshot/Manifest
@@ -1,5 +1,5 @@
 AUX README.gentoo 684 BLAKE2B 7175ddfbb8dd5b209fa4fa5e5a3aeecac3fdd102e240f93b640f91bbf0204f9101801a94087383d7087bec08ae490e9769dfcf4f7f218d6daa4779087a8a0d23 SHA512 e77c3a573c2d4499df902b68909c186e4c80ba8b451b493c7e08e5e96ebe281933ce4b5fc11c201e33f27b14a02a35fd85270baf7ddece42a2fcbc6c3c421146
 DIST zfs-auto-snapshot-upstream-1.2.4.tar.gz 13375 BLAKE2B 2a44cdecb7c4bb432c1804dba9a6674289aced9664ae0fcc6a33b604b128d852fce459367316f11961747594516916da51072ed10f84d0c01ea8cca553ce7eec SHA512 26382303fce8b90dfb40f69fcab92308e88c17c147b4a566c5d32f2e9aa241d64f5da56ad82b4becb824ba01a470037a724460d35676a1d46de9c578c02a57d9
-EBUILD zfs-auto-snapshot-1.2.4.ebuild 1382 BLAKE2B bbd5ce2059437b6263c0dab8fbf944a349a4240e86ff6b2278ae79a6b8eb1626770a2b5cbf7e559d0568e0c30a63b2375e104f0298843accfcd32ee68fc7ddb8 SHA512 9a769f3c595890506a2501ed20a33967a5091a3aab07353189cf62fbc7be9a6136797d250f4ab655b149356238176f05cdbcbe486131d900c51f00ed3c71e14a
-EBUILD zfs-auto-snapshot-9999.ebuild 1383 BLAKE2B 93d60c4935d00caa51d48a98dfc730672b65bbdde7423829f29150845d2d9894a97255fd0f8b9d798ea37dd88faa04d1ef3258cb4abcba20fa557a7a790f7efc SHA512 f62394d8054bd6b4442f69a81cb0c605aee70ef1b1854dbfea0c1debd477cf28894aa3de51260be54486d0245a88dc841d212ca8a1a0127c29cc7845f7d17524
+EBUILD zfs-auto-snapshot-1.2.4.ebuild 1388 BLAKE2B bbdc50ab6b3ee05cd8c7606b07d7609d62e092345232261a47bf12e423d0bd548d1f009f54aa8fa25a387264e20abfbf8efa415f87cb6ab2331a6e8250ef8a55 SHA512 2bbc915d73fe4fb581af4b9a512228834eaa13105be89e8b9a2303334328c426030220fe750ab7662f83c173184787367994bdb1c2adb7647fc9bc5e14b4a8d0
+EBUILD zfs-auto-snapshot-9999.ebuild 1390 BLAKE2B 641dd27e8910fce57c130dbaf49460efb5ca9f89a694f0f9661b898b75bd0af015d9036d43eb6d36840b325eb4a56c03d609dad326211534e97c2c53f8394e29 SHA512 180789c017c9c0f2fc432cf7cdcb147bfa2862a265fcab804585904c4cf0bd759ba89fe989d0a3474d5a1ffa4b3ae8a3f4fb0919241278624a5023265da26e97
 MISC metadata.xml 909 BLAKE2B 74eeac781ab385dfd962c316d6792c79ebdffed9084f3c7b071a13b502edb881555e4e9525a1c8c5f2fe0ca51241afbe430f7ce07fdbd4b2554c841f1837af85 SHA512 d98be1718d600b6a04af37294de1eb47e814c74ddf24d4e119d037554baf3f9b551ab43dabd1dcd70b35b65e9fb687325c04371d078757d26c07385ac72143c8
diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
index 609faf654fd0..0975c6425fc7 100644
--- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
+++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="${PN}-upstream-${PV}"
 	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="amd64 ~ppc64"
+	KEYWORDS="amd64 ~arm64 ppc64"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild
index d8170b5cfc1c..c880e32a7601 100644
--- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild
+++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="${PN}-upstream-${PV}"
 	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm64 ~ppc64"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 5cad82bfa5d2..656afab5f7a9 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,7 +1,8 @@
+AUX 0.8.4-powerpc_jmp_weak.patch 1314 BLAKE2B 5cec0c5bf0e7c8ba4fb29539384eeb28e431956a94853d7c7722fc4dfc680f984c3e1567bc27effb28e94b1a411f9d7e57a26536fb4dee9446b12183558ab49b SHA512 dabea2f795e3ee2d7df13c803ac4cb21499e23d6663f14d52a7b270075176a4378cd15d04d051999aa7ec6b8cf49e645435363053e16640f28068c2764580047
 AUX 2.0.0_rc1-U__BMI__.patch 966 BLAKE2B 370c9796450a451cb41aed4df7a927e0a88f674c55273a0680788ea8f42c7ca7ddbd4d75e092c59a6255adecb4dbe94b28d565cd54c03170cda07b15d138c8db SHA512 c568bee17b0a4ef6569fa531cd2bfbd483c766c8f16d045e9ee86c01c1d687701010659b58bbe3874c0d45e5e94a52ae10e5c31ab004a3215ed4dae6be8ba545
 DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
 DIST zfs-2.0.0-rc1.tar.gz 12820598 BLAKE2B 6ea935447e4f95eb4040533843677f0091c9620fc387c76818df69a6653467e10aecd07ece22b2a32f849dc52ab0160149147416af90d78c5284f403571f7962 SHA512 b70cd10672d4424a6ffaaa58b4fa14b7d1b6481413463abd9b6d75698e80d94301fd54c7e091d63ebad9c8838eaaef6449223a55f041a62ae8292882feb195b5
-EBUILD zfs-kmod-0.8.4-r1.ebuild 4502 BLAKE2B 65144dcd12b826831a05a8d9a3b83735026f5f4ba62c49a05038118b9a9adc0bc0eb1c37d142f4e095fd1fe6c78b07d83becdaa502ec79cabc9980d732369a62 SHA512 1395227f463331b00d0ff990bb76f3dfa41f41473126f98d1f024a101193f9344919c68acccccf4225e41673593b7183f8fec9ce510b0ae6a9f9bb925ee9e139
+EBUILD zfs-kmod-0.8.4-r1.ebuild 4558 BLAKE2B 90bab78673ace8d1684f7b06e1392745bc3b7bdbf4e695bac7d9478e35dba9daf0e121e3e72ece248c997cb5f1daa4000db9e9500a686e38d72319c6a3fd9355 SHA512 f2db01438ea0b53a2f964feba65343c15ae69dd3c47bda54321aeda4d0f19affc2cf4fb99e9f829f7968fa2774fffe86b4fce0cc310af775efc5165652425e8b
 EBUILD zfs-kmod-2.0.0_rc1.ebuild 4391 BLAKE2B 06daf5d1387aab0e90d9a3573159afdc58d121f3e8b799a34e4d87dda486113e54ec3bce70fed3fe928b33ce660e0fbfb96ae2529016a352a747ca105c8b6b96 SHA512 24970fd8f61f8bec233b9582858af235fa00cb160c7e7d781001366c6d07ca748b939f802ff8634f222622f936af1c46b764e787ac99387b4d8dc73e30103c4d
 EBUILD zfs-kmod-9999.ebuild 4312 BLAKE2B be95eaac5695ad30175fd32a9a95ca39376b82f667f91071b7e5d71c30c6c37d187fb137d93734b0c8ab21a70a8fd71317d5195db3452dcc09721c4df62a265c SHA512 cc6eac9ec1ee142b4fd2fabb7bb239374c5239a65222f45002b1e32c48a728ac936de398cecbd74b05669b8717579483ad1b4ba553d78e5dc205955bb52265e7
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch b/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch
new file mode 100644
index 000000000000..1a2948a3158c
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/0.8.4-powerpc_jmp_weak.patch
@@ -0,0 +1,48 @@
+From bd0efd1f062bfba5dd2d6b1fe30b6949f8e0a8ef Mon Sep 17 00:00:00 2001
+From: sterlingjensen <5555776+sterlingjensen@users.noreply.github.com>
+Date: Mon, 24 Aug 2020 22:41:05 -0500
+Subject: [PATCH] Mark lua setjmp/longjmp for powerpc weak
+
+Linux already defines setjmp/longjmp for powerpc, which leads to
+duplicate symbols in a statically linked build.
+
+Signed-off-by: Sterlng Jensen <sterlingjensen@users.noreply.github.com>
+---
+ module/lua/setjmp/setjmp_ppc.S | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/module/lua/setjmp/setjmp_ppc.S b/module/lua/setjmp/setjmp_ppc.S
+index f787ef34913..72aa5d5ab5b 100644
+--- a/module/lua/setjmp/setjmp_ppc.S
++++ b/module/lua/setjmp/setjmp_ppc.S
+@@ -56,7 +56,7 @@
+ #define	ENTRY(name) \
+ 	.align 2 ; \
+ 	.type name,@function; \
+-	.globl name; \
++	.weak name; \
+ name:
+ 
+ #else /* PPC64_ELF_ABI_v1 */
+@@ -65,8 +65,8 @@ name:
+ #define	GLUE(a,b) XGLUE(a,b)
+ #define	ENTRY(name) \
+ 	.align 2 ; \
+-	.globl name; \
+-	.globl GLUE(.,name); \
++	.weak name; \
++	.weak GLUE(.,name); \
+ 	.pushsection ".opd","aw"; \
+ name: \
+ 	.quad GLUE(.,name); \
+@@ -83,8 +83,8 @@ GLUE(.,name):
+ #define	ENTRY(name) \
+ 	.text; \
+ 	.p2align 4; \
+-	.globl  name; \
+-	.type   name,@function; \
++	.weak name; \
++	.type name,@function; \
+ name:
+ 
+ #endif /* __powerpc64__ */
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild
index 59ea52ab658b..2276604b161c 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild
@@ -37,6 +37,8 @@ RESTRICT="debug? ( strip ) test"
 
 DOCS=( AUTHORS COPYRIGHT META README.md )
 
+PATCHES=( "${FILESDIR}/${PV}-powerpc_jmp_weak.patch" )
+
 pkg_setup() {
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index de09315414d3..239aa9438c6f 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -3,7 +3,7 @@ AUX bash-completion-r1 11310 BLAKE2B f6c105fef1737d4be0e76967fdec62aa52fa7665bfc
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
 DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
 DIST zfs-2.0.0-rc1.tar.gz 12820598 BLAKE2B 6ea935447e4f95eb4040533843677f0091c9620fc387c76818df69a6653467e10aecd07ece22b2a32f849dc52ab0160149147416af90d78c5284f403571f7962 SHA512 b70cd10672d4424a6ffaaa58b4fa14b7d1b6481413463abd9b6d75698e80d94301fd54c7e091d63ebad9c8838eaaef6449223a55f041a62ae8292882feb195b5
-EBUILD zfs-0.8.4-r2.ebuild 5608 BLAKE2B add2a38bfd55510e47404281ce6892eeeaa3b37c9c8bc5ce7d5c03e3e42193fe7855416af7b0d884e7819c4700ed91da658d9841b65c830c96f6881c855a2d29 SHA512 a5753013f83ca7f5b66505305b478ef29f7dbb2e7e3c361aacacde4945257f01996bbea60c5ab48b4857c381bf4610895d1398cc90cf43f5e5fec71b4144d9a0
-EBUILD zfs-2.0.0_rc1-r1.ebuild 5836 BLAKE2B 7e067ccb6a60ce39e17a44e83ce3a4a84b68a2ed6f19a523a2aacbff642c673e301fc0f75427b3d76b47e475e2eaf7d8c35ba7d96a9f14e8e86a3bf713983612 SHA512 d9201ddf41e9c82b0b135be99888bc0afb1621c6aa83aead3b90a116b2434b3945aa8d001eb47506b3bb7d9d14fb597bf12d83333a383fe516d8851334234923
-EBUILD zfs-9999.ebuild 5859 BLAKE2B daee60e94c597e1306b87cdd2018a1347ef8db5cdba3b9b398127ec758d5a93d23eba3fab8d0867dde4ef0bdb3611dd009418f92c961b8bfdb56995bf101df19 SHA512 2d811674de3373cdce8c408429c0a419c0a51ed9502adcd5e3be1844220af7c42e49cfd12701229766c2e68d56a57188d971a129318ef52d2efbb3b2100a396d
+EBUILD zfs-0.8.4-r2.ebuild 5610 BLAKE2B 0b77963845e4024a552a9df7d3bc08862de2b7608acca979dd469d153021e81f6448ab15517c3892195fa2240e3cfa488b8c22ea9336a04aa65c6154ffbaafd5 SHA512 b190ceeac6cf846b93f180992d028d430cd21688b4ff12af155cc756ab60c5b6d886a78e62336e282b0a3b4b596c5ecf86eeead0e0d1f2a9f838ccbadb45bc4a
+EBUILD zfs-2.0.0_rc1-r1.ebuild 5838 BLAKE2B f9f3cd636abba1e9811672c1efd113d6094dc486d14b5d62eee2816f9d01c9c6dfa427f99d5a7fafa6de8bc102ebc0c1ced84704e78ff6ec54cd56656bbdfdbc SHA512 94e22f7cfe18338e2321dccf52462a3cdfb872a88b24147afcaff67a8a6e16c5c0cc971281721115bba0c372141acdd489c48892a323d4d0fb481ffd722aa4f8
+EBUILD zfs-9999.ebuild 5861 BLAKE2B 1a235667de2aeb65ceca37e11867ffd75a35852e91ae0e0e1141530b1eec73bffa42acc01c29dff84d6cd21333cd41481e5c4c11f5772b96f65b83d0759ccda1 SHA512 3f7b2cf46e2508feaa6b7aa31733a8117a8d5ac11defaf60a7d33e201b932c742d84202044dfcb399bb916003ca9b50d5fbb57134af82485a5a0b018e62b5e32
 MISC metadata.xml 1003 BLAKE2B 640ef6d6f178ae9c3f3281a8e8539980c4a263f6cf0c5f4e1de3f0572f2acfe409865e85a12473129eb026130c9b76b946ee7698bd990b05f14e6b26c40fcb22 SHA512 965eabb5488a3cb54b360b33c847a2eb0d326a2c6761d86d581e06c2f52db9478fe7df131f68cb57bf32a2a872ecc1597e2a1a6b457d254f578d684cf73810c5
diff --git a/sys-fs/zfs/zfs-0.8.4-r2.ebuild b/sys-fs/zfs/zfs-0.8.4-r2.ebuild
index 5501d0e9c675..71e06c34f7c3 100644
--- a/sys-fs/zfs/zfs-0.8.4-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.8.4-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript
 
diff --git a/sys-fs/zfs/zfs-2.0.0_rc1-r1.ebuild b/sys-fs/zfs/zfs-2.0.0_rc1-r1.ebuild
index 486de47acc47..ad7088f0af35 100644
--- a/sys-fs/zfs/zfs-2.0.0_rc1-r1.ebuild
+++ b/sys-fs/zfs/zfs-2.0.0_rc1-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
 
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index 7def71113015..d2f00419b0c7 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript