gentoo resync : 13.06.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-06-13 10:39:22 +0100
commit: 9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree: 8ac67e26b45f34d71c5aab3621813b100a0d5f00 /sys-fs
parent: f516638b7fe9592837389826a6152a7e1b251c54 (diff)
50 files changed, 274 insertions, 1902 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 1d17f7a7867b..80d05f820b17 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 9461b1aa7426..025c024cb538 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -2,5 +2,4 @@ AUX cryfs-0.10.2-install-targets.patch 1296 BLAKE2B d43ada858124c67242fdf537ae3d
 AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c
 DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f
 EBUILD cryfs-0.10.2.ebuild 2252 BLAKE2B f6de0d76ff9c43d727cb62f1b8c419210bcb603e9a2b60dfd3c741a98cbbaec199f6eea7232d8c150da0448f9887a917062d14b21f01cacb14728d5212e26389 SHA512 aeacb7c7fc9f337f0b6e38320db58c772e4fe9a2fb15267471ec34332ceedbaa54e894e3d46b46e2e80da54a44936ed38781f052c0d21bf077af96a61cbcabe7
-EBUILD cryfs-9999.ebuild 2309 BLAKE2B a461261be9418b221dd1518110fb10795f26469d182cc0c8af729146c8378690997469cfa4fa2d09646583562018d5d4e4df164d0c814bc9f7cf5fa2a488b8a7 SHA512 f69c9d7d77be022931471cd4108a13d043e7356b832ad9e08695816556bcef73bbbd5a59906c6ee8e35615599196372de382f386e932988d02bcfb9fb9018f41
 MISC metadata.xml 272 BLAKE2B 1f7b2457b970cd9a387d88914129fc76ae26bcd3e089bcecffdab0a8a86657ce3abc9c19bab77c51e1bd12b4fbfece20077dc4b15a673a11e821ab7b4952e137 SHA512 9d4fce67773a55f3f8dedd7c1532eb639aed188f0fba41375bc4e8219ffa9e720f51175571c6defde06afdeebe83c940ec77192d78555cf28a41f0c64e25629f
diff --git a/sys-fs/cryfs/cryfs-9999.ebuild b/sys-fs/cryfs/cryfs-9999.ebuild
deleted file mode 100644
index 0292d83f5f3b..000000000000
--- a/sys-fs/cryfs/cryfs-9999.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python3_{6,7} )
-inherit cmake flag-o-matic linux-info python-any-r1
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
-else
-	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-	S="${WORKDIR}"
-fi
-
-DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
-HOMEPAGE="https://www.cryfs.org/"
-
-# cryfs - LGPL-3
-# spdlog - MIT
-# crypto++ - Boost-1.0
-LICENSE="LGPL-3 MIT Boost-1.0"
-SLOT="0"
-IUSE="custom-optimization debug libressl test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/boost-1.65.1:=
-	net-misc/curl:=
-	>=sys-fs/fuse-2.8.6:0
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-"
-
-pkg_setup() {
-	local CONFIG_CHECK="~FUSE_FS"
-	local WARNING_FUSE_FS="CONFIG_FUSE_FS is required for cryfs support."
-
-	check_extra_config
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# don't install compressed manpage
-	cmake_comment_add_subdirectory doc
-
-	# remove tests that require internet access to comply with Gentoo policy
-	sed -e "/CurlHttpClientTest.cpp/d" -e "/FakeHttpClientTest.cpp/d" \
-		-i test/cpp-utils/CMakeLists.txt || die
-
-	# /dev/fuse access denied
-	sed -e "/CliTest_IntegrityCheck/d" \
-		-i test/cryfs-cli/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBoost_USE_STATIC_LIBS=OFF
-		-DCRYFS_UPDATE_CHECKS=OFF
-		-DBUILD_SHARED_LIBS=OFF
-		-DBUILD_TESTING=$(usex test)
-	)
-	use custom-optimization || append-flags -O3
-
-	cmake_src_configure
-}
-
-src_test() {
-	local TMPDIR="${T}"
-	local tests_failed=()
-
-	# fspp fuse tests hang, bug # 699044
-	for i in gitversion cpp-utils parallelaccessstore blockstore blobstore cryfs cryfs-cli ; do
-		"${BUILD_DIR}"/test/${i}/${i}-test || tests_failed+=( "${i}" )
-	done
-
-	if [[ -n ${tests_failed[@]} ]] ; then
-		eerror "The following tests failed:"
-		eerror "${tests_failed[@]}"
-		die "At least one test failed"
-	fi
-}
-
-src_install() {
-	# work around upstream issue with cmake not creating install target
-	# in Makefile if we enable BUILD_TESTING
-	dobin "${BUILD_DIR}/src/cryfs-cli/cryfs"
-	doman doc/man/cryfs.1
-	einstalldocs
-}
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index 0374842806d9..944a7385579a 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1,7 +1,4 @@
-AUX fatsort-1.5.0-gcc10.patch 374 BLAKE2B 34d8079233394171cceaf174f2959bd4adb2842a65e3411aadca21c4e9008579ffb166e16d5114ca1643ebd6ccd7dcce37a57c65abf40aade986d84c96973617 SHA512 c9d2d0a9a3f2c76d3579a87d3e51228a5141392a884c3f4b9317422b310cf62b5b546f076648be8eb1521004bc7550c034ccf34d294b48663c7ca01e1dd4bac6
 AUX fatsort-1.6.2.605-gcc10.patch 7400 BLAKE2B 05d9f3bc9c0118c9505e96f2766d27b142a61252f5ad21e3c106ac7afda9a69bddc1ec1dbb9f3b170bbc10315f04db06e80000ef0eb9c601db4b5b88da82e08a SHA512 bac23d94900f48f8fd331962f617b92250ff9cfc801a688526177ef24e571e341e124a2859cbf1ff8db80d1bcbb32ee99d1c9878abcdaa78b9dd0606f5689e28
-DIST fatsort-1.5.0.456.tar.xz 56100 BLAKE2B 996f144c67a2311ef9962b06e776d0a0c8897814383e50c9f48f5af0bc800159ee34c10d9f8d51dae5160844dfe9fcbc4b56bb9883cbdb0402a0ea20198fc1d6 SHA512 fe9d8108494fd64da730ec40882582fc16a89e76a5ba4e8040d03a3dbbf12c525904abe24814337713f5f1d15c72e8321b27fad69db816c073a96fbfd15ea486
 DIST fatsort-1.6.2.605.tar.xz 122928 BLAKE2B 2690233828e47a4809aac14a8d64dc8d95a824bec52f787190186adbe066d5d4e6f9c6d1873fc6b809c6df6879d12154430f44d412944963bdff49e673079d12 SHA512 0d119c99c5efff4c10367152fc6efe95e2cb1c39405ca02dd25b66cc68c7420b5b28c0daca1346b7928633bac8ace2d05d731502f989d39ca5c783dcec69ccc7
-EBUILD fatsort-1.5.0.ebuild 843 BLAKE2B d92b7e2d4b4bc25ab55cbd43ea1321b07b275e56a82505d9e8628ab9e33eb90eb39eba53d9b1aa0e1fc633e426e89adb004574c1a1fa78749813b4bc98608ad7 SHA512 e47dff05c99d535a9dcfa06c2b16367b449dc683a87e1e1f8a46e8f605634c737e65ecefea2a7808fddcbd1662d32452abd933b726e2e03c2e4b6fa692af2b52
 EBUILD fatsort-1.6.2.605.ebuild 754 BLAKE2B 11850d6ad2ca62de3f7c110773fa216a5d5cf1b7df81e2fc8eaa81fae2e9f029f4ee7b40ddcd5a66991a98d5bbb35e48b9328591aa6ce93e2f305da588d98d6a SHA512 cc94184f60f4ed2c17a476c4ed0718caae60db2769129233b82f39c5d0d9eb41eed803377c1b38bcb6db3b720937f85f5e659ed51fccb2e5bb72b0562d7c9202
 MISC metadata.xml 738 BLAKE2B b4ae8042af9b7a74705b42322ffcfba47aa18e3cb1bee693ff2db3fecb6555d516ec9a3f4746643ef37007e9d1b44ea79d5fa0e4bc12b6ca4ba813129d208dcd SHA512 42cb5be41b29129b17ea55591d352872ccd6078705068c6899d4f1f5a5b99ab5f6809e75ee6b49bd6b536f6b66632ce9e1859f4bbad764b966d5520a8aa5a228
diff --git a/sys-fs/fatsort/fatsort-1.5.0.ebuild b/sys-fs/fatsort/fatsort-1.5.0.ebuild
deleted file mode 100644
index d677a51ab6d2..000000000000
--- a/sys-fs/fatsort/fatsort-1.5.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-SVN_REV=456
-MY_P=${P}.${SVN_REV}
-
-DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players"
-HOMEPAGE="http://fatsort.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-S=${WORKDIR}/${MY_P}
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.0-gcc10.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e '/^\(MANDIR=\|SBINDIR=\)/s|/usr/local|/usr|' \
-		$(find ./ -name Makefile) || die
-}
-
-src_compile() {
-	emake CC=$(tc-getCC) LD=$(tc-getCC) \
-		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
-		DESTDIR="${D}"
-}
-
-src_test() {
-	# Tests require root permissions and mounting filesystems which does
-	# not work inside the ebuild environment
-	true
-}
diff --git a/sys-fs/fatsort/files/fatsort-1.5.0-gcc10.patch b/sys-fs/fatsort/files/fatsort-1.5.0-gcc10.patch
deleted file mode 100644
index c334793f11d1..000000000000
--- a/sys-fs/fatsort/files/fatsort-1.5.0-gcc10.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/src/options.h
-+++ b/src/options.h
-@@ -35,7 +35,7 @@
- extern struct sStringList *OPT_INCL_DIRS, *OPT_EXCL_DIRS, *OPT_INCL_DIRS_REC, *OPT_EXCL_DIRS_REC, *OPT_IGNORE_PREFIXES_LIST;
- extern struct sRegExList *OPT_REGEX_INCL, *OPT_REGEX_EXCL;
- 
--char *OPT_LOCALE;
-+extern char *OPT_LOCALE;
- 
- // parses command line options
- int32_t parse_options(int argc, char *argv[]);
-
diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest
index cf0b3ab03169..5192e1299e89 100644
--- a/sys-fs/fuse-common/Manifest
+++ b/sys-fs/fuse-common/Manifest
@@ -1,11 +1,7 @@
 AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c031586ec6da49f8f13c0593754ce6f6a92fc35ed4ce2f0f6d9c53089e08bf3ee960df577543bba49 SHA512 c8ae0e1932e34e2078bb8a1ab47c6d2d489f832f7adb118668624d3f0695ebf8b3ac2468a8db98579ef30078eac6989421aae7d7893e30a50e5c35d0a00ad6a9
 AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1
-DIST fuse-3.2.6.tar.xz 1456220 BLAKE2B 9b09504ed04abd0134188c28f3908e69e3416c345a96aefbca0f64447f3c3a8907550874f5fec9cd8f65fbaa892be6cc0213a7f61d7ad51c955ce3acf955ee17 SHA512 3a1ef77ab4c79a24aad0b259e17f568a30a5faf53ac17eb25d05f30dc7423f0081583f5b3c284ca9196a01885843e97c323a84231272b7e2b55c8e73848a61b8
-DIST fuse-3.8.0.tar.xz 1416716 BLAKE2B f921b739489e8eb8b2a78b719c9761f330de839f151f787a6db37d8d004ef9b90022bfe3c5d24ceab333cde8741340ede0315a5b92cabdaf87fb1b291f72e292 SHA512 46d2b1494c73f8b6b2be4e8969bb9906ea35620fb4081edc3176f7ba34e6ed815d5f9c5c6f06604fb37836460e25d0ce51619853288bb881362f04cba6b31812
-DIST fuse-3.9.0.tar.xz 1523028 BLAKE2B 2fff93431e59e370189fb1527de7bff3863d20e1a62628bb56a6671077a1c919b394ddac66537a1ef7c2991556b1817b2c7f6a92c161ebfffbc804466e19e5e7 SHA512 0c96df5db4d0ceb7885ddb6f6c05b523ee7e179f8f411ad0614caecb9fa0f5fd682ab9bf4dfdaa3aff9d90c18b8947a122ee376328535e49fa6091d784aa0cb7
 DIST fuse-3.9.1.tar.xz 1595308 BLAKE2B 3b1d5c8ac99e96183581d034889d8d6cab8feeee26cafd765dc4ab2cbeb655b3b162836c960ceacf08cd458bec2daaf0474877c9611ef6a6543795e4971ddc12 SHA512 295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329
-EBUILD fuse-common-3.2.6.ebuild 1253 BLAKE2B 18f04ff51eba07417dcef61e8d48e38947c251854dfe2f107e4bd5f3010cabdfe29122b42565976cb2de159201a2290e4c0884ab785bdb07f18c18c413c1c3cb SHA512 bab4ade4792c9ac10daf8d3ca79b4f3d39501305a134a001d6ede5330ff60d31e450c2418d70bc36de56da176f3c7e22238879406d9d1724ecdda96476e5f018
-EBUILD fuse-common-3.8.0.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f
-EBUILD fuse-common-3.9.0.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f
+DIST fuse-3.9.2.tar.xz 1674292 BLAKE2B 42d796802d3ce2e072120153b695d1e64d160695714c58ffba7859281bfa2c1ff3d9f95b92a38c1a5443abe5a8468f0d9d285845b97a444ae1b64bf750e234ae SHA512 47795d2e0431c93ff36609247016a5ddfa631e4dcdc56cb579030bdb78497e3fa2db28b0cbadd0848024be39381c54f8441de28b0af51f8b800519e76c7af9ed
 EBUILD fuse-common-3.9.1.ebuild 878 BLAKE2B 2b36fcad7d4b870240f6d8c25639825bc51c8ceca28488a46708317f72d7e58978fa6c8bbdcc12be211016c256e36408723ce9f042d935fb679f433cf2046956 SHA512 36f14cb465000d7d48ebe0367e2a84af714567cfc28ba4583e9e9b6d8a92808e1acf001a2742d0996bb0ad9875badde088e380e66ccce6eaca851bc3c85fe4e8
+EBUILD fuse-common-3.9.2.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f
 MISC metadata.xml 408 BLAKE2B 20a23e1ce0b234dcedcf095ccbef63413420ab0490a2e0b98f9dffcb43508bc7c770b0180e2cb9ac501764bc85f286b7e9bf81848e34257b414ed78c7de0877c SHA512 6bfd1910124508d1a555213adcd9509b19b28184fd5eb5346d84531370414194a6f18ac2ce7d726b4341018b058e02cf2805146fa1747aba21c6b9d8c2371020
diff --git a/sys-fs/fuse-common/fuse-common-3.2.6.ebuild b/sys-fs/fuse-common/fuse-common-3.2.6.ebuild
deleted file mode 100644
index 1c522686ccbc..000000000000
--- a/sys-fs/fuse-common/fuse-common-3.2.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit meson udev flag-o-matic
-
-DESCRIPTION="Common files for multiple slots of sys-fs/fuse"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-DEPEND="virtual/pkgconfig"
-RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
-
-S=${WORKDIR}/fuse-${PV}
-
-# tests run in sys-fs/fuse
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
-	filter-flags -flto*
-}
-
-src_configure() {
-	local emesonargs=( -Dudevrulesdir="$(get_udevdir)"/rules.d )
-	meson_src_configure
-}
-
-src_install() {
-	newsbin "${BUILD_DIR}"/util/mount.fuse3 mount.fuse
-	newman doc/mount.fuse3.8 mount.fuse.8
-
-	udev_newrules util/udev.rules 99-fuse.rules
-
-	if use kernel_linux ; then
-		newinitd "${FILESDIR}"/fuse.init fuse
-	elif use kernel_FreeBSD ; then
-		newinitd "${FILESDIR}"/fuse-fbsd.init fuse
-	else
-		die "We don't know what init code install for your kernel, please file a bug."
-	fi
-
-	insinto /etc
-	doins util/fuse.conf
-}
diff --git a/sys-fs/fuse-common/fuse-common-3.9.0.ebuild b/sys-fs/fuse-common/fuse-common-3.9.0.ebuild
deleted file mode 100644
index 1562ff02eb90..000000000000
--- a/sys-fs/fuse-common/fuse-common-3.9.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-DESCRIPTION="Common files for multiple slots of sys-fs/fuse"
-HOMEPAGE="https://github.com/libfuse/libfuse"
-SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
-
-S=${WORKDIR}/fuse-${PV}
-
-src_install() {
-	udev_newrules util/udev.rules 99-fuse.rules
-
-	if use kernel_linux ; then
-		newinitd "${FILESDIR}"/fuse.init fuse
-	elif use kernel_FreeBSD ; then
-		newinitd "${FILESDIR}"/fuse-fbsd.init fuse
-	else
-		die "We don't know what init code install for your kernel, please file a bug."
-	fi
-
-	insinto /etc
-	doins util/fuse.conf
-}
diff --git a/sys-fs/fuse-common/fuse-common-3.8.0.ebuild b/sys-fs/fuse-common/fuse-common-3.9.2.ebuild
index 1562ff02eb90..1562ff02eb90 100644
--- a/sys-fs/fuse-common/fuse-common-3.8.0.ebuild
+++ b/sys-fs/fuse-common/fuse-common-3.9.2.ebuild
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index d945fc1193c4..eeda29824fb7 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -1,6 +1,8 @@
 AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f977308c429858817fce81520291fd49fb58e6c863474a45a2e3a674da33b5678fcd784a7d1e8bc9472bbe0995ae3dc SHA512 909d43fbe190400d4beabd9801bf554e38a5bb5a3545930883976f42a2090c8768e485183949269639ddeae5bae5490b37dc23f031c48d6c4fd4c9facf08b66b
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST fuse-3.9.1.tar.xz 1595308 BLAKE2B 3b1d5c8ac99e96183581d034889d8d6cab8feeee26cafd765dc4ab2cbeb655b3b162836c960ceacf08cd458bec2daaf0474877c9611ef6a6543795e4971ddc12 SHA512 295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329
+DIST fuse-3.9.2.tar.xz 1674292 BLAKE2B 42d796802d3ce2e072120153b695d1e64d160695714c58ffba7859281bfa2c1ff3d9f95b92a38c1a5443abe5a8468f0d9d285845b97a444ae1b64bf750e234ae SHA512 47795d2e0431c93ff36609247016a5ddfa631e4dcdc56cb579030bdb78497e3fa2db28b0cbadd0848024be39381c54f8441de28b0af51f8b800519e76c7af9ed
 EBUILD fuse-2.9.9-r1.ebuild 2070 BLAKE2B 2946ac81c95dbb8cc329247aaf0f123a45475113028b8d79a845ae71388d3fd639c1c660c784284436fc4f603a7a248f33f19687569fde508929f16ac9168822 SHA512 d005e464d34b1a0edb69c795440c56d74c2147cb04403f8067987964ae243bb122adcbacd6f330dd53ed0cd058fdaee2ca4642dd711dfb559903b30364927fde
 EBUILD fuse-3.9.1.ebuild 1951 BLAKE2B d77d30f658b18676242b9f12240da45cd10a6e320592dc8c742febcfd9ce046fe2a92fd89c1d7e4c01da5ed89cbcaa24550a7eb1a7475e9a1c6515b877886722 SHA512 a4e79858f9f94df3e7494eb79270246c6fd64c87e68974e960d661a6056b4acdd0990cd8faa0cf0f2e9703e87a7732acb27bf1f604949d23a1b44654fca53e15
+EBUILD fuse-3.9.2.ebuild 1959 BLAKE2B 9031d363fe452bd0daa3ae880b2026db1c58ca1a2547e486351f0121fa56f777cc681af5c5f8d32879e87b1832027c67cd112f57659312f6a02daa20c4ecd083 SHA512 dc61b7ad3b936d6d298c51bfca3bcfccc0da77e5d41eba9acae04a06a24195adb1d2b7e6eee7e4ff6d9da60f89e69fedc232fe543ee46f6a5577bb19971d0962
 MISC metadata.xml 461 BLAKE2B 5886a41fed2f941b52933f1b2b83f7a6dfaf20a34721862a8ede36b573b6de79b3ac30fe25bf46e39047bf3d67b35bd44ae9747eccf566aa4d81f8bdee3d3a11 SHA512 66c7c7e08946aa12f78d09162654cb3da545a273e1a846b66a745bdb1767384c07bee4c8eccafce1615192d50cf783bddffcfd38783cc379afbae94a0b47e568
diff --git a/sys-fs/fuse/fuse-3.9.2.ebuild b/sys-fs/fuse/fuse-3.9.2.ebuild
new file mode 100644
index 000000000000..a858b29b4ecb
--- /dev/null
+++ b/sys-fs/fuse/fuse-3.9.2.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson multilib-minimal flag-o-matic udev python-any-r1
+
+DESCRIPTION="An interface for filesystems implemented in userspace"
+HOMEPAGE="https://github.com/libfuse/libfuse"
+SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+suid test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
+
+DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
+
+python_check_deps() {
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python_setup
+}
+
+src_prepare() {
+	default
+
+	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
+	filter-flags '-flto*'
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dexamples=$(usex test true false)
+		-Duseroot=false
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+src_test() {
+	if [[ ${EUID} != 0 ]]; then
+		ewarn "Running as non-root user, skipping tests"
+	elif has sandbox ${FEATURES}; then
+		ewarn "Sandbox enabled, skipping tests"
+	else
+		multilib-minimal_src_test
+	fi
+}
+
+multilib_src_test() {
+	${EPYTHON} -m pytest test || die
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# installed via fuse-common
+	rm -r "${ED}"/{etc,$(get_udevdir)} || die
+
+	# useroot=false prevents the build system from doing this.
+	use suid && fperms u+s /usr/bin/fusermount3
+
+	# manually install man pages to respect compression
+	rm -r "${ED}"/usr/share/man || die
+	doman doc/{fusermount3.1,mount.fuse3.8}
+}
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index e1c43747dada..e817cd8d6fa4 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,3 +1,5 @@
 DIST loop-AES-v3.7n.tar.bz2 373901 BLAKE2B 5cac9bd55f35a6cf0c056a6a2e75a48f49c1d23b7ebe1821e10dab522508e64ed23e5993dbcc19dbdeaab6c315ee4e71c8ecc17d9da41a5ad0794abc92563d7e SHA512 d190561f92a47292285e44c728bf1fcf9b7dd9c54f970ebc11a2988686f409515687a22028187756baaa4622903564e2646971a63eba13557c6ce78dc1f0bb96
+DIST loop-AES-v3.7q.tar.bz2 376027 BLAKE2B 7f3206196fcb7ecc928bda4cd127042f61cd5ac7f39e483fb91db388572be1c8e252d5c4adb653e6fd00ff6a7ba4c1406c35f2b2659e9cb38fd817f1bdb2a15f SHA512 103869695f6b18bcc765804865468db4b24fc2fcce3ec97d8468fdc0bd37c480386960730e280cd93c707026dddc5e79d8d25e2601c3678330e016835166ad20
 EBUILD loop-aes-3.7n.ebuild 2032 BLAKE2B 2218843eb73db2ed63c8e0f19be6a9f16c4084982067d6b153ca9d42688e5c3e1aa5118fe3a5720b5b5d175b20550d1250dcbf872acfff19d0a63b6d0dfccab0 SHA512 abd4f49db32d9808ccf1d4363e967bbd48cfd0db2390afd6ddb591b2540d44bb66233fad18cc7a0756cc91448a5abc20eaee24641b66bbded73fefb184859309
-MISC metadata.xml 418 BLAKE2B c816da5e3e43a688139fcbe60a32f0d53b6419df43431740458bc85aaf26806809f547d6a2df295d0f5e893eff599b57f5da4d7b6b7df06d7969a3f124e01a6f SHA512 cfdf69ab49b9088ada476c7597abdd6b045082fef71618c4be5ad62135b88562707392240dc612bd7d24c1ca7baa8d2e0c3c4f291b36f7c99a92b1a95b91bf1d
+EBUILD loop-aes-3.7q.ebuild 1751 BLAKE2B 1169b7659b99297cb22999f941fb0e164df1684f12fe548148adf6ff23ea72422227b85a1a0bb34345b92c4d7d55389a82bc63cba5f895c9480c2f81b5dc7612 SHA512 bf78deea9927612fac0d78e9bd15358b1f9c31c661a564d35064b10e1956db230d4f7b6b3a15cccbbb30f5e69a19cf6a81d9f26982c5f040abe943a9002e2461
+MISC metadata.xml 617 BLAKE2B 58d3b691b322ec4ae5772e391ff255fb0bfdba6202d24dec70baa5543657dc07c473992ceccc61beb35ad710e6014ab692eb8856463e8d001446bd45e8a2d60c SHA512 dba8f0278839b705911377ab463c7662f85f6f7be1528c1d96f5bb5bcb96566fdb73756d035879ddd746550fe048c5a0552b14436bbb9a69789cf5f1d4f8414d
diff --git a/sys-fs/loop-aes/loop-aes-3.7q.ebuild b/sys-fs/loop-aes/loop-aes-3.7q.ebuild
new file mode 100644
index 000000000000..6879462d4158
--- /dev/null
+++ b/sys-fs/loop-aes/loop-aes-3.7q.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit linux-mod
+
+MY_P="${PN/aes/AES}-v${PV}"
+
+DESCRIPTION="Linux kernel module to encrypt disk partitions with AES cipher"
+HOMEPAGE="http://loop-aes.sourceforge.net/loop-AES.README"
+SRC_URI="http://loop-aes.sourceforge.net/loop-AES/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
+IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
+
+DEPEND="app-crypt/loop-aes-losetup"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	linux-mod_pkg_setup
+
+	CONFIG_CHECK="!BLK_DEV_LOOP"
+	MODULE_NAMES="loop(block::tmp-d-kbuild)"
+	BUILD_TARGETS="all"
+
+	BUILD_PARAMS=" \
+		V=1 \
+		LINUX_SOURCE=\"${KERNEL_DIR}\" \
+		KBUILD_OUTPUT=\"${KBUILD_OUTPUT}\" \
+		USE_KBUILD=y MODINST=n RUNDM=n"
+	use cpu_flags_x86_aes && BUILD_PARAMS+=" INTELAES=y"
+	use keyscrub && BUILD_PARAMS+=" KEYSCRUB=y"
+	use cpu_flags_x86_padlock && BUILD_PARAMS+=" PADLOCK=y"
+
+	if use extra-ciphers; then
+		MODULE_NAMES="${MODULE_NAMES}
+			loop_blowfish(block::tmp-d-kbuild)
+			loop_serpent(block::tmp-d-kbuild)
+			loop_twofish(block::tmp-d-kbuild)"
+		BUILD_PARAMS+=" EXTRA_CIPHERS=y"
+	fi
+}
+
+src_install() {
+	linux-mod_src_install
+
+	dodoc README
+	dobin loop-aes-keygen
+	doman loop-aes-keygen.1
+
+	into /
+	dosbin build-initrd.sh
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	einfo
+	einfo "For more instructions take a look at examples in README at:"
+	einfo "'${EPREFIX}/usr/share/doc/${PF}'"
+	einfo
+	einfo "If you have a newer Intel processor (i5, i7), and you use AES"
+	einfo "you may want to consider using the aes-ni use flag. It will"
+	einfo "use your processors native AES instructions giving quite a speed"
+	einfo "increase."
+	einfo
+}
diff --git a/sys-fs/loop-aes/metadata.xml b/sys-fs/loop-aes/metadata.xml
index 4ac6180ef7ae..909b1d03e448 100644
--- a/sys-fs/loop-aes/metadata.xml
+++ b/sys-fs/loop-aes/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>hlein@korelogic.com</email>
+		<name>Hank Leininger</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<use>
 		<flag name="extra-ciphers">Enable extra ciphers</flag>
 		<flag name="keyscrub">Protects the encryption key in memory but takes
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 0cfb2d177477..ec3dd27f71c2 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -19,7 +19,6 @@ AUX lvm2-2.02.186-udev_remove_unsupported_option.patch 1149 BLAKE2B c2faaec3f9cc
 AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 BLAKE2B 5533ceb7a601d58995e7a90b1355508907edb30d14704b397a8c8ba0d66dbcd3d6b02ace1cadef1dfbb1d927449403f76f0f38e5d034344b3232deb512507cb6 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de
 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 BLAKE2B baf7010b5965f5c2b9a32ec812cb259cb3ceccea0d56e48d75e9f8e872634913f160fcfff0c2c77854ddfeaafb3b48bbca16d569041ab6f45aecb950f8e5bf4a SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c
 AUX lvm2-2.02.67-createinitrd.patch 660 BLAKE2B 23e784e6769bc1f47fa57d690e6bebdf16d784d775a06af1c8eb7c54dd63a12abb0edd8331c8d033d7a0dda058252453a46dd35bd820fd47ba1407e9568b3858 SHA512 17fbba5d34ece5c1c25ef35fa3bbc3d6fcd20b44bd766c049bbc120853a8d60c9544db5790645a7814db5c272fd12d383699a8a9be6f4e9c56a7c0a1bb29ade2
