gentoo resync : 25.08.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-08-25 10:45:55 +0100
commit: 3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree: c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sys-fs
parent: 05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)
121 files changed, 1810 insertions, 1085 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 5d19570d2f69..ffdb45f4dd5f 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/aufs-headers/Manifest b/sys-fs/aufs-headers/Manifest
index ae12969dbecb..49cacd80f3b1 100644
--- a/sys-fs/aufs-headers/Manifest
+++ b/sys-fs/aufs-headers/Manifest
@@ -4,4 +4,4 @@ DIST aufs-headers-4.1_p20170130.tar.xz 3136 BLAKE2B cda05eed3429c84dae70a5c88600
 EBUILD aufs-headers-4.14_p20180709.ebuild 616 BLAKE2B a8db7ed67120d808ce9a17e813c9aa1c3bc644746a7f1ca2d3f0b56add1e3e5e3479e75ce49dd0d735536fe7ea5292063abdb09c57c9805929b7de16f41bd43c SHA512 811e1645d18bbfb22ea70136441c121f79a8b491625538fb81e4c096be24bee3f4dd4f426a4eb361123f17e62226d6bcb725ab3bae08590c7e5b17e22433325b
 EBUILD aufs-headers-4.14_p20190603.ebuild 616 BLAKE2B 294a106b60390098f6181dfcb2059cef5c1a03e34a6d7b8eb275dc7cc01070af6b99f58597269229ca52802b7d22c72939afc0cda3c70c006236241b8ec077f1 SHA512 53331430b07ab14274cda2b42cb7ae2689c2060df19c5175c08ec932fa1c05dcec0596e0984fd380571b78cf07c021d6c050dbe78de2b1021c8268a4c0414aa2
 EBUILD aufs-headers-4.1_p20170130.ebuild 637 BLAKE2B 4b7e239c911ef0a8b0641d1f3643f9e7860d492e142245d014b6767b14f11bcc0f8ffb3f1bd98651d68cc73314ef5d268fcb84e86d45977dc4f36f70271c4f74 SHA512 fa44465b5d9c5c4964268289fbb0b378b64f0d340ba4037b34d702e97344f9ea5cdf600319ddd44af6c4f6ef8e598dd3744f8acb5c7ff222ed1a279b6212b3cb
-MISC metadata.xml 297 BLAKE2B a731cab2c80385c087edc64d31769ae6344ee80a5aee2cd5d8693c398da639f6a79cc124b11b79795e096519a70155ad4b2d3af22d92f8fc3b0f7611eb1c763e SHA512 fdf9bf9558a618fd070f65d91b96b9037498503a4df0d06f1b595a9157c34ddaf3c13de9922f32663fb9499394d8c669fe7957dd213ec8e0ed4e66e3638d837f
+MISC metadata.xml 246 BLAKE2B 54e23dce6915d5dd3bcd3ef84d487319a22a98e6c6dfa2addfce08b994aabe988e81204bbf956fc403c7fa1d660488a1a140d48c382a01fe11b6c154757956c2 SHA512 e3170e1d40a96c800cc21a6f8a3d54f6896865eba97d04f2e3962f7627af5460312de37f9c7eee34f9f2428dc752d6fb32c83e27a958e2b3a046805d48c2698c
diff --git a/sys-fs/aufs-headers/metadata.xml b/sys-fs/aufs-headers/metadata.xml
index 32681342c088..29a36d2b826b 100644
--- a/sys-fs/aufs-headers/metadata.xml
+++ b/sys-fs/aufs-headers/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jlec@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">aufs</remote-id>
   </upstream>
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
index 783540733457..e3300248b2dd 100644
--- a/sys-fs/aufs-util/Manifest
+++ b/sys-fs/aufs-util/Manifest
@@ -4,4 +4,4 @@ DIST aufs-util-4.1_p20170130.tar.xz 100144 BLAKE2B d3032feeb787e3864247890c2b774
 EBUILD aufs-util-4.14_p20180709.ebuild 1078 BLAKE2B d1627bfcac4d66856cff0040f6dec53cdf48d3e5ba8ff6b90b5722ed86b349d83f5200927c3e28bee34427e2b09462d7df076d6adbda8a2e947941d321fb6426 SHA512 d3e970e5b98fec4ccb5750614c25a5ccc27696fd00e2167d6ed1871de0c968c97649cc8c0b02597196e60637efd9a083aed30851f29064397b399274bf01ccb8
 EBUILD aufs-util-4.14_p20190603.ebuild 1078 BLAKE2B d1627bfcac4d66856cff0040f6dec53cdf48d3e5ba8ff6b90b5722ed86b349d83f5200927c3e28bee34427e2b09462d7df076d6adbda8a2e947941d321fb6426 SHA512 d3e970e5b98fec4ccb5750614c25a5ccc27696fd00e2167d6ed1871de0c968c97649cc8c0b02597196e60637efd9a083aed30851f29064397b399274bf01ccb8
 EBUILD aufs-util-4.1_p20170130.ebuild 1020 BLAKE2B e111c9619c4045c0c01d594429cbc0ba048607b0ad1724890c0e3576cf51dbf183837e9fe8f80b2e1388353a5a3d3d108e0e43cacddf9be457e7cbf92e9fc34c SHA512 e568606dcd2d50839433cb5acaa1e41be730f7feadec891541fc1ab7b8fd6a1d59a5b00fe6140a2b8d5604a55bdd8054a98de907109ff1f5992e7e785fff6f33
-MISC metadata.xml 297 BLAKE2B a731cab2c80385c087edc64d31769ae6344ee80a5aee2cd5d8693c398da639f6a79cc124b11b79795e096519a70155ad4b2d3af22d92f8fc3b0f7611eb1c763e SHA512 fdf9bf9558a618fd070f65d91b96b9037498503a4df0d06f1b595a9157c34ddaf3c13de9922f32663fb9499394d8c669fe7957dd213ec8e0ed4e66e3638d837f
+MISC metadata.xml 246 BLAKE2B 54e23dce6915d5dd3bcd3ef84d487319a22a98e6c6dfa2addfce08b994aabe988e81204bbf956fc403c7fa1d660488a1a140d48c382a01fe11b6c154757956c2 SHA512 e3170e1d40a96c800cc21a6f8a3d54f6896865eba97d04f2e3962f7627af5460312de37f9c7eee34f9f2428dc752d6fb32c83e27a958e2b3a046805d48c2698c
diff --git a/sys-fs/aufs-util/metadata.xml b/sys-fs/aufs-util/metadata.xml
index 32681342c088..29a36d2b826b 100644
--- a/sys-fs/aufs-util/metadata.xml
+++ b/sys-fs/aufs-util/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jlec@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="sourceforge">aufs</remote-id>
   </upstream>
diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest
index c81bbc6852ca..65fd77dbe340 100644
--- a/sys-fs/bcache-tools/Manifest
+++ b/sys-fs/bcache-tools/Manifest
@@ -12,4 +12,4 @@ EBUILD bcache-tools-1.0.5.ebuild 948 BLAKE2B 933b23d5b1a82ace33886d6d85960630c19
 EBUILD bcache-tools-1.0.8.ebuild 948 BLAKE2B 933b23d5b1a82ace33886d6d85960630c19ceb7b65ee8a39cf3538d6f58f410d3caece111ea3db203b3e14148e5595f424f2c79caebb64195dd12f4cd894a735 SHA512 9aaf48abd2b5c5aeffbdf0d9036c45c795802281ac1424c1acb9ac45f26b5f232632738ebc22ad894c007478e1036c8ce28ed7fb85cddbe5ca14c98a0228d8f1
 EBUILD bcache-tools-1.0.8_p20140220-r1.ebuild 1600 BLAKE2B b9cece80cc38461984bcfbe4a736f294f5d65339b29dc6e72ec5416fb6cca669d17af4137ef5e43100c682c01d779069c82e81ed87236200f29f6f1cab84c596 SHA512 37f20893675416762095b2d45aea6098a5f1886fe4a8abdf2005bad5e5a3e90ad5eeaa0642daf95adefc37866b00f2615a9291ee9aeff40cf5481ce797d4fb44
 EBUILD bcache-tools-9999.ebuild 992 BLAKE2B b44ccdac9c100f3777e73db2b5d91831d4cb9f434507df1b03d4aac965a0f3d927e1872f40050d1d5b3b81a0072d832425eb58ac047ca16ee3122e00f55bd525 SHA512 96f1b026c0365cb19fdd4d0815778609eb2f59cc6cd4760a5287a1e76f6c5591b9ac1ae36eae966255fa93b5be690e16553ca2881880c7cb8b4bb62ee4ae4de5
-MISC metadata.xml 304 BLAKE2B 57596b1ecdec4efba5eea65141ea49a3a5a12e4efa840bcadeded836dcdec0169f723917e52d28c56f6c0aabc6d3af587a9d276d88dd30b5978d901d72feae52 SHA512 4b5575ff0ece142ff6839b8a8a81c7c0515ac42993f5ca415d53d3a85a7171ff565332edbb237448cd662abe6f1d1ffa5dce0eb21817dd861a728f0652dcb541
+MISC metadata.xml 253 BLAKE2B 053cd7caa33b4ace537584fb68b0fd010978dd08ec030003d4f4cad19896018102a7fa85ccdfd6cbecb8f8c62c63fd97b7babc6a5b72d2a6f37d4aec14442694 SHA512 3ea0dad00b289add099c74cf0b6b8202e9adc0ac7537b16b7673d2fadddcf83c7c686b0662bfd4766819d37af300cf978bb939133aed74b9a8aa8de2b84e805a
diff --git a/sys-fs/bcache-tools/metadata.xml b/sys-fs/bcache-tools/metadata.xml
index afb6723f41a7..be52ca7a8c66 100644
--- a/sys-fs/bcache-tools/metadata.xml
+++ b/sys-fs/bcache-tools/metadata.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>jlec@gentoo.org</email>
-  </maintainer>
+  <!-- maintainer-needed -->
   <upstream>
     <remote-id type="github">g2p/bcache-tools</remote-id>
   </upstream>
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index bdd0fad8711e..d02bedcb61cd 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -8,4 +8,4 @@ EBUILD btrfs-progs-5.4.1.ebuild 3057 BLAKE2B ea4719eae94d8466501d701ef0734ac95ad
 EBUILD btrfs-progs-5.6.1.ebuild 3064 BLAKE2B ce781c34885668adeef3e1a0009f0a929122b482e7ef356a33652d791f082c9f2832b280c1f10894f3c43b0724c24f69850b26fbc26ee3d6a56b47dc7c409f9a SHA512 2797cbc83b6716addd885daa532fd17df55da984d8c184ecc37a75cbbc47765cb530909572671adf680f7408a3d75f58aceefcb544ab948d9a5b6cb9c77168ef
 EBUILD btrfs-progs-5.7.ebuild 3064 BLAKE2B ce781c34885668adeef3e1a0009f0a929122b482e7ef356a33652d791f082c9f2832b280c1f10894f3c43b0724c24f69850b26fbc26ee3d6a56b47dc7c409f9a SHA512 2797cbc83b6716addd885daa532fd17df55da984d8c184ecc37a75cbbc47765cb530909572671adf680f7408a3d75f58aceefcb544ab948d9a5b6cb9c77168ef
 EBUILD btrfs-progs-9999.ebuild 3064 BLAKE2B ce781c34885668adeef3e1a0009f0a929122b482e7ef356a33652d791f082c9f2832b280c1f10894f3c43b0724c24f69850b26fbc26ee3d6a56b47dc7c409f9a SHA512 2797cbc83b6716addd885daa532fd17df55da984d8c184ecc37a75cbbc47765cb530909572671adf680f7408a3d75f58aceefcb544ab948d9a5b6cb9c77168ef
-MISC metadata.xml 641 BLAKE2B 19bc0129354cdadfd5b7235d350d353ca9117339173a7974c3a66339f7941aa85cc8bd65ae2a02c658e4cce707e41242b17ffd0f8a7699b255415a131e0e9e31 SHA512 03901f600a69c9246533f90378e17c861dc2fee5f5621aa33d7e08b5f3119f4c58b14b4f2bdc65d8dc1e2b111ee57064ad26aa23ba1f8a37ee34217f4cda7486
+MISC metadata.xml 523 BLAKE2B 7757fa4d4f1400bf08e2975e5214a1dd0c8258b61366c98089ca9c497b8c62e497cdedad605370f7034519b91c266b23e2e42bcafef3bb2bb69cb6b93319fa00 SHA512 3830f8f555ade672eeb52394a5b262e06e69b8b27d947d81dcde9b341fea9f16b77df8101ee5cd3314b6552543431a5f32a2592bf77a7a50e28cc56c95a4b164
diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml
index fa11b7da7f87..924eff852107 100644
--- a/sys-fs/btrfs-progs/metadata.xml
+++ b/sys-fs/btrfs-progs/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="person">
-    <email>polynomial-c@gentoo.org</email>
-    <name>Lars Wendler</name>
-  </maintainer>
   <maintainer type="project">
     <email>base-system@gentoo.org</email>
     <name>Gentoo Base System</name>
diff --git a/sys-fs/btrfsmaintenance/Manifest b/sys-fs/btrfsmaintenance/Manifest
index ea6421a98b80..cbbe0ede3fa4 100644
--- a/sys-fs/btrfsmaintenance/Manifest
+++ b/sys-fs/btrfsmaintenance/Manifest
@@ -1,8 +1,5 @@
-AUX fix-btrfs-defrag.patch 298 BLAKE2B 3fb4d86066af4a09701494c82b1aa595d7a8989732c12e0aa41cfe9c4faf1f03a5a9b2e8b74b06118e4d789fd914a0f142af1ef4b877d9a99d0d1aa89b429a81 SHA512 5305f9e7d7b80f901c6a8a9a52d6a08cfa38a720b590f9413a621604fe6f468d7259491ebb08e8dd87a2fd5274bc9d493d2e47a6b642e535114fd8a3b3a9a5e6
-DIST btrfsmaintenance-0.4.1.tar.gz 21621 BLAKE2B 36632d64022c7bf64548b0f6076640ee41cc9a6705b521fdc841f72f46808006ea6888476e05bb18bc51c44cb29eb444f816f34a1f251a8254156959aa178cdd SHA512 9a7ccc874e5c62689a0c899e8cc40d0b61625a492d28d8a0fe6c8a32be5990600d55094cb203d81a66488ff363fb960208bda5c19cf2948b51ba1b2764e34000
 DIST btrfsmaintenance-0.4.2.tar.gz 21826 BLAKE2B 0efc06b6780d7e75573958cd979b991580d518ab756ae80c9f4328f113ab7de87367c6730c23b408298919ac740da3b0ec85ae76face60ad97bf75d9aaa2a178 SHA512 802c131edfbc07bca13b89cd8bfc90923b2f23ba780dcb07009a4c4991a588c66a6ffe780938e66ab632201980e5087cd0751cd9185a8bae1a5faba84bf87233
-DIST btrfsmaintenance-0.4.tar.gz 21622 BLAKE2B 844d467b7712093370c1d6391e26d5046deb84cee6fd60b5774743415c75ad00a1e27c0be21004c260680b72b5615dcfd01b84f1eba3d57f7c9c5d22b6750d8d SHA512 2d19e82c03b291d157dc5f763dcb094330fd1a4aaee6215dbe576a5da44f71f4adee55fd06c60409e4699ac671d2fc73628f202f4f68270910eeba782f0ad153
-EBUILD btrfsmaintenance-0.4.1-r1.ebuild 2061 BLAKE2B 4d019f8de6871da3319c52d040c2d23f7abbe52f804450801a20d97451b5ab70b7bd705f1aa0f23fd383fb57e82e80b38a55c8fd2da0792186bfa80e52726d3b SHA512 ba9f8b94f49b686f637086f68a6db23437a13bd661ee03ae2b4b26e114e0aa5b179ae29d3a9191348750be6b47f950f0d55ddb8bdb288fcee93545a78019df8f
+DIST btrfsmaintenance-0.5.tar.gz 24602 BLAKE2B 313c904aa53fc237472256ae74c9eafaf2305b437e280b6bb9c79c2bbaffb6b273304e57d096a911e658fa41fe80308f2a7ad76ded62d79a7f72439163b36444 SHA512 fadab1cf33992c42d476649fd017ac4ae26d6bf6a814dc49d0b7b38e04861474c4e54e6ebe429a83e662b8e5c7be7f460b551c65788d960e2f8f0c7512deef41
 EBUILD btrfsmaintenance-0.4.2.ebuild 2014 BLAKE2B 21e7ca9e7ef23f8baaceb2058fb5308b8059e6f7e8a2280967280651558806a9fca93274a125a5e25b1257e43b57e12d4b577a48c1364ce6e1e96436fa994126 SHA512 17de5b583a6626c6f5fac7118354cd130f740daadd18a71272c9ce7e5b97b644e4be1312845ef2884baf607e9ff69cfdcf1cbce3762f1a33402b3bab4ee042ca
-EBUILD btrfsmaintenance-0.4.ebuild 2052 BLAKE2B 066777c1ce55409a50ea2e1a640881cc0161ebc128e1d5d84bf7081f0ce5834bcf00ff5dc2d85d8fedccc7d2283223bf0842d227604fc6bd9ab3c2ac31de249c SHA512 80c3f7ae618e6b14dff3aae9d8387654de280388cbb7607d8a347d016c7c73a5015942fd1bf1a2fbbbd1f1e68e139c1d3af393aee6d4bd56b6836ee7c65c3b1a
+EBUILD btrfsmaintenance-0.5.ebuild 2154 BLAKE2B 920f0293198963d2a2d5d3ca9612862b7d2b2c31b354f265daad6a2f1392506d048d09624d2ca0b77b61c02a41a0344a7f8fcd1060bab0aecf1d6af15ae8422c SHA512 109e6e1aa4971a07d41e38c6ba78aa67f6267157d6a22cf3d405c545643bb44193fcdbeca6313a00afe095ad65eff196bf3a017cf33513252514eaa6fb8fc46f
 MISC metadata.xml 564 BLAKE2B a54366a1b7a22e5b6f7ba8814ebcc75e4fb6185a5ce49f021bc2dec51277f31f82cafd4cf2de29918b97aa9276485bdc0dcf42d21e65d71636d3ab6ea4bf78da SHA512 6affb15730bb1ec7d8601c46ac5ea9f48b603d36825b364831459025764080641f51644af6c838d0e6de9edca766236662d068ee5893ba811687c4a1d7585bdc
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild
deleted file mode 100644
index 0cf94723f7d2..000000000000
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit systemd
-
-DESCRIPTION="Scripts for btrfs maintenance tasks like periodic scrub, balance, trim or defrag"
-HOMEPAGE="https://github.com/kdave/btrfsmaintenance"
-SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="systemd"
-
-RDEPEND="systemd? ( sys-apps/systemd )
-	sys-fs/btrfs-progs
-	virtual/cron"
-
-src_prepare() {
-	# Fix config path into watching service
-	sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* || \
-		die "Unable to patch btrfsmaintenance-refresh.*"
-	default
-}
-
-src_install() {
-	dodoc README.md CONTRIBUTING.md btrfsmaintenance.changes
-	insinto /etc/default
-	newins sysconfig.btrfsmaintenance btrfsmaintenance
-	insinto /usr/share/btrfsmaintenance
-	doins btrfsmaintenance-functions
-	exeinto /usr/share/btrfsmaintenance
-	doexe btrfs*.sh
-	systemd_dounit *.service
-	systemd_dounit *.timer
-	systemd_dounit *.path
-}
-
-pkg_postinst() {
-	elog "Installing default btrfsmaintenance scripts"
-	if use systemd; then
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
-	else
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
-	fi
-	elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
-	elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
-	elog "update cron symlinks or run"
-	elog "/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer"
-	elog "to update systemd timers."
-	elog "You can also enable btrfsmaintenance-refresh.path service in order to"
-	elog "monitor the config files changes and update systemd timers accordly."
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
-		elog "Removing symlinks from btrfsmaintenance cron tasks"
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
-	fi
-}
diff --git a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1-r1.ebuild b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild
index 6290c1a9ccc1..3c44355dfc46 100644
--- a/sys-fs/btrfsmaintenance/btrfsmaintenance-0.4.1-r1.ebuild
+++ b/sys-fs/btrfsmaintenance/btrfsmaintenance-0.5.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit systemd
 
@@ -11,23 +11,22 @@ SRC_URI="https://github.com/kdave/btrfsmaintenance/archive/v${PV}.tar.gz -> ${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="systemd"
 
 RDEPEND="
+	app-shells/bash
+	sys-apps/util-linux
 	sys-fs/btrfs-progs
-	virtual/cron
 	systemd? ( sys-apps/systemd )
+	!systemd? ( virtual/cron )
 "
 
-PATCHES=(
-	"${FILESDIR}/fix-btrfs-defrag.patch"
-	)
-
 src_prepare() {
 	# Fix config path into watching service
-	sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* || \
+	sed -i 's%/etc/sysconfig/btrfsmaintenance%/etc/default/btrfsmaintenance%g' btrfsmaintenance-refresh.* ||
 		die "Unable to patch btrfsmaintenance-refresh.*"
+	rm btrfs-defrag-plugin.sh || die "cannot remove btrfs-defrag-plugin.sh" # not necessary on gentoo systems
 	default
 }
 
