gentoo resync : 11.07.2019

32 files changed, 241 insertions, 222 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 83b84effeafa..a9403198ac7a 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/aufs-headers/Manifest b/sys-fs/aufs-headers/Manifest
index e80bae1c0aa3..ae12969dbecb 100644
--- a/sys-fs/aufs-headers/Manifest
+++ b/sys-fs/aufs-headers/Manifest
@@ -1,5 +1,7 @@
 DIST aufs-headers-4.14_p20180709.tar.xz 3352 BLAKE2B 31b1573de9305518ef7935d7166d720f055c4b70de48943910d9041f976f483759af1998e6aa1dccff89fad0ff391686c4e18c867e700fcd4bb1211cc0004cc6 SHA512 e2c4e90c555edc072ebcb348de50e5ec9ba6e2785758d10f14e43c8a03980dfadd58bc9cd37c811648bfabda37e6ed7d0bf36d7099edd26f40672b0ca0f2f226
+DIST aufs-headers-4.14_p20190603.tar.xz 3352 BLAKE2B 771597a8812030caaf39f5b1d087fd9e815c6d4b0deda8a8f64c05e9cf21ceefd9001a6491ab87db3a3fedb6d8d7f510db334ddb32a6f1b52230a7ea83242ad1 SHA512 4cee3900ff832bbd76fe68868c60fa29b9a5680ea7ef34fdc7f838c50be699616035929734badc89afa06dc429ec795cfbf16a5a76d6928cc8cdc4ec86491a58
 DIST aufs-headers-4.1_p20170130.tar.xz 3136 BLAKE2B cda05eed3429c84dae70a5c88600e4369d4997cca5d0b8f21c82dcb3449b0b88ac27b3e3216034272a6f2ff53aa455b3eb9dc23fc7cc77473aa53943340df9c7 SHA512 d8099a59784739b76eac74de7113754981b6d2d4155eaf42f9d36ea4b6c84f6f49cd96ce0b9e19b2507674cd9b91667fe8520f1cfb7ff0e1d5c58596e784c6d0
 EBUILD aufs-headers-4.14_p20180709.ebuild 616 BLAKE2B a8db7ed67120d808ce9a17e813c9aa1c3bc644746a7f1ca2d3f0b56add1e3e5e3479e75ce49dd0d735536fe7ea5292063abdb09c57c9805929b7de16f41bd43c SHA512 811e1645d18bbfb22ea70136441c121f79a8b491625538fb81e4c096be24bee3f4dd4f426a4eb361123f17e62226d6bcb725ab3bae08590c7e5b17e22433325b
+EBUILD aufs-headers-4.14_p20190603.ebuild 616 BLAKE2B 294a106b60390098f6181dfcb2059cef5c1a03e34a6d7b8eb275dc7cc01070af6b99f58597269229ca52802b7d22c72939afc0cda3c70c006236241b8ec077f1 SHA512 53331430b07ab14274cda2b42cb7ae2689c2060df19c5175c08ec932fa1c05dcec0596e0984fd380571b78cf07c021d6c050dbe78de2b1021c8268a4c0414aa2
 EBUILD aufs-headers-4.1_p20170130.ebuild 637 BLAKE2B 4b7e239c911ef0a8b0641d1f3643f9e7860d492e142245d014b6767b14f11bcc0f8ffb3f1bd98651d68cc73314ef5d268fcb84e86d45977dc4f36f70271c4f74 SHA512 fa44465b5d9c5c4964268289fbb0b378b64f0d340ba4037b34d702e97344f9ea5cdf600319ddd44af6c4f6ef8e598dd3744f8acb5c7ff222ed1a279b6212b3cb
 MISC metadata.xml 297 BLAKE2B a731cab2c80385c087edc64d31769ae6344ee80a5aee2cd5d8693c398da639f6a79cc124b11b79795e096519a70155ad4b2d3af22d92f8fc3b0f7611eb1c763e SHA512 fdf9bf9558a618fd070f65d91b96b9037498503a4df0d06f1b595a9157c34ddaf3c13de9922f32663fb9499394d8c669fe7957dd213ec8e0ed4e66e3638d837f
diff --git a/sys-fs/aufs-headers/aufs-headers-4.14_p20190603.ebuild b/sys-fs/aufs-headers/aufs-headers-4.14_p20190603.ebuild
new file mode 100644
index 000000000000..4d859f69d22e
--- /dev/null
+++ b/sys-fs/aufs-headers/aufs-headers-4.14_p20190603.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="User space headers for aufs3"
+HOMEPAGE="http://aufs.sourceforge.net/"
+# Clone git://aufs.git.sourceforge.net/gitroot/aufs/aufs4-linux.git
+# Check aufs release Branch
+# Create .config
+# make headers_install INSTALL_HDR_PATH=${T}
+# find ${T} -type f \( ! -name "*aufs*" \) -delete
+# find ${T} -type d -empty -delete
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_install() {
+	doheader -r include/*
+}
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
index c1cffa05e7f7..783540733457 100644
--- a/sys-fs/aufs-util/Manifest
+++ b/sys-fs/aufs-util/Manifest
@@ -1,5 +1,7 @@
 DIST aufs-util-4.14_p20180709.tar.xz 103724 BLAKE2B 50df13812b090e5d8aa9a07009822f9a324091471243a76c9432ea22698a6167273e661f5ebf176fb3cc419fbe560e82ff73d6e3b37ed0a85a01e6315b06c8ac SHA512 f6330dfc0ddc36102473d9931c62a7f9a5549a3ad2b78ababedf68d335ef02b155a90327dd0c7d446182530db755b9ff756533f90c540bf8aacca5eb117555df
+DIST aufs-util-4.14_p20190603.tar.xz 104096 BLAKE2B 901c7405866cc8db490248b86e45e57375ea5d8db11505c0c15fd49f5bd9e7ea5a6c3d272bd8f001ac3db11665a9c3607565c7eb5be8cd5f45acf4b5f994ceb9 SHA512 803ce51a77c3e4942d3b8817be638c5e2440821088eeb58742eb0395b9c83f68975ed64a0410b6155b18edf0af47ef9df916be07d912fdb2bd4e94987a037fa7
 DIST aufs-util-4.1_p20170130.tar.xz 100144 BLAKE2B d3032feeb787e3864247890c2b77468cb39ac1936cebc7e2044a2a58bd84817401b0cf7ab42413ca2c6307430552b49fb642d45e04c42f2729c0a5f1ccfb1589 SHA512 bf47829bdd93472a318e3eb1fd76332a95a42b3ec39b4d3392baac419ca70bd47b7b0c6209592ad70c284ee997a71e3448e79fa0ad6b4a6db16ffa0c47ed11ca
 EBUILD aufs-util-4.14_p20180709.ebuild 1078 BLAKE2B d1627bfcac4d66856cff0040f6dec53cdf48d3e5ba8ff6b90b5722ed86b349d83f5200927c3e28bee34427e2b09462d7df076d6adbda8a2e947941d321fb6426 SHA512 d3e970e5b98fec4ccb5750614c25a5ccc27696fd00e2167d6ed1871de0c968c97649cc8c0b02597196e60637efd9a083aed30851f29064397b399274bf01ccb8
+EBUILD aufs-util-4.14_p20190603.ebuild 1078 BLAKE2B d1627bfcac4d66856cff0040f6dec53cdf48d3e5ba8ff6b90b5722ed86b349d83f5200927c3e28bee34427e2b09462d7df076d6adbda8a2e947941d321fb6426 SHA512 d3e970e5b98fec4ccb5750614c25a5ccc27696fd00e2167d6ed1871de0c968c97649cc8c0b02597196e60637efd9a083aed30851f29064397b399274bf01ccb8
 EBUILD aufs-util-4.1_p20170130.ebuild 1020 BLAKE2B e111c9619c4045c0c01d594429cbc0ba048607b0ad1724890c0e3576cf51dbf183837e9fe8f80b2e1388353a5a3d3d108e0e43cacddf9be457e7cbf92e9fc34c SHA512 e568606dcd2d50839433cb5acaa1e41be730f7feadec891541fc1ab7b8fd6a1d59a5b00fe6140a2b8d5604a55bdd8054a98de907109ff1f5992e7e785fff6f33
 MISC metadata.xml 297 BLAKE2B a731cab2c80385c087edc64d31769ae6344ee80a5aee2cd5d8693c398da639f6a79cc124b11b79795e096519a70155ad4b2d3af22d92f8fc3b0f7611eb1c763e SHA512 fdf9bf9558a618fd070f65d91b96b9037498503a4df0d06f1b595a9157c34ddaf3c13de9922f32663fb9499394d8c669fe7957dd213ec8e0ed4e66e3638d837f
diff --git a/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild b/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild
new file mode 100644
index 000000000000..98b1a6c96eae
--- /dev/null
+++ b/sys-fs/aufs-util/aufs-util-4.14_p20190603.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils flag-o-matic linux-info multilib toolchain-funcs
+
+DESCRIPTION="Utilities are always necessary for aufs"
+HOMEPAGE="http://aufs.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
+# git archive -v --prefix=${P}/ --remote=git://git.code.sf.net/p/aufs/aufs-util aufs4.14 -o ${P}.tar
+# xz -ve9 *.tar
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	!sys-fs/aufs2
+	!<sys-fs/aufs3-3_p20130318"
+DEPEND="${RDEPEND}
+	~sys-fs/aufs-headers-${PV}"
+
+src_prepare() {
+	sed \
+		-e "/LDFLAGS += -static -s/d" \
+		-e "/CFLAGS/s:-O::g" \
+		-e "s:/usr/lib:/usr/$(get_libdir):g" \
+		-i Makefile || die
+
+	sed \
+		-e '/LDFLAGS/s: -s::g' \
+		-e "s:m 644 -s:m 644:g" \
+		-e "s:/usr/lib:/usr/$(get_libdir):g" \
+		-i libau/Makefile || die
+
+	sed \
+		-e '/LDFLAGS/s: -s::g' \
+		-e '/LDLIBS/s:-lrt::g' \
+		-e '/LDLIBS/s:$: -lrt:g' \
+		-i fhsm/Makefile || die
+
+	tc-export CC AR
+	export HOSTCC=$(tc-getCC)
+	export STRIP=true
+	default
+}
diff --git a/sys-fs/avfs/Manifest b/sys-fs/avfs/Manifest
index 2b2824d0ea77..b84791a795d8 100644
--- a/sys-fs/avfs/Manifest
+++ b/sys-fs/avfs/Manifest
@@ -1,7 +1,9 @@
 DIST avfs-1.0.4.tar.bz2 719761 BLAKE2B 6bbe47136a6aedd399800ea3ee16f82c367e11f723785ebacf4ef7bd12319ad2f8fe528580e20f368934423ee41afc75b9a73ce7389a100f70e42180e2fb2dcc SHA512 3cfda7a471b5e696984acf9101312e898bc68fe16196bfee8e6a255bd182c279a6ad53fee09c0d6554a968f837e97652e95d794fa46f0d384dd41ae426d49516
 DIST avfs-1.0.5.tar.bz2 723937 BLAKE2B 49a7ba0f88e126804c8ae12d1ad9a2924311198baee85f56a17c1e9dd810bdac8d519f0fc8a8cf23b5e4d7319460108e3e27cb28a1dc7320760c42f7257460d0 SHA512 d50d8fc31a56a0dac17a14c19de3f1bae2519feb965768810d19192eba6dbe24ab181c4574ff8982883d9b76f77241a1e27f3ef12d05ab8112f3caf14e59bd3c
 DIST avfs-1.0.6.tar.bz2 729592 BLAKE2B 41c703e92921ba9393d95455f7d3dd18587b2d7f2ff46de02d290515cf6c8182d19ff117a7ce040ccaab491240b4f27a3ebd58026045ae9b0d69f47a8beeabc7 SHA512 6b9c070896c5d5abbb6a8c14a7dfd39d9b58d13a6db122b5bf1756b2da7435dfbc00a1fd04bedf99b94b76d9ec7f8c05fccc21de6b9e713fc60cfe0ec88064b4
+DIST avfs-1.1.0.tar.bz2 605637 BLAKE2B c9c64d1fdcda84ede92e0a8896e0b6508f6f2b2f086acd1edeacc87d01ba431d052d51535abd483a0652cf999df842432d02a8e90049ddeb7c5d9a269e2e5885 SHA512 415a52bfecb58cc67818a7e247e0cc40892c81431cdf13a607b4a233aa312ac900f1d33c060aa7495df50c3dda553115ab0b159950811318ca6850847ddbd4fa
 EBUILD avfs-1.0.4.ebuild 1491 BLAKE2B 44b686e4f157e63704afe64ceee6d000b81665e2e66263eaefb104baa63906dae2471b54e4b18514dbbf90658eb25ad8f8e5cf45e23f19c97143ca6ff0fd98aa SHA512 1428602ce6a1770e82b1a958e35f9fcb51dc244cafc6bd9dbecff1d5f4b8a0748fb23dc517c2703e19096c1a48f2ad8e671d33ed217ed41415ffb9b352da2f5c
 EBUILD avfs-1.0.5.ebuild 1495 BLAKE2B 6e3ba071c4ff9722a71fd3886798565145b62fbbb298a7199153814eac56ae2c13536032e260c8733dccf585d40442e5d50c8d82854ac674e67d22c612378a87 SHA512 59fc962e1989ad8759dbe8c93511c738dd4fdc276a462348249a7dfee8b6a93adc9a3f4978ddc317dc6e424888d2ea95299d052fd1bd4c3d4cf10c506b97bebc
-EBUILD avfs-1.0.6.ebuild 1497 BLAKE2B 46a81f8eb168cc4c6159abc74531bb36312fb3f59f6d66bb3c2c19f62981091bfbc421ffc97d3f666c0f1623c42fa8ad8d994afb8a931065f7e7f4aa6c6d8b4e SHA512 a8ecf6895c6676d4adb0006ad81433c4262de014d266b44a2afc6eb67c849baee447c068d78ee5e44e67682397db8a2ca2e28a198b84f62f7d741976a9a9cb4d
+EBUILD avfs-1.0.6.ebuild 1496 BLAKE2B b198029979fca9a5101689f9aa5b29b64684b879c4ce8966f674f38499de85987852f514b94c7d0078b35662374b1df3ebc3e3a8e122363e36d635d19964e51b SHA512 3c6ae0a58bf7acc4b69f019932a25dbbef5126e57ab77bd409adc2752d991273b2456deb0a7aaa170c2d08fe59bb76b6e0a8352e676d4f3fa5997956daf56098
+EBUILD avfs-1.1.0.ebuild 1485 BLAKE2B 0d6c8890fd19de44803b8c8b271b167e8f1e82349cdfe5b5a303846cb6aa450ab6be18904a1fc37525e68320543b2902bd0dedc5457a64cfd95fd8b1dcb24ee2 SHA512 a654908b37c840774128d6c77b397346d812b0c7d00d937594e4d89f1d8f5abf0a761b66b4d7c24fc2838a6c6889245c7b57feac65a2995f10d772c088102a2b
 MISC metadata.xml 319 BLAKE2B d0597cca90871778d014601140806702319a3a34784c9864d4e70a5b72fd04ec566622d8be8ba1fa3363ca5964ba63822af72ef524767c86b2f9f5535ed846b3 SHA512 805edf3205c69e9bb435c3b86d259e08044da746dfa6205343ccf4e2c2f802c8b51324d140e567a32019f79b5dc63203222221ddc9bc881683d8c9d511a38540
diff --git a/sys-fs/avfs/avfs-1.0.6.ebuild b/sys-fs/avfs/avfs-1.0.6.ebuild
index 155b11e19c13..3ff479bc85f2 100644
--- a/sys-fs/avfs/avfs-1.0.6.ebuild
+++ b/sys-fs/avfs/avfs-1.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 IUSE="static-libs +lzma"
 
 RDEPEND=">=sys-fs/fuse-2.4:0
diff --git a/sys-fs/avfs/avfs-1.1.0.ebuild b/sys-fs/avfs/avfs-1.1.0.ebuild
new file mode 100644
index 000000000000..4f16b08dfec5
--- /dev/null
+++ b/sys-fs/avfs/avfs-1.1.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="AVFS is a virtual filesystem that allows browsing of compressed files"
+HOMEPAGE="https://sourceforge.net/projects/avf"
+SRC_URI="mirror://sourceforge/avf/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="static-libs +lzma"
+
+RDEPEND=">=sys-fs/fuse-2.4:0
+	sys-libs/zlib
+	app-arch/bzip2
+	lzma? ( app-arch/xz-utils )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+src_configure() {
+	econf \
+		--enable-fuse \
+		--enable-library \
+		--enable-shared \
+		--with-system-zlib \
+		--with-system-bzlib \
+		$(use_enable static-libs static) \
+		$(use_with lzma xz)
+}
+
+src_install() {
+	default
+
+	# remove cruft
+	rm "${D}"/usr/bin/{davpass,ftppass} || die
+
+	# install docs
+	dodoc doc/{api-overview,background,FORMAT,INSTALL.*,README.avfs-fuse}
+	dosym ../../../$(get_libdir)/avfs/extfs/README /usr/share/doc/${PF}/README.extfs
+
+	docinto scripts
+	dodoc scripts/*pass
+
+	find "${ED}" -name "*.la" -delete || die
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		einfo "This version of AVFS includes FUSE support. It is user-based."
+		einfo "To execute:"
+		einfo "1) as user, mkdir ~/.avfs"
+		einfo "2) make sure fuse is either compiled into the kernel OR"
+		einfo "   modprobe fuse or add to startup."
+		einfo "3) run mountavfs"
+		einfo "To unload daemon, type umountavfs"
+		einfo
+		einfo "READ the documentation! Enjoy :)"
+	fi
+}
diff --git a/sys-fs/bindfs/Manifest b/sys-fs/bindfs/Manifest
index 0c1ae711bce0..aee5f53f82b7 100644
--- a/sys-fs/bindfs/Manifest
+++ b/sys-fs/bindfs/Manifest
@@ -1,7 +1,5 @@
-DIST bindfs-1.13.10.tar.gz 404078 BLAKE2B e4b5e4c6fea8463eaf3b612b7e3b67c0f64f8ebf430825c056c090d2f089c47a4fc8038c50744b43732f01529c082433a0920fc2257463810a6e2f5e69b89496 SHA512 0fcd07e412ce2a355310cc2eda4e005d045ac2c1744353eca118c921f647d4fc16d98269fd1e9d8bdc225602a915b2893746da77ae28c9cd07fa4eab0e03f4c7
-DIST bindfs-1.13.11.tar.gz 404296 BLAKE2B d3b4ddf9d26f39223b7b663fc2b362b359c423b6c202026502d78524a8b54da9878e4953785aca0fbafa5ca76242f2c590ab941f997b33ba38c9a5239e58ccec SHA512 53b27e42ab7c117e28275dbeb23e43dceba86838ad54b2b8ae3c6e7b3631d0356597559d0746f2cd8363226ffb62bff2461d7a227ff82578f1d47c4b19bdd3f2
 DIST bindfs-1.14.0.tar.gz 406723 BLAKE2B 1fa3821b7cdc92c10c93d7593fa2246a8acefdaf8be98bdae65424950aa54aba331f514da14d0fc1018af27aedbf276b3b0909ecf1c5e65673ea3fc1247b7f75 SHA512 0efe0a66a0e2e7b9c463dbb76ef6c33797c5e6ea92c4d84c5ecf579dcbc560b83107e8a6d29c2e395cf2294308aa0bfbdf000e3c47d0ec823b86a90b394f0dbe
-EBUILD bindfs-1.13.10.ebuild 478 BLAKE2B e918f5d8b816f4db54fe9218273e13a9f3856199329ae40cad25b48788b649a973d36783b60b61a45f27df329c4cf0c0a45b6e05c492c609faa24b471b5ae9d0 SHA512 a589ef3276f74a2cfd5cb1aff409d3d5f608fdafc70846b9ee1590e6f8c8cd3f53d1710f5cc1fabdbcb7ef575afb7917373a19d73391a8fbe466af33673e911f
-EBUILD bindfs-1.13.11.ebuild 478 BLAKE2B 824442dde04d0da3220bf3d43af63bdf7e6ff7ee24c43258e57ed7a90cbf199b38e159f135029eee24a4b2814ad08ef1a884cb9e5e55b8b6b8f440456024e842 SHA512 e20c7fd5378c2bf121e2627589baa1a95ada8f1111f340b860d4eaa9684ed049fc3d4b66389d5370bc8f97f17d4f279acf8e8bf7a07ed574011af20cafaed00d
+DIST bindfs-1.14.1.tar.gz 407141 BLAKE2B 749578af588a8f9f778e799ae57b3303f6ae8c83f174aa6df96a92c6af4edcd3f76a332b18b55493e1f60cbbf44c66def3083f8cfe85c9b1af382f1ec6166fd1 SHA512 a0cf4f2cff147f5496c15a9bd9634ccdee323e299a4b132f2c2166a9d5379a26a151a14a45aec6950f8cf9c7ac3e9d2b9a97fee60b3130f5dcb20d65a43a1702
 EBUILD bindfs-1.14.0.ebuild 478 BLAKE2B 90d44601a2bd2825d73409e5c393eb6171438694ae864301e04cb60136c23aff30a5c18dd291bad21ced261badaae989b2861d9a90478c9d697e81c396e31965 SHA512 7b31f97aec25686a0ca7a4ced6f52391a944a02d2cf3eacc45b458bd7ab6d0640615e15d4adba55d2d191beace44ae79b985b4593abe74fd95fd82e1e105a5cf
+EBUILD bindfs-1.14.1.ebuild 478 BLAKE2B 90d44601a2bd2825d73409e5c393eb6171438694ae864301e04cb60136c23aff30a5c18dd291bad21ced261badaae989b2861d9a90478c9d697e81c396e31965 SHA512 7b31f97aec25686a0ca7a4ced6f52391a944a02d2cf3eacc45b458bd7ab6d0640615e15d4adba55d2d191beace44ae79b985b4593abe74fd95fd82e1e105a5cf
 MISC metadata.xml 432 BLAKE2B 8d4cfae65a05e718922b04a0e70d5dc9b22bea0339d6640015341b45b6a8c6d7c7d48a98290fcb2d0b039aab14a9feae1e6c527a7f483b421069174525d4e619 SHA512 1d22b2bad552a622edcebc9b52823a812f483588257c379077e1cc323bfffea67ed2802a3f62c9264cadf355ae3f96ab4705d005286c598f25447efe813fb06c
diff --git a/sys-fs/bindfs/bindfs-1.13.10.ebuild b/sys-fs/bindfs/bindfs-1.13.10.ebuild
deleted file mode 100644
index fc8ae04fd9a9..000000000000
--- a/sys-fs/bindfs/bindfs-1.13.10.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
-HOMEPAGE="https://bindfs.org/"
-SRC_URI="https://bindfs.org/downloads/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-RDEPEND=">=sys-fs/fuse-2.9:0"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-RESTRICT="test"
-
-src_configure() {
-	econf $(use_enable debug debug-output)
-}
diff --git a/sys-fs/bindfs/bindfs-1.13.11.ebuild b/sys-fs/bindfs/bindfs-1.14.1.ebuild
index 1ac71904499e..124f1fc221b4 100644
--- a/sys-fs/bindfs/bindfs-1.13.11.ebuild
+++ b/sys-fs/bindfs/bindfs-1.14.1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 DESCRIPTION="FUSE filesystem for bind mounting with altered permissions"
 HOMEPAGE="https://bindfs.org/"
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 398de653147b..3b59cfd0cfb0 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,5 +1,4 @@
 AUX btrfs-progs-4.19-be-bswap.patch 1035 BLAKE2B 153ffa73bf79eca3172bd566d7daffd84d52fcb01fd69ad30547ed44a2ce1eec23b6eb95bbcb0259a966a152f796f5c57f022b33cbf7063c4e53236e93c6b3aa SHA512 695d21bd1dab1196596e4f6e2d14020e0b0e938493459feec33ac21f9ab6ecddc5c14a79ba738166d6010662b4f6c75232c6d3393d8eb69c5d7c7d0560448051
-AUX btrfs-progs-5.1-LDFLAGS.patch 1168 BLAKE2B a7e6e85a34d88fb5dc4d4b9eb2d56e708f2a4e1ca5d800f456e514a1f1f712f4800499331ca3490f3fc72150456f6a63eaf17b9c734a1560a00f5ea3240430bc SHA512 8b6db43b0c106ed494a6ea1b1c0e7a78018480c18fe6b765f063a86da586aa77a9c7edcd8cd98f165e658153fb749e3659ee45b437a9e273cb27f78bacd1971a
 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
@@ -9,7 +8,7 @@ DIST btrfs-progs-v4.19.tar.xz 2001340 BLAKE2B 117087adcb57e4ebf6a2e9c66bf0ad2b09
 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.1.tar.xz 2042196 BLAKE2B 1a0ccc04dc55f66c639a64e4c6c4f8683376fa2e273217ea2fd544d7e3b666e95bbaaf35809e25bdc84e92b1430af698d8bb57ab2c5f8ce4899920e1e71b7c05 SHA512 45a42b2c64b8120eb4ce6fe9e37571e197bd142403223e96af758adb00c116086d6790c9ab7f9707b4784f7b67af18b50ccf990b0d8d79571e04b81b11859154
+DIST btrfs-progs-v5.2.tar.xz 2047448 BLAKE2B 5b30e82036c33d0fb7b562c3fcd512247cd7946eb0679a5389e6891b205e8b06ed9d4c29fdd1f13f13a5dd30c4204a94ffa78843f9e5001dbb715e67f2efb46a SHA512 a62d3977aa62d7bd71a589525b7dde140fa8f5f2d484d6bd0546606be124b9776667ef3a5e9a084a1ea2b905b6a9125e5892637fcf9cabc79f0707b967aac9c0
 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
@@ -18,7 +17,7 @@ EBUILD btrfs-progs-4.19.1.ebuild 2853 BLAKE2B e655b6e505031d6e1e304d5d5bba4f0b19
 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-r1.ebuild 3075 BLAKE2B 565c20a00dff58014d6fc76591dffaeff105dfdfea9a951d8b8340be018068f4dc53ee6311e8d6665356b8f5b3fa802dc268b010823bd9b075dc78791182aaea SHA512 a6c2e8a3578916d7a0f515b192fbe75c6d16f16bc7080321496c78899b7e5013db92455aab79c8f55ceb7d170106ca5ce6e6e02d067148e72b781225ae803724
 EBUILD btrfs-progs-5.1.1.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
+EBUILD btrfs-progs-5.2.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
 EBUILD btrfs-progs-9999.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
 MISC metadata.xml 759 BLAKE2B 3f94ebaadb23c54121e8ffa1b80549b9e8a9d977d26ddcfdd8772e549e55fc762fcca5c8e2374a562dd9992086949eff626be71aa6da8326f8847cbc4f791fb7 SHA512 ababf03834be253af5402e167e7883fc73c6ad47198369eba02557e07ec8baaa81140837315e98979dc4b95ca160d2d984e970acdbf0ea4db9c2a9e9deddc9a8
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.2.ebuild
index 033e0ad66d1c..4680b387969c 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.2.ebuild
@@ -76,10 +76,6 @@ fi
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.1-LDFLAGS.patch
-)
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
diff --git a/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch b/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch
deleted file mode 100644
index fa1fe7a5ede3..000000000000
--- a/sys-fs/btrfs-progs/files/btrfs-progs-5.1-LDFLAGS.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-https://github.com/kdave/btrfs-progs/pull/172
-https://bugs.gentoo.org/686284
-
-From 7cdb5de31e954416e740886d46809e4883c31ddc Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Sun, 19 May 2019 08:51:28 +0100
-Subject: [PATCH] Makefile: apply LDFLAGS to libbtrfsutil.so
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-libbtrfs.so already has user's LDFLAGS applied.
-The change also applies those to libbtrfsutil.so.
-
-Reported-by: Michał Górny
-Bug: https://bugs.gentoo.org/686284
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index e25e256f..4c67d187 100644
---- a/Makefile
-+++ b/Makefile
-@@ -424,7 +424,7 @@ libbtrfsutil/%.o: libbtrfsutil/%.c
- 
- libbtrfsutil.so.$(libbtrfsutil_version): $(libbtrfsutil_objects)
- 	@echo "    [LD]     $@"
--	$(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) \
-+	$(Q)$(CC) $(LIBBTRFSUTIL_CFLAGS) $(libbtrfsutil_objects) $(LDFLAGS) \
- 		-shared -Wl,-soname,libbtrfsutil.so.$(libbtrfsutil_major) -o $@
- 
- libbtrfsutil.a: $(libbtrfsutil_objects)
--- 
-2.21.0
-
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index dae73c4d690b..335dc6b97d90 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -3,6 +3,6 @@ DIST btrfsmaintenance-0.4.1.tar.gz 21621 BLAKE2B 36632d64022c7bf64548b0f6076640e
 DIST btrfsmaintenance-0.4.2.tar.gz 21826 BLAKE2B 0efc06b6780d7e75573958cd979b991580d518ab756ae80c9f4328f113ab7de87367c6730c23b408298919ac740da3b0ec85ae76face60ad97bf75d9aaa2a178 SHA512 802c131edfbc07bca13b89cd8bfc90923b2f23ba780dcb07009a4c4991a588c66a6ffe780938e66ab632201980e5087cd0751cd9185a8bae1a5faba84bf87233
 DIST btrfsmaintenance-0.4.tar.gz 21622 BLAKE2B 844d467b7712093370c1d6391e26d5046deb84cee6fd60b5774743415c75ad00a1e27c0be21004c260680b72b5615dcfd01b84f1eba3d57f7c9c5d22b6750d8d SHA512 2d19e82c03b291d157dc5f763dcb094330fd1a4aaee6215dbe576a5da44f71f4adee55fd06c60409e4699ac671d2fc73628f202f4f68270910eeba782f0ad153
 EBUILD btrfsmaintenance-0.4.1-r1.ebuild 2061 BLAKE2B 4d019f8de6871da3319c52d040c2d23f7abbe52f804450801a20d97451b5ab70b7bd705f1aa0f23fd383fb57e82e80b38a55c8fd2da0792186bfa80e52726d3b SHA512 ba9f8b94f49b686f637086f68a6db23437a13bd661ee03ae2b4b26e114e0aa5b179ae29d3a9191348750be6b47f950f0d55ddb8bdb288fcee93545a78019df8f
-EBUILD btrfsmaintenance-0.4.2.ebuild 2006 BLAKE2B bdd2d00116d5c882b01698cc96429d3add7c8dd781d118ada7ac37c9817a868f6e7c1096e105c9cceefcb7e2e24e4b7f8e8a29dd483e1cd99f406662e8c2c4ad SHA512 963294525a89daae6a116c0ac7a39c8b2eb9eb1ea51c3d8b70691bceda8cecdedb7a72575b2b6a1cb655d607299328372f957eb6f585c2827df5630f6fb8d192
+EBUILD btrfsmaintenance-0.4.2.ebuild 2020 BLAKE2B 1f14812ae0d4e72c14abad57dc08ac6f343d2906edad6a368b28ffacd12c630b98562f52c68951f3567d95f3979e2387d22c5349fdf840ccb13772c40dc09c45 SHA512 134a2d4c7232a53d25e2b5c4b0950529dac4aaf25d3a64f9f926edc09fcdf0fc0a514003448672ace474b6e4b56d00938c3892ee6f54382ee2318c84b3663cae
 EBUILD btrfsmaintenance-0.4.ebuild 2052 BLAKE2B 066777c1ce55409a50ea2e1a640881cc0161ebc128e1d5d84bf7081f0ce5834bcf00ff5dc2d85d8fedccc7d2283223bf0842d227604fc6bd9ab3c2ac31de249c SHA512 80c3f7ae618e6b14dff3aae9d8387654de280388cbb7607d8a347d016c7c73a5015942fd1bf1a2fbbbd1f1e68e139c1d3af393aee6d4bd56b6836ee7c65c3b1a
 MISC metadata.xml 564 BLAKE2B a54366a1b7a22e5b6f7ba8814ebcc75e4fb6185a5ce49f021bc2dec51277f31f82cafd4cf2de29918b97aa9276485bdc0dcf42d21e65d71636d3ab6ea4bf78da SHA512 6affb15730bb1ec7d8601c46ac5ea9f48b603d36825b364831459025764080641f51644af6c838d0e6de9edca766236662d068ee5893ba811687c4a1d7585bdc
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild
index 447173a0be08..ed7fa2413f8b 100644
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.2.ebuild
@@ -16,8 +16,8 @@ IUSE="systemd"
 
 RDEPEND="
 	sys-fs/btrfs-progs
-	virtual/cron
 	systemd? ( sys-apps/systemd )
+	!systemd? ( virtual/cron )
 "
 
 src_prepare() {
diff --git a/sys-fs/cryptmount/Manifest b/sys-fs/cryptmount/Manifest
index c1ea4bd47897..85a90957b2aa 100644
--- a/sys-fs/cryptmount/Manifest
+++ b/sys-fs/cryptmount/Manifest
@@ -1,6 +1,3 @@
-DIST cryptmount-5.2.2.tar.gz 743638 BLAKE2B fdcf0ec18904bd847d905a1241c0e4e9c825b9c73f2cab0406426d56d22a0ef4d26701d9955b4f7975cc1cedcd650758cd4aebb29805e6cf8a8c05ef9202b8b7 SHA512 e8767728c49b7f8dc4f777778d5a9d1b912ea2c4c5363dbb5035a208aa1bd1f2565ce12a0666d75e9ee677bde04029082d20c22cf46a216f5e87a4adf7093572
 DIST cryptmount-5.3.1.tar.gz 748020 BLAKE2B 63c66717ed8a8ede983894564576d26720a571b47bd33f3cd160596d831c017c7239b307eb9fb8112c6a51f91799117a47392675f9fe53c0286ada84887d528e SHA512 c4bfb7a2bd2f672dfed014d3a4b1feaa4d20237f9b658ea981a0a054e83ad4d0282089a006ceb769ee05e0cf6ecd004c97b48d69973ed630330e77bf13925680
-EBUILD cryptmount-5.2.2-r1.ebuild 1134 BLAKE2B 7540b21b4bff4363d7b104ca0ddf71ef3c5339747b5401596aa75ca76f76fd1b19d750c8cb00062ce20e5aa6888798b7501d59bfd57d70caed06edfe8a607269 SHA512 5bbca0cb292b45cc01143343cf87adddb15be390b1e1681b27b55dee01d2827bae57a040b959d704ee49ea16a775548778e76d3eefa1994f5a09205e73981f3e
-EBUILD cryptmount-5.2.2.ebuild 1118 BLAKE2B 598a04d8f3a7b37a235f7157f55411697d4df916da320046e2b839ec17fdff5580c715d69edf95414f17f86adb71cc9b8c8e049c1df55ffca7cae3afb10d7ab8 SHA512 5746a3eb8cee6c46f8ec86c7ace69b0fde7ef48c744c4c567512fac5bb8da0d71817de302d38aecaee8314968f9ec953f8f3e830927fe6cdd971fa95e4e05f51
 EBUILD cryptmount-5.3.1.ebuild 1711 BLAKE2B 4fe52f5d39d50587e9edcb19cef6646a82d5b19e9e2a9f61b640453fff5141804fff0de5c9c275f40ed2a6a00b371644b8e7f12839d61560ac241620c0aaaee4 SHA512 9696011888cac486764b90f9f94df669bc49a978aa25ce04d9bb4704f181aec8af89e26414b14e4e9e8b63a9f1fb38d84a127a1e1d6e559d6d0ea8dd6c579184
 MISC metadata.xml 2231 BLAKE2B f4b90363aa03426bcbf4a908d226ae1c5a1256fc62007005c58e97607bc2d0a984b9fd1fe78460d236c1d11ffd2bc3dd387fc5b97910c32fc7d21d67556379b2 SHA512 ff5bb67a85f5312b1df9be3a596fcfa08a7e7089df44d50efb63603946c8cfac9e6061519469b1b7126222b6ad7479110f092f629ea05ce9e0692caf52e463c4
diff --git a/sys-fs/cryptmount/cryptmount-5.2.2-r1.ebuild b/sys-fs/cryptmount/cryptmount-5.2.2-r1.ebuild
deleted file mode 100644
index 690f70da85bb..000000000000
--- a/sys-fs/cryptmount/cryptmount-5.2.2-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd
-
-DESCRIPTION="A utility for management and user-mode mounting of encrypted filesystems"
-HOMEPAGE="http://cryptmount.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="nls +ssl systemd"
-
-DOCS=( AUTHORS ChangeLog NEWS README RELNOTES ToDo )
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	sys-fs/lvm2:0=
-	nls? ( virtual/libintl )
-	ssl? ( dev-libs/openssl:0= )
-	systemd? ( sys-apps/systemd )"
-
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-CONFIG_CHECK="BLK_DEV_DM"
-ERROR_BLK_DEV_DM="Please enable Device mapper support in your kernel config
-	-> Device Drivers
-		-> Multi-device support (RAID and LVM)
-			-> Multiple devices driver support (RAID and LVM) (MD)
-				<M> Device mapper support"
-
-src_configure() {
-	econf \
-		--enable-cswap \
-		--enable-delegation \
-		--enable-fsck \
-		--enable-luks \
-		--with-libgcrypt \
-		$(use_enable nls) \
-		$(use_enable ssl openssl-compat) \
-		$(use_with systemd)
-}
-
-src_install() {
-	default
-}
diff --git a/sys-fs/cryptmount/cryptmount-5.2.2.ebuild b/sys-fs/cryptmount/cryptmount-5.2.2.ebuild
deleted file mode 100644
index 5708d3b0ad3d..000000000000
--- a/sys-fs/cryptmount/cryptmount-5.2.2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info systemd
-
-DESCRIPTION="A utility for management and user-mode mounting of encrypted filesystems"
-HOMEPAGE="http://cryptmount.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-IUSE="nls +ssl systemd"
-
-DOCS=( AUTHORS ChangeLog NEWS README RELNOTES ToDo )
-
-RDEPEND="
-	dev-libs/libgcrypt:0=
-	nls? ( virtual/libintl )
-	ssl? ( dev-libs/openssl:0= )
-	systemd? ( sys-apps/systemd )"
-
-DEPEND="
-	${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-CONFIG_CHECK="BLK_DEV_DM"
-ERROR_BLK_DEV_DM="Please enable Device mapper support in your kernel config
-	-> Device Drivers
-		-> Multi-device support (RAID and LVM)
-			-> Multiple devices driver support (RAID and LVM) (MD)
-				<M> Device mapper support"
-
-src_configure() {
-	econf \
-		--enable-cswap \
-		--enable-delegation \
-		--enable-fsck \
-		--enable-luks \
-		--with-libgcrypt \
-		$(use_enable nls) \
-		$(use_enable ssl openssl-compat) \
-		$(use_with systemd)
-}
-
-src_install() {
-	default
-}
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index ccadd43aa2e6..d3db67a22c44 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -14,5 +14,5 @@ DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78
 EBUILD e2fsprogs-1.44.5.ebuild 3915 BLAKE2B 910133a809c3d28f21623a38b1aa4a5ec162298e32360db7cfa8e7a345bb440c0208e47fecc9a57a56eccaf59d2ff0699cf793167cdbb4c59b92acae00199d3f SHA512 bb486fadb929ffe64df5066d3bb5c1a96e604ad17f164ddd06956ca35cfcb2f0283a4e1161ebe4ae5a5aecea5db927a3a48d6215aa24373d91508d05b517f15a
 EBUILD e2fsprogs-1.44.6.ebuild 3863 BLAKE2B 57d1ab60969ce206b11aae22c1c5f214bcdac17a9e741829cc5b3ac105919e68a736f9f2f5263d037965e63a692263b58e5615ce6c14a0c3dd16710d2299bd80 SHA512 ef1981716a3f7495ea68ff8ff2800549f51390eb3f1d9ef037f141fa1e2fbc2bdcc945277456d453dae40e5fea6b092100526cfc8cd750128ebf45920075c149
 EBUILD e2fsprogs-1.45.1-r1.ebuild 4094 BLAKE2B 1ed574459a9121ee18c9963d9311b320b0e37838167223f94d27b35b6093e4dea10f9fe6c931cbf1628d6908e5d9e9f3146a4e1c341c1cd2982f7c8ed874d92d SHA512 adc9340b6eec174d8a3d481581e1a5db9c051bda3e25c3aef3d0ddbb24da6c76eadbbd5c698bda4bfe613011cd7549457bd1a4435b70018b04f30c4d1c0a0665
-EBUILD e2fsprogs-1.45.2.ebuild 4094 BLAKE2B 1ed574459a9121ee18c9963d9311b320b0e37838167223f94d27b35b6093e4dea10f9fe6c931cbf1628d6908e5d9e9f3146a4e1c341c1cd2982f7c8ed874d92d SHA512 adc9340b6eec174d8a3d481581e1a5db9c051bda3e25c3aef3d0ddbb24da6c76eadbbd5c698bda4bfe613011cd7549457bd1a4435b70018b04f30c4d1c0a0665
+EBUILD e2fsprogs-1.45.2.ebuild 4091 BLAKE2B 220fc75f3f2d379d706c1e5907b2c3f4fe9f236e41eee23f836481552fcf43d44e2e1fd341738494badc480b466422a4817c3c5287abbf6b07101cf557c89741 SHA512 4dbd4d25b18f93bffb6fb2e8d5a6e20e1d82c5d5a71387330ff670e0f75eff9819300951800d8d5e5371820853fa1d9e41c2455cfdda823a93fdcb6820df6479
 MISC metadata.xml 578 BLAKE2B 08094a62570e432f1ed7370d2eb402523f17e7cea8ca1370302b602de949e812e6d277a280be23d0a0f515b6b39ee18d974b1ef0d008d2267fcc4e7bb41ff3d9 SHA512 094625d323bca75af0884ee4d2c1503437a50aa1a323c52e054b49edf890afc0b20f936b2833c82e944b58615996b76e7fc2a502aa87b3c66a385e7698d2d6cf
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild
index c0ce32929e1b..0a5a645000b5 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
 IUSE="cron fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index 10ee50036a88..1f5a4a2c831d 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,3 +1,3 @@
 DIST loop-AES-v3.7n.tar.bz2 373901 BLAKE2B 5cac9bd55f35a6cf0c056a6a2e75a48f49c1d23b7ebe1821e10dab522508e64ed23e5993dbcc19dbdeaab6c315ee4e71c8ecc17d9da41a5ad0794abc92563d7e SHA512 d190561f92a47292285e44c728bf1fcf9b7dd9c54f970ebc11a2988686f409515687a22028187756baaa4622903564e2646971a63eba13557c6ce78dc1f0bb96
 EBUILD loop-aes-3.7n.ebuild 2032 BLAKE2B 2218843eb73db2ed63c8e0f19be6a9f16c4084982067d6b153ca9d42688e5c3e1aa5118fe3a5720b5b5d175b20550d1250dcbf872acfff19d0a63b6d0dfccab0 SHA512 abd4f49db32d9808ccf1d4363e967bbd48cfd0db2390afd6ddb591b2540d44bb66233fad18cc7a0756cc91448a5abc20eaee24641b66bbded73fefb184859309
-MISC metadata.xml 633 BLAKE2B 364ea3f67381f2878af750cdf6da32980f96bad6f277d4cdc4c943e72a554e50e9c91fdce007a8ac63e3f9c715481740688b242947a8c19a25996b9f5621d726 SHA512 75e4ed0408d32a91012b03de7ac1f4ac4aac8a20ccc73ad612a9fe79e9046d79eee189e40692c13822e219b8ee35800b04fe36c88168be24248222c6ddd6193c
+MISC metadata.xml 491 BLAKE2B b726731c854dd7b4182a576762cce2784dd0d5f1a4f8d4fc0e10b9e50935bbbde4ecb0909aac75a23a516a7f32863ff67d4206ae5f9240ca3e48c53f33c55aa9 SHA512 46ef3955bfa5040af14eb8add9ee827d82bd2a364c38391e2bbcdfc4b0f152938087846e85bef6edeba3880409951118fdf70acee563a2dfa076c97e521431b6
diff --git a/sys-fs/loop-aes/metadata.xml b/sys-fs/loop-aes/metadata.xml
index 40d08800ede3..cf6f48a49730 100644
--- a/sys-fs/loop-aes/metadata.xml
+++ b/sys-fs/loop-aes/metadata.xml
@@ -9,8 +9,6 @@
 		<flag name="extra-ciphers">Enable extra ciphers</flag>
 		<flag name="keyscrub">Protects the encryption key in memory but takes
 			more cpu resources</flag>
-		<flag name="cpu_flags_x86_padlock">Use VIA padlock instructions,
-			detected at run time, code still works on non-padlock processors</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">loop-aes</remote-id>
diff --git a/sys-fs/mp3fs/Manifest b/sys-fs/mp3fs/Manifest
index 8e4dac4631dd..5ef5ed7471a9 100644
--- a/sys-fs/mp3fs/Manifest
+++ b/sys-fs/mp3fs/Manifest
@@ -1,4 +1,3 @@
 DIST mp3fs-0.91.tar.gz 357098 BLAKE2B 39f77f1f6d2c6e86aa08be925060c6cc72e0737ead2578f5b7ac5cfcf92aaf27dc31ae10e38646d0460c0087a7100229bc150ec443879b7c1c15c485cf3946c8 SHA512 9499566afbaf181acd9efb8a4d6253e288ab9be0c8b036b2993553d0d4f4692d7dbcf34ac03787d8dbbfc35b2cc29e1d78612933c428a908c9c48290fedb8681
-EBUILD mp3fs-0.91-r1.ebuild 532 BLAKE2B 363edbe4e1e0f1fee923a823c99df7cedd30d6a99369b811df3ef78313d6b57545fb4d6106c5189754603660c549c60307445eaad678ba5c209b2a557254f3d5 SHA512 7a3480bd298d0f60223c0c8ef91a09d9f00cdf56ad301a32cb61680680998aca9635a9a03b6a202914ab04db8d6df349ee1396e033816d9ee8d003aa150acca2
-EBUILD mp3fs-0.91.ebuild 509 BLAKE2B 1274b24c136a10aea0b1f551e1a783e229b1dfa41764efb4f288b8e031116d198aa31f455e9bb70508a7f9dde6861855e155693480410246295e809b6235f5b1 SHA512 1ef7af20667d796f28b76d37fbccfe550987b1d15590a379dd991efaf7c9571a0190b44bf301069eb158034783a4371268992b4ceeee56a4b68828fe11638459
+EBUILD mp3fs-0.91-r1.ebuild 528 BLAKE2B 4fa86b39e4c7f876d72efaeed62d1a8549742687df17e7e843efba2f67a1037a785517ee316d9df6b19c0add8359be291a8491d234cd18738497f71cd69286b8 SHA512 26d3d16a16fae151954f6ddad30e4186416b1ca3b4ad0ebd6a8a745c289c2efa698ad168bd32acb52ab78d1a3da543c1ace8f9704e56dfb1732680a4cd07b409
 MISC metadata.xml 326 BLAKE2B 9689902b13674b4fb2e4a98e94c6a798b6fcef9e873d3681ccae6d466836090ca8d4ae79e0c6d90d35a6790215616e0d3021df5d3294686382d631e5695a2de4 SHA512 66983dba89d7cf95e671fd0e382778b3a406348e979a20baa24db0e049468550497154b2809f231dc4409f803f94b057f4de89facf6f63a1a5ec14919be2ddac
diff --git a/sys-fs/mp3fs/mp3fs-0.91-r1.ebuild b/sys-fs/mp3fs/mp3fs-0.91-r1.ebuild
index e3b560646d84..76e7779cab45 100644
--- a/sys-fs/mp3fs/mp3fs-0.91-r1.ebuild
+++ b/sys-fs/mp3fs/mp3fs-0.91-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,12 +9,12 @@ SRC_URI="https://github.com/khenriks/mp3fs/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RESTRICT=test
 
-DEPEND="sys-fs/fuse:=
+DEPEND="sys-fs/fuse:0=
 	media-libs/libid3tag:=
 	media-libs/flac:=
 	media-sound/lame
diff --git a/sys-fs/mp3fs/mp3fs-0.91.ebuild b/sys-fs/mp3fs/mp3fs-0.91.ebuild
deleted file mode 100644
index 781cd6151251..000000000000
--- a/sys-fs/mp3fs/mp3fs-0.91.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="a read-only FUSE filesystem which transcodes FLAC audio files to MP3 when read"
-HOMEPAGE="https://khenriks.github.com/mp3fs/"
-SRC_URI="https://github.com/khenriks/mp3fs/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="sys-fs/fuse
-	media-libs/libid3tag
-	media-libs/flac
-	media-sound/lame
-	media-libs/libogg"
-RDEPEND="${DEPEND}"
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index 8eae9f2217d5..8e16cb0ce009 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -5,10 +5,10 @@ AUX multipath.rc 565 BLAKE2B efb26199eddb75c5e87d1ab40aa8cb4fbaf9f7a2bfd7a20add6
 AUX rc-multipathd 402 BLAKE2B c44befc14ff361d27278bd7850aada4fb8e309c0459d9d1bdb3ca1a670929b2d8b40275c73cd937ab3245b95460b3e9e12ecf199532ec916e1cf5f3e634d3bbb SHA512 466296ff69c0f56c312a8b88445ca0719c8c6b794511f7e228812d63b859bd120b965301c8923e3411a3e1b196e7fb9c48dd7dbe004efe4c65ee7f9798cc3e11
 DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea
 DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379 SHA512 6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
-DIST multipath-tools-0.8.0.tar.gz 447076 BLAKE2B 10a93a2654decd2377414188013d2141e34288fe119fa7c54047d95b825ef9ae64b20de1067d3f37a904b58be587997842f7a62088701fe1c1e6a078283b56e4 SHA512 8b6081109e535d0e392233bcedda930bc6d4b529ebe23bc45b276026311bc997e3cf8b39c1a86e4962c464faa69512202c0f6fb3d1f06c6445f8141853ad1bc4
 DIST multipath-tools-0.8.1.tar.gz 447883 BLAKE2B c840ede03fd15763cd947a71596bf3a2e5935433d956208225f4fd6ed55074e2d9709f8b0e6c059a58d44b6649f52b3564d6651ea1af6186138357ba37f86b14 SHA512 1f87f974aace746ecac8af6ae330de16affe49cc89a5660b28be3b1c4a69f822da01042432176e64b5de6ad3a6568044954fdce8e3aa31e85611a595a4939947
+DIST multipath-tools-0.8.2.tar.gz 458879 BLAKE2B a5aae1c9b211c788b658cf53e1c966bb9dd39dbe3e81058d6c758ba11cfd77ebfbc9d70bfde5b41d00fb1d4fbf31f3d2e6d58c69179e8842b9f5b8e9edd0b755 SHA512 c809e652479a8b6b141fd69810dbba316d93368ec6cf1c57f479ccde50e3ccf0bebe1b62e9db4791135aec45a90761f9100635f0ffa4b175ce9c2d82ebcea5c9
 EBUILD multipath-tools-0.6.4-r1.ebuild 2545 BLAKE2B f22afaabe21080d64175063c82e5a731d9e789968d1502b3771ade1eeb3ba3bf539d9cd1d100b75875a5f86fe85ef1ed77b8fee5178829ae301df23eadb0765c SHA512 21c5474be753c3762af2e1b73aab89d666d6f477d04b612360925ff10d994b1fd1152204a5254a39d87438cce274c0d57cb7003e37679b49d22b159fe5c0cfce
 EBUILD multipath-tools-0.7.9.ebuild 2068 BLAKE2B ec54d156a55c25a9c7cc9c6c3854a48c8bb1d404119398bfdb9defcb5c011e1824ce82f53cd5cc4d8e81a63bb412d11cb79ac276406e140f2808b911f7912947 SHA512 8e1fff8d8c71b2cac948e5501edef63acb7e0ba760e7b56a22644e0e08ce3cb9b70c29e69550f6a356113154f740a4e95199ac14e44b3d2db338605954d19be4
-EBUILD multipath-tools-0.8.0.ebuild 2068 BLAKE2B 5c9ca01560d80aeb6a2bb008f029f3782e539f41b5705c2cfacc428203572d5f343555b41107964c5082c476230f4b270293c49d2553ffb8f1e972ee1b54dcb7 SHA512 e23cdd535e66844c1ec622b896449184f950112a28e603361c76ad44b6e35591b0c8d0600758611be157ce49f919167b893d5b7346756902925bc3c39d8e578f
 EBUILD multipath-tools-0.8.1.ebuild 2068 BLAKE2B 5c9ca01560d80aeb6a2bb008f029f3782e539f41b5705c2cfacc428203572d5f343555b41107964c5082c476230f4b270293c49d2553ffb8f1e972ee1b54dcb7 SHA512 e23cdd535e66844c1ec622b896449184f950112a28e603361c76ad44b6e35591b0c8d0600758611be157ce49f919167b893d5b7346756902925bc3c39d8e578f
+EBUILD multipath-tools-0.8.2.ebuild 2077 BLAKE2B f6ec67513e237d0c85116baf9fc020bc32354682ca1cfb2bef0bd14df783d2b3ad2a832ef7cada9e47dfa23111f6eee53acc8cf82c928b1b5fff3278e640903c SHA512 44bb10811f8f7595ab32e6770b12cfe4d666cdea0c480453c5a9d7ce3af0fddc34974433d43000714b34baa7f428c1f8d2dcf8dc9325b6537732cc0b3c74baee
 MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.0.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.2.ebuild
index 956caa89e080..fe7820dee263 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.0.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.2.ebuild
@@ -24,8 +24,8 @@ RDEPEND="
 	rbd? ( sys-cluster/ceph )
 	systemd? ( sys-apps/systemd )
 "
-DEPEND="
-	${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	virtual/pkgconfig
 "
 
diff --git a/sys-fs/pysize/Manifest b/sys-fs/pysize/Manifest
index 8cb134390d13..87e43dedf9d4 100644
--- a/sys-fs/pysize/Manifest
+++ b/sys-fs/pysize/Manifest
@@ -1,5 +1,6 @@
 AUX 0.2-setuptools-automagic.patch 265 BLAKE2B da39d6dc75ead004365561b443966a388b3596073d21ba05b8faad4b77c7dae8ce994e72ce878141c81dd7b3350a52d57550abe5b3a3bfea9bc669f0d5208bfc SHA512 8caa271dcfb016c81392e0f590e06f6057d297e9bb5196e9362372c725d218fbef911561e6528c624c2acf133b0ab8947e2b5ccc58704dc2ea5e0cbab0011dad
-AUX psyco-0.2-automagic.patch 587 BLAKE2B bb411ae9f7f1437cb59f5a4dd70bdce931ba95cbdef0d04d9e816506478351baf235579d569ec35b04317aca29cc9e2842e8512e761c5e5b5ed3d642c6bc43c5 SHA512 a0f254b2f7b659bd63fbee10fe0beba79871f7da15f63f951c9794147d700a0f9073ce3039713bb649074cb6380ea18b321c0140cf85f2c192bee59686a04fa2
+AUX psyco-0.2-automagic.patch 591 BLAKE2B 2e28396f8236fcf0a7d832155893785fa514846cc964b3ede2c6a59f96ba9b650f8a60e4e75b9a0fabfdb865f425af7b2e01cee2799f8a717a07294a00c207aa SHA512 04cdf174c9fdab2abca56fa84704d83fba976fa8cd6a2a40d704aa54dd46e733e7b2ac8e236da6b8e003b06fc8c55691fc0eff2c7666b3c2eb672d5607f86983
 DIST pysize-0.2.tar.bz2 498930 BLAKE2B ada679a30073f7ac27e632be80f44891d6b84137db4a0ae27d406aaf36a9c8c90f9f1700da1a69615cf4f92ac4ae27f8b70cea5bfe06a3f48de25a58f507d39f SHA512 621e6e8de75d3486c196cf59e29f1c01eca151139a1d8518ace334d92533dd2df19fce52a3362c3b8abbb1e3b244148609a081832ae53f91bccc65f5f7fa57a5
-EBUILD pysize-0.2-r1.ebuild 1579 BLAKE2B 9e3c4e14bc96a7f48c30d431dbd18e5e7bc6a4235560b329bda0fe4b2e1fb815a6e291b2a25b16d1d6447f0dbb81802093f5dcfa5a57faafa15d544b24b981c1 SHA512 0c0d6f3c86d75b1789072ef7817a6c280ac4baebeea10878e96f8e2eb284f83e6d27640e99ae0eb4226953d22a953635499f7cd5953b6eb51d0507dd8e5ed62a
+EBUILD pysize-0.2-r1.ebuild 1663 BLAKE2B b18ef0c79d6d852c5ae600d5ddd8486b539d0338e08fb8d4c6c87eef1220cc684ad09e916e889f2b0ce13c9e2ae6a8bd533318c7968f08f903b5a281dfadd940 SHA512 d7e63489fec1d0a4e3ef04afa632ece677f18db914d1a5fd144ddae46fe14442dff52819a61ad5fa05360ff6e7630724af5971f380172c80e07cd8713ad06987
+EBUILD pysize-0.2-r2.ebuild 1665 BLAKE2B ace1b8caf687480edbbe4925dbdf33cf9a1627da2c0797af0810344a00e59d0c77fcaa98a79b559041b23bcadc680eaf57392a63c9adf8b41fa622309245f4bd SHA512 0177389204f8ced3834fcfd765c74103ccc172bcfd36a9015e2cdb5a825c7fb45a445fb681fd516d33fea1d0e56227c43ca72d200e0a30c97b7f38b66fe440a3
 MISC metadata.xml 219 BLAKE2B 813585cd65d05a9ef9aaa9a9fca8cfa66b803be8df8b300a6adfe0263e593ab53afd106180cc44391c9c27129ea9fdacdd8b1c37841e6aa33d833278b8c7dd9f SHA512 e075cd1d2568691a299ae945f75e194b462a394f88f7b3e5a60c4529cee7ac7e7a275204602085f15d024c3496f21554a18a24002770e9c5ef0ce64a74597602
diff --git a/sys-fs/pysize/files/psyco-0.2-automagic.patch b/sys-fs/pysize/files/psyco-0.2-automagic.patch
index 696f81fa4feb..72129804b88c 100644
--- a/sys-fs/pysize/files/psyco-0.2-automagic.patch
+++ b/sys-fs/pysize/files/psyco-0.2-automagic.patch
@@ -1,5 +1,5 @@
---- pysize/main.py	2007-03-11 16:09:53.000000000 +0100
-+++ pysize/main.py.new	2009-01-02 00:08:43.384827054 +0100
+--- a/pysize/main.py	2007-03-11 16:09:53.000000000 +0100
++++ b/pysize/main.py.new	2009-01-02 00:08:43.384827054 +0100
 @@ -69,17 +69,8 @@
      stats.print_stats(40)
      os.remove(prof_file)
diff --git a/sys-fs/pysize/pysize-0.2-r1.ebuild b/sys-fs/pysize/pysize-0.2-r1.ebuild
index 00d9596d3c9c..867db7463b78 100644
--- a/sys-fs/pysize/pysize-0.2-r1.ebuild
+++ b/sys-fs/pysize/pysize-0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,6 +18,8 @@ IUSE="gtk ncurses"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
+RESTRICT="test"
+
 RDEPEND="
 	gtk? ( dev-python/pygtk:2 )
 	ncurses? ( sys-libs/ncurses:0= )"
@@ -49,6 +51,10 @@ python_prepare_all() {
 	fi
 
 	sed \
+		-e "s:/tmp:${T}:g" \
+		-i tests/tests/*.py tests/*py || die
+
+	sed \
 		-e '/for ui_run in/s:ui_ascii.run:ui_ascii.run, ui_ascii.run:g' \
 		-i pysize/main.py || die
 
diff --git a/sys-fs/pysize/pysize-0.2-r2.ebuild b/sys-fs/pysize/pysize-0.2-r2.ebuild
new file mode 100644
index 000000000000..df91d9b7fc8a
--- /dev/null
+++ b/sys-fs/pysize/pysize-0.2-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="A graphical and console tool for exploring the size of directories"
+HOMEPAGE="http://guichaz.free.fr/pysize/"
+SRC_URI="http://guichaz.free.fr/${PN}/files/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="gtk ncurses"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+RDEPEND="
+	gtk? ( dev-python/pygtk:2 )
+	ncurses? ( sys-libs/ncurses:0= )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/psyco-${PV}-automagic.patch
+	"${FILESDIR}"/${PV}-setuptools-automagic.patch
+	)
+
+python_prepare_all() {
+	if ! use gtk; then
+		sed \
+			-e '/^from pysize.ui.gtk/d' \
+		    -e "s~'gtk': ui_gtk.run,~~g" \
+		    -e 's:ui_gtk.run,::g' \
+		    -i pysize/main.py || die "Failed to remove gtk support"
+		rm -rf pysize/ui/gtk || die "Failed to remove gtk support"
+	fi
+
+	if ! use ncurses; then
+		sed \
+			-e '/^from pysize.ui.curses/d' \
+		    -e "s~'curses': ui_curses.run,~~g" \
+		    -e 's:ui_curses.run,::g' \
+		    -i pysize/main.py || die "Failed to remove ncurses support"
+		rm -rf pysize/ui/curses || die "Failed to remove ncurses support"
+	fi
+
+	sed \
+		-e "s:/tmp:${T}:g" \
+		-i tests/tests/*.py tests/*py || die
+
+	sed \
+		-e '/for ui_run in/s:ui_ascii.run:ui_ascii.run, ui_ascii.run:g' \
+		-i pysize/main.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	pushd "${S}"/tests > /dev/null
+	PYTHONPATH=.:../ "${PYTHON}" pysize_tests.py || die "tests failed under ${EPYTHON}"
+	popd  > /dev/null
+}