-AUX lvm2-2.02.92-dynamic-static-ldflags.patch 3031 BLAKE2B 4e0e8bf8335420087470ca2b5ba01d1fbc1164a53f768415f2a6e4208ba9f65865719eececdbf1b8bbfd021813fb9cf5505a4066529e019fc25b9695feb29bff SHA512 edb78081d12bebaccd31c2474cb531563b729f1ad966afaff7892556177ee7a68217cc699c65383318066139ba62183adc8334f46f8f8933d62b6b5dcd11a023
 AUX lvm2-2.02.99-locale-muck.patch 405 BLAKE2B 07ac7c7f54d06dbdeae1c6bf0959fd0c223b30cbd67c08f853e02f520d212f7b6dcf7c3b6c3d3b7370bb004adbb23b226bf0d0792b5799ddbaff5ab655124ca2 SHA512 1c898693f71d165d55458ab87886a25206930c202b5aea95eba394ad06162cc710c1435e598acb9bcd3fbf46abf5409be972f6ce73bd02b2e177e1af780ae7ad
 AUX lvm2-2.03.05-dmeventd-no-idle-exit.patch 2737 BLAKE2B 957f51a45f41920e73141cff56612e1bc334ef455fe262f1563d7c476ed534922f8f7a5f99d4f8ad69bb8830b7b1b97cf7afeb9a628058d54ffcef9d6497956f SHA512 c8ba4930114d8f6af230c21840e966def269e064c2236db6402a527f4e4050762082f37a770c551d3dab8d1b21642cfee701e48231f2bf42d50e41056725b711
 AUX lvm2-2.03.05-dynamic-static-ldflags.patch 2696 BLAKE2B 7464ee428e2cb8834181d3023399f2f913912bc58cb69af1fe9bb4418aecea1e4815c79d349e335cf60a7566052a34eb48db75f4f69bc0b0c2454def45edb18d SHA512 cb8e517967501fe11fe6c19543c37b26ada300bc06156b9f84e96fed96818e4a63e5a4322736d8e1eff4025a268dfb5570c4ec514bdf92df219a626f8bacd607