@@ -45,9 +44,9 @@ src_install() {
 pkg_postinst() {
 	elog "Installing default btrfsmaintenance scripts"
 	if use systemd; then
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh systemd-timer || die
 	else
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh || die
 	fi
 	elog "Now edit cron periods and mount points in /etc/default/btrfsmaintenance "
 	elog "then run /usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh to"
@@ -61,6 +60,6 @@ pkg_postinst() {
 pkg_prerm() {
 	if [[ -z ${REPLACED_BY_VERSION} ]] ; then
 		elog "Removing symlinks from btrfsmaintenance cron tasks"
-		"${EROOT%/}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
+		"${EROOT}"/usr/share/btrfsmaintenance/btrfsmaintenance-refresh-cron.sh uninstall || die
 	fi
 }
diff --git a/sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch b/sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch
deleted file mode 100644
index 4dc5fd6b1d92..000000000000
--- a/sys-fs/btrfsmaintenance/files/fix-btrfs-defrag.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/btrfs-defrag.sh b/btrfs-defrag.sh
-index 284abc8..5ced921 100755
---- a/btrfs-defrag.sh
-+++ b/btrfs-defrag.sh
-@@ -15,6 +15,7 @@ if [ -f /etc/default/btrfsmaintenance ] ; then
- fi
- 
- LOGIDENTIFIER='btrfs-defrag'
-+. $(dirname $(realpath "$0"))/btrfsmaintenance-functions
- 
- {
- OIFS="$IFS"
diff --git a/sys-fs/cramfs/Manifest b/sys-fs/cramfs/Manifest
index 303db6530097..f5cd189f6402 100644
--- a/sys-fs/cramfs/Manifest
+++ b/sys-fs/cramfs/Manifest
@@ -1,3 +1,5 @@
 DIST cramfs-1.1.tar.gz 24179 BLAKE2B adb5d1682dbc7405333b735f145cdaffea770c09a60c15a79d1973a365b2f013ebbd728e05f5a20559bace237a6f685c6afba557249ee2049bb6827d5da3e9f8 SHA512 6c18dbe32df57f7d132fb2a59a917ad381156ca1f720c1ad0997ca81c62e82fd43ebb0339c5a66d5b144a72ce5c7ae93596522fe2698259f2b68c31db26e3b63
+DIST cramfs-2.1.tar.gz 33595 BLAKE2B 599f9af8f02cb7c17f58b78dde59f162bbcbe9008d2941fb4f8f9accfd4e6d371b9f31ae1a65a3e3d10458b53acd927fdab9049c082a132f139abdddb9f6890c SHA512 76137d1347fa7d1907590cfd7f3c5b48f2422bc2dd95fb2ae5b33561e5d5f179634a98d117f1f1344c15362f4282bce87cf9d527b5512f9badb1a2c024755eee
 EBUILD cramfs-1.1.ebuild 666 BLAKE2B 20588e4c237daae7a3e11b385433e347cd64a20e424c1c227d985ede4514f0f43d46d1a0ea4495ae8c4a9aec5c9b44f4d7bb11576b2a01bdecdfe08a004a33fd SHA512 fbd30c5dc515da8917ae1ebefcb837b0c2a2fefd3894da1b2c2cac64ed4cb24e071317742e596da053fd7a5218128828821d94034666b79618aa3e6e25a0f8d5
+EBUILD cramfs-2.1.ebuild 657 BLAKE2B ebf6a25cce6a6f1466c9b69be67ffe82b0909dd14684fdd30ad1af76be08e1a35eb40b772885f159827bc5d08f32dca52e37f85ef0a5e9c80eef6e3737343cf2 SHA512 3750670a12394e454c2bcb224fbed606e98f4c557f4eb1ed5f54f77b09910345522ac848c3250bb6a160f1fbe6868ea8a23d81801fc6f09732d9d11c8d879e01
 MISC metadata.xml 326 BLAKE2B 36719a57295c9599b2247c0a4abd21e78261171cb044a1cf4a206fbcfa50fee7c02f22cd0d1cca59a5c3bd9496be762e7fb9888f0e587d0eca8b3c596433e36a SHA512 adb8fa2cf18de2f83d1560eeb8af2b8a8cc81c6f30df05012c3999c1e1f5b0d450c48d81e27db3c01e61a3aced9c580acc06ec3e6a5f127800cae2fbf14872d5
diff --git a/sys-fs/cramfs/cramfs-2.1.ebuild b/sys-fs/cramfs/cramfs-2.1.ebuild
new file mode 100644
index 000000000000..856b3d1d26ae
--- /dev/null
+++ b/sys-fs/cramfs/cramfs-2.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux filesystem designed to be simple, small, and to compress things well"
+HOMEPAGE="https://github.com/npitre/cramfs-tools"
+SRC_URI="https://github.com/npitre/cramfs-tools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-libs/zlib:="
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/cramfs-tools-${PV}"
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)"
+}
+
+src_install() {
+	into /
+	dosbin mkcramfs cramfsck
+	dodoc README NOTES
+}
diff --git a/sys-fs/ddrescue/Manifest b/sys-fs/ddrescue/Manifest
index 906a1c9f1833..7b6482f5b958 100644
--- a/sys-fs/ddrescue/Manifest
+++ b/sys-fs/ddrescue/Manifest
@@ -1,5 +1,5 @@
 DIST ddrescue-1.24.tar.lz 85244 BLAKE2B e8b5ca5c89a65bed6126737125d78b2af9cdd7fe9b20f1f03636d58249d33dc08cb1907eca35c35d3ff81dd031290177084ae5dcc1cac20e79cb6c182cb894e4 SHA512 2c6a86c80bad122e0c44d6f8da49239e10362fbfbdb70acf39055ce02637daa05cce4f24adac732a1bb3a6fc97cf6985dd20827e99ab3bf6bad4db015a00fbaa
 DIST ddrescue-1.25.tar.lz 87001 BLAKE2B 45054ecb6ca12f8fe27d6b783f7e339fc11a9a3425160012e0682e39644fd3c91362ecd568a2a0b93f9f0af87fae2415b33a7c3fcd8fff2262898e8474818a00 SHA512 90e344a618e385730836218817588f6854db6d1acdf357bf60bdba04c76382e73041dfc367ba4de60062992ee74b2da58417f6e464ffbeed10ec89fac110f4b8
 EBUILD ddrescue-1.24.ebuild 875 BLAKE2B a483a5cba8aff117f0c22f88bbf3cecde193556d8f6168adee6ee6d2dc57b65246c383104df5060db7a5071ce00175d0d5978088353c05fe894a25a5ce05870f SHA512 a2bd0a8a8373e4bd4fb77c0ce1d01e2e97b69b4cfb9b7fe1451443d14b7ac5e85db4ee9858af78a40c22d9b199091a1a0cf325c0b132cf704980ce9af8288bfb
-EBUILD ddrescue-1.25.ebuild 879 BLAKE2B e90babba030601514f525ee1a6269c72ef86d56b8ec46ad4a7cec07d5f081a1eff594646e39b4b0424807fcdcfcbd4c6905f2dd0410227e3d1ae19c127c1ca45 SHA512 29f920683b56e78d0d4ea43b0f5c71955a040f5adadd13f02e2417c36bd0252491f526eb0897590850fe52c0cda4eca681aeb5e71b1ba1a00ff0215b58606444
+EBUILD ddrescue-1.25.ebuild 875 BLAKE2B f536aa8813c6c4b848ff13bcb4a0a7c906d1ab657f512bcbc19d551bdb2e1db45b5724c642577af307294e967d9121122fae36ee59ad6b5bf084a85c4b14c000 SHA512 aa48c34785bc64d91efe68cd2e72c97e60da455d3cdfc694e42a075e85140a6b0d85c7b55dc6ce09b5608f6734593e84ee09cda472cebe63516f96754d35a31e
 MISC metadata.xml 257 BLAKE2B 35c1b06807230338ceb9de70f79760d55e93dcdba508da3c663e785ab3966781edc2098abd8df084b2ecabbf40ff8e8e4a0d0a6e131daf648ff58e101cf27587 SHA512 ff078cacb115b8f3624b45d883d8ed72701e3d2fccae06c04c633eb60821b23681cc151e00689d1b6035c94570535e7ac0de51a55dae99f606886164883185ea
diff --git a/sys-fs/ddrescue/ddrescue-1.25.ebuild b/sys-fs/ddrescue/ddrescue-1.25.ebuild
index e627f217b785..61ffa9c9ef9d 100644
--- a/sys-fs/ddrescue/ddrescue-1.25.ebuild
+++ b/sys-fs/ddrescue/ddrescue-1.25.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.lz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~ia64 ppc ppc64 ~sparc x86 ~amd64-linux"
 IUSE="static"
 
 DEPEND="$(unpacker_src_uri_depends)"
diff --git a/sys-fs/diskdev_cmds/Manifest b/sys-fs/diskdev_cmds/Manifest
index 91376c1c96ca..bafbdc44fa9a 100644
--- a/sys-fs/diskdev_cmds/Manifest
+++ b/sys-fs/diskdev_cmds/Manifest
@@ -1,7 +1,7 @@
 AUX diskdev_cmds-332.14_p1-AR.patch 251 BLAKE2B 7bab604de5c1ff6ed2a78e2c7ef987bf85fc02b1a21c6996fef567086286cb1596cca61a5ddc246272570603cf0ef25050b2d6afcf8286c23f465b92e3bf096b SHA512 c81bd2bbeca3b76efb98142b9004011de923d5819d8f8bb65a9ec6afa9b1e5a594bcf69d3a733913bca614fca2ea0d456ee852beee897d7bb4799097640e8e9c
+AUX diskdev_cmds-332.14_p1-no-sysctl.patch 235 BLAKE2B 4eebaa367a3c1eef94c82755ddb848958984055b26097b98e078bf162a502632f1c0a29385db17aba61730b9ec28cf7dd46539520eab2a2d8fbf6a5a42106e8f SHA512 2dca72c6d7b82804e6355fe3262762c966dfaa848f5151f97946f4f9d0d29773f43f8f134d6e2dd52cb97430f2d98e02c37066ae8c88ca75c9fb7efb94c4c8c7
 AUX diskdev_cmds-respect-cflags.patch 388 BLAKE2B 8ecaa932e3a5841bc9ace0ffd2fea2f974a42ad33f0f65551bcc4c2a873b50a4413cf16542b74f277244f578142fcd5f1bfe63063c280062bf06aed20f601385 SHA512 21325ea43ea19a06962b7123ba418d5759d712d44b1ba7d35fa982613a95d2d91d1e7cde287b497d9e6de9483658f36378f7d3d03e5780d7dc468a82e5b0da69
 DIST diskdev_cmds-332.14.tar.gz 714035 BLAKE2B 8c66509366db8067b6b3057dc8dd8c6de5f25df86a88fec8beac78e4e14d91af5319bf61671ceea206508b6abac54231e82d527a2cc79ea467e7660e10997a7f SHA512 e1df91fb5330dc01a79de99dd8b1f389a337a19c2136994d59b7cbca9c2e1cb5f7d47101366dd01db4e23a5d3d7afab41758045bf7402d739fa22182dc922044
 DIST diskdev_cmds-332.14_p1.patch.bz2 21989 BLAKE2B f7e421c164ec242e6516a4638bc4c4706a11b03587fad0e7328a311d15f47b48b4e706f819cffa8e8539d7e4eaa8efa5f9a55a838f88586872e7fc8d67c9ac8e SHA512 aaef096aa6a3f2e09bcc8c1831172c3d68994589ade505153ade00e6f4d0c49263b63212f8616ece597b1ee218a87474bb1c3812d15f34c5bc5c51fd7b72a062
-EBUILD diskdev_cmds-332.14_p1-r2.ebuild 1211 BLAKE2B d78ec627dfbfdd755adebd7e046eda94dced4144c3993b291b119a2f6b5db13cf4a335c694b58b873a6ff2c4ed61c5de95aa5217ef88022f1daec14ae697a67b SHA512 ddccd84c7f12679b74924e2fa51fb28a385a54bac3d07ca1f3ab99a8b118657dc2155e6ced6f8b78b36e9f604d02adf795cede4c5741b6af0a4a68a42092f270
-EBUILD diskdev_cmds-332.14_p1-r3.ebuild 1299 BLAKE2B 75d5bfefeb0188160d5407cbc8dca554751787a1e498b635f43f3ddb668744bdc11331a102824246c896079a390a4c545babca9b766b6ecb1f877ca72894238a SHA512 0b5f64d71879324494675f85d336aa3d745d7966d30f994ebafba897d69f7314dfab82c579b4d00d4e5ffeac26a826b11da7971e0f80bad6ad20a6e2ebf40eb6
+EBUILD diskdev_cmds-332.14_p1-r3.ebuild 1331 BLAKE2B 3aa87e3b8743f508f1176c8e652e2d63660574c4a88bf829cd5c4f269fd21de4bfbfbce3cf1cdbfde5e5e15d5c5316beb994c66af7363b1ea979e91803a46161 SHA512 126425aab2c54ef9a146a7488023073ac677c74e87abcc151749dd8ec99c99b13ede41f0dad6b3680dca4f8b4c715bde08d2808019eaa363920ff48fa6d3098c
 MISC metadata.xml 375 BLAKE2B b5ab86c1adfdb8ad06c76fcff0378bc7d88bdb7510e0fa06cf3c32e5025d7bf7e151f4791e0b1bf9c76692408da5c979b7a9ea713cddf412e4c291eb2cbc31fb SHA512 4a9cb22aca89fe59e631d6a102977e8e3a6fe6f2599dddddcf7ca8eb043d2af50d23a43483cc23350d942cbbac52774571e57260820ea0448308858ed1fd45c5
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
deleted file mode 100644
index 7262c18fcab9..000000000000
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-MY_PV=${PV%_p*}
-
-DESCRIPTION="HFS and HFS+ utils ported from OSX, supplies mkfs and fsck"
-HOMEPAGE="http://opendarwin.org"
-SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.tar.gz
-		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
-LICENSE="APSL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE=""
-DEPEND="dev-libs/openssl"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-PATCHES=(
-	"${WORKDIR}"/diskdev_cmds-${PV}.patch
-	"${FILESDIR}"/diskdev_cmds-respect-cflags.patch
-)
-
-src_compile() {
-	emake -f Makefile.lnx AR="$(tc-getAR)" CC="$(tc-getCC)"
-}
-
-src_install() {
-	into /
-
-	dosbin fsck_hfs.tproj/fsck_hfs
-	dosbin newfs_hfs.tproj/newfs_hfs
-
-	dosym newfs_hfs /sbin/mkfs.hfs
-	dosym newfs_hfs /sbin/mkfs.hfsplus
-	dosym fsck_hfs /sbin/fsck.hfs
-	dosym fsck_hfs /sbin/fsck.hfsplus
-	doman newfs_hfs.tproj/newfs_hfs.8
-
-	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfs.8
-	newman newfs_hfs.tproj/newfs_hfs.8 mkfs.hfsplus.8
-	doman fsck_hfs.tproj/fsck_hfs.8
-	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfs.8
-	newman fsck_hfs.tproj/fsck_hfs.8 fsck.hfsplus.8
-}
diff --git a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
index 99913550e705..57753cb339ce 100644
--- a/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
+++ b/sys-fs/diskdev_cmds/diskdev_cmds-332.14_p1-r3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://darwinsource.opendarwin.org/tarballs/apsl/diskdev_cmds-${MY_PV}.
 		 mirror://gentoo/diskdev_cmds-${PV}.patch.bz2"
 LICENSE="APSL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
 IUSE="libressl"
 DEPEND="
 	!libressl? ( dev-libs/openssl:0= )
@@ -27,6 +27,7 @@ PATCHES=(
 	"${WORKDIR}"/diskdev_cmds-${PV}.patch
 	"${FILESDIR}"/${PN}-respect-cflags.patch
 	"${FILESDIR}"/${P}-AR.patch
+	"${FILESDIR}"/${P}-no-sysctl.patch
 )
 
 src_compile() {
diff --git a/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-no-sysctl.patch b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-no-sysctl.patch
new file mode 100644
index 000000000000..f7ff186ca19b
--- /dev/null
+++ b/sys-fs/diskdev_cmds/files/diskdev_cmds-332.14_p1-no-sysctl.patch
@@ -0,0 +1,12 @@
+--- a/newfs_hfs.tproj/makehfs.c
++++ b/newfs_hfs.tproj/makehfs.c
+@@ -37,8 +37,8 @@
+ #endif
+ #include <sys/errno.h>
+ #include <sys/stat.h>
+-#include <sys/sysctl.h>
+ #if !LINUX
++#include <sys/sysctl.h>
+ #include <sys/vmmeter.h>
+ #endif
+ 
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index df0a7c6a40f7..951bdf3d7162 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1,4 +1,6 @@
+AUX dislocker-0.7.1-fix-find-ruby.patch 25942 BLAKE2B bd9d93c5eddcbade0039c1787dae36f5dd01f91cd435dfb9dbcfcb16f0f09cba7e73a3221c8b2f3843d0a68199fb9e38bdb91428fa784442659f7af53ab6d4dd SHA512 70f5a628659ef4645d757b899f3e6310e3a4d2ab89f429748c711177a0944e9b0eabf5341e394ab09216b0fa18e3c2b0832406b27f40c04510df937ffe5f65ef
 DIST dislocker-0.7.1.tar.gz 103194 BLAKE2B 05421b0d3e7686480e40a41e67086017c454b76e0852fef78a7b5d10134cf388b4bf7b9669d87b867418f4c074cc023ea9b0260dbdbc837322d04f217aa40b28 SHA512 8852ba3e363fdea992eebecfe1e4dad2b85404f57c57ce6b2937a9859d03cfa88d969926c9e11e6d22596c6d96805b7d1737893ae2c5a957448ab26708bce226
 EBUILD dislocker-0.7.1-r2.ebuild 1185 BLAKE2B 25249a42cd4a6fcc165de59306d7da01eb5ad2eb661dd92d38934f0b9bdc88286a68f6c9f05337ba31b5de3de2e23af8cb5863b4bfb7f307004aafd095158d6d SHA512 c921cd7034b7e7a48d636e9b6a6420d5eb16a0e5382a29c829762a7742409ae2f371765ac3218402e7f42eeac292fdba568a3d66a1487c3fa8480cd69951a4a5
-EBUILD dislocker-9999.ebuild 1185 BLAKE2B 25249a42cd4a6fcc165de59306d7da01eb5ad2eb661dd92d38934f0b9bdc88286a68f6c9f05337ba31b5de3de2e23af8cb5863b4bfb7f307004aafd095158d6d SHA512 c921cd7034b7e7a48d636e9b6a6420d5eb16a0e5382a29c829762a7742409ae2f371765ac3218402e7f42eeac292fdba568a3d66a1487c3fa8480cd69951a4a5
+EBUILD dislocker-0.7.1-r3.ebuild 1621 BLAKE2B 43e89dd54b75bf9849f2d4091f6a48796a6c597dd0d7d933a3eab48a5ccdf4b009314960f3f80dfb8177d5b121a3fac532102285c741a5fce9e07869f14b7255 SHA512 4308136d2b048277dcadcba93fa797bcb2b09af58d7f9bf0604acc8552977aeda31c2cb8184434f1ff32894062ed071f6aec15eed468076088f741bd17ccae6e
+EBUILD dislocker-9999.ebuild 1621 BLAKE2B 43e89dd54b75bf9849f2d4091f6a48796a6c597dd0d7d933a3eab48a5ccdf4b009314960f3f80dfb8177d5b121a3fac532102285c741a5fce9e07869f14b7255 SHA512 4308136d2b048277dcadcba93fa797bcb2b09af58d7f9bf0604acc8552977aeda31c2cb8184434f1ff32894062ed071f6aec15eed468076088f741bd17ccae6e
 MISC metadata.xml 343 BLAKE2B edbbbf3c98bb40a48d9b39f6fbe579a306f44539eb9415585c3e8045f4bfa2c2b7864be18313f2dd50aa73c14aacb5e446d4eb94f4c7116a7c0407ec651f3d02 SHA512 479da4294232d9c49530e2ed2c936c824c697b08d722309addb64bc77dd083365b0d4ce063dd331e4dbd13a0185885dca7bf5d62a6a09dfc6e7a38fd7e25f448
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
new file mode 100644
index 000000000000..a15c39558ddc
--- /dev/null
+++ b/sys-fs/dislocker/dislocker-0.7.1-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
+HOMEPAGE="https://github.com/Aorimn/dislocker"
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/Aorimn/dislocker.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/Aorimn/dislocker/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ruby"
+
+DEPEND="
+	sys-fs/fuse:0=
+	net-libs/mbedtls:0=
+	ruby? ( dev-lang/ruby:* )
+"
+RDEPEND="${DEPEND}"
+
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
+
+src_prepare() {
+	if use ruby && [[ ${PV} == "0.7.1" ]]; then
+		PATCHES=( "${FILESDIR}/${P}-fix-find-ruby.patch" )
+	fi
+	cmake_src_prepare
+
+# We either need to change Werror to Wno-error or remove the multiple declarations of FORTIFY_SOURCE
+#    sed 's:Werror:Wno-error:g' -i "${S}/src/CMakeLists.txt" || die
+	sed 's:-D_FORTIFY_SOURCE=2::g' -i "${S}/src/CMakeLists.txt" || die
+
+#	sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die
+# Do not process compressed versions of the manuals
+	sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 \2\\:' -i "${S}/src/CMakeLists.txt" || die
+	sed -r 's:^(.+\.1\.gz):#\1:' -i "${S}/src/CMakeLists.txt" || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake_use_find_package ruby Ruby)
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	if ! use ruby; then
+		rm "${S}/man/linux/${PN}-find.1" || die
+	fi
+	find "${S}/man/linux" -name '*.1' -exec doman '{}' +
+	cmake_src_install
+}
diff --git a/sys-fs/dislocker/dislocker-9999.ebuild b/sys-fs/dislocker/dislocker-9999.ebuild
index 08e0e54087af..a15c39558ddc 100644
--- a/sys-fs/dislocker/dislocker-9999.ebuild
+++ b/sys-fs/dislocker/dislocker-9999.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
 
-inherit cmake-utils flag-o-matic
+inherit cmake flag-o-matic
 
 DESCRIPTION="Dislocker is used to read BitLocker encrypted partitions."
 HOMEPAGE="https://github.com/Aorimn/dislocker"
@@ -27,24 +27,35 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+CMAKE_REMOVE_MODULES_LIST="${CMAKE_REMOVE_MODULES_LIST} FindRuby"
+
 src_prepare() {
-	cmake-utils_src_prepare
+	if use ruby && [[ ${PV} == "0.7.1" ]]; then
+		PATCHES=( "${FILESDIR}/${P}-fix-find-ruby.patch" )
+	fi
+	cmake_src_prepare
 
 # We either need to change Werror to Wno-error or remove the multiple declarations of FORTIFY_SOURCE
 #    sed 's:Werror:Wno-error:g' -i "${S}/src/CMakeLists.txt" || die
 	sed 's:-D_FORTIFY_SOURCE=2::g' -i "${S}/src/CMakeLists.txt" || die
 
-	sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die
+#	sed 's:\.\./man:'../../${P}/man':g' -i "${S}/src/CMakeLists.txt" || die
+# Do not process compressed versions of the manuals
+	sed -r 's:( create_symlink \$\{BIN_FUSE\}\.1)\.gz (.+\.1)\.gz\\:\1 \2\\:' -i "${S}/src/CMakeLists.txt" || die
+	sed -r 's:^(.+\.1\.gz):#\1:' -i "${S}/src/CMakeLists.txt" || die
 }
 
 src_configure() {
 	mycmakeargs=(
-		$(cmake-utils_use_find_package ruby Ruby)
+		$(cmake_use_find_package ruby Ruby)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 src_install() {
+	if ! use ruby; then
+		rm "${S}/man/linux/${PN}-find.1" || die
+	fi
 	find "${S}/man/linux" -name '*.1' -exec doman '{}' +
-	cmake-utils_src_install
+	cmake_src_install
 }
diff --git a/sys-fs/dislocker/files/dislocker-0.7.1-fix-find-ruby.patch b/sys-fs/dislocker/files/dislocker-0.7.1-fix-find-ruby.patch
new file mode 100644
index 000000000000..b5659f062ccf
--- /dev/null
+++ b/sys-fs/dislocker/files/dislocker-0.7.1-fix-find-ruby.patch
@@ -0,0 +1,671 @@
+diff -Nuar a/cmake/FindPackageHandleStandardArgs.cmake b/cmake/FindPackageHandleStandardArgs.cmake
+--- a/cmake/FindPackageHandleStandardArgs.cmake	1970-01-01 01:00:00.000000000 +0100
++++ b/cmake/FindPackageHandleStandardArgs.cmake	2020-03-04 11:38:51.062021412 +0100
+@@ -0,0 +1,258 @@
++# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
++# file Copyright.txt or https://cmake.org/licensing for details.
++
++include(${CMAKE_CURRENT_LIST_DIR}/FindPackageMessage.cmake)
++
++# internal helper macro
++macro(_FPHSA_FAILURE_MESSAGE _msg)
++  if (${_NAME}_FIND_REQUIRED)
++    message(FATAL_ERROR "${_msg}")
++  else ()
++    if (NOT ${_NAME}_FIND_QUIETLY)
++      message(STATUS "${_msg}")
++    endif ()
++  endif ()
++endmacro()
++
++
++# internal helper macro to generate the failure message when used in CONFIG_MODE:
++macro(_FPHSA_HANDLE_FAILURE_CONFIG_MODE)
++  # <PackageName>_CONFIG is set, but FOUND is false, this means that some other of the REQUIRED_VARS was not found:
++  if(${_NAME}_CONFIG)
++    _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: missing:${MISSING_VARS} (found ${${_NAME}_CONFIG} ${VERSION_MSG})")
++  else()
++    # If _CONSIDERED_CONFIGS is set, the config-file has been found, but no suitable version.
++    # List them all in the error message:
++    if(${_NAME}_CONSIDERED_CONFIGS)
++      set(configsText "")
++      list(LENGTH ${_NAME}_CONSIDERED_CONFIGS configsCount)
++      math(EXPR configsCount "${configsCount} - 1")
++      foreach(currentConfigIndex RANGE ${configsCount})
++        list(GET ${_NAME}_CONSIDERED_CONFIGS ${currentConfigIndex} filename)
++        list(GET ${_NAME}_CONSIDERED_VERSIONS ${currentConfigIndex} version)
++        string(APPEND configsText "    ${filename} (version ${version})\n")
++      endforeach()
++      if (${_NAME}_NOT_FOUND_MESSAGE)
++        string(APPEND configsText "    Reason given by package: ${${_NAME}_NOT_FOUND_MESSAGE}\n")
++      endif()
++      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} ${VERSION_MSG}, checked the following files:\n${configsText}")
++
++    else()
++      # Simple case: No Config-file was found at all:
++      _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: found neither ${_NAME}Config.cmake nor ${_NAME_LOWER}-config.cmake ${VERSION_MSG}")
++    endif()
++  endif()
++endmacro()
++
++
++function(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FIRST_ARG)
++
++# Set up the arguments for `cmake_parse_arguments`.
++  set(options  CONFIG_MODE  HANDLE_COMPONENTS)
++  set(oneValueArgs  FAIL_MESSAGE  VERSION_VAR  FOUND_VAR)
++  set(multiValueArgs REQUIRED_VARS)
++
++# Check whether we are in 'simple' or 'extended' mode:
++  set(_KEYWORDS_FOR_EXTENDED_MODE  ${options} ${oneValueArgs} ${multiValueArgs} )
++  list(FIND _KEYWORDS_FOR_EXTENDED_MODE "${_FIRST_ARG}" INDEX)
++
++  if(${INDEX} EQUAL -1)
++    set(FPHSA_FAIL_MESSAGE ${_FIRST_ARG})
++    set(FPHSA_REQUIRED_VARS ${ARGN})
++    set(FPHSA_VERSION_VAR)
++  else()
++    cmake_parse_arguments(FPHSA "${options}" "${oneValueArgs}" "${multiValueArgs}"  ${_FIRST_ARG} ${ARGN})
++
++    if(FPHSA_UNPARSED_ARGUMENTS)
++      message(FATAL_ERROR "Unknown keywords given to FIND_PACKAGE_HANDLE_STANDARD_ARGS(): \"${FPHSA_UNPARSED_ARGUMENTS}\"")
++    endif()
++
++    if(NOT FPHSA_FAIL_MESSAGE)
++      set(FPHSA_FAIL_MESSAGE  "DEFAULT_MSG")
++    endif()
++
++    # In config-mode, we rely on the variable <PackageName>_CONFIG, which is set by find_package()
++    # when it successfully found the config-file, including version checking:
++    if(FPHSA_CONFIG_MODE)
++      list(INSERT FPHSA_REQUIRED_VARS 0 ${_NAME}_CONFIG)
++      list(REMOVE_DUPLICATES FPHSA_REQUIRED_VARS)
++      set(FPHSA_VERSION_VAR ${_NAME}_VERSION)
++    endif()
++
++    if(NOT FPHSA_REQUIRED_VARS)
++      message(FATAL_ERROR "No REQUIRED_VARS specified for FIND_PACKAGE_HANDLE_STANDARD_ARGS()")
++    endif()
++  endif()
++
++# now that we collected all arguments, process them
++
++  if("x${FPHSA_FAIL_MESSAGE}" STREQUAL "xDEFAULT_MSG")
++    set(FPHSA_FAIL_MESSAGE "Could NOT find ${_NAME}")
++  endif()
++
++  list(GET FPHSA_REQUIRED_VARS 0 _FIRST_REQUIRED_VAR)
++
++  string(TOUPPER ${_NAME} _NAME_UPPER)
++  string(TOLOWER ${_NAME} _NAME_LOWER)
++
++  if(FPHSA_FOUND_VAR)
++    if(FPHSA_FOUND_VAR MATCHES "^${_NAME}_FOUND$"  OR  FPHSA_FOUND_VAR MATCHES "^${_NAME_UPPER}_FOUND$")
++      set(_FOUND_VAR ${FPHSA_FOUND_VAR})
++    else()
++      message(FATAL_ERROR "The argument for FOUND_VAR is \"${FPHSA_FOUND_VAR}\", but only \"${_NAME}_FOUND\" and \"${_NAME_UPPER}_FOUND\" are valid names.")
++    endif()
++  else()
++    set(_FOUND_VAR ${_NAME_UPPER}_FOUND)
++  endif()
++
++  # collect all variables which were not found, so they can be printed, so the
++  # user knows better what went wrong (#6375)
++  set(MISSING_VARS "")
++  set(DETAILS "")
++  # check if all passed variables are valid
++  set(FPHSA_FOUND_${_NAME} TRUE)
++  foreach(_CURRENT_VAR ${FPHSA_REQUIRED_VARS})
++    if(NOT ${_CURRENT_VAR})
++      set(FPHSA_FOUND_${_NAME} FALSE)
++      string(APPEND MISSING_VARS " ${_CURRENT_VAR}")
++    else()
++      string(APPEND DETAILS "[${${_CURRENT_VAR}}]")
++    endif()
++  endforeach()
++  if(FPHSA_FOUND_${_NAME})
++    set(${_NAME}_FOUND TRUE)
++    set(${_NAME_UPPER}_FOUND TRUE)
++  else()
++    set(${_NAME}_FOUND FALSE)
++    set(${_NAME_UPPER}_FOUND FALSE)
++  endif()
++
++  # component handling
++  unset(FOUND_COMPONENTS_MSG)
++  unset(MISSING_COMPONENTS_MSG)
++
++  if(FPHSA_HANDLE_COMPONENTS)
++    foreach(comp ${${_NAME}_FIND_COMPONENTS})
++      if(${_NAME}_${comp}_FOUND)
++
++        if(NOT DEFINED FOUND_COMPONENTS_MSG)
++          set(FOUND_COMPONENTS_MSG "found components: ")
++        endif()
++        string(APPEND FOUND_COMPONENTS_MSG " ${comp}")
++
++      else()
++
++        if(NOT DEFINED MISSING_COMPONENTS_MSG)
++          set(MISSING_COMPONENTS_MSG "missing components: ")
++        endif()
++        string(APPEND MISSING_COMPONENTS_MSG " ${comp}")
++
++        if(${_NAME}_FIND_REQUIRED_${comp})
++          set(${_NAME}_FOUND FALSE)
++          string(APPEND MISSING_VARS " ${comp}")
++        endif()
++
++      endif()
++    endforeach()
++    set(COMPONENT_MSG "${FOUND_COMPONENTS_MSG} ${MISSING_COMPONENTS_MSG}")
++    string(APPEND DETAILS "[c${COMPONENT_MSG}]")
++  endif()
++
++  # version handling:
++  set(VERSION_MSG "")
++  set(VERSION_OK TRUE)
++
++  # check with DEFINED here as the requested or found version may be "0"
++  if (DEFINED ${_NAME}_FIND_VERSION)
++    if(DEFINED ${FPHSA_VERSION_VAR})
++      set(_FOUND_VERSION ${${FPHSA_VERSION_VAR}})
++
++      if(${_NAME}_FIND_VERSION_EXACT)       # exact version required
++        # count the dots in the version string
++        string(REGEX REPLACE "[^.]" "" _VERSION_DOTS "${_FOUND_VERSION}")
++        # add one dot because there is one dot more than there are components
++        string(LENGTH "${_VERSION_DOTS}." _VERSION_DOTS)
++        if (_VERSION_DOTS GREATER ${_NAME}_FIND_VERSION_COUNT)
++          # Because of the C++ implementation of find_package() ${_NAME}_FIND_VERSION_COUNT
++          # is at most 4 here. Therefore a simple lookup table is used.
++          if (${_NAME}_FIND_VERSION_COUNT EQUAL 1)
++            set(_VERSION_REGEX "[^.]*")
++          elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 2)
++            set(_VERSION_REGEX "[^.]*\\.[^.]*")
++          elseif (${_NAME}_FIND_VERSION_COUNT EQUAL 3)
++            set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*")
++          else ()
++            set(_VERSION_REGEX "[^.]*\\.[^.]*\\.[^.]*\\.[^.]*")
++          endif ()
++          string(REGEX REPLACE "^(${_VERSION_REGEX})\\..*" "\\1" _VERSION_HEAD "${_FOUND_VERSION}")
++          unset(_VERSION_REGEX)
++          if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _VERSION_HEAD)
++            set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
++            set(VERSION_OK FALSE)
++          else ()
++            set(VERSION_MSG "(found suitable exact version \"${_FOUND_VERSION}\")")
++          endif ()
++          unset(_VERSION_HEAD)
++        else ()
++          if (NOT ${_NAME}_FIND_VERSION VERSION_EQUAL _FOUND_VERSION)
++            set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is exact version \"${${_NAME}_FIND_VERSION}\"")
++            set(VERSION_OK FALSE)
++          else ()
++            set(VERSION_MSG "(found suitable exact version \"${_FOUND_VERSION}\")")
++          endif ()
++        endif ()
++        unset(_VERSION_DOTS)
++
++      else()     # minimum version specified:
++        if (${_NAME}_FIND_VERSION VERSION_GREATER _FOUND_VERSION)
++          set(VERSION_MSG "Found unsuitable version \"${_FOUND_VERSION}\", but required is at least \"${${_NAME}_FIND_VERSION}\"")
++          set(VERSION_OK FALSE)
++        else ()
++          set(VERSION_MSG "(found suitable version \"${_FOUND_VERSION}\", minimum required is \"${${_NAME}_FIND_VERSION}\")")
++        endif ()
++      endif()
++
++    else()
++
++      # if the package was not found, but a version was given, add that to the output:
++      if(${_NAME}_FIND_VERSION_EXACT)
++         set(VERSION_MSG "(Required is exact version \"${${_NAME}_FIND_VERSION}\")")
++      else()
++         set(VERSION_MSG "(Required is at least version \"${${_NAME}_FIND_VERSION}\")")
++      endif()
++
++    endif()
++  else ()
++    # Check with DEFINED as the found version may be 0.
++    if(DEFINED ${FPHSA_VERSION_VAR})
++      set(VERSION_MSG "(found version \"${${FPHSA_VERSION_VAR}}\")")
++    endif()
++  endif ()
++
++  if(VERSION_OK)
++    string(APPEND DETAILS "[v${${FPHSA_VERSION_VAR}}(${${_NAME}_FIND_VERSION})]")
++  else()
++    set(${_NAME}_FOUND FALSE)
++  endif()
++
++
++  # print the result:
++  if (${_NAME}_FOUND)
++    FIND_PACKAGE_MESSAGE(${_NAME} "Found ${_NAME}: ${${_FIRST_REQUIRED_VAR}} ${VERSION_MSG} ${COMPONENT_MSG}" "${DETAILS}")
++  else ()
++
++    if(FPHSA_CONFIG_MODE)
++      _FPHSA_HANDLE_FAILURE_CONFIG_MODE()
++    else()
++      if(NOT VERSION_OK)
++        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE}: ${VERSION_MSG} (found ${${_FIRST_REQUIRED_VAR}})")
++      else()
++        _FPHSA_FAILURE_MESSAGE("${FPHSA_FAIL_MESSAGE} (missing:${MISSING_VARS}) ${VERSION_MSG}")
++      endif()
++    endif()
++
++  endif ()
++
++  set(${_NAME}_FOUND ${${_NAME}_FOUND} PARENT_SCOPE)
++  set(${_NAME_UPPER}_FOUND ${${_NAME}_FOUND} PARENT_SCOPE)
++endfunction()
+diff -Nuar a/cmake/FindPackageMessage.cmake b/cmake/FindPackageMessage.cmake
+--- a/cmake/FindPackageMessage.cmake	1970-01-01 01:00:00.000000000 +0100
++++ b/cmake/FindPackageMessage.cmake	2020-03-04 11:38:51.062021412 +0100
+@@ -0,0 +1,19 @@
++# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
++# file Copyright.txt or https://cmake.org/licensing for details.
++
++function(find_package_message pkg msg details)
++  # Avoid printing a message repeatedly for the same find result.
++  if(NOT ${pkg}_FIND_QUIETLY)
++    string(REPLACE "\n" "" details "${details}")
++    set(DETAILS_VAR FIND_PACKAGE_MESSAGE_DETAILS_${pkg})
++    if(NOT "${details}" STREQUAL "${${DETAILS_VAR}}")
++      # The message has not yet been printed.
++      message(STATUS "${msg}")
++
++      # Save the find details in the cache to avoid printing the same
++      # message again.
++      set("${DETAILS_VAR}" "${details}"
++        CACHE INTERNAL "Details about finding ${pkg}")
++    endif()
++  endif()
++endfunction()
+diff -Nuar a/cmake/FindRuby.cmake b/cmake/FindRuby.cmake
+--- a/cmake/FindRuby.cmake	2017-02-09 10:33:45.000000000 +0100
++++ b/cmake/FindRuby.cmake	2020-03-04 11:38:51.062021412 +0100
+@@ -1,89 +1,297 @@
+-# Ruby cmake package
+-#
+-# Returns
+-# RUBY_FOUND
+-# RUBY_INCLUDE_DIRS
+-# RUBY_LIBRARIES
+-# RUBY_VERSION_MAJOR
+-# RUBY_VERSION_MINOR
+-# RUBY_VERSION_STRING
+-
+-if(RUBY_FOUND)
+-   set(RUBY_FIND_QUIETLY TRUE)
+-endif()
+-
+-find_program(RUBY_EXECUTABLE
+-  NAMES ruby2.2 ruby22 ruby2.1 ruby21 ruby2.0 ruby2 ruby1.9.3 ruby193 ruby1.9.2 ruby192 ruby1.9.1 ruby191 ruby1.9 ruby19 ruby1.8 ruby18 ruby
+-  PATHS /usr/bin /usr/local/bin /usr/pkg/bin
+-  )
+-if(RUBY_EXECUTABLE)
+-  execute_process(
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['MAJOR']"
+-    OUTPUT_VARIABLE RUBY_VERSION_MAJOR
+-    )
+-
+-  execute_process(
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['MINOR']"
+-    OUTPUT_VARIABLE RUBY_VERSION_MINOR
+-    )
+-
+-  execute_process(
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['TEENY']"
+-    OUTPUT_VARIABLE RUBY_VERSION_TEENY
+-    )
+-  set(RUBY_VERSION_STRING ${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_TEENY})
+-
+-  execute_process(
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubyhdrdir'] || RbConfig::CONFIG['archdir']"
+-    OUTPUT_VARIABLE RUBY_ARCH_DIR
+-    )
+-  execute_process(
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['arch']"
+-    OUTPUT_VARIABLE RUBY_ARCH
+-    )
+-  execute_process(
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['libdir']"
+-    OUTPUT_VARIABLE RUBY_POSSIBLE_LIB_PATH
+-    )
+-  execute_process(
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['rubylibdir']"
+-    OUTPUT_VARIABLE RUBY_LIB_PATH
+-    )
+-  execute_process(
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['archincludedir']"
+-    OUTPUT_VARIABLE RUBY_ARCH_INC_DIR
+-    )
+-  execute_process(
+-    COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['RUBY_SO_NAME']"
+-    OUTPUT_VARIABLE RUBY_SO_NAME
+-    )
+-
+-  find_path(RUBY_INCLUDE_DIRS
+-    NAMES ruby.h ruby/config.h
+-    PATHS ${RUBY_ARCH_DIR}
+-    )
+-  set(RUBY_INCLUDE_ARCH "${RUBY_INCLUDE_DIRS}/${RUBY_ARCH}")
+-  find_library(RUBY_LIB
+-    NAMES ${RUBY_SO_NAME}
+-    PATHS ${RUBY_POSSIBLE_LIB_PATH} ${RUBY_RUBY_LIB_PATH}
+-    )
+-
+-  if(RUBY_LIB AND RUBY_INCLUDE_DIRS)
+-    set(RUBY_FOUND TRUE)
+-    set(RUBY_INCLUDE_DIRS "${RUBY_INCLUDE_DIRS};${RUBY_INCLUDE_ARCH};${RUBY_ARCH_INC_DIR}/ruby-${RUBY_VERSION_STRING}")
+-    set(RUBY_LIBRARIES ${RUBY_LIB})
+-  endif()
++# Distributed under the OSI-approved BSD 3-Clause License.  See accompanying
++# file Copyright.txt or https://cmake.org/licensing for details.
++
++#[[
++FindRuby
++--------
++
++This module finds if Ruby is installed and determines where the
++include files and libraries are.  Ruby 1.8, 1.9, 2.0 through 2.5 are
++supported.
++
++The minimum required version of Ruby can be specified using the
++standard syntax, e.g.  find_package(Ruby 1.8)
++
++It also determines what the name of the library is.  This code sets
++the following variables:
++
++RUBY_EXECUTABLE
++    full path to the ruby binary
++RUBY_INCLUDE_DIRS
++    include dirs to be used when using the ruby library
++RUBY_LIBRARY
++    full path to the ruby library
++RUBY_VERSION
++    the version of ruby which was found, e.g. "1.8.7"
++RUBY_FOUND
++    set to true if ruby ws found successfully
+ 
+-  if(RUBY_OLD_VERSION)
+-    set(RUBY_FOUND FALSE)
+-    set(RUBY_NOT_FOUND TRUE)
++Also:
++
++RUBY_INCLUDE_PATH
++    same as RUBY_INCLUDE_DIRS, only provided for compatibility reasons, don't use it
++#]]
++
++#   RUBY_ARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"archdir"@:>@)'`
++#   RUBY_SITEARCHDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitearchdir"@:>@)'`
++#   RUBY_SITEDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"sitelibdir"@:>@)'`
++#   RUBY_LIBDIR=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"libdir"@:>@)'`
++#   RUBY_LIBRUBYARG=`$RUBY -r rbconfig -e 'printf("%s",Config::CONFIG@<:@"LIBRUBYARG_SHARED"@:>@)'`
++
++# uncomment the following line to get debug output for this file
++set(_RUBY_DEBUG_OUTPUT TRUE)
++
++# Determine the list of possible names of the ruby executable depending
++# on which version of ruby is required
++set(_RUBY_POSSIBLE_EXECUTABLE_NAMES ruby)
++
++# if 1.9 is required, don't look for ruby18 and ruby1.8, default to version 1.8
++if(DEFINED Ruby_FIND_VERSION_MAJOR AND DEFINED Ruby_FIND_VERSION_MINOR)
++   set(Ruby_FIND_VERSION_SHORT_NODOT "${Ruby_FIND_VERSION_MAJOR}${RUBY_FIND_VERSION_MINOR}")
++   # we can't construct that if only major version is given
++   set(_RUBY_POSSIBLE_EXECUTABLE_NAMES
++       ruby${Ruby_FIND_VERSION_MAJOR}.${Ruby_FIND_VERSION_MINOR}
++       ruby${Ruby_FIND_VERSION_MAJOR}${Ruby_FIND_VERSION_MINOR}
++       ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
++else()
++   set(Ruby_FIND_VERSION_SHORT_NODOT "18")
++endif()
++
++if(NOT Ruby_FIND_VERSION_EXACT)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.5 ruby25)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.4 ruby24)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.3 ruby23)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.2 ruby22)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.1 ruby21)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby2.0 ruby20)
++  list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.9 ruby19)
++
++  # if we want a version below 1.9, also look for ruby 1.8
++  if("${Ruby_FIND_VERSION_SHORT_NODOT}" VERSION_LESS "19")
++    list(APPEND _RUBY_POSSIBLE_EXECUTABLE_NAMES ruby1.8 ruby18)
+   endif()
+ 
+-  mark_as_advanced(
+-    RUBY_INCLUDE_DIRS
+-    RUBY_LIBRARIES
+-    RUBY_LIB
+-    RUBY_VERSION_MAJOR RUBY_VERSION_MINOR
+-    RUBY_VERSION_STRING
+-    )
++  list(REMOVE_DUPLICATES _RUBY_POSSIBLE_EXECUTABLE_NAMES)
++endif()
++
++find_program(RUBY_EXECUTABLE NAMES ${_RUBY_POSSIBLE_EXECUTABLE_NAMES})
++
++if(RUBY_EXECUTABLE  AND NOT  RUBY_VERSION_MAJOR)
++  function(_RUBY_CONFIG_VAR RBVAR OUTVAR)
++    execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print RbConfig::CONFIG['${RBVAR}']"
++      RESULT_VARIABLE _RUBY_SUCCESS
++      OUTPUT_VARIABLE _RUBY_OUTPUT
++      ERROR_QUIET)
++    if(_RUBY_SUCCESS OR _RUBY_OUTPUT STREQUAL "")
++      execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "print Config::CONFIG['${RBVAR}']"
++        RESULT_VARIABLE _RUBY_SUCCESS
++        OUTPUT_VARIABLE _RUBY_OUTPUT
++        ERROR_QUIET)
++    endif()
++    set(${OUTVAR} "${_RUBY_OUTPUT}" PARENT_SCOPE)
++  endfunction()
++
++
++  # query the ruby version
++   _RUBY_CONFIG_VAR("MAJOR" RUBY_VERSION_MAJOR)
++   _RUBY_CONFIG_VAR("MINOR" RUBY_VERSION_MINOR)
++   _RUBY_CONFIG_VAR("TEENY" RUBY_VERSION_PATCH)
++
++   # query the different directories
++   _RUBY_CONFIG_VAR("archdir" RUBY_ARCH_DIR)
++   _RUBY_CONFIG_VAR("arch" RUBY_ARCH)
++   _RUBY_CONFIG_VAR("rubyhdrdir" RUBY_HDR_DIR)
++   _RUBY_CONFIG_VAR("rubyarchhdrdir" RUBY_ARCHHDR_DIR)
++   _RUBY_CONFIG_VAR("libdir" RUBY_POSSIBLE_LIB_DIR)
++   _RUBY_CONFIG_VAR("rubylibdir" RUBY_RUBY_LIB_DIR)
++
++   # site_ruby
++   _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
++   _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
++
++   # vendor_ruby available ?
++   execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print 'true'"
++      OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY  ERROR_QUIET)
++
++   if(RUBY_HAS_VENDOR_RUBY)
++      _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
++      _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
++   endif()
++
++   # save the results in the cache so we don't have to run ruby the next time again
++   set(RUBY_VERSION_MAJOR    ${RUBY_VERSION_MAJOR}    CACHE PATH "The Ruby major version" FORCE)
++   set(RUBY_VERSION_MINOR    ${RUBY_VERSION_MINOR}    CACHE PATH "The Ruby minor version" FORCE)
++   set(RUBY_VERSION_PATCH    ${RUBY_VERSION_PATCH}    CACHE PATH "The Ruby patch version" FORCE)
++   set(RUBY_ARCH_DIR         ${RUBY_ARCH_DIR}         CACHE PATH "The Ruby arch dir" FORCE)
++   set(RUBY_HDR_DIR          ${RUBY_HDR_DIR}          CACHE PATH "The Ruby header dir (1.9+)" FORCE)
++   set(RUBY_ARCHHDR_DIR      ${RUBY_ARCHHDR_DIR}      CACHE PATH "The Ruby arch header dir (2.0+)" FORCE)
++   set(RUBY_POSSIBLE_LIB_DIR ${RUBY_POSSIBLE_LIB_DIR} CACHE PATH "The Ruby lib dir" FORCE)
++   set(RUBY_RUBY_LIB_DIR     ${RUBY_RUBY_LIB_DIR}     CACHE PATH "The Ruby ruby-lib dir" FORCE)
++   set(RUBY_SITEARCH_DIR     ${RUBY_SITEARCH_DIR}     CACHE PATH "The Ruby site arch dir" FORCE)
++   set(RUBY_SITELIB_DIR      ${RUBY_SITELIB_DIR}      CACHE PATH "The Ruby site lib dir" FORCE)
++   set(RUBY_HAS_VENDOR_RUBY  ${RUBY_HAS_VENDOR_RUBY}  CACHE BOOL "Vendor Ruby is available" FORCE)
++   set(RUBY_VENDORARCH_DIR   ${RUBY_VENDORARCH_DIR}   CACHE PATH "The Ruby vendor arch dir" FORCE)
++   set(RUBY_VENDORLIB_DIR    ${RUBY_VENDORLIB_DIR}    CACHE PATH "The Ruby vendor lib dir" FORCE)
++
++   mark_as_advanced(
++     RUBY_ARCH_DIR
++     RUBY_ARCH
++     RUBY_HDR_DIR
++     RUBY_ARCHHDR_DIR
++     RUBY_POSSIBLE_LIB_DIR
++     RUBY_RUBY_LIB_DIR
++     RUBY_SITEARCH_DIR
++     RUBY_SITELIB_DIR
++     RUBY_HAS_VENDOR_RUBY
++     RUBY_VENDORARCH_DIR
++     RUBY_VENDORLIB_DIR
++     RUBY_VERSION_MAJOR
++     RUBY_VERSION_MINOR
++     RUBY_VERSION_PATCH
++     )
++endif()
++
++# In case RUBY_EXECUTABLE could not be executed (e.g. cross compiling)
++# try to detect which version we found. This is not too good.
++if(RUBY_EXECUTABLE AND NOT RUBY_VERSION_MAJOR)
++   # by default assume 1.8.0
++   set(RUBY_VERSION_MAJOR 1)
++   set(RUBY_VERSION_MINOR 8)
++   set(RUBY_VERSION_PATCH 0)
++   # check whether we found 1.9.x
++   if(${RUBY_EXECUTABLE} MATCHES "ruby1\\.?9")
++      set(RUBY_VERSION_MAJOR 1)
++      set(RUBY_VERSION_MINOR 9)
++   endif()
++   # check whether we found 2.0.x
++   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?0")
++      set(RUBY_VERSION_MAJOR 2)
++      set(RUBY_VERSION_MINOR 0)
++   endif()
++   # check whether we found 2.1.x
++   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?1")
++      set(RUBY_VERSION_MAJOR 2)
++      set(RUBY_VERSION_MINOR 1)
++   endif()
++   # check whether we found 2.2.x
++   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?2")
++      set(RUBY_VERSION_MAJOR 2)
++      set(RUBY_VERSION_MINOR 2)
++   endif()
++   # check whether we found 2.3.x
++   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?3")
++      set(RUBY_VERSION_MAJOR 2)
++      set(RUBY_VERSION_MINOR 3)
++   endif()
++   # check whether we found 2.4.x
++   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?4")
++      set(RUBY_VERSION_MAJOR 2)
++      set(RUBY_VERSION_MINOR 4)
++   endif()
++   if(${RUBY_EXECUTABLE} MATCHES "ruby2\\.?5")
++      set(RUBY_VERSION_MAJOR 2)
++      set(RUBY_VERSION_MINOR 5)
++   endif()
+ endif()
++
++if(RUBY_VERSION_MAJOR)
++   set(RUBY_VERSION "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}.${RUBY_VERSION_PATCH}")
++   set(_RUBY_VERSION_SHORT "${RUBY_VERSION_MAJOR}.${RUBY_VERSION_MINOR}")
++   set(_RUBY_VERSION_SHORT_NODOT "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}")
++   set(_RUBY_NODOT_VERSION "${RUBY_VERSION_MAJOR}${RUBY_VERSION_MINOR}${RUBY_VERSION_PATCH}")
++endif()
++
++find_path(RUBY_INCLUDE_DIR
++   NAMES ruby.h
++   HINTS
++   ${RUBY_HDR_DIR}
++   ${RUBY_ARCH_DIR}
++   /usr/lib/ruby/${_RUBY_VERSION_SHORT}/i586-linux-gnu/ )
++
++set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIR} )
++
++# if ruby > 1.8 is required or if ruby > 1.8 was found, search for the config.h dir
++if( "${Ruby_FIND_VERSION_SHORT_NODOT}" GREATER 18  OR  "${_RUBY_VERSION_SHORT_NODOT}" GREATER 18  OR  RUBY_HDR_DIR)
++   find_path(RUBY_CONFIG_INCLUDE_DIR
++     NAMES ruby/config.h  config.h
++     HINTS
++     ${RUBY_HDR_DIR}/${RUBY_ARCH}
++     ${RUBY_ARCH_DIR}
++     ${RUBY_ARCHHDR_DIR}
++     )
++
++   set(RUBY_INCLUDE_DIRS ${RUBY_INCLUDE_DIRS} ${RUBY_CONFIG_INCLUDE_DIR} )
++endif()
++
++
++# Determine the list of possible names for the ruby library
++set(_RUBY_POSSIBLE_LIB_NAMES ruby ruby-static ruby${_RUBY_VERSION_SHORT} ruby${_RUBY_VERSION_SHORT_NODOT} ruby-${_RUBY_VERSION_SHORT} ruby-${RUBY_VERSION})
++
++if(WIN32)
++   set( _RUBY_MSVC_RUNTIME "" )
++   if( MSVC_VERSION EQUAL 1200 )
++     set( _RUBY_MSVC_RUNTIME "60" )
++   endif()
++   if( MSVC_VERSION EQUAL 1300 )
++     set( _RUBY_MSVC_RUNTIME "70" )
++   endif()
++   if( MSVC_VERSION EQUAL 1310 )
++     set( _RUBY_MSVC_RUNTIME "71" )
++   endif()
++   if( MSVC_VERSION EQUAL 1400 )
++     set( _RUBY_MSVC_RUNTIME "80" )
++   endif()
++   if( MSVC_VERSION EQUAL 1500 )
++     set( _RUBY_MSVC_RUNTIME "90" )
++   endif()
++
++   set(_RUBY_ARCH_PREFIX "")
++   if(CMAKE_SIZEOF_VOID_P EQUAL 8)
++     set(_RUBY_ARCH_PREFIX "x64-")
++   endif()
++
++   list(APPEND _RUBY_POSSIBLE_LIB_NAMES
++               "${_RUBY_ARCH_PREFIX}msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}"
++               "${_RUBY_ARCH_PREFIX}msvcr${_RUBY_MSVC_RUNTIME}-ruby${_RUBY_NODOT_VERSION}-static"
++               "${_RUBY_ARCH_PREFIX}msvcrt-ruby${_RUBY_NODOT_VERSION}"
++               "${_RUBY_ARCH_PREFIX}msvcrt-ruby${_RUBY_NODOT_VERSION}-static" )
++endif()
++
++find_library(RUBY_LIBRARY NAMES ${_RUBY_POSSIBLE_LIB_NAMES} HINTS ${RUBY_POSSIBLE_LIB_DIR} )
++
++include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
++set(_RUBY_REQUIRED_VARS RUBY_EXECUTABLE RUBY_INCLUDE_DIR RUBY_LIBRARY)
++if(_RUBY_VERSION_SHORT_NODOT GREATER 18)
++   list(APPEND _RUBY_REQUIRED_VARS RUBY_CONFIG_INCLUDE_DIR)
++endif()
++
++if(_RUBY_DEBUG_OUTPUT)
++   message(STATUS "--------FindRuby.cmake debug------------")
++   message(STATUS "_RUBY_POSSIBLE_EXECUTABLE_NAMES: ${_RUBY_POSSIBLE_EXECUTABLE_NAMES}")
++   message(STATUS "_RUBY_POSSIBLE_LIB_NAMES: ${_RUBY_POSSIBLE_LIB_NAMES}")
++   message(STATUS "RUBY_ARCH_DIR: ${RUBY_ARCH_DIR}")
++   message(STATUS "RUBY_HDR_DIR: ${RUBY_HDR_DIR}")
++   message(STATUS "RUBY_POSSIBLE_LIB_DIR: ${RUBY_POSSIBLE_LIB_DIR}")
++   message(STATUS "Found RUBY_VERSION: \"${RUBY_VERSION}\" , short: \"${_RUBY_VERSION_SHORT}\", nodot: \"${_RUBY_VERSION_SHORT_NODOT}\"")
++   message(STATUS "_RUBY_REQUIRED_VARS: ${_RUBY_REQUIRED_VARS}")
++   message(STATUS "RUBY_EXECUTABLE: ${RUBY_EXECUTABLE}")
++   message(STATUS "RUBY_LIBRARY: ${RUBY_LIBRARY}")
++   message(STATUS "RUBY_INCLUDE_DIR: ${RUBY_INCLUDE_DIR}")
++   message(STATUS "RUBY_CONFIG_INCLUDE_DIR: ${RUBY_CONFIG_INCLUDE_DIR}")
++   message(STATUS "--------------------")
++endif()
++
++FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ruby  REQUIRED_VARS  ${_RUBY_REQUIRED_VARS}
++                                        VERSION_VAR RUBY_VERSION )
++
++mark_as_advanced(
++  RUBY_EXECUTABLE
++  RUBY_LIBRARY
++  RUBY_INCLUDE_DIR
++  RUBY_CONFIG_INCLUDE_DIR
++  )
++
++# Set some variables for compatibility with previous version of this file
++set(RUBY_POSSIBLE_LIB_PATH ${RUBY_POSSIBLE_LIB_DIR})
++set(RUBY_RUBY_LIB_PATH ${RUBY_RUBY_LIB_DIR})
++set(RUBY_INCLUDE_PATH ${RUBY_INCLUDE_DIRS})
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 22bdd4ab0e3a..5273327c44b7 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -6,6 +6,6 @@ AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
 DIST e2fsprogs-1.45.5.tar.xz 5569796 BLAKE2B cf9633caa6c00afa51408364d0c0a1515a9989ad1582fb485a300fd71bf61ec56b57dbb26f152609eaf2d63bfb04fe1e3f271085c26aa0c832c1f467960e6480 SHA512 d1a8611b525742387061f390fb24825dfa175997cc7db05decea913fcc7b97a95a3e787091f2920d4a7d4eb1d813568af734a1610229ead09bcbf9f3e262e4ce
 DIST e2fsprogs-1.45.6.tar.xz 5572144 BLAKE2B 24a44d27a02a1fa178083d5ee6034b20fedcac9faf7cf7f5cfcd4e4cee6d38775bc78949b9b00823cbbdacfab783e8e1e739579b9a7236c5425f51b27600743b SHA512 f3abfb6fe7ef632bb81152e2127d601cadd3fa93162178576a1d5ed82c2286627184b207b85a5b2a1793db0addf0885dfc3b9523bb340443224caf9c6d613b84
-EBUILD e2fsprogs-1.45.5.ebuild 4031 BLAKE2B 771cb2472759c64693ad5018040fd6d7bab93f173c5f7f848c6a6c9fcc3b251cb0bea3010d4f4805e7d1c53b210b6eaeed278bb3b8b43bf4b81300e4961fa49c SHA512 0e9fc8b712d1d3cd5425d667399e9057200722157d160fe6d47cc430f46c774e1101894453ee53d1fc9ce3af3ddda624ef851f1461737b4c5de877f3ace16a5c
-EBUILD e2fsprogs-1.45.6.ebuild 4040 BLAKE2B 48ba3717d78c88fcff4339b518f4c6be465a79cef62aecf0485adff9c79f2b243d5508fb9c37fcc81b6b68f22c053147aba41b09995b3ab716871d8f979d80a2 SHA512 0c463e4e15aa20b1ab62db37e5fac39abc4833fc24b7c60ec032f56fa3bc143aa80069bd8702a754e3a63f7e610b76620f06459f4de38650b48579f32f0f7024
+EBUILD e2fsprogs-1.45.5.ebuild 3987 BLAKE2B b870c4acafb4d819339e86862dac99711d3904e54944d2f41ed0a6fbd3366e11ab5083563a225ffbc2d2756960b0967c3870c3c87b01b1c5cb9da4114f46ccd5 SHA512 b8fff7dec7463837ac0ccb068e3934fc97d48231c6602a569e07d2c7736695c0f43f0bd7f6099c8a21c95d26f18470bedf7e5cb1072ff51a6f225dd54c61249d
+EBUILD e2fsprogs-1.45.6.ebuild 3996 BLAKE2B f0b0f292cfd822c86ff8911d8fb463c06bb0b8ae810702b9e4639682d011ca21a3eee5c6da6b010fc200943038a8993712a30314fe4cdea01355491271fcc11f SHA512 22be93b9db74fe521b32bd67222bce96c6e87f06837e36e51aa683380f28bb870f9ae4a6d294c15a8d3710bcb258e5eebbb510f550ecf1eb64b561763ff63525
 MISC metadata.xml 569 BLAKE2B 0a09eb03e2d5f07a24f33d71a16d0e4cb7e12e5a03356b44127e964c712addfb5bb9d5bc3b26dc66c608544639b6a92ebe0dcc18c03b8820f50b6fabcc9c231b SHA512 fa3e24f0db835a5fb475d42874d3197bd30f0c1f606b66b1b3f285e61dd32624ae56014b37ee0de0a9ebfaf51dd2f06cc2f73f91a011c5314809f5d495d65e67
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
index c2d5f2b67c35..d3c4e3c8cb9a 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.5.ebuild
@@ -7,8 +7,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
+SRC_URI="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"
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
index 5db4525cd57e..47bad0c4a4ec 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.6.ebuild
@@ -7,8 +7,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
+SRC_URI="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"
diff --git a/sys-fs/ecryptfs-utils/Manifest b/sys-fs/ecryptfs-utils/Manifest
index 5e7a9c3156e3..44312105cf8d 100644
--- a/sys-fs/ecryptfs-utils/Manifest
+++ b/sys-fs/ecryptfs-utils/Manifest
@@ -1,3 +1,4 @@
+AUX ecryptfs-utils-111-musl-fix.patch 655 BLAKE2B 36b58a963e3aa82b2eac0753f0177fc6293ea33dad78077f6c9735cbacc9f14064a4517747b72298191dd3ab8266bf15506b2947544fbe250ab1a96706aa47ae SHA512 3e69d642e650be5a94c3f1a47ee7094fd5c052d77d3298ebe96ababfe6f526963dd08d8260ca546eee271b799357ef57a51479565b646b2b428e7c8868ec469a
 DIST ecryptfs-utils-111_p20170609.tar.gz 1433722 BLAKE2B eeb8840e0b369d2eb420e7853629086cbf430daed2dbf3ed620f5c2489de711c9d8dc5c2b555db5d09b968df6d07da19b93ca46add3b7987d3ff1ad9f06adc69 SHA512 4788a35d68bbb6b769803754adad14d063564e6285edcec4d68df076e96c61550ab6487a1b84498e24e3f56f8c9fda6eb63a66d469d3e654834357c5e2b4c781
-EBUILD ecryptfs-utils-111_p20170609.ebuild 2152 BLAKE2B 4a30dc24bed2c2e69723d29b2d60231b0d49d00a09699e7395d588be85b5edfb23e577c35b43c9743defcf3bf6b64e85a3bb955feee822e98612c3e0459f6739 SHA512 ec7b6590397739abeb215cca0b06dfba2fb16fba72cba0e63af02b93760d528fc78f5530a880fc01cda145251c8f53d56a233f3204d2a385da7ef75ff6866ef5
+EBUILD ecryptfs-utils-111_p20170609-r1.ebuild 1894 BLAKE2B 819bd32ec8104bb3483507fa17a3015afaf20954ed01ac16b06d4f789c98d2f0e5044f9a81423c3bec69a29037600b814da723efe087e332baffb645fdfaa6ae SHA512 6a26a4bb96dd4ae43874dc7ffbdeb7063990db46c5cabbe38becd9ab9686ef3e1949131c940574b7c79f41d4aff1a85dfabf5e451b26368261d164d9441d12ef
 MISC metadata.xml 654 BLAKE2B 64e5132639a3fe0cd686cb0e8d48498c824541534557bfea1afceaf0f650554b05138850d9c43601c837de7d3499ac1608b5d7ff6ca6bbce02d5f617bb962f26 SHA512 47e06caf756f98d2d2f105c1e89e4e9fbb5b8a84a34969c918646b85a0004491b37bf1c86fef322e97c83f914e8ab68b0584e3e675c53c51238c0b13dd87e43c
diff --git a/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609.ebuild b/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild
index a5704e9bce6f..711644620d7c 100644
--- a/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609.ebuild
+++ b/sys-fs/ecryptfs-utils/ecryptfs-utils-111_p20170609-r1.ebuild
@@ -1,25 +1,32 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit flag-o-matic pam python-single-r1 linux-info autotools
+inherit autotools flag-o-matic linux-info pam
 
+MY_PN=${PN/-utils//}
 DESCRIPTION="eCryptfs userspace utilities"
 HOMEPAGE="https://launchpad.net/ecryptfs"
 SRC_URI="https://dev.gentoo.org/~bkohler/dist/${P}.tar.gz"
+S="${WORKDIR}/~${MY_PN}/${MY_PN}/trunk/"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-IUSE="doc gpg gtk nls openssl pam pkcs11 python suid tpm"
+IUSE="doc gpg gtk nls openssl pam pkcs11 suid tpm"
 
-RDEPEND=">=sys-apps/keyutils-1.5.11-r1:=
-	>=dev-libs/libgcrypt-1.2.0:0
+BDEPEND="
+	>=dev-util/intltool-0.41.0
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+RDEPEND="
+	>=dev-libs/libgcrypt-1.2.0:0=
 	dev-libs/nss
-	gpg? ( app-crypt/gpgme )
+	>=sys-apps/keyutils-1.5.11-r1:=
+	sys-process/lsof
+	gpg? ( app-crypt/gpgme:= )
 	gtk? ( x11-libs/gtk+:2 )
 	openssl? ( >=dev-libs/openssl-0.9.7:= )
 	pam? ( sys-libs/pam )
@@ -27,28 +34,21 @@ RDEPEND=">=sys-apps/keyutils-1.5.11-r1:=
 		>=dev-libs/openssl-0.9.7:=
 		>=dev-libs/pkcs11-helper-1.04
 	)
-	python? ( ${PYTHON_DEPS} )
 	tpm? ( app-crypt/trousers )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	sys-devel/gettext
-	>=dev-util/intltool-0.41.0
-	python? ( dev-lang/swig )"
+DEPEND="
+	${RDEPEND}
+	dev-libs/glib:2
+"
 
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+PATCHES=(
+	"${FILESDIR}/${PN}-111-musl-fix.patch"
+)
 
 pkg_setup() {
-	use python && python-single-r1_pkg_setup
-
 	CONFIG_CHECK="~ECRYPT_FS"
 	linux-info_pkg_setup
 }
 
-src_unpack() {
-	mkdir -p "${S}" || die
-	tar -xf "${DISTDIR}/${P}.tar.gz" --strip-components=3 -C "${S}"
-}
-
 src_prepare() {
 	default
 	eautoreconf
@@ -60,6 +60,7 @@ src_configure() {
 	econf \
 		--enable-nss \
 		--with-pamdir=$(getpam_mod_dir) \
+		--disable-pywrap \
 		$(use_enable doc docs) \
 		$(use_enable gpg) \
 		$(use_enable gtk gui) \
@@ -67,17 +68,12 @@ src_configure() {
 		$(use_enable openssl) \
 		$(use_enable pam) \
 		$(use_enable pkcs11 pkcs11-helper) \
-		$(use_enable python pywrap) \
 		$(use_enable tpm tspi)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install
 
-	if use python; then
-		echo "ecryptfs-utils" > "${D}$(python_get_sitedir)/ecryptfs-utils.pth" || die
-	fi
-
 	use suid && fperms u+s /sbin/mount.ecryptfs_private
 
 	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
diff --git a/sys-fs/ecryptfs-utils/files/ecryptfs-utils-111-musl-fix.patch b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-111-musl-fix.patch
new file mode 100644
index 000000000000..1d6de38e8cb3
--- /dev/null
+++ b/sys-fs/ecryptfs-utils/files/ecryptfs-utils-111-musl-fix.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/715508
+https://git.alpinelinux.org/aports/tree/community/ecryptfs-utils/fix-build.patch?id=9e57b1f1197ee99b9f998472371042c42bffdc49
+--- a/src/utils/mount.ecryptfs_private.c	2016-01-22 18:04:52.000000000 +0200
++++ b/src/utils/mount.ecryptfs_private.c	2017-01-20 08:39:31.877975729 +0200
+@@ -235,7 +235,7 @@
+ 	 * deceive other programs with a crafted /proc/self/*. See
+ 	 * https://launchpad.net/bugs/1530566 for more details.
+ 	 */
+-	__SWORD_TYPE f_type_whitelist[] = {
++	static const uint32_t f_type_whitelist[] = {
+ 		0x61756673 /* AUFS_SUPER_MAGIC */,
+ 		0x9123683E /* BTRFS_SUPER_MAGIC */,
+ 		0x00C36400 /* CEPH_SUPER_MAGIC */,
diff --git a/sys-fs/exfatprogs/Manifest b/sys-fs/exfatprogs/Manifest
new file mode 100644
index 000000000000..b62845e4cc43
--- /dev/null
+++ b/sys-fs/exfatprogs/Manifest
@@ -0,0 +1,4 @@
+DIST exfatprogs-1.0.4.tar.xz 255736 BLAKE2B de2d64853e94944dd5c1f961a94daf5d31266a4b8f51e20a0528344fed24a5482ae6412f39d47b7da9807d5b8d10f87106b88818318f26339c0c8e05d52b247d SHA512 c3d9b92101b9461d47a9b3c7a43a99b90160ec81121662b04947aea18ad1b2381dc1d71c491bc4a5f2439120d6c21533ba2714a548134d9c918c4b1c72063d45
+EBUILD exfatprogs-1.0.4.ebuild 601 BLAKE2B bf01b45d28396612a1de65bab39576f0d0c671e88f5edf736af7d7e341ef4dd38bde5e76e7a1c2bf7eacc37bc69ce262b1ed96d9fd164f958bbd7b58a6ac8662 SHA512 1f585fa1671b8ab418a2f5fb9c9d2743bca511627a1bab540159a863a1e7712a679ee397429244cb9f654330fc8555214f34f46aea10720a25f73808ec0a4d69
+EBUILD exfatprogs-9999.ebuild 601 BLAKE2B bf01b45d28396612a1de65bab39576f0d0c671e88f5edf736af7d7e341ef4dd38bde5e76e7a1c2bf7eacc37bc69ce262b1ed96d9fd164f958bbd7b58a6ac8662 SHA512 1f585fa1671b8ab418a2f5fb9c9d2743bca511627a1bab540159a863a1e7712a679ee397429244cb9f654330fc8555214f34f46aea10720a25f73808ec0a4d69
+MISC metadata.xml 343 BLAKE2B 76c85c7abf0d2244304b72aad5f78ab1ed278b01c943b3380ff5fbd5cb104284accbc33b1b620309f1f9034625e98e0424e89ba4d1d13887c07502b6fd8efb63 SHA512 ca7a2f710812f1e5ee73b4faeadf9628274b1130e96f60af6155388746e0d14559a5e18262191ba50fcc1255cddeb88acf6c2d40df2af48548ce676a7a2fb91e
diff --git a/sys-fs/exfatprogs/exfatprogs-1.0.4.ebuild b/sys-fs/exfatprogs/exfatprogs-1.0.4.ebuild
new file mode 100644
index 000000000000..f262a17592a0
--- /dev/null
+++ b/sys-fs/exfatprogs/exfatprogs-1.0.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)"
+HOMEPAGE="https://github.com/exfatprogs/exfatprogs"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE=""
+
+RDEPEND="!sys-fs/exfat-utils"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
diff --git a/sys-fs/exfatprogs/exfatprogs-9999.ebuild b/sys-fs/exfatprogs/exfatprogs-9999.ebuild
new file mode 100644
index 000000000000..f262a17592a0
--- /dev/null
+++ b/sys-fs/exfatprogs/exfatprogs-9999.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Userspace utilities for new exfat filesystem (kernel 5.7+)"
+HOMEPAGE="https://github.com/exfatprogs/exfatprogs"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/exfatprogs/exfatprogs.git"
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE=""
+
+RDEPEND="!sys-fs/exfat-utils"
+
+src_prepare() {
+	default
+	[[ "${PV}" == *9999 ]] && eautoreconf
+}
diff --git a/sys-fs/exfatprogs/metadata.xml b/sys-fs/exfatprogs/metadata.xml
new file mode 100644
index 000000000000..f694d91a6b55
--- /dev/null
+++ b/sys-fs/exfatprogs/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">exfatprogs/exfatprogs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/sys-fs/fatsort/Manifest b/sys-fs/fatsort/Manifest
index 944a7385579a..49a2fd01a092 100644
--- a/sys-fs/fatsort/Manifest
+++ b/sys-fs/fatsort/Manifest
@@ -1,4 +1,6 @@
 AUX fatsort-1.6.2.605-gcc10.patch 7400 BLAKE2B 05d9f3bc9c0118c9505e96f2766d27b142a61252f5ad21e3c106ac7afda9a69bddc1ec1dbb9f3b170bbc10315f04db06e80000ef0eb9c601db4b5b88da82e08a SHA512 bac23d94900f48f8fd331962f617b92250ff9cfc801a688526177ef24e571e341e124a2859cbf1ff8db80d1bcbb32ee99d1c9878abcdaa78b9dd0606f5689e28
 DIST fatsort-1.6.2.605.tar.xz 122928 BLAKE2B 2690233828e47a4809aac14a8d64dc8d95a824bec52f787190186adbe066d5d4e6f9c6d1873fc6b809c6df6879d12154430f44d412944963bdff49e673079d12 SHA512 0d119c99c5efff4c10367152fc6efe95e2cb1c39405ca02dd25b66cc68c7420b5b28c0daca1346b7928633bac8ace2d05d731502f989d39ca5c783dcec69ccc7
+DIST fatsort-1.6.3.622.tar.xz 123644 BLAKE2B 1db530753bdaee4ebda9ab36a47f6794584bc590de4cbf8d144a5baa770c080c9d27a1ecadd5a22de72538887c4e10f161f3c4fb3afb3e63bd18834897ebe905 SHA512 309c7424e53fb74f57d0c4272a1a4b3df57fa1130d7e7adae0ac73ac1c8b1900504e49efd0cc4dafea3efa2fbc9191f343b10bb97b647dd6124197356cd01c53
 EBUILD fatsort-1.6.2.605.ebuild 754 BLAKE2B 11850d6ad2ca62de3f7c110773fa216a5d5cf1b7df81e2fc8eaa81fae2e9f029f4ee7b40ddcd5a66991a98d5bbb35e48b9328591aa6ce93e2f305da588d98d6a SHA512 cc94184f60f4ed2c17a476c4ed0718caae60db2769129233b82f39c5d0d9eb41eed803377c1b38bcb6db3b720937f85f5e659ed51fccb2e5bb72b0562d7c9202
+EBUILD fatsort-1.6.3.622.ebuild 715 BLAKE2B d41dd107dc97485ba7d7225703dc813d81acb112fab52551d4360015873c806bbdee4b909fe180228db695a0493bd0d3a7b49bdcec4cd85006727d63af98ffce SHA512 764a8bff79153356dcea1c8fb746f5cc43af397441e114b4d92806769ee22e2a3f6d65f8ccd4445f1e7ffbc011681fc5a7004163776da6ae7abb1d3096f2cd8d
 MISC metadata.xml 738 BLAKE2B b4ae8042af9b7a74705b42322ffcfba47aa18e3cb1bee693ff2db3fecb6555d516ec9a3f4746643ef37007e9d1b44ea79d5fa0e4bc12b6ca4ba813129d208dcd SHA512 42cb5be41b29129b17ea55591d352872ccd6078705068c6899d4f1f5a5b99ab5f6809e75ee6b49bd6b536f6b66632ce9e1859f4bbad764b966d5520a8aa5a228
diff --git a/sys-fs/fatsort/fatsort-1.6.3.622.ebuild b/sys-fs/fatsort/fatsort-1.6.3.622.ebuild
new file mode 100644
index 000000000000..28d6fc9100bc
--- /dev/null
+++ b/sys-fs/fatsort/fatsort-1.6.3.622.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Sorts files on FAT16/32 partitions, ideal for basic audio players"
+HOMEPAGE="http://fatsort.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+
+	sed -i -e 's|/usr/local|/usr|g' \
+		$(find ./ -name Makefile) || die
+}
+
+src_compile() {
+	emake CC=$(tc-getCC) LD=$(tc-getCC) \
+		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		DESTDIR="${D}" man
+}
+
+src_test() {
+	# Tests require root permissions and mounting filesystems which does
+	# not work inside the ebuild environment
+	true
+}
diff --git a/sys-fs/fuse-common/Manifest b/sys-fs/fuse-common/Manifest
index 5192e1299e89..d69f1a2d68bf 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.9.1.tar.xz 1595308 BLAKE2B 3b1d5c8ac99e96183581d034889d8d6cab8feeee26cafd765dc4ab2cbeb655b3b162836c960ceacf08cd458bec2daaf0474877c9611ef6a6543795e4971ddc12 SHA512 295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329
 DIST fuse-3.9.2.tar.xz 1674292 BLAKE2B 42d796802d3ce2e072120153b695d1e64d160695714c58ffba7859281bfa2c1ff3d9f95b92a38c1a5443abe5a8468f0d9d285845b97a444ae1b64bf750e234ae SHA512 47795d2e0431c93ff36609247016a5ddfa631e4dcdc56cb579030bdb78497e3fa2db28b0cbadd0848024be39381c54f8441de28b0af51f8b800519e76c7af9ed
+DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
 EBUILD fuse-common-3.9.1.ebuild 878 BLAKE2B 2b36fcad7d4b870240f6d8c25639825bc51c8ceca28488a46708317f72d7e58978fa6c8bbdcc12be211016c256e36408723ce9f042d935fb679f433cf2046956 SHA512 36f14cb465000d7d48ebe0367e2a84af714567cfc28ba4583e9e9b6d8a92808e1acf001a2742d0996bb0ad9875badde088e380e66ccce6eaca851bc3c85fe4e8
 EBUILD fuse-common-3.9.2.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f
+EBUILD fuse-common-3.9.3.ebuild 886 BLAKE2B 9c6698ce02f1fcce6e841254d1170460bf25476b70b95c02433216d6906628aeea4e18592e30e05ef730926969199d625954f6c56f8f0dbe6255f6c06d3676d8 SHA512 edd2f53c2dc865a39e7e74f032c2918f81379bbdaed2bf8f559d5a01e232b4883253de06122358a0aeea65d02590f4e86f39614aa2b32e34efb4b74e4598310f
 MISC metadata.xml 408 BLAKE2B 20a23e1ce0b234dcedcf095ccbef63413420ab0490a2e0b98f9dffcb43508bc7c770b0180e2cb9ac501764bc85f286b7e9bf81848e34257b414ed78c7de0877c SHA512 6bfd1910124508d1a555213adcd9509b19b28184fd5eb5346d84531370414194a6f18ac2ce7d726b4341018b058e02cf2805146fa1747aba21c6b9d8c2371020
diff --git a/sys-fs/fuse-common/fuse-common-3.9.3.ebuild b/sys-fs/fuse-common/fuse-common-3.9.3.ebuild
new file mode 100644
index 000000000000..1562ff02eb90
--- /dev/null
+++ b/sys-fs/fuse-common/fuse-common-3.9.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+DESCRIPTION="Common files for multiple slots of sys-fs/fuse"
+HOMEPAGE="https://github.com/libfuse/libfuse"
+SRC_URI="https://github.com/libfuse/libfuse/releases/download/fuse-${PV}/fuse-${PV}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="!<sys-fs/fuse-2.9.7-r1:0"
+
+S=${WORKDIR}/fuse-${PV}
+
+src_install() {
+	udev_newrules util/udev.rules 99-fuse.rules
+
+	if use kernel_linux ; then
+		newinitd "${FILESDIR}"/fuse.init fuse
+	elif use kernel_FreeBSD ; then
+		newinitd "${FILESDIR}"/fuse-fbsd.init fuse
+	else
+		die "We don't know what init code install for your kernel, please file a bug."
+	fi
+
+	insinto /etc
+	doins util/fuse.conf
+}
diff --git a/sys-fs/fuse-overlayfs/Manifest b/sys-fs/fuse-overlayfs/Manifest
index 54ba06816d6a..837f8d62fe06 100644
--- a/sys-fs/fuse-overlayfs/Manifest
+++ b/sys-fs/fuse-overlayfs/Manifest
@@ -1,7 +1,9 @@
 DIST fuse-overlayfs-0.7.8.tar.gz 95759 BLAKE2B b2c8928bd309dabdd17d6248e6e07426ddd3922484a35dbc3ff1dfe74954e58872a0f472b0ddd84cc357af9dc5aaf6e401a5b385c3fe743092893ae822bc60b5 SHA512 0eb3ca179ff88ad4ba783646e51aaab147ae5fdffbc48b2121a481ff3030d35d1f3e32b838e1f41a275c08d345ef397b86ff2e4a6768ead98a1bb1d56922f689
 DIST fuse-overlayfs-1.0.0.tar.gz 95855 BLAKE2B f42fb77854a170a9a504167b3437525c560d48e172a2df77349e2874356aaf86ac86257f1700fa11687a7b2836f233f6726136745baeb09bb681f803440da45e SHA512 cb45306985e6f91424219dfa1706da9e987602c402df7d6ad4905a9ae2a92937e91d72663aec672904d69f588049f157fb361189c290840f2ae93d8d2c001d05
 DIST fuse-overlayfs-1.1.1.tar.gz 97965 BLAKE2B acb787e2d793a790a439e19d15bc5249c21449e7ec569e04ecac72ec59936c387e771abc05820b768b35d57775e7692c168b479ac73ea1c075da7b896ea4aa5d SHA512 71f331499920510b6e31984b09ee5feca94d427756323d39872b7f9b58d3312aada2addf2af79e4d263cb5b75fb134083dfa3cef4021a0a18a5230fcdd2ccdad
+DIST fuse-overlayfs-1.1.2.tar.gz 98055 BLAKE2B 04cee8052671431604031ddd3d0ebc254de0ba00a527b4a7caa24bf4a0b74be81c9d0f2c02e5eb583c3f6a61b540762b52617531f266341878cb54f40e087331 SHA512 41bb7ed21d0408af61820b9aebefb08ee6add0c9a15ff1cafd8abc7ff6fcc46afd53740c946c6835bbba8c58ee8bfcc8351cd2a1fe81d749dad81934ce44032b
 EBUILD fuse-overlayfs-0.7.8.ebuild 557 BLAKE2B 3c520126b339c8666d0f4b4c1443bef31352a9c1e0d77044ad38984f33aac5a3998d57941e2896a87be27a058a795acf4d5940b31efa31f99c2e3c111e0149aa SHA512 c72c29f1f5d8b269e4a3cff1440b76e8d02e7aa38f9418c628de67fab768729da6ce8e898f251085d836122b08d432721cd83a7f85604fcfe4db24387eb1defa
 EBUILD fuse-overlayfs-1.0.0.ebuild 557 BLAKE2B 3c520126b339c8666d0f4b4c1443bef31352a9c1e0d77044ad38984f33aac5a3998d57941e2896a87be27a058a795acf4d5940b31efa31f99c2e3c111e0149aa SHA512 c72c29f1f5d8b269e4a3cff1440b76e8d02e7aa38f9418c628de67fab768729da6ce8e898f251085d836122b08d432721cd83a7f85604fcfe4db24387eb1defa
 EBUILD fuse-overlayfs-1.1.1.ebuild 557 BLAKE2B 3c520126b339c8666d0f4b4c1443bef31352a9c1e0d77044ad38984f33aac5a3998d57941e2896a87be27a058a795acf4d5940b31efa31f99c2e3c111e0149aa SHA512 c72c29f1f5d8b269e4a3cff1440b76e8d02e7aa38f9418c628de67fab768729da6ce8e898f251085d836122b08d432721cd83a7f85604fcfe4db24387eb1defa
+EBUILD fuse-overlayfs-1.1.2.ebuild 557 BLAKE2B 3c520126b339c8666d0f4b4c1443bef31352a9c1e0d77044ad38984f33aac5a3998d57941e2896a87be27a058a795acf4d5940b31efa31f99c2e3c111e0149aa SHA512 c72c29f1f5d8b269e4a3cff1440b76e8d02e7aa38f9418c628de67fab768729da6ce8e898f251085d836122b08d432721cd83a7f85604fcfe4db24387eb1defa
 MISC metadata.xml 334 BLAKE2B d159a1336d5c016f97f854c7dc8267a7df63d9352fc81670d09fb436aa1267c842a466bbe026443a57c3e910c927f361d0ad25e9785ea785e522500c966beca0 SHA512 c91863d890e5145d3e05d247455ee2d0bda70525dfbc15632e11df75ccdd40bdb0dca17b41d3f8485ad1768cf401915ada074ee05f739d74df93d440785b6fd5
diff --git a/sys-fs/fuse-overlayfs/fuse-overlayfs-1.1.2.ebuild b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.1.2.ebuild
new file mode 100644
index 000000000000..d594f97bb55f
--- /dev/null
+++ b/sys-fs/fuse-overlayfs/fuse-overlayfs-1.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="FUSE implementation for overlayfs"
+HOMEPAGE="https://github.com/containers/fuse-overlayfs"
+EGIT_COMMIT="v${PV}"
+SRC_URI="https://github.com/containers/fuse-overlayfs/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+RDEPEND=">=sys-fs/fuse-3:="
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}-${EGIT_COMMIT#v}"
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index eeda29824fb7..9a6ae17a8b85 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.9.tar.gz 1813177 BLAKE2B 9e9141380bda46eb0bcce325c6fd293fe3844fe884a4952bb38d4b89dc48b728ffcc891038b3a7a861f05acfacce9dd7bb0e11d600609f3ad0ab278ccbe98847 SHA512 3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2
 DIST fuse-3.9.1.tar.xz 1595308 BLAKE2B 3b1d5c8ac99e96183581d034889d8d6cab8feeee26cafd765dc4ab2cbeb655b3b162836c960ceacf08cd458bec2daaf0474877c9611ef6a6543795e4971ddc12 SHA512 295bb62274264789c977a1fee78c6c122a2f227ae85d750b8519cafbdcf6551499b77cf021d83cc8261831e29761c166d84a4e50bdebb4191c76bcad1d15d329
 DIST fuse-3.9.2.tar.xz 1674292 BLAKE2B 42d796802d3ce2e072120153b695d1e64d160695714c58ffba7859281bfa2c1ff3d9f95b92a38c1a5443abe5a8468f0d9d285845b97a444ae1b64bf750e234ae SHA512 47795d2e0431c93ff36609247016a5ddfa631e4dcdc56cb579030bdb78497e3fa2db28b0cbadd0848024be39381c54f8441de28b0af51f8b800519e76c7af9ed
+DIST fuse-3.9.3.tar.xz 1805676 BLAKE2B 907806f8799ce70f07d65e08a058709901bafa0fbfa098d3e66f9913f08b1d5f3e35a099f84832f221b5aa8681f69d8291f2a20967acdc8f0b7b0b72c2ae414b SHA512 e4a4bfbc276b1d676211d93878b487c5946f54e8811e929fad4ff32de1f64e0c4e762d33c43e3a04afae538f41efe8d29221f45340ccd74f0055f644802f3e26
 EBUILD fuse-2.9.9-r1.ebuild 2070 BLAKE2B 2946ac81c95dbb8cc329247aaf0f123a45475113028b8d79a845ae71388d3fd639c1c660c784284436fc4f603a7a248f33f19687569fde508929f16ac9168822 SHA512 d005e464d34b1a0edb69c795440c56d74c2147cb04403f8067987964ae243bb122adcbacd6f330dd53ed0cd058fdaee2ca4642dd711dfb559903b30364927fde
 EBUILD fuse-3.9.1.ebuild 1951 BLAKE2B d77d30f658b18676242b9f12240da45cd10a6e320592dc8c742febcfd9ce046fe2a92fd89c1d7e4c01da5ed89cbcaa24550a7eb1a7475e9a1c6515b877886722 SHA512 a4e79858f9f94df3e7494eb79270246c6fd64c87e68974e960d661a6056b4acdd0990cd8faa0cf0f2e9703e87a7732acb27bf1f604949d23a1b44654fca53e15
 EBUILD fuse-3.9.2.ebuild 1959 BLAKE2B 9031d363fe452bd0daa3ae880b2026db1c58ca1a2547e486351f0121fa56f777cc681af5c5f8d32879e87b1832027c67cd112f57659312f6a02daa20c4ecd083 SHA512 dc61b7ad3b936d6d298c51bfca3bcfccc0da77e5d41eba9acae04a06a24195adb1d2b7e6eee7e4ff6d9da60f89e69fedc232fe543ee46f6a5577bb19971d0962
+EBUILD fuse-3.9.3.ebuild 1959 BLAKE2B 9031d363fe452bd0daa3ae880b2026db1c58ca1a2547e486351f0121fa56f777cc681af5c5f8d32879e87b1832027c67cd112f57659312f6a02daa20c4ecd083 SHA512 dc61b7ad3b936d6d298c51bfca3bcfccc0da77e5d41eba9acae04a06a24195adb1d2b7e6eee7e4ff6d9da60f89e69fedc232fe543ee46f6a5577bb19971d0962
 MISC metadata.xml 461 BLAKE2B 5886a41fed2f941b52933f1b2b83f7a6dfaf20a34721862a8ede36b573b6de79b3ac30fe25bf46e39047bf3d67b35bd44ae9747eccf566aa4d81f8bdee3d3a11 SHA512 66c7c7e08946aa12f78d09162654cb3da545a273e1a846b66a745bdb1767384c07bee4c8eccafce1615192d50cf783bddffcfd38783cc379afbae94a0b47e568
diff --git a/sys-fs/fuse/fuse-3.9.3.ebuild b/sys-fs/fuse/fuse-3.9.3.ebuild
new file mode 100644
index 000000000000..a858b29b4ecb
--- /dev/null
+++ b/sys-fs/fuse/fuse-3.9.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7,8} )
+
+inherit meson multilib-minimal flag-o-matic udev python-any-r1
+
+DESCRIPTION="An interface for filesystems implemented in userspace"
+HOMEPAGE="https://github.com/libfuse/libfuse"
+SRC_URI="https://github.com/libfuse/libfuse/releases/download/${P}/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="+suid test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig
+	test? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
+	)"
+RDEPEND=">=sys-fs/fuse-common-3.3.0-r1"
+
+DOCS=( AUTHORS ChangeLog.rst README.md doc/README.NFS doc/kernel.txt )
+
+python_check_deps() {
+	has_version -b "dev-python/pytest[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python_setup
+}
+
+src_prepare() {
+	default
+
+	# lto not supported yet -- https://github.com/libfuse/libfuse/issues/198
+	filter-flags '-flto*'
+}
+
+multilib_src_configure() {
+	local emesonargs=(
+		-Dexamples=$(usex test true false)
+		-Duseroot=false
+		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
+	)
+	meson_src_configure
+}
+
+multilib_src_compile() {
+	eninja
+}
+
+src_test() {
+	if [[ ${EUID} != 0 ]]; then
+		ewarn "Running as non-root user, skipping tests"
+	elif has sandbox ${FEATURES}; then
+		ewarn "Sandbox enabled, skipping tests"
+	else
+		multilib-minimal_src_test
+	fi
+}
+
+multilib_src_test() {
+	${EPYTHON} -m pytest test || die
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	# installed via fuse-common
+	rm -r "${ED}"/{etc,$(get_udevdir)} || die
+
+	# useroot=false prevents the build system from doing this.
+	use suid && fperms u+s /usr/bin/fusermount3
+
+	# manually install man pages to respect compression
+	rm -r "${ED}"/usr/share/man || die
+	doman doc/{fusermount3.1,mount.fuse3.8}
+}
diff --git a/sys-fs/fuseiso/Manifest b/sys-fs/fuseiso/Manifest
index 5456aed72557..576f33370664 100644
--- a/sys-fs/fuseiso/Manifest
+++ b/sys-fs/fuseiso/Manifest
@@ -1,5 +1,7 @@
+AUX fuseiso-20070708-CVE-2015-8837.patch 1480 BLAKE2B 53eb28eb86b963963631955f5b402fdf48b34111278634953a41228ef0b56cc2668deb86b18e9f837261ce3fa7a2b539425070304be8e318e2aa220e9cc8f211 SHA512 3bf7e2b199d0521de8eabda9db9dc6ac64ed6356ab675c0d7ca1264a37f57b19a86a79ed2dd471d90b80d033207ce870b56020e0f0408854edb60c6af18595ff
 AUX fuseiso-20070708-fix-typo.patch 683 BLAKE2B a6467bc243f7dcf37e843ccbdc044b05b94458fd3324a359793267008f144cc2514e379b713c4d0571afafe621f1455c321b94083d760e49cdbeb0eed79e8091 SHA512 ccfbcdba2c81d834d658f399f378feb6fec9d920c0fcc5cce3cd744f26cb94708a739c34e9e7cc374d31920a84bc6fbcc5b3ff841ee0d352de96a90cdc7c266e
