gentoo resync : 15.01.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-01-15 15:51:32 +0000
commit: 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree: e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sys-fs
parent: 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)
97 files changed, 614 insertions, 914 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 8c61bcf6dd21..47fa68971b1a 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/android-file-transfer-linux/Manifest b/sys-fs/android-file-transfer-linux/Manifest
index 5ccf0c0d015a..49d66d694904 100644
--- a/sys-fs/android-file-transfer-linux/Manifest
+++ b/sys-fs/android-file-transfer-linux/Manifest
@@ -1,6 +1,6 @@
 DIST android-file-transfer-linux-3.8.tar.gz 780911 BLAKE2B 07b4e7670125b1ff382e7c6b1e36427fe0c1fd9665106d73144de5ca68692ae390496985fe83550ec90a64a83fa45b27e4e6d6738e4590ca8c5078a4814ac141 SHA512 b311b76658b57d16cd11c8f5bf03630adc6e0f1939d985a75e7effab584c93dbb82e65fb4cf84a9ef453c901c7f7d3100b96737de20577235fae6fd156a03da1
 DIST android-file-transfer-linux-3.9.tar.gz 781268 BLAKE2B 63032a39b39cf31b8d051c0069c0357f0b6ed5bd9e592ee5ce1f5e95438ff27571ec7d58789eb865a1896097c3cebf0ec30a89526b62c93694d71ca29e95d415 SHA512 7468ff19d2b4ae0f768eea70ec45246da11c4e541d07a9548d057c080adbbc905f76dcdff18c4c8478cd19aee6992d02beaf8b4275d7302997652e25351ab5c8
-EBUILD android-file-transfer-linux-3.8.ebuild 1212 BLAKE2B 5f5d6b810c630b6376306834226be2537cb7bcf2705ef3c69b272c77e08181e9539d7a7a2f69e7068bddfbd6c83e63e5a799f314ab6800e29f31c1017673410e SHA512 1ffb129dd108c2c917fadfd9f5d99095a0bb67c845eb69e51835a06a0a2296501fe446ee0a0c95bddf60af7e3f938a75cfd1e610543070df0c226c4198859ee6
-EBUILD android-file-transfer-linux-3.9.ebuild 1212 BLAKE2B 5f5d6b810c630b6376306834226be2537cb7bcf2705ef3c69b272c77e08181e9539d7a7a2f69e7068bddfbd6c83e63e5a799f314ab6800e29f31c1017673410e SHA512 1ffb129dd108c2c917fadfd9f5d99095a0bb67c845eb69e51835a06a0a2296501fe446ee0a0c95bddf60af7e3f938a75cfd1e610543070df0c226c4198859ee6
-EBUILD android-file-transfer-linux-9999.ebuild 1212 BLAKE2B 5f5d6b810c630b6376306834226be2537cb7bcf2705ef3c69b272c77e08181e9539d7a7a2f69e7068bddfbd6c83e63e5a799f314ab6800e29f31c1017673410e SHA512 1ffb129dd108c2c917fadfd9f5d99095a0bb67c845eb69e51835a06a0a2296501fe446ee0a0c95bddf60af7e3f938a75cfd1e610543070df0c226c4198859ee6
+EBUILD android-file-transfer-linux-3.8.ebuild 1194 BLAKE2B cab174e5582f94aead2dde5bedd357dd045beb912f07df3d677d59b1244c38c6a1a8424a6cfb5a277b22fa8f8199602c1003765554ccf422fb55138678b6927d SHA512 448b714c40bf84705876697d154a77d58e6ffb2c782cde0b5187ec716c6f5492ea4f82adcb7a8ac9906c6350a2c6c38e09d6e87fe978ae2ccf24371e81ab1d3a
+EBUILD android-file-transfer-linux-3.9.ebuild 1193 BLAKE2B 8b0d02c8d933b9dcb08cd4d256d2b349694fb4db8a6fc07fff613aad18b217fefe0290a12cb3544dd765c68cf956141b9d1d232571914177bad2461c812235f5 SHA512 fcfc9a94eace56b09890fb2cf4abeece387a9d934c2ae483ec17ba5a62282685dd4609ab59176e51e19b10171d0946b60159d3a9440e0e616d2ef13de0316522
+EBUILD android-file-transfer-linux-9999.ebuild 1194 BLAKE2B cab174e5582f94aead2dde5bedd357dd045beb912f07df3d677d59b1244c38c6a1a8424a6cfb5a277b22fa8f8199602c1003765554ccf422fb55138678b6927d SHA512 448b714c40bf84705876697d154a77d58e6ffb2c782cde0b5187ec716c6f5492ea4f82adcb7a8ac9906c6350a2c6c38e09d6e87fe978ae2ccf24371e81ab1d3a
 MISC metadata.xml 429 BLAKE2B 8d4f35c4537ff2fbe3f410e1d07a5e973b13f644d8a22b2f0dbddefc360ba851802ea8c0af29383dd791f4df26f0d235acfc35e3051e295512d0c9fbef19e9e1 SHA512 65bc09b634fa9f7d501ca82d4b64ed6ab524d226dc2e47c8b52db340cb5614280ace108fdf1bcd37b6ba80ea48e7c5a249c43da5053fadb7d5993950b5448874
diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.8.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.8.ebuild
index dbd8f4ce067c..96cfef233539 100644
--- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.8.ebuild
+++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Android File Transfer for Linux"
 HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}"
 
 # required to override src_prepare from xdg eclass
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -48,7 +48,7 @@ src_configure() {
 		-DUSB_BACKEND_LIBUSB="OFF"
 		$(usex qt5 '-DDESIRED_QT_VERSION=5' '')
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_preinst() {
diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.9.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.9.ebuild
index dbd8f4ce067c..e2ce2ae66cfe 100644
--- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.9.ebuild
+++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-3.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Android File Transfer for Linux"
 HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
@@ -13,7 +13,7 @@ if [[ "${PV}" = *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/whoozle/android-file-transfer-linux.git"
 else
 	SRC_URI="https://github.com/whoozle/android-file-transfer-linux/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 LICENSE="LGPL-2.1"
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}"
 
 # required to override src_prepare from xdg eclass
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -48,7 +48,7 @@ src_configure() {
 		-DUSB_BACKEND_LIBUSB="OFF"
 		$(usex qt5 '-DDESIRED_QT_VERSION=5' '')
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_preinst() {
diff --git a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild
index dbd8f4ce067c..96cfef233539 100644
--- a/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild
+++ b/sys-fs/android-file-transfer-linux/android-file-transfer-linux-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit cmake-utils xdg
+inherit cmake xdg
 
 DESCRIPTION="Android File Transfer for Linux"
 HOMEPAGE="https://github.com/whoozle/android-file-transfer-linux"
@@ -36,7 +36,7 @@ DEPEND="${RDEPEND}"
 
 # required to override src_prepare from xdg eclass
 src_prepare() {
-	cmake-utils_src_prepare
+	cmake_src_prepare
 }
 
 src_configure() {
@@ -48,7 +48,7 @@ src_configure() {
 		-DUSB_BACKEND_LIBUSB="OFF"
 		$(usex qt5 '-DDESIRED_QT_VERSION=5' '')
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_preinst() {
diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest
index 96630fdc3127..ecaff092bd36 100644
--- a/sys-fs/bcache-tools/Manifest
+++ b/sys-fs/bcache-tools/Manifest
@@ -10,6 +10,6 @@ DIST bcache-tools-1.0.8.tgz 22153 BLAKE2B d40a64b02e0d66ef8868151870715f6e6ab546
 DIST bcache-tools-1.0.8_p20140220.tgz 22153 BLAKE2B d40a64b02e0d66ef8868151870715f6e6ab54633e4875c32d0e03dfe1871e5aa98d7e133b9eed583ac4898b1598f38b71e47109210009ca51c4dfe9dbd31768c SHA512 21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc
 EBUILD bcache-tools-1.0.5.ebuild 950 BLAKE2B f0841d328abef9b5259718584d3eeaba692a94a6acaa70d9a4f0c8b4230b52d1576fdb374249aa56950d6b64e677111d95fee3249ec8c28605fb2db51dff1a2e SHA512 94e89384c4783604f1a930ed840428deb9574fbae37653ac5e6c3d315be62fb3497ba6a463ef95f3a0fa5a983a56cff84d55dba371b6f3ce7f2d39ab6323f028
 EBUILD bcache-tools-1.0.8.ebuild 950 BLAKE2B f0841d328abef9b5259718584d3eeaba692a94a6acaa70d9a4f0c8b4230b52d1576fdb374249aa56950d6b64e677111d95fee3249ec8c28605fb2db51dff1a2e SHA512 94e89384c4783604f1a930ed840428deb9574fbae37653ac5e6c3d315be62fb3497ba6a463ef95f3a0fa5a983a56cff84d55dba371b6f3ce7f2d39ab6323f028
-EBUILD bcache-tools-1.0.8_p20140220-r1.ebuild 1597 BLAKE2B be77bb0278de0900a07072600950e732d0212b249350c9de31b1633b3e06fd2db659af0578ef733868442c148c597de6e9e7dca76035ae0a7883b503900aa107 SHA512 3722ba541aed414ce8bb3539e0b0fbc3b66f5d323b33615ae317604cb78df10fc12ca7a95e2c2e4d4324401999fb83851583ec601585ddc591f8dc9633119b7a
+EBUILD bcache-tools-1.0.8_p20140220-r1.ebuild 1593 BLAKE2B 99145a86a5a640d4628373c5b67e794b7713ff423b29d8b54846b1402825d5b13a0aadcfc7b1b57ded802821c1f156c8759be16d11b007a26b723523ca6e82eb SHA512 3eb5f56845da92058890379f1afc42e2b04481ba3e17487076c087f40d7480a84d6983c426614e2e11d91ce072215a95d836fad57adb1303b2c6ab56924bd22b
 EBUILD bcache-tools-9999.ebuild 994 BLAKE2B 11e9b8fec92d414fdb4bde15d4e359a9b0f30ac9d09f1fd6f7fc94a5c4e4bf1e07d0e48b75735e238c88cceb88ab94e0ab7b8d5b8169dad173a2051632bc209c SHA512 d329bdbaa5f93eb42cfe8e7d77416d01f279db42f3f28f3186399253641442e064395db9ea9ea56db26f8cb9d3fd432eac986799c3f342bf1187fe1885709f02
 MISC metadata.xml 304 BLAKE2B 57596b1ecdec4efba5eea65141ea49a3a5a12e4efa840bcadeded836dcdec0169f723917e52d28c56f6c0aabc6d3af587a9d276d88dd30b5978d901d72feae52 SHA512 4b5575ff0ece142ff6839b8a8a81c7c0515ac42993f5ca415d53d3a85a7171ff565332edbb237448cd662abe6f1d1ffa5dce0eb21817dd861a728f0652dcb541
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
index 7f2f14527624..0a67fc7a5f00 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit eutils flag-o-matic python-r1 toolchain-funcs udev
 
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index d0d4ec583be9..d152af23f7b3 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,11 +1,11 @@
 AUX btrfs-progs-4.19-be-bswap.patch 1035 BLAKE2B 153ffa73bf79eca3172bd566d7daffd84d52fcb01fd69ad30547ed44a2ce1eec23b6eb95bbcb0259a966a152f796f5c57f022b33cbf7063c4e53236e93c6b3aa SHA512 695d21bd1dab1196596e4f6e2d14020e0b0e938493459feec33ac21f9ab6ecddc5c14a79ba738166d6010662b4f6c75232c6d3393d8eb69c5d7c7d0560448051
 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-v5.3.1.tar.xz 2077644 BLAKE2B f2943fd2215cfc65095e361824deb862c1934bb734c0f3073d8d0a7cb40c606e9e8054e36ae467f6d67f3ed58120493b9515f6a1d0d1062f864dd44521d1bab1 SHA512 7e7ac18a1ced5a8e5db7c0651ac438a48242fb4ca045b944527ed07ac91e87397dbab62b99d67d782501a632f4178db605e81912dfa48ac831d07177f96876fa
+DIST btrfs-progs-v5.4.1.tar.xz 2107476 BLAKE2B 1ea58f49b0f8185e944010804e544643a2eafeea58fecb480b13095c362350c218f0602fbb43a96705a81befe88ec3e3abe35cc90d4732006479b059aa7fed32 SHA512 56381b37036aecea61b758fb4971abfeda24a387bb3a828f7d54eb068982a37763a8ebe2bcc6be61d6a8bc2057dddcd4754325b236e14d8ec02e58cf711f192f
 DIST btrfs-progs-v5.4.tar.xz 2103432 BLAKE2B 8ed1321c61d73b66bd27b37a255056e601302dacdcf2dd3122d1b7c41e537ebd1aa5df51100e61458084ec15efd6a1aa478d13f424d45d33d7454d886214a994 SHA512 cc445b9e2b7c5a0adeaa0c467de797f240e4ee9b58c6ac51b9dad51bc0ba0c580fd265efebc04fa46dc23e5b3c4d6baf3ad0b8e2e82728cf34ef51973f028a90
-EBUILD btrfs-progs-4.19.ebuild 2895 BLAKE2B 319a48ec9c610dfd28ccd91dbc11a978e6faf21f764da675d3ab5ed568d1d4beee4aacdea6e51dad68d5c17eddcd0081cbfe23ca862eeff576668c3c71182336 SHA512 3d34478a49484d2bf9cf4309c728886b7dc99f08a5d42f65225bd836f3e12411bec8140f3860e3b48cd7a6695212314fa5a4bdb75d9f5a2419e0a88e933763e1
+EBUILD btrfs-progs-4.19.ebuild 2893 BLAKE2B b11fc0e091e342de288c20688397ffa1bba00643ab9fb4088ffa4725af823bd4c1e715b5e9b99db920387eff86001b7fef2e4a2294ef7fb6b550aa4a25a40038 SHA512 227d27a7c13c8fca2ae5a4d33ca43463d3261b3be758e8cb322e34c69a241441bcf555a20eab91c73a196fd0cd9bba4dade7407bbd0c706b6bb50f4f8949965e
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3aebd699880baa42196d1fc632ef36023401fa142d46f3d919c256a0b49209fee96f96b3a9e858e67c6b35f3298044c556ecdfcbf883532f134e4a3874b6e193 SHA512 af818f7c469477dd83fa3129d4f7065aaec0652fda04498c7f1aeeb03a3c60e4dd502545efdc24e37839d73d22a7fc4f82023a302f77a03c01ce016bd43b4aad
-EBUILD btrfs-progs-5.3.1.ebuild 3023 BLAKE2B cc4ecbb80df68e9fd2c714c53321a0599518461eed995e99a9af0792bf8fc4e739a7b930f3be8db6f8b271bc02d2fdd1c9fce6d7e24ea04c5aaa4e0d52db65d5 SHA512 3de10575039286ff068d01bdaae9ebf368e433476fc04fa03e9a88cad9e0f379a97760f2e3a52cf00ca9afb5f1d8e9867787cf9a610337a87952a4fe4bfac376
-EBUILD btrfs-progs-5.4.ebuild 3023 BLAKE2B cc4ecbb80df68e9fd2c714c53321a0599518461eed995e99a9af0792bf8fc4e739a7b930f3be8db6f8b271bc02d2fdd1c9fce6d7e24ea04c5aaa4e0d52db65d5 SHA512 3de10575039286ff068d01bdaae9ebf368e433476fc04fa03e9a88cad9e0f379a97760f2e3a52cf00ca9afb5f1d8e9867787cf9a610337a87952a4fe4bfac376
-EBUILD btrfs-progs-9999.ebuild 3023 BLAKE2B cc4ecbb80df68e9fd2c714c53321a0599518461eed995e99a9af0792bf8fc4e739a7b930f3be8db6f8b271bc02d2fdd1c9fce6d7e24ea04c5aaa4e0d52db65d5 SHA512 3de10575039286ff068d01bdaae9ebf368e433476fc04fa03e9a88cad9e0f379a97760f2e3a52cf00ca9afb5f1d8e9867787cf9a610337a87952a4fe4bfac376
+EBUILD btrfs-progs-5.4.1.ebuild 3021 BLAKE2B 897e13c0ac0c7cb1672e7378a6d019bf7c37dcb2ef06ae67caf839090ac1b2c9449f188a34558ea562adaf0fa82cad335ee0644652e5b298e55668925a18bf09 SHA512 aebd9316b8b7c80b458337b8a22544bacb393dc8ec7fedab75f7986c6caf1e7e60128f5b53c3d0e3f58cd45a03fd35aa729f8331d1f30c3e44e2dea5964878b4
+EBUILD btrfs-progs-5.4.ebuild 3021 BLAKE2B 897e13c0ac0c7cb1672e7378a6d019bf7c37dcb2ef06ae67caf839090ac1b2c9449f188a34558ea562adaf0fa82cad335ee0644652e5b298e55668925a18bf09 SHA512 aebd9316b8b7c80b458337b8a22544bacb393dc8ec7fedab75f7986c6caf1e7e60128f5b53c3d0e3f58cd45a03fd35aa729f8331d1f30c3e44e2dea5964878b4
+EBUILD btrfs-progs-9999.ebuild 3021 BLAKE2B 897e13c0ac0c7cb1672e7378a6d019bf7c37dcb2ef06ae67caf839090ac1b2c9449f188a34558ea562adaf0fa82cad335ee0644652e5b298e55668925a18bf09 SHA512 aebd9316b8b7c80b458337b8a22544bacb393dc8ec7fedab75f7986c6caf1e7e60128f5b53c3d0e3f58cd45a03fd35aa729f8331d1f30c3e44e2dea5964878b4
 MISC metadata.xml 759 BLAKE2B 3f94ebaadb23c54121e8ffa1b80549b9e8a9d977d26ddcfdd8772e549e55fc762fcca5c8e2374a562dd9992086949eff626be71aa6da8326f8847cbc4f791fb7 SHA512 ababf03834be253af5402e167e7883fc73c6ad47198369eba02557e07ec8baaa81140837315e98979dc4b95ca160d2d984e970acdbf0ea4db9c2a9e9deddc9a8
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
index 895c7e396bd2..a6727a95a5ea 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 python-single-r1
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.3.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
index d9472cc887d7..43710cbc3332 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.3.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.4.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 python-single-r1
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild
index d9472cc887d7..43710cbc3332 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.4.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 python-single-r1
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index d9472cc887d7..43710cbc3332 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 2008-2019 Gentoo Authors
+# Copyright 2008-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{5,6,7} )
+PYTHON_COMPAT=( python3_{6,7} )
 
 inherit bash-completion-r1 python-single-r1
 
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index ff65c0d9675f..58697982f352 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -2,7 +2,7 @@ AUX cryfs-0.10.2-install-targets.patch 1296 BLAKE2B d43ada858124c67242fdf537ae3d
 AUX cryfs-0.10.2-unbundle-libs.patch 15634 BLAKE2B dc484cc722cf80e605f52f3b193b1ae5747ad01b796a6b7d8fd81b03be9bcde456591f94d2839c3be3a39dc2a9975ba503d8ad369bf838232157cf1385ef43d6 SHA512 815956b160f5f117a5c4f89babe088e6f485d89a58feb12d514ff0fd3d39752db6695f7a9a2e279d88eb3ef490394dd03ee8b0ca2d04f66793096fac742ae45c
 DIST cryfs-0.10.2.tar.xz 7902252 BLAKE2B 704d124ed32a8a958f400188af99498cedb706ccfc004131b677a113b6ab2733942becb1ab64fd06d0b9d5b39f7abe832b3b0669caaf2b6feb7c6577c8c7fbfd SHA512 e49dd6d1e402d968cc4df0e8ca0460a01a27e4e73482041dca0fa9cde905a91d12e2bda18d257a044335e32e316b9363cecf374eb2ca621924b394dd2fabcb8f
 DIST cryfs-0.9.9.tar.xz 977928 BLAKE2B 927d5f61be99a6400cfd53de6291e14ae32f446d281485901e758341f138a2efdfb7385b6c205db6f865dc83f6fbd9ede8fd1bb5a7957fb242624d78d2523eaf SHA512 18f0ce954dc9958b52a77aac85d4d30d03409e4f88c27ec3e904a6014f5257e12fe47a4f3bb628f6ebf3b5aa8cb9d3a59e0aee76d83a3f6bdd4ef864b66898aa
-EBUILD cryfs-0.10.2.ebuild 2282 BLAKE2B d96f7737c0b29bcb3884c5f70fc8f233b6cce44e2fbf4e28b83189bd6fda2f149a410fe98637318ff5c165796b8d5f6a69fd37d507e70bb879d854d091da06f9 SHA512 e272ef3c1ad24f2a0da51c6256ea6077a0086cb77d72eeae99bdbb37263438b83c07d6af288404889f90e2158a25badb18fc80e4c0e83854c9cc441fb1548dd6
-EBUILD cryfs-0.9.9-r1.ebuild 2444 BLAKE2B a981f4eb4c12024d8ca880e3affe8097f12dd68d3188320b0959c51a343e43052be1cf1e25cdd3f893baded41a6c66df55e61f9e4c72597bb69bb1e28b39be6a SHA512 8b3f8b7458e967324ff819ad62e3ca86fee76f4d89cbf78b9c075fb5b324785808d44ffc2ac0ef2e0818e837b7b797b3e4128720265c9e5a8e8efa1b48dd357e
-EBUILD cryfs-9999.ebuild 2335 BLAKE2B c7d37ff9619607f7cf585295ae95316fe5fea02253c931a742ae7a1831c4405688f5b4a83002c2f865808bce54758f336dad3f40581f17d4e2cec52f9a100486 SHA512 34bf3ab0f15ccc7e3d43bc2e0256d042c7909083bd27645b51c57b5b5517838ee0e1a75b31612401a0a8c0347c06fb98c4791896a23ad2c47b41befb127df5d2
+EBUILD cryfs-0.10.2.ebuild 2280 BLAKE2B 738f0a4aea0a7d110c50a2ea605fb720ca53e495e20d835499f01b9bc4ad3d2ad19b8421c23520ced0062aff4a96defd3439198874fb62752d472b05e88048c6 SHA512 e5ae2fdbeeb39971fc06b0c9cf8de82808f24a6658ed78e06c43f81020b4726b4ccec237868fb7334ee3187543807772e7774576ce9e13aa5efe67fbf5f86d42
+EBUILD cryfs-0.9.9-r1.ebuild 2440 BLAKE2B 503eac24b88da768eb4a7d791e85c2841a0601de0f55ae05c9bac17401b9dbe2534fd5461d65fc7337fc95008c11e90027ae4848d886ae9e7f0ee1fba5127a86 SHA512 716ec453ac0b5cfc5e4625c0974cc8129cdf2736dc229ba340b8368ed06a8b0c40c9460cdb76bac9a05804d504d24776627a18bae52ee04f7e9ff6bd0e5ddd00
+EBUILD cryfs-9999.ebuild 2333 BLAKE2B e2d82cc079bf5b05a02be0acea431699c6963e98bacfda0cbe2e2772a66a709266d483243a9308c35ac6db27a4b209ed6feac2ee04e9b5322b8df0f9a8f255b1 SHA512 ecf9abae1036d0fdb8379742f10d50748ee8581faa044148ecbf21bcbb2326155e9f20cf580656e1052b6efb31a3710be069b4bba34596dbf210c4f19e0e2063
 MISC metadata.xml 605 BLAKE2B cfbabba2fc835d75ab64ff6ea27f87639d27b0d8591d5d318e2c1768f68cb48a50995b7a96b045ba6da3491c4a50219a8a69de6a2efc28325b3bc852b4abf213 SHA512 e7b1aba09cebc2786c664b1f9dbbfeb7baff97536af721953c4eb2dc10d84c97e02277fa5c4532f8bb022a344731d6ea65be81cb3cc88c25d4dea70dcd6ce250
diff --git a/sys-fs/cryfs/cryfs-0.10.2.ebuild b/sys-fs/cryfs/cryfs-0.10.2.ebuild
index 3be99d5e1469..a348a7b36d9e 100644
--- a/sys-fs/cryfs/cryfs-0.10.2.ebuild
+++ b/sys-fs/cryfs/cryfs-0.10.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit cmake-utils flag-o-matic linux-info python-any-r1
 
 if [[ ${PV} == 9999 ]] ; then
diff --git a/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild b/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild
index 7465d202882d..2a9e7684358a 100644
--- a/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.9-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python{2_7,3_{5,6}} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 inherit cmake-utils python-any-r1 flag-o-matic
 
diff --git a/sys-fs/cryfs/cryfs-9999.ebuild b/sys-fs/cryfs/cryfs-9999.ebuild
index 0201a999cbce..e51d307230e3 100644
--- a/sys-fs/cryfs/cryfs-9999.ebuild
+++ b/sys-fs/cryfs/cryfs-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 CMAKE_MAKEFILE_GENERATOR="emake"
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 inherit cmake-utils flag-o-matic linux-info python-any-r1
 
 if [[ ${PV} == 9999 ]] ; then
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 4869103c91a6..b254bc0d35fa 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -5,7 +5,7 @@ AUX setup-1.7.0.py 788 BLAKE2B dc7a2dbc2187f233f4fae9d85bbec9e2152259a45094f10ab
 DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2f06ea09f11788566e33d58f7d0dc8c79d5827e5966e1a20a5597c2cbdec76da49c8f54c0538a1ac3f869d8ef55456 SHA512 d473f7b06d705a3868a70f3767fafc664436b5897ba59025ea1268f815cb80a9076841ff9ff96cc130fb83ba18b03c1eee38cfaf1b471fdd883a3e126b771439
 DIST cryptsetup-2.2.1.tar.xz 10803072 BLAKE2B 00ee2eff11e3054a40a4d9036c1786422288ff4c61ff497cb7039721dde80ca337cab067faa4f70721de3aded465f612e9328a6b533ff7c9b67d1069fe435bed SHA512 e4b45b24ad63cc4c22cb816f04cf4af71431e15134a8208af1a24e64ded54c07aba6c43521c063f03429304e0610b6cce849332564d69a46934fb7bae8e99718
 DIST cryptsetup-2.2.2.tar.xz 10808684 BLAKE2B d8d864d9ec2a5d646706d3ba003a21aa83d2373ca7afed5663c5167172116ea9342704483559f49c06979cbe0f6ac5670f4e9baae88ab908423b793043ba4a68 SHA512 d04123a622438ecbee28145cbdc71886b6f13db87df1c67522bff6e6e3cba817e895e2d085bdb08c78f9cafba557b1203177811a0c316ccd9b7c19939f3fc851
-EBUILD cryptsetup-1.7.5-r1.ebuild 4047 BLAKE2B 89298062a22226a385555fe6f65c6f0f24f36b6c749f95e76122f05f5974cae26ca0a4c36cd1a1521239626cdadf89ad9087486ddcffce725f7f41f6fd0b4c74 SHA512 84dbcf22be795fe9c4b9f958dc0df5c99c8597c4d618673ac30e2f5597a60e44c09fcbc830c9f691a999ae019fe1af92066e7ecd5f858a0ee3c95451eea8788b
+EBUILD cryptsetup-1.7.5-r1.ebuild 4043 BLAKE2B 1c7bad00696aadacbc4b3b8acb97d6028f570313bdbb462b99381779a67a4f8709adf65f8823d6256f71187a7d1a933186299cb3fc8d5aa52eb2e23814a1eb01 SHA512 b3ae28a6816746a8cc53107e6cdc88c24305087f7a05a53579059812b9f1f149081262780f8f8c4a3005ff1c9cc37063abff4b34893466e1ead911b4098164b1
 EBUILD cryptsetup-2.2.1-r1.ebuild 4233 BLAKE2B e407b1f989ea25d86f535387e580f82584b3e123fccae3e059721b0fb341b716d4f667d3b0319206dec4b3cf4b867fad7f521573f254a83e322eb8319d8017de SHA512 eaba899c59dde9e345f00bbdbaa27218aaad44a75401716aed663dfef1e273136cd205087468c73fe9aeec7ad0c39c8d788d451a08ea48c0c5547d7db0eed802
 EBUILD cryptsetup-2.2.2.ebuild 4244 BLAKE2B c3ea10ab5824f1f60e19256a19c1726025f277d968203db89043adbd6289ad88ce786547540ad58a21acf51695e842ea0e9f6730e3f34f6e1315a0c26a6331ad SHA512 a723ce4032546dc97d58bcfa3845fa8d6aa6a7c437674778056f23c644d0b5c1020c4cb91e2f7d5ca8a5d6a0e94ac24840519b29d281bc0308cfb6bbea2a66b8
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
index b37162bcba61..3b9a2217fe33 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_6,3_7} )
 
 inherit autotools distutils-r1 linux-info libtool eutils versionator
 
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index ad30fe48a366..83eef4ba8fbd 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -1,18 +1,12 @@
 AUX e2fsck.conf 138 BLAKE2B b97a754b6aebf1f7fcd4001b720eead61d183eaf5a2c9eb86e8304f5958b034697ac52f4c40b0225c9c404ca7b9fe5bd3f130d9ebf8faf38815050d945524d3c SHA512 d10a8ef566a60815b6f65414d84d23f3ec535c2a93cd780d4425488465f4eff6910c20d0163d1b7d334e9f4c707beab35bf63078b9ec3a5602763ea219bddbef
 AUX e2fsprogs-1.40-fbsd.patch 352 BLAKE2B efef09c11bdf6ebeb89819dfefec241919afa17ddee65610332bcd3edbacad4fa501def1d224de39fd6a9979a35e63699b0a2d5e9a2242517122339b68edf6af SHA512 86374e641f958d7c4b53eb44abf7933af064b55a38fef6ca26f848bb63f0c6bf2966852c7cf0770337aef95ff965de95ef282205771e86be36e7ad74e8f81146
-AUX e2fsprogs-1.41.8-makefile.patch 317 BLAKE2B 89f393fd0b09e853158707aa6ec7f803c8938138666459df6a2bbc1cc5e86ac107db67b40ffbd7b12694de8eb22863b6c910b6e192f42e07939c0206b248e627 SHA512 dbd738affe910d3812ca4d969a6d4295b09abc413cab23f29dcbd0c1e82eefa095a61a377c494dd9b7e1d189d4edadc469dbf2d1a1068c11dd5fc8311bd83f8f
 AUX e2fsprogs-1.42.13-fix-build-cflags.patch 290 BLAKE2B b37f9fd204bd35631776d68dda5cc9defb5e2bc54e0061778e5bea4886820829605cb092bb40a7f65cd0626d8ffe689bd1c8aad7d29f7c67e5166dd578925ddb SHA512 fed2a8502fafb56a21c88d680a42848bdc8921b228f74842ce3f702279917b6e6c0d1204ee060ea0d2d5ebb02465fc1f3d1a4304068a59b45bf1ddfbdfd46507
-AUX e2fsprogs-1.44.4-fix_make_install_for_subset.patch 2168 BLAKE2B 041a3ce097186d8cbad480157c2bcf686d83218cf90bf7dc419e6f709e1557955b26dfc18a30586644497364289f3266626efcb2e7765d8d53fd639ff0a9785a SHA512 f6fa19fbe5dc1ed9adae421bd371d4cad7f52b250eedad1c47883a00ac6aa7061530df3d5928d0f4cfbcd2af0d9c457c4ab1fa460c9e43df323d1db052934724
 AUX e2fsprogs-1.44.6-parallel_install.patch 317 BLAKE2B a57666bebbbfdd9933112b027eb48aef6702514c835b0e5ce493957c6db7d6dd5570734a28415f27a874e54429e169e79b6895d4cfb69de1fb91fb2000f0245d SHA512 4b6b51d93cd2c84facd88174312522443822232f8f2259492dcb0e9d52b27d6a5bb6c2b874f50de53b0c127dd3df3cb86610e7f3615986851d8f743922e8dce0
 AUX fsck_ext2fs.8 3802 BLAKE2B 379ef7974e29c654e4a69caa64c3703eecf375d63557915bdbfe23c8c0ca67cc9a13792988ba8c0b18bb4ae0819d220102f034499200fd20951e004d34273311 SHA512 639af16c7881bdfca55a9cd39623d3eeb9ae0ca93f8e65321c69ab1b2591cb17cdd0cfc21d27c20b8cc65bd295cccf23e47f740fffb91f4cf17e32959bb166d0
 AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa0722a0a3163885561bf06f0fdb73b4cf8c9cfc5bd0dc0c6ee0a7fb340a2416ce34555eff22f71a4 SHA512 1cac2963c0e85dd6a111bfe2a00f2b4f65c17a05bf0039cec073d4109ad4b0efee8905cff1a25098e0693f367db300054d92598a85dfbe8e5db7ff6419534af6
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
-DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024edf098205012446677c76ed206f18e71a0f241527ac33ee35eebdfa8fe87a81dde5228694186fc4e1e55e5b7bc87862 SHA512 c0faec90b2be81460d374c150be917cd6beb1d10dc7cd0c6c4747de19de9af1763e90d48aec5b3c0fbff1b59bf79a35f93536cd52e68d1e45d4db610e158bb2e
-DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e
-DIST e2fsprogs-1.45.3.tar.xz 5561452 BLAKE2B ee41f35c3294ccb8dad4274e44d9c07dc94f93d2e921472c34da7913cdb2d60f998fa154c98f6ba4f9e598de152006a0fdb63a9006bbf3bb1847166d9342a29f SHA512 9f898d353af48a1d357cb01f64187b6dfef671bb2e0450438530fe4fa9454fccc6b755c9469d81e702e6d85a4defd02ae0a493897a4b3284cb112e8444c9bf52
 DIST e2fsprogs-1.45.4.tar.xz 5567164 BLAKE2B ab7be15e504b674290a25572d09d1ca4bacebc14d23a0ae400636bdcf3bf117f3aaf82b806ca7fd25dcd6ef9fedff588de7c72134b095e27f7a363f7d70c94c7 SHA512 408f093a6674ef2316c451173481851041957617c550308d2969b983e11d988ddfc120626cd957c0759648bc357edf1d9971e6d46bed109c2af5f8a09bdc5bda
-EBUILD e2fsprogs-1.44.5.ebuild 3929 BLAKE2B 31e29eb9610406b1dc0c10e43be042976371be51ed6d17e28a09fdd6bc0fce2edf1c26abb931a891302e0dfc48aff681cd3eca31b5dfaa6dd54f001642f9ec5d SHA512 579423805a574f91fa6a3444e93fb23ca03914fceba3d27f33430472a2fb6b125f8b563227ccf9f4fa3ad0e658696350312f235207f0ca4cb69f59c497cccad7
-EBUILD e2fsprogs-1.45.2.ebuild 4095 BLAKE2B 6d34711ed7b09788c37ca2e3f7f9ba19a38277cfdbab4133e213eb3a7823c0f64c8aa5c233c69ee7581521cf650f13b9d5642a6273d1649d58090348d58dfb14 SHA512 b7bcab130d875d7302e3fea99687c47e06afc035e5c353495ebf8bfacbaf59723c6d546eca168ff1110f56f449e8a70067325f0e41d220a045eae4695acb6207
-EBUILD e2fsprogs-1.45.3.ebuild 4108 BLAKE2B 8f6aeb8fcac2bf80dc03baae754d68f3a0365bb9b9ffaf1db28971b73f87f77b551c7337545b7ae077ed17da3fa12cb635b7291d3ae71cebce6ca88aa918fecc SHA512 ba0c7c0a0ebfa2dab25bb4f5dda2834a7243c3d8a7d105bfcb41f7608da1b330578524c714fc476537ddfafccc042286d89b26e3d5d00f9e0a11f96ab09b20dd
+DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
 EBUILD e2fsprogs-1.45.4.ebuild 4095 BLAKE2B 6d34711ed7b09788c37ca2e3f7f9ba19a38277cfdbab4133e213eb3a7823c0f64c8aa5c233c69ee7581521cf650f13b9d5642a6273d1649d58090348d58dfb14 SHA512 b7bcab130d875d7302e3fea99687c47e06afc035e5c353495ebf8bfacbaf59723c6d546eca168ff1110f56f449e8a70067325f0e41d220a045eae4695acb6207
+EBUILD e2fsprogs-1.45.5.ebuild 4108 BLAKE2B 3ffbb1dd16e6656cb5a47646462f04a985e17487bbf8479e6738b56261079c0e85093c26e9dbdcd563d66885afae37f158dabdfa62d083e8408346cbd4fa2c3d SHA512 e934c694b55c5e31e0ecff662f6a46831771a9ed08ed01d8a0d616b42523183e1c6b922dc97d34b268270da68a51b55cd59d4e4e2128c4686fd98e1f8efed0a2
 MISC metadata.xml 569 BLAKE2B 0a09eb03e2d5f07a24f33d71a16d0e4cb7e12e5a03356b44127e964c712addfb5bb9d5bc3b26dc66c608544639b6a92ebe0dcc18c03b8820f50b6fabcc9c231b SHA512 fa3e24f0db835a5fb475d42874d3197bd30f0c1f606b66b1b3f285e61dd32624ae56014b37ee0de0a9ebfaf51dd2f06cc2f73f91a011c5314809f5d495d65e67
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
deleted file mode 100644
index 62549675f713..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.44.5.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit flag-o-matic multilib toolchain-funcs usr-ldscript
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
-	elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="fuse nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	fuse? ( sys-fs/fuse:0 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.41.8-makefile.patch
-	"${FILESDIR}"/${PN}-1.40-fbsd.patch
-	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
-	# Upstream patches (can usually removed with next version bump)
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *-mint* ]] ; then
-		PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
-	fi
-
-	default
-
-	eapply -R "${FILESDIR}"/${PN}-1.44.4-fix_make_install_for_subset.patch
-
-	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
-
-	# Get rid of doc -- we don't use them. This also prevents a sandbox
-	# violation due to mktexfmt invocation
-	rm -r doc || die "Failed to remove doc dir"
-
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
-		-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-	ln -s $(which mk_cmds) lib/ss/ || die
-
-	# Avoid rebuild
-	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS="${T}/fonts"
-
-	# needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
-
-	local myeconfargs=(
-		--with-root-prefix="${EPREFIX%/}/"
-		--enable-symlink-install
-		--enable-elf-shlibs
-		$(tc-has-tls || echo --disable-tls)
-		--without-included-gettext
-		$(use_enable fuse fuse2fs)
-		$(use_enable nls)
-		--disable-libblkid
-		--disable-libuuid
-		--disable-fsck
-		--disable-uuidd
-	)
-	ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
-
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake V=1 fsck_ext2fs
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX%/}/usr/$(get_libdir)" \
-		DESTDIR="${D%/}" \
-		install install-libs
-
-	einstalldocs
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a e2p ext2fs
-
-	# configure doesn't have an option to disable static libs :/
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs
-		doman "${FILESDIR}"/fsck_ext2fs.8
-
-		# filefrag is linux only
-		rm \
-			"${ED%/}"/usr/sbin/filefrag \
-			"${ED%/}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild
deleted file mode 100644
index 901d0170ae23..000000000000
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Standard EXT2/EXT3/EXT4 filesystem utilities"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
-	https://www.kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v${PV}/${P}.tar.xz
-	elibc_mintlib? ( mirror://gentoo/${PN}-1.42.9-mint-r1.patch.xz )"
-
-LICENSE="GPL-2 BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="cron fuse nls static-libs elibc_FreeBSD"
-
-RDEPEND="~sys-libs/${PN}-libs-${PV}
-	>=sys-apps/util-linux-2.16
-	cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
-	fuse? ( sys-fs/fuse:0 )
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-	sys-apps/texinfo
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.44.6-parallel_install.patch
-	"${FILESDIR}"/${PN}-1.40-fbsd.patch
-	"${FILESDIR}"/${PN}-1.42.13-fix-build-cflags.patch #516854
-
-	# Upstream patches (can usually removed with next version bump)
-)
-
-src_prepare() {
-	if [[ ${CHOST} == *-mint* ]] ; then
-		PATCHES+=( "${WORKDIR}"/${PN}-1.42.9-mint-r1.patch )
-	fi
-
-	default
-
-	cp doc/RelNotes/v${PV}.txt ChangeLog || die "Failed to copy Release Notes"
-
-	# Get rid of doc -- we don't use them. This also prevents a sandbox
-	# violation due to mktexfmt invocation
-	rm -r doc || die "Failed to remove doc dir"
-
-	# blargh ... trick e2fsprogs into using e2fsprogs-libs
-	sed -i -r \
-		-e 's:@LIBINTL@:@LTLIBINTL@:' \
-		-e '/^(STATIC_)?LIB(COM_ERR|SS)/s:[$][(]LIB[)]/lib([^@]*)@(STATIC_)?LIB_EXT@:-l\1:' \
-		-e '/^DEP(STATIC_)?LIB(COM_ERR|SS)/s:=.*:=:' \
-		MCONFIG.in || die "muck libs" #122368
-	sed -i -r \
-		-e '/^LIB_SUBDIRS/s:lib/(et|ss)::g' \
-		Makefile.in || die "remove subdirs"
-	ln -s $(which mk_cmds) lib/ss/ || die
-
-	# Avoid rebuild
-	echo '#include_next <ss/ss_err.h>' > lib/ss/ss_err.h
-}
-
-src_configure() {
-	# Keep the package from doing silly things #261411
-	export VARTEXFONTS="${T}/fonts"
-
-	# needs open64() prototypes and friends
-	append-cppflags -D_GNU_SOURCE
-
-	local myeconfargs=(
-		--with-root-prefix="${EPREFIX}"
-		$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
-		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
-		--enable-symlink-install
-		--enable-elf-shlibs
-		$(tc-has-tls || echo --disable-tls)
-		--without-included-gettext
-		$(use_enable fuse fuse2fs)
-		$(use_enable nls)
-		--disable-libblkid
-		--disable-libuuid
-		--disable-fsck
-		--disable-uuidd
-	)
-	ac_cv_path_LDCONFIG=: econf "${myeconfargs[@]}"
-
-	if [[ ${CHOST} != *-uclibc ]] && grep -qs 'USE_INCLUDED_LIBINTL.*yes' config.{log,status} ; then
-		eerror "INTL sanity check failed, aborting build."
-		eerror "Please post your ${S}/config.log file as an"
-		eerror "attachment to https://bugs.gentoo.org/show_bug.cgi?id=81096"
-		die "Preventing included intl cruft from building"
-	fi
-}
-
-src_compile() {
-	emake V=1 COMPILE_ET=compile_et MK_CMDS=mk_cmds
-
-	# Build the FreeBSD helper
-	if use elibc_FreeBSD ; then
-		cp "${FILESDIR}"/fsck_ext2fs.c .
-		emake V=1 fsck_ext2fs
-	fi
-}
-
-src_install() {
-	# need to set root_libdir= manually as any --libdir options in the
-	# econf above (i.e. multilib) will screw up the default #276465
-	emake \
-		STRIP=: \
-		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
-		DESTDIR="${D}" \
-		install install-libs
-
-	einstalldocs
-
-	insinto /etc
-	doins "${FILESDIR}"/e2fsck.conf
-
-	# Move shared libraries to /lib/, install static libraries to
-	# /usr/lib/, and install linker scripts to /usr/lib/.
-	gen_usr_ldscript -a e2p ext2fs
-
-	# configure doesn't have an option to disable static libs :/
-	if ! use static-libs ; then
-		find "${ED}" -name '*.a' -delete || die
-	fi
-
-	if use elibc_FreeBSD ; then
-		# Install helpers for us
-		into /
-		dosbin "${S}"/fsck_ext2fs
-		doman "${FILESDIR}"/fsck_ext2fs.8
-
-		# filefrag is linux only
-		rm \
-			"${ED}"/usr/sbin/filefrag \
-			"${ED}"/usr/share/man/man8/filefrag.8 || die
-	fi
-}
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.3.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
index 5d69f41bdf97..c89dd215ca89 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.3.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch
deleted file mode 100644
index b7d3d96856b5..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.41.8-makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- e2fsprogs-1.41.5/Makefile.in
-+++ e2fsprogs-1.41.5/Makefile.in
-@@ -281,6 +66,7 @@
- uninstall: uninstall-progs-recursive uninstall-shlibs-libs-recursive uninstall-doc-libs
- 
- install-libs: install-libs-recursive
-+install-libs-recursive: | install-shlibs-libs-recursive
- 
- uninstall-libs: uninstall-libs-recursive
- 
diff --git a/sys-fs/e2fsprogs/files/e2fsprogs-1.44.4-fix_make_install_for_subset.patch b/sys-fs/e2fsprogs/files/e2fsprogs-1.44.4-fix_make_install_for_subset.patch
deleted file mode 100644
index 222366f6c015..000000000000
--- a/sys-fs/e2fsprogs/files/e2fsprogs-1.44.4-fix_make_install_for_subset.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From ed07fd93056a2d2c03affe3255d3d5747deaab21 Mon Sep 17 00:00:00 2001
-From: Theodore Ts'o <tytso@mit.edu>
-Date: Wed, 22 Aug 2018 13:42:23 -0400
-Subject: Fix "make install" for configure --enable-subset
-
-Signed-off-by: Theodore Ts'o <tytso@mit.edu>
----
- Makefile.in | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/Makefile.in b/Makefile.in
-index 745e8590..80ab2994 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -42,7 +42,7 @@ subs: $(DEP_SUBSTITUTE)
- 
- progs: all-progs-recursive
- libs: all-libs-recursive
--all-progs-recursive all-libs-recursive: subs
-+all-progs-recursive all-libs-recursive:: subs
- 
- rpm:
- 	sh contrib/build-rpm
-@@ -91,19 +91,23 @@ TAGS clean-recursive distclean-recursive depend-recursive fullcheck-recursive \
- 	done
- 
- all-progs-recursive install-progs-recursive install-strip-progs-recursive \
--  uninstall-progs-recursive coverage.txt-progs-recursive: all-libs-recursive
--	@for subdir in $(PROG_SUBDIRS); do \
--	  if test -d $$subdir ; then \
--	    target=`echo $@|$(SED) 's/-progs-recursive//'`; \
--	    echo making $$target in $$subdir; \
--	    (cd $$subdir && $(MAKE) $$target) || exit 1; \
--	  fi ; \
--	done
-+  uninstall-progs-recursive coverage.txt-progs-recursive:: all-libs-recursive
-+
-+
-+@ALL_CMT@all-progs-recursive install-progs-recursive install-strip-progs-recursive \
-+@ALL_CMT@  uninstall-progs-recursive coverage.txt-progs-recursive:: all-libs-recursive
-+@ALL_CMT@	@for subdir in $(PROG_SUBDIRS); do \
-+@ALL_CMT@	  if test -d $$subdir ; then \
-+@ALL_CMT@	    target=`echo $@|$(SED) 's/-progs-recursive//'`; \
-+@ALL_CMT@	    echo making $$target in $$subdir; \
-+@ALL_CMT@	    (cd $$subdir && $(MAKE) $$target) || exit 1; \
-+@ALL_CMT@	  fi ; \
-+@ALL_CMT@	done
- 
- all-libs-recursive install-libs-recursive install-strip-libs-recursive \
-   uninstall-libs-recursive install-shlibs-libs-recursive \
-   install-shlibs-strip-libs-recursive uninstall-shlibs-libs-recursive \
--  coverage.txt-libs-recursive:
-+  coverage.txt-libs-recursive::
- 	@for subdir in $(LIB_SUBDIRS); do \
- 	  if test -d $$subdir ; then \
- 	    target=`echo $@|$(SED) 's/-libs-recursive//'`; \
--- 
-cgit 1.2-0.3.lf.el7
-
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index 895907194722..c33208b3676f 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -2,4 +2,4 @@ DIST ecryptfs-utils-111_p20170609.tar.gz 1433722 BLAKE2B eeb8840e0b369d2eb420e78
 DIST ecryptfs-utils_108.orig.tar.gz 659465 BLAKE2B a4497470e1aeb3122da1c612a4bb9a32bbae960fad165b5d30543ccaf5682d877927b881956e109c2910eb46e456470ffc0f8fc1f3766f6767741d28d05dc802 SHA512 856d8fac587921f1b5cd0b4ff269c7db8941b6b183506c5bc2e640a77994293f3e09ecfaef94f12c00f2378e756ecec252d3f59eebbabb4229105f8be87653ba
 EBUILD ecryptfs-utils-108-r3.ebuild 2028 BLAKE2B 49d699aab2800b77577054c730bc77c3bdb60c9284ab59f484220eda3e6038f42cece942233a92c150b8d2959c47df9813a1c8f0e6b20f5d747e56e35939f8d5 SHA512 d2cfaa289bc89df391c8a2f85fcf5bdd1134a5c497bb804e12f8ea968547e03741a5d86e9ecca1818ab98b05c868b06cf163709f231928d6d0b858adce9293de
 EBUILD ecryptfs-utils-111_p20170609.ebuild 2151 BLAKE2B 5ea76bd1ffbbfa7d70850dff7d0ff964c90710c55f05d7697590f729556c7f32c6b49dbe57a05d0ddc1076a29f5ea0eb86d903f5a1918cadcc5a593451009782 SHA512 d64c6fd9a37694dd4c7f1b88679d4442a49100672911310181b0b116c434d212a067e2c9ac01fbba7a97bcfa33aa0b51e3ea56216a695b037d5c79353e14a237
-MISC metadata.xml 727 BLAKE2B f84dadf31a97d3f4e30ba3ede03ace3ed2a327c94b8a30e25dd1e391c197a231924361d2c31fec85bd893e64540925d6ca943fde1c26b95d9db077a7615b768b SHA512 87eaf8fc34e2f5ca0a2c60aa0d051901f6353e65eb6f63e29e26594588c69dd5f14039a6153bd5bc295a06674d8bb625fa43ccfd7f334188d8333f307405ab5a
+MISC metadata.xml 654 BLAKE2B 64e5132639a3fe0cd686cb0e8d48498c824541534557bfea1afceaf0f650554b05138850d9c43601c837de7d3499ac1608b5d7ff6ca6bbce02d5f617bb962f26 SHA512 47e06caf756f98d2d2f105c1e89e4e9fbb5b8a84a34969c918646b85a0004491b37bf1c86fef322e97c83f914e8ab68b0584e3e675c53c51238c0b13dd87e43c
diff --git a/sys-fs/ecryptfs-utils/metadata.xml b/sys-fs/ecryptfs-utils/metadata.xml
index 8fb8852b5c3b..e67a27b30bda 100644
--- a/sys-fs/ecryptfs-utils/metadata.xml
+++ b/sys-fs/ecryptfs-utils/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> key module</flag>
 		<flag name="openssl">Enable <pkg>dev-libs/openssl</pkg> key
diff --git a/sys-fs/etcd-fs/Manifest b/sys-fs/etcd-fs/Manifest
index 6ba18b19dd29..10a682da6093 100644
--- a/sys-fs/etcd-fs/Manifest
+++ b/sys-fs/etcd-fs/Manifest
@@ -1,5 +1,5 @@
 DIST etcd-fs-0_p20140620.zip 12608 BLAKE2B 7a7ae1c2e9b8fc952118eb658f191508350fa674ba0ab21a36cd3420f8d7fbf3c7208758af7274ca4e1b13e93e1c4ea79595773be3e21e4bd43a13d2e7d945c1 SHA512 9f0066ed635bf33812c2ab71d320d42e45684312243bff2e17c0d58eee25723ef980c59d6a7ca751ceacd69e75af7edc691d5595ab06d5de1bdfe244656367e9
 DIST etcd-fs-0_p20170517.tar.gz 8575 BLAKE2B ea47b3588efd206cd6632dfdc4210b2b08e566603c0fc72cecaa834f675f95ccb6d4907e9e7b00788e939ab4452494a53f3c9bdef16ef7693e0c38ac071e5aac SHA512 1695eeb70895d316db68fca45b0cdcef6f4bb00b39a443bd85a7d457a1437476562d269226f7cc872fbec22555c4f4b94d48617688294400685e1719224fa92f
-EBUILD etcd-fs-0_p20140620.ebuild 762 BLAKE2B 96288f7effd4d921ab89e643283bbc089d1133064aa7a689431019ca089245f47d15bfa26a2bce1af2cbca1d3c1bfca26500d48ea711ae3883ca12ab9e43cd30 SHA512 1f87bdd0af258aac5fb632178f6422f0ca088fafa14aaf64b798d242fe20062e2bb7e4b54edba5a82d465feb901eb4489c37e74dde0f098451b4cc06bd21e38e
-EBUILD etcd-fs-0_p20170517.ebuild 754 BLAKE2B a2bf3b9e068311870177f4bf78c0fbc88cb0b58ec049fdb8363be62cfacfcebd1b82eb02c63eacf2d76c233220334be237ec76efffca71ffbef90597fba77cfc SHA512 22525772acc208b3c00e335276eaf9be24722f1d4b86c77153d577b180a95d4fef9ac305d9b584619c08a7d8999bc8f9a79d88778c203b09344456e62d7fa529
+EBUILD etcd-fs-0_p20140620.ebuild 787 BLAKE2B 5353740fe7cc244258d6279e8839d6ebbc2d649fd9376b18bd01749edf641ec7f46e225edb23f7ba4f3f13787cd3ddc2d192a514e5dc6d0c1296ab5b71c27fd8 SHA512 2353ba13247056b5f4f501e9690d9739789f5e535770f0176929c404afbac40c3cbdc2c2749ef1b927a4c1a2fdfc4161affa66f80d6a42d125cfb5f936179a8e
+EBUILD etcd-fs-0_p20170517.ebuild 779 BLAKE2B d7102c79d4dfe73dc131aae5d33aab4e6b4975dc4618f6905fb1b8c16f3cdaf03ca4bc326fdd5fa8033298e7d818c2e5ecad220da094b049fc2b4fff594f8940 SHA512 1b8060f616bedab808f674c3b71069d0ed19eee8e3597abc745bf0e83f3dbdf8ee1dcdf760d6fc13222af5cbf51769ee5ed435c9fbbe8f865b9335bbde487688
 MISC metadata.xml 528 BLAKE2B d07e47777010b5a508fe96d9652c22822d6af399c18acf331023e4dd6d20f695df5d75a5122162e12d02ef6d41e614ea7ffec465e7b8db7e4f76655bf0409cca SHA512 42b4837d689032e27dfe9aaaa74c520f710eec8ca9827659c1316aeee4ff9e22bb024df5464f31097db5ab1d89bdcf84abeed74d30b68921023f0501030695f9
diff --git a/sys-fs/etcd-fs/etcd-fs-0_p20140620.ebuild b/sys-fs/etcd-fs/etcd-fs-0_p20140620.ebuild
index 87f34f99cc94..0a85e5062c67 100644
--- a/sys-fs/etcd-fs/etcd-fs-0_p20140620.ebuild
+++ b/sys-fs/etcd-fs/etcd-fs-0_p20140620.ebuild
@@ -10,7 +10,7 @@ EGO_PN="github.com/xetorthio/${PN}"
 DESCRIPTION="Use etcd as a FUSE filesystem"
 HOMEPAGE="https://github.com/xetorthio/etcd-fs"
 EGIT_COMMIT="395eacbaebccccc5f03ed11dc887ea2f1af300a0"
-SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.zip -> ${P}.zip"
+SRC_URI="https://github.com/xetorthio/etcd-fs/archive/${EGIT_COMMIT}.zip -> ${P}.zip"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
diff --git a/sys-fs/etcd-fs/etcd-fs-0_p20170517.ebuild b/sys-fs/etcd-fs/etcd-fs-0_p20170517.ebuild
index c657538fd5f7..030f2d88a5ee 100644
--- a/sys-fs/etcd-fs/etcd-fs-0_p20170517.ebuild
+++ b/sys-fs/etcd-fs/etcd-fs-0_p20170517.ebuild
@@ -10,7 +10,7 @@ EGO_PN="github.com/xetorthio/${PN}"
 DESCRIPTION="Use etcd as a FUSE filesystem"
 HOMEPAGE="https://github.com/xetorthio/etcd-fs"
 EGIT_COMMIT="1eeace3bc20b15e4347c631a1cf7b45f3852518a"
-SRC_URI="${HOMEPAGE}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/xetorthio/etcd-fs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
diff --git a/sys-fs/f2fs-tools/Manifest b/sys-fs/f2fs-tools/Manifest
index 1f1d8cc79ee9..c3be16c8729e 100644
--- a/sys-fs/f2fs-tools/Manifest
+++ b/sys-fs/f2fs-tools/Manifest
@@ -1,11 +1,3 @@
-AUX f2fs-tools-1.10.0-fibmap-include-config_h.patch 401 BLAKE2B 83b0888b5892111165134b858e79bd7b68d3f1f2f66e67745b75e2ab5510f003969a60e8e8d148aba23c2e1b2167d184e20f8acdbbf5dd40cfacc773e9a4f1fc SHA512 d1ccb17c15267a42e64b1760410f1ff5ffeca8bc1545afacd7723e0a86ef7172df63dfbe85c9395f6c2d1b0651dc40bea991b9c30445badde4a1256fa58e6627
-AUX f2fs-tools-1.12.0-fsck.patch 1504 BLAKE2B 8e8cdda64e093faa17a1b9c8757c1013a49222b6d48306f5088f217c9e252b2bbca098bb77d34eeb9bb36fa37d7751c26c274625bc034506ed7b66d9ee353869 SHA512 ff4304561e03086094116e67d8e71d6f1388b89b203b7a852f3b02f31f892735ee96551e8fa3577babb1062eb3e50bff4b957085879ac59e94efaa0f2e4d4a95
-DIST f2fs-tools-1.10.0.tar.xz 342904 BLAKE2B ba4dec55e11959b2dd9461b1b02d173c7766908bfdbca9f6da7aa134b4a3b5cf2bda3c2e380b3fab46afdda0be9181ae5fe85ed9d085f816a1ff96e847e2a836 SHA512 e6e9fc10bd8051db86880c415ceb50900bf0cc919f1d9fe39026b5320de7c93cbcc1d817fab73130817042ed551fc5fd55ef9b589caeca9fca63fd3098f7a853
-DIST f2fs-tools-1.11.0.tar.gz 278795 BLAKE2B 8faefb1554283291ad2dc2b66800b88bbdcf07dcb1896a206fd56d52eaa19761c6b008a4961bcec12843a96d2df1744bb5394b4f7bf3830315f4bd3180850e8d SHA512 a69fbd01826909576634f40343293addae3a9c3be09bf8210e2abc1ae12f385fe24dd71c623d14a0a15a81d12f404f193981caaadacbd663bc1502de9a8f7fb7
-DIST f2fs-tools-1.12.0.tar.gz 286528 BLAKE2B ca2e17fa6c48905fc1905fdec865143a003260bd60f659cd9f6c427b371c39f4c869f7265dc198888adf7ef7d4d8ba7ed2a3733c52aab18277f5371cb2cb3be3 SHA512 3f1a914540f57f94bbdc33ad66ee0b02b26fe380b05f9209f226cb3df8e84e29aa4e8e91d77f52bf737915b2785d4b9723becf5a95d75e8821b2e107e991cbad
 DIST f2fs-tools-1.13.0.tar.gz 356028 BLAKE2B 170ddd5825b4f0f6a42a623f01d332092172a385e07dffccca46eb2545c12db23799fdeca7458c0cef17c95989e35db5e617a1458f0c7b41eeccd93eae807167 SHA512 fd920a19e8705a65395809aeef55791c5678ed31c026cdf41fc173e0dbcacdef1db7e0e184ec1aae8637b1784e2ad6e0207583e918255483fe43c73f89bd7f7f
-EBUILD f2fs-tools-1.10.0.ebuild 829 BLAKE2B 33cb5076ad952162afc2b53506aa09370b28fd6c7942d7d800fc2f48506cb4fcf2db44f9e68ae58f70d95178a53c73b27cfe70aed1c5dc954d3e31e512aab70b SHA512 3319a0480393572701b4728268437cbc6490e84ee8f215425d663d2c314c42588b594869b6bf6ba87eb3a44947ef5d10ae9e0605942f1ed4f46d797769140a9f
-EBUILD f2fs-tools-1.11.0-r1.ebuild 824 BLAKE2B 888b9092f9f8b402ce3d549cc6c896877dd1b7b0c6fdea785092d3160929175bb26aee5e05def9c07a3edf3c39ce0b6670a08f7d2a50cd7dc87e71d7f73ea5c6 SHA512 0771171e56491746fb9703ac2c0d454d7bb35bf62fc4b7f031c2d7ed7c2fa207227950cd35741bd1967531f2dbb08d64bc00535441c67cb11decb875b5784912
-EBUILD f2fs-tools-1.12.0-r1.ebuild 862 BLAKE2B 02c0087976e8c385776decfae140346c857a6c7e071057eb3680cff615e66787f9416cba4e3a611166451971589fadf4fef9abfc43cc4d95535714d45abe351d SHA512 51aabee7f1d91b09426511be0c33967181109be7ea7d4ace44072879bfa8d31baf0c328452ccdffa9d4e0675750e27a2e6f7417bc7dc67e713125e07acc7b7e9
-EBUILD f2fs-tools-1.13.0.ebuild 829 BLAKE2B 6e2c985a06c5973a118e998b101dce476cc4812384673d89d236c92259d39dd29c5460abfc665fe767cdbfb01b4dd1108e3862cc4e6769e7e18d65ebc339867d SHA512 69668767557a8f64c056475257fe3cb1636f8336afc5e67ecebfc4bb57484467a82dbb06342e7b547f72462cdc9bde497bf2d277a5bf647ec0b490f2c59ab6d8
+EBUILD f2fs-tools-1.13.0.ebuild 824 BLAKE2B 38f5fb1ddb65a2a22664eecae2825f226a9cab587604f7f4f9a9e43cf66b4f0131434ff3d50f347b939243943b87d3b5b9875f5704e60c567e50aeb74a72c4a7 SHA512 669a684b1a799b1509b37d86963b0e0d59f00b78e32b6e80d6bc37e7643fa3dd69b6b087f078f5b86fc92d2a649c18bb2b878773c27df416ed010f78427b3a37
 MISC metadata.xml 438 BLAKE2B a3bb4e3293bcde65dc3b01fdf363738fc65f63f50756a390f5c0211ed7d252c305e386a913cfc9b016c198238ae0017c82d52d2ff20f79957de19d8db9f30b0a SHA512 d662e42e0da62d264cad5df63fd8f407798f8d396f74b17a2d5cdb20793753b450bb232b4320f9491126b71752a44a69ed11a22b0433786f9825e3941ab24578
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild
deleted file mode 100644
index ce7d7f0fa630..000000000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.10.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
-SRC_URI="https://dev.gentoo.org/~blueness/f2fs-tools/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0/4"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
-IUSE="selinux"
-
-RDEPEND="
-	sys-apps/util-linux
-	selinux? ( sys-libs/libselinux )
-	elibc_musl? ( sys-libs/queue-standalone )"
-DEPEND="$RDEPEND"
-
-PATCHES=( "${FILESDIR}"/${P}-fibmap-include-config_h.patch )
-
-src_configure() {
-	#This is required to install to /sbin, bug #481110
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--disable-static \
-		$(use_with selinux)
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild
deleted file mode 100644
index 8bbde577cad3..000000000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.11.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
-SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/5"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
-IUSE="selinux"
-
-RDEPEND="
-	selinux? ( sys-libs/libselinux )
-	elibc_musl? ( sys-libs/queue-standalone )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	#This is required to install to /sbin, bug #481110
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--disable-static \
-		$(use_with selinux)
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild
deleted file mode 100644
index 3717d20a3636..000000000000
--- a/sys-fs/f2fs-tools/f2fs-tools-1.12.0-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Tools for Flash-Friendly File System (F2FS)"
-HOMEPAGE="https://git.kernel.org/cgit/linux/kernel/git/jaegeuk/f2fs-tools.git/about/"
-SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0/6"
-KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
-IUSE="selinux"
-
-RDEPEND="
-	selinux? ( sys-libs/libselinux )
-	elibc_musl? ( sys-libs/queue-standalone )"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	eapply "${FILESDIR}"/${P}-fsck.patch
-	default
-	eautoreconf
-}
-
-src_configure() {
-	#This is required to install to /sbin, bug #481110
-	econf \
-		--bindir="${EPREFIX}"/sbin \
-		--disable-static \
-		$(use_with selinux)
-}
-
-src_install() {
-	default
-	find "${D}" -name "*.la" -delete || die
-}
diff --git a/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild b/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild
index 9b271b07467b..84cf365f110a 100644
--- a/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild
+++ b/sys-fs/f2fs-tools/f2fs-tools-1.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~zlogene/distfiles/${CATEGORY}/${PN}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0/6"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
 IUSE="selinux"
 
 RDEPEND="
diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.10.0-fibmap-include-config_h.patch b/sys-fs/f2fs-tools/files/f2fs-tools-1.10.0-fibmap-include-config_h.patch
deleted file mode 100644
index df57412b74cf..000000000000
--- a/sys-fs/f2fs-tools/files/f2fs-tools-1.10.0-fibmap-include-config_h.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-See https://bugs.gentoo.org/649168
-
-Patch by: Matt Whitlock <gentoo@mattwhitlock.name>
-
-diff -Naur a/tools/fibmap.c b/tools/fibmap.c
---- a/tools/fibmap.c	2018-03-01 00:09:24.861919778 +0000
-+++ b/tools/fibmap.c	2018-03-01 17:31:48.854604556 +0000
-@@ -15,6 +15,7 @@
- #ifndef O_LARGEFILE
- #define O_LARGEFILE 0
- #endif
-+#include "config.h"
- #include <unistd.h>
- #include <string.h>
- #include <stdlib.h>
diff --git a/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch b/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch
deleted file mode 100644
index 72d86fec465c..000000000000
--- a/sys-fs/f2fs-tools/files/f2fs-tools-1.12.0-fsck.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From a6160c3e21f43b89b49802cc4a956d1c4b65ae44 Mon Sep 17 00:00:00 2001
-From: Chao Yu <yuchao0@huawei.com>
-Date: Mon, 26 Nov 2018 18:53:37 +0800
-Subject: fsck.f2fs: allow to fsck readonly image w/ -f option
-
-To keep line with e2fsprogs, let's allow to fsck mounted image as
-readonly w/ -f option.
-
-Reported-by: Perfect Gentleman <perfect007gentleman@gmail.com>
-Signed-off-by: Chao Yu <yuchao0@huawei.com>
----
- fsck/main.c       | 1 +
- include/f2fs_fs.h | 1 +
- lib/libf2fs.c     | 2 +-
- 3 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/fsck/main.c b/fsck/main.c
-index 675c603..bb79f6e 100644
---- a/fsck/main.c
-+++ b/fsck/main.c
-@@ -249,6 +249,7 @@ void f2fs_parse_options(int argc, char *argv[])
- 			case 'f':
- 			case 'y':
- 				c.fix_on = 1;
-+				c.force = 1;
- 				MSG(0, "Info: Force to fix corruption\n");
- 				break;
- 			case 'q':
-diff --git a/include/f2fs_fs.h b/include/f2fs_fs.h
-index 65cc8fd..6eebb3a 100644
---- a/include/f2fs_fs.h
-+++ b/include/f2fs_fs.h
-@@ -369,6 +369,7 @@ struct f2fs_configuration {
- 	void *private;
- 	int dry_run;
- 	int fix_on;
-+	int force;
- 	int defset;
- 	int bug_on;
- 	int alloc_failed;
-diff --git a/lib/libf2fs.c b/lib/libf2fs.c
-index cc335db..498f6c0 100644
---- a/lib/libf2fs.c
-+++ b/lib/libf2fs.c
-@@ -821,7 +821,7 @@ int get_device_info(int i)
- 			return -1;
- 		}
- 
--		if (S_ISBLK(stat_buf->st_mode))
-+		if (S_ISBLK(stat_buf->st_mode) && !c.force)
- 			fd = open(dev->path, O_RDWR | O_EXCL);
- 		else
- 			fd = open(dev->path, O_RDWR);
--- 
-cgit 1.2-0.3.lf.el7
-
diff --git a/sys-fs/fatresize/Manifest b/sys-fs/fatresize/Manifest
index dab8c1814f04..2d964c8617d2 100644
--- a/sys-fs/fatresize/Manifest
+++ b/sys-fs/fatresize/Manifest
@@ -1,4 +1,4 @@
 AUX fatresize-1.0.4-version.patch 203 BLAKE2B 1d9b66cadb04b4deb8798997db50b03abcebbe110c103817805eccd1a2c29331644b90b80aa7ae7091a75f2b7359437151ecfba26638c5f40386014f2a61b7ca SHA512 e1ee0ac7fc08be32c7b34cc8ea27da9baa9e6d5d38b10f2cd9be3614820cab4a8d787fd503ffd85cd65d8de065fa920f0dd5937b861eda48487e0759155957f6
 DIST fatresize-1.0.4.tar.gz 115159 BLAKE2B 16bdfc28bb58f9694adccc7d04dc7c26dc72ce0e859787f66c2aa9c560ce987f20374e9f5166b79ac9501878e06f072c9102ce2f4e3bc2afa694e2a13ecb8e07 SHA512 36b67f7d5e4ccb03b98fb8a788c40f430464a40765a9092deab3292ff736fcb07288c4b5b30143a18125f4b3de1225ce32b5643b344ec207ca332a87981fe18f
-EBUILD fatresize-1.0.4.ebuild 483 BLAKE2B 1d8658694b3bfdfd7e1201f458b4173ed6cdef3d77e9d8dd6a62912b8428ae20bab6a209158a12148587da8f800d7b8ba2b93bd90d29c34e667ca3e01a3751bf SHA512 f5d37df573692c6222fb9cc3205c074f3a083c5c5ac7dff1b106e793fc33dd24b86957993e86e651ff09db1124ee4381942b959f7048870871cc137b6d62d884
+EBUILD fatresize-1.0.4.ebuild 509 BLAKE2B 608d3babe8975989e697e136baf13adbcc6bce497647fa7d8e70c8a9fc3c1cc22f382aea849d12497cd10e34ee8afe1f800e4cfcae9d59238c950136eb13ae4c SHA512 6e97e3fadb3015556445318ed9c7c632730cf4c5cc1e2fdadf134842f029b55068b8034d704eb2a582213f9db45fb665be5c5c0f258bcac401de86f24e09af01
 MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54
diff --git a/sys-fs/fatresize/fatresize-1.0.4.ebuild b/sys-fs/fatresize/fatresize-1.0.4.ebuild
index cfdd713b6f02..1c05a33c4c46 100644
--- a/sys-fs/fatresize/fatresize-1.0.4.ebuild
+++ b/sys-fs/fatresize/fatresize-1.0.4.ebuild
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="Resize FAT partitions using libparted"
 HOMEPAGE="https://github.com/ya-mouse/fatresize"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/ya-mouse/fatresize/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest
index 4a8160fe767f..acdfbfeda01b 100644
--- a/sys-fs/fuse-common/Manifest
+++ b/sys-fs/fuse-common/Manifest
@@ -2,6 +2,8 @@ AUX fuse-fbsd.init 468 BLAKE2B 3b84afb0e215064d4944808b87fdc29396e851042a83bb7c0
 AUX fuse.init 757 BLAKE2B 802821596154d3dabae5c56367656d46a714c22a284cadf8ca78b2ca01a68fce8cefc37576cd26a14551452ff910a5317544e39b8fc4bddf74d80879fb7a0334 SHA512 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1
 DIST fuse-3.2.6.tar.xz 1456220 BLAKE2B 9b09504ed04abd0134188c28f3908e69e3416c345a96aefbca0f64447f3c3a8907550874f5fec9cd8f65fbaa892be6cc0213a7f61d7ad51c955ce3acf955ee17 SHA512 3a1ef77ab4c79a24aad0b259e17f568a30a5faf53ac17eb25d05f30dc7423f0081583f5b3c284ca9196a01885843e97c323a84231272b7e2b55c8e73848a61b8
 DIST fuse-3.8.0.tar.xz 1416716 BLAKE2B f921b739489e8eb8b2a78b719c9761f330de839f151f787a6db37d8d004ef9b90022bfe3c5d24ceab333cde8741340ede0315a5b92cabdaf87fb1b291f72e292 SHA512 46d2b1494c73f8b6b2be4e8969bb9906ea35620fb4081edc3176f7ba34e6ed815d5f9c5c6f06604fb37836460e25d0ce51619853288bb881362f04cba6b31812
+DIST fuse-3.9.0.tar.xz 1523028 BLAKE2B 2fff93431e59e370189fb1527de7bff3863d20e1a62628bb56a6671077a1c919b394ddac66537a1ef7c2991556b1817b2c7f6a92c161ebfffbc804466e19e5e7 SHA512 0c96df5db4d0ceb7885ddb6f6c05b523ee7e179f8f411ad0614caecb9fa0f5fd682ab9bf4dfdaa3aff9d90c18b8947a122ee376328535e49fa6091d784aa0cb7
 EBUILD fuse-common-3.2.6.ebuild 1255 BLAKE2B fc0e83b952ef21e22ae91fdde4e51cb06558b904660af2b6a8ae95904faf7dd46093ce8fd73086c5c9a44ee51ab489519c5a65cea5086909fca5b09d6de07ec2 SHA512 296f5904a0835f6645841809c12d22d7fa8a9921ae6231c211ff5a07e2532c1f87f5728e64721b50452f46d687420a092a5caa08482315a1abe237e8100a17b9
 EBUILD fuse-common-3.8.0.ebuild 890 BLAKE2B a30aa5a43f66fab1a13dce2ed4e2c623be8acff88199aac8f02b9d8d24ba8cf3daac3c016d3c0e6f2bb737bb87f691d6bad62b922ed1b84c7264c0918e67bd40 SHA512 cdc290308b5f33d81284280b1e71f07b9bbb24f2b01011f0613ae24b9a5841474b531eefb9477ab8c3f71b2d6e2c05e9459010a6da4b5c4a46c7402f93b59f42
+EBUILD fuse-common-3.9.0.ebuild 890 BLAKE2B a30aa5a43f66fab1a13dce2ed4e2c623be8acff88199aac8f02b9d8d24ba8cf3daac3c016d3c0e6f2bb737bb87f691d6bad62b922ed1b84c7264c0918e67bd40 SHA512 cdc290308b5f33d81284280b1e71f07b9bbb24f2b01011f0613ae24b9a5841474b531eefb9477ab8c3f71b2d6e2c05e9459010a6da4b5c4a46c7402f93b59f42
 MISC metadata.xml 408 BLAKE2B 20a23e1ce0b234dcedcf095ccbef63413420ab0490a2e0b98f9dffcb43508bc7c770b0180e2cb9ac501764bc85f286b7e9bf81848e34257b414ed78c7de0877c SHA512 6bfd1910124508d1a555213adcd9509b19b28184fd5eb5346d84531370414194a6f18ac2ce7d726b4341018b058e02cf2805146fa1747aba21c6b9d8c2371020
diff --git a/sys-fs/fuse-common/fuse-common-3.9.0.ebuild b/sys-fs/fuse-common/fuse-common-3.9.0.ebuild
new file mode 100644
index 000000000000..b775eb8fb168
--- /dev/null
+++ b/sys-fs/fuse-common/fuse-common-3.9.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+DESCRIPTION="Common files for multiple slots of sys-fs/fuse"
+HOMEPAGE="https://github.com/libfuse/libfuse"
+SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
+
+S=${WORKDIR}/fuse-${PV}
+
+src_install() {
+	udev_newrules util/udev.rules 99-fuse.rules
+
+	if use kernel_linux ; then
+		newinitd "${FILESDIR}"/fuse.init fuse
+	elif use kernel_FreeBSD ; then
+		newinitd "${FILESDIR}"/fuse-fbsd.init fuse
+	else
+		die "We don't know what init code install for your kernel, please file a bug."
+	fi
+
+	insinto /etc
+	doins util/fuse.conf
+}
diff --git a/sys-fs/fuse-zip/Manifest b/sys-fs/fuse-zip/Manifest
index e78f12238fd7..9e9d66c0f96d 100644
--- a/sys-fs/fuse-zip/Manifest
+++ b/sys-fs/fuse-zip/Manifest
@@ -1,4 +1,4 @@
 AUX fuse-zip-0.4.5-makefile.patch 820 BLAKE2B cf6bbce2be6d9da05ab6974759b1fde5f05f0ab1f4fbda79dc0dd439409480a183d6e3c116dc488c9f8e098be47dfad7ea1adb1c4b0d07daef854c70d655763f SHA512 64eb06111deaa858558de068a331c0b086983390c13be39857b38a87e5d24ddb9efe652e4612a3cd50c45dc052dc2f147743c898a5933aa6828fc0810d47d9b6
-DIST fuse-zip-0.4.5.tar.gz 687727 BLAKE2B 5a03eee7e44eb0599129c3266cf8779545426e8992b8d4a473ca87e3b65c51bdde5720e9cea3e5a121b2983dd320f7ff4f352359702e5e2e8e83598153d575c5 SHA512 5a3338d8b820ec5b218db849d139b74d2f4413b94ec75ba8d1a69b8d0e3fdbca0195b1af2f33322fdf9c35f56d3e2e5c4142a7ff3fd3a84bfe7649bbe29b6e98
-EBUILD fuse-zip-0.4.5.ebuild 696 BLAKE2B e52b9478f293898c3ff965fc10f942695b75715b8e5d13f0025b9372f118e0f0eb70eb84de0bbb256e4d006a392e81c38e2767ff0d0b7ca5a1c76ae0b4ca82c0 SHA512 86a8e8f055b969fc1cdcfe10d1655455f24b982cacddac2d8ac2f51b13640183b67ea461df7ef7416be5d9a924fd28778deb869a23f03646b646ebada590868d
+DIST fuse-zip-0.7.0.tar.gz 712853 BLAKE2B fd8bdaf30321bfbf897598de0291b1b285171b9b254e21acc1ca9f9d5af2b3a199dcb05696e92983a9b7491b4993b59defa53ec37d0a958d4fb80d2baf322194 SHA512 ea08bee4a7d0e7a0584237c6e9560d0fd2665bea59e87bc020697c3fc6bdc3c4c5c5d4dcdb454eed8cb735c176dd54d7c9bf879a04ac2d5b38bc271cc3128b69
+EBUILD fuse-zip-0.7.0.ebuild 691 BLAKE2B ee9f37d3ea5ba2c1f6dcb67dd4d770d1d10ba725675afaee4bb39c0404ea2da396b79f1583ca1c8b396cefd6aae62ba82a158997ca49c843a87cbd0dc1afacd9 SHA512 1b5eb8da3474e28d01cea7b3c988ac4497fd44bb1e1df8a032719cae011932de7468312787440a2ca9c7ce2d9365ce76658675396938f5d5d6d69659b1535255
 MISC metadata.xml 383 BLAKE2B 9fbc9f2c9ddbe2560cee3301a08f6705818607c3f43deea8a964208843eb4954ec3169362ffea084689e90313a9e18518c315a422de8719a6bbeda103358257f SHA512 e7962c4db2054e682b47d78745cbea5bd0a1d2da9c2d17dc4e48b7f88f83ac18515f23f5ae09a3b07b6bb0ad81cb28881ba9bca977f35536503b8737a3134fce
diff --git a/sys-fs/fuse-zip/fuse-zip-0.4.5.ebuild b/sys-fs/fuse-zip/fuse-zip-0.7.0.ebuild
index a6bf2433100a..1fefa7a93ca4 100644
--- a/sys-fs/fuse-zip/fuse-zip-0.4.5.ebuild
+++ b/sys-fs/fuse-zip/fuse-zip-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,15 +14,17 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-DEPEND=">=dev-libs/libzip-0.11.2:=
-	>=sys-fs/fuse-2.7:="
+DEPEND="
+	dev-libs/libzip:=
+	sys-fs/fuse:0
+"
 RDEPEND="${DEPEND}"
 
 RESTRICT="test"
 
 DOCS=( changelog README.md )
 
-PATCHES=( "${FILESDIR}/${P}-makefile.patch" )
+PATCHES=( "${FILESDIR}/${PN}-0.4.5-makefile.patch" )
 
 src_compile() {
 	emake CXX="$(tc-getCXX)" CXXFLAGS="${CXXFLAGS} ${LDFLAGS}"
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index 7fa30c5fa267..9a591040e94e 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -2,7 +2,9 @@ AUX fuse-2.9.3-kernel-types.patch 434 BLAKE2B 501d771217a6131c31982a5cee300d1d6f
 DIST fuse-2.9.8.tar.gz 4610904 BLAKE2B 803eebea510834676379df8c9514050efcf47d83c06ba1f5b5756d27f5c32d3a0cc199d826b0c041118c5d2260ff023f58432a0d7b623807c0a4af4da7c34eff SHA512 0a9b14d96c6f98f5c903baf00114bfff72f9aeb97224702bbed370516b2b582401d5b436fcef979918ffd85d69ba4a82c8f722c0b35ebd50f7aa5f4ddfdcf8ad
 DIST fuse-2.9.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST fuse-3.8.0.tar.xz 1416716 BLAKE2B f921b739489e8eb8b2a78b719c9761f330de839f151f787a6db37d8d004ef9b90022bfe3c5d24ceab333cde8741340ede0315a5b92cabdaf87fb1b291f72e292 SHA512 46d2b1494c73f8b6b2be4e8969bb9906ea35620fb4081edc3176f7ba34e6ed815d5f9c5c6f06604fb37836460e25d0ce51619853288bb881362f04cba6b31812
+DIST fuse-3.9.0.tar.xz 1523028 BLAKE2B 2fff93431e59e370189fb1527de7bff3863d20e1a62628bb56a6671077a1c919b394ddac66537a1ef7c2991556b1817b2c7f6a92c161ebfffbc804466e19e5e7 SHA512 0c96df5db4d0ceb7885ddb6f6c05b523ee7e179f8f411ad0614caecb9fa0f5fd682ab9bf4dfdaa3aff9d90c18b8947a122ee376328535e49fa6091d784aa0cb7
 EBUILD fuse-2.9.8.ebuild 1942 BLAKE2B 160c38daa8321d980347079e0ab8677526c639e0d6f20b8fffaa481b7072146f1aced7f61cfc5ae05b483d7178beed551e6df44d5e319c9274a3c1c5cb530e58 SHA512 35efa56282f0a9a4aca7e284af1da587d6a5545439c50258ecc31c47159fa777c70400f28b4fd9c8392a39d1b43ba8c3c1935e0860d7689dc7ad40f5134e7da8
 EBUILD fuse-2.9.9-r1.ebuild 2082 BLAKE2B cd76adedf8a5674cf7b6071d150b0d6ac15a3895998d50aa78f8392a6dbbcf00bab6dae4e53905c879506c01e1a06bcfffc1ba584369af26ba669a8e488da101 SHA512 bc85964d55375dfe4d44ee29879281d06c94641763e9e2f855f74693f5a81bd051f129f8fdb8aa439bc0b456989d763ee597235b4f83d6aadd25fd26b5f29c04
-EBUILD fuse-3.8.0.ebuild 1776 BLAKE2B 1f51840daa80da2d456a9e74e197d4cf408af8ff76ccd1a1c5f895a7a1ef17479f8250c937da8c2c1c0ef42b6a2fa6a6ca168fe909f8b0d978ad657a2aeed1a2 SHA512 5a8db47b6b99685140129edaa0f57acb99f8cf1ca21deca186b00ee84415b63be7a32717b13dde4c2245ca5955f4e9118d8f9cb2a3619cb114f5320ba1086e21
+EBUILD fuse-3.8.0.ebuild 1826 BLAKE2B 65af8d81a039fbce8019ae4711ee39651a9c41f70839f74370dd048d82e9a865e6443f2f206e7f744b3732a0ebe06e2b74cb38d919747ac24c9b878b6bbdafc4 SHA512 7d8ed3a6451b0cdaca0ea6536f646ba63fc7b57ff262cab0450ee48f285945d9f0b1df3b21935c0ba819649d9a8ff4e720f8d33a43b4bad8d33930f5b4ee1e25
+EBUILD fuse-3.9.0.ebuild 1826 BLAKE2B 65af8d81a039fbce8019ae4711ee39651a9c41f70839f74370dd048d82e9a865e6443f2f206e7f744b3732a0ebe06e2b74cb38d919747ac24c9b878b6bbdafc4 SHA512 7d8ed3a6451b0cdaca0ea6536f646ba63fc7b57ff262cab0450ee48f285945d9f0b1df3b21935c0ba819649d9a8ff4e720f8d33a43b4bad8d33930f5b4ee1e25
 MISC metadata.xml 461 BLAKE2B 5886a41fed2f941b52933f1b2b83f7a6dfaf20a34721862a8ede36b573b6de79b3ac30fe25bf46e39047bf3d67b35bd44ae9747eccf566aa4d81f8bdee3d3a11 SHA512 66c7c7e08946aa12f78d09162654cb3da545a273e1a846b66a745bdb1767384c07bee4c8eccafce1615192d50cf783bddffcfd38783cc379afbae94a0b47e568
diff --git a/sys-fs/fuse/fuse-3.8.0.ebuild b/sys-fs/fuse/fuse-3.8.0.ebuild
index 4e75898ead75..947ec7caa8e5 100644
--- a/sys-fs/fuse/fuse-3.8.0.ebuild
+++ b/sys-fs/fuse/fuse-3.8.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{5,6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 
 inherit meson multilib-minimal flag-o-matic udev python-any-r1
 
@@ -46,6 +46,7 @@ src_prepare() {
 multilib_src_configure() {
 	local emesonargs=(
 		-Duseroot=false
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
 	)
 	meson_src_configure
 }
diff --git a/sys-fs/fuse/fuse-3.9.0.ebuild b/sys-fs/fuse/fuse-3.9.0.ebuild
new file mode 100644
index 000000000000..947ec7caa8e5
--- /dev/null
+++ b/sys-fs/fuse/fuse-3.9.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson multilib-minimal flag-o-matic udev python-any-r1
+
+DESCRIPTION="An interface for filesystems implemented in userspace"
+HOMEPAGE="https://github.com/libfuse/libfuse"
+SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+suid test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
+
+DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
+
+python_check_deps() {
+	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
+	filter-flags '-flto*'
+
+	# passthough_ll is broken on systems with 32-bit pointers
+	cat /dev/null > example/meson.build || die
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Duseroot=false
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+multilib_src_test() {
+	${EPYTHON} -m pytest test || die
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# installed via fuse-common
+	rm -r "${ED}"/{etc,$(get_udevdir)} || die
+
+	# useroot=false prevents the build system from doing this.
+	use suid && fperms u+s /usr/bin/fusermount3
+
+	# manually install man pages to respect compression
+	rm -r "${ED}"/usr/share/man || die
+	doman doc/{fusermount3.1,mount.fuse3.8}
+}
diff --git a/sys-fs/hfsutils/Manifest b/sys-fs/hfsutils/Manifest
index 8b81149c0b0a..d3d9f73a88e4 100644
--- a/sys-fs/hfsutils/Manifest
+++ b/sys-fs/hfsutils/Manifest
@@ -1,6 +1,9 @@
-AUX hfsutils-3.2.6-errno.patch 377 BLAKE2B 1c3e45b7b5874e7a5d1798e47b846f1a53bf991aaa6649c7b55e2663c28178f42af9896828e6d8a8e79e34f3efab626454bc7fdd9a658430743d987abf120c96 SHA512 564eb03f85299c3fddd5f61d1563b38951a866daeca1bd1ba020a4e1fe8603ae22f1f764be54ecb1fdc47f97bbca68a512936fff21b2a359050ddebef978eb1b
-AUX hfsutils-3.2.6-fix-tcl-8.6.patch 184 BLAKE2B e3efbab15a8cbcf4f642b83daf871da315136699123d06e4912047965351acbc44a3460dd56e5e5052351a6c6a7aa71312183cc65368b27065f8381268af496f SHA512 0868c22b49f5cae7602982f71a0ea8e9c1f4cd350a27b7bb8d810db8d1d4b2396358f410875e21cc2b0611d127960384dc152a93abc0ec63128efaaf5d81a0f2
-AUX largerthan2gb.patch 289 BLAKE2B abb2d405007a16382d5e6e997b0ed2c44fac241cdb4f66f14699306c26c6c4cf3f291a24a8900676648c62c54679a82afb38bb5041a672563fe9cc12638aa5ad SHA512 896b4c89e04b8d0ec6ac66d928a60ccbdab30fd6bb7196e747af91b0823f7875542bfb0c3264062dc9627493d859a6ef28571848fd5e82a73a460ef705bd5362
+AUX hfsutils-3.2.6-errno.patch 223 BLAKE2B d6b42f5cb76fb57dc158bf9ae4ba43ad5518d1326048eb0e4cea7067ccd16925fd892a8a2df2d71a79f6042d4c33f3425f8be316b6f287c32b61278c588885e8 SHA512 0a6074d77690ac73513f7197b49c5309e6066104301aa53dd1c3d1b4b55abb542cef8a76f8c2f7b5aff47c1b3476446498cfe27e5763fe28bc08bba9e47dd8b1
+AUX hfsutils-3.2.6-fix-tcl-8.6.patch 158 BLAKE2B bb12d05629bede97e0d0eedcf42cbabd3d4e5c682253002b726db1d33a72f70f4cade4a2cbfbde810ac0481419c6a1561e4a3e29a81e0b0f48152e4b3b9830c1 SHA512 7b9cb4cb04fad7c092e2061568ba804f0c7035160c6213d3b069deefab8789d624e4b51b39c8bc77a2504279c641b72fad92ceff0a3e2049dad3c9b65e0163fa
+AUX largerthan2gb.patch 216 BLAKE2B d8f9edd367883df8ad1e88660f6f2e0d0d0654cfefe38da0b846ae136f141047b99c9251e9ef63e1fcb11bfc56f6ff739007a81d9cdf655e11270dfd7499db76 SHA512 f20e52f571995a0fc0b0e0a7b804717a1d501fbaecf80460cdbb69cbf2e956a2b8f33ec8c9fa637af2e857edc1d2565797d4a6f2c3ce2ace0359311ef8dc0882
 DIST hfsutils-3.2.6.tar.gz 207697 BLAKE2B 96c3d839e3c07e325e4e175a484b3c637d7cdebdc02ec11ee6810096162d155aa75d71a8e133b801b767a78d50115384460c4181359767f49e015524800885e8 SHA512 0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173
-EBUILD hfsutils-3.2.6-r5.ebuild 1067 BLAKE2B b98f6591ec0bff3cf78652497ac5141ab5b77e447b113d5f6f797f6891a3f3a18ac3a294df1f28a2684582a8f774a62953bab4d0985e3522575816ee761a4b16 SHA512 6afabb87d4de717bd31a521ef383a36cab72a7475a597690b63fc5759159c5972aba4753e935c21ad788c34cc1e1d62a12ed8c1605f584db87c091d4791ab064
+DIST hfsutils_3.2.6-14.debian.tar.xz 6780 BLAKE2B 00474d328f5ec2614ec429052e6940b9eb10d04f433399f686ccc24d66ca1559e7ca45c4ab3ebe6386e02fc4de5ffd96242a7aa6f58d6032798d5536da912a61 SHA512 33d44f7b9094743031fc9315cf9380e158225ee2cd5af7a5ec7c55a2ae9af42e16f9cad3c667b153a1d3d9484d4ea773d34b88b78bfe9499df52a8b9d77defb2
+DIST hfsutils_3.2.6.orig.tar.gz 207697 BLAKE2B 96c3d839e3c07e325e4e175a484b3c637d7cdebdc02ec11ee6810096162d155aa75d71a8e133b801b767a78d50115384460c4181359767f49e015524800885e8 SHA512 0db3050e5969c4e4e6c6ddb10cbc221a5837eb1e12f9331e7129511d31a4ec8d38420ed0b948dadc85ed990f3b1085e930eb7f0c37b3883866d963e47cbbb173
+EBUILD hfsutils-3.2.6-r6.ebuild 1046 BLAKE2B b5d120855a6285b7cabb38b897eb942c9fd52241495a05fdeb04f7bed686e15581affa77c6fb2711865ee17342a9832f69e5ea2a2ffdf46d4963b36f58d697e4 SHA512 2cf1dbd3c3fe26e7e963b2f8530803033077236e6acd11628eba25997fdb50c50a7caf4c9abd7505b2e62b860fd146bbc853d148d18068ae0d22c9f846783283
+EBUILD hfsutils-3.2.6_p14.ebuild 1391 BLAKE2B d07394734bd278c859466965c8bad2344ac2326a61fa5576d5b6c02e59963a06e2cb92065d6cc5c90afa3809370d3933970c944254f7a6942f2802389a10bc06 SHA512 4e9165f8053907a6c4a348d37acf303e3d454daae2222cde6c9be7b9e0ea3d40983c74dff516619e9f8d63984d8d8fe66059521bc56d0b2c1ca58bbe1bf2a107
 MISC metadata.xml 259 BLAKE2B 04ac80e5edbb7a409e8b0c9d856a3af1bcc59c70211fe4b10938eabce6f9f7fbf37ef80fdc3c53a86071d1d416a2159e8292d89b1ffe83213383137032df6f6e SHA512 ca71b1781806d20022c238e5b5d10f9154c78e0fa51f2603de34c48ecbe4cbc2c3190cf046526840546743644c691ee7fe51e31a4617b01bb7602dde803c1538
diff --git a/sys-fs/hfsutils/files/hfsutils-3.2.6-errno.patch b/sys-fs/hfsutils/files/hfsutils-3.2.6-errno.patch
index 6e25f794b220..f8ab6a0bf0a0 100644
--- a/sys-fs/hfsutils/files/hfsutils-3.2.6-errno.patch
+++ b/sys-fs/hfsutils/files/hfsutils-3.2.6-errno.patch
@@ -1,6 +1,5 @@
-diff -ruN hfsutils.orig/tclhfs.c hfsutils-3.2.6/tclhfs.c
---- hfsutils.orig/tclhfs.c	2003-03-31 17:34:55.000000000 +0200
-+++ hfsutils-3.2.6/tclhfs.c	2003-03-31 17:39:51.000000000 +0200
+--- a/tclhfs.c
++++ b/tclhfs.c
 @@ -43,8 +43,7 @@
  # include "charset.h"
  # include "suid.h"
diff --git a/sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch b/sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch
index 19f15424543c..8faf06e0f77a 100644
--- a/sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch
+++ b/sys-fs/hfsutils/files/hfsutils-3.2.6-fix-tcl-8.6.patch
@@ -1,5 +1,5 @@
---- hfsutils-3.2.6/config.h.in
-+++ hfsutils-3.2.6/config.h.in
+--- a/config.h.in
++++ b/config.h.in
 @@ -91,3 +91,5 @@
  # ifndef HAVE_STRTOL
  long strtol(const char *, char **, int);
diff --git a/sys-fs/hfsutils/files/largerthan2gb.patch b/sys-fs/hfsutils/files/largerthan2gb.patch
index a688ff621a30..fb9fb7787f9c 100644
--- a/sys-fs/hfsutils/files/largerthan2gb.patch
+++ b/sys-fs/hfsutils/files/largerthan2gb.patch
@@ -1,5 +1,5 @@
---- libhfs/os/unix.c-orig	1998-11-02 23:09:13.000000000 +0100
-+++ libhfs/os/unix.c	2004-12-13 14:39:28.099124272 +0100
+--- a/libhfs/os/unix.c
++++ b/libhfs/os/unix.c
 @@ -19,6 +19,11 @@
   * $Id$
   */
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6-r6.ebuild
index 1d19c5f6f8e0..23076395fd73 100644
--- a/sys-fs/hfsutils/hfsutils-3.2.6-r5.ebuild
+++ b/sys-fs/hfsutils/hfsutils-3.2.6-r6.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-
-inherit eutils toolchain-funcs
+EAPI=7
+inherit toolchain-funcs
 
 DESCRIPTION="HFS FS Access utils"
 HOMEPAGE="https://www.mars.org/home/rob/proj/hfs/"
@@ -21,15 +20,14 @@ RDEPEND="${DEPEND}"
 
 # use tk requires tcl - bug #150437
 REQUIRED_USE="tk? ( tcl )"
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}"/${P}-errno.patch \
-		"${FILESDIR}"/largerthan2gb.patch \
-		"${FILESDIR}"/${P}-fix-tcl-8.6.patch
-}
+PATCHES=(
+	"${FILESDIR}"/${P}-errno.patch
+	"${FILESDIR}"/largerthan2gb.patch
+	"${FILESDIR}"/${P}-fix-tcl-8.6.patch
+)
 
 src_configure() {
+	tc-export CC
 	econf $(use_with tcl) $(use_with tk)
 }
 
diff --git a/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
new file mode 100644
index 000000000000..b25482a3b41e
--- /dev/null
+++ b/sys-fs/hfsutils/hfsutils-3.2.6_p14.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools toolchain-funcs
+
+DESCRIPTION="HFS FS Access utils"
+HOMEPAGE="https://www.mars.org/home/rob/proj/hfs/"
+SRC_URI="
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}.orig.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p/-}.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
+IUSE="tcl tk"
+
+DEPEND="
+	tcl? ( dev-lang/tcl:0= )
+	tk? ( dev-lang/tk:0= )
+"
+RDEPEND="
+	${DEPEND}
+"
+
+# use tk requires tcl - bug #150437
+REQUIRED_USE="tk? ( tcl )"
+PATCHES=(
+	"${FILESDIR}"/largerthan2gb.patch
+	"${FILESDIR}"/${P/_p*}-fix-tcl-8.6.patch
+)
+S=${WORKDIR}/${P/_p*}
+
+src_prepare() {
+	eapply $(
+		for file in $(cat "${WORKDIR}"/debian/patches/series)
+			do echo "${WORKDIR}"/debian/patches/${file}
+		done
+	)
+	default
+	eautoreconf
+}
+
+src_configure() {
+	tc-export CC
+	econf \
+		$(use_with tcl tcl /usr/$(get_libdir) no) \
+		$(use_with tk tk /usr/$(get_libdir) no)
+}
+
+src_compile() {
+	emake AR="$(tc-getAR) rc" CC="$(tc-getCC)" RANLIB="$(tc-getRANLIB)"
+	emake CC="$(tc-getCC)" -C hfsck
+}
+
+src_install() {
+	dodir /usr/bin /usr/lib /usr/share/man/man1
+	emake \
+		prefix="${ED}"/usr \
+		MANDEST="${ED}"/usr/share/man \
+		infodir="${ED}"/usr/share/info \
+		install
+	dobin hfsck/hfsck
+	dodoc BLURB CHANGES README TODO doc/*.txt
+}
diff --git a/sys-fs/jmtpfs/Manifest b/sys-fs/jmtpfs/Manifest
index becaf7b440d5..90172abc8b1a 100644
--- a/sys-fs/jmtpfs/Manifest
+++ b/sys-fs/jmtpfs/Manifest
@@ -1,4 +1,4 @@
 DIST jmtpfs-0.5.tar.gz 142914 BLAKE2B c6970df3f332b918792034d1da195601098c369a55b9ad4534961227fbc286da6a552ba5fad520474fb8b245f2df5c0b3f07f400d4d12fa5478286250f6e2881 SHA512 1997d202199af59ae2138701855864e4dab624fff4feac08ea98e3e4ed6c39e4181d8f9fec35db0e83570f48de204f3d00e1b0d2244ec677f77a99b1dc9c38b3
-EBUILD jmtpfs-0.5-r1.ebuild 538 BLAKE2B d115071327280a2acda4c26d25344c9d163302c1dfaef80ef25881f7ae06070a2ed3b594d43d2d6290cd946c8d7ea550333ffd565b979c6d27446af523cd64cb SHA512 f7ec7977de44ff1eef22f8b5ce9ab414a75edc9401fd903dd442890376cd65fa83949074fff4d790acb6847ff273257ebfbe95315897f536428f417f18ee4961
-EBUILD jmtpfs-0.5.ebuild 523 BLAKE2B 49212758b08073c0e4f81900284c136cb17b9d6749a20bfab9ca28c7e0d0808e9aa39061030b35defe3092b4a8b8e16269e13aba323c14b6bcb614fba865ee2b SHA512 2789599a26fc8f0d349face029f5876fdd33e2a9e2236dbb4e6b4cc21ff3a3b48e63576f2abb66b58122cdc5216815f54c348272b88e8737e9ef2b62c5c15384
+EBUILD jmtpfs-0.5-r1.ebuild 565 BLAKE2B cfefeaeebebff5a9c1089b621601ec717ef6c396500c5d84cc6ca22a8e74965c6b531764f78d3edf71f0806a63b664ffae28fd1ab973ac7c6985f3a57f6b41bf SHA512 86bd98d69427bfae81993c724857765cc6dca83d6bca250901d16a60188702c977625a242e2f6aba45ccc62de04ce26ccba8f1870285316282e407a32f3e2c2d
+EBUILD jmtpfs-0.5.ebuild 550 BLAKE2B d991b6bc3148738155050e8b4da8b304878ce41e347cc15c4a36a43ce4ab06c85dd024f646c2ea4633771bd0315f21e37e516aad6562f438cb2bf7b18a621104 SHA512 5da62ad2addc5f236744721c95d958b8d96fed7c180e74adb6767e5d82951c8eb5c31f189c43db6467231f02738b3392fb09349c4aa6aabb0c70b9404f196df8
 MISC metadata.xml 298 BLAKE2B 26a4e6270ad510210e0f36c42bb2fa2b44ce328e86307222a4ce16db8d3f924b9f5f3577b092c6d5b62f892b94a411edc0d9909101231099636356e3a030abff SHA512 0164dff12990e4ab1cf98d21baf3d3f02354aec3827244112f1f6a7f02769d3d7210ffb0c190ddd5b193921df44237bb0e1a9a2cfc860fe5b3fd3be5ab6ab922
diff --git a/sys-fs/jmtpfs/jmtpfs-0.5-r1.ebuild b/sys-fs/jmtpfs/jmtpfs-0.5-r1.ebuild
index 8ac5c3177bfb..6f657f193d19 100644
--- a/sys-fs/jmtpfs/jmtpfs-0.5-r1.ebuild
+++ b/sys-fs/jmtpfs/jmtpfs-0.5-r1.ebuild
@@ -6,7 +6,7 @@ inherit autotools
 
 DESCRIPTION="A FUSE and libmtp based filesystem for accessing MTP devices"
 HOMEPAGE="https://github.com/JasonFerrara/jmtpfs"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/JasonFerrara/jmtpfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/sys-fs/jmtpfs/jmtpfs-0.5.ebuild b/sys-fs/jmtpfs/jmtpfs-0.5.ebuild
index d913faaf4893..8af7ed5b575d 100644
--- a/sys-fs/jmtpfs/jmtpfs-0.5.ebuild
+++ b/sys-fs/jmtpfs/jmtpfs-0.5.ebuild
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="A FUSE and libmtp based filesystem for accessing MTP devices"
 HOMEPAGE="https://github.com/JasonFerrara/jmtpfs"
-SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/JasonFerrara/jmtpfs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index 1f5a4a2c831d..e1c43747dada 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 491 BLAKE2B b726731c854dd7b4182a576762cce2784dd0d5f1a4f8d4fc0e10b9e50935bbbde4ecb0909aac75a23a516a7f32863ff67d4206ae5f9240ca3e48c53f33c55aa9 SHA512 46ef3955bfa5040af14eb8add9ee827d82bd2a364c38391e2bbcdfc4b0f152938087846e85bef6edeba3880409951118fdf70acee563a2dfa076c97e521431b6
+MISC metadata.xml 418 BLAKE2B c816da5e3e43a688139fcbe60a32f0d53b6419df43431740458bc85aaf26806809f547d6a2df295d0f5e893eff599b57f5da4d7b6b7df06d7969a3f124e01a6f SHA512 cfdf69ab49b9088ada476c7597abdd6b045082fef71618c4be5ad62135b88562707392240dc612bd7d24c1ca7baa8d2e0c3c4f291b36f7c99a92b1a95b91bf1d
diff --git a/sys-fs/loop-aes/metadata.xml b/sys-fs/loop-aes/metadata.xml
index cf6f48a49730..4ac6180ef7ae 100644
--- a/sys-fs/loop-aes/metadata.xml
+++ b/sys-fs/loop-aes/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="project">
-		<email>crypto@gentoo.org</email>
-		<name>Crypto</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<use>
 		<flag name="extra-ciphers">Enable extra ciphers</flag>
 		<flag name="keyscrub">Protects the encryption key in memory but takes
diff --git a/sys-fs/mtd-utils/Manifest b/sys-fs/mtd-utils/Manifest
index 28ceb747fb18..83f17b94e361 100644
--- a/sys-fs/mtd-utils/Manifest
+++ b/sys-fs/mtd-utils/Manifest
@@ -3,5 +3,4 @@ DIST mtd-utils-1.5.2.tar.gz 343843 BLAKE2B 7f6612c4b9185583e9bbc785f7f96b08b7897
 DIST mtd-utils-2.0.2.tar.gz 355964 BLAKE2B 9a795ddac1287c7c44f52215faa4b6295cf5ac3917392a407c7824f8715f4a180feab95621e6b1aa738fba38950c8e12b722b7c518c3362227e6da25deecd3fb SHA512 e61f4bb24d3b96d39fe262f73e01b7bf3e15a9258fd5766657ef0d807d7b5bb0b489ade9dc45068b2a25bcf378ca2877177df3915398b367f50ff1ef9bc5be7a
 EBUILD mtd-utils-1.5.2.ebuild 1564 BLAKE2B de9628c6cff455da5ed55f2f5822cd561ac9a487e6b9510d3b7ece0ae26edece2d02045cbadae63c4e6e48421c0babb4b77bb2ebf076f3fb86c7170bc671c301 SHA512 934327b7a547dff08509bbf956a00eb22188d0a0bf1275bcf2c2b07b7a2a5faaefe64ce6665de31c8dfd74c835a10e7d9de9b9404630109e4dbaad51e8780410
 EBUILD mtd-utils-2.0.2.ebuild 1327 BLAKE2B 02cd485785eb0c8f112a9868701cf64674057592c89bfa2958cea23885afca964c8d743b303a213fb00231a73364bdbed528ea0e8db03d3acbbc81718ddf573a SHA512 1e0b35ec4fb7cecd48eed123ba20b8121014e0f5bf7836a0247e09c5f5b8624e235ebe1ab6dd9b02cc015a701a83e92b24504e5e558af7b32181289d7fa46fb6
-EBUILD mtd-utils-99999999.ebuild 1510 BLAKE2B 6b49689495715cb470e1c386dd0ab7006610aaed89935a2d9c75eae5b7c08a8566a89060bc9ab1d8da73ce18a5e8826b6bf7f2e724531d93103a298ad894f241 SHA512 8fd85aaed72cf2a59f783a366a01ba93f3929c15eb098500be0025a6a2e388db397c385a9d97293cba1b14913ae6a2d93f90be082d129312e9fc49601f95a5f8
 MISC metadata.xml 416 BLAKE2B 88cdc71a56448e05d3d8bba7b5bb031b043d7b798ad40a04d7ab416b5148fc9c27501366991d26a51f44186953fa6eb3a1214cc8d0872f6e3cd39861c532a672 SHA512 e75a4504c7558e19937f8f608a852905853f8efc2aef32ca3c383517fce86673aa3647a6ed5305d105f16be2c6a0f9667bb8326a9453050810b29b8f72fdc7ac
diff --git a/sys-fs/mtd-utils/mtd-utils-99999999.ebuild b/sys-fs/mtd-utils/mtd-utils-99999999.ebuild
deleted file mode 100644
index 8354dce126cd..000000000000
--- a/sys-fs/mtd-utils/mtd-utils-99999999.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit eutils vcs-snapshot
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="git://git.infradead.org/mtd-utils.git"
-
-	inherit git-2
-	SRC_URI=""
-	#KEYWORDS=""
-else
-	if [[ ${PV} == *.*.* ]] ; then
-		MY_PV="${PV}-*"
-		SRC_URI="http://git.infradead.org/mtd-utils.git/snapshot/v${PV}.tar.gz -> ${P}.tar.gz"
-	else
-		MY_PV="${PV}-02ae0aac87576d07202a62d11294ea55b56f450b"
-		SRC_URI="mirror://gentoo/${PN}-snapshot-${MY_PV}.tar.xz"
-	fi
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-fi
-
-DESCRIPTION="MTD userspace tools (NFTL, JFFS2, NAND, FTL, UBI)"
-HOMEPAGE="http://git.infradead.org/?p=mtd-utils.git;a=summary"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="xattr"
-
-# We need libuuid
-RDEPEND="!sys-fs/mtd
-	dev-libs/lzo
-	sys-libs/zlib
-	>=sys-apps/util-linux-2.16"
-# ACL is only required for the <sys/acl.h> header file to build mkfs.jffs2
-# And ACL brings in Attr as well.
-DEPEND="${RDEPEND}
-	xattr? ( sys-apps/acl )"
-
-makeopts() {
-	# These affect build output, so keep it common between compile & install.
-	echo CROSS=${CHOST}- V=1
-	use xattr || echo WITHOUT_XATTR=1
-}
-
-src_compile() {
-	tc-export AR CC RANLIB
-	local compileopts=(
-		AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
-	)
-	emake $(makeopts) "${compileopts[@]}"
-}
-
-src_install() {
-	emake $(makeopts) install DESTDIR="${ED}"
-	dodoc *.txt
-	newdoc ubifs-utils/mkfs.ubifs/README README.mkfs.ubifs
-	# TODO: check ubi-utils for docs+scripts
-}
diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 6fb9297542b6..f8f582ff2363 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,7 +1,3 @@
-DIST ncdu-1.13.tar.gz 143819 BLAKE2B 8ba489dab1cbafec5b1d9b437b44aa7aa5d79ed7b6938f7904465c4d3803390307bfdfed531641fa186873005ce7f0c37db058855ffcd4ce45888bfbffd03c3b SHA512 f1f417caa9bd9e9d9aa6311962b461e48301cf9eab5d0f57073e25df01f96ded05dd093627b95b43afc659ad99aed869efd4a98d723f5835b100747b5525a60c
 DIST ncdu-1.14.1.tar.gz 146346 BLAKE2B 50152647389cb08c236a47c8f85b93c7a42ba9a94b84dee313b7887614e5612ad9c0158a878872e08ffc3e85f4a7b91d292dfa0ae0471e194e6cec2b25a9355e SHA512 7db9115f7ba20d43c47bc7187347658d7a4dc36da6ffdc54308d3966a431c24b87c3266854d69685c3ea5e29805b5a631805a783d6431e30bd83c411b398515d
-DIST ncdu-1.14.tar.gz 145911 BLAKE2B 27b9350d5f12bb0c3a972b81e325e305fce2ffb73194e26a70a4fcac79805e5addfe18483e56dcfcb1e24bad4c3ef418ffba5a0c15d49199996db5aa0961aec6 SHA512 9583d86f66ae9ab19e5d373d90e0d85504807f726fe6656e593ab09f83ba4ff22c0bec6fcfec216c4d9ac0b3725899ff1d9fe6cca1e3d5fd1c76cd4636b65c1f
-EBUILD ncdu-1.13.ebuild 429 BLAKE2B b437604c81314a3aba39cc8e502e4c680aa09b153a8ad52006a0bec74deb03fbe73aaaa9efe2cdd4b2a84eb73e3b47dd8b851dc56483f36ace9290328d8023e3 SHA512 5e0208e5c53aa232f2a611e7784a6b18165156c71a7e2011186b4fa4f7d40a3b127452d531be8412ac8b193b464c8bd0adade8ca1f8bcd066417257e21ac5a38
-EBUILD ncdu-1.14.1.ebuild 433 BLAKE2B 27b9ed7ec4894b03c11e8adca1cb280cb8ff1d171e003c5a4a6b0c4bb77a2373ecc8addc68279d07200f3e76e79921914df9cd7bedfc9924a5d25c82293708f8 SHA512 716f050cbbf479d23d065ccf04b7b1ac344d6b5ca478aa58996f1d0ca6c2c1b84ac79bd94995b91b7542c5db5b17c08ec5de7de269e58efd13d339a2e8e6591c
-EBUILD ncdu-1.14.ebuild 438 BLAKE2B 96c9ddbecc06a9bb7b3692b6bfe2f1a6f145d8977f05daeb7f13bfdb83184ee568eb3feb7381654db5b98a11288946c3a27f450c430d68f5e81642cb4d644da7 SHA512 13c7b99e659c9ed88d996adf57c22f80d2d00f782a85e56599d4e41ab94ea78ba92c9b42ad630019d1cc1876c17269d444caced02731902d8881645916619f64
+EBUILD ncdu-1.14.1.ebuild 431 BLAKE2B f5ea75552e13db3394eba917e4ace472836e785d1ad6cc00f5703c693d950fad38420e5b7211e6611c81421522678dbaa637bb5fe521b1c4b2a715659287e9fd SHA512 1d8348097d5739ea2c8d8aa01f80fe2605d812cc3340744dfa678a0447f32e7d53d70961b4dffeef26a4ae4f007115e7b05d5355de50b27d6fee770bd0dd5f9e
 MISC metadata.xml 589 BLAKE2B 9915d839320066570a64eb949ce52f48af51689617cdb6cdbac0fb6094a3923900bb940ae84be99fcd52618db5ba8a2de698c5c0515f4e5f0a6a3dbf73a42165 SHA512 2c3cf9225fafe928e442ef61f3ec10b810051843c801f3901fe8cf97d0a22e6c2354c9b3517b0c9439fad6e5829fa223ec36c6c295f426aa8a8a89a06b637d21
diff --git a/sys-fs/ncdu/ncdu-1.13.ebuild b/sys-fs/ncdu/ncdu-1.13.ebuild
deleted file mode 100644
index bddef439e959..000000000000
--- a/sys-fs/ncdu/ncdu-1.13.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu/"
-SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/sys-fs/ncdu/ncdu-1.14.1.ebuild b/sys-fs/ncdu/ncdu-1.14.1.ebuild
index 7a56047b0345..4eb64e8e338e 100644
--- a/sys-fs/ncdu/ncdu-1.14.1.ebuild
+++ b/sys-fs/ncdu/ncdu-1.14.1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="alpha amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 RDEPEND="
 	sys-libs/ncurses:0=[unicode]
diff --git a/sys-fs/ncdu/ncdu-1.14.ebuild b/sys-fs/ncdu/ncdu-1.14.ebuild
deleted file mode 100644
index 27a003fb9d22..000000000000
--- a/sys-fs/ncdu/ncdu-1.14.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-DESCRIPTION="NCurses Disk Usage"
-HOMEPAGE="https://dev.yorhel.nl/ncdu/"
-SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	sys-libs/ncurses:0=[unicode]
-"
-DEPEND="
-	${RDEPEND}
-	virtual/pkgconfig
-"
diff --git a/sys-fs/pysize/Manifest b/sys-fs/pysize/Manifest
index 87e43dedf9d4..5c959e2fdaeb 100644
--- a/sys-fs/pysize/Manifest
+++ b/sys-fs/pysize/Manifest
@@ -1,6 +1,6 @@
 AUX 0.2-setuptools-automagic.patch 265 BLAKE2B da39d6dc75ead004365561b443966a388b3596073d21ba05b8faad4b77c7dae8ce994e72ce878141c81dd7b3350a52d57550abe5b3a3bfea9bc669f0d5208bfc SHA512 8caa271dcfb016c81392e0f590e06f6057d297e9bb5196e9362372c725d218fbef911561e6528c624c2acf133b0ab8947e2b5ccc58704dc2ea5e0cbab0011dad
 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 1663 BLAKE2B b18ef0c79d6d852c5ae600d5ddd8486b539d0338e08fb8d4c6c87eef1220cc684ad09e916e889f2b0ce13c9e2ae6a8bd533318c7968f08f903b5a281dfadd940 SHA512 d7e63489fec1d0a4e3ef04afa632ece677f18db914d1a5fd144ddae46fe14442dff52819a61ad5fa05360ff6e7630724af5971f380172c80e07cd8713ad06987
-EBUILD pysize-0.2-r2.ebuild 1665 BLAKE2B ace1b8caf687480edbbe4925dbdf33cf9a1627da2c0797af0810344a00e59d0c77fcaa98a79b559041b23bcadc680eaf57392a63c9adf8b41fa622309245f4bd SHA512 0177389204f8ced3834fcfd765c74103ccc172bcfd36a9015e2cdb5a825c7fb45a445fb681fd516d33fea1d0e56227c43ca72d200e0a30c97b7f38b66fe440a3
+EBUILD pysize-0.2-r1.ebuild 1658 BLAKE2B a58ccb09a1137205dbf6518b339df41495ed54cb3d7dcc473371f57d3b4d6d20646c3aa52a87b9ab8f575e6159ef6230fd11aa39eb972c0e00d8676b70a93180 SHA512 5860cab4ab2990e8eb457dea657f322a57a9e4dc529fb1571608faa59bb3df1dc2953bfa361aacf277199ebd63a18e1f6de88be817cc59ac01fd29a4a7fcd904
+EBUILD pysize-0.2-r2.ebuild 1660 BLAKE2B 0fddf71eab1ddbb1401101c9aae57730facfb48ebddd2c3ad8ea64c1bb3b10c9103372b1259083c2995c64ce5648eacaf96af98a77cf02867d60552022bc5320 SHA512 e7c2c663e6a1a7c6a63c9ed5f5f0a47c0e4dc64c6bd134bf341289eff0e532649e9beaa2d112bab344d4a1caf3eec2ed31af937bc105007ce53202528697dcac
 MISC metadata.xml 219 BLAKE2B 813585cd65d05a9ef9aaa9a9fca8cfa66b803be8df8b300a6adfe0263e593ab53afd106180cc44391c9c27129ea9fdacdd8b1c37841e6aa33d833278b8c7dd9f SHA512 e075cd1d2568691a299ae945f75e194b462a394f88f7b3e5a60c4529cee7ac7e7a275204602085f15d024c3496f21554a18a24002770e9c5ef0ce64a74597602
diff --git a/sys-fs/pysize/pysize-0.2-r1.ebuild b/sys-fs/pysize/pysize-0.2-r1.ebuild
index 867db7463b78..abf13864ccb8 100644
--- a/sys-fs/pysize/pysize-0.2-r1.ebuild
+++ b/sys-fs/pysize/pysize-0.2-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/sys-fs/pysize/pysize-0.2-r2.ebuild b/sys-fs/pysize/pysize-0.2-r2.ebuild
index df91d9b7fc8a..b95233617d65 100644
--- a/sys-fs/pysize/pysize-0.2-r2.ebuild
+++ b/sys-fs/pysize/pysize-0.2-r2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 pypy )
+PYTHON_COMPAT=( python2_7 )
 
 inherit distutils-r1
 
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index d2638e3d68d7..f3eb3d564405 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -10,6 +10,6 @@ AUX quota.rc7 688 BLAKE2B 18a3317da5360532d6e6d9051f674a7a8e0495fa08aae8511fc7b7
 AUX rpc.rquotad.initd 448 BLAKE2B 59dc12ee73ddd0473f8122c780ef94c46dc8cfa0e15bd7a839b2d0360ea08d18d239b17b538b0ff9cd8110b8c29676aa93d06f25cf4acbc7f169ac545ab5248e SHA512 c6ab8d6e0e15032bbbee523c2550e7f23d48fb45035d37181e988f2f96cd1ece316681f1b529b51fd1aeb390c5f27a6911f5de52132e90b4cbcfb4c2dfc95954
 DIST quota-4.04.tar.gz 577303 BLAKE2B 8ee1e8f99b70f626ec051e4e9afe53c788b625a29f26afbe075039cf88dde9f6641c39e0ccfdbfcc6981fabe35e8fd15e7203989e9bbbdd1f1772949566531f6 SHA512 adc33863d2a966b4c46983fa3926e6b6ba75e260ed21bdff646584237840e6beb0dcfbfd2f655969aa5675c3c398ac2e483afb933f03f983756ebb3352d0eaad
 DIST quota-4.05.tar.gz 577313 BLAKE2B ab0adc04a2bee46f5b4f528c3a1b7f1dfbfc93cc153aebef91cf563e0b03344479b4d465f7d91cfee60c533052f27ce54f24a937c0c1ec312a5fff763cb82bd1 SHA512 a13ca93fb6fad032cb032874dda2f5d792e619b41e89b481e6aaa4f06ac5774e2728b09dd625addfbe22efccb1d85892b093736084c72f75675a60df168b92f2
-EBUILD quota-4.04-r2.ebuild 1637 BLAKE2B 5e0fc49e04ae121ad313611e14a267cf2b37749c6080c3e569ea8f28c1d213a1068a6d1a42ccb04942adf1b4d9a81cf5c935211bb0c72d45003707093acd3081 SHA512 fd31874034f0b45c73d405122c802ef43a8ed0edabf5d17edcb72693d3a87fb070ec6be1704bd0ff647ad32e5e6f36c8feb0ec484bbda9ef720fd71eaec1c365
-EBUILD quota-4.05.ebuild 1548 BLAKE2B 4d62b492ee718f0b2ce05c84706f5ea634f23676f7d24f05451b5f98e363fc74146aba045524be0c85ef7c9de82b4326cc1914c87fdbfc36712ce04547634bea SHA512 9ed6d2fd53401b74d27614d0060957554d7909b1cc2e1ed2f4f91cfbed8d9dacb78612290be33ac59dac1ce4f0882c13e20580d25f593d6fd8676f716db5d9d4
+EBUILD quota-4.04-r3.ebuild 1656 BLAKE2B 953166e2d058ce2a975ef97e2f74aea80221c4097a3482cc9b485027cc41957946bc34f4d967ac025bf3d925eec1dd1202d5bf226e7581412c5ddd43fa70c9d1 SHA512 390764339f02457096938ece74102d3c933dbb5981d6b3107f85ec62c1472a7abe212b8e4ba6da9a1a5b182b3513037fa8f47e065d004e46807b50739000c68c
+EBUILD quota-4.05-r1.ebuild 1563 BLAKE2B ca6c4850940d4b49383a842159c99ab6fdadd447b137a1a99c9b733bf90b80d5f3200a55d86cc243697d7ae972faa566135e8f25424c761ce344bfb94f7a6569 SHA512 a71be1a11a405c44085c33e63277ee4cc2a893afe7054e50e8602b376fe27c9803717e3de454c1916fec7357eb23e5cc6a894cf2d9d6d39b0a6f81d77a258fa1
 MISC metadata.xml 482 BLAKE2B 4b2afb537080bc15a4cd9756de6fcbb8df9a19a5a6ea3a7a4e024756be844415d46c07c3321c9dc6bfde8956ec4fb5f3ef87d0dcd090a3f4ed606e724d25fbf4 SHA512 50b2143425f8ab315784fab4d9e569d2f80893c91ba64b4c209947eb79688ed9e8e23955b9f04406d699de6f28e9c10dad78889853d05f84191af65911d7a38e
diff --git a/sys-fs/quota/quota-4.04-r2.ebuild b/sys-fs/quota/quota-4.04-r3.ebuild
index 1d128be85e60..cd21f0e44141 100644
--- a/sys-fs/quota/quota-4.04-r2.ebuild
+++ b/sys-fs/quota/quota-4.04-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="ldap netlink nls rpc tcpd"
 
 RDEPEND="
@@ -22,7 +22,6 @@ RDEPEND="
 		dev-libs/libnl:3
 	)
 	rpc? (
-		net-nds/rpcbind
 		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
 		net-libs/libtirpc
 		net-libs/rpcsvc-proto
@@ -33,6 +32,9 @@ DEPEND="
 	${RDEPEND}
 	nls? ( sys-devel/gettext )
 "
+PDEPEND="
+	rpc? ( net-nds/rpcbind )
+"
 
 PATCHES=(
 	"${FILESDIR}/${P}-glibc226.patch"
diff --git a/sys-fs/quota/quota-4.05.ebuild b/sys-fs/quota/quota-4.05-r1.ebuild
index 06512aaf271a..bbab3f558205 100644
--- a/sys-fs/quota/quota-4.05.ebuild
+++ b/sys-fs/quota/quota-4.05-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc ~x86"
 IUSE="ldap netlink nls rpc tcpd"
 
 RDEPEND="
@@ -22,7 +22,6 @@ RDEPEND="
 		dev-libs/libnl:3
 	)
 	rpc? (
-		net-nds/rpcbind
 		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
 		net-libs/libtirpc
 		net-libs/rpcsvc-proto
@@ -33,6 +32,9 @@ DEPEND="
 	${RDEPEND}
 	nls? ( sys-devel/gettext )
 "
+PDEPEND="
+	rpc? ( net-nds/rpcbind )
+"
 
 src_prepare() {
 	default
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index 13b6ae13c72c..9fc8f43d34e8 100644
--- a/sys-fs/reiser4progs/Manifest
+++ b/sys-fs/reiser4progs/Manifest
@@ -1,8 +1,8 @@
 AUX reiser4progs-1.0.7-readline-6.3.patch 472 BLAKE2B 88f0489b88691e72a8813145428e949b0ace21b15dc01f18da4292524e3601adfbe30e3b6cb3d1f12174bc5241fa7732bf36856025c7af5c678f3ca53d24497e SHA512 0162505148699f8e5270314be586d8db7d42f9ea5fc8517b5475aa59f54b47eb626349c36820cc34c0490e0c3df1597a230c27abf316226cc7d261e986963788
 DIST reiser4progs-1.1.0.tar.gz 929047 BLAKE2B 82193eb4b465db365062785abfda8df1c2c42252adf4518f85abd785954b3305f2eed42ebf6e1c3c032f9c23e34744f4c9f05d25e259f8c0011f83283c51b963 SHA512 649645d702298ee7f3e5b8d2c39b2781fc1aae55cd03a4b774a2e66feef51e67f0a4367350db4defd62eaa2fc6710cb48a58d65991a63942d34e43783d29f94d
-DIST reiser4progs-1.2.0.tar.gz 962611 BLAKE2B 0ee17f51ea7ae21d82b682c5594c8022be41af602390ccdb6ebf88d9e4c1ce12ef3ea190bc4f0b109cbc3657d1c404bbbaa30cbd7c0febf619f99d528de97ea3 SHA512 c517c3ea2121689ef94241a63daf7a0d85322b8cfa2343b08d0aef7640642499f261c806c83a2d46cfcdf28feba3518ff48a76b898b89c811f53493a918db843
 DIST reiser4progs-1.2.1.tar.gz 980203 BLAKE2B 8c9cb77458c083c50f34c17bddf4747b755b52b911a63835152ad584494c2738a5317c28e5b3f1e6bfdc49416f3715ca4fbbd9c8a428b5b484b54f8f4a861a58 SHA512 2caac5a98d672d68910c6df3e694a42365fa6273ae367c26126778c1fbe956aa502dac236d36c3302a5bf109468ad3447e645a6eab89c83f122dd1afe2aeda21
+DIST reiser4progs-2.0.0.tar.gz 1019362 BLAKE2B 94d94697e427932b82634a756e7797ba7b061592c4ce946660f3c7750eb48ece7a5c0a265aa392a463c598212a87ec9fe769af88f680fa24adff36bd6db51128 SHA512 1993a38b2c4f339acb5d305b3b4c3360e57bf3df4684543f708bfd1062ecfb2435dd16e22f9555ab1317d77e95750cf9c2b2f81a91a109ad65aa30a5e7d815bd
 EBUILD reiser4progs-1.1.0.ebuild 1252 BLAKE2B 7c4d0c03e9886f1b049493a9065948fd35447699bdfc72784b382d920077b7ca127c1b85c3fc9fc3fa3f3345e152b63ea6fdedc3a0ab707c3341f1864539af21 SHA512 861f8dd87c1bb823f336639eae859e2e171448c25cfe73e09cc168aca157bf89a48d2cfb2861e74386c5ef296f8f096e567dc65ecdf0418649d5b474f9817954
-EBUILD reiser4progs-1.2.0.ebuild 1273 BLAKE2B 17a605c78f95ce4d6542924c417b9906ac2e27235a98836bfa9a712202528964cb23f2cf2e38c6cd643b6b4d9e95d01f830fd9315a1ca04b0ac812fcc9c97d15 SHA512 7cf47e8526d17d51fc00456e202254a67980ef0161aff76e35a45b3d222225b9f1b41d853f1959ea73d342d5cd8d0def362bfe25f16c05d3093105d0e50a328c
-EBUILD reiser4progs-1.2.1.ebuild 1303 BLAKE2B 95b17a94fcb35b10ff5edc6e89db7e84011b72bbd263f86aa560cb3ce04c51013736d1a9d05ae74afe469b82f2875ace9ee67b7cdee31cdde77cc35df0423076 SHA512 8159dd1a0c3f4b6db72deaeb4bb31b1256ae0ddc5547b3149da008cace692e23a7b9bc999209d0907be131ab3c1da4d31c67c8437529f8b9df1223de8593652e
+EBUILD reiser4progs-1.2.1.ebuild 1295 BLAKE2B 8ef4781ad4a121a92f6c732ba92eb8d6adb51f918eb975eb7cb97969135d1380e41bb1b010788ebd970805d29d8ca7267387ed3da75943922ac0fad729066ef1 SHA512 81f2db7655fe926394e628cacc97ef1d1749a4387393a7c04575cff245268f42b8e9fa58c974a5a8647b9d34f9e73b4f9b596dc70bf512f53b90fd3022af9fdd
+EBUILD reiser4progs-2.0.0.ebuild 1341 BLAKE2B dd6207a5efd9f565c717ae0fc1517a1c2208e9efdddc71fed1d3b83ff0c890def4681029e828208009fd5c5f0fc7dab22c2ed488893921817b2bcd9cc17f331a SHA512 1d14e1acf510629aa32e6b7a50dcdb962e332ae7f5c8402b63e97ab2b5d16d244835a7a858cd477143b5d1a085db3534903c183e2cb81b113c4987840a1cc5a4
 MISC metadata.xml 440 BLAKE2B ccaa949c04b37b13f2b7d11a4ab6586de239bc61be58e772f160e797e6da6c102b66be660e57e7888ca5960911b0dd2455978709de0d6e75b615a37bd870e8de SHA512 f12899412ca119abba07a6012e55f243ea069e1132c7dd9786aeb399f7d543ff82cba92f0957443ec08f230e68bc257729b789519ef52337ebc5679ee63b3ddc
diff --git a/sys-fs/reiser4progs/reiser4progs-1.2.1.ebuild b/sys-fs/reiser4progs/reiser4progs-1.2.1.ebuild
index 0c268dd4ffc2..77fd55138b22 100644
--- a/sys-fs/reiser4progs/reiser4progs-1.2.1.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-1.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/reiser4/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86"
+KEYWORDS="amd64 arm ppc ppc64 -sparc x86"
 IUSE="debug readline static static-libs"
 
 LIB_DEPEND=">=sys-libs/libaal-1.0.6:=[static-libs(+)]
diff --git a/sys-fs/reiser4progs/reiser4progs-1.2.0.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.0.ebuild
index d1dfac41fa30..fa83088da8fb 100644
--- a/sys-fs/reiser4progs/reiser4progs-1.2.0.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-2.0.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-inherit multilib eutils toolchain-funcs usr-ldscript
+inherit multilib toolchain-funcs usr-ldscript
 
 DESCRIPTION="reiser4progs: mkfs, fsck, etc..."
 HOMEPAGE="https://sourceforge.net/projects/reiser4/"
@@ -14,10 +14,10 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 -sparc ~x86"
 IUSE="debug readline static static-libs"
 
-LIB_DEPEND=">=sys-libs/libaal-1.0.6:=[static-libs(+)]
+LIB_DEPEND=">=sys-libs/libaal-1.0.7:=[static-libs(+)]
 	readline? ( sys-libs/readline:0=[static-libs(+)] )"
 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-libs? ( >=sys-libs/libaal-1.0.6:=[static-libs(+)] )"
+	static-libs? ( >=sys-libs/libaal-1.0.7:=[static-libs(+)] )"
 DEPEND="${RDEPEND}
 	static? ( ${LIB_DEPEND} )"
 
@@ -35,17 +35,20 @@ src_prepare() {
 }
 
 src_configure() {
-	econf \
-		$(use_enable static full-static) \
-		$(use_enable static-libs static) \
-		$(use_enable debug) \
-		$(use_with readline) \
-		--disable-Werror \
-		--enable-libminimal \
+	local myeconfargs=(
+		$(use_enable static full-static)
+		$(use_enable static-libs static)
+		$(use_enable debug)
+		$(use_with readline)
+		--disable-Werror
+		--enable-libminimal
 		--sbindir=/sbin
+	)
+	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
 	gen_usr_ldscript -a reiser4{,-minimal} repair
+	find "${ED}" -type f -name "*.la" -delete || die
 }
diff --git a/sys-fs/simple-mtpfs/Manifest b/sys-fs/simple-mtpfs/Manifest
index c30eb70498c9..c86724232f41 100644
--- a/sys-fs/simple-mtpfs/Manifest
+++ b/sys-fs/simple-mtpfs/Manifest
@@ -1,3 +1,3 @@
 DIST simple-mtpfs-0.3.0.tar.gz 36655 BLAKE2B 3e3e625268fac9454f512ce592d84fde3b3e6d190f123b82bede13bc4119ad4c0cefb4ca3e5d8a81ddf9a020dc375be389853410b0147b419a255b6c0af6047b SHA512 7d2da152708c01ddd2a39c1b56cba6470bfd320b92507530cdd8fc4f25f9500ff817eac6a5d19c775f31029ae6a0baef693987c59453c60c688b84934378f772
-EBUILD simple-mtpfs-0.3.0.ebuild 565 BLAKE2B 0240a0e68c96934b1db597609eb3589c886f93e26eba9b23f7a4b17d43f2d9485ff0e7aa67011897990568e1503a88227e57435dca1a1c20910903b8d1562abb SHA512 c1fa45fa3c6dc0db336c11710e8f454084b6afd6e203c6bca11fd680346c5b229aecf163a93a9dc6d8e964a05303a41bd48e3b86fa49f94488e522491f89474f
+EBUILD simple-mtpfs-0.3.0.ebuild 593 BLAKE2B db5185d4f25df14064e5042d4a27a68304ac5b526e111719f7fa03c285a9aa328216be688c68e9ff6349af6d85808442e1672b912d48ed7bf16468b7950ae376 SHA512 1cd0e0aa7c3af28e7643a8dc2eb03d4648907d94a2197519dc725fd825971e32aa17b4df24f0ef2c94a995bea55ee0840d7b7e2e524901ca951b5175fdce5dae
 MISC metadata.xml 799 BLAKE2B 0e57ff1e7dab7129a637ae9b978d448cc7e10932c3d1d9407a6e68465d45b433d427fa1ca2d3953d9b8c631fd69b58902c2b7503ee27599445db0b1452c2fc8a SHA512 5957d316d1df4e24a79c54f68f1814f6d3d8766c4324c1664ad29da6534d8e7a25652033be1472a61992e76d6cc0c6d07683f30c7e496e894629587620693b7e
diff --git a/sys-fs/simple-mtpfs/simple-mtpfs-0.3.0.ebuild b/sys-fs/simple-mtpfs/simple-mtpfs-0.3.0.ebuild
index 5e46a628ca75..5247a121e82b 100644
--- a/sys-fs/simple-mtpfs/simple-mtpfs-0.3.0.ebuild
+++ b/sys-fs/simple-mtpfs/simple-mtpfs-0.3.0.ebuild
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="Simple MTP fuse filesystem driver"
 HOMEPAGE="https://github.com/phatina/simple-mtpfs"
-SRC_URI="${HOMEPAGE}/archive/${P}.tar.gz"
+SRC_URI="https://github.com/phatina/simple-mtpfs/archive/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index 9e9a010da8c3..84f0c0f6ab39 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,4 +1,6 @@
 DIST squashfs-tools-ng-0.7.tar.xz 372956 BLAKE2B 5fd0849c8cb0255ea56edc5b5cdc771363f5ca038f4306bb7d816ff26ce23cbd4f4652ef8ae497b8c9fe1ec09f9ebcfcf13aeb6b99b97db80a95018c25d4a3a6 SHA512 e53d7b64e68a40b49667b65d9fa8f12e977e8ca923c2fe9ce1e1def2745573f8607f7dee7ae6c06496489ef721c4c500ec40513ea5f6bd3ad4bb3a7796972b8e
+DIST squashfs-tools-ng-0.8.tar.xz 1004616 BLAKE2B 5d347eef252886e7750da306f038494a15660350aca7b93aaf85a8411882489d8855c771e719a68b025f5c15fdc8b0d30727dde0884c5982460ff85d106fcd37 SHA512 7a533c7f9f21f717718a9ce5d775cf297c2e8edb6f121741b14692b52cbb6e3d7fe5cd59525222f7f9617440ea2adb2acec4dda3252abf3bebc689905b9fdc20
 EBUILD squashfs-tools-ng-0.7.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
+EBUILD squashfs-tools-ng-0.8.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
 EBUILD squashfs-tools-ng-9999.ebuild 1117 BLAKE2B b003c6754e392cecbdf7b763c50653b2ed268a03c7005081f8d31f16aff5fdcde5fb4f86e2ebfaca03247c2e33ace848250cffdfc1e66ae8d4de57c15a5c7ae8 SHA512 5b8a6b42f929047fced02ba98a26e1309bce5fd0a1ce9956cd6a21c1061539b56c5d2dc2bd29a24860c9841dab26777ab0e22c8c5968cc6ebd72c3a2962fccd7
 MISC metadata.xml 556 BLAKE2B fcff50b7024c1743fb7d7e677c04865bba266c011305d701b4a27b1ce813eb492b6becb64b5f1d4d52a3efd5a80d3369ac88ac65c2665cb0121c6b59d592b966 SHA512 cd1de16571ec7651bf353e804c8f44cbe6a919c21577a832782d8213e7e956b5af1769889eb1631f1a97c44b89018d484122fee59bedef4409363901101df6e3
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.8.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.8.ebuild
new file mode 100644
index 000000000000..22a2dbc93b62
--- /dev/null
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.8.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="A new set of tools for working with SquashFS images"
+HOMEPAGE="https://github.com/AgentD/squashfs-tools-ng"
+if [[ ${PV} = 9999* ]]; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/AgentD/${PN}.git"
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	SRC_URI="https://infraroot.at/pub/squashfs/${P}.tar.xz"
+fi
+
+LICENSE="LGPL-3+ tools? ( GPL-3+ )"
+SLOT="0"
+IUSE="lz4 lzo selinux +tools +xz zstd"
+
+DEPEND="
+	sys-libs/zlib:=
+	lz4?     ( app-arch/lz4:= )
+	lzo?     ( dev-libs/lzo:= )
+	xz?      ( app-arch/xz-utils:= )
+	selinux? ( sys-libs/libselinux:= )
+	zstd?    ( app-arch/zstd:= )
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	default
+	[[ ${PV} == "9999" ]] && eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--disable-static
+		$(use_with lz4)
+		$(use_with lzo)
+		$(use_with selinux)
+		$(use_with tools)
+		$(use_with xz)
+		$(use_with zstd)
+	)
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die
+}
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 389350323e0f..b25b39c4ba17 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -14,6 +14,6 @@ DIST squashfs4.3.tar.gz 182550 BLAKE2B f56ff33a505f7d60cced11224526bfce003bc0618
 EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c528665123ab08b9d2fc212faea1f460d8be277ff26f7d9f58c4fd912d1b3a4d2a36d8a65028d922e9e50fbc2198859207ee44103 SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec
 EBUILD squashfs-tools-4.3_p12.ebuild 2176 BLAKE2B b55b7e215becdd233a43fbd2abfb4676b694270257b87f49b9a301c2271fb7de29f6a4e41ec1af4c89ed777e000d2bb27025c1314e74e4ea263d8928f6896f89 SHA512 13537ed71d3c8f4a599107eed5efb20f3a70633bb1e4cd193f98febfa89ddc4c38b2fd6eadfec2c0aca187044a40198d01c0d16b33685db85e7a9433e9b625b6
 EBUILD squashfs-tools-4.3_p7.ebuild 2081 BLAKE2B 4a8dd3b2d9aeab4dd62e837ccad73c3978a38cc6eab1bed7b325cae5df5b86eb07a72c7fb41d15c6f3c8d359e7f737e42378bf1f8cd27449fbdee0feabe3e757 SHA512 7502683661d1ce9dceae275695f727153fa3215735e8d65089f3953244ec9e4a37e0be4df02300001d8ea49e1819e4d9a14529b6a6f654ee6332b6bbc2ce63f8
-EBUILD squashfs-tools-4.4.ebuild 1655 BLAKE2B c4bf73f98ee35f5b4477908824f3586f1171f68bf80c17c1595d20734d00248a72b5e03bad824df3b730daa0240a0de09e61039205bb955fc33f49fd559106a7 SHA512 016adb7773bf58153291369f1ff44efbd0b69f54bc26c6cda4de2ad717c7d7878e60651dccbb042f8f7b9e2d7c212ac0f99317db8015c5463112efa5cfc96b90
+EBUILD squashfs-tools-4.4.ebuild 1682 BLAKE2B f26a90aa1069483c51fd4a198b5604cbc1010e16476a207dfea47a3987522f26d29f3d9f4be3d435069b4dd3dca6b4474c3a63eb036ae5c9c7e99a479dcdff9c SHA512 c42d7d613652f82d044504f9ab513ee9187fb84ffc7fa15e9f57d38aaaa910e6eecae082e7dd8213aa385fa9c87e3ed8dde79711f91cebd11a2e1e0db816ac0a
 EBUILD squashfs-tools-9999.ebuild 1598 BLAKE2B 99811ee72ca38123b68e575076e88abd43353143a399039347608d5c28ac32c0bc1b095811af3571ef63dd157a28ff7c330b851f6874f052ae79da524982bed7 SHA512 4c6339bcd651802945f61d20c881836936fb99e0eb3c4b21ca7766805db1c5bb031e221a171c2f02e2d761b6659669ca97d43e82b0c3c74e2cfc1beea6440858
 MISC metadata.xml 438 BLAKE2B 7bb1623378cbc91becb4e12f91bfdead33f1859c9a13e5dc53652a1202b0d5cdf4a7be46071e766fc932f15ab3223b889e6ff32063d67d50e8ef809e887221dc SHA512 985005bd45043f21efc64f544cc685e93a70dac00a869416aa93bbc91571461dae236d2b4bb3325c63c7c3515b88f32a84ab56d3405e84545053c86d164c7dc0
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
index 3f7f548b7f0d..4bbb6fa92af7 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.4.ebuild
@@ -6,11 +6,11 @@ inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="tools to create and extract Squashfs filesystems"
 HOMEPAGE="https://github.com/plougher/squashfs-tools"
-SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/plougher/squashfs-tools/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86"
 IUSE="debug lz4 lzma lzo static xattr +xz zstd"
 
 LIB_DEPEND="
diff --git a/sys-fs/tmsu/Manifest b/sys-fs/tmsu/Manifest
index 788362c1e6df..e2af3e19a0eb 100644
--- a/sys-fs/tmsu/Manifest
+++ b/sys-fs/tmsu/Manifest
@@ -1,5 +1,7 @@
 DIST tmsu-0.6.1.tar.gz 92874 BLAKE2B 492145376c1e96dfab5be2692ae98d5171e6a3797bd132151ecf34db27c223be429fb7ca675f6724f875884b30e2887e0c357f9ed0020de7a2fda6718280dd5d SHA512 53bc9d880f9138e9d88b25a151f72a5a3110418002c2a1a6101d2794c0b6fd854ebd52e589f3b1ffa18f1b5c2f2298550246fc6cb1bfebbfd0131692c2fa5512
 DIST tmsu-0.7.0.tar.gz 98108 BLAKE2B 560d7a241d6e6ca3a0e3cde4a446af458bebf83ae8449d043789756bca56c1cbe03453d23dbc397ae205df68c38e14e9ffff7ebfec107b45a7fc4671a527dbb5 SHA512 c3f719f4962291a9701d2438381aeb65ea470b896ab6acf5a0871b1984bbb2758380a73ddc94c2b37ea2a45477fb66eb1a2afcae3f1e7ca3e469913f7562bd66
+DIST tmsu-0.7.4.tar.gz 98631 BLAKE2B 4af013de08f43b6ee337259b394aafce0862d3f0811174b196785d6e05d520a188ef6a1ce6f320dddcff6b2ab47cae8c248201a27d79bdd09d80b91e12161abd SHA512 28af79a03c774d8c08651cfac794d14a3363d3b5f6b037de1a74968b22053da45e6290ec9c5159950539e1e6577d01c06c62a05eb2b4f01ad5635d98e52b4e20
 EBUILD tmsu-0.6.1.ebuild 828 BLAKE2B 544356fcf009e348278680947a1fa071e7afc74b2406021957353d51ff9bcde27025a97fe02a6c2d314498dd14224fdae0912632f47b1491fd72c6452e31406c SHA512 95b03475431a7d9c539e6bc3a5e49110515cdbb23fb91693ca7d92ae749419a3619f22497581fd0199d6105f2ac785a46798d7ace764026415b2d2216f35767f
 EBUILD tmsu-0.7.0.ebuild 828 BLAKE2B 544356fcf009e348278680947a1fa071e7afc74b2406021957353d51ff9bcde27025a97fe02a6c2d314498dd14224fdae0912632f47b1491fd72c6452e31406c SHA512 95b03475431a7d9c539e6bc3a5e49110515cdbb23fb91693ca7d92ae749419a3619f22497581fd0199d6105f2ac785a46798d7ace764026415b2d2216f35767f
+EBUILD tmsu-0.7.4.ebuild 848 BLAKE2B 73ea7a0136d29c6c0e24cd576b96888b02ab8af284c7b2fb928d7af5188ed164211fd78236b5e21d223c19a0ccf65797d74c407f1d8c46b6c6fcd3a1181221ea SHA512 d70901fe4999ef13483af4ea2996c463c0a96acb522079748d13b04d613c1d902da271159d565b0971d1a649fc5e115070b81f0a57987ee3e0a1de846b37ad01
 MISC metadata.xml 694 BLAKE2B 3004756ca4f4822d9a1e5bc854e92c8f7beb449150754990c4a54bb00a20e79e20801854d655a81ae246c995ccccbe48b3b63a5761548d44e5b5cfcaf7617c87 SHA512 78e596dce79201090c19568ea1a36badb92b26420114a319f062c02465f4410e26e8811203fb723bb740ad5c20e0563a83ec5b646c407b5201ca622902bcf856
diff --git a/sys-fs/tmsu/tmsu-0.7.4.ebuild b/sys-fs/tmsu/tmsu-0.7.4.ebuild
new file mode 100644
index 000000000000..7483ecb0b7d6
--- /dev/null
+++ b/sys-fs/tmsu/tmsu-0.7.4.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-build
+
+EGO_PN="github.com/oniony/TMSU/"
+DESCRIPTION="Files tagger and virtual tag-based filesystem"
+HOMEPAGE="https://github.com/oniony/TMSU/wiki"
+SRC_URI="https://github.com/oniony/TMSU/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 AGPL-3+ BSD-4 GPL-3+ MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="sys-fs/fuse:0"
+DEPEND="
+	dev-go/go-sqlite3
+	dev-lang/go
+	dev-libs/go-fuse
+	test? ( ${RDEPEND} )
+"
+
+src_unpack() {
+	default
+	mv TMSU-${PV} ${P} || die "Failed to move sorce directory."
+}
+
+src_install() {
+	dobin misc/bin/*
+	doman misc/man/tmsu.*
+	newbin TMSU tmsu
+
+	insinto /usr/share/zsh/site-functions
+	doins misc/zsh/_tmsu
+}
+
+src_test() {
+	cd tests || die
+	./runall || die
+}
diff --git a/sys-fs/udftools/Manifest b/sys-fs/udftools/Manifest
index 49dbab9ba596..be44d2f8e75a 100644
--- a/sys-fs/udftools/Manifest
+++ b/sys-fs/udftools/Manifest
@@ -1,6 +1,5 @@
-AUX udftools-2.0-sysmacros.patch 1203 BLAKE2B 87e9d5ce829584ff0dae366bc3c2b52bcce7115668cc0ed9387a49744a2f558103e58980f038da141ae250135278a89578d4c7b3295a73ba7d3cd7a8ebd37aa5 SHA512 2108fb8e6d2e35922a47a6c7d82d218770ac1294cf0d2c88f9e3794ff2d91112eca850f8cda14ce019cc4c7e1653c173c9a6b3fffdf117ac58bfebb351c3b880
-DIST udftools-2.0.tar.gz 541231 BLAKE2B 8e43f4b1ab0940d607987e972dc0244ad086e088441bf462e6ce75a668af62041b1c4d8bac5da6046d2943ace753498aeb721d9524b4442a84f1901fd92066e6 SHA512 178a20405de6cd48e5f58b0ed61565e2a463479cf6d40fd7d5895d7af768b814bf1d5849873740aa409eb8cb3e7cd480c07198f6b340c612a271241c737f76e5
 DIST udftools-2.1.tar.gz 555440 BLAKE2B 09ed67d67a5194aff1611ca40907465cf5d9b83a6a9c1771118c80599be29e8d68fc48c10b38d33a4aed4fa6e7e6dbf0399b5d04bd103153f42a705e17edcf6c SHA512 0bdb3f2e0595200dadb771af4f31ba513d0bf6a0fbd30bc3a1f8aba4ab5f487f61635e65dc155926d2f566cb6e2b2f3a57938071616058cf703692d529971a64
-EBUILD udftools-2.0-r2.ebuild 580 BLAKE2B daa7d7fbca6685da0cc0d0690a9e8f3739ce44e27d463e97a532c7e7d6af73ec8f6799f734e0a374ad8e6cec6bee5fe4c2da5566c537c270ccdaf4484614c558 SHA512 1c86fdf192726f58a3b61514c1f8f88de7d15e2f7736e97c949b8c47d18a5f6a04471ee5b94c10e5e340b5283372ab386de793370425b8b60c1988b073b37f42
+DIST udftools-2.2.tar.gz 543515 BLAKE2B 8702959e9840415201668255272a7f5bb3b88d1e11a20ea6818c9c031d602ceba25a4892965f77961e265d55a687c6574a9aa7c657610d85e56549550a978d58 SHA512 1d6f7b725053ab8c2092ca07bce07fb075168ba48f7d2580076ee84b2652af3898622746c5a2f0bdb8c0d1d0e09d1f4a3cbaae4f998924652a56561b84690e2b
 EBUILD udftools-2.1.ebuild 550 BLAKE2B 026a1ff99b0c4cefe88ab802897f98aea94f7711db84a1d40e8b5683fa76e02a2273657ad844482e7aafeb101e408b7c0305f10dc37003682524ce8585c836b8 SHA512 a541cbe3dc4079bf074a3320079035749b4e0e8d812801e25a161de109a678847dee96af60180998d00ab3e6ba497f8e2f54f764538ee82a42dab899ff48d4a8
+EBUILD udftools-2.2.ebuild 581 BLAKE2B 5661c7835873585f282d2cbf4e1bbc7e549b5a20e3e83b0d2107980c458ce418567ed85044c56d4a64a5c45c9b8bd0fe233b14c01b8f4dfaa6b8931a6ec5f9fa SHA512 17e539835787fa78119e67d5a39f869bd09b959c6276764d92ca5b179f4a8522ec94029bdf92e9e432cec8d1be6db6ce8d871622ad8eb426018749ad5992d3a9
 MISC metadata.xml 389 BLAKE2B 9ce42e5303df1f4d7fc293387617a2b6335377b7a3943e768cd7f8e58e9dd456c568f9b72c1fe3d12f2876d364edfc184b3644aa76569e04bee22fbb3673d8b9 SHA512 049fe016aafa25e50396b166ac9931ea7c293aa581467fb587e0d79c0bc4e79621bc3d5bf295c2e9e589a517a4c1fcfbb863fb71175fe5061f99e45a26c7c61f
diff --git a/sys-fs/udftools/files/udftools-2.0-sysmacros.patch b/sys-fs/udftools/files/udftools-2.0-sysmacros.patch
deleted file mode 100644
index 9df9de6d3fd9..000000000000
--- a/sys-fs/udftools/files/udftools-2.0-sysmacros.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From cca194f17fe2892c929acab2f1d5016ad38aa305 Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Tue, 2 Jan 2018 15:10:34 +0100
-Subject: [PATCH] Include <sys/sysmacros.h> to prevent build breakage with
- >=glibc-2.25
-
-libtool: link: x86_64-pc-linux-gnu-gcc -march=native -mtune=native -O2
--pipe -Wl,-O1 -Wl,--hash-style=gnu -Wl,--sort-common -Wl,--as-needed -o
-mkudffs main.o mkudffs.o defaults.o file.o options.o
-../libudffs/.libs/libudffs.a
-main.o: In function `is_whole_disk':
-main.c:(.text+0x2ce): undefined reference to `major'
-main.c:(.text+0x2dd): undefined reference to `minor'
-main.o: In function `main':
-main.c:(.text.startup+0x72f): undefined reference to `minor'
-main.c:(.text.startup+0x741): undefined reference to `major'
-collect2: error: ld returned 1 exit status
-make[1]: *** [Makefile:378: mkudffs] Error 1
----
- mkudffs/main.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/mkudffs/main.c b/mkudffs/main.c
-index 066afac..3e306ac 100644
---- a/mkudffs/main.c
-+++ b/mkudffs/main.c
-@@ -43,6 +43,7 @@
- #include <sys/ioctl.h>
- #include <linux/fs.h>
- #include <linux/fd.h>
-+#include <sys/sysmacros.h>
- 
- #include "mkudffs.h"
- #include "defaults.h"
--- 
-2.16.0.rc0
-
diff --git a/sys-fs/udftools/udftools-2.0-r2.ebuild b/sys-fs/udftools/udftools-2.2.ebuild
index ac92ff6d84fd..03a562512736 100644
--- a/sys-fs/udftools/udftools-2.0-r2.ebuild
+++ b/sys-fs/udftools/udftools-2.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit flag-o-matic
 
@@ -11,10 +11,12 @@ SRC_URI="https://github.com/pali/udftools/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 RDEPEND="sys-libs/readline:0="
 DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-sysmacros.patch" )
+BDEPEND="
+	virtual/pkgconfig
+	virtual/udev
+"
diff --git a/sys-fs/udiskie/Manifest b/sys-fs/udiskie/Manifest
index 7371c72fa93c..dda5f579985c 100644
--- a/sys-fs/udiskie/Manifest
+++ b/sys-fs/udiskie/Manifest
@@ -1,7 +1,5 @@
-DIST udiskie-1.1.1.tar.gz 62207 BLAKE2B 47dea106580fbd037970b274205b896fa95e1f41cd8593bc9a14c8d19f40c3c44281e7334d4b0aaab0aa5e37146b8fa702afc4b82a2ed0e00549d2f9eb475533 SHA512 0524aeafb4777039a35be8854a0cf3bdbefd43eccb758da9aa2fa71fc4041816ff009dbbff20b4906c9bac281995c9923fcf542107a83c76ecb8c45d6b20b1ba
-DIST udiskie-1.7.5.tar.gz 92103 BLAKE2B 9996ea150c0052809825479f500c6bc44fa514a1b9433521b2a5d1d1de62546e16cd77fd94c61e73164af2bad34a8e9b0d5a681db99a66011950b435423456b3 SHA512 d6178b582bfe855cbf7710bc9699d10f1e06fbc303b9c5a352a7261734be18178b3fd7f44fece7d2a05e7fe85d1337c93fa11c3e6011abee44b62aafd1c7c656
 DIST udiskie-1.7.7.tar.gz 91858 BLAKE2B 7d9729f8c66e0d9afdf2b89f5cc2a941ce6726c809af1069146f13466eccdfa54ed45f43535d84592f1b09ccf6454814d7ff62d453781c547ebfb989fcab7767 SHA512 ea192cc8a50c742e96d5163bb1378a7cd110599cfe731d676343766a1ce3ee1102ab43322c5f9666d6c6a232e310fd494e0f76ad33aeab1fd8225a3267f3193a
-EBUILD udiskie-1.1.1.ebuild 1078 BLAKE2B 4b3f90ca67699ada2a3959cb91b0b68e11e17a597eca9a8f4c30da46a60b1635d93421ba891a0609ea70d4b946640411d0c678cef076bd4805db4e4d8ac2b82d SHA512 956d0c074d9d5dd414db188360d96182be8c799094d35ea16e94f42781b7db653471a80eab9b644cb94b088f0de3033d3ec3250a3df15118153477b54e945cff
-EBUILD udiskie-1.7.5.ebuild 1007 BLAKE2B ea45c955fa8aadc891eb60e396ff3dfbee9609fc56e7ae7dd23b15016ab5db70b13d9345f4a34e9df80d6c9670bdd6f6c5f62cee2ad5682564513c8725615eb8 SHA512 9ee8745ceae7d145d71e1807ab750cf087fdc013348cf352d9cbc52496843f834e6c96a6ee4f1df136c73c937e8062e104cfe4d5546e1d069526016be77c5d58
-EBUILD udiskie-1.7.7.ebuild 1005 BLAKE2B 2bf2cab1de984c3ebbbbe7ce2fd56efcee9ca13a98e1ae7c0123b1448107b6746e11cfd5b6b8abcc8663b0c630bd171f0f077a44326af61f4e3150951cd53848 SHA512 0333eec045d9476612b33e7cc41231087eb8242d2fa1eaf51733fe093b688e090032662c863645316abe9348a4eb5544c1f6213ca002d9b1b1437bdf556a6862
+DIST udiskie-2.0.2.tar.gz 85616 BLAKE2B 4d2ab17679610a4d3aa5eae5e6a611a5ae16e7958071c6b44f52884d945b7776d5dd84e85acda2a9b763f5c7da8846e0d2a80e7c788b739953cde04790610804 SHA512 ae3e298b11adaa50046bf521c5f3bd67cbcaa2f1e1cf18cf43f4b6b086ded2540f7db93de5c8b57048ea1bb115fb5266f9e3b69f7bb1acb9b7f429efcbe101c1
+EBUILD udiskie-1.7.7.ebuild 1001 BLAKE2B 4c11cc62dc78e04bac3b01a7b6b1fc19b4ad29a876a86a1abcf5b3d7f1233f9e71211b7bc211f5873637fd21269e4d0d0819748e26edc94e4be49f76eac3a06c SHA512 dcc2cd4ffbbf77021fc9ad7d4c74163fe5825a6f9ae3d19b90c1fb333382b1fdab90dcb1b860b1c0ca8c6eda259878d5182afc43f1f2cf3f96644f8225672ca6
+EBUILD udiskie-2.0.2-r1.ebuild 1096 BLAKE2B 329a2c23ff404ba204bfbe9859aad676dc77ea44097f94859d96d7248d77486061aaadf1cc699a2b943f4971b91feb1afa928e1c4acaa5f040dccc712d9a8fbf SHA512 a80a1a402beaabe9bac66a30e7d09576bb4c81943f067da7be503f3f251204547e9d6176b6704e81c3c190f6df074d312a602760c395acf3816ef7a452d7c65e
 MISC metadata.xml 369 BLAKE2B 0241a847b1eb2f650f66bc3fd631ccdf1927562d510e08c7bcd3db850752b665894838d0c705b7d03690aeea0aa93372d1faae5b313c9136d46e4913c177b0a4 SHA512 0772b0fa065a42292268b9e6a6b99b7198f5923bcc4697913b6c432db4e206a28b0fb1bd6c14b6363591cca02108a8a91029233824c3ec5bd7fbc592a941137e
diff --git a/sys-fs/udiskie/udiskie-1.1.1.ebuild b/sys-fs/udiskie/udiskie-1.1.1.ebuild
deleted file mode 100644
index 5a469d48d77d..000000000000
--- a/sys-fs/udiskie/udiskie-1.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit distutils-r1 gnome2-utils
-
-DESCRIPTION="An automatic disk mounting service using udisks"
-HOMEPAGE="https://pypi.org/project/udiskie/ https://github.com/coldfix/udiskie"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86"
-IUSE=""
-
-RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	sys-fs/udisks:2"
-DEPEND="app-text/asciidoc
-	dev-python/setuptools[${PYTHON_USEDEP}]"
-
-src_prepare() {
-	sed -i \
-		-e "s:udiskie.__version__:2:" \
-		-e 's:gtk-update-icon-cache:true:' \
-		setup.py || die
-
-	distutils-r1_src_prepare
-}
-
-src_compile() {
-	distutils-r1_src_compile
-	emake -C doc
-}
-
-src_install() {
-	distutils-r1_src_install
-	doman doc/${PN}.8
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sys-fs/udiskie/udiskie-1.7.7.ebuild b/sys-fs/udiskie/udiskie-1.7.7.ebuild
index 4bda47307f30..e8cea14bd9b6 100644
--- a/sys-fs/udiskie/udiskie-1.7.7.ebuild
+++ b/sys-fs/udiskie/udiskie-1.7.7.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_6 )
 inherit distutils-r1 gnome2-utils
 
 DESCRIPTION="An automatic disk mounting service using udisks"
diff --git a/sys-fs/udiskie/udiskie-1.7.5.ebuild b/sys-fs/udiskie/udiskie-2.0.2-r1.ebuild
index 22152090e9d0..342a8f0494a3 100644
--- a/sys-fs/udiskie/udiskie-1.7.5.ebuild
+++ b/sys-fs/udiskie/udiskie-2.0.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python3_{5,6} )
+PYTHON_COMPAT=( python3_{6,7,8} )
 inherit distutils-r1 gnome2-utils
 
 DESCRIPTION="An automatic disk mounting service using udisks"
@@ -18,7 +18,8 @@ RDEPEND="dev-python/docopt[${PYTHON_USEDEP}]
 	dev-python/pygobject:3[${PYTHON_USEDEP}]
 	dev-python/pyxdg[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	sys-fs/udisks:2"
+	sys-fs/udisks:2
+	$(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' 'python3_6')"
 DEPEND="app-text/asciidoc
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index 1b9ffa446c73..527ad17dd488 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -9,5 +9,5 @@ DIST udisks-2.8.4.tar.bz2 1619051 BLAKE2B 4fdf3d5ea8ae02eb74efd552afee2dbe941377
 EBUILD udisks-1.0.5-r3.ebuild 2796 BLAKE2B f0b07eb68d352b40101ad6c320b0ea93811c49e4cf36690881ccbe7b0dcb5f15a2810a43a0c722accc4549c68ecc17e0c79eea9f27114590da00e0b5200d3fbe SHA512 9095b305e94d48cbf9564ffc5dceaccc2ffc3108e3239d3cac59ef0defb16b4bf0fcdcd7638209865a816e9593e61d4a652c510e7b86daa8faa2b16130539dbc
 EBUILD udisks-2.8.2.ebuild 3232 BLAKE2B 9e10f4fc309e3b38e0277055cb9c98730b8ee5c67d79f8289e09e93033f73146b64757a7dc05a0303722ff7c3f399b8b09b825a8aafb22f366752939ea71b76d SHA512 8e8cfddf57fffc8dedc23dd3bb1f915e7322377c0bfd432e9c96de05821f2841bf6613b54f8f3c739acb8d91489510a10795790ee8dc7a51770268d09825c113
 EBUILD udisks-2.8.3.ebuild 3292 BLAKE2B ba199f539f63d699312ec5d4b556557d7c0d561c79f062f2905ca06f2be6bbf898205c9ec1c801f39d0565c93f9181bd19dae3ccf1c5904d8012c7d73e7f7619 SHA512 d514649cdb2610e19a45390d598ccfb8eaefc90afcf0ae448972dadb6746534351517fc4bbee51b55ecbb7f7253471fcb0c9baa5f6c7b007a0f373324e3fe82d
-EBUILD udisks-2.8.4.ebuild 3285 BLAKE2B 143cd117d5667519c2878d601cc1f7a4b8ae7a7159509671248afef0787ffcca3e232578ad1ffb253585b71cc3666b694803d7f357f665cb5ed5842a12434e84 SHA512 47d65963d5b13bcd5420dc76c3524522f2f2f335dd90e16641c4274c22544d8c1db954265a33621ebd62449660435eb3de378b48d1cb94a73470463e8a61a051
+EBUILD udisks-2.8.4.ebuild 3284 BLAKE2B 59a74c88ce67b3d243c85cf6150b273c80a7b329d407eaad7fec71e345e462342dd46806dee9ebb6c14d2de63a8cffd19b541acd7e9781bc9a77512dbea7caff SHA512 7093d1e21ae620dbac252baabd657af62a4dc5df6cf68084f50f00b54844be4da93b8bf828a712c3c08be5820631f4bc45d47b52413304b6d4c8053f8213f4ed
 MISC metadata.xml 666 BLAKE2B 901164cd5d79ae10dedfe4905228912e88f38d9c555f512a31a55dfd5c61a5156f2498af7e1aef59713afda07e7218e922757f8ced95443557e0b8e8d088ceea SHA512 f2f854b15d66c994008195a9b24a6a98db493e3faf38da7324c7ed780df4f34bd029ae5083b0f52e46e5c6ada490e1427ce45cb1a56c07059789c7b12fe4863e
diff --git a/sys-fs/udisks/udisks-2.8.4.ebuild b/sys-fs/udisks/udisks-2.8.4.ebuild
index a93cdbe5abb4..826b59d7bcac 100644
--- a/sys-fs/udisks/udisks-2.8.4.ebuild
+++ b/sys-fs/udisks/udisks-2.8.4.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="LGPL-2+ GPL-2+"
 SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl debug elogind +introspection lvm nls selinux systemd vdo"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index 403a8cd3fb2d..4407247a8da9 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,3 +1,5 @@
 DIST vhba-module-20190831.tar.bz2 15570 BLAKE2B 202f28a0729eddce907f5fc46f99a52b116948a376c0f2aaab3b9340f88fc248151c3ec592f2f60e52a07eeed4f551d6f270b4464605bce9df4badf9fa8ed322 SHA512 f43cb9b5730c4d634b58d3dd204610dbc86fdc520d4cfee6c9efbae3bb2acb88f5663e5fbd2b11b5ef9e3b6ad7d4dd0ecf9728dc36ac0b492bd06e0806223591
+DIST vhba-module-20200106.tar.bz2 15632 BLAKE2B 9b2db6cab2388fb5b84f2735d41a093af212434de2784f112d212cfc6193b1267ccf0afb222765bc32b0fc455d16bd1f0e98ddf60212735473853ec29ab27b97 SHA512 fc320e1f8f05247b7c2feded1335dce0fcc9a1257127d8d4086db48bd1e082d81b8a88089c04d0b8624ae584f1c0d049544f6f0018ec7dcea20ccfb136cd1bf0
 EBUILD vhba-20190831.ebuild 1150 BLAKE2B 46336ede854af6c25154a1a352894892231872df26e83d07c61a093e56c0af78b0b2bd209616ff74c739a1653cdc6fccdfcebc90b993d4fff66928f7d84e9593 SHA512 ee3277b42dd44cc3d8c5cdc5705c3ab05b4d90448b0f39a091631abbf30cb27772838b5e9167b33848700f38333d678ffb73225a95a8bcd80a7469e4ea15418a
+EBUILD vhba-20200106.ebuild 1094 BLAKE2B 2c2b51b080376f51053e5ffb19e24c2c10cc9b66f9a5d051efb63f7412107bc540016cb016538c7fdd06d13945e586b3d6e23b028b4f6d98b26a6a5b360863fa SHA512 daccd22f3f277ab28053b4b258c8af4b970caf6de4f20d235f2c9ea6ee7ec3ac42ef973e1ef1b39720b4cf9625e03b2810995bfac730ddf9c8aee53691884c80
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/sys-fs/vhba/vhba-20200106.ebuild b/sys-fs/vhba/vhba-20200106.ebuild
new file mode 100644
index 000000000000..588db552a4bf
--- /dev/null
+++ b/sys-fs/vhba/vhba-20200106.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils linux-mod udev
+
+MY_P=vhba-module-${PV}
+DESCRIPTION="Virtual (SCSI) Host Bus Adapter kernel module for the CDEmu suite"
+HOMEPAGE="https://cdemu.sourceforge.io"
+SRC_URI="https://download.sourceforge.net/cdemu/vhba-module/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="virtual/udev"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+MODULE_NAMES="vhba(block:${S})"
+BUILD_TARGETS=modules
+
+pkg_setup() {
+	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
+	check_extra_config
+	BUILD_PARAMS="KDIR=${KV_OUT_DIR}"
+	linux-mod_pkg_setup
+}
+
+src_prepare() {
+	# Avoid -Werror problems
+	sed -i -e '/ccflags/s/-Werror/-Wall/' Makefile || die "sed failed"
+
+	eapply_user
+}
+
+src_install() {
+	dodoc AUTHORS ChangeLog README
+	linux-mod_src_install
+
+	einfo "Generating udev rules ..."
+	udev_newrules - 69-vhba.rules <<-EOF
+		# do not edit this file, it will be overwritten on update
+		#
+		KERNEL=="vhba_ctl", SUBSYSTEM=="misc", TAG+="uaccess"
+	EOF
+}
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index 09efac2e6485..4c7bf5ecafe3 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -4,6 +4,8 @@ AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13f
 AUX xfsprogs-5.3.0-libdir.patch 1137 BLAKE2B 7e455b8b82c553a819155fb4c1fee3d5c31bef0fa4c7ab0bf4ad4558a9a5b0b2f408138558c3601deb3ba85d465ab2dae5248bc20a4ba83f08cf733b27a796a1 SHA512 eaec31b6dab500c2e9c4fe7d5d82e60a40f3073cff99af0ae2aa817f6e4541f6a3de0a48f9151a274c6dd97e99ca26192b95b920aea1c5227d75232b808c98fa
 DIST xfsprogs-4.19.0.tar.xz 1212852 BLAKE2B 2d04390765c5e0dd7d51366f0310c9e680651d49bdd1ecd220b4eec50540a66c97bf6e54f976414351bc77381ffd463803836b27ca25b53960a278a34bc09775 SHA512 a96d0ce406534e70b0a531dfab296de420ec710cd0682dffaf5211602adf82dd59f84b9eb7793c54eabb782a9e0229acf7b247ab644d531ee9e5b51fe9dc0f58
 DIST xfsprogs-5.3.0.tar.xz 1247636 BLAKE2B 0f8b2eafa1b1c91ff8bbcf8f79f61a8bea47123b859ec7a181dea37891ca0345a79a0cc714f003fbe560b00c0c2fc76e6bf6a3a1465f51c44b2df3a3dcbe6415 SHA512 308202eba3765e416c43877ad68d528f6c7d03ca024b89709aa3ca818f6c6692e3b90a809cbb81ff886624300c0e548925e70b34c30c47bac8dcfe4bb9c18857
+DIST xfsprogs-5.4.0.tar.xz 1248688 BLAKE2B dd00083b62a4989ca94d117eabad3905dc487c3e6d4f20bbe855399e99e2195c1a45f2be3b117048e2a7f2374c7e6258e7c1edd63d12a405c88f4c9fa6cd5e8e SHA512 c0973fcf97e2666385b46c80cd1398728702cb34fd7e0f89e2a63686300573405d09a81d3ae43d79c2e9710ccf6b6bd6ed1c3f3f831c75cd0916f094f203aaa7
 EBUILD xfsprogs-4.19.0.ebuild 2434 BLAKE2B cc6ca0e0425994414497bb9ac27541408958d9da936a659028b38cdaf3ed6527c741efeff812b023ce513b091b301723fa21fce1a4512939c5d3f6ddb8f42ab4 SHA512 bcef5fcc339809950886dd2a37fa696892216e1ddc5fc85b773ba40fe94fd1430a0b34b71a1ea22ce5d3cb947a8de23c800993067b5f909358ed037a2c18a198
 EBUILD xfsprogs-5.3.0.ebuild 2776 BLAKE2B 4833f2c95cde504f429095702217d63be549413933dc97dbf13e9206db943ab95e7f7c579eb522578a1092f508b30f5dd76d780fee62e609611549ea36d3b1fd SHA512 a3b116e1420b4e21aa3eb051f6c6ed9e7d8278db24ae43b3d61be79ed53fec14ad678b1148f55f55e3c162be8b08c85996028e64b01923a75c2105b52cba4af5
+EBUILD xfsprogs-5.4.0.ebuild 2766 BLAKE2B 15f17f23f5ea2466b93b6b6d1fcee69b2136e31141ca3e281542cc928e4fc42346ef78062c0922fb6d1470ebe2cc9940e978a75987d18f8deec038caf9dace5e SHA512 2444d2a804a78c5c2bd5b363c7b35da59acc5185da87d5701757197713e6f9c37e1124e30953a085da4ddc7feaccab475c726b450fb54691f1a11e6fb5282844
 MISC metadata.xml 338 BLAKE2B cdf07fec58a2401c154a3fdb7d5326065143eeac8dbe78078012d643dc3872bc2df79cc734c033c2030d356f2366dad8ad1da553bc268fd0318ab3ba971c4b5e SHA512 1a085c94d623db2cc55d987afb66265ab51e94c8868bc7c169cc669b58f8a8c5a1d81f503aa838d5c2a84f2a0bf923f73314048b49eb1e139d91eca6f71e119e
diff --git a/sys-fs/xfsprogs/xfsprogs-5.4.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.4.0.ebuild
new file mode 100644
index 000000000000..4a6b20edc230
--- /dev/null
+++ b/sys-fs/xfsprogs/xfsprogs-5.4.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs systemd usr-ldscript
+
+DESCRIPTION="xfs filesystem utilities"
+HOMEPAGE="https://xfs.wiki.kernel.org/"
+SRC_URI="https://www.kernel.org/pub/linux/utils/fs/xfs/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
+IUSE="icu libedit nls readline"
+
+LIB_DEPEND=">=sys-apps/util-linux-2.17.2[static-libs(+)]
+	icu? ( dev-libs/icu:=[static-libs(+)] )
+	readline? ( sys-libs/readline:0=[static-libs(+)] )
+	!readline? ( libedit? ( dev-libs/libedit[static-libs(+)] ) )"
+RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
+	!<sys-fs/xfsdump-3"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.15.0-docdir.patch
+	"${FILESDIR}"/${PN}-5.3.0-libdir.patch
+)
+
+pkg_setup() {
+	if use readline && use libedit ; then
+		ewarn "You have USE='readline libedit' but these are exclusive."
+		ewarn "Defaulting to readline; please disable this USE flag if you want libedit."
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Fix doc dir
+	sed -i \
+		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
+		include/builddefs.in || die
+
+	# Don't install compressed docs
+	sed 's@\(CHANGES\)\.gz[[:space:]]@\1 @' -i doc/Makefile || die
+}
+
+src_configure() {
+	# include/builddefs.in will add FCFLAGS to CFLAGS which will
+	# unnecessarily clutter CFLAGS (and fortran isn't used)
+	unset FCFLAGS
+
+	export DEBUG=-DNDEBUG
+
+	# Package is honoring CFLAGS; No need to use OPTIMIZER anymore.
+	# However, we have to provide an empty value to avoid default
+	# flags.
+	export OPTIMIZER=" "
+
+	unset PLATFORM # if set in user env, this breaks configure
+
+	# Upstream does NOT support --disable-static anymore,
+	# https://www.spinics.net/lists/linux-xfs/msg30185.html
+	# https://www.spinics.net/lists/linux-xfs/msg30272.html
+	local myconf=(
+		--enable-blkid
+		--with-crond-dir="${EPREFIX}/etc/cron.d"
+		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
+		$(use_enable icu libicu)
+		$(use_enable nls gettext)
+		$(use_enable readline)
+		$(usex readline --disable-editline $(use_enable libedit editline))
+	)
+
+	if is-flagq -fno-lto ; then
+		einfo "LTO disabled via {C,CXX,F,FC}FLAGS"
+		myconf+=( --disable-lto )
+	else
+		if is-flagq -flto ; then
+			einfo "LTO forced via {C,CXX,F,FC}FLAGS"
+			myconf+=( --enable-lto )
+		elif use amd64 || use x86  ; then
+			# match upstream default
+			myconf+=( --enable-lto )
+		else
+			# LTO can cause problems on some architectures, bug 655638
+			myconf+=( --disable-lto )
+		fi
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	emake DIST_ROOT="${ED}" install
+	emake DIST_ROOT="${ED}" install-dev
+
+	gen_usr_ldscript -a handle
+}
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 6c2109925417..15873bfd05b7 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -6,8 +6,8 @@ AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c9
 AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b9243f111c6c882c3480eb6396e347eac91670e3a67d7f122953d6fa82ec61a6467163b788b31858 SHA512 7a167b389723e5f55fea6956e5546e46c89ebf3e2d1c25f6b56c357e6d3ffc765226549d78cdeb79b4dc90c798ec6326a13996215b40eb49179376e32c3c3287
 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
 DIST zfs-0.8.2.tar.gz 8738111 BLAKE2B 5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0 SHA512 1424b1a030b814f812b5da422100669db5b8c3ccae14c2fdd62a5e0df28e7255247fe5ca99c95a14f08c92cc1574c22dd132093e4a1dd81e38c95b10cc5e2496
-EBUILD zfs-0.7.13-r1.ebuild 6286 BLAKE2B 8ff2c44069a13fe26b02a7a490ffcf1cb9833f5d5ba9ca1b151e1ed6bcc706bc46083a86663c073660d7a80792989335f8a1f4d71d162fcc8a16a635336ef175 SHA512 35127bc47361845a18bba3b60b27ae900a16ad2b94c1c479a62b30079b6688236b2feccb9d902ce93e3d8ff0a95504bc00d52fba6120b763d69057227e50a8a6
-EBUILD zfs-0.7.13-r2.ebuild 6350 BLAKE2B 3196bdde32d4264117bf7e5a1f81d07703b5a519fb3429438b67c314128ae583ed5cc33fa3184c1739eda7db3429eee9fa6cc38f1c2f750311e230ad87b2b282 SHA512 c5af6b806b932508de1d8724ae84d461dcbba3987fa822ed8bbc7db608df625baee7bbd5c3a695699bd3415c62be3034e70618f399fe13a4286039308ea18898
-EBUILD zfs-0.8.2-r2.ebuild 5674 BLAKE2B a902bd8be17dfbb3291c75a8f7a26e262c4631ce3f3754ca28403b6c7b46ac8527b71a7f0d356d04f0f633f8cac861169416919bbd73e4ec54ae38b1a8a8a91e SHA512 bc5991a96d9fa25eaf8aa8e05535975c7456d45a956c7bc1db60355454a5ea3ca9eb040e9d75e60941fbb19fee5b88cc70b72c1fed257df9b71db5a2781100a6
-EBUILD zfs-9999.ebuild 5571 BLAKE2B 4e550701988684482311a50c2c78120d19570b45c927e881e655323625f1ee5d8db81f98568f823c6b1a274c63dfc37504a827e8a7d64cc87c563a2041d23a87 SHA512 7af3c13954b927b34e52a5221fdf1c1ec7b36b73bda8b69fce806365a2d16d361412c1e6143a493d72411ae77fdeaa85d17e641842ac31681d1dc1d8162141ff
+EBUILD zfs-0.7.13-r1.ebuild 6282 BLAKE2B 9fae8590e1d6f723bea164f90b6b8a5ce1a96d8dc2d10b514f0d50a2c24c70ede7fd3dc1888efc4c3746e72d4970d5c2ed501072a21f08a46a188cd288a9743b SHA512 b50d3835a65153143ea4b9236e8084a495565397d570b64f4b622e4b501432a55b8b604dc7f276502e97e0b500302b74ae53fc8ba12c087f9e43ba84a4891ceb
+EBUILD zfs-0.7.13-r2.ebuild 6346 BLAKE2B f317a17063a320a92c13b1546507dc37b75c48ae5c19871d8ed0113590dd84687bd5b331f168a5d68e8d0aef0c135519e5abd9a8c91c858ab6bae53c5236496b SHA512 4c24e183caf67d52b14047add79947d0331eb1590a0754486ca5a03c2ab9f7cade308973164924855e8293d7c0d905bae1d4295f7cb5efbafe9dea8a4d1b9125
+EBUILD zfs-0.8.2-r2.ebuild 5672 BLAKE2B 02538fc52c722905316084dc355fc2360abd784818e9ddb07a068567af038aa374004c83b95d4bea01ee75023469f24a87f1afffd0c21894c5c4234979e1ff37 SHA512 9fd338a8d9704ab43623b867a1a269cb2bcd2a54d651f8533d4d7fd6755013adc041f75b830ad147d48038eb0d594aad426b9e1ac65ff6f7376ad0582cff669d
+EBUILD zfs-9999.ebuild 5569 BLAKE2B a2030bb29de3e93238728b33f347865a338421929d4c263456ab16dc0c4388ee5a333455530afefef9c09036c995e0b416cc600ed9090f8b879330d5c951ab18 SHA512 bb0ab5184ff53381302179f4e4e122d31cec6517add9c9800a578e3453506548cb14f6d548fc2bef92246f32cc59378605d09892b29d862629b4f96041e3ebae
 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/zfs-0.7.13-r1.ebuild b/sys-fs/zfs/zfs-0.7.13-r1.ebuild
index 18349e7f7c5b..7bfb7393b91a 100644
--- a/sys-fs/zfs/zfs-0.7.13-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.7.13-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-r3 linux-mod
diff --git a/sys-fs/zfs/zfs-0.7.13-r2.ebuild b/sys-fs/zfs/zfs-0.7.13-r2.ebuild
index 928b6e1c5327..2b547fcde15c 100644
--- a/sys-fs/zfs/zfs-0.7.13-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.7.13-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_6} )
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-r3 linux-mod
diff --git a/sys-fs/zfs/zfs-0.8.2-r2.ebuild b/sys-fs/zfs/zfs-0.8.2-r2.ebuild
index 55c311aac94b..fea065189c3f 100644
--- a/sys-fs/zfs/zfs-0.8.2-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.8.2-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev usr-ldscript
 
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index a29a5f7f0679..b7ec33da576e 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{6,7}} )
 
 inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev usr-ldscript
author	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-01-15 15:51:32 +0000
commit	21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch)
tree	e1810a4b135afce04b34862ef0fab2bfaeb8aeca /sys-fs
parent	7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff)