gentoo resync : 20.10.2021

17 files changed, 71 insertions, 317 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5384b477f059..5e0b850f7677 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 83916a48fec4..060767a998ce 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,10 +1,8 @@
 DIST btrfs-progs-v5.10.1.tar.xz 2204164 BLAKE2B ed83729754f9abd22d4d2e7ae9a7e90e80be9b63d49a4a9692e20e5939467dbd864834b71495661e1c7a1fca89e253a62fbda37f1d01d2eadecb13f5904f0dd0 SHA512 32e5b8bda1863e34613802db91946f240b2cde21288ff8f95c1807e7afd0a67c5a704aa4d2bc0d7b1ca094de6831adbfec83fe61f74e1caf6d1975be7d972f2d
-DIST btrfs-progs-v5.13.1.tar.xz 2237108 BLAKE2B 6de5d70d1b3611dc7c502530c08f9b58da798b33a97a415a787c5ed55b3369432f362c4d61636b6c85d952bf4482125a2d59397214ac543cf7160de28fe20a0b SHA512 4ef8256da59614d17316db9c19909a2aa4f0557504201e421332c63a4935dbd6578791484b9f3f2dbeaaa28f6f4b4fd59c5a7adf6853fd76546ac213a0f09823
 DIST btrfs-progs-v5.14.1.tar.xz 2247384 BLAKE2B 70eb5f1f3f4b7acc2d4f662c0484984903a09c03bd4d3bd6e15ac712318c3ee9a3621e682f1d33a8b2b25280a63801e1a71d574c55dbd28e205e7fb4b549af47 SHA512 d706322b3c82825ab0eedc952a5e68642483539af5f3bf84d751ffed09d5e997f188370734145c7eb8b109be5bf6d77a2e3731521b3e34d46e1a454eef6bfb56
-DIST btrfs-progs-v5.14.tar.xz 2246876 BLAKE2B 0b0b9a8b131c7a80951695bd8e606e07f89834b60e5af1478b9a02474b9c4e77cd7d628e8cb1be32051d25bd8539e15c48f8b15b3500f6490daca87cd36555b6 SHA512 153dc24e24cb68e2522bad94873de4e24b106fe160fbea924e132728a908219f22baacbdd224a4d1f93179ebcb265bfef6ae7e92e486f538cd40ecdc46b98efd
+DIST btrfs-progs-v5.14.2.tar.xz 2252600 BLAKE2B 74ac21bc9bbc70a4034b6a439afbd0c0ab023ac7815c1cae1e7ac81c4239684d41be06bebe1d015dc2a0ba80cf0975e8f6da7e111b2825eb1a7814d1832914eb SHA512 dc1a73e49dd94ccd8128c197d99f112977b16350d22bc0ca32247211314a3fec66de73827305bf24ef8e0571fc890f00378d0ec3a82988f0ee54f5db10f6578c
 EBUILD btrfs-progs-5.10.1-r1.ebuild 2981 BLAKE2B 0c1e13d87b5119c171447e3eebc0fe9439da77a7d05ae0b1130eb8904c24081716e6f15dcb39f700abbe68a0431331c78c18a9253cb631998e61a842bbbe9791 SHA512 715d72ae20791fa701e3116ae7540be89c6761cbee1b42589881482e3abab6d5f9621fcba2b22166ac858466fe821b1af32284a0eea0a25ec8d9b3f63518a7c7
-EBUILD btrfs-progs-5.13.1-r1.ebuild 3015 BLAKE2B 4d1c0c35fe2e0d159db0a286805258ec4db568b39ea0bab81b3459bd87538c0d9b2ce5b4966d7cb64548d25e86ab0a42d6a96818439ed26dfbd6a904fc52ea1d SHA512 8109626768b1622658657eeb054decb92e1f2474623c3b4eae249d94712f61831d7f4a8207f824eae08bd6a4ad776e411c39c9896a359467ec53d07c5b5df03b
-EBUILD btrfs-progs-5.14-r1.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374
 EBUILD btrfs-progs-5.14.1.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374