+AUX fuseiso-20070708-integer-overflow.patch 721 BLAKE2B 1ae8dcde6d4618a6da264ffe072d0e8273fe0de2eb4afc03a6decad683caa728f70a208ff646e3bb84cb81b16b838bdafb1325d8b5c3a2804c6ba974e787281c SHA512 61a2ce687eb6a88f1e07398df08eb360167826f70d97570a89a67a3c263e37661ed9664173b2df36db0b6a25533cddcd53efa706f89be7bbb73fe2a821d4580e
 AUX fuseiso-20070708-largeiso.patch 2583 BLAKE2B 90374aca589c81aa760301c1fbd98bc1199c8d69d20d26f42d343ca80e17f3656b5c1b5dd5c7088d4e2f242e536db6726f6d3a44f712f78fa7472c114af63f56 SHA512 f3268473d771de520f80d6ccdc6147fdc0c250f4b28070b7cb7b75734b893431ee3e20c46acb54f51f177c2e60f554c5ae8c2e3a514aa97a4208f514512be9cf
 DIST fuseiso-20070708.tar.bz2 239960 BLAKE2B b794d7381d707c42ad8082c999ba2702d76b4b37971e9cad37ccf80657a68e0d4aa5a6b8628c324e81b7fe0c031d91398c82c3d5f40ee0ed12711ef5d7cad1f6 SHA512 d9d8153101494434fe4ec9c684cec46a1eee46fd3ce06e97fa27f4746990f866e1f23f256b2659e60296d2362cea05d259a0a2ef669ecddf7a0a7e44110c4ae0
