gentoo resync : 10.11.2019

author: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2019-11-10 13:21:36 +0000
commit: 77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree: 5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /sys-fs
parent: bd4aeefe33e63f613512604e47bfca7b2187697d (diff)
39 files changed, 78 insertions, 1726 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index b2ff1cdc504e..26114ecb3842 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/arm-fdisk/Manifest b/sys-fs/arm-fdisk/Manifest
index 0b6199e071b9..920511844c3f 100644
--- a/sys-fs/arm-fdisk/Manifest
+++ b/sys-fs/arm-fdisk/Manifest
@@ -1,4 +1,4 @@
 DIST acorn-fdisk_3.0.6-6.2.diff.gz 5580 BLAKE2B d4c70c874cb60b02403edadd51a2547781f78efe7a09f3d776c1ce3a135a07f1c856e640f5cf0e2a1308ff80541f9a0c68cadfa44f10000bd81f576fc823ce2a SHA512 076587945548f10fef92a93910aee670927a2de9b1b32fd1b4ab72b1cfc26440177745f09b62f9b903987e3802060f4e278e1647ee12b7e2f29a0fd7b36ff188
 DIST arm-fdisk-3.0.6.tar.gz 62266 BLAKE2B e9554325562fd8fa03b896927fd9dca4cd61b86a4dd1a9d0bcc8aff638e0f0d1a9bca5c5b4bdf7bc9f1799f712497c8677af74f5204646bd505bc107818dfecf SHA512 954c1112c8108da676a0c4223de3a7b0320a37286b0ed099f3000bf4777ebb483b0b62eb0a5dd480f775c503020e7d9ed6ef737ef7bbc5bce858ae68aa471a3f
-EBUILD arm-fdisk-3.0.6-r1.ebuild 1009 BLAKE2B 9daf8c01c3914d99d242acca9385818d3e8c7b8315fe7d8a6654e217ef7f53fbf74abc548b5c48c839eeee2f181f104ddf580c6b6cd8053be8c10e4426cd7026 SHA512 fb14969b30e477a45516ab1aac866ac4caf3f6f6aeb8bc9cc3561c7ad9ba16c0486f74d0acafe429c9125d55a7eb5747027afe198c2260a4c80399f3da7d4a16
+EBUILD arm-fdisk-3.0.6-r1.ebuild 936 BLAKE2B 9694f015c849744d37c2090cf04c05db15d415a08c4ec7e4f6fd69d2e5b4e05a613dddcab41e27a0fdfef39ea9266d32b2971d5c427d167b9fed21587c5ae87a SHA512 85b7ad212cf738d0dd6d212ad3968fca59433f7b03263219d893159608e8647b174ea7df0b97242ebfedabd4c68d707d36fffecafbef89284c6a0da0ff3bd1cf
 MISC metadata.xml 255 BLAKE2B a9541f4bfab6e4a12975e8b3d56e433e65828b6376510448f11930d35451e23cad5bbf264180f150629ce9c1dea24eb7fb4f2b3f950ee5ff5d345811e017773a SHA512 4408b5018e974df4d7508f29e255f318bbd09b4056927cae6406ff1f427c06d5d655f677a28440cb84af04e411c88e4582f9ad1ea76829afeee0bbe4e3841c2f
diff --git a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
index 3a85f525491e..aaafaf93c51b 100644
--- a/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
+++ b/sys-fs/arm-fdisk/arm-fdisk-3.0.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DEB_VER=6.2
 DESCRIPTION="edit disk partitions on Acorn machines"
@@ -16,30 +16,26 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc s390 sh sparc x86"
 IUSE=""
 
-DEPEND=""
+src_prepare() {
+	default
+	eapply "${WORKDIR}"/acorn-fdisk_${PV}-${DEB_VER}.diff
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${WORKDIR}"/acorn-fdisk_${PV}-${DEB_VER}.diff
-
-	find "${S}" -name Makefile -print0 | xargs -0 \
-		sed -i \
+	find . -name Makefile -exec sed -i \
 		-e "s:-O2 -Wall\( -g\)\?::" \
 		-e "/^CFLAGS/s:=:+=:" \
 		-e "/^LDFLAGS/s:=:+=:" \
-		-e '/^STRIP/s:strip:true:'
+		-e '/^STRIP/s:strip:true:' {} + || die
 }
 
 src_compile() {
 	emake \
 		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" || die
+		AR="$(tc-getAR)"
 }
 
 src_install() {
 	into /
-	newsbin fdisk ${PN} || die "sbin failed"
+	newsbin fdisk ${PN}
 	dosym ${PN} /sbin/acorn-fdisk
 	dodoc ChangeLog README debian/changelog
 }
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index e68d5ebba7c9..12d2fc836704 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,27 +1,9 @@
 AUX btrfs-progs-4.19-be-bswap.patch 1035 BLAKE2B 153ffa73bf79eca3172bd566d7daffd84d52fcb01fd69ad30547ed44a2ce1eec23b6eb95bbcb0259a966a152f796f5c57f022b33cbf7063c4e53236e93c6b3aa SHA512 695d21bd1dab1196596e4f6e2d14020e0b0e938493459feec33ac21f9ab6ecddc5c14a79ba738166d6010662b4f6c75232c6d3393d8eb69c5d7c7d0560448051
-DIST btrfs-progs-v3.18.2.tar.xz 1029228 BLAKE2B be8b3e0151c939135bcac11cdd118b7cafdfefa9d06de4629a0727db781b42dfdfa447265d1b4dafce8711a65ac838b19c38a2a93c0439d92d5b8fb4b4d974f5 SHA512 7fd125eeedabd54178f5198ac09c364b6772125124adcdb2620515a51c331307205ae06ff81375a49ebc62650d537c6f9eed2b63bf1f7e97b9ff047cda8a2cc4
-DIST btrfs-progs-v4.1.2.tar.xz 1123080 BLAKE2B 4b6395080c1456321d6923609544da066bd86806588e5860bc2750162a257a94a64cd4e3fb1362065eaa38a73fdee92f053cd2a26c367fe179aa13f068e8b1d2 SHA512 dd159bcc3adb65efd4f612d75f5a6b30df8ad9fa06ef952dd03dac965256de37eab26f4cc2fb3840178403ccbb7368cae11638e27eadb9b1835b636c4b126e2e
-DIST btrfs-progs-v4.10.2.tar.xz 1508304 BLAKE2B d2540b27f4405d43ea60e0f6d31fae1794641d81db066ffab57a8f8cc9f6671c3bc01df5efc6309967e88af418e62eed61b7837863bc222bf371ce24b7d63cea SHA512 1a21ca29d03c8d0e697ce075b841e38b021771a67da20087c80ab84bb87c5f56ea80695f9b2a25a2a159fba8b01d74a364435f5462545ec00ebd6f335d3fcd6f
-DIST btrfs-progs-v4.14.1.tar.xz 1926492 BLAKE2B 35575946c1de9cb81f1aed2a5be2433149b6aae5e8602cef4c892f7e5fa1160e4b8bbed354bf36c90d3a6a4d6856b57cb10e632a9fba47b1f0b312098a6393da SHA512 e01a52a84bc0de81e7173fda46c12fbd451b5117014008033e16c7bf48165065c6362d812a95ade17c01f62f66755b4c7ab11dd22804eb3bdfc56346a161e2a6
-DIST btrfs-progs-v4.19.1.tar.xz 2007160 BLAKE2B fda89842f5117e77a00794054b1a11a7233d33c2135492b4a382cfdbcbbe58624447178cbeba7c44fabd5a5848fb4d47665dffbd838ff1b88432e1d98deb0666 SHA512 834b0a16216437301637d44561fd265db167b7084de7d43d36802907645627d955421c1f5c46f0eb72d85f8b8d70905e5f6c0d539a34693704aa188085dfeec4
 DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b098108f7363fc3c015d73bf9afcda9d579831fe0e324125893cdb2510873d052522b15843c461e640a546900e535ce76 SHA512 e5abf637a9c811973422ca05a5530f6cd18263013d141277e2a70099cf8ab7e0eb8781df56368da4321c90f21d1022ad852b661adc4877e9a9ba5c60ccbefdee
 DIST btrfs-progs-v4.4.1.tar.xz 1173248 BLAKE2B 8bf07a3bc3d24a3f641c2dc7a6353f186ebd98f7a633bdbc2689359e6204b3f1db76accee3e648634f319e26b57e6376c13fa31d39413908d0b2308e0ae28d0e SHA512 3086e2e0385d9e14edcfa25e1aee1ed98087dd5b91a66aa450786c932d79841b5c4ee3f9a40b8fdecee0ba1e386196b89679d28e58e4924ce66cd78c5e3c0d4a
-DIST btrfs-progs-v4.9.1.tar.xz 1476524 BLAKE2B 3fdd1c040fdf8083fcf5d4106db22112aaba59dd9a6ab8ad164302ec153a83151fbf88d84181dc849c296bb96ad883d4f7329bff111c67c19fdb814db5073fb2 SHA512 143f5c8863f3b9eff2e4ca2c750bb80ffe62f66d0c15d23e6f5bf75dab0133dcd3ff4d4c722360560de24b73e3da1222f265230d18de06d7bccd85ad2cb9a6a5
-DIST btrfs-progs-v5.1.1.tar.xz 2041940 BLAKE2B ca032cf17e78e5892788b677b5a0fead7cf1108fd464facb48e713b259c8c75f8b7714377f75e7b9e595c7c8fa5927fa37d11f43f51e4d898698f9fc5d26a808 SHA512 0f7582893e76d73ac7c0061dd43f65c465ca6308d3447a4e12f95397edcf3b74cc4dd3fad4a139739322650a0d228c4b2d43eb6eb9a09eb92f8fa2a5ef1519cd
-DIST btrfs-progs-v5.2.2.tar.xz 2073592 BLAKE2B 6c477ad2599a2f629b5d85a28dee7286af744e4d684ff9a0e9b5ae433b7b1450ac66caa41103781d159c172d8c6fdf26f4590d1476e457f09d7f52d6ea87e481 SHA512 97eaf3dd8ce1629f0acace23f3eedc7c6942299ddb65cdc3b0a7b623026db1063d72f3c1b6297782705e08dfc4c361384e17b5e27a16e756cd0a81e35e79aa9c
 DIST btrfs-progs-v5.3.1.tar.xz 2077644 BLAKE2B f2943fd2215cfc65095e361824deb862c1934bb734c0f3073d8d0a7cb40c606e9e8054e36ae467f6d67f3ed58120493b9515f6a1d0d1062f864dd44521d1bab1 SHA512 7e7ac18a1ced5a8e5db7c0651ac438a48242fb4ca045b944527ed07ac91e87397dbab62b99d67d782501a632f4178db605e81912dfa48ac831d07177f96876fa
-DIST btrfs-progs-v5.3.tar.xz 2076996 BLAKE2B 31bfb9b1fd12cc4607e565c58ea674050b89b4f5730da59254dc84e99ea1b8c40132be3025b7ac3e0b9a74db3ff9fc5b4d9afa2dce7604f2df7915114c0e37b0 SHA512 a1676a5f7d978bc32a5967de7be4b1010acf62350f44199a1595d50bfe83a79c790ed5cfa2b81656982c9ab7fc4a753786c909d59f9b0b068e772f1ffafe0bca
-EBUILD btrfs-progs-3.18.2.ebuild 1264 BLAKE2B 097f4c5717fb4824868811c82bae7a382a4fa7afe15eafe647945e5ba9e72a0157ab9d5bef694bd8836ef46396e79382ceac74c341b26b2a5cc957fef03a94f1 SHA512 152cd4da549f7b2af7fb90b4e06bfa52e1cc06f64a704e72e1172fd39b667fb6e083367901f857334590018845243ec56c4cd03a9886faa80fdc054f1586a148
-EBUILD btrfs-progs-4.1.2.ebuild 1891 BLAKE2B 6164d918d4452a4d91ee812a84fe7a2859fd303396ccacde0fa2dcd5fe7ed1e974bee47e9deece3b621e62d8176379d45b12c2ce6b52497d406425781cb35a3a SHA512 9f0771068eae7ec9bd54545d1f7d1146e9c1a221599dacb40c15106f73ea15bded433adc13dda8d2f7e302b2b4a989fd3a4442904ab222901eab70652e43d28c
-EBUILD btrfs-progs-4.10.2.ebuild 2195 BLAKE2B b2fc7318648463c6a9dd12fdca7f92fd4e6f03c85b84cc5e25f6f7ce8c471e8c2830cae58125145a794f42f17724edd82aaf0de71ad73db05b6e4b32da0ea177 SHA512 ad7aee9448e252f09291ddf82ca9e4c992cbb7b3cf25dfe968b3ed1d5a3958b6c63289f49d829621f2d08bbe3fe75f8e8a1888a6802c186db2a1617576a5b2c8
-EBUILD btrfs-progs-4.14.1.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa3087eeb77f2d5e86f51995dba2c85b557c5546f659798d593e36cc03307d436a11a98ab768bce47ffa186c7a2da6d2 SHA512 01032adb19e4ebef2bc923c16284274b5177701551c578e8813596f13e938b5504b1735e438f4633cc9131a2e20decd6e5bc58a45b3955f08b7d9c9144f60512
-EBUILD btrfs-progs-4.19.1.ebuild 2853 BLAKE2B e655b6e505031d6e1e304d5d5bba4f0b19e425949fd3e37de3ba4d2deeb643869763dae4aad2993f2e2a637e950b78e06cc74e28d902af08327e98d8fe38bf24 SHA512 7420ccecbca2432e06bed191b018a30f14d6c18c710e4ccd1227c9622f5e5dfe9dd84aa7b7479698dc66ed0326615f72049d1fc0639f53574cabe218a575177f
 EBUILD btrfs-progs-4.19.ebuild 2895 BLAKE2B abdc15e7c275830ef675616ca76117145b21c0105569b8bd9010949f21b5a9b85adf76ca6a0d2652e6ffffa8fd2b706cfe479659b33731d66da21d1bc9fe9d6e SHA512 2a1ff36eb7f79f8eea312821c729af96de045fd5d1032b224713a2fecfe9266e322f92dae27147d3a0a3fc43dd0e6a05759fe0ea9cac565b0f8db9f1537ab970
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
-EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
-EBUILD btrfs-progs-5.1.1.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
-EBUILD btrfs-progs-5.2.2.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
 EBUILD btrfs-progs-5.3.1.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
-EBUILD btrfs-progs-5.3.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
 EBUILD btrfs-progs-9999.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
 MISC metadata.xml 759 BLAKE2B 3f94ebaadb23c54121e8ffa1b80549b9e8a9d977d26ddcfdd8772e549e55fc762fcca5c8e2374a562dd9992086949eff626be71aa6da8326f8847cbc4f791fb7 SHA512 ababf03834be253af5402e167e7883fc73c6ad47198369eba02557e07ec8baaa81140837315e98979dc4b95ca160d2d984e970acdbf0ea4db9c2a9e9deddc9a8
diff --git a/sys-fs/btrfs-progs/btrfs-progs-3.18.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-3.18.2.ebuild
deleted file mode 100644
index ae8956a2b652..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-3.18.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	inherit git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
-		https://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE=""
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-libs/zlib:0=
-	sys-fs/e2fsprogs:0=
-"
-DEPEND="${RDEPEND}
-	sys-apps/acl
-	app-text/asciidoc
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-"
-
-src_prepare() {
-	epatch_user
-}
-
-src_compile() {
-	emake \
-		AR="$(tc-getAR)" \
-		CC="$(tc-getCC)" \
-		CFLAGS="${CFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		BUILD_VERBOSE=1
-}
-
-src_install() {
-	emake install \
-		DESTDIR="${D}" \
-		prefix=/usr \
-		bindir=/sbin \
-		libdir=/usr/$(get_libdir) \
-		mandir=/usr/share/man
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.1.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.1.2.ebuild
deleted file mode 100644
index 0f9295456a1a..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.1.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils multilib toolchain-funcs
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/kdave/btrfs-progs.git
-		https://git.kernel.org/pub/scm/linux/kernel/git/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"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	epatch_user
-	if [[ ${PV} == 9999 ]]; then
-		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 elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	newbashcomp btrfs-completion btrfs
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.10.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.10.2.ebuild
deleted file mode 100644
index 95614d543907..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.10.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		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 elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.14.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.14.1.ebuild
deleted file mode 100644
index 783e23d3203d..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.14.1.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-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 elibc_glibc backtrace)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.1.ebuild
deleted file mode 100644
index 7dfe272040c2..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.19.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-
-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 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
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.9.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.9.1.ebuild
deleted file mode 100644
index 397d271d38c9..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-4.9.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV=v${PV}
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}"/${PN}-${MY_PV}
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="git://repo.or.cz/btrfs-progs-unstable/devel.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert static static-libs"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-	)
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-		)
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		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 elibc_glibc backtrace)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex static-libs '' 'libs_static=')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.1.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.1.1.ebuild
deleted file mode 100644
index 4680b387969c..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.1.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert doc python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-BDEPEND="
-	doc? (
-		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
-		app-text/docbook-xml-dtd:4.5
-		app-text/xmlto
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable doc documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-
-	# install prebuilt subset of manuals
-	use doc || doman Documentation/*.[58]
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.2.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.2.2.ebuild
deleted file mode 100644
index 4680b387969c..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.2.2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert doc python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-BDEPEND="
-	doc? (
-		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
-		app-text/docbook-xml-dtd:4.5
-		app-text/xmlto
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable doc documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-
-	# install prebuilt subset of manuals
-	use doc || doman Documentation/*.[58]
-}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.3.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.3.ebuild
deleted file mode 100644
index 4680b387969c..000000000000
--- a/sys-fs/btrfs-progs/btrfs-progs-5.3.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{5,6,7} )
-
-inherit bash-completion-r1 python-single-r1
-
-libbtrfs_soname=0
-
-if [[ ${PV} != 9999 ]]; then
-	MY_PV="v${PV/_/-}"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-else
-	WANT_LIBTOOL=none
-	inherit autotools git-r3
-	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
-	EGIT_BRANCH="devel"
-fi
-
-DESCRIPTION="Btrfs filesystem utilities"
-HOMEPAGE="https://btrfs.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0/${libbtrfs_soname}"
-IUSE="+convert doc python reiserfs static static-libs +zstd"
-
-RESTRICT=test # tries to mount repared filesystems
-
-RDEPEND="
-	dev-libs/lzo:2=
-	sys-apps/util-linux:0=[static-libs(+)?]
-	sys-libs/zlib:0=
-	convert? (
-		sys-fs/e2fsprogs:0=
-		sys-libs/e2fsprogs-libs:0=
-		reiserfs? (
-			>=sys-fs/reiserfsprogs-3.6.27
-		)
-	)
-	python? ( ${PYTHON_DEPS} )
-	zstd? ( app-arch/zstd:0= )
-"
-DEPEND="${RDEPEND}
-	convert? ( sys-apps/acl )
-	python? ( dev-python/setuptools[${PYTHON_USEDEP}] )
-	static? (
-		dev-libs/lzo:2[static-libs(+)]
-		sys-apps/util-linux:0[static-libs(+)]
-		sys-libs/zlib:0[static-libs(+)]
-		convert? (
-			sys-fs/e2fsprogs:0[static-libs(+)]
-			sys-libs/e2fsprogs-libs:0[static-libs(+)]
-			reiserfs? (
-				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
-			)
-		)
-		zstd? ( app-arch/zstd:0[static-libs(+)] )
-	)
-"
-BDEPEND="
-	doc? (
-		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
-		app-text/docbook-xml-dtd:4.5
-		app-text/xmlto
-	)
-"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/gnuconfig"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == 9999 ]]; then
-		AT_M4DIR=m4 eautoreconf
-		mkdir config || die
-		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
-		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
-		ln -s "${automakedir}"/install-sh config/install-sh || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.guess config/config.guess || die
-		ln -s "${EPREFIX}"/usr/share/gnuconfig/config.sub config/config.sub || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/sbin
-		$(use_enable convert)
-		$(use_enable doc documentation)
-		$(use_enable elibc_glibc backtrace)
-		$(use_enable python)
-		$(use_enable static-libs static)
-		$(use_enable zstd)
-		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1 all $(usev static)
-}
-
-src_install() {
-	local makeargs=(
-		$(usex python install_python '')
-		$(usex static install-static '')
-	)
-	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
-	newbashcomp btrfs-completion btrfs
-	use python && python_optimize
-
-	# install prebuilt subset of manuals
-	use doc || doman Documentation/*.[58]
-}
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 6b9ff4fd5af7..3b037e723023 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -7,7 +7,7 @@ DIST eudev-3.2.9.tar.gz 1959836 BLAKE2B 8792ded8a7d1dfbc16fae249283b58251656961c
 EBUILD eudev-3.2.5.ebuild 6766 BLAKE2B 7007467747f127831b358fdc62a559a209a9b49d643c4eb1f3c9a44d11e1ed62ec00fadf8b939ec0b27fe20dc6b01a28f7d2e9c3e1f884af8b5b62b93e2d9ffb SHA512 eee2fa087a18778225b053d21a3ef091370a9f960676d68baa4b2d7094641c2906de6dbd0345af6de25316188817bf2ea0b9e223da152a39dd055eccdf70cf79
 EBUILD eudev-3.2.7-r2.ebuild 6931 BLAKE2B 3c75f45f6cd87110ce66b8e2f644178fb913670c6434dccff6a96dcd8afb7ef1097c1af7761d99ec9c9acba08c312f96f38b55dffa01f47dcd0cb24649bf4054 SHA512 c9c3067d102107ed5fb58027738eda2f608b80323473f16f438feb30aa2c0b0819954267edf240d82b21be2abbcb54ea98ea55affb400f7af539422b1141c215
 EBUILD eudev-3.2.8.ebuild 6931 BLAKE2B 3c75f45f6cd87110ce66b8e2f644178fb913670c6434dccff6a96dcd8afb7ef1097c1af7761d99ec9c9acba08c312f96f38b55dffa01f47dcd0cb24649bf4054 SHA512 c9c3067d102107ed5fb58027738eda2f608b80323473f16f438feb30aa2c0b0819954267edf240d82b21be2abbcb54ea98ea55affb400f7af539422b1141c215
-EBUILD eudev-3.2.9.ebuild 6926 BLAKE2B a7f424f2b655b35a7dee09351d6f87fe80c78bd0e53a8fffd00e8c32eacf62d9ace8e3bcc0bc00bc9c1423a0da2069e85335a4a524ab28d8e742f80530a7c035 SHA512 23d849d0746905937c4cdf5c7bd69dbb48ac10c7f321976f44a9f85477f3a6c4ea71e9950b4166643f4004aa684d5ba9b381643817489b62df62850fcdab5798
+EBUILD eudev-3.2.9.ebuild 6923 BLAKE2B c4ed16b40474fb55be9d93eb8198e22ca3eb00de6d8338ad35116a5d04ead1859312b832b7de5cd7f051d4ef3511dfe5d0b3be6fb8b11879be7657ac5c34faba SHA512 ad93f9d751e7c3cad4ba35b14d0883f324899aabd4cd590589f74d53dce9fdfe141efa007b95e17a4b88c9b745842b5a60e3ad5a7c163ab07d2938eab53f91d3
 EBUILD eudev-4.9999.ebuild 6068 BLAKE2B 129380de118a1bb7389ffda2b3954f1cd3b64e92ab41e23eb0de153a338f6e7e74bcf0e06125061b22bdc2f48fdb5202a43cc212d87090cf7306e59a2b9ceafd SHA512 fcbfc2635093d4c88e95f413a39ee7b08c473797b2b8afc50a5f73b84e58c67e96b316f996c3f2ce7be90304c14139ec813bf877c9374583509a29df2451de83
 EBUILD eudev-9999.ebuild 6931 BLAKE2B 3c75f45f6cd87110ce66b8e2f644178fb913670c6434dccff6a96dcd8afb7ef1097c1af7761d99ec9c9acba08c312f96f38b55dffa01f47dcd0cb24649bf4054 SHA512 c9c3067d102107ed5fb58027738eda2f608b80323473f16f438feb30aa2c0b0819954267edf240d82b21be2abbcb54ea98ea55affb400f7af539422b1141c215
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.2.9.ebuild b/sys-fs/eudev/eudev-3.2.9.ebuild
index d7c517b3cd24..5462de109326 100644
--- a/sys-fs/eudev/eudev-3.2.9.ebuild
+++ b/sys-fs/eudev/eudev-3.2.9.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
diff --git a/sys-fs/fuse4bsd/Manifest b/sys-fs/fuse4bsd/Manifest
deleted file mode 100644
index a694695e59d0..000000000000
--- a/sys-fs/fuse4bsd/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX fuse4bsd-0.3.9_pre1-fbsd91.patch 508 BLAKE2B c8b61e8cb6a4337657a6ae4c1d25d380d350584654e8e1d6ce8d2a2f32140640c0be2c4a971055943ce960c306f6c93da7608d213e9fd3a4c9eb99bdffafcc76 SHA512 9a02ef10ffc1134470a807c7d475c56ac7139835593e06c66a2ed182f39e7488468035ae940a6ef0551e6d888689969d5838733e0fcd398fc524e1de9fd1e8b3
-AUX fuse4bsd-0.3.9_pre1-ports.patch 12209 BLAKE2B 2a0bfd4c2028b30d82d82787b1a444302d2a89f14cf68ccc33f20694bd27ae0ff07488401bf99eae424cbbbfb291ea5f4e5e0dff2c505d9e57dc44f7738f683b SHA512 0d149e517bfa2b0260e86bda7f1d3f06c6328dd1803f72a1e823e91bb596e5f0a0bcf4fd00a70f574935eb96c515049001d8e7c42bc0893d81fb2e371fcef67c
-DIST 498acaef33b0.tar.gz 116035 BLAKE2B f5f7b3ded2e65422c9df771a62590e71803884ac8fbba5aabc67d1ddf7e2309e4b20d37ae43a64ca0ce46100963e68c57131c263291d0f747fe849ed65b05c0e SHA512 6427d888cea5b1519c4ae92ec8ec640535692c59dd8ca987a32574050239c9ff4cb92a4cf6b34f3c1363becdd9fd75c031f5db4bda34b298898466066740845a
-DIST freebsd-sbin-9.1.tar.bz2 1273913 BLAKE2B c00fea446a19311020ae081ba00d6c7d0b3b0365ab2046ec24252c2b02d4b4079fb7bbbf0d17432e2a1efb0788b552d684b1b91bbbb05d2c1712a93380a89b49 SHA512 9f186602b7de96f268c352ca386986652fddf5570e7eca1afa8c0d2bdc83b57df1198efe47f36dd5c7a6abf4f9c935f1c8207a4a12a6b2153bd6c3c6292719dc
-EBUILD fuse4bsd-0.3.9_pre1.ebuild 1553 BLAKE2B 02fee33b7675a6f797520c3296887f6ed06f5c41e29996e320f3f1b507b033056705d65f01499d48a22404df831fafccdff104cb7b0d5efb64b97dcc64ca4d7f SHA512 8c99fb5aea981130390894af76ad5e5feba9ff72211b09287fabe3d032a68972e6b4f2bac2b23391f4cc83ca8a1f587e82b5cdae8531f1e3970c92020e432829
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-fs/fuse4bsd/files/fuse4bsd-0.3.9_pre1-fbsd91.patch b/sys-fs/fuse4bsd/files/fuse4bsd-0.3.9_pre1-fbsd91.patch
deleted file mode 100644
index cc3ea70ec7af..000000000000
--- a/sys-fs/fuse4bsd/files/fuse4bsd-0.3.9_pre1-fbsd91.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Taken from FreeBSD ports
-
-extra-patch-fuse_module__fuse_vnops.c
-
---- fuse_module/fuse_vfsops.c.orig	2008-02-05 07:25:57.000000000 +0200
-+++ fuse_module/fuse_vfsops.c	2011-09-08 10:27:43.000000000 +0300
-@@ -224,7 +231,7 @@
- 	struct cdev *fdev;
- 	struct sx *slock;
- 	struct fuse_data *data;
--	int mntopts = 0, __mntopts = 0, max_read_set = 0, secondary = 0;
-+	uint64_t mntopts = 0, __mntopts = 0, max_read_set = 0, secondary = 0;
- 	unsigned max_read = ~0;
- 	struct vnode *rvp;
- 	struct fuse_vnode_data *fvdat;
diff --git a/sys-fs/fuse4bsd/files/fuse4bsd-0.3.9_pre1-ports.patch b/sys-fs/fuse4bsd/files/fuse4bsd-0.3.9_pre1-ports.patch
deleted file mode 100644
index cf4cf4441196..000000000000
--- a/sys-fs/fuse4bsd/files/fuse4bsd-0.3.9_pre1-ports.patch
+++ /dev/null
@@ -1,475 +0,0 @@
-Taken from FreeBSD Ports
-
-cat sysutils/fusefs-kmod/files/patch-* > fuse4bsd-0.3.9_pre20080208-ports.patch
-
-
---- fuse_module/Makefile.orig	2008-02-05 08:25:57.000000000 +0300
-+++ fuse_module/Makefile	2009-01-14 00:29:13.000000000 +0300
-@@ -1,3 +1,5 @@
-+.undef KERNCONF
-+
- .include "../Makefile.common"
- 
- SRCS = fuse_main.c    \
-@@ -22,7 +24,8 @@
- 
- .if defined(KERNCONF)
- KERNCONF1!= echo ${KERNCONF} | sed -e 's/ .*//g'
--KERNCONFDIR= /usr/obj/usr/src/sys/${KERNCONF1}
-+KRNLOBJDIR!=	make -C /usr/src -f /usr/src/Makefile.inc1 -V KRNLOBJDIR
-+KERNCONFDIR= ${KRNLOBJDIR}/${KERNCONF1}
- .endif
- 
- .if defined(KERNCONFDIR)
---- fuse_module/fuse.h.orig	2008-02-05 00:25:57.000000000 -0500
-+++ fuse_module/fuse.h	2009-05-13 18:40:19.000000000 -0400
-@@ -25,6 +25,22 @@
- #endif
- #endif
- 
-+#ifndef VFSOPS_TAKES_THREAD
-+#if __FreeBSD_version >= 800087
-+#define VFSOPS_TAKES_THREAD 0
-+#else
-+#define VFSOPS_TAKES_THREAD 1
-+#endif
-+#endif
-+
-+#ifndef VOP_ACCESS_TAKES_ACCMODE_T
-+#if __FreeBSD_version >= 800052
-+#define VOP_ACCESS_TAKES_ACCMODE_T 1
-+#else
-+#define VOP_ACCESS_TAKES_ACCMODE_T 0
-+#endif
-+#endif
-+
- #ifndef VOP_OPEN_TAKES_FP
- #if __FreeBSD_version >= 700044
- #define VOP_OPEN_TAKES_FP 1
-@@ -49,6 +65,14 @@
- #endif
- #endif
- 
-+#ifndef VOP_GETATTR_TAKES_THREAD
-+#if __FreeBSD_version >= 800046
-+#define VOP_GETATTR_TAKES_THREAD 0
-+#else
-+#define VOP_GETATTR_TAKES_THREAD 1
-+#endif
-+#endif
-+
- #ifndef USE_PRIVILEGE_API
- /*
-  * __FreeBSD_version bump was omitted for introduction of
---- fuse_module/fuse_dev.c
-+++ fuse_module/fuse_dev.c
-@@ -52,8 +52,13 @@
- 	.d_read = fusedev_read,
- 	.d_write = fusedev_write,
- 	.d_version = D_VERSION,
-+#ifndef D_NEEDMINOR
-+#define D_NEEDMINOR 0
-+#endif
- #if ! DO_GIANT_MANUALLY
--	.d_flags = D_NEEDGIANT,
-+	.d_flags = D_NEEDMINOR|D_NEEDGIANT,
-+#else
-+	.d_flags = D_NEEDMINOR,
- #endif
- };
- 
-@@ -548,7 +553,12 @@
- 	/* find any existing device, or allocate new unit number */
- 	i = clone_create(&fuseclones, &fuse_cdevsw, &unit, dev, 0);
- 	if (i) {
--		*dev = make_dev(&fuse_cdevsw, unit2minor(unit),
-+		*dev = make_dev(&fuse_cdevsw,
-+#if __FreeBSD_version < 800062
-+				unit2minor(unit),
-+#else /* __FreeBSD_version >= 800062 */
-+				unit,
-+#endif /* __FreeBSD_version < 800062 */
- 			        UID_ROOT, GID_OPERATOR,
- 		                S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP,
-                                 "fuse%d", unit);
---- fuse_module/fuse_io.c.orig	2008-02-05 00:25:57.000000000 -0500
-+++ fuse_module/fuse_io.c	2009-07-13 09:31:24.000000000 -0400
-@@ -35,6 +35,10 @@
- #include <vm/vnode_pager.h>
- #include <vm/vm_object.h>
- 
-+#if (__FreeBSD_version >= 800000)
-+#define vfs_bio_set_validclean vfs_bio_set_valid
-+#endif
-+
- #include "fuse.h"
- #include "fuse_session.h"
- #include "fuse_vnode.h"
-@@ -157,7 +161,11 @@
- 		goto out;
- 
- 	if (uio->uio_rw == UIO_WRITE && fp->f_flag & O_APPEND) {
--		if ((err = VOP_GETATTR(vp, &va, cred, td)))
-+		if ((err = VOP_GETATTR(vp, &va, cred
-+#if VOP_GETATTR_TAKES_THREAD
-+		    , td
-+#endif
-+		    )))
- 			goto out;
- 		uio->uio_offset = va.va_size;
- 	} else if ((flags & FOF_OFFSET) == 0)
-@@ -227,7 +235,7 @@
- 		return (0);
- 
- 	biosize = vp->v_mount->mnt_stat.f_iosize;
--	bcount = min(MAXBSIZE, biosize);
-+	bcount = MIN(MAXBSIZE, biosize);
- 
- 	DEBUG2G("entering loop\n");
- 	do {
-@@ -352,7 +360,7 @@
- 		fri = fdi.indata;
- 		fri->fh = fufh->fh_id;
- 		fri->offset = uio->uio_offset;
--		fri->size = min(uio->uio_resid,
-+		fri->size = MIN(uio->uio_resid,
- 		                fusefs_get_data(vp->v_mount)->max_read);
- 	
- 		DEBUG2G("fri->fh %llu, fri->offset %d, fri->size %d\n",
-@@ -399,7 +407,7 @@
- 	while (uio->uio_resid > 0) {
- 		int transfersize;
- 
--		chunksize = min(iov->iov_len, nmax);
-+		chunksize = MIN(iov->iov_len, nmax);
- 
- 		if (uio->uio_rw == UIO_READ) {
- 			struct fuse_read_in *fri;
-@@ -464,7 +472,7 @@
- {
- 		int err;
- 
--		if ((err = uiomove(buf, min(reqsize, bufsize), uio)))
-+		if ((err = uiomove(buf, MIN(reqsize, bufsize), uio)))
- 			return (err);
- 
- 		if (bufsize < reqsize)
-@@ -502,7 +510,7 @@
- 	}
- 
- 	while (uio->uio_resid > 0) {
--		chunksize = min(uio->uio_resid,
-+		chunksize = MIN(uio->uio_resid,
- 		                fusefs_get_data(vp->v_mount)->max_write);
- 
- 		fdi.iosize = sizeof(*fwi) + chunksize;
-@@ -569,7 +577,7 @@
- 	do {
- 		lbn = uio->uio_offset / biosize;
- 		on = uio->uio_offset & (biosize-1);
--		n = min((unsigned)(biosize - on), uio->uio_resid);
-+		n = MIN((unsigned)(biosize - on), uio->uio_resid);
- 		
- 		DEBUG2G("lbn %d, on %d, n %d, uio offset %d, uio resid %d\n",
- 		        (int)lbn, on, n, (int)uio->uio_offset, uio->uio_resid);
-@@ -739,8 +747,8 @@
- 		 */
- 		if (n) {
- 			if (bp->b_dirtyend > 0) {
--				bp->b_dirtyoff = min(on, bp->b_dirtyoff);
--				bp->b_dirtyend = max((on + n), bp->b_dirtyend);
-+				bp->b_dirtyoff = MIN(on, bp->b_dirtyoff);
-+				bp->b_dirtyend = MAX((on + n), bp->b_dirtyend);
- 			} else {
- 				bp->b_dirtyoff = on;
- 				bp->b_dirtyend = on + n;
-@@ -823,7 +831,11 @@
- #if FUSELIB_CONFORM_BIOREAD
- 		struct vattr va;
- 
--		if ((err = VOP_GETATTR(vp, &va, cred, curthread)))
-+		if ((err = VOP_GETATTR(vp, &va, cred
-+#if VOP_GETATTR_TAKES_THREAD
-+		    , curthread
-+#endif
-+		    )))
- 			goto out;
- #endif
- 
-@@ -831,7 +843,7 @@
- 		bp->b_resid = bp->b_bcount;
- 		while (bp->b_resid > 0) {
- 			DEBUG2G("starting bio with resid %ld\n", bp->b_resid);	
--			chunksize = min(bp->b_resid,
-+			chunksize = MIN(bp->b_resid,
- 			                fusefs_get_data(vp->v_mount)->max_read);
- 			fdi.iosize = sizeof(*fri);
- 			if (! op)
-@@ -842,8 +854,8 @@
- 			fri->fh = fufh->fh_id;
- 			fri->offset = ((off_t)bp->b_blkno) * biosize + ioff;
- #if FUSELIB_CONFORM_BIOREAD
--			chunksize = min(chunksize,
--			                min(fri->offset + bp->b_resid,
-+			chunksize = MIN(chunksize,
-+			                MIN(fri->offset + bp->b_resid,
- 			                    va.va_size) - fri->offset);
- 			if (chunksize == 0) {
- 				respsize = -1;
-@@ -901,7 +913,7 @@
- 
- 		bufdat = bp->b_data + bp->b_dirtyoff;
- 		while (bp->b_dirtyend > bp->b_dirtyoff) {
--			chunksize = min(bp->b_dirtyend - bp->b_dirtyoff,
-+			chunksize = MIN(bp->b_dirtyend - bp->b_dirtyoff,
- 			                fusefs_get_data(vp->v_mount)->max_write);
- 	
- 			fdi.iosize = sizeof(*fwi);
---- fuse_module/fuse_main.c.00	2010-08-15 14:40:29.000000000 +0400
-+++ fuse_module/fuse_main.c	2010-08-15 15:56:56.000000000 +0400
-@@ -108,6 +108,9 @@
- 	switch (what) {
- 	case MOD_LOAD:                /* kldload */
- 
-+#if __FreeBSD_version > 800009
-+	        fuse_fileops.fo_truncate = vnops.fo_truncate;
-+#endif
- 		fuse_fileops.fo_ioctl    = vnops.fo_ioctl;
- 		fuse_fileops.fo_poll     = vnops.fo_poll;
- 		fuse_fileops.fo_kqfilter = vnops.fo_kqfilter;
-
-
---- fuse_module/fuse_vfsops.c.orig	2008-02-05 00:25:57.000000000 -0500
-+++ fuse_module/fuse_vfsops.c	2009-05-13 18:54:01.000000000 -0400
-@@ -18,6 +18,7 @@
- #include <sys/namei.h>
- #include <sys/mount.h>
- #include <sys/sysctl.h>
-+#include <sys/fcntl.h>
- 
- #include "fuse.h"
- #include "fuse_session.h"
-@@ -213,8 +214,14 @@
-  * Mount system call
-  */
- static int
-+#if VFSOPS_TAKES_THREAD
- fuse_mount(struct mount *mp, struct thread *td)
- {
-+#else
-+fuse_mount(struct mount *mp)
-+{
-+	struct thread *td = curthread;
-+#endif
- 	int err = 0;
- 	size_t len;
- 	char *fspec, *subtype = NULL;
-@@ -529,8 +536,14 @@
-  * Unmount system call
-  */
- static int
-+#if VFSOPS_TAKES_THREAD
- fuse_unmount(struct mount *mp, int mntflags, struct thread *td)
- {
-+#else
-+fuse_unmount(struct mount *mp, int mntflags)
-+{
-+	struct thread *td = curthread;
-+#endif
- 	int flags = 0, err = 0;
- 	struct fuse_data *data;
- 	struct fuse_secondary_data *fsdat = NULL;
-@@ -633,8 +646,14 @@
- 
- /* stolen from portalfs */
- static int
-+#if VFSOPS_TAKES_THREAD
- fuse_root(struct mount *mp, int flags, struct vnode **vpp, struct thread *td)
- {
-+#else
-+fuse_root(struct mount *mp, int flags, struct vnode **vpp)
-+{
-+	struct thread *td = curthread;
-+#endif
- 	/*
- 	 * Return locked reference to root.
- 	 */
-@@ -650,7 +669,11 @@
- 		data = fsdat->master;
- 		sx_slock(&data->mhierlock);
- 		if (data->mpri == FM_PRIMARY)
--			err = fuse_root(data->mp, flags, vpp, td);
-+			err = fuse_root(data->mp, flags, vpp
-+#if VFSOPS_TAKES_THREAD
-+			    , td
-+#endif
-+			    );
- 		else
- 			err = ENXIO;
- 		sx_sunlock(&data->mhierlock);
-@@ -667,7 +690,11 @@
- 	if (vp->v_type == VNON) {
- 		struct vattr va;
- 
--		(void)VOP_GETATTR(vp, &va, td->td_ucred, td);
-+		(void)VOP_GETATTR(vp, &va, td->td_ucred
-+#if VOP_GETATTR_TAKES_THREAD
-+		    , td
-+#endif
-+		);
- 	}
- 	*vpp = vp;
- #if _DEBUG2G
-@@ -678,8 +705,14 @@
- }
- 
- static int
-+#if VFSOPS_TAKES_THREAD
- fuse_statfs(struct mount *mp, struct statfs *sbp, struct thread *td)
- {
-+#else
-+fuse_statfs(struct mount *mp, struct statfs *sbp)
-+{
-+	struct thread *td = curthread;
-+#endif
- 	struct fuse_dispatcher fdi;
- 	struct fuse_statfs_out *fsfo;
- 	struct fuse_data *data;
-@@ -696,7 +729,11 @@
- 
- 		sx_slock(&data->mhierlock);
- 		if (data->mpri == FM_PRIMARY)
--			err = fuse_statfs(data->mp, sbp, td);
-+			err = fuse_statfs(data->mp, sbp
-+#if VFSOPS_TAKES_THREAD
-+			    , td
-+#endif
-+			    );
- 		else
- 			err = ENXIO;
- 		sx_sunlock(&data->mhierlock);
-@@ -794,7 +831,11 @@
- 	if (nodeid == FUSE_ROOT_ID) {
- 		if (parentid != FUSE_NULL_ID)
- 			return (ENOENT);
--		err = VFS_ROOT(mp, myflags, vpp, td);
-+		err = VFS_ROOT(mp, myflags, vpp
-+#if VFSOPS_TAKES_THREAD
-+		    , td
-+#endif
-+		    );
- 		if (err)
- 			return (err);
- 		KASSERT(*vpp, ("we neither err'd nor found the root node"));
---- ./fuse_module/fuse_vnops.c.orig	2012-09-19 06:04:10.512413490 +0200
-+++ ./fuse_module/fuse_vnops.c	2012-09-19 06:20:44.949613892 +0200
-@@ -799,8 +799,11 @@
- 	struct vnode *vp = ap->a_vp;
- 	struct vattr *vap = ap->a_vap;
- 	struct ucred *cred = ap->a_cred;
-+#if VOP_GETATTR_TAKES_THREAD
- 	struct thread *td = ap->a_td;
--
-+#else
-+	struct thread *td = curthread;
-+#endif
- 	struct fuse_dispatcher fdi;
- 	struct timespec uptsp;
- 	int err = 0;
-@@ -871,7 +874,11 @@
- fuse_access(ap)
- 	struct vop_access_args /* {
- 		struct vnode *a_vp;
-+#if VOP_ACCESS_TAKES_ACCMODE_T
-+		accmode_t a_accmode;
-+#else
- 		int a_mode;
-+#endif
- 		struct ucred *a_cred;
- 		struct thread *a_td;
- 	} */ *ap;
-@@ -886,7 +893,13 @@
- 	else
- 		facp.facc_flags |= FACCESS_DO_ACCESS;
- 
--	return fuse_access_i(vp, ap->a_mode, ap->a_cred, ap->a_td, &facp);
-+	return fuse_access_i(vp,
-+#if VOP_ACCESS_TAKES_ACCMODE_T
-+	    ap->a_accmode,
-+#else
-+	    ap->a_mode,
-+#endif
-+	    ap->a_cred, ap->a_td, &facp);
- }
- 
- /*
-@@ -946,7 +959,11 @@
- 		/* We are to do the check in-kernel */
- 
- 		if (! (facp->facc_flags & FACCESS_VA_VALID)) {
--			err = VOP_GETATTR(vp, VTOVA(vp), cred, td);
-+			err = VOP_GETATTR(vp, VTOVA(vp), cred
-+#if VOP_GETATTR_TAKES_THREAD
-+			    , td
-+#endif
-+			    );
- 			if (err)
- 				return (err);
- 			facp->facc_flags |= FACCESS_VA_VALID;
-@@ -1544,7 +1561,7 @@
- 	struct fuse_vnode_data *fvdat = VTOFUD(vp);
- 	uint64_t parentid = fvdat->parent_nid;
- 	struct componentname *cnp = fvdat->germcnp;
--	struct fuse_open_in *foi;
-+	struct fuse_create_in *foi;
- 	struct fuse_entry_out *feo;
- 	struct fuse_mknod_in fmni;
- 	int err;
-@@ -1929,7 +1946,11 @@
- 		 * It will not invalidate pages which are dirty, locked, under
- 		 * writeback or mapped into pagetables.") 
- 		 */
-+#if VOP_GETATTR_TAKES_THREAD
- 		err = vinvalbuf(vp, 0, td, PCATCH, 0);
-+#else
-+		err = vinvalbuf(vp, 0, PCATCH, 0);
-+#endif
- 		fufh->flags |= FOPEN_KEEP_CACHE;
- 	}
- 
-@@ -3005,8 +3026,11 @@
- 	struct vattr *vap = ap->a_vap;
- 	struct vnode *vp = ap->a_vp;
- 	struct ucred *cred = ap->a_cred;
-+#if VOP_GETATTR_TAKES_THREAD
- 	struct thread *td = ap->a_td;
--
-+#else
-+	struct thread *td = curthread;
-+#endif
- 	int err = 0;
- 	struct fuse_dispatcher fdi;
- 	struct fuse_setattr_in *fsai;
---- mount_fusefs/mount_fusefs.c	2008-02-05 07:25:57.000000000 +0200
-+++ mount_fusefs/mount_fusefs.c	2012-01-07 21:07:35.000000000 +0200
-@@ -44,6 +44,7 @@
- #include <getopt.h>
- #include <libgen.h>
- #include <limits.h>
-+#include <osreldate.h>
- #include <paths.h>
- 
- #include "fuse4bsd.h"
-@@ -312,7 +313,12 @@
- 	 * Resolve the mountpoint with realpath(3) and remove unnecessary
- 	 * slashes from the devicename if there are any.
- 	 */
-+#if __FreeBSD_version >= 1000005
-+	if (checkpath(dir, mntpath) != 0)
-+		err(1, "%s", mntpath);
-+#else
- 	(void)checkpath(dir, mntpath);
-+#endif
- 	(void)rmslashes(dev, dev);
- 
- 	if (strcmp(dev, "auto") == 0)
diff --git a/sys-fs/fuse4bsd/fuse4bsd-0.3.9_pre1.ebuild b/sys-fs/fuse4bsd/fuse4bsd-0.3.9_pre1.ebuild
deleted file mode 100644
index 710c35f8bc01..000000000000
--- a/sys-fs/fuse4bsd/fuse4bsd-0.3.9_pre1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit portability toolchain-funcs eutils flag-o-matic
-
-DESCRIPTION="Fuse for FreeBSD"
-HOMEPAGE="http://fuse4bsd.creo.hu/"
-# -sbin is needed for getmntopts.c, hardcoding 6.2 is nasty but can't think of
-# any better solution right now
-SRC_URI="http://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/fuse4bsd/498acaef33b0.tar.gz
-	mirror://gentoo/freebsd-sbin-9.1.tar.bz2"
-S="${WORKDIR}/fuse4bsd-498acaef33b0"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-DEPEND=">=sys-freebsd/freebsd-sources-9.1
-	virtual/pmake"
-RDEPEND="sys-fs/fuse"
-
-QA_TEXTRELS="boot/modules/fuse.ko"
-
-src_prepare() {
-	cp /usr/include/fuse/fuse_kernel.h fuse_module/ || die
-	cp "${WORKDIR}/sbin/mount/getmntopts.c" mount_fusefs/ || die
-	epatch "${FILESDIR}"/${P}-ports.patch
-	epatch "${FILESDIR}"/${P}-fbsd91.patch
-}
-
-src_compile() {
-	filter-ldflags "-Wl,--hash-style=*"
-	tc-export CC
-	cd "${S}"/fuse_module
-	$(get_bmake) \
-		KMODDIR=/boot/modules BINDIR=/usr/sbin MANDIR=/usr/share/man/man \
-		MOUNT="${WORKDIR}/sbin/mount" LDFLAGS="$(raw-ldflags)" \
-		|| die "$(get_bmake) failed"
-
-	cd "${S}"/mount_fusefs
-	$(get_bmake) \
-		KMODDIR=/boot/modules BINDIR=/usr/sbin MANDIR=/usr/share/man/man \
-		MOUNT="${WORKDIR}/sbin/mount" \
-		|| die "$(get_bmake) failed"
-}
-
-src_install() {
-	dodir /boot/modules
-	$(get_bmake) \
-		KMODDIR=/boot/modules BINDIR=/usr/sbin MANDIR=/usr/share/man/man \
-		DESTDIR="${ED}" install \
-		|| die "$(get_bmake) failed"
-
-	dodoc doc/{CREDITS,README}
-}
diff --git a/sys-fs/fuse4bsd/metadata.xml b/sys-fs/fuse4bsd/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/sys-fs/fuse4bsd/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/sys-fs/gt5/Manifest b/sys-fs/gt5/Manifest
index e4bdee8838ef..23675fe75dc0 100644
--- a/sys-fs/gt5/Manifest
+++ b/sys-fs/gt5/Manifest
@@ -1,5 +1,5 @@
-AUX gt5-1.4.0-bash-shabang.patch 292 BLAKE2B a02a35d8c11c8faad446b0f498569b21d6f7d25f974ae811bd3fd923bb50cda827b26360956a952f7f1c61013f4a2b7701603c0bd7d45126c3ff3cdcefcaaa18 SHA512 d8e58bd47e3e2a867b54852ac73148618679d286a9d5ea93d19038be2ad34375ed150eaa33b095a18724cd40f0d0df61df31630cbb8dd936615ec7e6b595e032
-AUX gt5-1.4.0-empty-dirs.patch 339 BLAKE2B 3c2aa49043136fbaa1e95323418c7908cb40f1ed6c8a7a8537e282a67d440fb04e4d076a1edede9f1d6957e8ca4ba3eef658f2d295d70e47c1b5cef73d2fc19d SHA512 4a494660e10ee7ecdd8aa56ac8a25d6e544c42a535466119fd2702ff9bf0cf0e26e492f2e98a34ea4b5741c20357fa6d2b600dea76f9ead89b20cd9461f86b9c
+AUX gt5-1.4.0-bash-shabang.patch 229 BLAKE2B 2ddb4edaf20bddeb648be02823c05d5af4032a1ae51a9f467746d3b07b44c3548f528a771c47b006d3d1259be3ddfd07c5a219014e7330f5217d20db49475592 SHA512 b191cf1eee2a539cb6076e4d55e075493df4915d183e2387a7e8f1979d932a33f196495cb5084ababaea6200a8bc5963d32b3a5cc53684c9a2c275e0b4bb66ce
+AUX gt5-1.4.0-empty-dirs.patch 321 BLAKE2B c56f8738739164f52075f42df0090585c8da600de0db1f03fa01a28ef403dce3acc9f91191984213dedcdd5c2b86fcfe51cb59f9cef156b5eb69f647c96a2efa SHA512 1ef2f4957de5df12a52c3a8579e188ce52b7364ddc1c9ab8a7399ea86cc2eceadab8923a207c123252d6d0fce97cecdd15413dca0bb9bba28daa1b602c6d2e1f
 DIST gt5-1.4.0.tar.gz 16504 BLAKE2B 67d8b7dabc269268cb220b3f7c954dc71ccdb563dc5da89fd185ab65f3c67c6268fec8930f09f01591d6c192194134ea389cc84b6246d5e8704439d6935df5be SHA512 5006a033ec203e229cc56db90af6b92d20b6cf0de4602abf3dec65e91906991d80e8682767ab10348ff8351baf919e515e2e950cf0d9d9210956916e26ce10fa
-EBUILD gt5-1.4.0-r2.ebuild 596 BLAKE2B 97864d416109328080f94e789b0b46a6cce45a4beb7b1e8c4d8d3c332f8226884b7430a9390cff5f4499dcb5ad3a48c3e025f9cc4f7b13c05c22a089961de8d4 SHA512 b8a4e54416d72f319e913c0b2537274ea2443deb6a962d346e5ef7864b4b0f55100e30aa37ef1089bf31a32c10c878151fc9c61a9a61c579516f4c48b6c26979
+EBUILD gt5-1.4.0-r2.ebuild 538 BLAKE2B e96b6d2bd81a8e0f18764b554213a3d2a46106e4b443973a600edb015a894bc997e7873f058528678aec14d85c63d49c921226c549b9b153b04254ec1f873da1 SHA512 18f1445c60edf872610d63464c1f077adcea5bfa65fcd2f1b02d09ce2bde3dbeb6492d5e2e3972e9c74bd3b73a7233289a352e4f82c5f3f293c430eaa41c4085
 MISC metadata.xml 238 BLAKE2B d24a618dbd473a7afc5cfd4d4232bdb82bdf29b121371a88c049503342d2476019fa754d8f2c0f1837ba7e25f9b31919acc647e82adc0e6121089d58eaed19dc SHA512 7cc695ba5a9a5bd525be7439594134e18c9ecd1b40210e387f3156bf12e4b92e4e5376ffcb6e82a468f380d64ace7dffd9bf1dc8731ee74f62038d3db5552c90
diff --git a/sys-fs/gt5/files/gt5-1.4.0-bash-shabang.patch b/sys-fs/gt5/files/gt5-1.4.0-bash-shabang.patch
index d28d9f6c1eed..be428b6bb9f4 100644
--- a/sys-fs/gt5/files/gt5-1.4.0-bash-shabang.patch
+++ b/sys-fs/gt5/files/gt5-1.4.0-bash-shabang.patch
@@ -1,6 +1,5 @@
-diff -ru gt5-1.4.0.orig/gt5 gt5-1.4.0/gt5
---- gt5-1.4.0.orig/gt5	2007-09-17 00:29:48.685233203 +0200
-+++ gt5-1.4.0/gt5	2007-09-17 00:29:55.684165472 +0200
+--- a/gt5	2007-09-17 00:29:48.685233203 +0200
++++ b/gt5	2007-09-17 00:29:55.684165472 +0200
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
diff --git a/sys-fs/gt5/files/gt5-1.4.0-empty-dirs.patch b/sys-fs/gt5/files/gt5-1.4.0-empty-dirs.patch
index 4aab4d0ab840..c1eb9b91b640 100644
--- a/sys-fs/gt5/files/gt5-1.4.0-empty-dirs.patch
+++ b/sys-fs/gt5/files/gt5-1.4.0-empty-dirs.patch
@@ -1,5 +1,5 @@
---- /usr/bin/gt5.old	2011-01-10 23:01:29.778000092 +0100
-+++ /usr/bin/gt5	2011-01-10 23:01:16.577000089 +0100
+--- a/gt5	2011-01-10 23:01:29.778000092 +0100
++++ b/gt5	2011-01-10 23:01:16.577000089 +0100
 @@ -261,7 +261,7 @@
  
  #can du handle depths?
diff --git a/sys-fs/gt5/gt5-1.4.0-r2.ebuild b/sys-fs/gt5/gt5-1.4.0-r2.ebuild
index 41df9c34df7a..4c907a13c1c7 100644
--- a/sys-fs/gt5/gt5-1.4.0-r2.ebuild
+++ b/sys-fs/gt5/gt5-1.4.0-r2.ebuild
@@ -1,30 +1,26 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
-
-inherit eutils
+EAPI=7
 
 DESCRIPTION="a diff-capable 'du-browser'"
 HOMEPAGE="http://gt5.sourceforge.net/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
+KEYWORDS="amd64 ~sparc x86"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~sparc x86"
 IUSE=""
 
 RDEPEND="|| ( www-client/links
 		www-client/elinks
 		www-client/lynx )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-bash-shabang.patch" \
-		"${FILESDIR}/${P}-empty-dirs.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${P}-bash-shabang.patch"
+	"${FILESDIR}/${P}-empty-dirs.patch"
+)
 
 src_install() {
 		dobin gt5
diff --git a/sys-fs/libeatmydata/Manifest b/sys-fs/libeatmydata/Manifest
index 9374a844a8d9..561b3e5fc935 100644
--- a/sys-fs/libeatmydata/Manifest
+++ b/sys-fs/libeatmydata/Manifest
@@ -1,9 +1,4 @@
-AUX libeatmydata-105-undpkg.patch 379 BLAKE2B 8e53fff0b78507413051bdf8ca42e5ee6a131ff9fb9a76154a1d029fb4292e668755696253f1a6fe111e6f8564fca10c089f6a54e3cfd527beddf8b5769d4608 SHA512 b6b56e90305937eebe6a043f40c904a1facbf480d9f63a3c59d8bd96150c810bb2cb4aaffafc3d02f4c01179eeec5cce2f5b285d0db6fb7664ea5b2fa64f2ec5
+AUX libeatmydata-105-undpkg.patch 308 BLAKE2B a6ad730f191ae342217dd7f881bab503ae662d3fcc9d8f782e23765e9b2385ab5d8f30a3ffdb0180d2ef22f22f327b7c6b3189674d65ac1aaacf68a4466e8620 SHA512 1f90cd5637babf47139c30f0b3a1c96e4dfaceaba7617108b76ef68f69a47287e509284e318cbbe1c0c62fc4f2fb5792b0d0ad0dd977388fd90f3ed54ba35e28
 DIST libeatmydata-105.tar.gz 419427 BLAKE2B 251fc4226ddddce16abc16c8a0717cd69621e8c166cf7a7dec1c8782c2a25edcf26e34f1a09bd2b6153a46eb99a6cf4b1adc334db188201b12a27b4a1562ed03 SHA512 fb2ac1400d5e3c44bfc952c72f29a4c7234edf5b756a9602ad822c57fbc9813c35d2da9492e2982abf81e0826d278da2d31ee1865e806754e0b387ad699367d4
-DIST libeatmydata-65.tar.gz 408813 BLAKE2B 21b125ee28fde610ce91f342c2579ad302c43aac4c8fcbb4663ed1d1a55355f8ef2c61bdffd4734e04032e7ccacabc7c17ba708f07e468f44a9bdecbe14428c9 SHA512 b2e3ed9c67b6ae9b0e5918b114bf0fb6e59dda3bff9b9331a8c280243822d4c77f35e9b08138ea65a74c893cc2bd67677bbf28b03bc61f011b24dd39d171adc2
-DIST libeatmydata-82.tar.gz 407977 BLAKE2B 1a0c024e8199302f30df170e6668719bc19b38cff08b05a62f8d085f3b1531dc22690811f4ba1459b0b2d59c5329ee3b3e377f37838d9e607d69171399d85ba6 SHA512 882b2464c26d99ea0b01a2f1171dddb637ac0b3509c18416da4e0199f515ff23c43a7bb5eb641bc3447a2c6be06c261260713565c3e4c4b988995d09f52d623c
-EBUILD libeatmydata-105-r1.ebuild 718 BLAKE2B d20c366834274acfb7ce0e60f8c3cdeb84ee30f4fcf225c086b5df0c582a94e0945fb06a4c68e1239fe0ddf523c6b3ba7b235a05bbe6095d4e84d1276c61ee2f SHA512 41f08297579e704008856a13fed9c6df70b41931c0be4ce89c76a1cbada7dca9a6cada20f2085744dd0b6efa8face844c7af60c156b4a3bbe1780c89ba0db725
-EBUILD libeatmydata-65.ebuild 646 BLAKE2B f675ee8134252580fb4361284022591663715d4ff7e6c1bc55900a215cc14d1cc50601ec1cabe51b7c3855289e9482e1eeadff3ed39f4237d89f18d2d8e11928 SHA512 2575255da69e9001574b4ba288188ca0a08a1f85c25f3b0148f906c4ed2c973cc410ead085a122f2ba33dc32be065d5442d509ee5e65e6116c95b55c285c988e
-EBUILD libeatmydata-82-r1.ebuild 630 BLAKE2B 9c6f95259969fe6e61ff22733eb1cf429a31b38fa397e5ad7b769469e70fb22b8c7dc9b5a1c589b7d0322adc9cc86200f4560053ce2e76117a51e06cf139f623 SHA512 c646bc4930c299b6ae1b7b7b0beff1fb2150e5713d04c9d4604d45e192d27e6bf1210bc7b1af0ef1985b61bf93c069999625d648b01803de39bf1dd631379b31
-EBUILD libeatmydata-82.ebuild 635 BLAKE2B 6a4c9f777b73451dbab0ba3a602c3b18d2ed6b7ff9859e563bf2703f6a698e9ab7190c9a77405fb223c7bc3a15079207069b0febbcc7cf57c578bd2bb15f06e6 SHA512 41a6bbee82152a245bbf939f912d9f0d1aee15abe072bfd233ceb3e2a736e30ecdd459a7f1d01114e68e283fcbf032c4a41f9b947cb355138118f30b127c2d54
+EBUILD libeatmydata-105-r2.ebuild 746 BLAKE2B 1a57dc157792ca1f25de7a1225fb762e88be60845dbf48f21fef3782b1950559399ebe048426452fd834910046cea379021849045ccf727e3dd4885bfd538acb SHA512 cd390db0b4e89e365de7ebb72784f87a139fafceee744d92200f1baf08e49d24a1b3308d41b67393ad32d6524fab0f4fe15461d436e15bbec3d565d646f5ab96
 MISC metadata.xml 512 BLAKE2B 549d76a933090ccaf7100a6ae03b8a1f0c1c68454764018360184bcdce4e6628a38ac499bd8a568fc43240fa13596a6f0b4e108fff1c742d4e229aad59049b10 SHA512 4b436b230dfafd7554ffe9ef222fda5aa4e4132768f945c34cde4fed9359f2782e0f371617ecf52b55339f278fbd51f28fe58bf50ec600bef8644c82f594d363
diff --git a/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch b/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch
index 3ffd698c7ddd..41362d1c2531 100644
--- a/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch
+++ b/sys-fs/libeatmydata/files/libeatmydata-105-undpkg.patch
@@ -1,8 +1,6 @@
 Don't rely on debian's way to multilib/multiarch.
 
 https://bugs.gentoo.org/550344
-diff --git a/eatmydata.in b/eatmydata.in
-index 40468db..aa143f0 100644
 --- a/eatmydata.in
 +++ b/eatmydata.in
 @@ -17,5 +17,4 @@
diff --git a/sys-fs/libeatmydata/libeatmydata-105-r1.ebuild b/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild
index 4065bab2afd0..2b6e0ab0a184 100644
--- a/sys-fs/libeatmydata/libeatmydata-105-r1.ebuild
+++ b/sys-fs/libeatmydata/libeatmydata-105-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit autotools-multilib eutils
+EAPI=7
+
+inherit multilib-minimal
 
 DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
 HOMEPAGE="https://launchpad.net/libeatmydata/"
@@ -14,7 +15,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 # sandbox fools LD_PRELOAD and libeatmydata does not get control
-# bug/feature in sandbox?
+# feature of sandbox
 #DEPEND="test? ( dev-util/strace )"
 RESTRICT=test
 
@@ -25,8 +26,10 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-105-undpkg.patch
 )
 
+ECONF_SOURCE=${S}
+
 multilib_src_install_all() {
-	prune_libtool_files --all
+	find "${D}" -name '*.la' -type f -delete || die
 
 	dodoc AUTHORS README
 }
diff --git a/sys-fs/libeatmydata/libeatmydata-65.ebuild b/sys-fs/libeatmydata/libeatmydata-65.ebuild
deleted file mode 100644
index 716221b794a4..000000000000
--- a/sys-fs/libeatmydata/libeatmydata-65.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-inherit eutils
-
-DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
-HOMEPAGE="https://launchpad.net/libeatmydata/"
-SRC_URI="https://launchpad.net/${PN}/trunk/release-${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# sandbox fools LD_PRELOAD and libeatmydata does not get control
-# bug/feature in sandbox?
-#DEPEND="test? ( dev-util/strace )"
-RESTRICT=test
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-	dodoc AUTHORS README
-}
diff --git a/sys-fs/libeatmydata/libeatmydata-82-r1.ebuild b/sys-fs/libeatmydata/libeatmydata-82-r1.ebuild
deleted file mode 100644
index 67a35edabb68..000000000000
--- a/sys-fs/libeatmydata/libeatmydata-82-r1.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib eutils
-
-DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
-HOMEPAGE="https://launchpad.net/libeatmydata/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# sandbox fools LD_PRELOAD and libeatmydata does not get control
-# bug/feature in sandbox?
-#DEPEND="test? ( dev-util/strace )"
-RESTRICT=test
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-multilib_src_install_all() {
-	dodoc AUTHORS README
-}
diff --git a/sys-fs/libeatmydata/libeatmydata-82.ebuild b/sys-fs/libeatmydata/libeatmydata-82.ebuild
deleted file mode 100644
index 1649666771ac..000000000000
--- a/sys-fs/libeatmydata/libeatmydata-82.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils
-
-DESCRIPTION="LD_PRELOAD hack to convert sync()/msync() and the like to NO-OP"
-HOMEPAGE="https://launchpad.net/libeatmydata/"
-SRC_URI="https://launchpad.net/${PN}/trunk/${P}/+download/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-# sandbox fools LD_PRELOAD and libeatmydata does not get control
-# bug/feature in sandbox?
-#DEPEND="test? ( dev-util/strace )"
-RESTRICT=test
-
-DEPEND="sys-apps/sed"
-RDEPEND=""
-
-src_install() {
-	default
-
-	prune_libtool_files --all
-	dodoc AUTHORS README
-}
diff --git a/sys-fs/lufs/Manifest b/sys-fs/lufs/Manifest
index 0d781085e487..c031b44f9313 100644
--- a/sys-fs/lufs/Manifest
+++ b/sys-fs/lufs/Manifest
@@ -1,8 +1,8 @@
 AUX lufs-0.9.7-enable-gnome-2.patch 2893 BLAKE2B c267ab97740e7f3dc31a0bad28e67f349eac9889cc99b0881942ed666277eb30c64b047d4cf7d910b79845f1b24878a427f390f5155db9d68ca2cac98318e8ec SHA512 59ee306dc0f3ec0c080738850bd8ea3fbd582ac573d74f2e3b920ddb96af69164c24437dcf545b0a33881e2f2bd609809411f89f46ea451387ce699a4f62f856
-AUX lufs-0.9.7-fPIC.patch 714 BLAKE2B 90d117159d4736cfd5fc964507e46b8d127bc5d849f881c9b1a3a9d7fa2ac00a92397f2a2b1f0651b2da96b400b74dbe65928383bd5bb2ee8b82290dc875c2a2 SHA512 8677e14d0323ce588f5679b4037a190fc686f4458b8cde65903e736f5ccbe4f7af8b643e72598d1d8acf21d41e358cb424b3ecad0d1737278ad572aad7acbeca
-AUX lufs-0.9.7-gcc43.patch 877 BLAKE2B 9cd53781407225cc84b29726412bcfdd9246252607901485d50fe77e0689d416bc9cf8ff63eb60f0ae71c11c8318653b3df5da182b3ca8bdf287b29e97083617 SHA512 4eda5f796d857d5d89b28cf2bde2dce92a1526a5824f9f15fc0418ad41e0cae315202ad5facf398efdb32c1cc9dcd8b910deaa1d7b6d134c7c7b49b5e1fcfb75
+AUX lufs-0.9.7-fPIC.patch 646 BLAKE2B 7ecf96f85169678fb4367a9aa2831c84c3905e15041a31e0f6f02a41678b7d3c56668f5adf40e47eda8bd9c86bc4459ed4203b9265b44047a8a63264cd2001e8 SHA512 e36c4e14c51f74485a46e209875d023d6900f2f362d2d0e77103edf7b2597cad1622b1ef6861c614b284ce0127d1c6baec75d3775308208275de8c9398988da0
+AUX lufs-0.9.7-gcc43.patch 658 BLAKE2B 6bdbae5d71d9f011f0c35058a5041c672eb0d504b46e6e06b9765b7d1dbddbb731cdcf8dc51e6cb565ff3b107048c60c27831f95e27a3807fa478be64ce71ebc SHA512 ee531efdad653a71df540c4b3c7158ac02551ac92173b550ef25c38156a6b3a250dd5bd77ec9a7190c1075754816893a55668df9c4edc1a58f944ab8bfea6c15
 AUX lufs-automount-port.diff 754 BLAKE2B 83b54abf4afcee61639530d781f18da370420d5dc5f9c52aa07900ee071bb7870b521f52ed42d08a5cd19c4a3dc79236e35b6909d3f171f217f9ba63ab1f9f9c SHA512 006149b123cf052e3b3e16cf301b05ae7604d3415a40c069a536afe5f0c8ab503dcc6e518f6323a0bd25a5597300f16535ce5d9caf3fb781071331271c4cef3f
 AUX lufs-no-kernel.patch 3347 BLAKE2B 3519852a28b8d4d5f38f8e90056272d2f43f896c8118161c5ee7166ea63a42e8b3d2787d2f9baaba3b4ef5446ed824c2eadfe9e334c26a78911dc7fcaec48fd0 SHA512 690e12928f206856859f94bb2ed4a9ca0d6e34fea2a9cb84c17293e54ee0230e2d01bca11cbd3ac5298f442483b3be3fb557129a044905738139b997bcf20743
 DIST lufs-0.9.7.tar.gz 537772 BLAKE2B cc0a22a1711c9d6fabb310e760455fe50d427a323ced7c5289ff00392983a14cf4ab9921fbe33c2889cea4478c16ba448db6877b585d33c5a3795838568edb74 SHA512 c7c70de89bd3f31e4fbae3e4a4acb04a6c29d0dac2b52e18a99dd2563db57ca9b3ff5e3fef53b45b9eea4b689122a30fef887973a9eb6e13b12c38fc957bfb91
-EBUILD lufs-0.9.7-r3.ebuild 1696 BLAKE2B 6b21cb2c6fcc121fc268252ccffdf913b50f22f778b2c27a9148c235a25ef9c6e0b1c56132f3713a59fd7b6382618554e6aa327ec8b9d324c8661e21f8099f99 SHA512 b381ded239d682e3cf712d221dfb28e62de27093a28e26ae8fa7c155696f12aa2d0253344616cb5740a990c0d3c97841a15c63573293726ad1645d0f3678af3a
+EBUILD lufs-0.9.7-r4.ebuild 1715 BLAKE2B 4e0dffa20d8b1cc7ba455d2a920573b53674c5f434313eb42e5c55f8a0c72c6c6649bfd6bccccf3a82a27dfce0668bef619efa74976e4c00bd09e86a9c300e70 SHA512 75d6e08fe9db87915ca09204f31059ec353e46829b02eff284d42ef9d73b2c98dd2c01162fe33b40de2fd5ef0c79836b8925de50febe85b73c8f06c9acb4baee
 MISC metadata.xml 324 BLAKE2B 839b0c3da99be949242c9193de8ae875e6780673053ef5201df7ddeec61df8a921272b9056b5acc63331efab6b02db6d94e441354a7ea68e54188724e2f95375 SHA512 0f93937ea367a04e67b3d03a4a000b4e020a3ac4ca432eaa9dccfd82211a3db52afbeb4f3fd800e2164fa22dfa6f70ffbec6ecea44aad8aac8dc675920f9ac19
diff --git a/sys-fs/lufs/files/lufs-0.9.7-fPIC.patch b/sys-fs/lufs/files/lufs-0.9.7-fPIC.patch
index 05bb1d2f5d25..2f19ab0b8bd9 100644
--- a/sys-fs/lufs/files/lufs-0.9.7-fPIC.patch
+++ b/sys-fs/lufs/files/lufs-0.9.7-fPIC.patch
@@ -1,5 +1,5 @@
---- filesystems/gnetfs/Makefile.in	2004-03-18 15:59:28.391299639 +0000
-+++ filesystems/gnetfs/Makefile.in	2004-03-18 15:59:45.316142704 +0000
+--- a/filesystems/gnetfs/Makefile.in
++++ b/filesystems/gnetfs/Makefile.in
 @@ -197,7 +197,7 @@
  @AMDEP_TRUE@	./$(DEPDIR)/vtree.Plo ./$(DEPDIR)/xfer.Plo
 -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
diff --git a/sys-fs/lufs/files/lufs-0.9.7-gcc43.patch b/sys-fs/lufs/files/lufs-0.9.7-gcc43.patch
index 3736ba62b017..a3da3f82cf6d 100644
--- a/sys-fs/lufs/files/lufs-0.9.7-gcc43.patch
+++ b/sys-fs/lufs/files/lufs-0.9.7-gcc43.patch
@@ -1,5 +1,5 @@
---- filesystems/ftpfs/ftplib.cpp.orig	2008-06-08 20:01:35.000000000 +0200
-+++ filesystems/ftpfs/ftplib.cpp	2008-06-08 20:01:53.000000000 +0200
+--- a/filesystems/ftpfs/ftplib.cpp
++++ b/filesystems/ftpfs/ftplib.cpp
 @@ -20,6 +20,7 @@
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
@@ -8,8 +8,8 @@
  #include <unistd.h>
  #include <netdb.h>
  #include <stdio.h>
---- filesystems/ftpfs/ftpfs.h.orig	2008-06-08 20:04:33.000000000 +0200
-+++ filesystems/ftpfs/ftpfs.h	2008-06-08 20:05:07.000000000 +0200
+--- a/filesystems/ftpfs/ftpfs.h
++++ b/filesystems/ftpfs/ftpfs.h
 @@ -23,6 +23,8 @@
  #ifndef _FTPFS_H_
  #define _FTPFS_H_
@@ -19,8 +19,8 @@
  using namespace std;
  
  struct directory;
---- filesystems/sshfs/sftplib.h.orig	2008-06-08 20:08:55.000000000 +0200
-+++ filesystems/sshfs/sftplib.h	2008-06-08 20:09:43.000000000 +0200
+--- a/filesystems/sshfs/sftplib.h
++++ b/filesystems/sshfs/sftplib.h
 @@ -28,6 +28,9 @@
  
  #include <string>
diff --git a/sys-fs/lufs/lufs-0.9.7-r3.ebuild b/sys-fs/lufs/lufs-0.9.7-r4.ebuild
index 617a1bfed0e8..eb06257760e0 100644
--- a/sys-fs/lufs/lufs-0.9.7-r3.ebuild
+++ b/sys-fs/lufs/lufs-0.9.7-r4.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=0
+EAPI=7
 
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="User-mode filesystem implementation"
 HOMEPAGE="https://sourceforge.net/projects/lufs/"
@@ -17,43 +17,48 @@ IUSE="debug"
 RDEPEND="sys-fs/lufis"
 DEPEND="${RDEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}"/${P}-fPIC.patch
-	epatch "${FILESDIR}"/lufs-automount-port.diff
-	epatch "${FILESDIR}"/${P}-enable-gnome-2.patch
-	epatch "${FILESDIR}"/lufs-no-kernel.patch
-	epatch "${FILESDIR}"/${P}-gcc43.patch
+PATCHES=(
+	"${FILESDIR}"/${P}-fPIC.patch
+	"${FILESDIR}"/${PN}-automount-port.diff
+	"${FILESDIR}"/${P}-enable-gnome-2.patch
+	"${FILESDIR}"/${PN}-no-kernel.patch
+	"${FILESDIR}"/${P}-gcc43.patch
+)
 
+pkg_setup() {
 	filesystems="ftpfs localfs"
 	use amd64 || filesystems+=" sshfs"
+}
 
+src_prepare() {
+	default
 	eautoreconf
 }
 
+src_configure() {
+	unset ARCH
+	econf $(use_enable debug)
+}
+
 src_compile() {
 	einfo "Compiling for ${filesystems}"
-	unset ARCH
-	econf $(use_enable debug) || die
 
-	cd filesystems
+	cd filesystems || die
 	local i
 	for i in ${filesystems} ; do
-		cd ${i}
-		emake || die "emake ${i} failed"
-		cd ..
+		pushd ${i} &>/dev/null || die
+		emake
+		popd &>/dev/null || die
 	done
 }
 
 src_install() {
-	cd filesystems
+	cd filesystems || die
 	local i
 	for i in ${filesystems} ; do
-		cd ${i}
-		emake DESTDIR="${D}" install || die "emake install ${i} failed"
-		cd ..
+		pushd ${i} &>/dev/null || die
+		emake DESTDIR="${D}" install
+		popd &>/dev/null || die
 	done
 }
 
diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest
index 10e507e5715e..ea24bf9c2757 100644
--- a/sys-fs/mtpfs/Manifest
+++ b/sys-fs/mtpfs/Manifest
@@ -9,6 +9,5 @@ AUX mtpfs-1.1-wking-patches/0005-Use-O_ACCMODE-to-pull-out-the-access-portion-of
 AUX mtpfs-1.1-wking-patches/0006-Check-for-find_storage-failures.patch 3484 BLAKE2B c6cff901a12db5254517776abef8ec58b756bcb2a10b26bcf6fefe7340bb7003a6e2d043f1c87fa586025ab71d0c692e910b3e545858c560b7e9d21193892b70 SHA512 c43ab62c8d63d6e9c2b42de74a4a25fbb6edf87d0f46128796c7e4e61704a5ee7753fafffbcfbbbc116e180cc1a8d8a3aa8a9b4cb9d3a031ffd8d3d67e201da3
 AUX mtpfs-1.1-wking-patches/0007-Use-path-instead-of-fields-0-for-find_storage.patch 987 BLAKE2B dcf215b4ad2fd16e2cef84becdc530d4faed1cbab59531be095ea000546d14623a3a3ad370f9005e3b7b42016fcc21092ecb16ccd8ea7b892e63c0fb1429fe6d SHA512 b358816389cbde3679bd1e50505f9e68de9ffe68041dfdc48af9ae64d1453d1ce7c3ab4ee4b6260a6d42d520225ad91c6cf6cd8d05cd561e3b72d102fd6dcbdb
 DIST mtpfs-1.1.tar.gz 108329 BLAKE2B 7172c1ca0b31a532d0ba1068874c0fd4012dd80da4684d69fa36355126be0c56d79570d5fe5f42876d1a98f49bbc21b0f446c08e28b62e20583bbfd4d7054f62 SHA512 627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8
-EBUILD mtpfs-1.1-r4.ebuild 1242 BLAKE2B ba8f15fb0b62c6ab0b4a5063d7263782ae00b3bce04baac5c091fa642eb774fd0e78203737b381fd5523b0d7bdbcd8cba0e41c5904bcb8a35d041cbd237dba90 SHA512 94c5de07d7d90de0ebac9ebb5f2f0a72b442fe8d47215c27a9bb4b815c6236e2f2f1103717e17e2021b725645cdbaca869f1847ed63f0118c8fd960be590a804
-EBUILD mtpfs-1.1-r5.ebuild 1250 BLAKE2B d927c05104108a374f687669e9e61b8b0945652ba3d3b4ae0c46bcdfdcaf2906ebef70d0bc93ad7e64d7b6ec8036b89b2146e5f948034a26c0743d06b6ab7636 SHA512 1c036b9c225b403bb0c4abda72e68e20fbbba03d0880f7738b14b17e57cad73d50323a5856e184c5f6aedb3ab7d20a652fdbb9c45a37bc3e9b9c4610ce8f2bdd
+EBUILD mtpfs-1.1-r5.ebuild 1248 BLAKE2B dac042ee8488b5a310154756668066cbe6972be15378ba10f416d2c0ca42b86afd0b502aa64e9b81cff5567a381900593cbae58e6ecd85145e02d56dbe1aae98 SHA512 5a9f59cadd34ca4baedde8e7b1619ee22f8311225625c6782f9a5ea216138fa7a7754bca842342c0527219d5679b60ac6e38bebca07d4819b4498c6e7874f2a3
 MISC metadata.xml 684 BLAKE2B e83930dc207e798257d2e2a2cdb065ce462e232a20c33514034852099cb3e6683fbd2905b90e328cee8b50b84e6c9f887698a1c920d164f5f910174531ab7ad4 SHA512 725d050ed87be3de8beff0e97178452e806261e704aaaaf523982deb2fc803c771949bee9ac0651747323b3294d584470e49e4877a3cf5e8f2301f477a543955
diff --git a/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
deleted file mode 100644
index deab850ea328..000000000000
--- a/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="A FUSE filesystem providing access to MTP devices"
-HOMEPAGE="https://www.adebenham.com/mtpfs/"
-SRC_URI="https://www.adebenham.com/files/mtp/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug mad"
-
-RDEPEND="dev-libs/glib:2
-	>=media-libs/libmtp-1.1.2
-	sys-fs/fuse
-	mad? (
-		media-libs/libid3tag
-		media-libs/libmad
-	)"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=(AUTHORS NEWS README)
-
-PATCHES=( "${FILESDIR}"/${P}-fix-mutex-crash.patch
-	"${FILESDIR}"/${P}-unitialized-variable.patch
-	"${FILESDIR}"/${P}-wking-patches/
-	"${FILESDIR}"/${P}-g_printf.patch )
-
-src_prepare() {
-	default
-	sed -e "/#include <string.h>/ a\
-		#include <stdlib.h>" -i mtpfs.h id3read.c || die #implicit
-}
-
-src_configure() {
-	econf $(use_enable debug) \
-		$(use_enable mad)
-}
-
-pkg_postinst() {
-	einfo "To mount your MTP device, issue:"
-	einfo "    /usr/bin/mtpfs <mountpoint>"
-	echo
-	einfo "To unmount your MTP device, issue:"
-	einfo "    /usr/bin/fusermount -u <mountpoint>"
-
-	if use debug; then
-		echo
-		einfo "You have enabled debugging output."
-		einfo "Please make sure you run mtpfs with the -d flag."
-	fi
-}
diff --git a/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
index 8cc52ebc9b74..4230a9048a14 100644
--- a/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
+++ b/sys-fs/mtpfs/mtpfs-1.1-r5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.adebenham.com/files/mtp/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug mad"
 
 RDEPEND="dev-libs/glib:2
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 4768510bc108..6cddc46b0210 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -2,7 +2,7 @@ AUX 242-gcc-9.patch 7672 BLAKE2B 1cd98213f70e6813582706e7b523925fd7956507bd5bf11
 DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
 EBUILD udev-242.ebuild 9610 BLAKE2B 03c9d20e26bf3da9a397fcad196d9c9a037776cc8f121c1bd1ed4d1a01e6e9189ed512e5aa7c8c74c5d4a17446459a24f3c77b02bcdec2c15878c69ee2a7ec5c SHA512 1a8b87cd84bd431b2e8bc483285c9700a5f0cda8d372779da7da728dd4589f416eea15e1009a281b2568a099cdc733ef711c2b6801834630a4289d2b0665f3c2
-EBUILD udev-243-r2.ebuild 9815 BLAKE2B 80c66df7f1dc24e6436c42f8a0aa01d60362ae3b571a3dac7a03aaa8dcde187a79f250b8a98f1e7f5cc51635f58b2cd3581c7bd69a3c434939936a4151c781ed SHA512 cc5b1bc6828184389edac77573a469c375328b33555e39e9d1d1596543a397eed1d954a679ed6be990fbf2e4bc21b7765e4e8a5eb7abcd6625666b4c819dc8ab
+EBUILD udev-243-r2.ebuild 9814 BLAKE2B cd9af5917344e9028e3d852d1129f437f2fa2e07d1b2f6301953a540d4bb1b184a288b6e6f65154d9e6e394ddc669bfa8c0113a10562b34cbef6f6d33828f7ba SHA512 a32d410e846f7517db189324bdb259c085361711c2522f2eab3e78ca363e39ea44366a6a3ce8a7693ef0d710e234f65a0456361231dd1b691aa6bb56ae414b1d
 EBUILD udev-243.ebuild 9570 BLAKE2B 020a845640cb14fd9ddff78b8e5526df69964d35c6eef33ab39fa30c4001558170d89e256641f9a394ebaeba7e81bc764d8765b8fe6583fe05aefb35dfcefed2 SHA512 1644eeff8e645f5514a80cffd8f357f0077514c35d489a77d088f1006e6e43930984aabc0195576be392b83bdec9ecf02c36062084471be368798a4b81891f53
 EBUILD udev-9999.ebuild 9847 BLAKE2B 7f94e3a34b82cdffe6b2a233b9197570e4af9ca4eaa7df5a49156905d21893867b569d9dec6d350eb280b5848f101364dd96d410f3c4d47d77416951de7b7ba5 SHA512 2ed67940af79cbb0bd5743e6edeb16215371a1903eaa11e0ac48de7d030404e056a5f63d7a62f12dd6b6da39f46d44835684bf0286dc83a44e406155b8d7845e
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-243-r2.ebuild b/sys-fs/udev/udev-243-r2.ebuild
index 44fb2b07b2ec..8040e69e4e8b 100644
--- a/sys-fs/udev/udev-243-r2.ebuild
+++ b/sys-fs/udev/udev-243-r2.ebuild
@@ -13,7 +13,7 @@ else
 	MY_P=systemd-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
author	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2019-11-10 13:21:36 +0000
commit	77398e424e45d9e98c1cef3c43bdadb9d56e81ef (patch)
tree	5aeffd3fc7b92fc615bd2c222fa8831aeda1925b /sys-fs
parent	bd4aeefe33e63f613512604e47bfca7b2187697d (diff)