+EBUILD btrfs-progs-5.14.2.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374
 EBUILD btrfs-progs-9999.ebuild 3020 BLAKE2B cc9ea2671ef95528d17529556c6ae00cda5d2386c35c93e1bd07909775393dd208df0b28269935fdab8d049611dcb3b1ec4e1561346058e94166703cdf8f0a84 SHA512 c063048685057d687f99516f770789a3919e6354d7279999ffab70c05511b08ab632f888ed4a9b1d7870acd2a8bdccda9b9e4e1abec0b3c83fda3d8578eda374
 MISC metadata.xml 524 BLAKE2B 4e27833128aeb064271af7a4f3c05699b4603b1d993b32bef3d9d973182d3d0c88ac799c95f0f35495e9a99e645627afd96049273c08c3e1334d8fe1ccf0debe SHA512 471014a98bc3feb75e7930485e89daf6cb3390c37a330b8373d5c3b0b764b9180cbff133839ce4742a3c76f63e6f18895060d5906e6a113d2cd43af0df3b0d5a
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.13.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.13.1-r1.ebuild
deleted file mode 100644
index 7180e0d1cd55..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.13.1-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert doc python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	>=sys-kernel/linux-headers-5.10
-	convert? ( sys-apps/acl )
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_USEDEP}]
-		')
-	)
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-BDEPEND="
-	doc? (
-		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
-		app-text/docbook-xml-dtd:4.5
-		app-text/xmlto
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable doc documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-
-	# install prebuilt subset of manuals
-	use doc || doman Documentation/*.[58]
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.14-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.14.2.ebuild
index 36548f98db8a..36548f98db8a 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.14-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.14.2.ebuild
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index e089fd953067..2f4d8beaa176 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -2,8 +2,6 @@ AUX cryfs-0.10.2-install-targets.patch 1337 BLAKE2B e2e1e4157a41ebe26ae459e0d680
 AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c
 AUX cryfs-0.10.3-fix-build-with-boost-1-77.patch 639 BLAKE2B c03de4feed91e4182bcc9e68c294b15bf5715f06e38e21ced9e27a0bb96f9cb4546ec2eca5b0ae106724e797cbe0f734fb311bd13361248043f590e5a2c61c8f SHA512 e67f0dd1c0b08c062db75ff354124cc2f346efd0141439af78c9ade1019937af91ccd5c5c06ade89889d9b2a9ac5d01afbcec33a22ec454120918329a9ee60e2
 AUX cryfs-0.10.3-gcc11.patch 14590 BLAKE2B c6541d1e211c9ae503ee83be18dd2283f2ac5785f5a975fcd155b02759f6180eb96b8673d98c71e20c101ac4afa4ceaab4c6ece14c6605e32f5c020f260568bc SHA512 4fa2817c9f10df4e371deb7fb4acc423dd8260277216cf959ace47d64bebe394db71c79cd72098c6b11ac27b88d98eab8b5cde5af5095a63d57dc88d7dea7085
-DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f
 DIST cryfs-0.10.3.tar.xz 7908228 BLAKE2B e1c816bd2ceb125573f5385c6ddb316a600275f0b907d89d3ab32f2050f1a0874ebbfd3db7b452b41d20dcbdd01bf59210a0a96c5bfee079ce222307d4c55596 SHA512 a1325c79cb253219bb092fd68399d6ec68aaf3d78bc95608582ab0c239dfaa0361416531cd1051661e4699b1e79867547710ea55d23e5697ebd4421c937d5b87
-EBUILD cryfs-0.10.2-r1.ebuild 2180 BLAKE2B bf826cc26d0ec5aeace2d411744192891aa3b14f6ae18e76d183b247b34eabf7809f9f7b9238ba2d705761fec12bffa1ef069657b2672145485e2f5f55a4216a SHA512 778e1d7bc641f0ba5bd428098c72b0079ad7db796394816e1d35e7db639fb661be9b90e8cdd6fd58855fcbc5634afb465b8c1b4e7c018d33eb60cf64980f0b4e
-EBUILD cryfs-0.10.3-r1.ebuild 2321 BLAKE2B 12262873ce9b8ea55bcb1158472a7efa302a29cc0f180747aef103d2f98bbf544e47acf3ca59cd4cf47aea8a3610eeb6a185e7b2700ad4c65e62bbf35b43bdc0 SHA512 9a4c9bf496d995f48fa63dcc86b9ebc0f410788eb1375712352c0b9e8bd667683c2987d5f430af404220564e0dd986f125d43083259470732f7a21664521c7c3
+EBUILD cryfs-0.10.3-r1.ebuild 2320 BLAKE2B 503a13941bd1fabc274921702634bd575d08615a3a9749921f068bc12d03afc6ef66f15515f2807a80d6a2544fef79f3bb69532ecf1422d894833844e8a4e95a SHA512 30cbb54d4a7f1323d8330937e81149e6e0e9c0f8b7b46c8e8688b51427dd40192830e0dd252c77ace2b196a9739ed2cb610dab85acbf6d39c9eaa5688880e097
 MISC metadata.xml 416 BLAKE2B b741d80131fbeac4c8659847bc206aad10c2ade82bb63bf1233542b0d9d6a2a0d3aee2b09aad9d7ef0f5dfb0ef1f9d065ae51c0884ef9a89479fcb99df912650 SHA512 4d38d4f4d0f5870d4cf6b1f86fbafe7327b6b799c8fe32d37fcd00d47b3d02f39f4725aa1bd205d2e141fa287427fb1a8f47206c25d2b8973135b6cd44735395
diff --git a/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild
deleted file mode 100644
index 5f06da1a12ff..000000000000
--- a/sys-fs/cryfs/cryfs-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-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 ~ppc64 x86"
-	S="${WORKDIR}"
-fi
-
-DESCRIPTION="Encrypted FUSE filesystem that conceals metadata"
-HOMEPAGE="https://www.cryfs.org/"
-
-LICENSE="LGPL-3 MIT"
-SLOT="0"
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-libs/boost-1.65.1:=
-	>=dev-libs/crypto++-8.2.0:=
-	net-misc/curl:=
-	>=sys-fs/fuse-2.8.6:0
-	dev-libs/openssl:0=
-"
-DEPEND="${RDEPEND}
-	test? ( dev-cpp/gtest )
-"
-BDEPEND="${PYTHON_DEPS}"
-
-PATCHES=(
-	# TODO upstream:
-	"${FILESDIR}/${P}-unbundle-libs.patch"
-	"${FILESDIR}/${P}-install-targets.patch"
-)
-
-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
-		-DUSE_SYSTEM_LIBS=ON
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	use debug || append-flags -DNDEBUG
-
-	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() {
-	cmake_src_install
-	doman doc/man/cryfs.1
-}
diff --git a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
index e6d04c05f241..199c5a6badd1 100644
--- a/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.3-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
 else
 	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-fs/fuse-zip/Manifest b/sys-fs/fuse-zip/Manifest
index 225992704c7a..fc8fae985765 100644
--- a/sys-fs/fuse-zip/Manifest
+++ b/sys-fs/fuse-zip/Manifest
@@ -1,4 +1,4 @@
 AUX fuse-zip-0.4.5-makefile.patch 820 BLAKE2B cf6bbce2be6d9da05ab6974759b1fde5f05f0ab1f4fbda79dc0dd439409480a183d6e3c116dc488c9f8e098be47dfad7ea1adb1c4b0d07daef854c70d655763f SHA512 64eb06111deaa858558de068a331c0b086983390c13be39857b38a87e5d24ddb9efe652e4612a3cd50c45dc052dc2f147743c898a5933aa6828fc0810d47d9b6
 DIST fuse-zip-0.7.0.tar.gz 712853 BLAKE2B fd8bdaf30321bfbf897598de0291b1b285171b9b254e21acc1ca9f9d5af2b3a199dcb05696e92983a9b7491b4993b59defa53ec37d0a958d4fb80d2baf322194 SHA512 ea08bee4a7d0e7a0584237c6e9560d0fd2665bea59e87bc020697c3fc6bdc3c4c5c5d4dcdb454eed8cb735c176dd54d7c9bf879a04ac2d5b38bc271cc3128b69
 EBUILD fuse-zip-0.7.0.ebuild 691 BLAKE2B ee9f37d3ea5ba2c1f6dcb67dd4d770d1d10ba725675afaee4bb39c0404ea2da396b79f1583ca1c8b396cefd6aae62ba82a158997ca49c843a87cbd0dc1afacd9 SHA512 1b5eb8da3474e28d01cea7b3c988ac4497fd44bb1e1df8a032719cae011932de7468312787440a2ca9c7ce2d9365ce76658675396938f5d5d6d69659b1535255
-MISC metadata.xml 384 BLAKE2B f5b3d72dc934c938ea6e8a7fbe981987371107a519771e92ab9583155d388eb0398569461128ab1fca5542e72f55536b2364db548ec772464afd08fc467899b4 SHA512 8cff3c23a549d5117936f3845eac925b901538dacc92792726855d7ebecec2cf91b5607d0ceca3de0fc3921aa1f2bbf4e1e85a4f979950be001a6980786136e5
+MISC metadata.xml 306 BLAKE2B 6430b8d23ab5b4108fa9f2dbb1e2732c6c3d03c9b23d7daa0cfe25213f79f364573c95ad01ea93a842b44794c9d53dee320a4dc4b4c401fce0a65224643cdd9e SHA512 60016befbb6e1691bd1f1c8f471b3374e51d02aad68db4a83164f5850c2961903803b03c4553aa10a36524f155271323617976bb3815f36dd61266966395cc06
diff --git a/sys-fs/fuse-zip/metadata.xml b/sys-fs/fuse-zip/metadata.xml
index 11c7d000eb5c..8cde094293e5 100644
--- a/sys-fs/fuse-zip/metadata.xml
+++ b/sys-fs/fuse-zip/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>johu@gentoo.org</email>
-		<name>Johannes Huber</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="google-code">fuse-zip</remote-id>
 		<remote-id type="bitbucket">agalanin/fuse-zip</remote-id>
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index ead90bd8c3a7..edeed8cb1765 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,5 +1,3 @@
-DIST loop-AES-v3.7t.tar.bz2 377808 BLAKE2B 77a6baa31be9efc84504e6eaccca87193180b26ec6f6dc824480453e78905f8763c08fd72a63c18950796ad0b70ad8be2ed26e107cded6dcaddd96433dfa7f56 SHA512 cb0dcbfa7639f8d2c1990465a44cbcd6d4bf065b1df9178f4dd524a8b8ddd05ebb860e6a9d9425b4a22b9c74342bf3ff232ff777be9b5458bdabe54f4097ecef
 DIST loop-AES-v3.7v.tar.bz2 378465 BLAKE2B 01d9c3719242846696c1e199a02a42254c06472abce6cee7ccc3882e456921176f7469e9c61331193dd86ee2fcf0d24972f9012026eadad150a8e6116dd4e275 SHA512 62c0bafd97bc07d78d128ba3bbcf471bf16bd979264ad9180132b83f01a1e8d4f6d9aa874c602a00bc85360abfefe16f72b28b2c73cc2ad863ea2d36eb7bc478
-EBUILD loop-aes-3.7t.ebuild 1751 BLAKE2B 318ecaf349eb7ef78e506352c9a20c3ac5d77b7d8e95dbd14c5ea8e8d6000018fdc16ba10ad7806d51539167a5a42978465ca4693c8b9b0796139bee05aae57a SHA512 f0dbca7131097f5c9e58623991085a60bfaea2d6f70072da714485ede0f1b89b27dad78f322a8bd4e77d8b081ca95f347d7d8098a3c3735814f47aadf4aca94b
 EBUILD loop-aes-3.7v.ebuild 1528 BLAKE2B 9774785e6db9f11ad9191e3b4b761b05507b6f613de6d347a3a756aa5abc4d63b7db56826b6345bf836ca837fcb8bc4f81fde6555c027772d2434931e32672c0 SHA512 8edae2efb1686106bc3f4a625f9a7e0e5da5034e80019b37be5ea568eefcc289916aa81c919e7d64223efcec5e21172994aa9db557f3b3d2b675102ff443c58a
 MISC metadata.xml 648 BLAKE2B 283db8a905c756bf44779739a188d2555ff87bdf77ff46ef2d0d947661633a45a0b163a1ad3a7bcc00a50e6502e01886178245af2c73d86947adda24c948c37a SHA512 8fa7faf71248ce5dc0c217869a2109ea3275c84de1b5f4b898fe97be5c0c4c91d38405699b41a8e591336993d52d69357becba2b2a7f15369dc5e0508c4788b4
diff --git a/sys-fs/loop-aes/loop-aes-3.7t.ebuild b/sys-fs/loop-aes/loop-aes-3.7t.ebuild
deleted file mode 100644
index 116820a36e69..000000000000
--- a/sys-fs/loop-aes/loop-aes-3.7t.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 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/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 2b8d7f2f0380..2864c92ed349 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -1,5 +1,5 @@
 DIST ntfs-3g_ntfsprogs-2017.3.23AR.5.tgz 1278315 BLAKE2B d4f84bf744b12fec7faff82bd3d3048282a3cbcde2ca75e5d3a295206585c4cee68e25dff5fb20b034f516a3f2cd95c489105d9df810f8a9378024ef065b67d3 SHA512 8534970ba9f07999c5ff433144ad3a59640fb9a28fb30b37b5d736101e19f9fec1c222152338be382c894f972fce2b2a83680b85a28cf147cb5500b40a0a25cc
 DIST ntfs-3g_ntfsprogs-2021.8.22.tgz 1317499 BLAKE2B 403036c68a37ba83873b5faadbb2088deb25e0ff31deb1958d4f869a198d830caa44edea879492a7894f5e7a5ad6205a6fda57bf8de722ce49bf3187239ad993 SHA512 e0544df78a6c352999e1206d7b5d71c56e39396b7a0936a261d728c2ac9d61c6b95ef297f8529ac2a5146f31c1c9e43066d3e281064d4f5d781a04eba51f536d
 EBUILD ntfs3g-2017.3.23.5-r1.ebuild 2063 BLAKE2B d70e46fe59628db9440f4d6516781fad6d9d10873f98b06364acd4c8afbc6b609f78fca688fbb1c4486ae6cd7a0089a6c3674b8555fec8af4360b6c7e4ac54b1 SHA512 fbf424b708a4e15fabdffb1046dd49854ed21335bf953fe39eb8993541178cfd3ffe482121d29c56b5dd5802c373d8aaaa70e0ae9dc6526f091baa886950bf36
-EBUILD ntfs3g-2021.8.22.ebuild 2101 BLAKE2B 5f4b74c7f0f149215ed69d120dc2b0bd556fde2646b4ff641a4a081826b7eb00198b999a2846cf8165cfba64e8ad28f40015938e2041b95a49a0b6a903d24306 SHA512 055b4a7aabe659361a52a6c469e195b4ef50bbfb784918e5629b270fd03e2d5f515e8a834d66e7d1c2248b9002dd5a6faaa2ad05651c70bcf3d1a32a3e9f2dba
+EBUILD ntfs3g-2021.8.22.ebuild 2096 BLAKE2B 70fde87b5c2f698b4671ae86f02dbd75552bcf7782de775d955b22f87ae4e58c44da9462802dba2e82327a0b3716a72bc098a84206e3856d397ea33ef2cf985c SHA512 22d0d2fe43e0359efc7c46fcc3853c8130feeb530776b6014a3bb948feb73e1f8452ce777719ca72623d3d16d517b54c4869513593ea4ad17f0356d673f48eac
 MISC metadata.xml 1072 BLAKE2B cbfb93f83a25bb707c6584f035d742513da2e423ec1f52fcebf25b6b34829bc429f7fbc38e2e3e76dd5ad2eca5f28d91072a0000ef83277bf84553aa6ff1e6b5 SHA512 2afcc34189ca0708f6d1cd15e9e249dc3ac0a150f4094c97a0d5745ca0b21f426676c3090df031cc8f234da38b2d13abb8ddf1583b9049d52ce2737833ee9314
diff --git a/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild b/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
index 7e4c2ed5669d..50d7f44b0230 100644
--- a/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2021.8.22.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/89"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 2d63cd04ae0a..383d0ede9d52 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -1,3 +1,5 @@
 DIST squashfs-tools-4.5.tar.gz 250471 BLAKE2B 2fc8ab9bb6565b97656afd63b76bfd7449d96b83697286e88b55a8cd82957b395df17a707ee93e8a99ed19dc5ba73966ce33530ef6c35797924dad4e3f16ed3b SHA512 e00610487d24eed9e5dadcf84014a3d7faa9815d8ce00fd4660e6c8ce394dccf185ed9f387f4fa1313b9812fe770f802bdcbaef87887f2bcefacf234594a72e0
+DIST squashfs-tools-4.5_p20210914.tar.gz 252104 BLAKE2B f3e2e281c30464b3c2e9b2a3520979f90ccb83665ac61a2f68513b402d8ef658621fc75c782c2f42da20ddf51f884e2ccc6217df941790fd45b41f3f4e3ec970 SHA512 a814092be787bbcbd4115f87493a63b67caa364ad88fe5a3c82808083343cbcbc22b4617bd5c72d65d8abe2b11eb77853bcc55c11f5cd5dc3edf24bd27cbd135
 EBUILD squashfs-tools-4.5.ebuild 1315 BLAKE2B 081cb5d1c7826695bdc7324c0e86ee3292db8a6b8ee50f7688d617961e6538b76f2b4b73f008f94acedc51f2245cfe1c0900d4c9e957a500dd75423330b157a6 SHA512 9f8eff369fb146a9f8fbaacdfa9c1d7c2a55b8efa528c2613d66787d6ad60e86ea367780739766a660855288b41ada5bfc7530bf734dcd37e5fff9f6b769ee4b
+EBUILD squashfs-tools-4.5_p20210914.ebuild 1508 BLAKE2B 91dda143b0d2f238472fcf299f25a062681209f9a9eafe524546229f51f6ccab0b6060afd56a49db0018bbfa018ff33f0e00444aedc259f659de723e797b90ca SHA512 f059411486b21b14e77b6e12804161c8e691f4ecb4b00c7faf6a9c04bd220d4ea713b99fe00acf2dbd717df943f004d797783cc5c40c152a6fa4a49fe069892f
 MISC metadata.xml 326 BLAKE2B b34f627cbc911d0e31c84e29ab196767d6618ae95909466efe663abdc54f76325b24e1d6a95ff5e7fa9d33f19b848dec1bfa95dc1b5f0b260839cf7337ce2c0f SHA512 354a34decfc9aa79c434275283e805423f2bcbbcb788e09236cd7b4e67a7bfbbc413e3874a45fe618f0e601036372e94c5965665483566cb651edea0728d5117
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild
new file mode 100644
index 000000000000..66c6618def05
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.5_p20210914.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit flag-o-matic toolchain-funcs
+
+MY_COMMIT="19fcc9365dcdb2c22d232d42d11012940df64b7c"
+MY_P=${P/_p/-git.}
+DESCRIPTION="tools to create and extract Squashfs filesystems"
+HOMEPAGE="https://github.com/plougher/squashfs-tools/"
+SRC_URI="https://github.com/plougher/squashfs-tools/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+S=${WORKDIR}/${PN}-${MY_COMMIT}
+
+#SRC_URI="
+#	https://github.com/plougher/squashfs-tools/archive/${PV/_p/-git.}.tar.gz
+#		-> ${MY_P}.tar.gz"
+#S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="debug lz4 lzma lzo xattr zstd"
+
+RDEPEND="
+	sys-libs/zlib
+	lz4? ( app-arch/lz4 )
+	lzma? ( app-arch/xz-utils )
+	lzo? ( dev-libs/lzo )
+	xattr? ( sys-apps/attr )
+	zstd? ( app-arch/zstd )
+"
+DEPEND=${RDEPEND}
+
+use10() { usex "${1}" 1 0; }
+
+src_configure() {
+	# set up make command line variables in EMAKE_SQUASHFS_CONF
+	EMAKE_SQUASHFS_CONF=(
+		LZMA_XZ_SUPPORT=$(use10 lzma)
+		LZO_SUPPORT=$(use10 lzo)
+		LZ4_SUPPORT=$(use10 lz4)
+		XATTR_SUPPORT=$(use10 xattr)
+		XZ_SUPPORT=$(use10 lzma)
+		ZSTD_SUPPORT=$(use10 zstd)
+	)
+
+	tc-export CC
+	use debug && append-cppflags -DSQUASHFS_TRACE
+}
+
+src_compile() {
+	emake "${EMAKE_SQUASHFS_CONF[@]}" -C squashfs-tools
+}
+
+src_install() {
+	dobin squashfs-tools/{mksquashfs,unsquashfs}
+	dodoc ACKNOWLEDGEMENTS CHANGES README*
+	dodoc -r RELEASE-READMEs
+}
diff --git a/sys-fs/xfsdump/Manifest b/sys-fs/xfsdump/Manifest
index 873e88e9b815..aece29c1e6f4 100644
--- a/sys-fs/xfsdump/Manifest
+++ b/sys-fs/xfsdump/Manifest
@@ -4,6 +4,6 @@ AUX xfsdump-3.1.9-no-symlink.patch 1027 BLAKE2B 35e0a308e9c368448305361e1632a229
 AUX xfsdump-3.1.9-prompt-overflow.patch 329 BLAKE2B 58bada935969c61fe9a161e810c6402642a87d0803076c89f1cecf5367037f96ff234d3231c49fa8b450810b21f60ac391bd631400e30738b9b11d3000158bd7 SHA512 dae03fd09ac45c8a974cf1818625cbb07c1bd7c88b28613f855d0a5878c1bf3bcb071c6f8ebd46627b83fd482ff4847a33f8a54f1de5be7595025df9f22d2fdf
 AUX xfsdump-3.1.9-skip-inventory-debian-subfolder.patch 468 BLAKE2B 81cf0af8cef61efa4dff6e230b71c0db65c3e7d93fd252035b6b5bf14afe28e65eccaef22bc3fc4419d196b0cca1428bc1697233efcc4f28aa138beaf3a5ccbf SHA512 c94af1c52c95a7617586b64a8936cdbfbd3a264c9580fabc3e1e7d3d5c37ca368b97f730baef2330e796ef7459561fa37b03280601aaa3b79eb2f90d9af5170d
 DIST xfsdump-3.1.9.tar.xz 600348 BLAKE2B 9e833acaacd3ad581b4f23731d7d613fcffa3d518f43638cddbc7da7015e582cb9415e00616e5e8586836831b6d5877fa83e8a5fd931fd454731bf2af7072095 SHA512 e8f9811d16fc06ab49fe2c109de0546c989575eca6e68b579c6d219a745f935952020069f58b357c5c87b944c5097ca2894466d328d09f06beb8a55880142351
-EBUILD xfsdump-3.1.9-r1.ebuild 1615 BLAKE2B cdec8971db53d7745a1ea77478b3ee266f48a5875f8921e19da04adde7f54a27471f8bcd745ff1801b9cca8f7264e560b30b9e4e388129e100fec0631141875d SHA512 24a8d2b84525bdca75217b903ec884693d7923c2f09a3e64e0d1e2ca465626e4ef883acc05bc5d2f31dd2305dbcab1982c6102b43d9e419f748f86fea9f8d5c1
+EBUILD xfsdump-3.1.9-r1.ebuild 1618 BLAKE2B 734ce5ddc985969de991b2c7394e93b59e9a02e32492df9b389b8be7e50b3961549980ab553837fa758c138f3456d983e112060b8c403718b78d5e14d68173a0 SHA512 4e718505da2fb99d33b1c7432a89aad2ce1662a3672aa982e31d0cbef8709876aff143a2a2fea22843d85bf9dc4f13ae76e4e5754b7c4bcb412929edbfce7425
 EBUILD xfsdump-3.1.9.ebuild 1627 BLAKE2B a0a8dc7e37a915700699b5db970c755a84fc679ffb327654bbb07592b297740a9fb945062442d439d026e15c82a56423ecfe61c02dea497e59af549e0aa7d83a SHA512 c4de8c287915cc9e6934b8fbafb9ae1ca44a9b8e5cfa81c09defbad9b60facb0fc0344dfc94b49dbceaf6a97e87529821a76e2465f5044c47a91b8d8929f59f7
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild b/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild
index aafb02db2752..9d68ac0a7cd4 100644
--- a/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild
+++ b/sys-fs/xfsdump/xfsdump-3.1.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 -sparc x86"
 IUSE="ncurses nls"
 
 RDEPEND="