-EBUILD fuseiso-20070708-r2.ebuild 596 BLAKE2B 46b709c6aac399c06335e04d2833c6470282e1bc4620b1f2ccfc7c8e5052ac48c3fd8f43f67355fdd4372cbaaf061b47e428ae7b7a7156ec4e5914b54d790e1e SHA512 877c0dcd58a31a9e8f482ac610fc31696352335d8520c811e5eda7ecc3a13c18f07953c71c361e6b1603562f606009ef779b3529dfca0741ab6aae8190e892d9
-MISC metadata.xml 420 BLAKE2B ab7884f79bd4e597cb7cd131ffa708353fbebc814578bcfedeb1d16bfd9b28163e1b66455b325ee7c2e811febca207568a376166d6d91b46e7aabf43ae3344ef SHA512 03659deebcb170d3144010e020528bf2ab8fc946f324a70da5b68db30d0ce89864b355abc358287ee01b3758d3495c246bc102e2a0d61fc54e8c549dad9228e6
+EBUILD fuseiso-20070708-r3.ebuild 667 BLAKE2B d490108be3b3132cf64bf4482ecd9940dee6b6d8374684c084ac5e031cddef90d63cfa9ead2004d4bbc81964638d4d73d85d87eda2b8fcf9f0f4266f4bbe4379 SHA512 32a1299f5cd439bb4a733284138a37099de09c18a5a63e67e3be16b3d8656f29a44cb4d4b11e390f7c6176680f0da2217bf1829a71540ebecc9846a339fc3e92
+MISC metadata.xml 244 BLAKE2B b8fe725610fb85711c3dcae43435062521d9102cf3f87cef36d2f0decff44f0d769ab8bd6fb9ecf610ab6d130aa74568f1d9a9649b7f7374094960971782b466 SHA512 386ec4723a0de60b693f2bc258b75e05be36b2809d93b637cde00f484deafb235b8b1d359b940321ddcf3947bc091e1c3a60cece5c7d57418fbeeb126b02e178
diff --git a/sys-fs/fuseiso/files/fuseiso-20070708-CVE-2015-8837.patch b/sys-fs/fuseiso/files/fuseiso-20070708-CVE-2015-8837.patch
new file mode 100644
index 000000000000..a5ab828ee637
--- /dev/null
+++ b/sys-fs/fuseiso/files/fuseiso-20070708-CVE-2015-8837.patch
@@ -0,0 +1,38 @@
+https://sources.debian.org/patches/fuseiso/20070708-3.2/02-prevent-buffer-overflow.patch/
+https://bugs.gentoo.org/713328
+----
+Description: Prevent stack-based buffer overflow on too-long path names
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+--- a/src/isofs.c
++++ b/src/isofs.c
+@@ -1532,13 +1532,23 @@
+             if(path[1] != '\0') { // not root dir
+                 strcat(absolute_entry, "/");
+             };
+-            strcat(absolute_entry, entry);
+-            if(g_hash_table_lookup(lookup_table, absolute_entry)) {
+-                // already in lookup cache
++
++            if(strlen(absolute_entry) + strlen(entry) <= PATH_MAX-1) {
++                strcat(absolute_entry, entry);
++                if(g_hash_table_lookup(lookup_table, absolute_entry)) {
++                    // already in lookup cache
++                    isofs_free_inode(inode);
++                } else {
++                    g_hash_table_insert(lookup_table, g_strdup(absolute_entry), inode);
++                };
++            }
++            else {
++                printf("readdir: absolute path name for entry '%s' exceeding PATH_MAX (%d)\n", entry, PATH_MAX);
+                 isofs_free_inode(inode);
+-            } else {
+-                g_hash_table_insert(lookup_table, g_strdup(absolute_entry), inode);
+-            };
++                free(buf);
++                free(entry);
++                return -EIO;
++            }
+             
+             free(entry);
+             
diff --git a/sys-fs/fuseiso/files/fuseiso-20070708-integer-overflow.patch b/sys-fs/fuseiso/files/fuseiso-20070708-integer-overflow.patch
new file mode 100644
index 000000000000..9f20b9b8c51e
--- /dev/null
+++ b/sys-fs/fuseiso/files/fuseiso-20070708-integer-overflow.patch
@@ -0,0 +1,19 @@
+https://sources.debian.org/patches/fuseiso/20070708-3.2/03-prevent-integer-overflow.patch/
+https://bugs.gentoo.org/713328
+----
+Description: Prevent integer overflow in ZISO code
+Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
+--- a/src/isofs.c
++++ b/src/isofs.c
+@@ -1618,6 +1618,10 @@
+ };
+ 
+ static int isofs_real_read_zf(isofs_inode *inode, char *out_buf, size_t size, off_t offset) {
++    if( inode->zf_block_shift > 17 ) {
++        fprintf(stderr, "isofs_real_read_zf: can't handle ZF block size of 2^%d\n", inode->zf_block_shift);
++        return -EIO;
++    }
+     int zf_block_size = 1 << inode->zf_block_shift;
+     int zf_start = offset / zf_block_size;
+     int zf_end = (offset + size) / zf_block_size;
diff --git a/sys-fs/fuseiso/fuseiso-20070708-r2.ebuild b/sys-fs/fuseiso/fuseiso-20070708-r3.ebuild
index e5d22bb4de7c..4ac8844af9f9 100644
--- a/sys-fs/fuseiso/fuseiso-20070708-r2.ebuild
+++ b/sys-fs/fuseiso/fuseiso-20070708-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="Fuse module to mount ISO9660"
 HOMEPAGE="https://sourceforge.net/projects/fuseiso"
-SRC_URI="http://superb-dca2.dl.sourceforge.net/project/fuseiso/fuseiso/20070708/fuseiso-20070708.tar.bz2"
+SRC_URI="http://superb-dca2.dl.sourceforge.net/project/${PN}/${PN}/${PV}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,4 +19,10 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 DOCS=( AUTHORS ChangeLog NEWS README )
-PATCHES=( ${FILESDIR}/${P}-largeiso.patch ${FILESDIR}/${P}-fix-typo.patch )
+
+PATCHES=(
+	"${FILESDIR}/${P}-largeiso.patch"
+	"${FILESDIR}/${P}-fix-typo.patch"
+	"${FILESDIR}/${P}-CVE-2015-8837.patch"
+	"${FILESDIR}/${P}-integer-overflow.patch"
+)
diff --git a/sys-fs/fuseiso/metadata.xml b/sys-fs/fuseiso/metadata.xml
index 220254c786eb..409729bbcacb 100644
--- a/sys-fs/fuseiso/metadata.xml
+++ b/sys-fs/fuseiso/metadata.xml
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>zhaoxiaoqiang007@gmail.com</email>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="sourceforge">fuseiso</remote-id>
 	</upstream>
diff --git a/sys-fs/go-mtpfs/Manifest b/sys-fs/go-mtpfs/Manifest
index b322bb0fd3ed..dd3d40c75e58 100644
--- a/sys-fs/go-mtpfs/Manifest
+++ b/sys-fs/go-mtpfs/Manifest
@@ -1,2 +1,19 @@
-EBUILD go-mtpfs-9999.ebuild 1062 BLAKE2B 6266c7ae1faee17352191fc084b24f35ae2b43785cede29d378027e2bb627186c96f5acecd646e8889260f95c2748f0f87a24477469006f37cd07f33e2da465e SHA512 4865c4c9d0c3e62cc9e4aef2b071e823385842228b5626dd474357e9f9dec9738243c5d25e326235904c0f23bfa49a45db7ec5a502549fc0ce73b1bb060cc284
-MISC metadata.xml 327 BLAKE2B 13b5d5548bdfdfa4565f56fc4cfa0644275b0ba9e95129fde3eaeee06e5ccb51c292f918031dee6829213fa31991ed94c04b4e32780df835605cb9aa517af1bd SHA512 a8debf10dfbec6f73b80abede368c00dd5d20f319edc28ae5264400fe4916c9a4150c134a68757e007d309222f2051ce66cb36d12be181f7d65e954725db2d66
+DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv0.0.0-20190726130028-2f298055551b.mod 165 BLAKE2B 3c00585dfae81a1d3f411bc0bd8f24ed6837fbba75b567195ba611cec746bcc3b560fd2dbef2264d80ba6927af0a822d032356f2b5697012fbd41d43faf24041 SHA512 cb39e8ee3d11d09445bfd47e68c819b0aee04a5616967354833b6d5ae08611199050ee86e3165ae22b03bd85fe8d82985a2f19e515d60145fdca12154eb45ce7
+DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv0.0.0-20190726130028-2f298055551b.zip 296527 BLAKE2B 13b839fed2e680244d4cdb7afd78e8a7d79c9a4d167c9bbd09108bc18c74f0c136d1819e6d4eadfe66591c0e81caef4f6c150c92e2358cc35f6ff341e39e91c9 SHA512 012aa7ea118dd1d627869257d4dd2c0ba40108a0704b908a8b1c6737c67fe305b99e0e214653d9f8352e031c84b10b3846f4404b0b0adbbfcfc1c1e05e9d38cd
+DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.mod 94 BLAKE2B 36f3fb449d60fd88b98ab51277603a6c6aa551a1b15fc01ec289506cbb22fca2d7bc2841dd8574c9cdcc5ef14d70aacd5eecd240060b396c76422326f5e5dcea SHA512 a4ec6bdb7df5b5706be0a19144023042cce1fe54d1fe23d2556fcf1c23fadc112f5c4f16d6b497ab0ddf595fb21550543e65ace43a147747d894c220da346ce2
+DIST github.com%2Fhanwen%2Fgo-fuse%2F@v%2Fv1.0.0.zip 219180 BLAKE2B 8b80ef3028be429c025c8b75aaae686cac7fcbd0d6b196311dc77c1079a5c8db5b8b2db602282345bb0fd25037669b00796e7a92a40cfc42a79cd299ebe0940d SHA512 b5a5bea977945d4305b3506e5a6f96d1acce91280e103f1c88f3b2c072437d5bbf84b8ef8760ae073106156342356a763ef0db9339b6e2c72002a73f8187ebf6
+DIST github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.0.1.mod 168 BLAKE2B 0f0c27a9f98a7622d1549ab708bd4fbc12cf7f8e2d5e488a77524d94f105647a4d7125505a45287845e7d557a053462ace845f9244841954b534b31238ce0517 SHA512 3698021f166b89bbe92497f3b278a4683270f6e4887777837bb02f03ca6ece642abcb70bebf5b437bd71a90b0471930654069b83185ba15bac3318b854d0a033
+DIST github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.0.1.zip 286729 BLAKE2B 3a268b05391216041ae50fab09a3a765b0b811b0f05f625c206d114c0feeec4058509616a1a31fbf03dae862baf5565b0234a3da180667f8b9bd0154995504f3 SHA512 cb0b4e22297d390795dc88323c8d71847760a027c5f168b59861b3bb03de5789bae466511b861c809c16b34c6659e2d7f72b36c768af85b0055ee62a48606061
+DIST github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.0.2.mod 202 BLAKE2B 4f6833004dcb52b6d482749e2c5fb9b1be9bb40ae7f46beeee6b6eb026d39e6bddb92b9a99b32735ec1e42f3402f322fea96dc6e46a186719bbf908662e48ced SHA512 d2559ce7fd11ed7e5398e960b7c19038ec9cd2f322886c64d4967580d8fbe7b6d3e9da244c29f0cc080a192fd84bb508b75f29597ef4e09621acafb0e592657d
+DIST github.com%2Fhanwen%2Fgo-fuse%2Fv2%2F@v%2Fv2.0.2.zip 287139 BLAKE2B c67d884c8cbd25a2dccac55dcd3b55fb34b8e07cd517ddd20fac33c5c5c66f466aa44f8b59acc92f39c344cefbe3080596a622925235975aecb3d33bdb5c72d0 SHA512 cd2dcc27bd09fdece5c55ffd946a14e22f3a426a094c8b5e05e3bb5e6e359775304772fa7859f55f2dc1bd0e13d3024a8d3537d1abc00d371f0491bf876bc316
+DIST github.com%2Fhanwen%2Fusb%2F@v%2Fv0.0.0-20141217151552-69aee4530ac7.mod 29 BLAKE2B fa81f7ee7eb868c49bfb7b8c6a527f2c9cf05f28a5322692b916ca755eea0255dcc640963dd002980d09145529a3e56dd6eaa6e714c2268c43b7ae19e17237aa SHA512 73bf0e1253c776a05d7518e4da2c74fc003f3b4a002303d64e1adea08ab157bd161651e647e2415603d5aa400eb12b0bde12ae7786755ea3a3448976f2aac416
+DIST github.com%2Fhanwen%2Fusb%2F@v%2Fv0.0.0-20141217151552-69aee4530ac7.zip 9353 BLAKE2B c00ec955841381512696975ae88f2925d7b81e46b21712e05459a14649130a48cb7ccd8e4daef8094eb3d5d5eb2687c996e7f15a7a678b0d216e37a81229cded SHA512 3ea8f1a5e7b1b03950721a22f89f3c6faa6acac01fca473bfe9b183d9c17fa90dc12cd54ab043534147fc88a3588b6fe2b4e6a994d6148394ee12000f7614d15
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv0.0.0-20170820004349-d65d576e9348.mod 37 BLAKE2B 0ff43371511295cc3819b33c0dc26e3d9352a4b931ad3dabdf79561e5ee077ddfdaf5a601827246c0b5cd8992d53d47ef74aab0b7deac6d08ef5f60f44a728ff SHA512 60a202487e693d925ec13186a89ca6b7f322cf53b2bb3d8657d50a0fa0561ef9f2d8416901478fa9783b7a44774511486fcc8735b1d15b558f7ce111f53d5a27
+DIST github.com%2Fkylelemons%2Fgodebug%2F@v%2Fv1.1.0.mod 46 BLAKE2B 1989fd1b186328abc02f8dcd503bf396ee63b55630d3f37f576c7e55b4c48623f62d5f2b16d047afeaa13cd423ab014f254df5f210da52535bb8818a60b375d4 SHA512 4fcffc595708aba2673e895182e695e91d6d239f8feaaaeaf15d75fcff398112af0f0d5ebdb28506d95eae30533dcbb54112ac0b0a4034ee11d7a35b78674915
+DIST go-mtpfs-1.0.0.tar.gz 44589 BLAKE2B 2c5f0c30ae16fb9ded1e2ad405de94cbb7ca598b9c9681dcb2eaf811438c1040b8989afb2102cc97402415accf8e08e76362f697f049b37ae95a718187875154 SHA512 b66d4f3179f95a7137cdc921fc171a260d23c4d003bd680b92791b6aab79484c75dd3a5ec39129d42b52822b95711f98438900033da4aedecc7c6dc5e0f6a834
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20180830151530-49385e6e1522.zip 1346335 BLAKE2B e51789de19eef04b939952b15828675a0ed71c7f7639355cc529ea02e9177a2c2a9f1350567fb514d8d7d6641ccc231dff1920d72c98b1e335eb76c636b3eb67 SHA512 fdb5d6f6f46feb491048048cf76ae94af824664e9f424f5c0fa2938b64bc8bd6ec810cd33bd3b34bf1d3e03bca7e8f067fb8487bb45ce791cf56ed002dc63d1c
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
+DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190826190057-c7b8b68b1456.zip 1818872 BLAKE2B f8bb456d6c12b800b7a572f686788454dc81f4f65f61d2f5f7986e936a7dcd4a57417137df2ff16d229adafe2a2daddd9622cb558454648419fbf293857a0382 SHA512 15544b523ad8b302ab9f9fffaf971decb598f3f7789296125523638d5ebb56218312ba2b0d7d43dd8e786ffb761b012d957c8f123dcdcec8c967bb28a544f84d
+EBUILD go-mtpfs-1.0.0.ebuild 1779 BLAKE2B 7c660991b78dd23c070b1cf33ae3bb00d803622c9819e53e3865972deee998b55d0d8130fe2a6f097b0447e8eec56ffb157f14b995a8b1b82241b3d8b23272c3 SHA512 7dfc82558ffe089bae6ebc8976689aad748787df666e54c761c06d10d08c5ab47823653b24472bfa74263a4f7b9b03daa5b82f18197078f494d3792e529d2bde
+MISC metadata.xml 328 BLAKE2B a2f7d3acc2a10d3b3049c66e615e957f75cf033722cabeb52a3db3b4374986e800a638b3cbc50c0ecdb7a0ec0dee67728621a0e30c4112d83c4860d7f86dac1a SHA512 4b091e497a102bbf1f9ff2a03b3c3740613decf8f3ffb50ed6eb11e868ec604b471a3f30d317760a035678c40a20947add4387baf244339b15bc2e7b7a065431
diff --git a/sys-fs/go-mtpfs/go-mtpfs-1.0.0.ebuild b/sys-fs/go-mtpfs/go-mtpfs-1.0.0.ebuild
new file mode 100644
index 000000000000..3d539c5fa7ff
--- /dev/null
+++ b/sys-fs/go-mtpfs/go-mtpfs-1.0.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit go-module
+
+DESCRIPTION="a simple FUSE filesystem for mounting Android devices as a MTP device"
+HOMEPAGE="https://github.com/hanwen/go-mtpfs"
+
+EGO_SUM=(
+	"github.com/hanwen/go-fuse v0.0.0-20190726130028-2f298055551b"
+	"github.com/hanwen/go-fuse v0.0.0-20190726130028-2f298055551b/go.mod"
+	"github.com/hanwen/go-fuse v1.0.0"
+	"github.com/hanwen/go-fuse v1.0.0/go.mod"
+	"github.com/hanwen/go-fuse/v2 v2.0.1"
+	"github.com/hanwen/go-fuse/v2 v2.0.1/go.mod"
+	"github.com/hanwen/go-fuse/v2 v2.0.2"
+	"github.com/hanwen/go-fuse/v2 v2.0.2/go.mod"
+	"github.com/hanwen/usb v0.0.0-20141217151552-69aee4530ac7"
+	"github.com/hanwen/usb v0.0.0-20141217151552-69aee4530ac7/go.mod"
+	"github.com/kylelemons/godebug v0.0.0-20170820004349-d65d576e9348/go.mod"
+	"github.com/kylelemons/godebug v1.1.0/go.mod"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522"
+	"golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456"
+	"golang.org/x/sys v0.0.0-20190826190057-c7b8b68b1456/go.mod"
+	)
+go-module_set_globals
+SRC_URI="https://github.com/hanwen/go-mtpfs/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+COMMON_DEPEND="virtual/libusb:1
+		virtual/udev"
+DEPEND="${COMMON_DEPEND}
+	media-libs/libmtp"
+RDEPEND="${COMMON_DEPEND}"
+
+#Tests require a connected mtp device
+RESTRICT+=" test"
+
+src_compile() {
+	go build -ldflags '-extldflags=-fno-PIC' . || die
+}
+
+src_test() {
+	go test -ldflags '-extldflags=-fno-PIC' fs || die
+	go test -ldflags '-extldflags=-fno-PIC' usb || die
+	go test -ldflags '-extldflags=-fno-PIC' mtp || die
+}
+
+src_install() {
+	dobin go-mtpfs
+dodoc README.md
+}
diff --git a/sys-fs/go-mtpfs/go-mtpfs-9999.ebuild b/sys-fs/go-mtpfs/go-mtpfs-9999.ebuild
deleted file mode 100644
index 79178eb3ff39..000000000000
--- a/sys-fs/go-mtpfs/go-mtpfs-9999.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit git-r3 flag-o-matic toolchain-funcs
-
-DESCRIPTION="a simple FUSE filesystem for mounting Android devices as a MTP device"
-HOMEPAGE="https://github.com/hanwen/go-mtpfs"
-EGIT_REPO_URI="https://github.com/hanwen/go-mtpfs.git"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS=""
-IUSE=""
-
-COMMON_DEPEND="virtual/libusb
-		virtual/udev"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/go-fuse
-	dev-libs/go-usb
-	dev-lang/go
-	media-libs/libmtp"
-
-RDEPEND="${COMMON_DEPEND}"
-
-#Tests require a connected mtp device
-RESTRICT="test"
-
-GO_PN="github.com/hanwen/${PN}"
-EGIT_CHECKOUT_DIR="${S}/src/${GO_PN}"
-QA_FLAGS_IGNORED=usr/bin/go-mtpfs
-
-export GOPATH="${S}"
-
-src_compile() {
-	go build -ldflags '-extldflags=-fno-PIC' -v -x -work ${GO_PN} || die
-}
-
-src_test() {
-	go test -ldflags '-extldflags=-fno-PIC' ${GO_PN}/fs || die
-	go test -ldflags '-extldflags=-fno-PIC' ${GO_PN}/usb || die
-	go test -ldflags '-extldflags=-fno-PIC' ${GO_PN}/mtp || die
-}
-
-src_install() {
-	dobin go-mtpfs
-}
diff --git a/sys-fs/go-mtpfs/metadata.xml b/sys-fs/go-mtpfs/metadata.xml
index dc1d6c77a19c..177b4a353a50 100644
--- a/sys-fs/go-mtpfs/metadata.xml
+++ b/sys-fs/go-mtpfs/metadata.xml
@@ -2,8 +2,8 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>zerochaos@gentoo.org</email>
-		<name>Rick Farina</name>
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
 	</maintainer>
 	<upstream>
 		<remote-id type="github">hanwen/go-mtpfs</remote-id>
diff --git a/sys-fs/growpart/Manifest b/sys-fs/growpart/Manifest
index 52cab72af87a..d785a3f2fb93 100644
--- a/sys-fs/growpart/Manifest
+++ b/sys-fs/growpart/Manifest
@@ -1,5 +1,5 @@
 DIST growpart-0.0.1.gz 7731 BLAKE2B 187a532f87a0c5caefb4877e9a629e154e75f857299cb92ecad049d54467b1181d3e2bb348bd70af86d6eb4db518ebeeca6cb7b45fb628ec5dc07e1132a7b361 SHA512 84645e68f8ee913740333d3dca097e1322d74c99020af7205f6f4c2527469a2fbb4cbc3fe69bda7e19b5758897e9e6a09b17a4d1fb1f2934bf7c45186156eae9
 DIST growpart-0.0.30.gz 7897 BLAKE2B b8f28615578c1b19a7cd2eff9cb60c37929c2d3767d9f98b07b1040f7f5d2687f41ed051b9899573119b4de9c2e04dcb91d76fc70fcff7a6e6dde0335959681f SHA512 ed6cf92149c0802c4a08427fa025ce2666dd7c32c5d1f362f4d14973f709dfd73124fd85b7eaf179daad5dfb1d126e86d7db0fb1fe7e2d496e17bf0bc1bc9c58
 EBUILD growpart-0.0.1.ebuild 504 BLAKE2B fcc63c7029c1ece4878609248046e5dc82e00427dbdeb885888bee281f6f94a0b9f253e7dbf4ccaeb57652312021767385c856ee21c1d5e8d0610a6f90b509c5 SHA512 3f4bf22da670ed117992c1ae8ea32f54633f4ba5fc1c849b58c1c9fe4abe89c49617102a027d4581214dc96bde2d74c80645836a72e9e3c26a63847d1b5ee3c7
-EBUILD growpart-0.0.30.ebuild 509 BLAKE2B 73c9fb12931b18a5b3aaf205198214e11c48174a9280796c4e5f2517431af619d9a1d6b4b2679ebf70120b34be7df1d4f84d78ddd1e3cef2c61bdfc0da3b1863 SHA512 5bfedfdd4f8373ea77e969432caf5ae798ded477bc26fc44d0a7a448aaec17806b6f5271b3d6ecfea5def85005c129188d13c8a3991d22a8beb54c43b3639a1a
+EBUILD growpart-0.0.30.ebuild 512 BLAKE2B b9121f0240fb8b2eee6cf9e2b33ab2e678610a74c1bd295e06096b52b38d654cea9d82212a330cc48a1eafcb6350c546ccaca93f16710b226469fa6e7e28a6f8 SHA512 14148542f813a66c27c9a5b3fe5b2e3cc9a0a2fc1db0b773e9b091d8135a543023acd05a5e173fe43d9c42d0503b6dc2b4ffe667784a030c9c479d33ad6fafea
 MISC metadata.xml 330 BLAKE2B d3ec3cf8acc79aef659e1818315a7e1c94b15cc3e75cbc7acc605a78350ad93cf20dbbf7c2ffb5a819cb8b6f09f83e380407d943bea3accd09fba665e47a970a SHA512 dc5e3efe296cfb0fd207d93ba4279d325fe50f52d9aa932a57d0cb0eb9bdc3a46c0d46be76115bcfe1db74f55c87a195c1a21b71f92b6b5a3b707577a54366e9
diff --git a/sys-fs/growpart/growpart-0.0.30.ebuild b/sys-fs/growpart/growpart-0.0.30.ebuild
index 1c3c31db971e..2d7de159d565 100644
--- a/sys-fs/growpart/growpart-0.0.30.ebuild
+++ b/sys-fs/growpart/growpart-0.0.30.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
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ppc64 x86"
+KEYWORDS="amd64 arm64 ppc64 x86"
 IUSE=""
 
 DEPEND=""
diff --git a/sys-fs/jfsutils/Manifest b/sys-fs/jfsutils/Manifest
index 7218b3628c18..bcc8c804fd17 100644
--- a/sys-fs/jfsutils/Manifest
+++ b/sys-fs/jfsutils/Manifest
@@ -1,5 +1,8 @@
+AUX jfsutils-1.1.15-check-for-ar.patch 207 BLAKE2B 52f709e4ddf5899245fe3cb2485124672ae7549f2fa9d39e5dc8eef1a5e5fe8f8accfddaab96b0502b19c3dc4119cb76602fff384c3a03604c7330098d52e3f3 SHA512 2596252cccc0c5cc3f570949c26d6b7dad0889e9afa0713276daf996141a184e1ac9f36e4875f5f95096d01628ba87989b7a1a0ccdaa333c8a38bf36100f0f90
+AUX jfsutils-1.1.15-format-security-errors.patch 1057 BLAKE2B c5283e945fe5db2fdc87f35c21adb5d7135f04a80e3dd8f4a9ea29ce44a58ec718e7aa8334bcda0c42a5ae764242442fc41fa91aba004904e0cf7804a1851122 SHA512 10e0baed287338826e3ba5c73aa4f16e55892390e252d2874de9e39b5bcb63ff18cc6019af36de64bece5dd2c6c04566bb8a3a5bd6d2656da9b9f116dcce02d2
+AUX jfsutils-1.1.15-gcc10.patch 2015 BLAKE2B 58accef19b804367f6801724a443e9eefd3bd18f74653486ea178b4d97c358c894f4eeb87380408f5e12c998d9462520cb124a63c38c3c4880155a634a8f00bb SHA512 e1804d55afd57a758247902e0e31f93406712e9ce42541b88e7c1126b949eb46ca44f47f191f032225cd57b01736296bfbb72034ad49fc18d5ad6e57050fd0f2
 AUX jfsutils-1.1.15-linux-headers.patch 318 BLAKE2B c04fc414526ed854ed9fd0ac6cd8c1874c924e4446ade2ec85eec2ccbdd8a9c6f580fe6b4b91e61050a468855c46082f2373de08246640362ab81b8e74199cad SHA512 1fd097f403e0ffd434b433fcbf20664166b7ed9b9878f81719d45747fc96249ebac25f8afc9f1f6e532bfac90fe98f1474bb616da3c83fd69cc57d2fe3c11815
 AUX jfsutils-1.1.15-sysmacros.patch 276 BLAKE2B 5c45f4bfc1a03843f59d715bf1c837f33a455e74508b82360c7f77ecd19205e23bc53f445e1bb8c03ca5e88d210685e0dc0ac28f8dfa3eb0b88c4347888e94fd SHA512 3f6472cdfc706e32cc2cefdf673450cb98e81c24c16dea47cacd95f83d75461c8750a9f4dc73ac30782d91e2b7814efdc7e736ef30bffb6cc8ceaf6dba8d51d5
 DIST jfsutils-1.1.15.tar.gz 539148 BLAKE2B 8fe3b4b157482311e7afd938b0d7d22af62a4d342c5d0e6527fc04a90ecc3a5b80de226a4faec582b17bb5a5f10371ab8e0f87e72dc5e1211a0b79180cc5a952 SHA512 fa8ba7f4997471da3e6ea7239564f3395046222cfbb2b10e37b24ad0bd107b7eadbb51ce328d89d193034360b4035ca5e0e5b0b416a74483d7a2c0a2b9c65858
-EBUILD jfsutils-1.1.15.ebuild 903 BLAKE2B 61e1f3983e44f0a39d2f75b00e2204c471cd46bdce3d00c62312ee2dbb7a3ffe5fdec3011a5d38c5b68cd889dd2793079c0ff02b886b7cafb9f876864106f421 SHA512 896ced8f28263026af4f35de04f6e23442c2f53887ff3d7a23b4874152982d867199c863b8c3ff9311b3e7d7df0b60114cccdb04f7fefcb73ff3e3f103111d52
-MISC metadata.xml 420 BLAKE2B 1e6317bfbec962c8404b304ff98179641b1eb460d0b40f20823c876b3dcfd6b7243ca311b6c912440d86d510ef5210510de528c69651b805c5bb26c00bca7531 SHA512 15c5545e60302be536d0f09b4529a76d13d57e8bbd45be1294798bbf11247c8a7148849b5e5481eab968007d1dcb1f43db6297ed752901a5b564136b8bbf1a11
+EBUILD jfsutils-1.1.15-r1.ebuild 1211 BLAKE2B e7d449eda7a3419417b8f74142f48d1e13a06e9029f824498d31035ad72fab053191fa73e5615759ae2dcd0c1a17ed42e59808f408237c9b3d8273ec568a00a0 SHA512 ffbb3a604b0c781f8ada406873c17e008b9626accad700197d062ad9a0aa1966327bacb135664e625e585a7c07d8418fdbb6272fb164e06338d34e010b08fdd2
+MISC metadata.xml 683 BLAKE2B db09548b3469462387d1835ad1c835cb45be5fdf5f18b4940ba35e20a1dd5a57159519e862672fdf08989a0c1b4351d721226ee289523fc214dfafb506150f23 SHA512 e81833363d32078db3c370d6a3faa1803857af05e6df470bc3b625da06680bcf725b443697ef356d73d3b4d4c7e4230ba54459e260f9a5e738978a08742af189
diff --git a/sys-fs/jfsutils/files/jfsutils-1.1.15-check-for-ar.patch b/sys-fs/jfsutils/files/jfsutils-1.1.15-check-for-ar.patch
new file mode 100644
index 000000000000..6469e7d82d22
--- /dev/null
+++ b/sys-fs/jfsutils/files/jfsutils-1.1.15-check-for-ar.patch
@@ -0,0 +1,10 @@
+--- a/configure.in
++++ b/configure.in
+@@ -9,6 +9,7 @@ dnl Don't include maintainer make-rules by default
+ AM_MAINTAINER_MODE
+ 
+ dnl Checks for programs.
++AM_PROG_AR
+ AC_PROG_AWK
+ AC_PROG_CC
+ AC_PROG_INSTALL
diff --git a/sys-fs/jfsutils/files/jfsutils-1.1.15-format-security-errors.patch b/sys-fs/jfsutils/files/jfsutils-1.1.15-format-security-errors.patch
new file mode 100644
index 000000000000..f66b9e0d46df
--- /dev/null
+++ b/sys-fs/jfsutils/files/jfsutils-1.1.15-format-security-errors.patch
@@ -0,0 +1,40 @@
+Origin: https://sources.debian.org/patches/jfsutils/1.1.15-5/format-security-errors.patch/
+
+--- a/fscklog/display.c
++++ b/fscklog/display.c
+@@ -182,7 +182,7 @@ void dump_service_log()
+ 				} else {
+ 					/* the record looks ok */
+ 					msg_txt = &log_entry[log_entry_pos];
+-					printf(msg_txt);
++					printf("%s", msg_txt);
+ 					/*
+ 					 * set up for the next record
+ 					 */
+--- a/fscklog/fscklog.c
++++ b/fscklog/fscklog.c
+@@ -252,8 +252,8 @@ int v_send_msg(int msg_num, const char *file_name, int line_number, ...) {
+ 
+ 	sprintf(debug_detail, " [%s:%d]\n", basename(file_name), line_number);
+ 
+-	printf(msg_string);
+-	printf(debug_detail);
++	printf("%s", msg_string);
++	printf("%s", debug_detail);
+ 
+ 	return 0;
+ }
+--- a/logdump/helpers.c
++++ b/logdump/helpers.c
+@@ -95,8 +95,8 @@ int v_fsck_send_msg(int msg_num, const char *file_name, int line_number, ...) {
+ 
+ 	sprintf(debug_detail, " [%s:%d]\n", file_name, line_number);
+ 
+-	printf(msg_string);
+-	printf(debug_detail);
++	printf("%s", msg_string);
++	printf("%s", debug_detail);
+ 
+ 	return 0;
+ }
+ 
diff --git a/sys-fs/jfsutils/files/jfsutils-1.1.15-gcc10.patch b/sys-fs/jfsutils/files/jfsutils-1.1.15-gcc10.patch
new file mode 100644
index 000000000000..72160e8b4fae
--- /dev/null
+++ b/sys-fs/jfsutils/files/jfsutils-1.1.15-gcc10.patch
@@ -0,0 +1,71 @@
+Fix building with GCC 10
+
+Origin: https://sources.debian.org/patches/jfsutils/1.1.15-5/gcc10_fix-1.patch/
+
+--- jfsutils-1.1.15.old/fscklog/display.c
++++ jfsutils-1.1.15.new/fscklog/display.c
+@@ -54,7 +54,7 @@
+  * output: fsck extracted service log I/O buffer
+  *
+  */
+-char xchklog_buffer[XCHKLOG_BUFSIZE];
++static char xchklog_buffer[XCHKLOG_BUFSIZE];
+ 
+ /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+  *
+--- jfsutils-1.1.15.old/libfs/logredo.c
++++ jfsutils-1.1.15.new/libfs/logredo.c
+@@ -87,9 +87,9 @@
+  *    S T U F F    F O R    T H E    L O G
+  *
+  */
+-struct logsuper logsup;		/* log super block */
+-int32_t numdoblk;		/* number of do blocks used     */
+-int32_t numnodofile;		/* number of nodo file blocks used  */
++static struct logsuper logsup;		/* log super block */
++static int32_t numdoblk;		/* number of do blocks used     */
++static int32_t numnodofile;		/* number of nodo file blocks used  */
+ int32_t numExtDtPg = 0;		/* number of extended dtpage blocks used  */
+ 
+ /*
+@@ -129,7 +129,7 @@
+  */
+ 
+ /* buffer header table */
+-struct bufhdr {
++static struct bufhdr {
+ 	int16_t next;		/* 2: next on free/lru list */
+ 	int16_t prev;		/* 2: previous on free/lru list */
+ 	int16_t hnext;		/* 2: next on hash chain */
+@@ -142,7 +142,7 @@
+ } bufhdr[NBUFPOOL];		/* (24) */
+ 
+ /* buffer table */
+-struct bufpool {
++static struct bufpool {
+ 	char bytes[PSIZE];
+ } buffer[NBUFPOOL - 1];
+ 
+@@ -151,15 +151,16 @@
+  *
+  * log has its own 4 page buffer pool.
+  */
+-uint8_t afterdata[LOGPSIZE * 2];	/* buffer to read in redopage data */
++static uint8_t afterdata[LOGPSIZE * 2];	/* buffer to read in redopage data */
+ 
+ /*
+  * Miscellaneous
+  */
+-caddr_t prog;			/* Program name */
+-int32_t mntcnt, bufsize;
+-char *mntinfo;
+-int32_t retcode;		/* return code from logredo    */
++static caddr_t prog;			/* Program name */
++extern int32_t mntcnt;
++static int32_t bufsize;
++static char *mntinfo;
++static int32_t retcode;		/* return code from logredo    */
+ int end_of_transaction = 0;
+ 
+ /*
+ 
diff --git a/sys-fs/jfsutils/jfsutils-1.1.15.ebuild b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
index 9d17529ffecb..2a8654317bd8 100644
--- a/sys-fs/jfsutils/jfsutils-1.1.15.ebuild
+++ b/sys-fs/jfsutils/jfsutils-1.1.15-r1.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit flag-o-matic eutils
+inherit autotools flag-o-matic
 
 DESCRIPTION="IBM's Journaling Filesystem (JFS) Utilities"
 HOMEPAGE="http://jfs.sourceforge.net/"
@@ -14,11 +14,27 @@ SLOT="0"
 KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 s390 ~sparc x86"
 IUSE="static"
 
+LIB_DEPEND="sys-apps/util-linux:=[static-libs]"
+
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )"
+
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
 DOCS=( AUTHORS ChangeLog NEWS README )
 
+PATCHES=(
+	"${FILESDIR}"/${P}-linux-headers.patch #448844
+	"${FILESDIR}"/${P}-sysmacros.patch #580056
+	"${FILESDIR}"/${P}-check-for-ar.patch #726032
+	"${FILESDIR}"/${P}-gcc10.patch #707314
+	"${FILESDIR}"/${P}-format-security-errors.patch #557140
+)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-linux-headers.patch #448844
-	epatch "${FILESDIR}"/${P}-sysmacros.patch #580056
+	default
+
+	eautoreconf
 }
 
 src_configure() {
@@ -33,6 +49,6 @@ src_install() {
 	default
 
 	rm -f "${ED}"/sbin/{mkfs,fsck}.jfs || die
-	dosym /sbin/jfs_mkfs /sbin/mkfs.jfs
-	dosym /sbin/jfs_fsck /sbin/fsck.jfs
+	dosym jfs_mkfs /sbin/mkfs.jfs
+	dosym jfs_fsck /sbin/fsck.jfs
 }
diff --git a/sys-fs/jfsutils/metadata.xml b/sys-fs/jfsutils/metadata.xml
index 048c190bdfca..23eb0811376e 100644
--- a/sys-fs/jfsutils/metadata.xml
+++ b/sys-fs/jfsutils/metadata.xml
@@ -6,7 +6,12 @@
 		<name>Lars Wendler</name>
 	</maintainer>
 	<longdescription>
-		Utilities for working with IBM's journaled file system
+		The jfsutils package contains administration and debugging
+		tools for IBM's journaled file system.
+
+		IBM's journaled file system technology, currently used in IBM enterprise servers,
+		is designed for high-throughput server environments, key to running intranet and
+		other high-performance e-business file servers.
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">jfs</remote-id>
diff --git a/sys-fs/loop-aes/Manifest b/sys-fs/loop-aes/Manifest
index e817cd8d6fa4..8076df6cdcde 100644
--- a/sys-fs/loop-aes/Manifest
+++ b/sys-fs/loop-aes/Manifest
@@ -1,5 +1,5 @@
 DIST loop-AES-v3.7n.tar.bz2 373901 BLAKE2B 5cac9bd55f35a6cf0c056a6a2e75a48f49c1d23b7ebe1821e10dab522508e64ed23e5993dbcc19dbdeaab6c315ee4e71c8ecc17d9da41a5ad0794abc92563d7e SHA512 d190561f92a47292285e44c728bf1fcf9b7dd9c54f970ebc11a2988686f409515687a22028187756baaa4622903564e2646971a63eba13557c6ce78dc1f0bb96
 DIST loop-AES-v3.7q.tar.bz2 376027 BLAKE2B 7f3206196fcb7ecc928bda4cd127042f61cd5ac7f39e483fb91db388572be1c8e252d5c4adb653e6fd00ff6a7ba4c1406c35f2b2659e9cb38fd817f1bdb2a15f SHA512 103869695f6b18bcc765804865468db4b24fc2fcce3ec97d8468fdc0bd37c480386960730e280cd93c707026dddc5e79d8d25e2601c3678330e016835166ad20
-EBUILD loop-aes-3.7n.ebuild 2032 BLAKE2B 2218843eb73db2ed63c8e0f19be6a9f16c4084982067d6b153ca9d42688e5c3e1aa5118fe3a5720b5b5d175b20550d1250dcbf872acfff19d0a63b6d0dfccab0 SHA512 abd4f49db32d9808ccf1d4363e967bbd48cfd0db2390afd6ddb591b2540d44bb66233fad18cc7a0756cc91448a5abc20eaee24641b66bbded73fefb184859309
-EBUILD loop-aes-3.7q.ebuild 1751 BLAKE2B 1169b7659b99297cb22999f941fb0e164df1684f12fe548148adf6ff23ea72422227b85a1a0bb34345b92c4d7d55389a82bc63cba5f895c9480c2f81b5dc7612 SHA512 bf78deea9927612fac0d78e9bd15358b1f9c31c661a564d35064b10e1956db230d4f7b6b3a15cccbbb30f5e69a19cf6a81d9f26982c5f040abe943a9002e2461
+EBUILD loop-aes-3.7n-r1.ebuild 2033 BLAKE2B b57cf91c8c11a96ac0259e904950aa6c20f9f7244cf1114b598fa90fc7deda16c87348bb223147aa003372bfe03d9627b60bccc9a3e398b196a4666b5a398e6b SHA512 907140e56ed3fb76630e8389764b3e776cbe9429ebd81899e8d33452415c6c0183b84060716d9ee1f85658334d8ae1647c9c3912c7cf92c8b8902f1db9db7e0a
+EBUILD loop-aes-3.7q-r1.ebuild 1751 BLAKE2B 1169b7659b99297cb22999f941fb0e164df1684f12fe548148adf6ff23ea72422227b85a1a0bb34345b92c4d7d55389a82bc63cba5f895c9480c2f81b5dc7612 SHA512 bf78deea9927612fac0d78e9bd15358b1f9c31c661a564d35064b10e1956db230d4f7b6b3a15cccbbb30f5e69a19cf6a81d9f26982c5f040abe943a9002e2461
 MISC metadata.xml 617 BLAKE2B 58d3b691b322ec4ae5772e391ff255fb0bfdba6202d24dec70baa5543657dc07c473992ceccc61beb35ad710e6014ab692eb8856463e8d001446bd45e8a2d60c SHA512 dba8f0278839b705911377ab463c7662f85f6f7be1528c1d96f5bb5bcb96566fdb73756d035879ddd746550fe048c5a0552b14436bbb9a69789cf5f1d4f8414d
diff --git a/sys-fs/loop-aes/loop-aes-3.7n.ebuild b/sys-fs/loop-aes/loop-aes-3.7n-r1.ebuild
index 715db29486c6..18a5ba1f82aa 100644
--- a/sys-fs/loop-aes/loop-aes-3.7n.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.7n-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=7
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 IUSE="cpu_flags_x86_aes extra-ciphers keyscrub cpu_flags_x86_padlock"
 
-REPEND="app-crypt/loop-aes-losetup"
+RDEPEND="app-crypt/loop-aes-losetup"
 
 S="${WORKDIR}/${MY_P}"
 
diff --git a/sys-fs/loop-aes/loop-aes-3.7q.ebuild b/sys-fs/loop-aes/loop-aes-3.7q-r1.ebuild
index 6879462d4158..6879462d4158 100644
--- a/sys-fs/loop-aes/loop-aes-3.7q.ebuild
+++ b/sys-fs/loop-aes/loop-aes-3.7q-r1.ebuild
diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest
index 72514ad2c806..85d52bef74f0 100644
--- a/sys-fs/lsscsi/Manifest
+++ b/sys-fs/lsscsi/Manifest
@@ -1,3 +1,3 @@
 DIST lsscsi-0.31.tgz 191650 BLAKE2B 0bd9b72356cc8f9a7f83bf5bdebdc7d3093efa09b1c72e79b45f6e6dacedb6c80e085fce8ce734e298d03c959bc4428f7a4faeeaace3cdeaa3b2d6bfc4b547cc SHA512 e76a011b79657fb138e88d37ff38d83b6bbe2e28330fb621ca5972ba4ffb0131a5e67c8afeb0292c002eaf91e1b69c8f051d48849e5ed822e8705365092a53ba
-EBUILD lsscsi-0.31.ebuild 337 BLAKE2B 7e109cb575eedbea0cf1607b4ea1c8d6bca57a8dd8d36383b6822a4d117a778aee9df4359d58f563a4fc3c223820dfbdf9aa42dfa35c55b4d433985996975376 SHA512 c6724006bd1bf0a9ad6d284df00ff06178a10174e41bbb89e24e7ad7d4c51228246f8c67d1dc6fc3f309940d73557755326d78392e3ba3a247e75496697cc3d6
+EBUILD lsscsi-0.31.ebuild 336 BLAKE2B 8d73e5b1d732bc3827e22eb3de73bf62247b2db83431799f7b692183b9a6eda8ae7416f67b525d3ec99875aed55de9300c15e4cede42e7fcb153f134423bc1d7 SHA512 5e89db0f0be0e1eac5de15b0d93522ab980583969298670a7268215f6e1bdccac44979d9a4c5b17aa1314a45fd8ac6a4208d839779012f162ad3bce77e3d0d59
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-fs/lsscsi/lsscsi-0.31.ebuild b/sys-fs/lsscsi/lsscsi-0.31.ebuild
index b29effe6652d..7879201a16ed 100644
--- a/sys-fs/lsscsi/lsscsi-0.31.ebuild
+++ b/sys-fs/lsscsi/lsscsi-0.31.ebuild
@@ -9,4 +9,4 @@ SRC_URI="http://sg.danny.cz/scsi/${P}.tgz"
 
 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"
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index ec3dd27f71c2..4d72748f1084 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -28,7 +28,7 @@ AUX lvmetad.initd-2.02.116-r3 345 BLAKE2B d458efd01fa08debe0857072c880adf9514774
 AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc
 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91
-DIST LVM2.2.03.09.tgz 2476346 BLAKE2B 0987b19bc39ef218fe5a79d6035d6e3d5b59fc75ee94e401148f91437faedfa73295fcaefd97a7606ae9d158b000fa5de4e2a72e89da1e1ad27759f7b821489b SHA512 8540e46a6025ab14b592ccd9493b3224ffc0f962739a0a8de6d7b25c65c6ad96fc83ddb0e3d877b123a5e1b104476d0c20ccee2ead6d322257ec82ad1e3362d4
-EBUILD lvm2-2.02.187-r2.ebuild 9592 BLAKE2B ebeb2f0c206f0b3e60d6453ea0752a83bbcfb357bae033fc6f7f7347e03c0372b0865b49ade8dbcdf20be9badd30d1efbb2edddcebbed6b48ca7d17b5c5901b7 SHA512 58e16d4f395632826ed3e802f91852cf0519a315a419cd35dff97bddbf93b4ef38908cd6e35448762cd72f578cf429325b1a440b8f6f3c8caccc2be563ed4487
-EBUILD lvm2-2.03.09.ebuild 8902 BLAKE2B 36ce1a37c59cf5f48eecb984bcb0c4fd3ad248def8c740614605df8bcd9fdaef3b58cd7b4c0c05644c073f114626e136b5b9c4ec2cf020798431e5bd4901d5a4 SHA512 07f83e2fb14823a97c84d319a33b0764e565d6c77ca1f5a16c3e5b204452afdaf6b2676a6042ee82149f7665ddd9fa5a2a4c94f467275a64d36ceb6f0bb58eee
+DIST LVM2.2.03.10.tgz 2510568 BLAKE2B 1b4e9d09ef948b79a2e6e70fa8f8c9cd38ec8d8d1462eefb059f93020f65664538cee9bab41b81aaaf719ca428a9e824a2b181f40ebe261c5dd0fc6551ebcbb3 SHA512 8678ae2f99739ccad0250f6f4b4b8e84520f2053835985a1ea9c80196a64df31a48858aebf983170c3dfcafecea83f2c6aa630ef73fd31dd84cf1627a1b421e4
+EBUILD lvm2-2.02.187-r2.ebuild 10170 BLAKE2B 538b3fec167771ac31218769a03f203a1fbbfa7d25e621153a210dbc195680677eeae0df4e6d2d71d5ca14e341c08d5425107fb4bbe5526c6e57ab4aa4280516 SHA512 f4cfae2f60ed861b5f4c406005e862659de2a0de9a12a86af9475350946edfacc1d24a280f8463b265e830776b8c7861c53777d00ba4c8b4f50b8b236244ea92
+EBUILD lvm2-2.03.10.ebuild 9617 BLAKE2B 995b48f9b4be54e950154399c6201c562534ba5d3a275da69d82a426451a93cf509a3efd98804dfae1f1f99fc53c1ec869e44c4d8581849565bee6be017715e4 SHA512 55f15137a06762104db963abf86700aded570c9152e13a35f34c42139351b4730e5699d9134a0725bd8696fd1362b49dc248613a8eb71a7f1544545ad20e07e2
 MISC metadata.xml 1020 BLAKE2B 6427d15f63ac775b03758cef58620c77fb2dd6f92de8ac23a87b51d76ae3882acf5f555c3aada81235afa0f52290e35d142083004e53443902a710721228e213 SHA512 834e3798b590e693d6a26c708985ee6c3eea27b958924827d9325fbe7bd00711bdfbfabfd21d408752393f99131588116b3d2b841107afadf67e09cae3289ed9
diff --git a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
index 8c994897df92..2bc6f354e530 100644
--- a/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild
@@ -266,11 +266,30 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-	ewarn "# rc-update add lvm boot"
-	ewarn
-	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
-	ewarn "to enable lvm autoactivation and metadata caching."
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+		ewarn "# rc-update add lvm boot"
+		ewarn
+		ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
+		ewarn "to enable lvm autoactivation and metadata caching."
+	fi
+
+	if use udev && [[ -d /run ]] ; then
+		local permission_run_expected="drwxr-xr-x"
+		local permission_run=$(stat -c "%A" /run)
+		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
+			ewarn "Found the following problematic permissions:"
+			ewarn ""
+			ewarn "    ${permission_run} /run"
+			ewarn ""
+			ewarn "Expected:"
+			ewarn ""
+			ewarn "    ${permission_run_expected} /run"
+			ewarn ""
+			ewarn "This is known to be causing problems for UDEV-enabled LVM services."
+		fi
+	fi
 }
 
 src_test() {
diff --git a/sys-fs/lvm2/lvm2-2.03.09.ebuild b/sys-fs/lvm2/lvm2-2.03.10.ebuild
index 40418f6bae35..c1a7dbc3b20a 100644
--- a/sys-fs/lvm2/lvm2-2.03.09.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.10.ebuild
@@ -253,8 +253,30 @@ src_install() {
 }
 
 pkg_postinst() {
-	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-	ewarn "# rc-update add lvm boot"
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		# This is a new installation
+		ewarn "Make sure the \"lvm\" init script is in the runlevels:"
+		ewarn "# rc-update add lvm boot"
+		ewarn
+		ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
+		ewarn "to enable lvm autoactivation and metadata caching."
+	fi
+
+	if use udev && [[ -d /run ]] ; then
+		local permission_run_expected="drwxr-xr-x"
+		local permission_run=$(stat -c "%A" /run)
+		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
+			ewarn "Found the following problematic permissions:"
+			ewarn ""
+			ewarn "    ${permission_run} /run"
+			ewarn ""
+			ewarn "Expected:"
+			ewarn ""
+			ewarn "    ${permission_run_expected} /run"
+			ewarn ""
+			ewarn "This is known to be causing problems for UDEV-enabled LVM services."
+		fi
+	fi
 }
 
 src_test() {
diff --git a/sys-fs/lxcfs/Manifest b/sys-fs/lxcfs/Manifest
index 292378eef3c9..f4815a8c8232 100644
--- a/sys-fs/lxcfs/Manifest
+++ b/sys-fs/lxcfs/Manifest
@@ -1,8 +1,9 @@
 AUX lxcfs-4.0.0.confd 221 BLAKE2B 18924acc45506885e0f1795ffd4dd666d341abc2957c22a241909004ea988f1464b817939b450741bc77e413fb37d2e2dcd8f85405ab69f27d475567f48df2db SHA512 ebccfce0f865c8dbc1cff67712be4ac625b91ccc42aa78971c6619cf32553abe15ae82c6b3f320600cf3605f8b8c7ccbbcac3a399c6ae8261a08ea2793992e58
 AUX lxcfs-4.0.0.initd 533 BLAKE2B c4dee71fbbe477c46cf2d661f335a43517158c3c2061decfdf327a24cb1360dd08184d8cdc3936db26b6a50c47748f146414a1ae1ab61f963a9c7740c0ec3919 SHA512 755356e2a4f1e92803d8864c4edc223c183c81592562d6492d4b374174d4e5ca2d30fcdeb9861c46df795e6373ecf5f14c089c7ad22465d02516748c2c18aed7
+AUX lxcfs-4.0.0.service 427 BLAKE2B 4a681cfe9f856f0a2986fc2934ee3712f02af2ba3b085ff1c9fe4bdb80195ea943e4c9d1640410b9302c7c42d697d3483a0d8e4942a1f494695199bdfd6dfeca SHA512 592847d97ec6afd69de670918fdf5e7e8ef4ba730d917cd78a177c164d69c5d80417fed1b2a41849e08f5b9f3bbe28e3ad99887c195db6fd0ebeb559f23214bf
 AUX lxcfs.service 350 BLAKE2B 654b9053265ac16b28e0e5d04e0278070e8f6f2bc08be55f6a896c372f1b6c98c8872a0386c0dc71dee0a3afcf7cb3a7f5049d8f5a192dda983d7273eb2bdacf SHA512 3c8f44bdc2f9e5e23fa0a44b77ce3cb0cd5fd90fea6e82a46e7bac77d22a1d52a66c3d052ca9ea7319d1debe1a1808e01a34adb79fa4fd9f1024ab60139afc6c
 DIST lxcfs-4.0.3.tar.gz 100719 BLAKE2B 24371b921ad635f97c51ac8406c949e81330ae358b0166c2af295cb1f630594bb72da802aad41971c11303f393fd05bc9f1b109bd4da4953db2c3bb7e5189315 SHA512 0aaedfe826d982b9464dfb60fb57c58e34ea6022b8503bc858538b6634dc7d0845f65832d6f814043dbc0677f887e1b559549a8f3865c755970c6b47ba65eb2b
-DIST lxcfs-4.0.4.tar.gz 101546 BLAKE2B 1e84e3b75bfb39273539ea72f941442cc3c8574c0f55359a38edc04a98a45ea8680f9bf49c5974decf180a8ecf07cadccf4e732d1743c070a740c78b773a3ee8 SHA512 15bcebecc815310870aea58d995d605444b57583b7f1bb2d35b065256ea5f70b071d58887fbf1ca124ea84da99151bbd9dffcca37a2e151677d56229dc8961ce
+DIST lxcfs-4.0.5.tar.gz 101842 BLAKE2B c916473e1b7ad42b8f69026a16810941c999d44ffcf1d456cb301411965f05e626338a5bde1e38fe99acd05f72bbcd5acbdcb2f65fa5ec183c967babcb8c70fd SHA512 5c44aa7f43071a4316cc8702928fde2c928bd5654c9ab4d540152839db0d7dd235a861f263da56f02611941d46d22eee98e0cdd52aeaeda99f3c79c754d420a1
 EBUILD lxcfs-4.0.3.ebuild 1248 BLAKE2B 0e37ad8f8b904f2fa2aead5fc24e316bd8d9f0b9a67c8db8f2351750f8308a7688bc4e78d662a533d16aa58b871fccfd21b33624e295a36de4fd32e1277ab8de SHA512 ea98650d13885fe5d5217ea2486c4042636377e862b71509a5de74ca028a27c7fe89c05ba663397164bea8bbd1ab845a97cfd910327b61e11879ccce2102cdd2
-EBUILD lxcfs-4.0.4-r1.ebuild 1110 BLAKE2B cfbafcae2d47f5cacc066dccec779d526ed086e4d44f6e57652266bf73bda2ebe96013f42149c3ae40cdfebbc5e04877c8730ea490c911be01a843cb61c2ff81 SHA512 19bece2da21669ad24e74749152ef5ec6a1e8f570ea728d92e1b672151373a5194e14dcd2e8796727659032f4174eb2cde0e22237f8957dd475ee660b40d19e0
+EBUILD lxcfs-4.0.5.ebuild 1130 BLAKE2B 5b3b52a533f18cb23fd226189145bb2482918e67e0cfdde4c3b9398f83262df9cae1053fe6e2e0597e912606fa1cfd4ec53293feb480f5adf1b666ec761b7098 SHA512 bd182c749df79c21e2e5ea0a8742660d99b3c82c07f530b0a71a4d75313c078d198bdc49f43cd35f5ee5443983e13b2e72ca428e4331a98928c559a94a5a6965
 MISC metadata.xml 808 BLAKE2B b8b8be1a8fd8a1a9614dbfeddd97cd322bcf0ed4d11a97bc6680bde28faa0bdaabbf8b5a92242e0da09845f6a08280dd0d6681e3932a7319117c186f167bf6fd SHA512 dfb81661c2feb5abb3397c93eabf26c12af51099f6676d8fec346c83ca3edea788745e4a59ea05035b16b1baf21edd16d9537f66fbd10d0c8da8a7933b35c528
diff --git a/sys-fs/lxcfs/files/lxcfs-4.0.0.service b/sys-fs/lxcfs/files/lxcfs-4.0.0.service
new file mode 100644
index 000000000000..0bdab880a790
--- /dev/null
+++ b/sys-fs/lxcfs/files/lxcfs-4.0.0.service
@@ -0,0 +1,18 @@
+[Unit]
+Description=FUSE filesystem for LXC
+ConditionVirtualization=!container
+Before=lxc.service
+Documentation=man:lxcfs(1)
+
+[Service]
+ExecStartPre=/sbin/modprobe -q fuse
+ExecStartPre=install -d /var/lib/lxcfs
+ExecStart=/usr/bin/lxcfs /var/lib/lxcfs
+KillMode=process
+Restart=on-failure
+ExecStopPost=-/usr/bin/fusermount -u /var/lib/lxcfs
+Delegate=yes
+ExecReload=/bin/kill -USR1 ${MAINPID}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild b/sys-fs/lxcfs/lxcfs-4.0.5.ebuild
index 583ac4fcfa62..3f5a924ec104 100644
--- a/sys-fs/lxcfs/lxcfs-4.0.4-r1.ebuild
+++ b/sys-fs/lxcfs/lxcfs-4.0.5.ebuild
@@ -45,7 +45,7 @@ src_install() {
 	newconfd "${FILESDIR}"/lxcfs-4.0.0.confd lxcfs
 	newinitd "${FILESDIR}"/lxcfs-4.0.0.initd lxcfs
 
-	# Provide our own service file (copy of upstream) due to paths being different from upstream, 
+	# Provide our own service file (copy of upstream) due to paths being different from upstream,
 	# 728470
-	systemd_dounit "${FILESDIR}"/lxcfs.service
+	systemd_newunit "${FILESDIR}"/lxcfs-4.0.0.service lxcfs.service
 }
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 76974669fcf3..42003694228f 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -7,5 +7,5 @@ AUX mdraid.confd 383 BLAKE2B c61fd2c072a0d12ca21ad4f8a60a55101b4e452f9acc8cdcdf9
 AUX mdraid.rc 759 BLAKE2B 41f1b4cb9dd29411d56bea656dddc2cb2fd3cc14b183d05c502fb5e29407d1d816de9595e13349ef7e03240308cf4395578be31149f59d1960d1feee0165506d SHA512 d76190646b393d1480607b0d89d08ce4196738295fbb7790fa1035c53a041b5cb88fe857bb2070920a9c3ae21b9fb8f7838dde240fa0e275e5915add9c113021
 DIST mdadm-4.1.tar.xz 440756 BLAKE2B df0506d937c2aa309d7c68804f66f7dcd51783288594bf746832311c64b8cf82004af4af5f246c5f9753f1de324ff7d49b5ee752d6a00ec03864f7885389706e SHA512 0859c5d3e786345d93ff2c3b291ca8866ba60f1375479e5b4d343124f6824140a8268d42b8ae603b069edba761aa30aaf20d49e9ec54dfcbad34bad3bea0e433
 DIST mdadm_4.1-3.debian.tar.xz 89640 BLAKE2B 3cb5e42dcbd218a71e55127cecda6f2594a1b1691e17c05f52a8cd0ba05b556d2812772e53d78de025738d7c2de059df3f878b8290ba3906b3d75ef435bfb698 SHA512 e9b04abf195d7bda9fb0197eb926c01a69b879ef82c72af6497116cea9be8f0823408dddbe5c6c033f5fae554a8fec17299e361fa48045e033c87dcee1a0bb63
-EBUILD mdadm-4.1.ebuild 2298 BLAKE2B b0baee542b09618b820df3eb31d25662690dfdc0e0d364c38fffcc577be0473e6dd66fa73d731c7b841288b17c29ebcf1c3c6786c65a20b4e6b481d8be45631e SHA512 2c415ce117adaf302dc7dba820e6debefbba0d9091cc50f28d2e8425a1e6c0225e09b54c197c70b2fcc280cef1d12b72a7b967321caef9ab33b6ea4f9673af7e
+EBUILD mdadm-4.1.ebuild 2305 BLAKE2B 26d7b00aaaa982c1a26636b274becc653030e23eb4166960496710b53c624f1ea3ed7a326dda94d73c09654c1227815d661f1057e5a18553ad0e01199591ff38 SHA512 a242d8263972c64d8b0aac3476e6e01cb88356a19b41af15206ccba95073d8543b6012942013fba7b5035dd4b3d53ea2301e1e887127026252da1fc23a8af137
 MISC metadata.xml 338 BLAKE2B 09821f9f1d507fccd175044288b7d5d8966b7bb807399c86e9e2e5b41134ac39a76f79b7c9000ecee890b902175aa86b7dd1ce2f288b6926fbe633496c1b1d9c SHA512 1f86c31c1f9c17f0a0d57a17c7bdfe6da70eed4e8102f3c545f447b58e892b0f6a3b0f6c4df9c611abcb544d6b26d3a0d0c591f1afd20f91a445746e3454eca1
diff --git a/sys-fs/mdadm/mdadm-4.1.ebuild b/sys-fs/mdadm/mdadm-4.1.ebuild
index 56b94c104554..515775501e94 100644
--- a/sys-fs/mdadm/mdadm-4.1.ebuild
+++ b/sys-fs/mdadm/mdadm-4.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/raid/mdadm/${P/_/-}.tar.xz
 LICENSE="GPL-2"
 SLOT="0"
 [[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static"
 
 DEPEND="virtual/pkgconfig
diff --git a/sys-fs/mergerfs/Manifest b/sys-fs/mergerfs/Manifest
index 4fb3b8c2ee04..d1b6e4737382 100644
--- a/sys-fs/mergerfs/Manifest
+++ b/sys-fs/mergerfs/Manifest
@@ -1,5 +1,8 @@
+AUX mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch 1874 BLAKE2B f1ed2498105ae152f06048c2723d02d0a797d3f129e4401a4069046f231219d363506c40e054c5770de2a874e6d44da3dbc8c29f959ce7ff6b85e3414d087644 SHA512 8294242cb6e25198296e7d7bf4a2808cec10fd33ce95aed1669459577c26c9de6868abcdb6244cf50bba0819e2bfab31cbb38b138af0acbc257fe906cbc92c32
 DIST mergerfs-2.28.3.tar.gz 294065 BLAKE2B 2e59e00726aec53438d5a5df143ca204069794d68c663a130139102a19e118a54fede1c8eca99199a3e634ffa92cb21c25c30718ea0842826de8a64e876b2819 SHA512 5469b3515464680aa72fc393c218fb038bed31194a933e6736eec478d87a110979323308b642d7f100a5c506534ca75badf4a87a050007cdc77cd2a641217929
 DIST mergerfs-2.29.0.tar.gz 302391 BLAKE2B a7d051c63b12a95af2868d8b3be9b32aa1be3d9c4cc4e359914b07e18ed30dadece80861ad559d5cdd85b375f565b9e70dac9ad3e34b98c054dd54822897c1a6 SHA512 2c21dedffc2f261c6c8427af59cffcacacc9b67bce7bb9989bd5946aa645c68bac0f56250ec19710e586a00892f7198853390bea3ff5981035d5a492ae4569a2
+DIST mergerfs-2.30.0.tar.gz 316560 BLAKE2B 7e6be39cfa5f085aabbc928e1da9c0bf1f6442be1de4ccef1868832c852d138901071129cf7feff19b13dd5939c5fff56520c5292473b92c71a85430818ab25c SHA512 6914c5efa783d66293ebcce0a6a493267eedfa45ac058cd24b2024aea15a866b997f4474363e4ababa4af59d302466c5f8c6b9f07ee42f7661b335d4701315b4
 EBUILD mergerfs-2.28.3-r1.ebuild 1050 BLAKE2B 8b5ea7c3cdb6751b706c1a1f7917f3f6cd1d5bfd08848a711f99b32e1fb5ef594ed22488562a33f6c22bf42144b881fa97389b6f28420e9ed35337f4d1327b3e SHA512 79ce0ba08e48defd5d704be474c2be7fbe2588bdc343f921a71ce9f0b2c94483b141b6ec4f9322c4400bb3d03397166094e2d293f28741e930234bae250edb1b
 EBUILD mergerfs-2.29.0.ebuild 963 BLAKE2B 2df7a15e80299d35e0931db932b3af8d74d452e70eae97382fa28a75ac13cec48b62ef1bcfdacfb82fc04d4d3ef7bc3b148da806a6af1120c5ce73e60ab46a54 SHA512 226502ebd8e52f109039c7a3e6ccfd283f5212c1aa29f9b074eeeb4e81a001a004edc355bb7eb3d42e923990fcd260cc5ca9c7b992a2ffebf799f556d8dc0891
+EBUILD mergerfs-2.30.0.ebuild 1151 BLAKE2B 5232e20f48f6b79f9e5547d97af84930ece5608d808a0dbfe87eab956f6730643ddc59fd05e2e95f016f5ba1905f5fccc33a49c4176312636daa431a2ce42d98 SHA512 adf4b53a9189ceb371903304ed63bd3eca6938da757897159450b6e3f7fa4252ef5ecd2b420f195bc401bd8f62795db05c509235b19840db6f83ea79f6c207a6
 MISC metadata.xml 334 BLAKE2B e0f154866ccf08a8534567e5848aa41a0413a31cbd0fc92af2b873e77da2b007c222ab7431a81513e12f3cacd5e8bf8deb8a426e4cee2a64c8d02d0d9b56e4c2 SHA512 8b30ddda63065e140e02f4d3e79d933f46fd9460d2acc5b70e453f82eb6b5c204c810aa0019d183b256fcbde18239efbf01fccc40c5a1ddb632183418a596496
diff --git a/sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch b/sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch
new file mode 100644
index 000000000000..05166bacd874
--- /dev/null
+++ b/sys-fs/mergerfs/files/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch
@@ -0,0 +1,83 @@
+diff --git a/Makefile b/Makefile
+index 6c38066..d98021c 100644
+--- a/Makefile
++++ b/Makefile
+@@ -61,13 +61,14 @@ SRC	    = $(wildcard src/*.cpp)
+ OBJS        = $(SRC:src/%.cpp=build/%.o)
+ DEPS        = $(SRC:src/%.cpp=build/%.d)
+ MANPAGE     = mergerfs.1
+-CXXFLAGS    = \
++CXXFLAGS    ?= ${OPT_FLAGS}
++CXXFLAGS    := \
++              ${CXXFLAGS} \
+               -std=c++0x \
+-              $(OPT_FLAGS) \
+               $(STATIC_FLAGS) \
+               $(LTO_FLAGS) \
+               -Wall \
+-	      -Wno-unused-result \
++              -Wno-unused-result \
+               -MMD
+ FUSE_FLAGS = \
+               -Ilibfuse/include \
+@@ -76,9 +77,11 @@ FUSE_FLAGS = \
+ MFS_FLAGS  = \
+ 	      -DUSE_XATTR=$(USE_XATTR) \
+ 	      -DUGID_USE_RWLOCK=$(UGID_USE_RWLOCK)
+-LDFLAGS    = \
+-	      -pthread \
+-              -lrt
++
++LDFLAGS := \
++    ${LDFLAGS} \
++    -pthread \
++    -lrt
+ 
+ DESTDIR       =
+ PREFIX        = /usr/local
+diff --git a/libfuse/Makefile b/libfuse/Makefile
+index e3001aa..2bbc45a 100644
+--- a/libfuse/Makefile
++++ b/libfuse/Makefile
+@@ -29,6 +29,8 @@ INSTALLBINDIR  = $(DESTDIR)$(BINDIR)
+ INSTALLSBINDIR = $(DESTDIR)$(SBINDIR)
+ INSTALLMAN1DIR = $(DESTDIR)$(MAN1DIR)
+ 
++AR ?= ar
++
+ SRC   = \
+ 	lib/buffer.c \
+ 	lib/cuse_lowlevel.c \
+@@ -46,9 +48,10 @@ SRC   = \
+ 	lib/mount.c
+ OBJS = $(SRC:lib/%.c=build/%.o)
+ DEPS = $(SRC:lib/%.c=build/%.d)
+-
+-CFLAGS = \
+-	$(OPT_FLAGS) \
++CFLAGS ?= \
++	$(OPT_FLAGS)
++CFLAGS := \
++    ${CFLAGS} \
+ 	-Wall \
+ 	-pipe \
+ 	-MMD
+@@ -61,7 +64,8 @@ FUSE_FLAGS = \
+ 	-DFUSE_USE_VERSION=29 \
+ 	-DPACKAGE_VERSION=\"$(VERSION)\" \
+ 	-DFUSERMOUNT_DIR=\"$(FUSERMOUNT_DIR)\"
+-LDFLAGS = \
++LDFLAGS := \
++	${LDFLAGS} \
+ 	-lrt \
+ 	-pthread
+ 
+@@ -78,7 +82,7 @@ objects: build/config.h
+ 	$(MAKE) $(OBJS)
+ 
+ build/libfuse.a: objects
+-	ar rcs build/libfuse.a $(OBJS)
++	${AR} rcs build/libfuse.a $(OBJS)
+ 
+ utils: mergerfs-fusermount mount.mergerfs
+ 
diff --git a/sys-fs/mergerfs/mergerfs-2.30.0.ebuild b/sys-fs/mergerfs/mergerfs-2.30.0.ebuild
new file mode 100644
index 000000000000..e18bed548895
--- /dev/null
+++ b/sys-fs/mergerfs/mergerfs-2.30.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="A featureful union filesystem"
+HOMEPAGE="https://github.com/trapexit/mergerfs"
+
+SRC_URI="https://github.com/trapexit/mergerfs/archive/${PV}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64 ~x86"
+
+# Vendorized libfuse that's bundled is under LGPL-2.1.
+LICENSE="ISC LGPL-2.1"
+SLOT="0"
+IUSE="+xattr"
+
+DEPEND="
+	xattr? ( sys-apps/attr )
+"
+
+RDEPEND="${DEPEND}"
+
+BDEPEND="sys-devel/gettext"
+
+PATCHES=(
+	"${FILESDIR}"/mergerfs-makefiles-fixes-ar-cflags-cxxflags-ldflags.patch
+)
+
+src_prepare() {
+	default
+
+	# Hand made build system at it's finest.
+	echo -e "#!/bin/sh\ntrue" >tools/update-version || die
+	echo "#pragma once" >src/version.hpp || die
+	echo "static const char MERGERFS_VERSION[] = \"${PV}\";" >>src/version.hpp || die
+
+	if ! use xattr; then
+		sed 's%USE_XATTR = 1%USE_XATTR = 0%g' -i Makefile || die
+	fi
+}
+
+src_compile() {
+	# https://bugs.gentoo.org/725978
+	tc-export AR
+
+	default
+}
+
+src_install() {
+	dobin build/mergerfs
+	dosym mergerfs /usr/bin/mount.mergerfs
+	dodoc README.md
+	doman man/mergerfs.1
+}
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index 550eb8ee07ad..631cb48d36db 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -6,5 +6,5 @@ DIST mtools-4.0.23.tar.bz2 418592 BLAKE2B 442f552087a5d53ef0ead6161cdad7997dc45a
 DIST mtools-4.0.24.tar.bz2 418178 BLAKE2B 96ccbde0e5ed5e304c73c7faaeb495751c43ae37970e5c2329299e0f7bf90f3a810f4ca95faea10a00e5af110be579a3b083043314e980bb0128226caffb5608 SHA512 b74becc4f696315cfabc016d1746e744b43e366de73bf1bffeec4fbab1e4815967594de8acb4af01f89d36a925f93672efbac205b89540161bd53ab7edebcf04
 EBUILD mtools-4.0.18-r2.ebuild 1440 BLAKE2B db5974fd44a2d94c73ff4a255f58b06daba7fd25479ed48357d06e5bf8592bebc6d7ab6add898b1537e500ef1b1531658525cf29d8a0cbe8f7476c0bed769faa SHA512 074e1aad4fba2b1533f8abf7bce994fb34004838f7be900abd81bf0574a278584ec3fc5e53357044a5f92a241eacd55d9b1b97b0efabde4b721a9b7f082387e2
 EBUILD mtools-4.0.23.ebuild 1171 BLAKE2B 7b5603db7542d25f187158aae1bc5cc798368ca25059e4bbf5a3dd7217b049f47bae48de397d4a675a2f2128ec311a582cccb8cff0596ded00a637cd5da4a9e7 SHA512 632df381993fc2622ac64ab296c6d0b5249ec3f1e02a4c2db91f5157524b74265f1f1254d88a6398c49d9eec8f2f597bb447d4e0a40f7d408a792ecdf4ab4354
-EBUILD mtools-4.0.24.ebuild 1051 BLAKE2B 8bace5704234712bffd3c88ffce51534a6a141caa283501cf6599a96d0e6b99ae7bc40543ea064bb8385900e4bb6623c0005b8bde0b9a3beec510bd9cbbd8f01 SHA512 4ed910c39dd8683b28a2238e46bf015329a36f516761c486f9dfc987c919e8e3780270de173885b97eb9455232639d5dc1d83da5a24bfcffdeedb2bc637700c4
+EBUILD mtools-4.0.24.ebuild 1045 BLAKE2B 2861833d297fdaf906239a2a52a5c922e0a195116ae73548c6d47212faa682b7b12f7bd20b68a167d86ecebfd2f6561236ff53bffcf093686bbf7c2c1893d6fa SHA512 dcb73024498715f8173c65076fa02a78873d01f22849fa568a6757384fc93e47981f1c95125a56646612f7dc4af39b4995ba0ef1ef41467f51eb60a99ee2b030
 MISC metadata.xml 327 BLAKE2B 24ec22d469778c0c13d9bf96aed3214f59598b5ddf6a6bdf7dbe971e014396e8075c62059b1033ccdca6c5acca1af0fa2c1f377b006471358238402b40d7fec5 SHA512 9b9c5a4a88cf046ad30bf9764d7d865d692c73477220cc871e7e727fe3f718302c9ff1a8492b165270a88049e2bdebe68923415e52da1257971d887d8f808f7d
diff --git a/sys-fs/mtools/mtools-4.0.24.ebuild b/sys-fs/mtools/mtools-4.0.24.ebuild
index a10154dee9ba..163ada6df317 100644
--- a/sys-fs/mtools/mtools-4.0.24.ebuild
+++ b/sys-fs/mtools/mtools-4.0.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x64-macos ~x64-solaris"
 IUSE="X elibc_glibc"
 
 RDEPEND="
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index ee3617b12bfa..1f1c5133793c 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -15,6 +15,6 @@ DIST multipath-tools-0.8.3.tar.gz 465248 BLAKE2B 21a7a18c70150b4422bdd0ae02f26f4
 DIST multipath-tools-0.8.4.tar.gz 480994 BLAKE2B be8368df049218e2eaa1749e7b1c7a930da15f0311ab549b1bbba9c019dcfe39f90a05fd621e0703301ef1d55c98ac8cc74231d82950d9066f19d8764421704b SHA512 720823188c053c1c50269a30e34a9d69099098495bfd607076bcfa2c079565e3f0580c91783f19d42ed82290c0db98e4e19ef620eca4ee5ec7885c49c72d2307
 EBUILD multipath-tools-0.6.4-r1.ebuild 2545 BLAKE2B f22afaabe21080d64175063c82e5a731d9e789968d1502b3771ade1eeb3ba3bf539d9cd1d100b75875a5f86fe85ef1ed77b8fee5178829ae301df23eadb0765c SHA512 21c5474be753c3762af2e1b73aab89d666d6f477d04b612360925ff10d994b1fd1152204a5254a39d87438cce274c0d57cb7003e37679b49d22b159fe5c0cfce
 EBUILD multipath-tools-0.7.9.ebuild 2068 BLAKE2B ec54d156a55c25a9c7cc9c6c3854a48c8bb1d404119398bfdb9defcb5c011e1824ce82f53cd5cc4d8e81a63bb412d11cb79ac276406e140f2808b911f7912947 SHA512 8e1fff8d8c71b2cac948e5501edef63acb7e0ba760e7b56a22644e0e08ce3cb9b70c29e69550f6a356113154f740a4e95199ac14e44b3d2db338605954d19be4
-EBUILD multipath-tools-0.8.3-r2.ebuild 2215 BLAKE2B 6df0b2588f7838f365a942b7f8cc47e7aa369b53b0c2d364bfe083b08a9930143a1ad99aaeb795c2eb84a3f7ba558b93c213110f4fa8b58a53150c8c5912d63f SHA512 4f483b7f0231483a7597b436d3e2eeffeee57626937238565978f5733b9892f88b09bd599f7e473092ccdbbf1d19d3a87b26c88dbe6bb9574b98261c902a7f9c
+EBUILD multipath-tools-0.8.3-r2.ebuild 2214 BLAKE2B bf6650365f7fe7548f6643e5935752851bc8b89ce0e3276f90d74398e8e198ef9cea082136781f2e89fb1447bdcdc8830478757fc347597af62d5b366ecd87fe SHA512 e01fe5c6c6ecd49c09afb3f9920a15d70d487d11c9a06a3214cd10a91170f557f152a847b867756cc61534edb0f9d3d21f75966e60fa77ca5b7fa7419e26e50c
 EBUILD multipath-tools-0.8.4.ebuild 2214 BLAKE2B 90daeab97f15ecfe9ffae2158825dce22578cf0d77c6bc576ad55d643a88759083c4270c3923d587ce7aa78709f2d14957c16209c745273ef085011b39e4f0aa SHA512 c748accc0babbe40ab7e8c5950a12df281bdf47a700e62d9b24c4737d5df967fbf23e5ca3902cf13c2d86fe9c26b9be8f15d1ac4b5f8d829e6a50382d5615409
 MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
index d1edcd936a90..ab5b8e5272a9 100644
--- a/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.3-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=t
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 x86"
 IUSE="systemd rbd"
 
 BDEPEND="virtual/pkgconfig"
diff --git a/sys-fs/reiser4progs/Manifest b/sys-fs/reiser4progs/Manifest
index ce5a28edf6ee..4bff3fcde9f1 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.2.1.tar.gz 980203 BLAKE2B 8c9cb77458c083c50f34c17bddf4747b755b52b911a63835152ad584494c2738a5317c28e5b3f1e6bfdc49416f3715ca4fbbd9c8a428b5b484b54f8f4a861a58 SHA512 2caac5a98d672d68910c6df3e694a42365fa6273ae367c26126778c1fbe956aa502dac236d36c3302a5bf109468ad3447e645a6eab89c83f122dd1afe2aeda21
-DIST reiser4progs-2.0.0.tar.gz 1019362 BLAKE2B 94d94697e427932b82634a756e7797ba7b061592c4ce946660f3c7750eb48ece7a5c0a265aa392a463c598212a87ec9fe769af88f680fa24adff36bd6db51128 SHA512 1993a38b2c4f339acb5d305b3b4c3360e57bf3df4684543f708bfd1062ecfb2435dd16e22f9555ab1317d77e95750cf9c2b2f81a91a109ad65aa30a5e7d815bd
-DIST reiser4progs-2.0.1.tar.gz 1019909 BLAKE2B d415a32c0d75e311ca0ece734a1f95273403341c4e38eee9e036c5c83a95d6e3aaebae8e5b89c713bbe7630c5dd902438b582e7ab1197202f7f5027702c89a67 SHA512 c1f5ab1ef36e959fb03bee81ddc4ad62152d43867d3021fa41aa07eca64a16e8bf56f6cf27378e0df9f77f223fd3d334f13c015620cd16f0aa1b9e7718274d14
+DIST reiser4progs-2.0.2.tar.gz 994469 BLAKE2B ac680b901807c22b246ea5601b89d51fdd8ea12636bdacbddcdb191455c4ede50b116edd0d8d7398f99d6fb26ea9f44c5ffc561296ab3ee1c3ae0b5eade2e1ec SHA512 b7473c6ab4e3f3249b60081ac31e92c267a1408c32f82dc6d27e92297ac4e90263c129ef748891ca4c7cf31035ac723867f9bed649bae9ea1b73525278fdfdb3
+DIST reiser4progs-2.0.3.tar.gz 995921 BLAKE2B fa38c8998603ca0c26a17c75240d07afec6c46da1b437e5a733ce3a5a865329591d4343b52d7fd5dc56bb6afe34f4f7685e7dc258ed075dfe4a70a7ad420324a SHA512 59bcd6d73a220fd0e71cc4213489801f45597ebfcf0be55f150e929ef391e0a461a94ab99ee9698e1fb1eb58840497277ece6a2ea57e88d54573347a8854da87
 EBUILD reiser4progs-1.2.1.ebuild 1295 BLAKE2B 8ef4781ad4a121a92f6c732ba92eb8d6adb51f918eb975eb7cb97969135d1380e41bb1b010788ebd970805d29d8ca7267387ed3da75943922ac0fad729066ef1 SHA512 81f2db7655fe926394e628cacc97ef1d1749a4387393a7c04575cff245268f42b8e9fa58c974a5a8647b9d34f9e73b4f9b596dc70bf512f53b90fd3022af9fdd
-EBUILD reiser4progs-2.0.0.ebuild 1341 BLAKE2B dd6207a5efd9f565c717ae0fc1517a1c2208e9efdddc71fed1d3b83ff0c890def4681029e828208009fd5c5f0fc7dab22c2ed488893921817b2bcd9cc17f331a SHA512 1d14e1acf510629aa32e6b7a50dcdb962e332ae7f5c8402b63e97ab2b5d16d244835a7a858cd477143b5d1a085db3534903c183e2cb81b113c4987840a1cc5a4
-EBUILD reiser4progs-2.0.1.ebuild 1341 BLAKE2B dd6207a5efd9f565c717ae0fc1517a1c2208e9efdddc71fed1d3b83ff0c890def4681029e828208009fd5c5f0fc7dab22c2ed488893921817b2bcd9cc17f331a SHA512 1d14e1acf510629aa32e6b7a50dcdb962e332ae7f5c8402b63e97ab2b5d16d244835a7a858cd477143b5d1a085db3534903c183e2cb81b113c4987840a1cc5a4
+EBUILD reiser4progs-2.0.2.ebuild 1341 BLAKE2B dd6207a5efd9f565c717ae0fc1517a1c2208e9efdddc71fed1d3b83ff0c890def4681029e828208009fd5c5f0fc7dab22c2ed488893921817b2bcd9cc17f331a SHA512 1d14e1acf510629aa32e6b7a50dcdb962e332ae7f5c8402b63e97ab2b5d16d244835a7a858cd477143b5d1a085db3534903c183e2cb81b113c4987840a1cc5a4
+EBUILD reiser4progs-2.0.3.ebuild 1341 BLAKE2B dd6207a5efd9f565c717ae0fc1517a1c2208e9efdddc71fed1d3b83ff0c890def4681029e828208009fd5c5f0fc7dab22c2ed488893921817b2bcd9cc17f331a SHA512 1d14e1acf510629aa32e6b7a50dcdb962e332ae7f5c8402b63e97ab2b5d16d244835a7a858cd477143b5d1a085db3534903c183e2cb81b113c4987840a1cc5a4
 MISC metadata.xml 440 BLAKE2B ccaa949c04b37b13f2b7d11a4ab6586de239bc61be58e772f160e797e6da6c102b66be660e57e7888ca5960911b0dd2455978709de0d6e75b615a37bd870e8de SHA512 f12899412ca119abba07a6012e55f243ea069e1132c7dd9786aeb399f7d543ff82cba92f0957443ec08f230e68bc257729b789519ef52337ebc5679ee63b3ddc
diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.0.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.2.ebuild
index fa83088da8fb..fa83088da8fb 100644
--- a/sys-fs/reiser4progs/reiser4progs-2.0.0.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-2.0.2.ebuild
diff --git a/sys-fs/reiser4progs/reiser4progs-2.0.1.ebuild b/sys-fs/reiser4progs/reiser4progs-2.0.3.ebuild
index fa83088da8fb..fa83088da8fb 100644
--- a/sys-fs/reiser4progs/reiser4progs-2.0.1.ebuild
+++ b/sys-fs/reiser4progs/reiser4progs-2.0.3.ebuild
diff --git a/sys-fs/squashfs-tools-ng/Manifest b/sys-fs/squashfs-tools-ng/Manifest
index d41cd8d69851..3d42ef817c09 100644
--- a/sys-fs/squashfs-tools-ng/Manifest
+++ b/sys-fs/squashfs-tools-ng/Manifest
@@ -1,7 +1,4 @@
-AUX squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch 2014 BLAKE2B 2e48b1343a52439e894d2058c4b8bc8d0ca18b709217882e92828479b9886d06e612117c270659b399b35d46b81eb0ddcae4f55e9116be048f647da028b35377 SHA512 3684736818b807f433b0f69c2a4d6439e4f204563b8fc8667cfa0f95d13860eb42c1775adc0d4689f8bf26888e6da9d2ed5308794d2bc2deb0c27c2391cd548e
-DIST squashfs-tools-ng-0.9.1.tar.xz 1026036 BLAKE2B 3e0a0acf5b11ea42bad2149a9b97442739f1eceacfc0f5b009403d4616fcd02d69082e2e0721be3a1d6d9ba67ce6287b12ea13fba6409cb751e844f5d48ce7ea SHA512 eb550430917f267ec1ef1d11795167a6893031fc184f914170679cd24c16930a8f73a2b04a349ce1602e80a327957db7935369965a892fbe4904b6e01bb48b5c
-DIST squashfs-tools-ng-1.0.0.tar.xz 1079912 BLAKE2B b7a9e4cafc31c0058d73b1a8b69125f92d753214f6e9f0372558271bbd8df163d9b3bf3fea45b96da5044c86e75affc2bfd27826d3725a35fbb417e443cf6ccb SHA512 536f12aa53214f88739cea0d26c55e04434c284935ff1d59ee8f5108acd92fc11e800e42e3a112524d09dbd1fa50c4f15c3211ff5d02ae50b7fa137600d2ae15
-EBUILD squashfs-tools-ng-0.9.1.ebuild 1122 BLAKE2B d7dd3c7314464d58d15f6229a52ee3336d853fae9f3238459202f385dbf253906b6a94fd4ea4469ccfd756abe4c504a3a40ad6c1f4442dd41b7b0448d29fde9e SHA512 d4c951eeb931881b710cdddafb381492b1698ac9b86506a73a73b346ace42f4048420bd035fff53a5bfa08bbd7ffcd958f254a4eef24316326c86fb92ae5214a
-EBUILD squashfs-tools-ng-1.0.0.ebuild 1201 BLAKE2B cc3f5a6908e0681a1a69d7c5966a6c27b63670339c8b02d3aa082bd2b088e79ff544437dcd5f2a179e049e1c7ec63a9493159b5d7198c4409690c491c110da53 SHA512 2420d389f4359a9bf1c5b99ddbb3f81a4182052050544e44bdd28b1e51fcf47c4f605cca8362df568311085a21d8e08c9efd2ff0c5f25011017fbe6e5e0784bc
+DIST squashfs-tools-ng-1.0.1.tar.xz 1079720 BLAKE2B efc4d715c65d42876d5ac51364d195267c6bc6c2219fea5746231bc4efbd9adac3fa23ea58f837da8610179f3d96ec9422efebe4ae231f4ab243cf948e64fa9b SHA512 3b597b7bf654c6897e04dc6c18cec6034a8f0c0fe070c8d6eb3c8f4a06f4ab2ea8c970ac18c12f05ccb3015cf911790e945798a34361fdb7d1a442a1ca646a04
+EBUILD squashfs-tools-ng-1.0.1.ebuild 1122 BLAKE2B d7dd3c7314464d58d15f6229a52ee3336d853fae9f3238459202f385dbf253906b6a94fd4ea4469ccfd756abe4c504a3a40ad6c1f4442dd41b7b0448d29fde9e SHA512 d4c951eeb931881b710cdddafb381492b1698ac9b86506a73a73b346ace42f4048420bd035fff53a5bfa08bbd7ffcd958f254a4eef24316326c86fb92ae5214a
 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/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch b/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch
deleted file mode 100644
index e61d881c74bf..000000000000
--- a/sys-fs/squashfs-tools-ng/files/squashfs-tools-ng-1.0.0-extras-Pass-flags-argument-to-fix-build.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 4c10a491a2ddfcdc3226431a71aefd6ca71135d4 Mon Sep 17 00:00:00 2001
-From: Matt Turner <mattst88@gmail.com>
-Date: Sat, 13 Jun 2020 11:05:49 -0700
-Subject: [PATCH] extras: Pass flags argument to fix build
-
-Missed in commit 259a98985b4f (Add flags to functions that might
-logically be expanded in the future)
-
-Signed-off-by: Matt Turner <mattst88@gmail.com>
----
- extras/browse.c | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/extras/browse.c b/extras/browse.c
-index ef4e223..86ce788 100644
---- a/extras/browse.c
-+++ b/extras/browse.c
-@@ -63,7 +63,7 @@ static void list_directory(const char *dirname)
- 
- 	/* Get the directory inode we want to dump and open the directory */
- 	if (dirname == NULL) {
--		ret = sqfs_dir_reader_open_dir(dr, working_dir);
-+		ret = sqfs_dir_reader_open_dir(dr, working_dir, 0);
- 		if (ret)
- 			goto fail_open;
- 	} else if (*dirname == '/') {
-@@ -74,7 +74,7 @@ static void list_directory(const char *dirname)
- 		if (ret)
- 			goto fail_resolve;
- 
--		ret = sqfs_dir_reader_open_dir(dr, inode);
-+		ret = sqfs_dir_reader_open_dir(dr, inode, 0);
- 		free(inode);
- 		if (ret)
- 			goto fail_open;
-@@ -84,7 +84,7 @@ static void list_directory(const char *dirname)
- 		if (ret)
- 			goto fail_resolve;
- 
--		ret = sqfs_dir_reader_open_dir(dr, inode);
-+		ret = sqfs_dir_reader_open_dir(dr, inode, 0);
- 		free(inode);
- 		if (ret)
- 			goto fail_open;
-@@ -526,7 +526,7 @@ int main(int argc, char **argv)
- 	}
- 
- 	/* create a directory reader and get the root inode */
--	dr = sqfs_dir_reader_create(&super, cmp, file);
-+	dr = sqfs_dir_reader_create(&super, cmp, file, 0);
- 	if (dr == NULL) {
- 		fprintf(stderr, "%s: error creating directory reader.\n",
- 			argv[1]);
-@@ -539,7 +539,7 @@ int main(int argc, char **argv)
- 	}
- 
- 	/* create a data reader */
--	data = sqfs_data_reader_create(file, super.block_size, cmp);
-+	data = sqfs_data_reader_create(file, super.block_size, cmp, 0);
- 
- 	if (data == NULL) {
- 		fprintf(stderr, "%s: error creating data reader.\n",
--- 
-2.26.2
-
diff --git a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.0.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.0.ebuild
deleted file mode 100644
index e9e3aff7cec4..000000000000
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2019-2020 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}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-extras-Pass-flags-argument-to-fix-build.patch
-)
-
-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-ng/squashfs-tools-ng-0.9.1.ebuild b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.1.ebuild
index 79c567828ddc..79c567828ddc 100644
--- a/sys-fs/squashfs-tools-ng/squashfs-tools-ng-0.9.1.ebuild
+++ b/sys-fs/squashfs-tools-ng/squashfs-tools-ng-1.0.1.ebuild
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index 5cfe8e724021..17bc6aa48fc3 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -1,4 +1,6 @@
 DIST udev-init-scripts-33.tar.gz 3698 BLAKE2B fc79b3f6984131180324919f7be4309715976309ee582147662634bb020b8162b293e7fd0e675a9cc7a3b1630ce0fc49b29c899e393c7748d47cf924b1ca2809 SHA512 2119aace937da02f47a5adc9af720587d25c2852cf70a9bcb04138e3ee511308c8f30cf0301fbec58cf0432b7fd6672ae6a02d1740c774703959197b3511fbcc
+DIST udev-init-scripts-34.tar.gz 3660 BLAKE2B 954b003c78b31649fef69213a5424098f40e17e7ed11f4ec1443247950ea60db8536f37ca603caa06e5c9f8bab07b5ac3cb8c9435144532a97ff04836c24da49 SHA512 ed48bcd0815e235b2b3fa38f857cd97f164aac7c6ea805be87890eb06a0d52064bd733da240c6e2a34c8c73e10fd047b5e53096de06f17bc81d8266d70c0cc9d
 EBUILD udev-init-scripts-33.ebuild 1494 BLAKE2B 1acf9890fb8edb06696a0987da6c1d669466b93151098c4e8a8ef87f60fc90deab921dfdd2e2e3791e992009479d0b02117d7ddf57c25092c9e97a7473e24830 SHA512 cb0d39a1a39b2b98502a43d7f13d55b2e793c85eadaea67cdc0c78df6998116141feafde95213b29cbb4a546170b64b0c840bfbc0006165af5c49f8dd83e06c5
+EBUILD udev-init-scripts-34.ebuild 1503 BLAKE2B a614dce0bc178b33855ff0ae5790a667f17e4bbf2b9e534f9e1afa3cd794ab7a45ca6154bf8afaf6506ea45ebd40556dd80cc477012985a92b237fc419ae6893 SHA512 dedab3ab6ec47a04eee618505796e21a6db709b89d3b69b37b3572af0fa0f1d5b495d2027088e3ccaa6cb966ac65ebf58f7aea25caa1331ca9a222f29f8b9640
 EBUILD udev-init-scripts-9999.ebuild 1502 BLAKE2B 37464301789e4136261003f133a06b7f0f692ca30fa1a6509e621d4a7ab0dc4a300a9718e5c9dc4e9adf6818fac510729f381864b9d9d2453c095fa293cac187 SHA512 352ad2bbb4407cb664897de841345946856cad1adcb05a7c360cf52c98706d488c5ce1eaedad3e68304d04c2980c7a07b54227e50b6c33e5176cc9d84234b24b
 MISC metadata.xml 221 BLAKE2B 9e0d24573ec598eccd3ad7e41a38ead4192d9e757ff4b870b51b02a96f04a13596b15c5c05ee2a4d888c4b9b0b9b30aafe5ba96d39ff9faa157b58e30e91ba55 SHA512 accbe81ec1cf4c8d7c6eb99b7ceb7a8119eb1f2f55dcaf6d368610c255e7a21ff222e7c613ca4be37083ce9527ca325f3ee91515dadad7c5929f60f4fda334df
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild
new file mode 100644
index 000000000000..0fa826de5d68
--- /dev/null
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-34.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+OLD_PN=udev-gentoo-scripts
+OLD_P=${OLD_PN}-${PV}
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://anongit.gentoo.org/proj/${OLD_PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${OLD_PN}.git/snapshot/${OLD_P}.tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}/${OLD_P}"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="udev startup scripts for openrc"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+RESTRICT="test"
+
+RDEPEND=">=virtual/udev-217
+	!<sys-apps/openrc-0.14"
+
+src_install() {
+	local -x SYSCONFDIR="${EPREFIX}/etc"
+	default
+}
+
+pkg_postinst() {
+	# Add udev and udev-trigger to the sysinit runlevel automatically.
+	for f in udev udev-trigger; do
+		if [[ -x "${EROOT}/etc/init.d/${f}" &&
+			-d "${EROOT}/etc/runlevels/sysinit" &&
+			! -L "${EROOT}/etc/runlevels/sysinit/${f}" ]]; then
+			ln -snf "${EPREFIX}/etc/init.d/${f}" "${EROOT}/etc/runlevels/sysinit/${f}"
+			ewarn "Adding ${f} to the sysinit runlevel"
+		fi
+	done
+
+	if ! has_version "sys-fs/eudev[rule-generator]" && \
+	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
+		ewarn "The udev-postmount service has been removed because the reasons for"
+		ewarn "its existance have been removed upstream."
+		ewarn "Please remove it from your runlevels."
+	fi
+}
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 3ba0bcefa5d9..319cb9118b07 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -1,12 +1,11 @@
 AUX 242-gcc-9.patch 7672 BLAKE2B 1cd98213f70e6813582706e7b523925fd7956507bd5bf113889189d3a5da3e0eb287163449d023755269827e3b5dc8db758a51cd9f37c3f3a69510de31b43109 SHA512 57add7e3215f25ec5547a905c7257ca06adca30d2f4a031eee9882ac16586ea5c5c9d3b50206674dffdb182c78f048834b6c73ab1490253a1ddae15c35878554
 DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
 DIST systemd-243.tar.gz 8242522 BLAKE2B 89e3ebbea5a99061329f7c78220a66c1e075d5ba90dfdf5ee8d0d9b762ef4600dc82d8ca2054632e5e343b6272cd8046c92f7f99dcfa8287c5ef2b42fb96d4cb SHA512 56b52a297aa5ac04d9667eb3afb1598725b197de73ff72baa1aabbc2844e36fba7b7fccdf6d214ae8b5b926616b2b7e15772763aaa80ec938d74333ff9c8673e
-DIST systemd-245.tar.gz 8993479 BLAKE2B be0b1fca5ba8585978f570868bc9135c1fee78ea64dcdf8b1a3419e856a83da90104ed2f86e5f3e5b0b6f29d4b34f603bfe1e4cbc61ccf71bedce547db62ff35 SHA512 1b80d0e02472dfc4197f11dab4f56cf90e8a6e105ce19f837cb11335b6d8577ed49031dad94cdb41aa9bdc06ec8eec62c8e9246272b83935e7bb9dcd3cd8c012
+DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-stable-245.5.tar.gz 9020836 BLAKE2B 7753eecceffa86c9208c3e71df2037b58b445f9090b73c6ff499b4170b94488a1fd1cabcd17cbb98506a692875a3eef07a40a54d23e09c331a01319f8d03d13d SHA512 47de4a59980643002f325c499eeb4dd76fa9f1d1267686e7564f103690487bf85974590d7cb3e3641409e5bfba567fe2a66efa80320e7e8adc48af4461e2e172
 EBUILD udev-242.ebuild 9610 BLAKE2B 0dcc6a6952d3c8681ee17710b45366ab9d11e75f57173ed51160b148a038f27fe9def06257ccc070f25777c03eb569febc75bab5bf3b82517de93cea8f7003b6 SHA512 29fe9d4174b70d474e65c7ef67a799ef8a0b3918a3fd811318f119fadf6dc4637c7d24bf9acbe99e4674a461402479c4ca4312babe27beb01a114b79df019944
 EBUILD udev-243-r2.ebuild 9807 BLAKE2B afd9f20de9da69ae4479bfa2c19682555cdce783194ebef1ff56be2e43e6d4df6645653a2e554532a6cf86630f3f6e7dd100e1e98ff437ac2ac962ecd2264247 SHA512 4e6aafea5860f2d9f9b905b093dcdbf1f618dc51c00eca4557aa22ac5acbd765422a962e0d4b5fff14c76f6341df93199689d36477a08046591ab277399b7d6d
-EBUILD udev-243.ebuild 9566 BLAKE2B 3f5159a90dfb4be8a55c894820db190692f36542d01cc68120efb59201a1bb65299b91175f9ee4739836477aca71618dbc28407106de9049bf9db7deb0b89637 SHA512 923ae752ec75c8d5ff42fcf929932e04972dbcd529d2ac85decaa7998ace17e0bde3ef304e8097892f29f5ed0235388742f2668b06b7653b63e19bdd19934206
-EBUILD udev-245.5.ebuild 5831 BLAKE2B 5c14d8b206de3c8c676c621784535556e4bdba5eacadffda1c9812992b93d88d91129da8c98598fe43c2b3f04d627a939879d4fb8a96ef71070cdf436f3e8b83 SHA512 3c6ca63e31cb5aacec6d223636723e485012a9ef6d36e604d367065ccc488a168b4d0f93d04a1091427a87339ad838b0ca41982cef5c0a30d3a81ea1a5180098
-EBUILD udev-245.ebuild 5751 BLAKE2B 89d14d90da8ac39fc27e2cd9399753daa3af91cdcc6ec55a24c46689ba838783065c185a3bb01cb9ecf35c52ca3e922c354ca43908e5e43bd80bdeebd050d22f SHA512 e11924682be87e73ea757947fae7997d72386265847c73941fb518d94de81f4f1169e87bcd954b25e06b0148016d419635010fc7d4e5adbbafb3b47c1437a19e
-EBUILD udev-9999.ebuild 5831 BLAKE2B 5c14d8b206de3c8c676c621784535556e4bdba5eacadffda1c9812992b93d88d91129da8c98598fe43c2b3f04d627a939879d4fb8a96ef71070cdf436f3e8b83 SHA512 3c6ca63e31cb5aacec6d223636723e485012a9ef6d36e604d367065ccc488a168b4d0f93d04a1091427a87339ad838b0ca41982cef5c0a30d3a81ea1a5180098
+EBUILD udev-245.5-r1.ebuild 5851 BLAKE2B 05143f65bf4bcc96e17a40129ea659bda1802e1c6e0cdb45514f970ac6653243b7c7915bb0a5e349e4668c2ee11bfce2cb7555f07d836c581b0aabdf96d8ba00 SHA512 59827cc29d73ec3119fb3ece47c9d3b97a9bc82c88c53b3a3569b4828346b50dbbc05ccc28a17823075c986fcbe9ac5820eff5e403d7a6194061c989d5f8f456
+EBUILD udev-246-r1.ebuild 5850 BLAKE2B afc24f86962029dcf04e3de5f6607364e767a94dc6fde89823419dc5d03dc6b6b8f8d2bbb97bef3dc61c5e83b90236e7be5beaf9e1184c8a450e9266b51c7021 SHA512 de8e68b6580eb27caa9970d0fdce6b4be75301dd7fe79686932fe9acf5ce6e4568e12c5905543422150545e8346449b1bcc9816124545d6895df93129fe76e85
+EBUILD udev-9999.ebuild 5850 BLAKE2B afc24f86962029dcf04e3de5f6607364e767a94dc6fde89823419dc5d03dc6b6b8f8d2bbb97bef3dc61c5e83b90236e7be5beaf9e1184c8a450e9266b51c7021 SHA512 de8e68b6580eb27caa9970d0fdce6b4be75301dd7fe79686932fe9acf5ce6e4568e12c5905543422150545e8346449b1bcc9816124545d6895df93129fe76e85
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-243.ebuild b/sys-fs/udev/udev-243.ebuild
deleted file mode 100644
index 0a23777e5dea..000000000000
--- a/sys-fs/udev/udev-243.ebuild
+++ /dev/null
@@ -1,329 +0,0 @@
-# Copyright 2003-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 linux-info meson ninja-utils multilib-minimal toolchain-funcs udev
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_/-}
-	MY_P=systemd-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="LGPL-2.1 MIT GPL-2"
-SLOT="0"
-IUSE="acl +kmod selinux"
-
-RESTRICT="test"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30[${MULTILIB_USEDEP}]
-	sys-libs/libcap[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl )
-	kmod? ( >=sys-apps/kmod-16 )
-	selinux? ( >=sys-libs/libselinux-2.1.9 )
-	!<sys-libs/glibc-2.11
-	!sys-apps/gentoo-systemd-integration
-	!sys-apps/systemd"
-DEPEND="${COMMON_DEPEND}
-	dev-util/gperf
-	>=dev-util/intltool-0.50
-	>=dev-util/meson-0.40.0
-	dev-util/ninja
-	>=sys-apps/coreutils-8.16
-	virtual/os-headers
-	virtual/pkgconfig
-	>=sys-kernel/linux-headers-3.9
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt"
-RDEPEND="${COMMON_DEPEND}
-	acct-group/kmem
-	acct-group/tty
-	acct-group/audio
-	acct-group/cdrom
-	acct-group/dialout
-	acct-group/disk
-	acct-group/input
-	acct-group/kvm
-	acct-group/lp
-	acct-group/render
-	acct-group/tape
-	acct-group/video
-	!<sys-fs/lvm2-2.02.103
-	!<sec-policy/selinux-base-2.20120725-r10"
-PDEPEND=">=sys-apps/hwids-20140304[udev]
-	>=sys-fs/udev-init-scripts-26"
-
-pkg_setup() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		CONFIG_CHECK="~BLK_DEV_BSG ~DEVTMPFS ~!IDE ~INOTIFY_USER ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2 ~SIGNALFD ~EPOLL ~FHANDLE ~NET ~!FW_LOADER_USER_HELPER ~UNIX"
-		linux-info_pkg_setup
-
-		# CONFIG_FHANDLE was introduced by 2.6.39
-		local MINKV=2.6.39
-
-		if kernel_is -lt ${MINKV//./ }; then
-			eerror "Your running kernel is too old to run this version of ${P}"
-			eerror "You need to upgrade kernel at least to ${MINKV}"
-		fi
-
-		if kernel_is -lt 3 7; then
-			ewarn "Your running kernel is too old to have firmware loader and"
-			ewarn "this version of ${P} doesn't have userspace firmware loader"
-			ewarn "If you need firmware support, you need to upgrade kernel at least to 3.7"
-		fi
-	fi
-}
-
-src_prepare() {
-	cat <<-EOF > "${T}"/40-gentoo.rules
-	# Gentoo specific floppy and usb groups
-	ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy"
-	ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb"
-	EOF
-
-	if [[ -d "${WORKDIR}/patches" ]]; then
-		eapply "${WORKDIR}/patches"
-	fi
-
-	default
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Dacl=$(meson_multilib_native_use acl)
-		-Defi=false
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Dlink-udev-shared=false
-		-Dsplit-usr=true
-
-		# Prevent automagic deps
-		-Dgcrypt=false
-		-Dlibcryptsetup=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dseccomp=false
-		-Dlz4=false
-		-Dxz=false
-	)
-	meson_src_configure
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	# meson creates this link
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	local targets=(
-		src/udev/${libudev}
-	)
-	if multilib_is_native_abi; then
-		targets+=(
-			systemd-udevd
-			udevadm
-			src/udev/ata_id
-			src/udev/cdrom_id
-			src/udev/mtd_probe
-			src/udev/scsi_id
-			src/udev/v4l_id
-			man/udev.conf.5
-			man/systemd.link.5
-			man/hwdb.7
-			man/udev.7
-			man/systemd-udevd.service.8
-			man/udevadm.8
-		)
-	fi
-	eninja "${targets[@]}"
-}
-
-multilib_src_install() {
-	local libudev=$(readlink src/udev/libudev.so.1)
-
-	into /
-	dolib.so src/udev/{${libudev},libudev.so.1,libudev.so}
-
-	insinto "/usr/$(get_libdir)/pkgconfig"
-	doins src/libudev/libudev.pc
-
-	if multilib_is_native_abi; then
-		into /
-		dobin udevadm
-
-		exeinto /lib/systemd
-		doexe systemd-udevd
-
-		exeinto /lib/udev
-		doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
-
-		rm rules/99-systemd.rules || die
-		insinto /lib/udev/rules.d
-		doins rules/*.rules
-
-		insinto /usr/share/pkgconfig
-		doins src/udev/udev.pc
-
-		mv man/systemd-udevd.service.8 man/systemd-udevd.8 || die
-		rm man/systemd-udevd-{control,kernel}.socket.8 || die
-		doman man/*.[0-9]
-	fi
-}
-
-multilib_src_install_all() {
-	doheader src/libudev/libudev.h
-
-	insinto /etc/udev
-	doins src/udev/udev.conf
-	keepdir /etc/udev/{hwdb.d,rules.d}
-
-	insinto /lib/systemd/network
-	doins network/99-default.link
-
-	# see src_prepare() for content of 40-gentoo.rules
-	insinto /lib/udev/rules.d
-	doins "${T}"/40-gentoo.rules
-	doins "${S}"/rules/*.rules
-
-	dobashcomp shell-completion/bash/udevadm
-
-	insinto /usr/share/zsh/site-functions
-	doins shell-completion/zsh/_udevadm
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	mkdir -p "${ROOT%/}"/run
-
-	# "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766
-	# So try to remove it here (will only work if empty).
-	rmdir "${ROOT%/}"/dev/loop 2>/dev/null
-	if [[ -d ${ROOT%/}/dev/loop ]]; then
-		ewarn "Please make sure your remove /dev/loop,"
-		ewarn "else losetup may be confused when looking for unused devices."
-	fi
-
-	local fstab="${ROOT%/}"/etc/fstab dev path fstype rest
-	while read -r dev path fstype rest; do
-		if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then
-			ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs"
-			ewarn "filesystem. Otherwise udev won't be able to boot."
-			ewarn "See, https://bugs.gentoo.org/453186"
-		fi
-	done < "${fstab}"
-
-	if [[ -d ${ROOT%/}/usr/lib/udev ]]; then
-		ewarn
-		ewarn "Please re-emerge all packages on your system which install"
-		ewarn "rules and helpers in /usr/lib/udev. They should now be in"
-		ewarn "/lib/udev."
-		ewarn
-		ewarn "One way to do this is to run the following command:"
-		ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)"
-		ewarn "Note that qfile can be found in app-portage/portage-utils"
-	fi
-
-	local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules
-	local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules
-	for old_rules in "${old_cd_rules}" "${old_net_rules}"; do
-		if [[ -f ${old_rules} ]]; then
-			ewarn
-			ewarn "File ${old_rules} is from old udev installation but if you still use it,"
-			ewarn "rename it to something else starting with 70- to silence this deprecation"
-			ewarn "warning."
-		fi
-	done
-
-	elog
-	elog "Starting from version >= 197 the new predictable network interface names are"
-	elog "used by default, see:"
-	elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-	elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c"
-	elog
-	elog "Example command to get the information for the new interface name before booting"
-	elog "(replace <ifname> with, for example, eth0):"
-	elog "# udevadm test-builtin net_id /sys/class/net/<ifname> 2> /dev/null"
-	elog
-	elog "You can use either kernel parameter \"net.ifnames=0\", create empty"
-	elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null"
-	elog "to disable the feature."
-
-	if has_version 'sys-apps/biosdevname'; then
-		ewarn
-		ewarn "You can replace the functionality of sys-apps/biosdevname which has been"
-		ewarn "detected to be installed with the new predictable network interface names."
-	fi
-
-	ewarn
-	ewarn "You need to restart udev as soon as possible to make the upgrade go"
-	ewarn "into effect."
-	ewarn "The method you use to do this depends on your init system."
-	if has_version 'sys-apps/openrc'; then
-		ewarn "For sys-apps/openrc users it is:"
-		ewarn "# /etc/init.d/udev --nodeps restart"
-	fi
-
-	elog
-	elog "For more information on udev on Gentoo, upgrading, writing udev rules, and"
-	elog "fixing known issues visit:"
-	elog "https://wiki.gentoo.org/wiki/Udev"
-	elog "https://wiki.gentoo.org/wiki/Udev/upgrade"
-
-	# If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null,
-	# do the same for 80-net-setup-link.rules to keep the old behavior
-	local net_move=no
-	local net_name_slot_sym=no
-	local net_rules_path="${ROOT%/}"/etc/udev/rules.d
-	local net_name_slot="${net_rules_path}"/80-net-name-slot.rules
-	local net_setup_link="${net_rules_path}"/80-net-setup-link.rules
-	if [[ ! -e ${net_setup_link} ]]; then
-		[[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes
-		if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then
-			net_move=yes
-			net_name_slot_sym=yes
-		fi
-	fi
-	if [[ ${net_move} == yes ]]; then
-		ebegin "Copying ${net_name_slot} to ${net_setup_link}"
-
-		if [[ ${net_name_slot_sym} == yes ]]; then
-			ln -nfs /dev/null "${net_setup_link}"
-		else
-			cp "${net_name_slot}" "${net_setup_link}"
-		fi
-		eend $?
-	fi
-
-	# Update hwdb database in case the format is changed by udev version.
-	if has_version 'sys-apps/hwids[udev]'; then
-		udevadm hwdb --update --root="${ROOT%/}"
-		# Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd
-		# https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda
-		[[ -z ${REPLACING_VERSIONS} ]] && udev_reload
-	fi
-}
diff --git a/sys-fs/udev/udev-245.5.ebuild b/sys-fs/udev/udev-245.5-r1.ebuild
index 4b884c8001b5..b5b2acbecf9a 100644
--- a/sys-fs/udev/udev-245.5.ebuild
+++ b/sys-fs/udev/udev-245.5-r1.ebuild
@@ -18,7 +18,7 @@ else
 	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
 	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -161,6 +161,7 @@ multilib_src_compile() {
 			udevadm
 			src/udev/ata_id
 			src/udev/cdrom_id
+			src/udev/fido_id
 			src/udev/mtd_probe
 			src/udev/scsi_id
 			src/udev/v4l_id
@@ -193,7 +194,7 @@ multilib_src_install() {
 		doexe systemd-udevd
 
 		exeinto /lib/udev
-		doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
+		doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
 
 		rm rules.d/99-systemd.rules || die
 		insinto /lib/udev/rules.d
diff --git a/sys-fs/udev/udev-245.ebuild b/sys-fs/udev/udev-246-r1.ebuild
index d5fc3ed104d5..cb14882292b2 100644
--- a/sys-fs/udev/udev-245.ebuild
+++ b/sys-fs/udev/udev-246-r1.ebuild
@@ -9,10 +9,15 @@ if [[ ${PV} = 9999* ]]; then
 	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
 	inherit git-r3
 else
+	if [[ ${PV} == *.* ]]; then
+		MY_PN=systemd-stable
+	else
+		MY_PN=systemd
+	fi
 	MY_PV=${PV/_/-}
-	MY_P=systemd-${MY_PV}
+	MY_P=${MY_PN}-${MY_PV}
 	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
+	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 fi
 
@@ -62,7 +67,7 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-apps/systemd
 "
 PDEPEND=">=sys-apps/hwids-20140304[udev]
-	>=sys-fs/udev-init-scripts-26"
+	>=sys-fs/udev-init-scripts-34"
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
@@ -152,10 +157,10 @@ multilib_src_compile() {
 	fi
 	if multilib_is_native_abi; then
 		targets+=(
-			systemd-udevd
 			udevadm
 			src/udev/ata_id
 			src/udev/cdrom_id
+			src/udev/fido_id
 			src/udev/mtd_probe
 			src/udev/scsi_id
 			src/udev/v4l_id
@@ -184,11 +189,10 @@ multilib_src_install() {
 		into /
 		dobin udevadm
 
-		exeinto /lib/systemd
-		doexe systemd-udevd
+		dosym ../../bin/udevadm /lib/systemd/systemd-udevd
 
 		exeinto /lib/udev
-		doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
+		doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
 
 		rm rules.d/99-systemd.rules || die
 		insinto /lib/udev/rules.d
diff --git a/sys-fs/udev/udev-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index 4b884c8001b5..cb14882292b2 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -67,7 +67,7 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-apps/systemd
 "
 PDEPEND=">=sys-apps/hwids-20140304[udev]
-	>=sys-fs/udev-init-scripts-26"
+	>=sys-fs/udev-init-scripts-34"
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != buildonly ]]; then
@@ -157,10 +157,10 @@ multilib_src_compile() {
 	fi
 	if multilib_is_native_abi; then
 		targets+=(
-			systemd-udevd
 			udevadm
 			src/udev/ata_id
 			src/udev/cdrom_id
+			src/udev/fido_id
 			src/udev/mtd_probe
 			src/udev/scsi_id
 			src/udev/v4l_id
@@ -189,11 +189,10 @@ multilib_src_install() {
 		into /
 		dobin udevadm
 
-		exeinto /lib/systemd
-		doexe systemd-udevd
+		dosym ../../bin/udevadm /lib/systemd/systemd-udevd
 
 		exeinto /lib/udev
-		doexe src/udev/{ata_id,cdrom_id,mtd_probe,scsi_id,v4l_id}
+		doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
 
 		rm rules.d/99-systemd.rules || die
 		insinto /lib/udev/rules.d
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index ef4be71c0999..0a1d51727bc4 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -1,5 +1,5 @@
-DIST udisks-2.8.4.tar.bz2 1619051 BLAKE2B 4fdf3d5ea8ae02eb74efd552afee2dbe94137767c343034dd68f1553b224871a51bb2382eda00de90d45bad18b4088b4812e1f3fbb004cd29e753e92afb34e05 SHA512 70860e5ca9ac73d442ca67f0e0429ce2f33575d8f64945fbf06d1694b080c8b6fed8d65b2485eff0ab66eab59cdebeb9309424820a2ee82c5faaa38029e15e6c
 DIST udisks-2.9.0.tar.bz2 1671841 BLAKE2B 5f0f26b203a4a54736875211d8299c1b81a4e2722561028f802200b3a0916fb70baa923b2f7f5474580ccf14581d4e3cf203bf9e864cf01613275d3f1b1935db SHA512 314355c9b0cc562b2359ea77137b3f2189c48e642c67cc9d9ed07048176967b67e78dfb3190dd160db2f92e8143a4f005bf2cc1aa814388a79201705e5297d0c
-EBUILD udisks-2.8.4.ebuild 3279 BLAKE2B d3a35670627a2cfa8f211efd0e38439ebb9b5aebf968d8dbdf3670f501d9ffac3a0665ffa85e894fb9eb31bf20240822d1650676ba2aef0a97fb873afa7bfa27 SHA512 bc3664b7a2e18c537ce33cbaf2931c113387bcf110b524b77f5ca2346c54e4d3e998accdb1cc075ae990becc09238ec7efd6543c5a2bff457710491ef2f150af
-EBUILD udisks-2.9.0.ebuild 3392 BLAKE2B 76ab015d09348290ef4e3456856e05147b7ba278eac4ddf6136f99d424226866d201ecba3fb880474f48e4fa082f33188969304a59a878a7d2094dde2dbde7dd SHA512 08c02d009d0614fc9907b55d9e065257c18a809fedab9823cffdd3b986046399d68178f94de8db0c2fac0185cde3545545a534bf42f15a753e9b25971f860705
-MISC metadata.xml 641 BLAKE2B 705b9b22bf911c442ba6529cc6481916d703bb43a741e731e65607be9d916be9db9b8bc75ca4b5e867ded9321f0fc2cd5d8c3c4f3c67908d639d6d6bb1416614 SHA512 b24f65a685c3d17b113467b274f2fe7acd46641e9afb9c87a6a23ff182d1b841c19540c57c92d7a346a80a077dfff9fb79ce98d564737d2af3001ed9c8f79013
+DIST udisks-2.9.1.tar.bz2 1680327 BLAKE2B 6573dd91decfaece6668a9848fc5ff276190c0d2be272e2d0fa550274a3e20df4038a87dd5fbb7b1b6a33a4c94f5668d01297d583da7df7027353353ef3936f4 SHA512 a360cafc65375153c5de65f817eecbc65d56a9d9167222e1adbc8f57568d15ccf7ed317e8e0b567340f250ca9247196de104442191bd069510f72dfc5ed65eb3
+EBUILD udisks-2.9.0.ebuild 3384 BLAKE2B 86fefe57eb435e5d77b734a22aa86f33fe44e410a36a16ea00e9e1b302ddc9d0852a3f524f50e46e1ecec59cd7072ec28f64696dd937a27e9c5ea0569073a12b SHA512 bc22927d295a93bf4d4054344f1cb379ee35a26cd2257931d56e2021035e28413b5f3b6bf848b2efdfa6ae5fdc84526e959d2a3c41ca4eddc5d24c6b6f1705ee
+EBUILD udisks-2.9.1.ebuild 3480 BLAKE2B 0536feb36b0240f126381ac5a67070dd8600eb14db6d6bde821c6fdd404c1cace49b743187a65e6274e83283625c03be5cdff907390542790db4992dcce21805 SHA512 aa971030e093510e6c0762a19782e092a1c34ab950b67645b16e860a2a92d8dd98e1396e598915ccd6a9ae3ad5ebc6c1a1e6ab2856b422f480777f3556be68c1
+MISC metadata.xml 728 BLAKE2B 4a540e1378d04b04e2b75a531e9df8c13faee4870c8bc3778e9e08dc742eb9e28e2b1134448302e43cbb8815432fa0bbbb402f22722267fa4869fe0c04775c8b SHA512 9f057eb51f5924b53cecf5e495b02bb6fad41e9b23c197b1f24a972e8a25504506e73329a93295e9eb30e62863f7c4454909fba10fdea696be23caa7cf50d8cb
diff --git a/sys-fs/udisks/metadata.xml b/sys-fs/udisks/metadata.xml
index 83ff308110f9..fbdc7a76f53c 100644
--- a/sys-fs/udisks/metadata.xml
+++ b/sys-fs/udisks/metadata.xml
@@ -10,5 +10,6 @@
 		<flag name="lvm">Add support for Logical Volume Management via <pkg>sys-fs/lvm2</pkg>.</flag>
 		<flag name="systemd">Support <pkg>sys-apps/systemd</pkg>'s logind</flag>
 		<flag name="vdo">Enable Virtual Data Optimizer support.</flag>
+		<flag name="zram">Enable ZRAM support (requires <pkg>sys-apps/systemd</pkg>).</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-fs/udisks/udisks-2.9.0.ebuild b/sys-fs/udisks/udisks-2.9.0.ebuild
index 020910ffa396..e86b1253b377 100644
--- a/sys-fs/udisks/udisks-2.9.0.ebuild
+++ b/sys-fs/udisks/udisks-2.9.0.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 +daemon debug elogind +introspection lvm nls selinux systemd vdo"
 
 REQUIRED_USE="
@@ -21,13 +21,13 @@ REQUIRED_USE="
 
 COMMON_DEPEND="
 	>=sys-auth/polkit-0.110
+	>=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?]
 	virtual/udev
 	acl? ( virtual/acl )
 	daemon? (
 		>=dev-libs/glib-2.50:2
 		>=dev-libs/libatasmart-0.19
 		>=dev-libs/libgudev-165:=
-		>=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?]
 	)
 	elogind? ( >=sys-auth/elogind-219 )
 	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
diff --git a/sys-fs/udisks/udisks-2.8.4.ebuild b/sys-fs/udisks/udisks-2.9.1.ebuild
index 357af8aca47a..a85f499c4a42 100644
--- a/sys-fs/udisks/udisks-2.8.4.ebuild
+++ b/sys-fs/udisks/udisks-2.9.1.ebuild
@@ -10,29 +10,37 @@ 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"
-IUSE="acl debug elogind +introspection lvm nls selinux systemd vdo"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="acl +daemon debug elogind +introspection lvm nls selinux systemd vdo zram"
 
-REQUIRED_USE="?? ( elogind systemd )"
+REQUIRED_USE="
+	?? ( elogind systemd )
+	elogind? ( daemon )
+	systemd? ( daemon )
+	zram? ( systemd )
+"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.50:2
-	>=dev-libs/libatasmart-0.19
-	>=dev-libs/libgudev-165:=
 	>=sys-auth/polkit-0.110
-	>=sys-libs/libblockdev-2.19[cryptsetup,lvm?,vdo?]
+	>=sys-libs/libblockdev-2.24[cryptsetup,lvm?,vdo?]
 	virtual/udev
 	acl? ( virtual/acl )
+	daemon? (
+		>=dev-libs/glib-2.50:2
+		>=dev-libs/libatasmart-0.19
+		>=dev-libs/libgudev-165:=
+	)
 	elogind? ( >=sys-auth/elogind-219 )
 	introspection? ( >=dev-libs/gobject-introspection-1.30:= )
 	lvm? ( sys-fs/lvm2 )
 	systemd? ( >=sys-apps/systemd-209 )
+	zram? ( >=sys-libs/libblockdev-2.24[kbd] )
 "
 # util-linux -> mount, umount, swapon, swapoff (see also #403073)
 RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/util-linux-2.30
 	>=sys-block/parted-3
 	virtual/eject
+	daemon? ( >=sys-apps/util-linux-2.30 )
 	selinux? ( sec-policy/selinux-devicekit )
 "
 DEPEND="${COMMON_DEPEND}
@@ -83,12 +91,14 @@ src_configure() {
 		--with-tmpfilesdir="/usr/lib/tmpfiles.d"
 		--with-udevdir="$(get_udevdir)"
 		$(use_enable acl)
+		$(use_enable daemon)
 		$(use_enable debug)
 		$(use_enable introspection)
 		$(use_enable lvm lvm2)
 		$(use_enable lvm lvmcache)
 		$(use_enable nls)
 		$(use_enable vdo)
+		$(use_enable zram)
 	)
 	econf "${myeconfargs[@]}"
 }
diff --git a/sys-fs/ufsutils/Manifest b/sys-fs/ufsutils/Manifest
index d065f4076a7a..33172e65cee6 100644
--- a/sys-fs/ufsutils/Manifest
+++ b/sys-fs/ufsutils/Manifest
@@ -1,4 +1,4 @@
 DIST ufsutils_8.2-3.debian.tar.gz 23469 BLAKE2B 9afdef3af0f71ec1a75d9e7c3426fd62dd109cf2f5231bf910bb7cf7a55e800b11b4ec5319e6cff9b211259f46fd9730225c96f2f74067ade2b793eccedda04a SHA512 7bc925e742eaf4e1837ca4b46afa7966490234492eeb40ad8fabf71550a79890f3294780c2dbdf3593a82fc8e0708cf4c72baba81f4fec9a884cfa545c8895c8
 DIST ufsutils_8.2.orig.tar.gz 463499 BLAKE2B 94a02de50724e4a1f59a889dbb696a62c8bbbf0935537cff92cd0edb1c5a0e790be45bc1a9aa0a27a9443efe33ec081e5cb26465a3eeb5dbb7b176c91d3c66cc SHA512 f378372c2493c16fe8cb3977f4ed2d104e747895e97d7642d21b5e87a2a03ac696bbac093e534e13c2f1dc4638741edcbbb0ddec5abcbfa6b4f7401efbf7cf14
-EBUILD ufsutils-8.2_p3.ebuild 1184 BLAKE2B 0295969c190ffa92c154d6a14a0705f40afa14c5bdc1557062925a2137fb0213fa935c76b76b1f4ee6cd6275f06c6cb3ca89b49cc68327092de0c20324af1c9b SHA512 0d67d3ac359bc9ab40154f2125cb7e142951ca8b722e29cfb1eea811544bfdae9ae291378bb8fe8a804aa5e51c8b5e822387a6bcefe4b87ddaa4de23319dfb36
+EBUILD ufsutils-8.2_p3.ebuild 1315 BLAKE2B c8688331bd550056342e9933e106486208709f511b9a215fb4a0d4d13f594e06bc5213b72a595ecf7b7c29fb8e52881ecafba660210134d8628188f80f856f7a SHA512 52bef40151b229255b7dfa9a94d1feab379806de3f67b10eceb2b48e2d7b6b6b07ea3d7c3b71d92ebea9f5e752936275007463a17331a88f22c24afa923f0a2e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/sys-fs/ufsutils/ufsutils-8.2_p3.ebuild b/sys-fs/ufsutils/ufsutils-8.2_p3.ebuild
index 4f614d470df6..92d1b917e8d8 100644
--- a/sys-fs/ufsutils/ufsutils-8.2_p3.ebuild
+++ b/sys-fs/ufsutils/ufsutils-8.2_p3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=4
 
-inherit eutils toolchain-funcs
+inherit eutils flag-o-matic toolchain-funcs
 
 DESCRIPTION="FFS/UFS/UFS2 filesystem utilities from FreeBSD"
 HOMEPAGE="http://packages.debian.org/source/sid/ufsutils"
@@ -38,6 +38,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# globals are defined in header files and reused in multiple final
+	# binaries. bug #706696
+	append-cflags -fcommon
+
 	tc-export AR CC
 }
 
diff --git a/sys-fs/unionfs-fuse/Manifest b/sys-fs/unionfs-fuse/Manifest
index ccd09050fc21..24b225497a3d 100644
--- a/sys-fs/unionfs-fuse/Manifest
+++ b/sys-fs/unionfs-fuse/Manifest
@@ -3,6 +3,6 @@ DIST unionfs-fuse-2.0.tar.gz 46537 BLAKE2B 2f5a0da5adb15c408e7b9d0c3658e389a1aea
 DIST unionfs-fuse-2.1.tar.gz 47917 BLAKE2B c76edbcbff98db28092f61facbdf443eda12ea97770126feac3d590e0f85e51df84308d0eeeebd96e5bafd126b472b0ded6a2ead72cac0fab3614e3cc04730dd SHA512 851e378f8c189d8a84d2a0cf47ce8f1e9cdda5e789a8c0c97aac6e0757c2f6480ca4d931a525bb94cec4af11789073ccda44ad01d7ed02de1c29ded72f578aa0
 EBUILD unionfs-fuse-1.0.ebuild 500 BLAKE2B 76060a23c99f96ee5d491dbad82ed1939bd72b364f656fdd58de737ac2c7388f8e177b46176e2ab4d1d0add262130faf492b3cce47ce4f12797e105b453c5477 SHA512 0ab0d5efdde62268f38cc319f972dd058586d312baf992b68ed5b05e4c6c0a63c4da8d0e0efdd5f9c598ecb9f71bca2f418cfe36a6506968597d9ec95b35ff92
 EBUILD unionfs-fuse-2.0.ebuild 500 BLAKE2B 86562c039d231ff38a14252b22eb1126d53ad533adea0c15eb9565e3c55545afa4f1affeddfc6da72b09b838eb4c9af3d37f4e15918888aecbd70a52af34358f SHA512 7a1d69a0f8fc0d96e1abb5e041f9bd9a1f2c8973c64be26b6f7c526c77b82d8ff2eb7ed11635847b7237d8076b8134ce0b08f7ffd3f061a2ae02f3cfd9477818
-EBUILD unionfs-fuse-2.1.ebuild 899 BLAKE2B 2d2ed6e149c62df5262029c24655b1d9773fc90b8c568bfbd0176a2ebd4b99689ee2d89bfe2c9169af28141d2e7804459518f1362d112e4e3dcb7f06c4e53308 SHA512 b79923749a0f75efbb4608921b56eb59e9179cece0c9cdba1b1b4806fbbb0693331c6b9e2e80ddd466382e685d52b300c59c2a755d2dd16cb7ac8cac6101a3c1
-EBUILD unionfs-fuse-9999.ebuild 864 BLAKE2B 17cb5169b70b178f5d6d20526e1efb5fe3cf92708f8984cfb4c5ccf80fc80214ee7258c5ec5158ad1e06fbbdf920ac7f02071a957c8ab569ec0356bbbaaab022 SHA512 4f4a89345c982f27f1e5efa2329f11e28feeb80b834c3695623c4a404c755a288eab8d4726c1c8fe66f05f1938955cd966032f16f4005d1b692041d5e49b2336
+EBUILD unionfs-fuse-2.1.ebuild 975 BLAKE2B 788def03fa8977c36cb049501a2e5a2479fd579b14b78082e2297b2ba44e466b48bbd1c98d35db8d5dfe2978752249aada97dcd8fb0edde902e533e0aceedf75 SHA512 933ac0df00d6aad1347e274258e52ef7a21036fba13f5cb26a9ca949077b6ee0f6c56d0bafab50b007a68706f1336ece70e8f34929f1da0eed83a15d94e38871
+EBUILD unionfs-fuse-9999.ebuild 940 BLAKE2B a20a79d69fa7452dda0d824da744f372ee9d192fa16200243e60e5851c58d70f0c18f1dda408d8f6ea5124adfb52a161ec01fbd70006441840c2edb9090aeee8 SHA512 a3695a3743f8ffc2bccc4d750faba0b2fea116f4401bdc577ddea8231b84e05e8e5e7b648ca88665fbfe8dce460a681f98d04971dc155c1ad39b94a43c8234d3
 MISC metadata.xml 336 BLAKE2B f9d55c17815e8d3179029c92fd758b0811b455b4d375aa31c44d7643f9d792a70dae915ae25d069e9967fbac2954c197b1ebcd85828b744a9924dc719eeb6f40 SHA512 54597ecd53cfe8d92d717481a533df32cb5fa7272cd64a42a0cd4b4803024b10e3451845569e3d7b199ed63f4070023468dd7528cb438f155539e5e752144197
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild
index 2c3037f0258e..480634c6bacb 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-2.1.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-any-r1
+inherit python-any-r1 toolchain-funcs
 
 DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
 HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
@@ -32,6 +32,10 @@ python_check_deps() {
 	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
 }
 
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 }
diff --git a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
index 914a41411a91..b935d86f2bc3 100644
--- a/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
+++ b/sys-fs/unionfs-fuse/unionfs-fuse-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-any-r1 git-r3
+inherit python-any-r1 toolchain-funcs git-r3
 
 DESCRIPTION="Self-syncing tree-merging file system based on FUSE"
 HOMEPAGE="https://github.com/rpodgorny/unionfs-fuse"
@@ -32,6 +32,10 @@ python_check_deps() {
 	has_version "dev-python/pytest[${PYTHON_USEDEP}]"
 }
 
+src_compile() {
+	emake AR="$(tc-getAR)" CC="$(tc-getCC)"
+}
+
 src_install() {
 	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
 }
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index 630311be0f0b..d9c586292776 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,3 +1,3 @@
 DIST vhba-module-20200106.tar.bz2 15632 BLAKE2B 9b2db6cab2388fb5b84f2735d41a093af212434de2784f112d212cfc6193b1267ccf0afb222765bc32b0fc455d16bd1f0e98ddf60212735473853ec29ab27b97 SHA512 fc320e1f8f05247b7c2feded1335dce0fcc9a1257127d8d4086db48bd1e082d81b8a88089c04d0b8624ae584f1c0d049544f6f0018ec7dcea20ccfb136cd1bf0
-EBUILD vhba-20200106.ebuild 1092 BLAKE2B fc19695ee2c9635179d71dcde7aca178ca6b6bac3258c534bb1410d107ff98cba005de3e60e3c7a8bc5fd3fa3b67d2886c1ce9550188fa15f602eb79d3b00a8d SHA512 121eecbcc463c064384aaa5a83907482fddf0cd9e3c7c687dceab7a39f982c1af431c7562aec549fe31ab8cb76bd18cb55fb754465da0d8bb16db8e7d5f0f6ac
+EBUILD vhba-20200106-r1.ebuild 1092 BLAKE2B fc19695ee2c9635179d71dcde7aca178ca6b6bac3258c534bb1410d107ff98cba005de3e60e3c7a8bc5fd3fa3b67d2886c1ce9550188fa15f602eb79d3b00a8d SHA512 121eecbcc463c064384aaa5a83907482fddf0cd9e3c7c687dceab7a39f982c1af431c7562aec549fe31ab8cb76bd18cb55fb754465da0d8bb16db8e7d5f0f6ac
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/sys-fs/vhba/vhba-20200106.ebuild b/sys-fs/vhba/vhba-20200106-r1.ebuild
index 72b25e972731..72b25e972731 100644
--- a/sys-fs/vhba/vhba-20200106.ebuild
+++ b/sys-fs/vhba/vhba-20200106-r1.ebuild
diff --git a/sys-fs/xfsprogs/Manifest b/sys-fs/xfsprogs/Manifest
index a406563893ee..3f14f1a6c484 100644
--- a/sys-fs/xfsprogs/Manifest
+++ b/sys-fs/xfsprogs/Manifest
@@ -1,13 +1,9 @@
 AUX xfsprogs-4.15.0-docdir.patch 299 BLAKE2B 1ef9dd458806f33ca989dd977ae3b62fb5b1953ded3cd211ca7fc4235cfc59c2eeb6cf2474e79378782696a9feb324a5c32e541873d8493ff019adfe1ff006c2 SHA512 f6492ab8b4f8a417752a0b38538e0fdc06808968df07ecc5d752261cbc11d683acdd0e83ebf2744ea0068a5216f817a3816029cbf74da91c8eccf391574b931e
-AUX xfsprogs-4.15.0-sharedlibs.patch 3022 BLAKE2B cfa23520a55750af375ada8c35fb9f4b3ea2f401ddebd95aef6d46f9195ac6ab3fb38f5f9d08529d3c2658623a49eadc7db0be68159753025310605fdfc35a6b SHA512 5a6e62f2914e372f2bf679b10c32fe65f60677b4bf0e58f60c40a297ed8974d5ec0af3bcba5801ba19cadbb689a6dad62c1e2cd88587f6f3d30f21f1472f3ac0
-AUX xfsprogs-4.9.0-underlinking.patch 731 BLAKE2B 501b3967487d89c56c986f0c03e13fe3d217a6c4c8dd21fce1986793cefaa4777e827945adb3807f2d644665fbf66e7fbd5318d6f5c58d37c49260c24ca46181 SHA512 2fcbaab48ca33cd2e8724cdc55d814a970beb5127c861f4b829ede9f501516733c6dabbfe0bfb1d23df01bb69538af5ca31eb403030e3d2ad9efd8643c509ac7
 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.4.0.tar.xz 1248688 BLAKE2B dd00083b62a4989ca94d117eabad3905dc487c3e6d4f20bbe855399e99e2195c1a45f2be3b117048e2a7f2374c7e6258e7c1edd63d12a405c88f4c9fa6cd5e8e SHA512 c0973fcf97e2666385b46c80cd1398728702cb34fd7e0f89e2a63686300573405d09a81d3ae43d79c2e9710ccf6b6bd6ed1c3f3f831c75cd0916f094f203aaa7
-DIST xfsprogs-5.5.0.tar.xz 1252760 BLAKE2B 8099d019e66be4fc8856a22be94ab94cbc78bb81137cb2f065d058b39c4048dbeca7378106047e16dc26e8307463d834bb03bcb9473af192d29b414e7fe715d8 SHA512 1169765e9a003f9618f020eb190dc0a692e7017cf1ec2a9329a8db0f07ef6a48cb250fc326fb9168714259c8d5f2195cc6fd41e01bbbdc9a5857e53f145b6815
 DIST xfsprogs-5.6.0.tar.xz 1253112 BLAKE2B 7928b29458e3ad8251b48b6fb14a515e0128701c40cdfa63c05fc85173c70da3f34c948b7791f12ac5bb8d5f0c634016dac71c328a8917d1065aa7fb4cac3291 SHA512 a6bee55b0a23316c73f3921234d1dbaa4cbe91c12e79264e5f9bfe1356a24baa0ab25270405a46e4613a7e48443ef21997ff4f5962663777bed373f89ca29701
-EBUILD xfsprogs-4.19.0.ebuild 2433 BLAKE2B fb9ce6332be3f04f676cf518d9eea3dd3b6618530282f991a9a23954221d225e7925f9dfb7a65d18a834b3019ad50146679a99ff68456355010c8a53da008891 SHA512 f9fb50cbd967beb4d0d5c585892d5cf96f4804505b42380530f3c0bd3fb8a1ed3ce2d0790d3c4465080a2e6fa1dbf998c11e2c848ca3cb3117660288100c18bf
+DIST xfsprogs-5.7.0.tar.xz 1258772 BLAKE2B 3dab72c1c64d88194f677ed434fe00c8c2eac10c7c6d471d3b32595eb27a76ec1fa20955a08d7c2e371a0d160bce741afad0998731d2fee497917e0d7a4e70f7 SHA512 6a333b7e4fc6afb1689f6bbbbf07b97058cce2fde437fd3ed5b010276c050f886e5c0317ea16aedb23f579a9fed5edc4e7e64b4af5f0331dc8fd97b3251dd231
 EBUILD xfsprogs-5.4.0-r1.ebuild 2847 BLAKE2B b81f15ddd470b549433942259ce7c7edb4f102a7903d361fd2ddc151b4d3ba1abcda491425d64d2cb5b50d1c034f4301e4350856a2e7df80f2690f065bc93c0d SHA512 962334a565a0b3686f28ec9c9091e1260df3f842da3f64ffdc3d524e6baed77663c8ee2100964471b44935661d60331e7b4c9688d151bcd2c16ef7208d1b9a54
-EBUILD xfsprogs-5.5.0.ebuild 2918 BLAKE2B 581ec3415812e55402d10afbbd4a85c157a7637dd48877c7840f31a92c876930dfcde851fe22f27d38242efe5d3b6b1697f2a562cf87213b9671cd7b7ad2a05b SHA512 e0ea8d0d2dcd43cbb1713d4b9477fd0d2f14ff0718b633a99b7e95bba22bf29b5cc50c14ec7716e75942209743ddd5c4b580b8c8f5b37709d7332970eb906a04
 EBUILD xfsprogs-5.6.0.ebuild 2603 BLAKE2B bfa5d557473a872df4f5afd89aab9f7484fdd11c7d567dc1474bcfaa880c03eb7c9fb68cfcac81a9a21f1a5d32b7afe09f1af58b1f25e1669206df423fac394f SHA512 0ff4477ac23129c22f9bcec54fb4335dee11e0b759887909a269b6d01d4b27188f68661269b5b3907d1d84de0a8911f1ca1ff84075644e0eb3fb8df44578e73d
+EBUILD xfsprogs-5.7.0.ebuild 2255 BLAKE2B 5b64ed3ac748471d4f7131015707bd6f12efcbdfd139b3da96015861f2cdcee9d1662a5771f306af6106f60c66e80e60c5506454ee7b4cabcd08a5ead4a6de46 SHA512 4f45c3320bb13444ae2b0b1cd2990de0115dbc13c1dbea8894fb780b64016c70238fa3fe097350d7c77c2dfc5d594d052622ddca5f744ab9d38f3595fede8eaf
 MISC metadata.xml 338 BLAKE2B cdf07fec58a2401c154a3fdb7d5326065143eeac8dbe78078012d643dc3872bc2df79cc734c033c2030d356f2366dad8ad1da553bc268fd0318ab3ba971c4b5e SHA512 1a085c94d623db2cc55d987afb66265ab51e94c8868bc7c169cc669b58f8a8c5a1d81f503aa838d5c2a84f2a0bf923f73314048b49eb1e139d91eca6f71e119e
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch b/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch
deleted file mode 100644
index 1080e4400944..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.15.0-sharedlibs.patch
+++ /dev/null
@@ -1,114 +0,0 @@
---- xfsprogs-4.15.0/include/buildmacros
-+++ xfsprogs-4.15.0/include/buildmacros
-@@ -70,18 +70,9 @@
- # /usr/lib.
- ifeq ($(ENABLE_SHARED),yes)
- INSTALL_LTLIB_DEV = \
--	cd $(TOPDIR)/$(LIBNAME)/.libs; \
--	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
--	../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \
--	../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \
--	../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \
--	../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \
--	if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \
--	     "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))" ]; then \
--		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \
--		../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \
--		../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \
--	fi
-+	set -e; cd $(TOPDIR)/$(LIBNAME); \
-+	$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
-+	env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la
- else
- INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC)
- endif
---- xfsprogs-4.15.0/libfrog/Makefile
-+++ xfsprogs-4.15.0/libfrog/Makefile
-@@ -5,6 +5,8 @@
- TOPDIR = ..
- include $(TOPDIR)/include/builddefs
- 
-+LTLIBS = $(LIBXFS) $(LIBBLKID)
-+
- LTLIBRARY = libfrog.la
- LT_CURRENT = 0
- LT_REVISION = 0
-@@ -34,6 +36,9 @@
- 
- include $(BUILDRULES)
- 
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- -include .ltdep
---- xfsprogs-4.15.0/libhandle/Makefile
-+++ xfsprogs-4.15.0/libhandle/Makefile
-@@ -24,7 +24,6 @@
- include $(BUILDRULES)
- 
- install: default
--	$(INSTALL_LTLIB)
- 
- install-dev: default
- 	$(INSTALL_LTLIB_DEV)
---- xfsprogs-4.15.0/libxcmd/Makefile
-+++ xfsprogs-4.15.0/libxcmd/Makefile
-@@ -12,6 +12,8 @@
- 
- CFILES = command.c input.c help.c quit.c
- 
-+LTLIBS = $(LIBXFS) $(LIBBLKID)
-+
- ifeq ($(ENABLE_READLINE),yes)
- LCFLAGS += -DENABLE_READLINE
- LTLIBS += $(LIBREADLINE) $(LIBTERMCAP)
-@@ -26,6 +28,9 @@
- 
- include $(BUILDRULES)
- 
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- -include .ltdep
---- xfsprogs-4.15.0/libxfs/Makefile
-+++ xfsprogs-4.15.0/libxfs/Makefile
-@@ -151,6 +151,7 @@
- 
- install-dev: install
- 	$(INSTALL) -m 644 $(PKGHFILES) $(PKG_INC_DIR)
-+	$(INSTALL_LTLIB_DEV)
- 
- # We need to install the headers before building the dependencies.  If we
- # include the .ltdep file, the makefile decides that it needs to build the
---- xfsprogs-4.15.0/libxlog/Makefile
-+++ xfsprogs-4.15.0/libxlog/Makefile
-@@ -19,6 +19,9 @@
- 
- include $(BUILDRULES)
- 
--install install-dev: default
-+install: default
-+
-+install-dev: default
-+	$(INSTALL_LTLIB_DEV)
- 
- -include .ltdep
---- xfsprogs-4.15.0/Makefile
-+++ xfsprogs-4.15.0/Makefile
-@@ -92,6 +92,10 @@
- mkfs: libxcmd
- spaceman: libxcmd
- scrub: libhandle libxcmd
-+libfrog: libxfs
-+libfrog-install-dev: libxfs-install-dev
-+libxlog: libxfs
-+libxlog-install-dev: libxfs-install-dev
- 
- ifeq ($(HAVE_BUILDDEFS), yes)
- include $(BUILDRULES)
diff --git a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch b/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch
deleted file mode 100644
index e6904a53bc2a..000000000000
--- a/sys-fs/xfsprogs/files/xfsprogs-4.9.0-underlinking.patch
+++ /dev/null
@@ -1,30 +0,0 @@
- libxfs/Makefile  | 2 +-
- libxlog/Makefile | 2 ++
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/libxfs/Makefile b/libxfs/Makefile
-index 6499731..00447c4 100644
---- a/libxfs/Makefile
-+++ b/libxfs/Makefile
-@@ -113,7 +113,7 @@ LSRCFILES += gen_crc32table.c
- 
- FCFLAGS = -I.
- 
--LTLIBS = $(LIBPTHREAD) $(LIBRT)
-+LTLIBS = $(LIBPTHREAD) $(LIBRT) $(LIBUUID)
- 
- # don't try linking xfs_repair with a debug libxfs.
- DEBUG = -DNDEBUG
-diff --git a/libxlog/Makefile b/libxlog/Makefile
-index 3417eed..fda1343 100644
---- a/libxlog/Makefile
-+++ b/libxlog/Makefile
-@@ -12,6 +12,8 @@ LT_AGE = 0
- 
- CFILES = xfs_log_recover.c util.c
- 
-+LTLIBS = $(LIBUUID)
-+
- # don't want to link xfs_repair with a debug libxlog.
- DEBUG = -DNDEBUG
- 
diff --git a/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild b/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild
deleted file mode 100644
index fcf8ea0503d1..000000000000
--- a/sys-fs/xfsprogs/xfsprogs-4.19.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs multilib 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 sparc x86"
-IUSE="icu libedit nls readline static-libs"
-
-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}
-	nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.9.0-underlinking.patch
-	"${FILESDIR}"/${PN}-4.15.0-sharedlibs.patch
-	"${FILESDIR}"/${PN}-4.15.0-docdir.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
-
-	# Clear out -static from all flags since we want to link against dynamic xfs libs.
-	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
-	find -name Makefile -exec \
-		sed -i -r -e '/^LLDFLAGS [+]?= -static(-libtool-libs)?$/d' {} +
-}
-
-src_configure() {
-	export DEBUG=-DNDEBUG
-	export OPTIMIZER=${CFLAGS}
-	unset PLATFORM # if set in user env, this breaks configure
-
-	local myconf=(
-		--disable-lto #655638
-		--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))
-		$(use_enable static-libs static)
-	)
-
-	econf "${myconf[@]}"
-
-	MAKEOPTS+=" V=1"
-}
-
-src_install() {
-	emake DIST_ROOT="${ED}" install
-	# parallel install fails on this target for >=xfsprogs-3.2.0
-	emake -j1 DIST_ROOT="${ED}" install-dev
-
-	# handle is for xfsdump, the rest for xfsprogs
-	gen_usr_ldscript -a handle xcmd xfs xlog frog
-	# removing unnecessary .la files if not needed
-	if ! use static-libs ; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-}
diff --git a/sys-fs/xfsprogs/xfsprogs-5.5.0.ebuild b/sys-fs/xfsprogs/xfsprogs-5.7.0.ebuild
index 662d88603bec..ca89c01e8930 100644
--- a/sys-fs/xfsprogs/xfsprogs-5.5.0.ebuild
+++ b/sys-fs/xfsprogs/xfsprogs-5.7.0.ebuild
@@ -12,12 +12,11 @@ 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 ~sparc ~x86"
-IUSE="icu libedit nls readline"
+IUSE="icu libedit nls"
 
 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(+)] ) )"
+	libedit? ( dev-libs/libedit[static-libs(+)] )"
 RDEPEND="${LIB_DEPEND//\[static-libs(+)]}
 	!<sys-fs/xfsdump-3"
 DEPEND="${RDEPEND}"
@@ -30,13 +29,6 @@ PATCHES=(
 	"${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
 
@@ -78,24 +70,13 @@ src_configure() {
 		--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))
+		$(use_enable libedit editline)
 	)
 
-	if is-flagq -fno-lto ; then
-		einfo "LTO disabled via {C,CXX,F,FC}FLAGS"
-		myconf+=( --disable-lto )
+	if is-flagq -flto ; then
+		myconf+=( --enable-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
+		myconf+=( --disable-lto )
 	fi
 
 	econf "${myconf[@]}"
diff --git a/sys-fs/xwmfs/Manifest b/sys-fs/xwmfs/Manifest
index dff525dd5d9d..e7e54fff0382 100644
--- a/sys-fs/xwmfs/Manifest
+++ b/sys-fs/xwmfs/Manifest
@@ -1,3 +1,3 @@
-DIST xwmfs-0.85.tar.gz 195179 BLAKE2B 9437dac24c1ae8e8fa775e7d85242b8dd7f37efea15c01d01601786a3588affe2f57682e8c879f349aba82e99b4a07866f9fa0e48821756787f1fa1654297d99 SHA512 0c0e043567b09bdd0463c488f56bb21fd15787633d86b6f8411ca0b37921561db4bc543bb109d38b059e04a123653cb7dd2f502d3584b13271dd7a6d511be94b
-EBUILD xwmfs-0.85.ebuild 616 BLAKE2B 29b3d25a10982a3116e28734feb7f4ef6df9ccd685871b9aace6b265ed962e617457dd31eb338677c2aa02400426c6065688328d8052971763e0def24617abd8 SHA512 a52877db9724c4d4e7da50b7f61e3981f5e53be7bdbe5a2dca1da730ec51386be25e9b92644efb73457bfe67d826e4f5d41d221a774d35a7e13034b99afc70b0
+DIST xwmfs-0.86.tar.gz 195544 BLAKE2B 7dc5eb4d7acd585be70c43142b1a093aefecd69d8c51f6dee1741e88ab0c592d195678df107c28426d4eab18ae3d33b292cb0b8ab9c5ab557e1c81d3e557c492 SHA512 2f053c8e7322af39f46c85c46c11c5d215b7797d0ccb8340ba143371f3a5b171cac324936a0559fc3bd1cad0aed31c02576ad71b269052e3d01fb7b896bd1a81
+EBUILD xwmfs-0.86.ebuild 616 BLAKE2B 29b3d25a10982a3116e28734feb7f4ef6df9ccd685871b9aace6b265ed962e617457dd31eb338677c2aa02400426c6065688328d8052971763e0def24617abd8 SHA512 a52877db9724c4d4e7da50b7f61e3981f5e53be7bdbe5a2dca1da730ec51386be25e9b92644efb73457bfe67d826e4f5d41d221a774d35a7e13034b99afc70b0
 MISC metadata.xml 1393 BLAKE2B f9f7389edcc5535cddf0e0c34ebacc0272b57e65c42ad76c2930534913e12d90c3a06dae5dda49fef8e14935b5376576bf1bc2118c528535c289cf436573457c SHA512 143ed4a1f942d55be296a6b909d56d853e7b27a9710f9d4248bd7102a47a49b804f3687abc2d508209889b12cbfcfdd07f8bdba94883858f1605e59964675951
diff --git a/sys-fs/xwmfs/xwmfs-0.85.ebuild b/sys-fs/xwmfs/xwmfs-0.86.ebuild
index 1f23a8953190..1f23a8953190 100644
--- a/sys-fs/xwmfs/xwmfs-0.85.ebuild
+++ b/sys-fs/xwmfs/xwmfs-0.86.ebuild
diff --git a/sys-fs/zfs-auto-snapshot/Manifest b/sys-fs/zfs-auto-snapshot/Manifest
index 473b6bb836da..16b0364353bb 100644
--- a/sys-fs/zfs-auto-snapshot/Manifest
+++ b/sys-fs/zfs-auto-snapshot/Manifest
@@ -1,5 +1,5 @@
 AUX README.gentoo 684 BLAKE2B 7175ddfbb8dd5b209fa4fa5e5a3aeecac3fdd102e240f93b640f91bbf0204f9101801a94087383d7087bec08ae490e9769dfcf4f7f218d6daa4779087a8a0d23 SHA512 e77c3a573c2d4499df902b68909c186e4c80ba8b451b493c7e08e5e96ebe281933ce4b5fc11c201e33f27b14a02a35fd85270baf7ddece42a2fcbc6c3c421146
 DIST zfs-auto-snapshot-upstream-1.2.4.tar.gz 13375 BLAKE2B 2a44cdecb7c4bb432c1804dba9a6674289aced9664ae0fcc6a33b604b128d852fce459367316f11961747594516916da51072ed10f84d0c01ea8cca553ce7eec SHA512 26382303fce8b90dfb40f69fcab92308e88c17c147b4a566c5d32f2e9aa241d64f5da56ad82b4becb824ba01a470037a724460d35676a1d46de9c578c02a57d9
-EBUILD zfs-auto-snapshot-1.2.4.ebuild 1383 BLAKE2B 93d60c4935d00caa51d48a98dfc730672b65bbdde7423829f29150845d2d9894a97255fd0f8b9d798ea37dd88faa04d1ef3258cb4abcba20fa557a7a790f7efc SHA512 f62394d8054bd6b4442f69a81cb0c605aee70ef1b1854dbfea0c1debd477cf28894aa3de51260be54486d0245a88dc841d212ca8a1a0127c29cc7845f7d17524
+EBUILD zfs-auto-snapshot-1.2.4.ebuild 1382 BLAKE2B bbd5ce2059437b6263c0dab8fbf944a349a4240e86ff6b2278ae79a6b8eb1626770a2b5cbf7e559d0568e0c30a63b2375e104f0298843accfcd32ee68fc7ddb8 SHA512 9a769f3c595890506a2501ed20a33967a5091a3aab07353189cf62fbc7be9a6136797d250f4ab655b149356238176f05cdbcbe486131d900c51f00ed3c71e14a
 EBUILD zfs-auto-snapshot-9999.ebuild 1383 BLAKE2B 93d60c4935d00caa51d48a98dfc730672b65bbdde7423829f29150845d2d9894a97255fd0f8b9d798ea37dd88faa04d1ef3258cb4abcba20fa557a7a790f7efc SHA512 f62394d8054bd6b4442f69a81cb0c605aee70ef1b1854dbfea0c1debd477cf28894aa3de51260be54486d0245a88dc841d212ca8a1a0127c29cc7845f7d17524
 MISC metadata.xml 909 BLAKE2B 74eeac781ab385dfd962c316d6792c79ebdffed9084f3c7b071a13b502edb881555e4e9525a1c8c5f2fe0ca51241afbe430f7ce07fdbd4b2554c841f1837af85 SHA512 d98be1718d600b6a04af37294de1eb47e814c74ddf24d4e119d037554baf3f9b551ab43dabd1dcd70b35b65e9fb687325c04371d078757d26c07385ac72143c8
diff --git a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
index d8170b5cfc1c..609faf654fd0 100644
--- a/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.ebuild
+++ b/sys-fs/zfs-auto-snapshot/zfs-auto-snapshot-1.2.4.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 @@ if [[ ${PV} == 9999 ]]; then
 else
 	MY_P="${PN}-upstream-${PV}"
 	SRC_URI="https://github.com/zfsonlinux/${PN}/archive/upstream/${PV}.tar.gz -> ${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="amd64 ~ppc64"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index d00de1fdabab..4946adf47a94 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,4 +1,4 @@
 DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
-EBUILD zfs-kmod-0.8.4.ebuild 4387 BLAKE2B 15ef13512c2fb94b9d849c828906649ec81fa1362338dc82a3373f67dade0d6968b3ba62176d4f76024156ba5f23c49668e3e57f5972365d96f98469b7fe86f2 SHA512 8c8c6291c117acc7f16bcac6020ec444c9d5c9a382ffc7bb8c33585d3421eec6ddcda262f641971a1971e18ec61e98fb6e70880cae51ebea20d6e17d0f4f9700
-EBUILD zfs-kmod-9999.ebuild 4388 BLAKE2B e142682c68e058beb9d110b86abb84d1169ed79461acf6fd852ef9800cd7b9e33c85adf4aba7e5e7e6d6f1c8f22ba8b56590e1636f0fe8285f66ab7754c9fa84 SHA512 a6c15aa5286e9c08207cf4f5676d967072bf8bf0118867771819a686b7802abe3127333b74066479b5fb0bac7b7f387075919b56b4f914192420ed51d38263e7
+EBUILD zfs-kmod-0.8.4-r1.ebuild 4385 BLAKE2B 0c4f28b71dbf68f9d06e3d14d1f232fe4dc9b52334d0bd501de387be1571fe9529d3b3f07720b432723e37f104cbdd29eca984403b1fee5ab2c5f62bf6aa8792 SHA512 d7e0c3600af4ecfc110381fd9eabf4a0c50607513911d074402d5c977075f9b51c2935b7419658270735818731450c2854af65774bbe17f73525caf903444b52
+EBUILD zfs-kmod-9999.ebuild 4302 BLAKE2B 907824615a733e8f1aa5e0b6cbf8ec6149fde22b60d5bf612c119d7b63894735f18ee6d7679dd65559ada77b63fa82279e0fd37919286e8110399de3ee782cc8 SHA512 e12b3c45fcd30dbd0fb5380a24740f0e6a19cae1a59a317f6dcd5593611d6ef34c6a7038f1c301de51ebcf7af426dda64eb9f9837f952de675e43782693eb827
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild
index 9a0cc54ca59b..5da2b7375143 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.4.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.4-r1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
 	SRC_URI="https://github.com/openzfs/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64"
+	KEYWORDS="amd64 arm64 ppc64"
 	S="${WORKDIR}/zfs-${PV}"
 	ZFS_KERNEL_COMPAT="5.6"
 fi
diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
index bd1fe4231acc..b70e569510ea 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild
@@ -60,10 +60,6 @@ pkg_setup() {
 			DEVTMPFS
 	"
 
-	if use arm64; then
-		kernel_is -ge 5 && CONFIG_CHECK="${CONFIG_CHECK} !PREEMPT"
-	fi
-
 	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
 
 	if [[ ${PV} != "9999" ]]; then
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 27ca4bd95f3c..6372e6be32fa 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -2,6 +2,6 @@ AUX 0.8.4-initconfdir.patch 1004 BLAKE2B fd4186b5f378f562098040a8e13a12e6fd7f0f3
 AUX bash-completion-r1 11310 BLAKE2B f6c105fef1737d4be0e76967fdec62aa52fa7665bfc1e9aa4c944dd6442d64d7d31b8af54f92f5db25542f968ecf83da46db8c2a8f978577526bf9f90d8bccf3 SHA512 03be521e2c646196766d5fd049f241cb97f290abf0409881ea6ba709934984deda402c8513009e62a5787e0648023b55c040e5f99baef27709e81c3bc9c8f56e
 AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e0699ae82618c4c14caf4b26cb466367a5372d7e0a030aa857d024e3db0faef4bb5fa32c54f41f0d4766693a95ba5ab SHA512 e53c79401f4c634a94af27b2f88a40440b68a4c192fd1944668786650aaa0f1f08dff851dca5b9666ce8bba1f0e2b7cb195314cd9d1314c9bab1194d03122319
 DIST zfs-0.8.4.tar.gz 9285838 BLAKE2B 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 SHA512 9086dc6a6262dd93ca6ec43f1b4c2e5c804deba708c8a7460b8531aa4802b0bf8cac0917a1a00e6af2e96d4a21cd68b85e226bf571bd94041d0325c457106eb1
-EBUILD zfs-0.8.4-r1.ebuild 5195 BLAKE2B 501f1ba692e13c7c9b73017626687ef129e0db61a6492b326327dcc07a2f9ebccb426359531e004bb17c4d99c12105e93fd84c5f83494a58e5351a16f2ab76ca SHA512 57e3acbbffab3e38e5d3522f868ad8d32985a3983a449c7c0552e71b92f0dbd46c18e91ebbf3002b96212b68308cbbbc0b90b742eda3d8733844160606cd38dc
-EBUILD zfs-9999.ebuild 5156 BLAKE2B 9dbb83c08b6bc0338303d6572a152f423a4de615c664c268991341f4ec4b7112cc5839c504de9f105404055415a9d5574271593673dfcf6838d1d9722865c668 SHA512 b99a1a80d4a5677d2e2624475f7694f1f2467643574fdaed8af0e4f929103ecba3cb6865c6fdae55c8b6c8e75027f0af88e8a142525448158ad518d50bb9d055
-MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
+EBUILD zfs-0.8.4-r2.ebuild 5197 BLAKE2B 20e55e42cc96b02acddf326c2ef75869cc73698d56aa7ae3e8797f50dc121c18c0b9d1424a7837a88d77e7e098eeaee353f26e841cabfbce3e18ad13023940e5 SHA512 6bcdf42cd77ffbb64e651e849edbb594a7f2482e481a0bf2f846f36e9524d637c1bd172dce0359a7907d6020622404e68ffbccd0839408f959f50a2d2b0fd5d9
+EBUILD zfs-9999.ebuild 5386 BLAKE2B d29282595b19ed397d5997da0cca17ad0b40648ac0252ae2acdc71e68e4513a3c57039b656862c41733d78e3e3cafa9192001aaddb7a9463126ba58d71de4ed6 SHA512 0d8e0912bb058a176dee139bd6106c03da560e84f07345d0b7a73f0308912b8bba4ca27e62ca498a803980bcf68086f1662438eace0c45c1d98646070e3df06a
+MISC metadata.xml 869 BLAKE2B 1efbc16c39a86816ce9b80bd0b13bd251b391c780ef4dbf05817639927cb725c25648593933a31c1a598bf331667a232cfc9331b48c4db35b455bbc95db7fd61 SHA512 e615f9628121aaea23014e91235bb8aa15b938bc7c831d7edbc88c98dddd0ee1170b1c7e025912f547f613f132e0ef46fba7bf1d8aaaf308d8ea9cefaf1a5252
diff --git a/sys-fs/zfs/metadata.xml b/sys-fs/zfs/metadata.xml
index 0b1da3a015bf..85d50d081aff 100644
--- a/sys-fs/zfs/metadata.xml
+++ b/sys-fs/zfs/metadata.xml
@@ -11,6 +11,7 @@
 	</maintainer>
 	<use>
 		<flag name="kernel-builtin">Disable dependency on sys-fs/zfs-kmod under the assumption that ZFS is part of the kernel source tree</flag>
+		<flag name="pam">Install zfs_key pam module, for automatically loading zfs encryption keys for home datasets</flag>
 		<flag name="rootfs">Enable dependencies required for booting off a pool containing a rootfs</flag>
 		<flag name="test-suite">Install regression test suite</flag>
 	</use>
diff --git a/sys-fs/zfs/zfs-0.8.4-r1.ebuild b/sys-fs/zfs/zfs-0.8.4-r2.ebuild
index 0f8aa28b0338..b24ddaf0dcba 100644
--- a/sys-fs/zfs/zfs-0.8.4-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.8.4-r2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
 	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm64 ~ppc64"
+	KEYWORDS="amd64 arm64 ppc64"
 fi
 
 LICENSE="BSD-2 CDDL MIT"
@@ -54,13 +54,13 @@ RDEPEND="${DEPEND}
 		!<sys-kernel/genkernel-3.5.1.1
 	)
 	test-suite? (
+		sys-apps/kmod[tools]
 		sys-apps/util-linux
 		sys-devel/bc
 		sys-block/parted
 		sys-fs/lsscsi
 		sys-fs/mdadm
 		sys-process/procps
-		virtual/modutils
 	)
 "
 
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index c7cc180b9ea0..11bc0febcb0a 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 DISTUTILS_OPTIONAL=1
 PYTHON_COMPAT=( python3_{6,7} )
 
-inherit autotools bash-completion-r1 flag-o-matic linux-info distutils-r1 systemd toolchain-funcs udev usr-ldscript
+inherit autotools bash-completion-r1 distutils-r1 flag-o-matic linux-info pam systemd toolchain-funcs udev usr-ldscript
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://github.com/openzfs/zfs"
@@ -21,7 +21,7 @@ fi
 
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
-IUSE="custom-cflags debug kernel-builtin libressl python +rootfs test-suite static-libs"
+IUSE="custom-cflags debug kernel-builtin libressl pam python +rootfs test-suite static-libs"
 
 DEPEND="
 	${PYTHON_DEPS}
@@ -32,6 +32,7 @@ DEPEND="
 	virtual/libudev[static-libs(-)?]
 	libressl? ( dev-libs/libressl:0=[static-libs?] )
 	!libressl? ( dev-libs/openssl:0=[static-libs?] )
+	pam? ( sys-libs/pam )
 	python? (
 		virtual/python-cffi[${PYTHON_USEDEP}]
 	)
@@ -54,13 +55,13 @@ RDEPEND="${DEPEND}
 		!<sys-kernel/genkernel-3.5.1.1
 	)
 	test-suite? (
+		sys-apps/kmod[tools]
 		sys-apps/util-linux
 		sys-devel/bc
 		sys-block/parted
 		sys-fs/lsscsi
 		sys-fs/mdadm
 		sys-process/procps
-		virtual/modutils
 	)
 "
 
@@ -129,10 +130,13 @@ src_configure() {
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
 		--with-udevdir="$(get_udevdir)"
+		--with-pamconfigsdir="${EPREFIX}/unwanted_debian_files"
+		--with-pammoduledir="$(getpam_mod_dir)"
 		--with-python="${EPYTHON}"
 		--with-systemdunitdir="$(systemd_get_systemunitdir)"
 		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
 		$(use_enable debug)
+		$(use_enable pam)
 		$(use_enable python pyzfs)
 		$(use_enable static-libs static)
 	)
@@ -154,7 +158,9 @@ src_install() {
 
 	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
 
-	use test-suite || rm -rf "${ED}/usr/share/zfs"
+	use pam && { rm -rv "${ED}/unwanted_debian_files" || die ; }
+
+	use test-suite || { rm -r "${ED}/usr/share/zfs" || die ; }
 
 	if ! use static-libs; then
 		find "${ED}/" -name '*.la' -delete || die
author	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-08-25 10:45:55 +0100
commit	3cf7c3ef441822c889356fd1812ebf2944a59851 (patch)
tree	c513fe68548b40365c1c2ebfe35c58ad431cdd77 /sys-fs
parent	05b8b0e0af1d72e51a3ee61522941bf7605cd01c (diff)