diff --git a/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch
deleted file mode 100644
index de2b294ef3e4..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.92-dynamic-static-ldflags.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/configure.in LVM2.2.02.92/configure.in
---- LVM2.2.02.92.orig/configure.in	2012-02-20 11:36:27.000000000 -0800
-+++ LVM2.2.02.92/configure.in	2012-02-20 15:53:40.700124222 -0800
-@@ -32,6 +32,7 @@
- 		COPTIMISE_FLAG="-O2"
- 		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
- 		ELDFLAGS="-Wl,--export-dynamic"
-+		STATIC_LDFLAGS="-Wl,--no-export-dynamic"
- 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
- 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
- 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
-@@ -1458,6 +1459,7 @@
- AC_SUBST(SELINUX_PC)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
-+AC_SUBST(STATIC_LDFLAGS)
- AC_SUBST(STATIC_LINK)
- AC_SUBST(TESTING)
- AC_SUBST(THIN)
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/daemons/dmeventd/Makefile.in LVM2.2.02.92/daemons/dmeventd/Makefile.in
---- LVM2.2.02.92.orig/daemons/dmeventd/Makefile.in	2012-02-20 15:48:04.861683196 -0800
-+++ LVM2.2.02.92/daemons/dmeventd/Makefile.in	2012-02-20 15:52:50.732314588 -0800
-@@ -65,7 +65,7 @@
- 	$(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic
- 
- dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
--	$(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \
- 	dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS)
- 
- ifeq ("@PKGCONFIG@", "yes")
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/make.tmpl.in LVM2.2.02.92/make.tmpl.in
---- LVM2.2.02.92.orig/make.tmpl.in	2012-02-20 15:48:05.034685963 -0800
-+++ LVM2.2.02.92/make.tmpl.in	2012-02-20 15:48:58.622550855 -0800
-@@ -38,6 +38,7 @@
- ELDFLAGS += @ELDFLAGS@
- LDDEPS += @LDDEPS@
- LDFLAGS += @LDFLAGS@
-+STATIC_LDFLAGS += @STATIC_LDFLAGS@
- LIB_SUFFIX = @LIB_SUFFIX@
- LVMINTERNAL_LIBS = -llvm-internal $(UDEV_LIBS) $(DL_LIBS)
- DL_LIBS = @DL_LIBS@
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.92.orig/tools/Makefile.in LVM2.2.02.92/tools/Makefile.in
---- LVM2.2.02.92.orig/tools/Makefile.in	2011-11-14 13:30:36.000000000 -0800
-+++ LVM2.2.02.92/tools/Makefile.in	2012-02-20 15:52:25.242901501 -0800
-@@ -126,7 +126,7 @@
- 	      -o $@ dmsetup.o -ldevmapper $(LIBS)
- 
- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \
- 	      -o $@ dmsetup.o -ldevmapper $(STATIC_LIBS) $(LIBS)
- 
- all: device-mapper
-@@ -136,7 +136,7 @@
- 		$(LVMLIBS) $(READLINE_LIBS) $(LIBS) -rdynamic
- 
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
- 	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
- 
- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 9bd09f4f48b6..e4e90d09c617 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -5,5 +5,5 @@ AUX lxcfs.initd 536 BLAKE2B cc8906ec07679c2aafcfc92e038e0442622ade31a9e7b3745426
 DIST lxcfs-3.0.3.tar.gz 49824 BLAKE2B 02e3a0a6f4fd515924c5f038f00d664ef347c9b685e6561334b460e0ce0ce5580aca67f33df56b44b9cdafa4953f4f92843662f3516e1c923f9242388b17dbc6 SHA512 d994e1dd85f499eba2847d33870281a4bcaf4466e2c8f7acb065f4f3d5688b93b775c486bc6db571e64d09a3567710b0c816e12555ffb3e3e50f81bc7f5f6be6
 DIST lxcfs-4.0.3.tar.gz 100719 BLAKE2B 24371b921ad635f97c51ac8406c949e81330ae358b0166c2af295cb1f630594bb72da802aad41971c11303f393fd05bc9f1b109bd4da4953db2c3bb7e5189315 SHA512 0aaedfe826d982b9464dfb60fb57c58e34ea6022b8503bc858538b6634dc7d0845f65832d6f814043dbc0677f887e1b559549a8f3865c755970c6b47ba65eb2b
 EBUILD lxcfs-3.0.3.ebuild 1735 BLAKE2B 51a331b3697b9e74a99de4bfaf1ba57aade89740d353fd0c2587bcb68d3a3a6089f161bc4c41a0f0f175364df9e4f0c829e9237d50460b85b7f3bd8342baf6f9 SHA512 e5bd8924ad6da0650f960ff18ef21f8607eee17e35198a3079a4758cceec5d971089b7118ee25a97a5374a7c9a7a26a4ef34ec3762ab161920d3bda7d5a53e83
-EBUILD lxcfs-4.0.3.ebuild 1162 BLAKE2B 01e17b5e82b4c9c3969fa9694145a455fee4afc739c8f98fd8ad776d48b847c3382ab2a37a55fa51e177d5018dd0d7ad004a83f19f853da554351ae2a08e8ba5 SHA512 a291d1de3ff3d3c46d0016b0f2ea42dbe3a666bc3c6eea42d94fa5049e46d196f83595abcad76cd796b44cfdcfb1b84a6b02d43a5c971c3ba8b6e0891eb5d4cb
+EBUILD lxcfs-4.0.3.ebuild 1249 BLAKE2B 497af2aa819e8142f41e5fca44c39d350428bdcd8fc16a1fceeaee6d182638c916900cdb240820141b682a9e9917dfeaf4260d227c0cd43db84561a5c07d6be6 SHA512 b65b38d4b7a096aad27004796328ee3d415fc1a4cf5264e66cb00e20fc4d2944dc5045ce4e54e29c9af43f29b779a8595eb918e294144cbac74b7577ef4bfde9
 MISC metadata.xml 808 BLAKE2B b8b8be1a8fd8a1a9614dbfeddd97cd322bcf0ed4d11a97bc6680bde28faa0bdaabbf8b5a92242e0da09845f6a08280dd0d6681e3932a7319117c186f167bf6fd SHA512 dfb81661c2feb5abb3397c93eabf26c12af51099f6676d8fec346c83ca3edea788745e4a59ea05035b16b1baf21edd16d9537f66fbd10d0c8da8a7933b35c528
diff --git a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
index 2c44e836a2c6..8d4d3457c618 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.3.ebuild
@@ -32,7 +32,8 @@ src_prepare() {
 
 src_configure() {
 	# Without the localstatedir the filesystem isn't mounted correctly
-	econf --localstatedir=/var
+	# Without with-distro ./configure will fail when cross-compiling
+	econf --localstatedir=/var --with-distro=gentoo
 }
 
 src_test() {
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index e26ea032005d..757d2a462066 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,5 +1,5 @@
-DIST ncdu-1.14.1.tar.gz 146346 BLAKE2B 50152647389cb08c236a47c8f85b93c7a42ba9a94b84dee313b7887614e5612ad9c0158a878872e08ffc3e85f4a7b91d292dfa0ae0471e194e6cec2b25a9355e SHA512 7db9115f7ba20d43c47bc7187347658d7a4dc36da6ffdc54308d3966a431c24b87c3266854d69685c3ea5e29805b5a631805a783d6431e30bd83c411b398515d
 DIST ncdu-1.14.2.tar.gz 145376 BLAKE2B f13f1286ae4e9f16f53a50b8e2ff5caa9cc0bb184a38e6e6025c2a8d396efc0fd453391813b712e358cf1607df29097b0330731b3dcc5688a72690352cee38e4 SHA512 d7398448e0e13354a0be1606c3e3f6f29e2dbb742fd56f7cd9c598e974c359429966527ef8fce6a0e3afb0ea3cad9a95169b880600e44d62273b937309fa0e59
-EBUILD ncdu-1.14.1.ebuild 432 BLAKE2B 7dddb5c5355a94b104fe57099a13eb48762289b0c7772526d184311ae298c9b8a3f2cca061d93712ed2619e2581052bec8ca187cf5f99c587dd24aaacdae0a74 SHA512 2e43fbc0fa51a6eb2d638100861d90b51bb0583e563533564be32d507934ddb9a9849eb2134865fb00542c27a424f404e3187e9a5e8186cd90c7515f8ac13e59
-EBUILD ncdu-1.14.2.ebuild 438 BLAKE2B 35cdb26899ac23e441483cb622d33602f25e0859f3e482a052d9320eec115a1935f06f0aba4d7ae54708cc8ec9473a53f83e496cf52efd22f6172a1fd7251854 SHA512 18fe69788d5e83f01a227988742db112b56b6016d45c83fe2b1461399d364cc539a793c1ccd9526187004a97680dd7437eeab96c7a1d418b4c053ad3710a9422
+DIST ncdu-1.15.tar.gz 147989 BLAKE2B 7ea8f46c81e4a8ae5e99a14ef561b768097152c95fe8ca46afc1aa4b5d37186917655972a8092b4050f89885a246a9b839ea02337711c441b7d1a66fee9fb676 SHA512 02bea12e45c984db2a758ec97e60f510c365c51a417a340edced13a9ab9d237cd004ed37b940359ddc4bed81295e9748d3370ad209dacd7ff1f406e434d205f0
+EBUILD ncdu-1.14.2.ebuild 432 BLAKE2B 7dddb5c5355a94b104fe57099a13eb48762289b0c7772526d184311ae298c9b8a3f2cca061d93712ed2619e2581052bec8ca187cf5f99c587dd24aaacdae0a74 SHA512 2e43fbc0fa51a6eb2d638100861d90b51bb0583e563533564be32d507934ddb9a9849eb2134865fb00542c27a424f404e3187e9a5e8186cd90c7515f8ac13e59
+EBUILD ncdu-1.15.ebuild 438 BLAKE2B 35cdb26899ac23e441483cb622d33602f25e0859f3e482a052d9320eec115a1935f06f0aba4d7ae54708cc8ec9473a53f83e496cf52efd22f6172a1fd7251854 SHA512 18fe69788d5e83f01a227988742db112b56b6016d45c83fe2b1461399d364cc539a793c1ccd9526187004a97680dd7437eeab96c7a1d418b4c053ad3710a9422
 MISC metadata.xml 589 BLAKE2B 9915d839320066570a64eb949ce52f48af51689617cdb6cdbac0fb6094a3923900bb940ae84be99fcd52618db5ba8a2de698c5c0515f4e5f0a6a3dbf73a42165 SHA512 2c3cf9225fafe928e442ef61f3ec10b810051843c801f3901fe8cf97d0a22e6c2354c9b3517b0c9439fad6e5829fa223ec36c6c295f426aa8a8a89a06b637d21
diff --git a/sys-fs/ncdu/ncdu-1.14.2.ebuild b/sys-fs/ncdu/ncdu-1.14.2.ebuild
index a63123a3d82a..b0e05454504a 100644
--- a/sys-fs/ncdu/ncdu-1.14.2.ebuild
+++ b/sys-fs/ncdu/ncdu-1.14.2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]
diff --git a/sys-fs/ncdu/ncdu-1.14.1.ebuild b/sys-fs/ncdu/ncdu-1.15.ebuild
index b0e05454504a..a63123a3d82a 100644
--- a/sys-fs/ncdu/ncdu-1.14.1.ebuild
+++ b/sys-fs/ncdu/ncdu-1.15.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 59bd1f359787..d6f3b536f20e 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,4 +1,3 @@
-AUX 99-ntfs3g.rules 51 BLAKE2B 11dd7b3deb9276b38be508ec3de5bdb79ceb5e272e24d5dab60ad6103df9003b6ba7654a78966b90d0aa9a3ff949ba14764f53ad04dc2826f19dc90eb0b8c1db SHA512 9310dd1dceec9a6252d3e8b95a9a1002c84a6f077457892eefe1255c85557041defbd8dcf6acef86285b45abd8bbe85822dd59a9e4c307bba80dd2c17f971851
 AUX CVE-2019-9755.patch 2111 BLAKE2B 5655cbef5789dc0de3f461f97f41e3c1d87fd64047a80ae5e2b848920afeff6fb464cec70c73ab367bb28bf77e7e73bf699f2fe9f491f380194abf058e96ba3c SHA512 2b08f609cca17740e610dd90f39c6187f5c92f74e66458df784da0fbff8490294ee5a942cb403f101fa446310f43af9d5ad451a7939e0dc84347d07912967f9f
 AUX ntfs3g-2014.2.15-no-split-usr.patch 1322 BLAKE2B efc71e28913d649484c1cf0d51dc34d8515cfba484a6a36a7cf158b142346255d403457ce0418148bbaa9e3e6e2cd494a509aa0c205ae944609844f4b9a04bc1 SHA512 232a1a7b84339c86758365564fce2058c3e652f833c6908245aa5f6f0e91d5c09cedcb978a1ebe62897c7288df4fe8671ba7085af403056742d897181e479e05
 AUX ntfs3g-2016.2.22-CVE-2017-0358.patch 1169 BLAKE2B 47ee2ae7724f77d6c50e4eb816a4558fc296990c2f65e56d40f71db642e75e2bb35aeb2d6880e3faf21f61d9c51619de003903dba93cb742170bf4df56d6e744 SHA512 223f7b4fcd962d3c2499787f9a32c09f35705de98d3d1c96677cea18c67f77f5a086b7839892cb25b62c9145b2543c02d5abca89a82cda2345d5f993d6a60131
@@ -6,10 +5,8 @@ AUX ntfs3g-2016.2.22-sysmacros.patch 911 BLAKE2B a53765dc5cd4ae8320584167fbf202b
 AUX ntfs3g-2017.3.23-big-sectors.patch 11378 BLAKE2B 47e47a6c1370af864aa7e700e56c8db1c190ae80bd3ed1ceeeb6952a143c2c7d640580d3586a088c7307893f3509884401cf2b7c4395ce8e536246ae3ae923e5 SHA512 e23b1e3eeeb3397e42c1a09afe8b261d5193df3fd521434b64aad80fe0c6fbbf78199b92659cbd76b6c802d77e708a81e86f1d2d97b464a5c854ef821ac722a1
 AUX ntfs3g-2017.3.23-check-mftmirr.patch 554 BLAKE2B 9c7ab2b705df38089dc0413b8132ea08ccfec34001470dfc8fb926ccdaddece6f7047cef29a9073a59f7a63da8f86e01dde9f8c9e482ae932a1dd860b940bffd SHA512 b6b4eb4c6c71b944a8a30b5da69fed97eec3b3e404c180f2c3434c402d3cf5b68aa7a4deaf74b74c11230c02ffd0ce41c96fa49f9874a0105e3219821431647f
 AUX ntfs3g-2017.3.23-full-clusters.patch 2206 BLAKE2B 5e11e3a1f3e51cf46c09c2e83033429d3ca900b4531dee419afe742efa2285793a57f968a042725d06cd139980010f99e2e7e240d892838fb7ea67682fa834dc SHA512 dbcc69018fea460882d644b3c1b794eaf1580ca6e9edbdd9a9590bbb6333dae0fedb50878c010908e3e7c7a08e0d443e95f0f7144aad78f2f89c51e92d777523
-DIST ntfs-3g_ntfsprogs-2016.2.22.tgz 1264364 BLAKE2B 6028048d676372c062cda1cf9ee43f2c1f035d080dde1201746d994e705756ab219de8359b1f8708e83e11c0036cdc33339e54299aa433f383e698e425ff2fed SHA512 dbd36fadd2881db1d17fdbf5d2b4e50bbe11dc9dd0ad4917e7f8bc4032c2287346143756ce8754df0d46ce9209f2c0c41b626cad929d76a9bc881712c7101c15
 DIST ntfs-3g_ntfsprogs-2017.3.23.tgz 1259054 BLAKE2B 4f12a6061ef0c116f26225eb3fb5cb84e469b63710115fbfb54fa3802ea94192afa973a553742818ff6849b72919069ec92aca2d4d6f58d8cabca1b0fefa3abe SHA512 3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef
-EBUILD ntfs3g-2016.2.22-r2.ebuild 2648 BLAKE2B 9e973a9296943a6c61adba256c76913e04f0b8076b9f763fbea2947248997321ce650e6a55f79fc3de7814c7b2968a5fbebdcbe3a710689e897699f0923cedbd SHA512 dc942abb0b74430ea29cb2fb3cf1ff2af11f79779f23b4fb1b66302ae4a456e4b47699835e1c7e3200d3a4b4e6e64631a07fb22bf3c9ca99ced6c1bf8169ab32
-EBUILD ntfs3g-2017.3.23-r1.ebuild 2512 BLAKE2B 155458dc34e1f37d79d7897cc25418982a0870f9de1e8e4d87c157b375c5b4c16b8b237a1eb51663be9c5753cbf721f232ae66b2af4217c165e4cc1d1f37a1fa SHA512 2cb2fac4ae5de791be2f7d68809d675f21e714a91119ad710c4230afcd9b356eaf1f63022004d41966e16f97be01fcdfce80c54c23032c83e253ddeb389ba8a8
-EBUILD ntfs3g-2017.3.23-r2.ebuild 2934 BLAKE2B 7bb5e3ede744866356917076f62c5c887c7da7c7866b30083043eaf93a0a8c84aaa6a62b0562642e00c1b240c3bd00ebb5826bf1e4207dd93c01bedc002782a4 SHA512 ba910621e742844e38c0e038982bf78b5744a3c42367b806dab8268e300570682de2e2cb279e6c3f580b9d520d9c88335f179f0baa846ab6185f98a555b5b43e
+DIST ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz 1278315 BLAKE2B d4f84bf744b12fec7faff82bd3d3048282a3cbcde2ca75e5d3a295206585c4cee68e25dff5fb20b034f516a3f2cd95c489105d9df810f8a9378024ef065b67d3 SHA512 8534970ba9f07999c5ff433144ad3a59640fb9a28fb30b37b5d736101e19f9fec1c222152338be382c894f972fce2b2a83680b85a28cf147cb5500b40a0a25cc
 EBUILD ntfs3g-2017.3.23-r3.ebuild 2930 BLAKE2B ea3cc4778fc6fc4af6d8e15c9c8fa7d2bb5ddda8c3d32202512cdfeca746c2d609147703b4f90fdc5875cd1dcf9d9816c86f02a1f3dd950a94c6f781b8271c4e SHA512 0be319c53b19da4c253d7b8b299a383e277b71ecce45e35f0f68adb0e98d0c5bf6cecf0aa3537b89b2734ce4ea67281f817dd238cad857962496c1cb2f7b58c8
+EBUILD ntfs3g-2017.3.23.5.ebuild 2011 BLAKE2B 5ebc1053adbfdadc68914ab207751244db2a4f6432b7cb9f353f93c8ea0ad8c7acd815e4e76c2991f260b57f1742da5934af2bb2178bdcd53dd6232b06810717 SHA512 618a472c48baaf5ad73159fa2ec324b756c669a67ccbc15d5c7bb359cf34187b9a7e468b80b596fb6427ee7bcfa69f4593b9e7e2a98baaba2fe0b6eb69ee08ff
 MISC metadata.xml 1188 BLAKE2B cd693b8b1281d056a5e75baeb04019684a67033607e16479c58830fbf9a19b88ba6e263c5e0637b5501cd5fe2fd000f92e8212354576242fa31c513158b38774 SHA512 6d9aa23202090132c37fe6915aa300597f2c88474065749de36143b8a47090c5bdb2e6449dffbb3843c9b7d30254fdde849b1aa230641910189d00134bd88c85
diff --git a/sys-fs/ntfs3g/files/99-ntfs3g.rules b/sys-fs/ntfs3g/files/99-ntfs3g.rules
deleted file mode 100644
index 52dca4064766..000000000000
--- a/sys-fs/ntfs3g/files/99-ntfs3g.rules
+++ /dev/null
@@ -1 +0,0 @@
-ENV{ID_FS_TYPE}=="ntfs", ENV{ID_FS_TYPE}="ntfs-3g"
diff --git a/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
deleted file mode 100644
index 6d2c789ca34d..000000000000
--- a/sys-fs/ntfs3g/ntfs3g-2016.2.22-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils linux-info ltprune udev toolchain-funcs libtool
-
-MY_PN=${PN/3g/-3g}
-MY_P=${MY_PN}_ntfsprogs-${PV}
-
-DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
-HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/"
-SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-# The subslot matches the SONAME major #.
-SLOT="0/87"
-KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
-
-RDEPEND="!<sys-apps/util-linux-2.20.1-r2
-	!sys-fs/ntfsprogs
-	ntfsdecrypt? (
-		>=dev-libs/libgcrypt-1.2.2:0
-		>=net-libs/gnutls-1.4.4
-	)
-	external-fuse? (
-		>=sys-fs/fuse-2.8.0
-		<sys-fs/fuse-3.0.0_pre
-	)"
-DEPEND="${RDEPEND}
-	sys-apps/attr
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS ChangeLog CREDITS README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2014.2.15-no-split-usr.patch
-	"${FILESDIR}"/${PN}-2016.2.22-sysmacros.patch #580136
-	"${FILESDIR}"/${PN}-2016.2.22-CVE-2017-0358.patch #607912
-)
-
-pkg_setup() {
-	if use external-fuse && use kernel_linux; then
-		if kernel_is lt 2 6 9; then
-			die "Your kernel is too old."
-		fi
-		CONFIG_CHECK="~FUSE_FS"
-		FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-	# Keep the symlinks in the same place we put the main binaries.
-	# Having them in / when all the progs are in /usr is pointless.
-	sed -i \
-		-e 's:/sbin:$(sbindir):g' \
-		{ntfsprogs,src}/Makefile.in || die #578336
-	# Note: patches apply to Makefile.in, so don't run autotools here.
-	elibtoolize
-}
-
-src_configure() {
-	tc-ld-disable-gold
-	# passing --exec-prefix is needed as the build system is trying to be clever
-	# and install itself into / instead of /usr in order to be compatible with
-	# separate-/usr setups (which we don't support without an initrd).
-	econf \
-		--exec-prefix="${EPREFIX}"/usr \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		$(use_enable debug) \
-		--enable-ldscript \
-		--disable-ldconfig \
-		$(use_enable acl posix-acls) \
-		$(use_enable xattr xattr-mappings) \
-		$(use_enable ntfsdecrypt crypto) \
-		$(use_enable ntfsprogs) \
-		$(use_enable ntfsprogs quarantined) \
-		--without-uuid \
-		--enable-extras \
-		$(use_enable static-libs static) \
-		--with-fuse=$(usex external-fuse external internal)
-}
-
-src_install() {
-	default
-
-	use suid && fperms u+s /usr/bin/${MY_PN}
-	udev_dorules "${FILESDIR}"/99-ntfs3g.rules
-	prune_libtool_files
-
-	dosym mount.ntfs-3g /usr/sbin/mount.ntfs #374197
-}
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild
deleted file mode 100644
index d73ec1687769..000000000000
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit eutils linux-info ltprune udev toolchain-funcs libtool
-
-MY_PN=${PN/3g/-3g}
-MY_P=${MY_PN}_ntfsprogs-${PV}
-
-DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
-HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/"
-SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-# The subslot matches the SONAME major #.
-SLOT="0/88"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
-
-RDEPEND="!<sys-apps/util-linux-2.20.1-r2
-	!sys-fs/ntfsprogs
-	ntfsdecrypt? (
-		>=dev-libs/libgcrypt-1.2.2:0
-		>=net-libs/gnutls-1.4.4
-	)
-	external-fuse? (
-		>=sys-fs/fuse-2.8.0:0
-	)"
-DEPEND="${RDEPEND}
-	sys-apps/attr
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS ChangeLog CREDITS README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2014.2.15-no-split-usr.patch
-	"${FILESDIR}"/${PN}-2016.2.22-sysmacros.patch #580136
-)
-
-pkg_setup() {
-	if use external-fuse && use kernel_linux; then
-		if kernel_is lt 2 6 9; then
-			die "Your kernel is too old."
-		fi
-		CONFIG_CHECK="~FUSE_FS"
-		FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	# Keep the symlinks in the same place we put the main binaries.
-	# Having them in / when all the progs are in /usr is pointless.
-	sed -i \
-		-e 's:/sbin:$(sbindir):g' \
-		{ntfsprogs,src}/Makefile.in || die #578336
-	# Note: patches apply to Makefile.in, so don't run autotools here.
-	elibtoolize
-}
-
-src_configure() {
-	tc-ld-disable-gold
-	# passing --exec-prefix is needed as the build system is trying to be clever
-	# and install itself into / instead of /usr in order to be compatible with
-	# separate-/usr setups (which we don't support without an initrd).
-	econf \
-		--exec-prefix="${EPREFIX}"/usr \
-		$(use_enable debug) \
-		--enable-ldscript \
-		--disable-ldconfig \
-		$(use_enable acl posix-acls) \
-		$(use_enable xattr xattr-mappings) \
-		$(use_enable ntfsdecrypt crypto) \
-		$(use_enable ntfsprogs) \
-		$(use_enable ntfsprogs quarantined) \
-		--without-uuid \
-		--enable-extras \
-		$(use_enable static-libs static) \
-		--with-fuse=$(usex external-fuse external internal)
-}
-
-src_install() {
-	default
-
-	use suid && fperms u+s /usr/bin/${MY_PN}
-	udev_dorules "${FILESDIR}"/99-ntfs3g.rules
-	prune_libtool_files
-
-	dosym mount.ntfs-3g /usr/sbin/mount.ntfs #374197
-}
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild
deleted file mode 100644
index 83370cc11235..000000000000
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit linux-info udev toolchain-funcs libtool
-
-MY_PN=${PN/3g/-3g}
-MY_P=${MY_PN}_ntfsprogs-${PV}
-
-DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
-HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/"
-SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
-
-LICENSE="GPL-2"
-# The subslot matches the SONAME major #.
-SLOT="0/88"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
-
-RDEPEND="!<sys-apps/util-linux-2.20.1-r2
-	!sys-fs/ntfsprogs
-	ntfsdecrypt? (
-		>=dev-libs/libgcrypt-1.2.2:0
-		>=net-libs/gnutls-1.4.4
-	)
-	external-fuse? (
-		>=sys-fs/fuse-2.8.0:0
-	)
-"
-DEPEND="${RDEPEND}
-	sys-apps/attr
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS ChangeLog CREDITS README"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2014.2.15-no-split-usr.patch
-	"${FILESDIR}"/${PN}-2016.2.22-sysmacros.patch #580136
-	# Fedora fixes
-	"${FILESDIR}"/${PN}-2017.3.23-check-mftmirr.patch
-	"${FILESDIR}"/${PN}-2017.3.23-big-sectors.patch
-	"${FILESDIR}"/${PN}-2017.3.23-full-clusters.patch
-)
-
-pkg_setup() {
-	if use external-fuse && use kernel_linux; then
-		if kernel_is lt 2 6 9; then
-			die "Your kernel is too old."
-		fi
-		CONFIG_CHECK="~FUSE_FS"
-		FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	default
-	# Keep the symlinks in the same place we put the main binaries.
-	# Having them in / when all the progs are in /usr is pointless.
-	sed -i \
-		-e 's:/sbin:$(sbindir):g' \
-		{ntfsprogs,src}/Makefile.in || die #578336
-	# Note: patches apply to Makefile.in, so don't run autotools here.
-	elibtoolize
-}
-
-src_configure() {
-	# disable hd library until we have the right library in the tree and
-	# don't links to hwinfo one causing issues like bug #602360
-	tc-ld-disable-gold
-	# passing --exec-prefix is needed as the build system is trying to be clever
-	# and install itself into / instead of /usr in order to be compatible with
-	# separate-/usr setups (which we don't support without an initrd).
-	econf \
-		--exec-prefix="${EPREFIX}"/usr \
-		$(use_enable debug) \
-		--enable-ldscript \
-		--disable-ldconfig \
-		$(use_enable acl posix-acls) \
-		$(use_enable xattr xattr-mappings) \
-		$(use_enable ntfsdecrypt crypto) \
-		$(use_enable ntfsprogs) \
-		$(use_enable ntfsprogs quarantined) \
-		--without-uuid \
-		--without-hd \
-		--enable-extras \
-		$(use_enable static-libs static) \
-		--with-fuse=$(usex external-fuse external internal)
-}
-
-src_install() {
-	default
-
-	use suid && fperms u+s /usr/bin/${MY_PN}
-	# Not needed with the link of mount.ntfs being created, causes
-	# issues like bug #635080
-#	udev_dorules "${FILESDIR}"/99-ntfs3g.rules
-	dosym mount.ntfs-3g /usr/sbin/mount.ntfs #374197
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23.5.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23.5.ebuild
new file mode 100644
index 000000000000..83e5a1f4f9ce
--- /dev/null
+++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit linux-info udev toolchain-funcs libtool
+
+MY_P="ntfs-3g_ntfsprogs-${PV%.*}AR.${PV##*.}"
+
+DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
+HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/"
+HOMEPAGE="https://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html"
+#SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
+SRC_URI="https://jp-andre.pagesperso-orange.fr/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+# The subslot matches the SONAME major #.
+SLOT="0/885"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="acl debug ntfsdecrypt +ntfsprogs static-libs suid xattr"
+
+RDEPEND="
+	sys-apps/util-linux:0=
+	ntfsdecrypt? (
+		>=dev-libs/libgcrypt-1.2.2:0
+		>=net-libs/gnutls-1.4.4
+	)
+"
+DEPEND="${RDEPEND}
+	sys-apps/attr
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	CONFIG_CHECK="~FUSE_FS"
+	FUSE_FS_WARNING="You need to have FUSE module built to use ntfs-3g"
+	linux-info_pkg_setup
+}
+
+src_configure() {
+	tc-ld-disable-gold
+
+	local myconf=(
+		# passing --exec-prefix is needed as the build system is trying to be clever
+		# and install itself into / instead of /usr in order to be compatible with
+		# separate-/usr setups (which we don't support without an initrd).
+		--exec-prefix="${EPREFIX}"/usr
+
+		--disable-ldconfig
+		--enable-extras
+		$(use_enable debug)
+		$(use_enable acl posix-acls)
+		$(use_enable xattr xattr-mappings)
+		$(use_enable ntfsdecrypt crypto)
+		$(use_enable ntfsprogs)
+		$(use_enable ntfsprogs quarantined)
+		$(use_enable static-libs static)
+
+		--with-uuid
+
+		# disable hd library until we have the right library in the tree and
+		# don't links to hwinfo one causing issues like bug #602360
+		--without-hd
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	use suid && fperms u+s /usr/bin/ntfs-3g
+	dosym mount.ntfs-3g /sbin/mount.ntfs
+	find "${D}" -name '*.la' -type f -delete || die
+}
diff --git a/sys-fs/owfs/Manifest b/sys-fs/owfs/Manifest
index 8ac6c9a4c644..63e7748b9996 100644
--- a/sys-fs/owfs/Manifest
+++ b/sys-fs/owfs/Manifest
@@ -9,5 +9,5 @@ AUX owhttpd.initd-r1 820 BLAKE2B 4122ce01036f63083286162f33d576e2a953e7bff7e2150
 AUX owserver.confd 108 BLAKE2B 3279ee61b42a9573472657e4297a7988668c081cd66d0f64d53cbd2eb27248abfebd6c368d77a5a3eb84ccd95b41ce65c2f03e3cb8ee1f095e4b776b60e3283a SHA512 c10fb23a60d89348c82f6f5ee6b0ba1c5d59e506dcdf484fa0c9c8c6ae07064cafc39517670b5edb474bcc1921efddfce2e5dd879f59f3bb3a1f80d6df3c0411
 AUX owserver.initd-r1 802 BLAKE2B 8273790945eb4df7b8aadf7d19ac3397152d225495dba7e5e8a472ad7420f2e9e97ba35ec5e7655e0e5b3c37ed97ac740dbda8d1ae030dc9b75ba2bbf1dbf391 SHA512 3c2d186df7c3d4549333f90a87c80a44dd8ed67b10bacdc08edce2b45db35bd0bc7f0956bdee8f03a388ae8a5bab039f7bb19e3bad007632608f945c7e54c649
 DIST owfs-3.2p2.tar.gz 1491195 BLAKE2B 3e56b954fc61e097d6e39345d689d3ba5386f2ed4383bb7755da6a867d802fe56b9e920fe9b4f24cdd639543bad79a6d13bd549e7ce81afb8eab52372864565a SHA512 d64078639ce4c1c5c42735c720cfa6741a34b91297500d6a7cff6e48a0a87b6391e43fc0c5f6bf44cec27feffb9a2f9b5510e085c602666a5adf803bb8ba3338
-EBUILD owfs-3.2_p2-r2.ebuild 4781 BLAKE2B ddbb63d06a3c6475f7b1febfe1b8e0f5bad216d2db2d5337ba0e94e4f96ceadd5872906f8962d905cb11b09e8b7d1f6a431f2c040db1a243477d4583013a5215 SHA512 f77002cd587881b99943c01268ce2ba218ec55e46e79e5c6384fc67b7dd89a94d35bee93a9a9dfde043f34ff85f4c456adfa27601726bfee99e805ff9e3207ef
+EBUILD owfs-3.2_p2-r2.ebuild 4782 BLAKE2B 05e42cf3d93fafcde9e875af9a91b16564846e9e7a487af8812a66c738bd66bf2600e9364864237c044379dec76eb48af9b9d9936695fb821a4ab86553fb1f08 SHA512 1aa74c96d39673636396e5ec76f5b829493a735542a86c4b7662f224e0d208ecf8bd4c579e9fa5740df0e6b59a5d439dcb53a151b9e5a25377c5427d9fd37d83
 MISC metadata.xml 1159 BLAKE2B 6a55584f7bf0ae7b11441169d59f53138a2e82a3ac38a53b9ab77c8a4e6baf5c268864e7f6897eb2fd9b35888f8373a6756b8760d894c5f4aeaae394f8cb3706 SHA512 4cff718d367711e5a99891caa7c19db9f50d885200841096f17ec3ee64cd01d3938fa34d1f2c5e6de575dd3cb36c5ea4f3625fa604b11cfdebe13362ea37cefe
diff --git a/sys-fs/owfs/owfs-3.2_p2-r2.ebuild b/sys-fs/owfs/owfs-3.2_p2-r2.ebuild
index 8bc833ad7ff9..49482396596b 100644
--- a/sys-fs/owfs/owfs-3.2_p2-r2.ebuild
+++ b/sys-fs/owfs/owfs-3.2_p2-r2.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
@@ -12,7 +12,7 @@ MY_P="${P/_/}"
 
 DESCRIPTION="Access 1-Wire devices like a filesystem"
 SRC_URI="mirror://sourceforge/owfs/${MY_P}.tar.gz"
-HOMEPAGE="http://owfs.org/ https://sourceforge.net/projects/owfs/"
+HOMEPAGE="https://owfs.org/ https://sourceforge.net/projects/owfs/"
 KEYWORDS="amd64 arm x86"
 
 # Upstream uses crazy SONAME, https://github.com/owfs/owfs/commit/c696fa9b9b44f49c96b9f1c2b3159d277e0c1273
diff --git a/sys-fs/snapraid/Manifest b/sys-fs/snapraid/Manifest
index e6f451e7be44..ea881135a457 100644
--- a/sys-fs/snapraid/Manifest
+++ b/sys-fs/snapraid/Manifest
@@ -1,7 +1,5 @@
-DIST snapraid-11.2.tar.gz 735526 BLAKE2B d039c56c2fa4f0d2b333cb9eada2d59346e672c5196c0622c5536c5c3fe49b6df0ba742bcd467695fcbd46bb0ede06b1e54dc0c8088c275aeb4b1acd2f8e0f84 SHA512 975c0bb3e69e4feb2845c7d2971676beb59e3815070ee5fae09447925e74af5666dd51783fdadca096bd8bca43cfa19a88132d0999eb86a338915842a46a1834
-DIST snapraid-11.3.tar.gz 736549 BLAKE2B 67ad1e23630076b088167525e50f0ae2673201a9c02b25116d7d0ad9d2d8e34b17e240bd2fd90d39c6906842a6f321a2b76569d90c6ae24b40d1c6c335b8d6b4 SHA512 f0ed2bc1ab480b58220dac299ef95635747d5a8046bfcddf21b216d92d5cbfbf4299cb4130856a7fa5b808ba42662534b35a370193fe0a51791c994ed773a2ae
 DIST snapraid-11.4.tar.gz 742589 BLAKE2B 21c0976b6fcf792653fb0d2f223cd9b728e8850505aa78914c37fa2e3b5399df33b38fcbe870a567b1beb87ba1e2a37d63afc32ae08fb487d7b24fcffe5da8a4 SHA512 d9d5d48f6f996f2c1fbec2f84219b007ac28828d54e6b8614d05ab87f717b3498333ec950e861060c1278993f4971af2435cf8f268c0f1fb403c279d00a96b92
-EBUILD snapraid-11.2.ebuild 513 BLAKE2B 35b85972d74b40296d65dad5f8bfbf862f4f33e821c13dc1f959ce507989a9bf1a1d556de634b4abb74f102bb522b059e73c4d8379b8a59ccee797a6a676dc38 SHA512 b189b49887f3d7bac7abeacc1e81ebcdb7079c81d73f5994790811a249803349909145f180bb257859329d3019229d80bd2c512ad0d513d01d112abd27b2b4a2
-EBUILD snapraid-11.3.ebuild 513 BLAKE2B c485fe4163015ed5989afe2625bea9f764b990382f86af2375b709184f49d83ec9583c7e5e220e9d535edb171695d76b8e01c0ad048b312137d80d98a461a253 SHA512 345e56a11747f9f10fea995d63695f9c0b859a7bfba86d4ed3c2c1b1204ba13ccc8f8be990093076c51c34a1f27695cee3781e3de251adb2eb6fd042bfc6f338
+DIST snapraid-11.5.tar.gz 742480 BLAKE2B b0e66faccdacc0404b52f38061bc45b198cac5ce2fd2c465b8730a6e98f3e50569be70f5374f33a24cd2578b5c5e6f5db1070bbcd0e5ab269424ea52595aac9d SHA512 c0c8b6ebf6c1f057de618504d8f030158cbaf5135097f6c4fa320697eef9be447341e5c26fcab861c40c9995bcc4429dbb4d1fcdfd00090e6dfc7a1f6b501f7c
 EBUILD snapraid-11.4.ebuild 513 BLAKE2B c485fe4163015ed5989afe2625bea9f764b990382f86af2375b709184f49d83ec9583c7e5e220e9d535edb171695d76b8e01c0ad048b312137d80d98a461a253 SHA512 345e56a11747f9f10fea995d63695f9c0b859a7bfba86d4ed3c2c1b1204ba13ccc8f8be990093076c51c34a1f27695cee3781e3de251adb2eb6fd042bfc6f338
+EBUILD snapraid-11.5.ebuild 513 BLAKE2B c485fe4163015ed5989afe2625bea9f764b990382f86af2375b709184f49d83ec9583c7e5e220e9d535edb171695d76b8e01c0ad048b312137d80d98a461a253 SHA512 345e56a11747f9f10fea995d63695f9c0b859a7bfba86d4ed3c2c1b1204ba13ccc8f8be990093076c51c34a1f27695cee3781e3de251adb2eb6fd042bfc6f338
 MISC metadata.xml 502 BLAKE2B df99ef331bfd0b3180fb3ab31d46fd0a2673deeca91bdbdca8033c5a2b8c2931d489dca5fccb2103df1bc10ac7217f976808f43841cffbb756c1f757a6f99199 SHA512 f3cc7f7f8bcf1b7dc813a8cbf18c562771437628fecce4824aac5abc849741ec81dcbcaac2a1a5e44b3410741213167894b882697701fd66857985c900372851
diff --git a/sys-fs/snapraid/snapraid-11.2.ebuild b/sys-fs/snapraid/snapraid-11.2.ebuild
deleted file mode 100644
index 35f69f087034..000000000000
--- a/sys-fs/snapraid/snapraid-11.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-DESCRIPTION="a backup program for disk array for home media centers"
-HOMEPAGE="http://snapraid.it/"
-SRC_URI="https://github.com/amadvance/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DOCS=( "AUTHORS" "HISTORY" "README" "TODO" "snapraid.conf.example" )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/sys-fs/snapraid/snapraid-11.3.ebuild b/sys-fs/snapraid/snapraid-11.5.ebuild
index d9c8f45f3452..d9c8f45f3452 100644
--- a/sys-fs/snapraid/snapraid-11.3.ebuild
+++ b/sys-fs/snapraid/snapraid-11.5.ebuild
diff --git a/sys-fs/xwmfs/Manifest b/sys-fs/xwmfs/Manifest
index 94d3c4aaa58d..dff525dd5d9d 100644
--- a/sys-fs/xwmfs/Manifest
+++ b/sys-fs/xwmfs/Manifest
@@ -1,3 +1,3 @@
-DIST xwmfs-0.84.tar.gz 194516 BLAKE2B 47181b349ed0f72e39fd2fba2dc1e2d85fd671e3e549fb75b12ff48e58ab7b2cb34afabe95de5130556c69a11c41ebd9ca1a6bd493f485fe67b8f99f5feb5626 SHA512 f900b773bf000481625980b94ed14f3775eaa4644b668c0d09ff206279f87592a3ad6ebea91dc2d2f81f69583ec64303f40dde5d6011da7df23b19ed4c969584
-EBUILD xwmfs-0.84.ebuild 616 BLAKE2B 29b3d25a10982a3116e28734feb7f4ef6df9ccd685871b9aace6b265ed962e617457dd31eb338677c2aa02400426c6065688328d8052971763e0def24617abd8 SHA512 a52877db9724c4d4e7da50b7f61e3981f5e53be7bdbe5a2dca1da730ec51386be25e9b92644efb73457bfe67d826e4f5d41d221a774d35a7e13034b99afc70b0
+DIST xwmfs-0.85.tar.gz 195179 BLAKE2B 9437dac24c1ae8e8fa775e7d85242b8dd7f37efea15c01d01601786a3588affe2f57682e8c879f349aba82e99b4a07866f9fa0e48821756787f1fa1654297d99 SHA512 0c0e043567b09bdd0463c488f56bb21fd15787633d86b6f8411ca0b37921561db4bc543bb109d38b059e04a123653cb7dd2f502d3584b13271dd7a6d511be94b
+EBUILD xwmfs-0.85.ebuild 616 BLAKE2B 29b3d25a10982a3116e28734feb7f4ef6df9ccd685871b9aace6b265ed962e617457dd31eb338677c2aa02400426c6065688328d8052971763e0def24617abd8 SHA512 a52877db9724c4d4e7da50b7f61e3981f5e53be7bdbe5a2dca1da730ec51386be25e9b92644efb73457bfe67d826e4f5d41d221a774d35a7e13034b99afc70b0
 MISC metadata.xml 1393 BLAKE2B f9f7389edcc5535cddf0e0c34ebacc0272b57e65c42ad76c2930534913e12d90c3a06dae5dda49fef8e14935b5376576bf1bc2118c528535c289cf436573457c SHA512 143ed4a1f942d55be296a6b909d56d853e7b27a9710f9d4248bd7102a47a49b804f3687abc2d508209889b12cbfcfdd07f8bdba94883858f1605e59964675951
diff --git a/sys-fs/xwmfs/xwmfs-0.84.ebuild b/sys-fs/xwmfs/xwmfs-0.85.ebuild
index 1f23a8953190..1f23a8953190 100644
--- a/sys-fs/xwmfs/xwmfs-0.84.ebuild
+++ b/sys-fs/xwmfs/xwmfs-0.85.ebuild
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index f07dac8b6135..d00de1fdabab 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,8 +1,4 @@
-DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
-DIST zfs-0.8.3.tar.gz 8779385 BLAKE2B 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 SHA512 aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010
 DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
-EBUILD zfs-kmod-0.7.13.ebuild 4119 BLAKE2B f8d921251bc94644a7331762054935518bb9fb68425b404572876466bff118b9ae20cf297f34d9267c933d7ea28840c84fe8e4a867e9a9f191b627f29207798b SHA512 8e4eb43e5b4edd7dcb8b0ecb13a809340ee20247017e7cb141b8489dc4c9988b84b40e866028e8d3b73aea69981a923e4fc4b237389115fb8e72d8b6ed450340
-EBUILD zfs-kmod-0.8.3.ebuild 4247 BLAKE2B 7346912021c1aece40acdb2d25f1eaeb64630fbb78c276fa8f76b5a51fd27ca816a5d7f990d7bebe6422648f8c001d4b343d3e0957a831904fc9c11d9eb2a714 SHA512 ab215e7b0ceed0f282022a36ecda3b4e6fe50913ae7684823a4eee987b9a11e11ad7755001cf47a737613216df550de391aef59230859b3ca89c0a48d074263a
-EBUILD zfs-kmod-0.8.4.ebuild 4390 BLAKE2B 3a7e549b456e0d40fd1082b160cf516843667e1e779d2d8a2da3106ddf48ef7db290fd540a6e6ca75dc8d605012dfa18cc6f9bf3c71c24018a304dd94861af96 SHA512 9e042db9684919ef1a32f0725dc58e635282e6bd3525994430d26fd0d9b2f5ea0be39b7bf0f4422ccf33266448e0fdf7eb3c526a0e548919cb880c432078f7cf
-EBUILD zfs-kmod-9999.ebuild 4390 BLAKE2B 3a7e549b456e0d40fd1082b160cf516843667e1e779d2d8a2da3106ddf48ef7db290fd540a6e6ca75dc8d605012dfa18cc6f9bf3c71c24018a304dd94861af96 SHA512 9e042db9684919ef1a32f0725dc58e635282e6bd3525994430d26fd0d9b2f5ea0be39b7bf0f4422ccf33266448e0fdf7eb3c526a0e548919cb880c432078f7cf
+EBUILD zfs-kmod-0.8.4.ebuild 4387 BLAKE2B 15ef13512c2fb94b9d849c828906649ec81fa1362338dc82a3373f67dade0d6968b3ba62176d4f76024156ba5f23c49668e3e57f5972365d96f98469b7fe86f2 SHA512 8c8c6291c117acc7f16bcac6020ec444c9d5c9a382ffc7bb8c33585d3421eec6ddcda262f641971a1971e18ec61e98fb6e70880cae51ebea20d6e17d0f4f9700
+EBUILD zfs-kmod-9999.ebuild 4388 BLAKE2B e142682c68e058beb9d110b86abb84d1169ed79461acf6fd852ef9800cd7b9e33c85adf4aba7e5e7e6d6f1c8f22ba8b56590e1636f0fe8285f66ab7754c9fa84 SHA512 a6c15aa5286e9c08207cf4f5676d967072bf8bf0118867771819a686b7802abe3127333b74066479b5fb0bac7b7f387075919b56b4f914192420ed51d38263e7
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.13.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.13.ebuild
deleted file mode 100644
index 250c19a2830e..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.13.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS="amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://zfsonlinux.org/"
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="debug? ( strip ) test"
-
-DEPEND="
-	=sys-kernel/spl-${PV}*
-	dev-lang/perl
-	virtual/awk
-"
-
-RDEPEND="${DEPEND}
-	!sys-fs/zfs-fuse
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
-	"
-
-	kernel_is lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
-
-	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 5 0 || die "Linux 5.0 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	# Remove GPLv2-licensed ZPIOS unless we are debugging
-	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
-
-	# Set module revision number
-	[ ${PV} != "9999" ] && \
-		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(${myeconfargs}
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-spl="${EROOT}usr/src/${SPL_PATH}"
-		--with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
-		$(use_enable debug)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-
-	if use x86 || use arm
-	then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	ewarn "This version of ZFSOnLinux includes support for new feature flags"
-	ewarn "that are incompatible with previous versions. GRUB2 support for"
-	ewarn "/boot with the new feature flags is not yet available."
-	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-	ewarn "Any new pools will be created with the new feature flags by default"
-	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
-	ewarn "create a newpool that is backward compatible wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.3.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.3.ebuild
deleted file mode 100644
index ba5f84805265..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.3.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic linux-mod toolchain-funcs
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://zfsonlinux.org/"
-
-if [[ ${PV} == "9999" ]]; then
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64"
-	S="${WORKDIR}/zfs-${PV}"
-	ZFS_KERNEL_COMPAT="5.4"
-fi
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-
-DEPEND=""
-
-RDEPEND="${DEPEND}
-	!sys-kernel/spl
-"
-
-BDEPEND="
-	dev-lang/perl
-	virtual/awk
-"
-
-RESTRICT="debug? ( strip ) test"
-
-DOCS=( AUTHORS COPYRIGHT META README.md )
-
-pkg_setup() {
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
-	"
-
-	if use arm64; then
-		kernel_is -ge 5 && CONFIG_CHECK="${CONFIG_CHECK} !PREEMPT"
-	fi
-
-	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
-
-	kernel_is -ge 3 10 || die "Linux 3.10 or newer required"
-
-	if [[ ${PV} != "9999" ]]; then
-		local kv_major_max kv_minor_max zcompat
-		zcompat="${ZFS_KERNEL_COMPAT_OVERRIDE:-${ZFS_KERNEL_COMPAT}}"
-		kv_major_max="${zcompat%%.*}"
-		zcompat="${zcompat#*.}"
-		kv_minor_max="${zcompat%%.*}"
-		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
-			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-	fi
-
-	linux-mod_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		eautoreconf
-	else
-		# Set module revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-}
-
-src_configure() {
-	set_arch_to_kernel
-
-	use custom-cflags || strip-flags
-
-	filter-ldflags -Wl,*
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		$(use_enable debug)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	set_arch_to_kernel
-
-	myemakeargs=( V=1 )
-
-	emake "${myemakeargs[@]}"
-}
-
-src_install() {
-	set_arch_to_kernel
-
-	myemakeargs+=(
-		DEPMOD="/bin/true"
-		DESTDIR="${D}"
-		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-	)
-
-	emake "${myemakeargs[@]}" install
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
-		ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
-		ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
-	fi
-
-	if use x86 || use arm; then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	ewarn "This version of ZFSOnLinux includes support for new feature flags"
-	ewarn "that are incompatible with previous versions. GRUB2 support for"
-	ewarn "/boot with the new feature flags is not yet available."
-	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-	ewarn "Any new pools will be created with the new feature flags by default"
-	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
-	ewarn "create a newpool that is backward compatible wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
index 8481dbb73811..9a0cc54ca59b 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	KEYWORDS="amd64 ~arm64 ~ppc64"
 	S="${WORKDIR}/zfs-${PV}"
 	ZFS_KERNEL_COMPAT="5.6"
 fi
@@ -74,7 +74,7 @@ pkg_setup() {
 		kv_minor_max="${zcompat%%.*}"
 		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
 			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-		
+
 		# 0.8.x requires at least 2.6.32
 		kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
 	else
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index 8481dbb73811..bd1fe4231acc 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -74,7 +74,7 @@ pkg_setup() {
 		kv_minor_max="${zcompat%%.*}"
 		kernel_is -le "${kv_major_max}" "${kv_minor_max}" || die \
 			"Linux ${kv_major_max}.${kv_minor_max} is the latest supported version"
-		
+
 		# 0.8.x requires at least 2.6.32
 		kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
 	else
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index adfb32ca0c27..27ca4bd95f3c 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,17 +1,7 @@
-AUX 0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch 1945 BLAKE2B db5d094bcac52a3b53bae9df4b0444f656858dd83f21994cbefe4900554a2579c67b5058d149d226ca354bd45d9e24c12244186da3232064233b74ec590187dc SHA512 71a009336fdcac8e5813001fd6741f4310c3e792b20650ebad73ba0049730acb5188587dc8e706846e886bf9ac241d2163b9558150eb389c99d7910a730542d0
-AUX 0.8.3-fno-common.patch 2377 BLAKE2B 61390e1c64b212b94060777154f5cf18942d4c22ba845f85ae91e81cdb6978e6d01cc9f90b1739bf3503bc40f26a98389659dbc0f83d3cedc954b802792b3b55 SHA512 7b2b066d0f4def5950c031ef87626ef68e0eccfe388f451dd6e5a36874674020ed2e4658bf24ab3977673b77aa7631822ef12318381f7785f310a0b24a61dfbc
-AUX 0.8.3-zfs-functions.patch 1707 BLAKE2B 6ead7415be7dbeff6377b8d4074bb4e1cf6b154cf145e77b876e514c57d05cc041c5a66cfd6ab4c0bbb4931fa2553680c5749c4e06810ebd5658941088f9e7cf SHA512 cda47f5ef47ab86b2fda87e9ac2ab26d08431b2bd7420ecdd8ab9625a283c48278caa794b2aaa4c5f9341e08a2751b5b4a7b93a3b53491ccbdf2f085a0cb86ec
 AUX 0.8.4-initconfdir.patch 1004 BLAKE2B fd4186b5f378f562098040a8e13a12e6fd7f0f37f3b981a8d46e0e3bc943eb8dd5fa474e6c65cefd8c03fc3c45a119f6a141d42753ce4729e3a234e7f57dc4b8 SHA512 c18e9cd03d537a3ad632e1aeb354b56f5db9a8ef51c30b2e728ea527b7e9017219b1a230374238ecdd24082d9f2c62510aea68b234df84961ada5dce2ed617cc
 AUX bash-completion-r1 11310 BLAKE2B f6c105fef1737d4be0e76967fdec62aa52fa7665bfc1e9aa4c944dd6442d64d7d31b8af54f92f5db25542f968ecf83da46db8c2a8f978577526bf9f90d8bccf3 SHA512 03be521e2c646196766d5fd049f241cb97f290abf0409881ea6ba709934984deda402c8513009e62a5787e0648023b55c040e5f99baef27709e81c3bc9c8f56e
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
-AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c93a2cd7134016a8d07d68483126d60e46ed4ff5cbaeb87f050e9c9fb5bff5352d5dc32b4d94db7b4 SHA512 bed7eae5f902f13489241782d3d560b53a5a3258de492763b7b25783ca9417975afb9000f68f58be5c2057e1db50a569374ed0ff572140aa65e401e20e646461
-AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b9243f111c6c882c3480eb6396e347eac91670e3a67d7f122953d6fa82ec61a6467163b788b31858 SHA512 7a167b389723e5f55fea6956e5546e46c89ebf3e2d1c25f6b56c357e6d3ffc765226549d78cdeb79b4dc90c798ec6326a13996215b40eb49179376e32c3c3287
-DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
-DIST zfs-0.8.3.tar.gz 8779385 BLAKE2B 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 SHA512 aded632e6b04180560d4f2ff283260016e883dadae4e7fda9070b7113dee948099cb7a7b183f1c8139654389a2610fb9cc6f997acdc846040e605125cf016010
 DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
-EBUILD zfs-0.7.13-r1.ebuild 6276 BLAKE2B b2aafe81b97e72249710bbed0282afe8e03aaf5029236d5b12d3089ef58458b9615f1f60f89b1473097321b8182704a5ba2964fb94b86f03a20d269029351264 SHA512 3547d9918e2b082299dbbaf39310ecaa780f44c2c7ece907b6149b3cff98ce68fc73846c303d579112453aaa6763bd029ccd24ab330c1578432a44da73a0d816
-EBUILD zfs-0.7.13-r2.ebuild 6340 BLAKE2B a351568c54fecd31574471e164f41e1909fe6096ac68211664ef6a90435c59c4189a5ed9a1356867a81941a17874c8580b6a27ec0caef49976afdda655bb8571 SHA512 4a17ca33411e286f19ae8d4c6eaee42cad9a2db024a83b6355f0f33db0fcbd83ca138f3e4b88a2b14cc3fded942edf4bd22f4588afc6082e608e02ced2d59b10
-EBUILD zfs-0.8.3-r1.ebuild 5631 BLAKE2B bddee093199db937dfb3803c959fcad9d7a582bdd662f73c03653a9a1024f72dc117204cf13939e130cc4c0580db7b5266b03f4561e96c2caed2cf349bfa766c SHA512 ec01abfbe7ca3661dcfe6b9acb7a7d6cce59bd81f9a8d14175cf196ee523c6f2dea315d6b4f22c77d4322f663b9087b4e5dac9ba52105e69447dba4dffc2eebb
-EBUILD zfs-0.8.4-r1.ebuild 5197 BLAKE2B a26eda5c79de67dfb2b7873de472c976e5e2983972aaee347a2b39ed85239bf42b7125108c0d0452cba2f02330d5f2c7ff729b2c512a9f437c5ce4d5a1fc558e SHA512 579dbe8d0cc66cbb63a2641a10779aeb00a47be24955037767608c303b5223e4ba5cabeba7b5b567d258affa99c4e52c14542f779d33e187759a6937a4a2564f
+EBUILD zfs-0.8.4-r1.ebuild 5195 BLAKE2B 501f1ba692e13c7c9b73017626687ef129e0db61a6492b326327dcc07a2f9ebccb426359531e004bb17c4d99c12105e93fd84c5f83494a58e5351a16f2ab76ca SHA512 57e3acbbffab3e38e5d3522f868ad8d32985a3983a449c7c0552e71b92f0dbd46c18e91ebbf3002b96212b68308cbbbc0b90b742eda3d8733844160606cd38dc
 EBUILD zfs-9999.ebuild 5156 BLAKE2B 9dbb83c08b6bc0338303d6572a152f423a4de615c664c268991341f4ec4b7112cc5839c504de9f105404055415a9d5574271593673dfcf6838d1d9722865c668 SHA512 b99a1a80d4a5677d2e2624475f7694f1f2467643574fdaed8af0e4f929103ecba3cb6865c6fdae55c8b6c8e75027f0af88e8a142525448158ad518d50bb9d055
 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/files/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch b/sys-fs/zfs/files/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch
deleted file mode 100644
index 922e5951bdf0..000000000000
--- a/sys-fs/zfs/files/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From a0767672aac01f41516550e3808ff72da893102f Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Tue, 26 Nov 2019 12:07:36 -0800
-Subject: [PATCH] backport udev timeout patch
-
-https://github.com/zfsonlinux/zfs/commit/803884217f9b9b5fb235d7c5e78a809d271f6387
----
- lib/libzfs/libzfs_import.c | 11 ++++++++++-
- man/man8/zpool.8           |  6 ++++++
- 2 files changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/lib/libzfs/libzfs_import.c b/lib/libzfs/libzfs_import.c
-index 9dbf207..cd08806 100644
---- a/lib/libzfs/libzfs_import.c
-+++ b/lib/libzfs/libzfs_import.c
-@@ -53,6 +53,7 @@
- #endif
- #include <stddef.h>
- #include <stdlib.h>
-+#include <stdio.h>
- #include <string.h>
- #include <sys/stat.h>
- #include <unistd.h>
-@@ -1594,17 +1595,25 @@ zpool_open_func(void *arg)
- 	if (rn->rn_labelpaths) {
- 		char *path = NULL;
- 		char *devid = NULL;
-+		char *env = NULL;
- 		rdsk_node_t *slice;
- 		avl_index_t where;
-+		int timeout;
- 		int error;
- 
- 		if (label_paths(rn->rn_hdl, rn->rn_config, &path, &devid))
- 			return;
- 
-+		env = getenv("ZPOOL_IMPORT_UDEV_TIMEOUT_MS");
-+		if ((env == NULL) || sscanf(env, "%d", &timeout) != 1 ||
-+		    timeout < 0) {
-+			timeout = DISK_LABEL_WAIT;
-+		}
-+
- 		/*
- 		 * Allow devlinks to stabilize so all paths are available.
- 		 */
--		zpool_label_disk_wait(rn->rn_name, DISK_LABEL_WAIT);
-+		zpool_label_disk_wait(rn->rn_name, timeout);
- 
- 		if (path != NULL) {
- 			slice = zfs_alloc(hdl, sizeof (rdsk_node_t));
-diff --git a/man/man8/zpool.8 b/man/man8/zpool.8
-index 46e531e..10a19b5 100644
---- a/man/man8/zpool.8
-+++ b/man/man8/zpool.8
-@@ -2291,6 +2291,12 @@ Similar to the
- option in
- .Nm zpool import .
- .El
-+.Bl -tag -width "ZPOOL_IMPORT_UDEV_TIMEOUT_MS"
-+.It Ev ZPOOL_IMPORT_UDEV_TIMEOUT_MS
-+The maximum time in milliseconds that
-+.Nm zpool import
-+will wait for an expected device to be available.
-+.El
- .Bl -tag -width "ZPOOL_VDEV_NAME_GUID"
- .It Ev ZPOOL_VDEV_NAME_GUID
- Cause
--- 
-2.24.0
-
diff --git a/sys-fs/zfs/files/0.8.3-fno-common.patch b/sys-fs/zfs/files/0.8.3-fno-common.patch
deleted file mode 100644
index 3b09d8bbc597..000000000000
--- a/sys-fs/zfs/files/0.8.3-fno-common.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From af09c050e95bebbaeca52156218f3f91e8c9951a Mon Sep 17 00:00:00 2001
-From: Romain Dolbeau <romain.dolbeau@european-processor-initiative.eu>
-Date: Thu, 6 Feb 2020 18:25:29 +0100
-Subject: [PATCH] Fix static data to link with -fno-common
-
--fno-common is the new default in GCC 10, replacing -fcommon in
-GCC <= 9, so static data must only be allocated once.
-
-Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
-Signed-off-by: Romain Dolbeau <romain.dolbeau@european-processor-initiative.eu>
-Closes #9943
----
- cmd/zfs/zfs_util.h     | 2 +-
- cmd/zpool/zpool_main.c | 2 ++
- cmd/zpool/zpool_util.h | 2 +-
- lib/libshare/smb.c     | 2 ++
- lib/libshare/smb.h     | 2 +-
- 5 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/cmd/zfs/zfs_util.h b/cmd/zfs/zfs_util.h
-index 3ddff9e22d7..a56af59adb1 100644
---- a/cmd/zfs/zfs_util.h
-+++ b/cmd/zfs/zfs_util.h
-@@ -33,7 +33,7 @@ extern "C" {
- 
- void * safe_malloc(size_t size);
- void nomem(void);
--libzfs_handle_t *g_zfs;
-+extern libzfs_handle_t *g_zfs;
- 
- #ifdef	__cplusplus
- }
-diff --git a/cmd/zpool/zpool_main.c b/cmd/zpool/zpool_main.c
-index ae5e8a370fc..ff4f44d4652 100644
---- a/cmd/zpool/zpool_main.c
-+++ b/cmd/zpool/zpool_main.c
-@@ -76,6 +76,8 @@
- 
- #include "statcommon.h"
- 
-+libzfs_handle_t *g_zfs;
-+
- static int zpool_do_create(int, char **);
- static int zpool_do_destroy(int, char **);
- 
-diff --git a/cmd/zpool/zpool_util.h b/cmd/zpool/zpool_util.h
-index ce760df723c..1f23f61aaa4 100644
---- a/cmd/zpool/zpool_util.h
-+++ b/cmd/zpool/zpool_util.h
-@@ -79,7 +79,7 @@ void pool_list_free(zpool_list_t *);
- int pool_list_count(zpool_list_t *);
- void pool_list_remove(zpool_list_t *, zpool_handle_t *);
- 
--libzfs_handle_t *g_zfs;
-+extern libzfs_handle_t *g_zfs;
- 
- 
- typedef	struct vdev_cmd_data
-diff --git a/lib/libshare/smb.c b/lib/libshare/smb.c
-index a95607ee032..f567f7c49d7 100644
---- a/lib/libshare/smb.c
-+++ b/lib/libshare/smb.c
-@@ -65,6 +65,8 @@ static boolean_t smb_available(void);
- 
- static sa_fstype_t *smb_fstype;
- 
-+smb_share_t *smb_shares;
-+
- /*
-  * Retrieve the list of SMB shares.
-  */
-diff --git a/lib/libshare/smb.h b/lib/libshare/smb.h
-index 7a0c0fd162d..8ea44677f9a 100644
---- a/lib/libshare/smb.h
-+++ b/lib/libshare/smb.h
-@@ -44,6 +44,6 @@ typedef struct smb_share_s {
- 	struct smb_share_s *next;
- } smb_share_t;
- 
--smb_share_t *smb_shares;
-+extern smb_share_t *smb_shares;
- 
- void libshare_smb_init(void);
diff --git a/sys-fs/zfs/files/0.8.3-zfs-functions.patch b/sys-fs/zfs/files/0.8.3-zfs-functions.patch
deleted file mode 100644
index 9cce3e1c1a7d..000000000000
--- a/sys-fs/zfs/files/0.8.3-zfs-functions.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 00478e1b5141f8b6ceaf14c173382d1aa11878b9 Mon Sep 17 00:00:00 2001
-From: Tony Hutter <hutter2@llnl.gov>
-Date: Thu, 6 Feb 2020 09:28:20 -0800
-Subject: [PATCH] Fix zfs-functions packaging bug
-
-This fixes a bug where the generated zfs-functions was being included along
-with original zfs-functions.in in the make dist tarball.  This caused an
-unfortunate series of events during build/packaging that resulted in the
-RPM-installed /etc/zfs/zfs-functions listing the paths as:
-
-ZFS="/usr/local/sbin/zfs"
-ZED="/usr/local/sbin/zed"
-ZPOOL="/usr/local/sbin/zpool"
-
-When they should have been:
-
-ZFS="/sbin/zfs"
-ZED="/sbin/zed"
-ZPOOL="/sbin/zpool"
-
-This affects init.d (non-systemd) distros like CentOS 6.
-
-Fixes: #9443
-
-Signed-off-by: Tony Hutter <hutter2@llnl.gov>
----
- contrib/initramfs/Makefile.am | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/contrib/initramfs/Makefile.am b/contrib/initramfs/Makefile.am
-index 52bdeb2afe5..4e52e8ea5e9 100644
---- a/contrib/initramfs/Makefile.am
-+++ b/contrib/initramfs/Makefile.am
-@@ -6,15 +6,12 @@ initrd_SCRIPTS = \
- SUBDIRS = hooks scripts
- 
- EXTRA_DIST = \
--	$(top_srcdir)/etc/init.d/zfs \
--	$(top_srcdir)/etc/init.d/zfs-functions \
-+	$(top_srcdir)/etc/init.d/zfs.in \
-+	$(top_srcdir)/etc/init.d/zfs-functions.in \
- 	$(top_srcdir)/contrib/initramfs/conf.d/zfs \
- 	$(top_srcdir)/contrib/initramfs/conf-hooks.d/zfs \
- 	$(top_srcdir)/contrib/initramfs/README.initramfs.markdown
- 
--$(top_srcdir)/etc/init.d/zfs $(top_srcdir)/etc/init.d/zfs-functions:
--	$(MAKE) -C $(top_srcdir)/etc/init.d zfs zfs-functions
--
- install-initrdSCRIPTS: $(EXTRA_DIST)
- 	for d in conf.d conf-hooks.d scripts/local-top; do \
- 		$(MKDIR_P) $(DESTDIR)$(initrddir)/$$d; \
diff --git a/sys-fs/zfs/files/zfs-init.sh.in b/sys-fs/zfs/files/zfs-init.sh.in
deleted file mode 100644
index ed84585cd5f6..000000000000
--- a/sys-fs/zfs/files/zfs-init.sh.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-ZFS="@sbindir@/zfs"
-ZPOOL="@sbindir@/zpool"
-ZPOOL_CACHE="@sysconfdir@/zfs/zpool.cache"
-
-if [ -f "${ZPOOL_CACHE}" ]; then
-    "${ZPOOL}" import -c "${ZPOOL_CACHE}" -aN 2>/dev/null
-    if [ "${?}" != "0" ]; then
-        echo "Failed to import not-yet imported pools." >&2
-    fi
-fi
-
-echo "Mounting ZFS filesystems"
-"${ZFS}" mount -a
-if [ "${?}" != "0" ]; then
-    echo "Failed to mount ZFS filesystems." >&2
-    exit 1
-fi
-
-echo "Exporting ZFS filesystems"
-"${ZFS}" share -a
-if [ "${?}" != "0" ]; then
-    echo "Failed to export ZFS filesystems." >&2
-    exit 1
-fi
-
-exit 0
-
diff --git a/sys-fs/zfs/files/zfs.service.in b/sys-fs/zfs/files/zfs.service.in
deleted file mode 100644
index ae2eff170a72..000000000000
--- a/sys-fs/zfs/files/zfs.service.in
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=ZFS filesystems setup
-Before=network.target
-After=systemd-udev-settle.target local-fs.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStartPre=-/sbin/modprobe zfs
-ExecStartPre=/usr/bin/test -c /dev/zfs
-ExecStart=/usr/libexec/zfs-init.sh
-ExecStop=@sbindir@/zfs umount -a
-
-[Install]
-WantedBy=multi-user.target
-
diff --git a/sys-fs/zfs/zfs-0.7.13-r1.ebuild b/sys-fs/zfs/zfs-0.7.13-r1.ebuild
deleted file mode 100644
index e7978fd5d927..000000000000
--- a/sys-fs/zfs/zfs-0.7.13-r1.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python3_6 )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-single-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="custom-cflags debug kernel-builtin +rootfs systemd test-suite static-libs"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	net-libs/libtirpc
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	!=sys-apps/grep-2.13*
-	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
-	!sys-fs/zfs-fuse
-	!prefix? ( virtual/udev )
-	test-suite? (
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-		virtual/modutils
-		)
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-boot/grub-2.00-r2:2
-		!<sys-kernel/genkernel-3.5.1.1
-		!<sys-kernel/genkernel-next-67
-		!<sys-kernel/bliss-initramfs-7.1.0
-		!<sys-kernel/dracut-044-r1
-		)
-	sys-fs/udev-init-scripts
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	# 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
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		$(use_enable debug)
-		$(use_enable systemd)
-	)
-	autotools-utils_src_configure
-
-	# prepare systemd unit and helper script
-	cat "${FILESDIR}/zfs.service.in" | \
-		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
-			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
-		> "${T}/zfs.service" || die
-	cat "${FILESDIR}/zfs-init.sh.in" | \
-		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
-			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
-		> "${T}/zfs-init.sh" || die
-}
-
-src_install() {
-	autotools-utils_src_install
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	exeinto /usr/libexec
-	doexe "${T}/zfs-init.sh"
-	systemd_dounit "${T}/zfs.service"
-
-	# enforce selected python implementation
-	python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
-	then
-		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
-		rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
-	fi
-
-	systemd_reenable zfs-zed.service
-	systemd_reenable zfs-import-cache.service
-	systemd_reenable zfs-import-scan.service
-	systemd_reenable zfs-mount.service
-	systemd_reenable zfs-share.service
-	systemd_reenable zfs-import.target
-	systemd_reenable zfs.target
-	systemd_reenable zfs.service
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-0.7.13-r2.ebuild b/sys-fs/zfs/zfs-0.7.13-r2.ebuild
deleted file mode 100644
index 2362e5ccec08..000000000000
--- a/sys-fs/zfs/zfs-0.7.13-r2.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python3_6 )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS=""
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-single-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="custom-cflags debug kernel-builtin +rootfs systemd test-suite static-libs"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	net-libs/libtirpc
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
-	${PYTHON_DEPS}
-	!=sys-apps/grep-2.13*
-	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
-	!sys-fs/zfs-fuse
-	!prefix? ( virtual/udev )
-	test-suite? (
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-		virtual/modutils
-		)
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-boot/grub-2.00-r2:2
-		!<sys-kernel/genkernel-3.5.1.1
-		!<sys-kernel/genkernel-next-67
-		!<sys-kernel/bliss-initramfs-7.1.0
-		!<sys-kernel/dracut-044-r1
-		)
-	sys-fs/udev-init-scripts
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-PATCHES=( "${FILESDIR}/0.7.13-ZPOOL_IMPORT_UDEV_TIMEOUT_MS.patch" )
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	# 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
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		$(use_enable debug)
-		$(use_enable systemd)
-	)
-	autotools-utils_src_configure
-
-	# prepare systemd unit and helper script
-	cat "${FILESDIR}/zfs.service.in" | \
-		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
-			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
-		> "${T}/zfs.service" || die
-	cat "${FILESDIR}/zfs-init.sh.in" | \
-		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
-			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
-		> "${T}/zfs-init.sh" || die
-}
-
-src_install() {
-	autotools-utils_src_install
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	exeinto /usr/libexec
-	doexe "${T}/zfs-init.sh"
-	systemd_dounit "${T}/zfs.service"
-
-	# enforce selected python implementation
-	python_fix_shebang "${ED}/bin"
-}
-
-pkg_postinst() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
-	then
-		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
-		rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
-	fi
-
-	systemd_reenable zfs-zed.service
-	systemd_reenable zfs-import-cache.service
-	systemd_reenable zfs-import-scan.service
-	systemd_reenable zfs-mount.service
-	systemd_reenable zfs-share.service
-	systemd_reenable zfs-import.target
-	systemd_reenable zfs.target
-	systemd_reenable zfs.service
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-0.8.3-r1.ebuild b/sys-fs/zfs/zfs-0.8.3-r1.ebuild
deleted file mode 100644
index 4837bd8086cf..000000000000
--- a/sys-fs/zfs/zfs-0.8.3-r1.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://zfsonlinux.org/"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3 linux-mod
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64"
-fi
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="custom-cflags debug kernel-builtin libressl python +rootfs test-suite static-libs"
-
-DEPEND="
-	${PYTHON_DEPS}
-	net-libs/libtirpc[static-libs?]
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
-	virtual/libudev[static-libs(-)?]
-	libressl? ( dev-libs/libressl:0=[static-libs?] )
-	!libressl? ( dev-libs/openssl:0=[static-libs?] )
-	python? (
-		virtual/python-cffi[${PYTHON_USEDEP}]
-	)
-"
-
-BDEPEND="virtual/awk
-	virtual/pkgconfig
-	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-"
-
-RDEPEND="${DEPEND}
-	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
-	!prefix? ( virtual/udev )
-	sys-fs/udev-init-scripts
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-kernel/genkernel-3.5.1.1
-	)
-	test-suite? (
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-		virtual/modutils
-	)
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}/bash-completion-sudo.patch"
-	"${FILESDIR}/${PV}-fno-common.patch"
-	"${FILESDIR}/${PV}-zfs-functions.patch"
-)
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [X] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == "9999" ]]; then
-		eautoreconf
-	else
-		# Set revision number
-		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
-	fi
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_prepare
-		popd >/dev/null || die
-	fi
-
-	# prevent errors showing up on zfs-mount stop, #647688
-	# openrc will unmount all filesystems anyway.
-	sed -i "/^ZFS_UNMOUNT=/ s/yes/no/" etc/init.d/zfs.in || die
-
-	# needed to get files regenerated
-	# https://github.com/zfsonlinux/zfs/issues/9443
-	rm -v etc/init.d/zfs{,-functions} || die
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	python_setup
-
-	local myconf=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--enable-systemd
-		--enable-sysvinit
-		--localstatedir="${EPREFIX}/var"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-python="${EPYTHON}"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		$(use_enable debug)
-		$(use_enable python pyzfs)
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_compile
-		popd >/dev/null || die
-	fi
-}
-
-src_install() {
-	default
-
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-
-	use test-suite || rm -rf "${ED}/usr/share/zfs"
-
-	if ! use static-libs; then
-		find "${ED}/" -name '*.la' -delete || die
-	fi
-
-	dobashcomp contrib/bash_completion.d/zfs
-	bashcomp_alias zfs zpool
-
-	# strip executable bit from conf.d file
-	fperms 0644 /etc/conf.d/zfs
-
-	if use python; then
-		pushd contrib/pyzfs >/dev/null || die
-		distutils-r1_src_install
-		popd >/dev/null || die
-	fi
-
-	# enforce best available python implementation
-	python_fix_shebang "${ED}/bin"
-
-}
-
-pkg_postinst() {
-	if use rootfs; then
-		if ! has_version sys-kernel/genkernel && ! has_version sys-kernel/dracut; then
-			elog "root on zfs requires initramfs to boot"
-			elog "the following packages known to provide one and tested on regular basis:"
-			elog "  sys-kernel/dracut"
-			elog "  sys-kernel/genkernel"
-		fi
-
-		if has_version "<=sys-kernel/genkernel-3.5.3.3"; then
-			einfo "genkernel version 3.5.3.3 and earlier does NOT support"
-			einfo " unlocking pools with native zfs encryption enabled at boot"
-			einfo " use dracut or >=genkernel-4 if you requre this functionality"
-		fi
-	fi
-
-	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
-		einfo "You should add zfs-import to the boot runlevel."
-	[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
-		einfo "You should add zfs-mount to the boot runlevel."
-	[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
-		einfo "You should add zfs-share to the default runlevel."
-	[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
-		einfo "You should add zfs-zed to the default runlevel."
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-0.8.4-r1.ebuild b/sys-fs/zfs/zfs-0.8.4-r1.ebuild
index 5f7c23109c09..0f8aa28b0338 100644
--- a/sys-fs/zfs/zfs-0.8.4-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.8.4-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
 	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64"
+	KEYWORDS="amd64 ~arm64 ~ppc64"
 fi
 
 LICENSE="BSD-2 CDDL MIT"
@@ -68,7 +68,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RESTRICT="test"
 
-PATCHES=( 
+PATCHES=(
 	"${FILESDIR}/bash-completion-sudo.patch"
 	"${FILESDIR}/${PV}-initconfdir.patch"
 )
author	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-06-13 10:39:22 +0100
commit	9452a6e87b6c2c70513bc47a2470bf9f1168920e (patch)
tree	8ac67e26b45f34d71c5aab3621813b100a0d5f00 /sys-fs
parent	f516638b7fe9592837389826a6152a7e1b251c54 (diff)