gentoo resync : 28.04.2019

78 files changed, 1852 insertions, 1490 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 4b19c4c15fa2..864809878734 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/bcache-tools/Manifest b/sys-fs/bcache-tools/Manifest
index 70fff94d063c..96630fdc3127 100644
--- a/sys-fs/bcache-tools/Manifest
+++ b/sys-fs/bcache-tools/Manifest
@@ -10,6 +10,6 @@ DIST bcache-tools-1.0.8.tgz 22153 BLAKE2B d40a64b02e0d66ef8868151870715f6e6ab546
 DIST bcache-tools-1.0.8_p20140220.tgz 22153 BLAKE2B d40a64b02e0d66ef8868151870715f6e6ab54633e4875c32d0e03dfe1871e5aa98d7e133b9eed583ac4898b1598f38b71e47109210009ca51c4dfe9dbd31768c SHA512 21eaed457e5de623089c0d4e1c11394a3950f29c749c502bfd5dd94d3dcdc7379c4a910825e33bf9fc8080df656949b94a1a28d19048a8eb6422976cb391b7dc
 EBUILD bcache-tools-1.0.5.ebuild 950 BLAKE2B f0841d328abef9b5259718584d3eeaba692a94a6acaa70d9a4f0c8b4230b52d1576fdb374249aa56950d6b64e677111d95fee3249ec8c28605fb2db51dff1a2e SHA512 94e89384c4783604f1a930ed840428deb9574fbae37653ac5e6c3d315be62fb3497ba6a463ef95f3a0fa5a983a56cff84d55dba371b6f3ce7f2d39ab6323f028
 EBUILD bcache-tools-1.0.8.ebuild 950 BLAKE2B f0841d328abef9b5259718584d3eeaba692a94a6acaa70d9a4f0c8b4230b52d1576fdb374249aa56950d6b64e677111d95fee3249ec8c28605fb2db51dff1a2e SHA512 94e89384c4783604f1a930ed840428deb9574fbae37653ac5e6c3d315be62fb3497ba6a463ef95f3a0fa5a983a56cff84d55dba371b6f3ce7f2d39ab6323f028
-EBUILD bcache-tools-1.0.8_p20140220-r1.ebuild 1602 BLAKE2B bdbd4825cb6d6095f767f836ac3aacbff80ccab3992d8b6505aad186594d33b2018dd623ddb7fb352fa30dc3cd75b4085e646d266e96280fa27315e0fdbe7ec7 SHA512 498c3f555c5ddf2b4a37836f00b3aa419b59fccee546b85161dfc90be08745d7703ef7fc9d445a5a67101ebb32c54ab8b67dab90636b7f9255091e5c3ccfc3e4
+EBUILD bcache-tools-1.0.8_p20140220-r1.ebuild 1597 BLAKE2B be77bb0278de0900a07072600950e732d0212b249350c9de31b1633b3e06fd2db659af0578ef733868442c148c597de6e9e7dca76035ae0a7883b503900aa107 SHA512 3722ba541aed414ce8bb3539e0b0fbc3b66f5d323b33615ae317604cb78df10fc12ca7a95e2c2e4d4324401999fb83851583ec601585ddc591f8dc9633119b7a
 EBUILD bcache-tools-9999.ebuild 994 BLAKE2B 11e9b8fec92d414fdb4bde15d4e359a9b0f30ac9d09f1fd6f7fc94a5c4e4bf1e07d0e48b75735e238c88cceb88ab94e0ab7b8d5b8169dad173a2051632bc209c SHA512 d329bdbaa5f93eb42cfe8e7d77416d01f279db42f3f28f3186399253641442e064395db9ea9ea56db26f8cb9d3fd432eac986799c3f342bf1187fe1885709f02
 MISC metadata.xml 304 BLAKE2B 57596b1ecdec4efba5eea65141ea49a3a5a12e4efa840bcadeded836dcdec0169f723917e52d28c56f6c0aabc6d3af587a9d276d88dd30b5978d901d72feae52 SHA512 4b5575ff0ece142ff6839b8a8a81c7c0515ac42993f5ca415d53d3a85a7171ff565332edbb237448cd662abe6f1d1ffa5dce0eb21817dd861a728f0652dcb541
diff --git a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
index a2b0838d0cce..7f2f14527624 100644
--- a/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
+++ b/sys-fs/bcache-tools/bcache-tools-1.0.8_p20140220-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{5,6} )
 
 inherit eutils flag-o-matic python-r1 toolchain-funcs udev
 
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index 684c921dfecd..12c16ad6f98a 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -16,12 +16,12 @@ EBUILD btrfs-progs-3.18.2.ebuild 1264 BLAKE2B 097f4c5717fb4824868811c82bae7a382a
 EBUILD btrfs-progs-4.1.2.ebuild 1891 BLAKE2B 6164d918d4452a4d91ee812a84fe7a2859fd303396ccacde0fa2dcd5fe7ed1e974bee47e9deece3b621e62d8176379d45b12c2ce6b52497d406425781cb35a3a SHA512 9f0771068eae7ec9bd54545d1f7d1146e9c1a221599dacb40c15106f73ea15bded433adc13dda8d2f7e302b2b4a989fd3a4442904ab222901eab70652e43d28c
 EBUILD btrfs-progs-4.10.2.ebuild 2195 BLAKE2B b2fc7318648463c6a9dd12fdca7f92fd4e6f03c85b84cc5e25f6f7ce8c471e8c2830cae58125145a794f42f17724edd82aaf0de71ad73db05b6e4b32da0ea177 SHA512 ad7aee9448e252f09291ddf82ca9e4c992cbb7b3cf25dfe968b3ed1d5a3958b6c63289f49d829621f2d08bbe3fe75f8e8a1888a6802c186db2a1617576a5b2c8
 EBUILD btrfs-progs-4.14.1.ebuild 2481 BLAKE2B 3e4db698cb95fdcdb982b424364cced1aa3087eeb77f2d5e86f51995dba2c85b557c5546f659798d593e36cc03307d436a11a98ab768bce47ffa186c7a2da6d2 SHA512 01032adb19e4ebef2bc923c16284274b5177701551c578e8813596f13e938b5504b1735e438f4633cc9131a2e20decd6e5bc58a45b3955f08b7d9c9144f60512
-EBUILD btrfs-progs-4.19.1.ebuild 2855 BLAKE2B 94e2d31c4d5f8ef45c076cd736f246d35c46b7a768dfee3e17bd7ac2a92a391b4817f188c6e84dc44a4bf94b107d452bd7376cd4dbf47dedcfda1215ae57c357 SHA512 040c58607f706224ee439f46bdb82123b3abf83ea75f8bce6c47ba7f8c3ad971b717c1c4895caafdc49fdadd6ef646470177eb377a17fd8009d666b7afd627eb
-EBUILD btrfs-progs-4.19.ebuild 2897 BLAKE2B 98a269aee1b1781b2dcd9be3dc4d6da8c82d2b5474e08f79937498d055766b738acc0e349321d6899c9ed2c5ad42c3db8126fa48041deec695cc2e78f7dfe801 SHA512 9dcd83e8f22b19b44a974ec809c8e1847f44dd33e85dc4adc3d47b26f90464f08247b195efa4ce3bb6effd5f68544f1cb1a08699220d658235ea73858be81ad2
-EBUILD btrfs-progs-4.20.1.ebuild 2855 BLAKE2B 091b43bbf8beae8e05e97b26f8f200aeaed6e5061bd6b945b42c9dcadb27d45ffbe69f47ec9c6cf2d7bcd820b123d686fba2fdd10e5762266adc63ec0d83c375 SHA512 7eff670c6e93f5f43cccb98b8cae3e41d3087f876bd94bde340f8a9b4690fef262237a39b205e4536f441685f5759b2b7c3b834c63d78e295d5feb96a7557d1e
-EBUILD btrfs-progs-4.20.2.ebuild 2855 BLAKE2B 091b43bbf8beae8e05e97b26f8f200aeaed6e5061bd6b945b42c9dcadb27d45ffbe69f47ec9c6cf2d7bcd820b123d686fba2fdd10e5762266adc63ec0d83c375 SHA512 7eff670c6e93f5f43cccb98b8cae3e41d3087f876bd94bde340f8a9b4690fef262237a39b205e4536f441685f5759b2b7c3b834c63d78e295d5feb96a7557d1e
-EBUILD btrfs-progs-4.20.ebuild 2855 BLAKE2B 091b43bbf8beae8e05e97b26f8f200aeaed6e5061bd6b945b42c9dcadb27d45ffbe69f47ec9c6cf2d7bcd820b123d686fba2fdd10e5762266adc63ec0d83c375 SHA512 7eff670c6e93f5f43cccb98b8cae3e41d3087f876bd94bde340f8a9b4690fef262237a39b205e4536f441685f5759b2b7c3b834c63d78e295d5feb96a7557d1e
+EBUILD btrfs-progs-4.19.1.ebuild 2853 BLAKE2B e655b6e505031d6e1e304d5d5bba4f0b19e425949fd3e37de3ba4d2deeb643869763dae4aad2993f2e2a637e950b78e06cc74e28d902af08327e98d8fe38bf24 SHA512 7420ccecbca2432e06bed191b018a30f14d6c18c710e4ccd1227c9622f5e5dfe9dd84aa7b7479698dc66ed0326615f72049d1fc0639f53574cabe218a575177f
+EBUILD btrfs-progs-4.19.ebuild 2895 BLAKE2B abdc15e7c275830ef675616ca76117145b21c0105569b8bd9010949f21b5a9b85adf76ca6a0d2652e6ffffa8fd2b706cfe479659b33731d66da21d1bc9fe9d6e SHA512 2a1ff36eb7f79f8eea312821c729af96de045fd5d1032b224713a2fecfe9266e322f92dae27147d3a0a3fc43dd0e6a05759fe0ea9cac565b0f8db9f1537ab970
+EBUILD btrfs-progs-4.20.1.ebuild 2853 BLAKE2B e655b6e505031d6e1e304d5d5bba4f0b19e425949fd3e37de3ba4d2deeb643869763dae4aad2993f2e2a637e950b78e06cc74e28d902af08327e98d8fe38bf24 SHA512 7420ccecbca2432e06bed191b018a30f14d6c18c710e4ccd1227c9622f5e5dfe9dd84aa7b7479698dc66ed0326615f72049d1fc0639f53574cabe218a575177f
+EBUILD btrfs-progs-4.20.2.ebuild 2853 BLAKE2B e655b6e505031d6e1e304d5d5bba4f0b19e425949fd3e37de3ba4d2deeb643869763dae4aad2993f2e2a637e950b78e06cc74e28d902af08327e98d8fe38bf24 SHA512 7420ccecbca2432e06bed191b018a30f14d6c18c710e4ccd1227c9622f5e5dfe9dd84aa7b7479698dc66ed0326615f72049d1fc0639f53574cabe218a575177f
+EBUILD btrfs-progs-4.20.ebuild 2853 BLAKE2B e655b6e505031d6e1e304d5d5bba4f0b19e425949fd3e37de3ba4d2deeb643869763dae4aad2993f2e2a637e950b78e06cc74e28d902af08327e98d8fe38bf24 SHA512 7420ccecbca2432e06bed191b018a30f14d6c18c710e4ccd1227c9622f5e5dfe9dd84aa7b7479698dc66ed0326615f72049d1fc0639f53574cabe218a575177f
 EBUILD btrfs-progs-4.4.1.ebuild 2233 BLAKE2B 3e7ccb59be25264c1b95f7d2a2a21ddeb338508f8b9a9c060decb0ff4999e87bfd67e4e6d2f00d811b818f13ba75d38972235b8f1685d4d072b8473cbaaa6d43 SHA512 85038dfcffd849ffdd62239f275e63a2fc4ce693c140c598c89f3dc19c92fa5b72c61fef27192d46853f3bcf828aa7efb34e74949acbd919cb358e1a20654dcd
 EBUILD btrfs-progs-4.9.1.ebuild 2201 BLAKE2B ae5b75a334cce82b436846179ebfa2dea8c1e61c41636821ec85e07c67c1fcbbbf60ecc6cff41bff77ddb0bae82b8b83c411ceb9f2b765fecb043790305c2bfe SHA512 51c6ab63b8cb3c0d6c99eec8412136a51788307c53eacbef3a81045b9cb093b9aa1c7cf9c2422d66bbcc9b714981927cac681c9838b5851d3311a3d9d2e4e6c4
-EBUILD btrfs-progs-9999.ebuild 2855 BLAKE2B 94e2d31c4d5f8ef45c076cd736f246d35c46b7a768dfee3e17bd7ac2a92a391b4817f188c6e84dc44a4bf94b107d452bd7376cd4dbf47dedcfda1215ae57c357 SHA512 040c58607f706224ee439f46bdb82123b3abf83ea75f8bce6c47ba7f8c3ad971b717c1c4895caafdc49fdadd6ef646470177eb377a17fd8009d666b7afd627eb
-MISC metadata.xml 821 BLAKE2B fcfbd09f0105b66c47f81af783cdd96d7fe1c5c3002ac9e4e8c270ff4348c3da8d44c03ec0dae10a6f32a300bbb1823e0039616a1c47db375bb0b938cc4b3f7f SHA512 8dda7730e4ed34352b74d73098267855e5ab61b6179b84b5e66e0bb2f6e3fb79fe693176482a27c0869b29a0b033de067e0b3a2ae3d49996ff2335e617d4915d
+EBUILD btrfs-progs-9999.ebuild 2853 BLAKE2B e655b6e505031d6e1e304d5d5bba4f0b19e425949fd3e37de3ba4d2deeb643869763dae4aad2993f2e2a637e950b78e06cc74e28d902af08327e98d8fe38bf24 SHA512 7420ccecbca2432e06bed191b018a30f14d6c18c710e4ccd1227c9622f5e5dfe9dd84aa7b7479698dc66ed0326615f72049d1fc0639f53574cabe218a575177f
+MISC metadata.xml 759 BLAKE2B 3f94ebaadb23c54121e8ffa1b80549b9e8a9d977d26ddcfdd8772e549e55fc762fcca5c8e2374a562dd9992086949eff626be71aa6da8326f8847cbc4f791fb7 SHA512 ababf03834be253af5402e167e7883fc73c6ad47198369eba02557e07ec8baaa81140837315e98979dc4b95ca160d2d984e970acdbf0ea4db9c2a9e9deddc9a8
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.1.ebuild
index 04d538396094..7dfe272040c2 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.19.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.19.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit bash-completion-r1 python-single-r1
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
index 17e1a09b4c24..72c6c1c855bf 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.19.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit bash-completion-r1 python-single-r1
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.20.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.20.1.ebuild
index 13b960406d19..7dfe272040c2 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.20.1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.20.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit bash-completion-r1 python-single-r1
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.20.2.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.20.2.ebuild
index 13b960406d19..7dfe272040c2 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.20.2.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.20.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit bash-completion-r1 python-single-r1
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-4.20.ebuild b/sys-fs/btrfs-progs/btrfs-progs-4.20.ebuild
index 13b960406d19..7dfe272040c2 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-4.20.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-4.20.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit bash-completion-r1 python-single-r1
 
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 04d538396094..7dfe272040c2 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit bash-completion-r1 python-single-r1
 
diff --git a/sys-fs/btrfs-progs/metadata.xml b/sys-fs/btrfs-progs/metadata.xml
index 8fca7add1357..7de09065cc96 100644
--- a/sys-fs/btrfs-progs/metadata.xml
+++ b/sys-fs/btrfs-progs/metadata.xml
@@ -17,6 +17,5 @@
     <flag name="convert">Build ext2 conversion utility (btrfs-convert)</flag>
     <flag name="reiserfs">Enable reiserfs support in btrfs-convert tool.</flag>
     <flag name="static">Build static binaries in addition to the dynamic ones</flag>
-    <flag name="zstd">Enable zstd compression support.</flag>
   </use>
 </pkgmetadata>
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 7b97a1801300..9beb78ea364f 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -1,7 +1,7 @@
 DIST cryfs-0.9.7-spdlog.patch.xz 28204 BLAKE2B 0905971713b2d709aa34bfd11333a0aaea21ba08bbed12eee20e668fae4c19b17fe25d2fecf17dfff67abadd896b5e3eda2344655e2fb32ea1f28961d850d158 SHA512 a09adf3d9ce47bd38bfc9e3b35f23df8ce971e6d115d7e6eaa907c7eab71e73d495bda9d1ab96e25b4a9a9d551fa07a71f37d17c9779679b3a95dfff1d311a86
 DIST cryfs-0.9.7.tar.xz 970588 BLAKE2B b3d79ed44c2280ef34bafa5613f51918093686da9a4637987745bd9601817033049115754e235b9a9a0f2045401182bc9cb48291173df6571887e9dec3f73636 SHA512 962c7e5e7ea153ed41cb47094b71bc41457e26203b94cc5e349c4d21e86630e32113c0193a248eee8ead41bede1c712d4c006150f84a6e1c2a0a0a7c02a1911b
 DIST cryfs-0.9.9.tar.xz 977928 BLAKE2B 927d5f61be99a6400cfd53de6291e14ae32f446d281485901e758341f138a2efdfb7385b6c205db6f865dc83f6fbd9ede8fd1bb5a7957fb242624d78d2523eaf SHA512 18f0ce954dc9958b52a77aac85d4d30d03409e4f88c27ec3e904a6014f5257e12fe47a4f3bb628f6ebf3b5aa8cb9d3a59e0aee76d83a3f6bdd4ef864b66898aa
-EBUILD cryfs-0.9.7.ebuild 2197 BLAKE2B 1adb3fb0ad71f63e39c1223d799d3dedcf94df6f089ffb5005fcfcc568445a12fedd6ec7d4108bcec73f35223ba9b1b0b1cdcfc1ff8a9441c186d961c44362d0 SHA512 9a8a7a593355f1b5d267e111ba968b4ebb578773db034230183dac95b51829a89962643a89876a71a11dd1242f2b3823fccb6b109744c8ed687b43798fab7386
-EBUILD cryfs-0.9.9.ebuild 2420 BLAKE2B 302510a07623888cc8fd76f5177a4d289ed49b3cb36e4e6d3fd77e3c4a2ffd921e3fd99f46fd07e68a0ccfaea432a953218da5dd62bc45fbacce095f06af113f SHA512 6562f997c7c42535821e850628df3db3194683f1aed6895a463c91eee36ae7c519a04871f2ae6bd71a69ad349fb395e80cb261da2d28cb158a259147100d32d0
-EBUILD cryfs-9999.ebuild 2418 BLAKE2B 44c4afa4e41810aed38fd6457c92b5795436110de8734f317ad734f3c0e4bacea8259eb54589c1ac0dfe498a6c96d489232fb44f8a4f39b2dd1f74202565c342 SHA512 0811d50ba9eb73da28d69cc26ed6a7b5b1709a5fe694941e6e38baa084acdbbd041645d7cb563c29987b2089d232918d1ac193dddcc90ede603b47a23f24ee3d
+EBUILD cryfs-0.9.7.ebuild 2195 BLAKE2B 59279b53ecd9acd372f6aeed6996ec5d33a20beb5599fbd7119f8f68c5445630e5bd39b5bf736dfb4f69766510897438ebbdf51b64697e26015dffc181f21179 SHA512 27c020e374be8e31072be14de1ce2f27e03466fb46e72e79b621d07ebeff834a729b0d7b1f2d626933ccf42e33dd874902d6b23bd100e5d8ea326429e50ff561
+EBUILD cryfs-0.9.9.ebuild 2418 BLAKE2B fcf9a626b3ece3fe35134677e3801920daf9c3c3a4e2eb2bda4cf1c9ff6be62e90d36d9337634c9ae07afb7f81ab8008b6b60f32a1fb5176e203c73d73aeb612 SHA512 42966adf9eae75f7e64b20bbbe64a5c85dc17a7ce06c29d3d7d2a1599f2f3ef185473822f480b032e752dad9486bfd9b9ea7464293fc89dc043b1975e22500fe
+EBUILD cryfs-9999.ebuild 2416 BLAKE2B 0492c25b60c3c563691fcc6085d3c8e82454c366f900c58be6a776bb337c232f145a3a74e28a8db185a06136ed1bba8cbb1ff2e8f9aa0c213d406219622a5c07 SHA512 ca4e83f9adb1377997dca058ef897a8e574a14c877b5744755904b489f9bb767a58a1f6c9c01b5512d22fcd92db5dc18ffdf26228689c78116df49cc1faecc4d
 MISC metadata.xml 605 BLAKE2B cfbabba2fc835d75ab64ff6ea27f87639d27b0d8591d5d318e2c1768f68cb48a50995b7a96b045ba6da3491c4a50219a8a69de6a2efc28325b3bc852b4abf213 SHA512 e7b1aba09cebc2786c664b1f9dbbfeb7baff97536af721953c4eb2dc10d84c97e02277fa5c4532f8bb022a344731d6ea65be81cb3cc88c25d4dea70dcd6ce250
diff --git a/sys-fs/cryfs/cryfs-0.9.7.ebuild b/sys-fs/cryfs/cryfs-0.9.7.ebuild
index 9731773b9492..fa5832c7cd9f 100644
--- a/sys-fs/cryfs/cryfs-0.9.7.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.7.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit cmake-utils python-any-r1
 
diff --git a/sys-fs/cryfs/cryfs-0.9.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild
index 4140cf41b08b..73f1da161ea1 100644
--- a/sys-fs/cryfs/cryfs-0.9.9.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit cmake-utils python-any-r1 flag-o-matic
 
diff --git a/sys-fs/cryfs/cryfs-9999.ebuild b/sys-fs/cryfs/cryfs-9999.ebuild
index 6501bc524cae..12a15789f0d6 100644
--- a/sys-fs/cryfs/cryfs-9999.ebuild
+++ b/sys-fs/cryfs/cryfs-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 CMAKE_MAKEFILE_GENERATOR=emake
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6}} )
 
 inherit cmake-utils python-any-r1 flag-o-matic
 
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 1c84116a7e64..178ceac870a5 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -8,9 +8,9 @@ DIST cryptsetup-1.7.5.tar.xz 1232696 BLAKE2B 1bd62b186564e0b902480d66f623074f8d2
 DIST cryptsetup-2.0.5.tar.xz 10476304 BLAKE2B cf1e335fce48a7bf835b2008dfc0a96ef35d344e2c9f6a0a5a2ff45644f9015311e99b8f9e05b0b23cad69d74f91dd1b7cdd766560fb6504e7453d6e46bea186 SHA512 bac3f5fde1be02d325c097f85e77aef44ce764c1bca7f0554cedd69b9444e5a5529f11b9ae74d36dc1977e88e11422a58dfa17e48559eac7f5e6c4ce332409ae
 DIST cryptsetup-2.0.6.tar.xz 10621424 BLAKE2B ecda2cb3c0a8a46b69519ab9ea9a1ece44fb21602cbce0751e52a16e5e493c7772fdc62c1151b95a783a847d9afd5a64f64bcac6673acba4bb90a417047c93cb SHA512 1fdb9068fe2b5825cef65323a9b788b5e043c1000e614e47e2b21ab3969e416653580aba639755ba936718ad612b986768029df5e07f3fa191db2bf29d2501ef
 DIST cryptsetup-2.1.0.tar.xz 10662576 BLAKE2B c79b24c986d5925aed31eddf8f271c3d0f12c89b3f99f953cfa39fe0d9dca2ab3dd2f6ea22141aca0148d6d533d197378b011561075ca26a14ca2e90500a1689 SHA512 f1b68e4d9d0ca2361fe9bdd51c60630dd4ab7a689b7be7756edf4dee12929d2356dd0658c9b940ffe27c033ef289efaf49daf21d250d37fdfa15394b5d821928
-EBUILD cryptsetup-1.7.5-r1.ebuild 4037 BLAKE2B ee982d2346da33ae7742147f303fdd0c452b66864c216b06221ba9760197f4084bffb6c7d954dacd25814940761040b0b62aea737f5b363e9a5cd85327abfe7f SHA512 b62f9603889d97e1b9302840145e59c606bdf9242346db4da3a0b4f389013fa6778db29a8077d244e9ddbb1c803d45d2fb43b2a8674e414c598b2c3b61a83f23
-EBUILD cryptsetup-2.0.5-r1.ebuild 4153 BLAKE2B cbca146d7e3fa93ca5e7848a6e6f6e81b6db999059be22ab4e23b96267f13d106a7ac4d34f771cfc566ec0d0968aabcb36a2985d799f9f5a3eff11c2975e6342 SHA512 dbb00e9b80e479eea14dc97a4ec44963eb1d8e251e0f17616197c30c2c55c2c4d7c62c446bcc4d0574e3968ed0a696cf8d8b04c88bbf367c55567b9cec4db713
-EBUILD cryptsetup-2.0.5.ebuild 4153 BLAKE2B fef3bc471620ccf1b2721fe48708a83a2df51ab1ffcc1b4671303152c9c0ef352e5f7d773bab43e389e6fb75ec7df42b34b2182951fab7e720804122af0fe3cc SHA512 83db793b38c609812008ecbb8edb1163ba7f32635606be2dfdec34a5ba8292ddbaf8fbafa7624d66c757f35566a2ef6b9f6b9ea56ab797779a54aa7cdd8026e4
-EBUILD cryptsetup-2.0.6.ebuild 4169 BLAKE2B 8a69fecfc6decdafc254d5c0256cddfa5dffa2403bdb56fa665a8b94b0295f5d4da26b75cc3edce70e7e55fcf4f7bb164f8a984a8f2bccf5234cc9c0c6bc39bd SHA512 f54b943703894c29a8b1d7066ccd2838ddebbb68804c15e747dc0e8a016c82d604b263ab569c949abddeec117a2a8645df7995e50c9720893f412e9b08df4f42
-EBUILD cryptsetup-2.1.0.ebuild 4185 BLAKE2B 89895eab8b457b05707e652d16204fd05fd06ddf81a94b87faa6db1b00872aa16717a40d212d0c5ec0bf6d07c61475d22a358da0088a3c1a917ed9d03aa8e41c SHA512 4c64374c431794e20f5ceedca2ebbb3a433da3758e7a273b1a66caab36dc3625b1828b28056d2fee7922044c8cc85ab0c0347bfc6d6951c4d739a6bd2bd36b33
+EBUILD cryptsetup-1.7.5-r1.ebuild 4033 BLAKE2B 77146c613eefaf677f4a0f77cb773b48829f520f988fb37c7ebc2b1df2e8d6269a02562a2e2f959029f563e9c89e0591160bbc5e22ec35875e4775bf20ba1da0 SHA512 0397db7c62308400767776b3caa614b8fe2dec4545ee1416eafb9116f9e458a6e26008ece4df870f40bc6270cd1b4340746b8fabb5f90418c7d9f18de852cf78
+EBUILD cryptsetup-2.0.5-r1.ebuild 4151 BLAKE2B eb67cb9e3424b5444bf298fafeb3cbf050e5420b4a2137c75e437a13b2b8a1ff642b40186d37f10ee92785074833f833cad44eca3bc3e9c0f91fd710ac9fcc50 SHA512 71c6948ff51c919ac6052ad65355ffb620049049ef21fe6545d39bb6d56adb843d5de25b722911d979becca9945f7d05d7cf1b240bb0d5448513a4fa7baad8cd
+EBUILD cryptsetup-2.0.5.ebuild 4151 BLAKE2B 3983c05c1cf91cdfe7fb999b9af742bf43fc704a49e01ad78b51a68b72640b022e5b8400da6f4c78e69bbc830ca7d54e460add31ef5157dddd316f5241b00285 SHA512 b4ee973b0f25a07af0c0d38e009b55e66387ba34f44cba8916ad60391bc0764d847da562c35561ae786c3961f8e93445d11366f776144c97b70ba8b27621fdf8
+EBUILD cryptsetup-2.0.6.ebuild 4167 BLAKE2B 0aaa413b365a5b3986e3908709e54af38af8191c2086168076d380321c8577cc686826b7f57fb1671bdf45adf141630f65e815842f0cf4703636a8caf7cee46b SHA512 c707d533fcfc71e5adcd3eacd9556ae0d87c65b9e283008daafe5aaa29056ed175bf5354c08638454677b75e99f0f77d51a0ea76a0006bb8812d721a46e8cef7
+EBUILD cryptsetup-2.1.0.ebuild 4191 BLAKE2B b64c29fa6b4ae4d11598d7e978f6eb6e7799e8066d43a844874738ac9528301ddc8cac2ad1ed8a8e1591ab9574a691e6989abd455bc33c9b15d203b6e3c1454d SHA512 7d8ce5d53f6b2aa3545c968fa799f6b2e3b62fee271464b3abceb59c351b33d5b163a8328adfa6f8fb76ada4d3c9f1b939cc498b83d5402f9c6dcd7ceb15fb63
 MISC metadata.xml 1074 BLAKE2B b1a6789b42307eb919717d35dabb48fc060490e561a1b5d4b0a25a2ba4dfe1399a7bf564c5477be61a68b7b5248153843f6892f95893e36257b9d790f8501779 SHA512 d070c22187874175ae93078fc80f4d150da102557cc680c8dd324ffe21de533ad67b4478f0d83e385ef5d4e75541bb04fd8308697db0ebf6ecd9f1e11382847b
diff --git a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
index 43f7f38eddef..67bb11a4ecdc 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.7.5-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=5
 
 DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
 
 inherit autotools distutils-r1 linux-info libtool eutils versionator
 
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
index 29d4e9c8fee8..3227928ccf91 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.5-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit autotools python-single-r1 linux-info libtool eapi7-ver
 
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild
index 95b79852b4de..f270366abe7e 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.5.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit autotools python-single-r1 linux-info libtool eapi7-ver
 
diff --git a/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild b/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
index 59f9499628da..8850779fd9d9 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.0.6.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
 inherit autotools python-single-r1 linux-info libtool eapi7-ver
 
diff --git a/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild b/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild
index 95a0d691044e..457a33aa1fbe 100644
--- a/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-2.1.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kernel/linux/utils/${PN}/v$(ver_cut 1-2)/${P/_/-}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0/12" # libcryptsetup.so version
 [[ ${PV} != *_rc* ]] && \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 CRYPTO_BACKENDS="gcrypt kernel nettle +openssl"
 # we don't support nss since it doesn't allow cryptsetup to be built statically
 # and it's missing ripemd160 support so it can't provide full backward compatibility
diff --git a/sys-fs/dfc/Manifest b/sys-fs/dfc/Manifest
index afecc30ea4f2..3d7fd5d3e691 100644
--- a/sys-fs/dfc/Manifest
+++ b/sys-fs/dfc/Manifest
@@ -1,3 +1,3 @@
 DIST dfc-3.1.1.tar.gz 52709 BLAKE2B 543795af9c0f3309ee497bc0bdfe144bec3cac69b4772803204d794acb9513e7f7b2726ea16640492a6c477f5c3c7fa872284efd5b7c690bf1bfde4608f7281d SHA512 eac2c8d464d57626efe939f515889cf91510f7e6eb50382d045204d4f1d6b9b9f0af4b1d8974c9cbcff1eb5b8802157e421ec06e5a1e38dac74eba72f43f9701
-EBUILD dfc-3.1.1.ebuild 815 BLAKE2B bfe85924d7b50a1fcf67d1416861143e1327bb097d5cf6cf8e4b326a4abd7c72b73f48bce4a7fdd2ecb5f9ecbfba0ad11bc1556f2834452d8e0a0aa1d8f2212b SHA512 0b308cd3cf6d922e0b8e44c31481e63a590a3c61e24fbddaa7f18d8beb8c397d4f39ab5282ffd3f32dfb1f6adab9c8d3f7d3f6de151047b149395305d12ce830
+EBUILD dfc-3.1.1.ebuild 822 BLAKE2B 0583da13a2fc63d937612c7eea628db8cbd9590bcf1d06291dd4821e9fdb0e715cda12bb2fe3c33fd52fa3ce19f8737ca52f1c585a16b49772095375c367c8a4 SHA512 64bf87044f5098b2f4c59d4e1e3f1411d926e4c5b60adf93124a9e2bb881987278970ae7fc214f09dde00c54f430811dfb0b50f5a2c5d792f9f908f47739be87
 MISC metadata.xml 240 BLAKE2B bd240e0175a0c9b3a954ded560844811f58403fcf0fd6474dde32d571e7c3f22424ae8de719a4adad492b6d5f4df7d3198f5a5f65f2c21ca8f05274a9f979f85 SHA512 923a0a24ce7efb7b5c6e6561521def809a20d77a8dca21ca55c1bd8e0e34139c0d5d6ec683180f0b97ddb809ea124765eba82f1135abe08c93f4dfb353d18da8
diff --git a/sys-fs/dfc/dfc-3.1.1.ebuild b/sys-fs/dfc/dfc-3.1.1.ebuild
index d48aa170728e..ff80ffbf9eb5 100644
--- a/sys-fs/dfc/dfc-3.1.1.ebuild
+++ b/sys-fs/dfc/dfc-3.1.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://projects.gw-computing.net/attachments/download/615/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="nls"
 
 DEPEND="nls? (
diff --git a/sys-fs/dislocker/Manifest b/sys-fs/dislocker/Manifest
index 50a7e902ece2..d73599c99cd2 100644
--- a/sys-fs/dislocker/Manifest
+++ b/sys-fs/dislocker/Manifest
@@ -1,4 +1,4 @@
 DIST dislocker-0.7.1.tar.gz 103194 BLAKE2B 05421b0d3e7686480e40a41e67086017c454b76e0852fef78a7b5d10134cf388b4bf7b9669d87b867418f4c074cc023ea9b0260dbdbc837322d04f217aa40b28 SHA512 8852ba3e363fdea992eebecfe1e4dad2b85404f57c57ce6b2937a9859d03cfa88d969926c9e11e6d22596c6d96805b7d1737893ae2c5a957448ab26708bce226
-EBUILD dislocker-0.7.1-r1.ebuild 1191 BLAKE2B f79cb810f7911e23d3aeb3c171aa3f2e7a2d2f4d591123efcde5dd47ec531945f6b61c4590073fe145518751b1cecd77d4a1af1929ef074af6ed1b3e1e299506 SHA512 70f2be9bceef29bd0e3f7b02a57314d8039263605cf8befe26fc4ef4f0415ce525c966ab38b0def3049f1a535d28a2c3d3d777f69f85fcbf71377b3d03d01006
+EBUILD dislocker-0.7.1-r1.ebuild 1188 BLAKE2B b67d84c16aed081a49593a9153f64586ed87a52fb4c941d53948e61bae10442fc16611433c4c86adf7c606619ab23a2938229026a8743f329c1a55effaac9415 SHA512 97f38be0cae69e033acb2517c25c698ee14e44007d2d0ebbb01ac02823d9cc28693883cd338f52afa8bb1d21ffe637097e3b77fd9c3ed816c06341e2a1885aee
 EBUILD dislocker-9999.ebuild 1191 BLAKE2B f79cb810f7911e23d3aeb3c171aa3f2e7a2d2f4d591123efcde5dd47ec531945f6b61c4590073fe145518751b1cecd77d4a1af1929ef074af6ed1b3e1e299506 SHA512 70f2be9bceef29bd0e3f7b02a57314d8039263605cf8befe26fc4ef4f0415ce525c966ab38b0def3049f1a535d28a2c3d3d777f69f85fcbf71377b3d03d01006
 MISC metadata.xml 343 BLAKE2B edbbbf3c98bb40a48d9b39f6fbe579a306f44539eb9415585c3e8045f4bfa2c2b7864be18313f2dd50aa73c14aacb5e446d4eb94f4c7116a7c0407ec651f3d02 SHA512 479da4294232d9c49530e2ed2c936c824c697b08d722309addb64bc77dd083365b0d4ce063dd331e4dbd13a0185885dca7bf5d62a6a09dfc6e7a38fd7e25f448
diff --git a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
index 6c245bbb7f6c..e0008c697804 100644
--- a/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
+++ b/sys-fs/dislocker/dislocker-0.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,7 @@ IUSE="ruby"
 
 DEPEND="sys-fs/fuse:*
 	net-libs/mbedtls
-	ruby? ( dev-lang/ruby:2.3 )"
+	ruby? ( dev-lang/ruby:2.4 )"
 
 RDEPEND="${DEPEND}"
 
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 8e1a62a4be53..3d96efb50b0c 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -3,7 +3,7 @@ AUX udev-postmount 1208 BLAKE2B bcfbaee26ea666304091092deabcc068c533c7707252917a
 DIST eudev-3.2.5.tar.gz 1856958 BLAKE2B 8ca5706a91395ffa38c9bc552df874c1521d18103a6568bcf82d0664a20f8e38b58b67a74798f9f0c10a5adc99a7524318055b79dc2e360aee684c2a2a5983a4 SHA512 f73efde0d2dafcf79be4ebe9f6e6abb44329ea4ae45ccc4d9662c1d5ca6f4d45c27ca0b3135d7fa85f305bf7c5825dc1000079eb93fe7179c36a229fe63e372c
 DIST eudev-3.2.7.tar.gz 1892931 BLAKE2B 9ae903d624e8fb1b334735527329e6074a194dd6e22073c54acc58010d0f8f2d29bdc42d3e6d72dd388c1012be273ca27626ffe1173382d7dde9ad3aee942cd0 SHA512 e6c8ec86ae434c967f6a568fa0b281229bb87be7e3fec025dc3e0225de7843ffaa5dd65bdeffefbc91e9e2911aa3de9df84c76148fe8863ff60fba4c88653c40
 EBUILD eudev-3.2.5.ebuild 7019 BLAKE2B 39a12a772b0f543cf6c76a988d3c485423da493a695200d6e18a38916e3c1ce0442979549191683c5aee04efa0bbcbbb32e15d1f92381cffe41658438496d634 SHA512 271017380e0713c76126a8a34d53b974cbf657da1b0e31a4fe869cddc6327c992f722acc5f08bf9cc1f49f9d053867a9978cc42b4d481db0021dc8c12715d7fa
-EBUILD eudev-3.2.7-r1.ebuild 7089 BLAKE2B 8db47834c459c15cb14497a53ed5b5bca8dc388b8ec3b07a17d150ec45872f68a513e188b0075fb6d824a9d4c6532c9b85027a290aa024aff2bdf73933bfd1fd SHA512 7d835d5ac85a206c09d9b07cb7c5044b6f2cf70257dfef1c1e3fdab711356585e288e4804fb17008ee98dc97d992d895e820d569c37390f5d3f6b3d7bc125327
+EBUILD eudev-3.2.7-r2.ebuild 7125 BLAKE2B 182deb57725a17ad62c3af21ba85ae6d2734410ae268845f4c022b24f00f93688a3a300e3f6fb4b480830ba61f336f0d58f7b8b67bff7a4a9ef755b2dff2017b SHA512 f1b24d8ed035f90c4a22b9f507d266820da1f234ad14a8aa86a043f0a3ed7982e27414104c1aedc629cfd9bf0c57123fd1a56e4799ada6bd9906752bdba3e80c
 EBUILD eudev-4.9999.ebuild 6314 BLAKE2B cb761cf1b967faf8d5ea170beafd0218a8be85d7f599107ee1977f77bae167d86840e7842da4bc6435a984df25470bd6fd10f263df1a326ec97f47799e38d6f5 SHA512 300f700e4ee4e117af85609d64847007b422b9a0ea7a75cb4cfb08882b4da38687d8a498cfdd36d4b1cd0f44e5eda773d24eb1085281fe302a30f978987dd0a2
-EBUILD eudev-9999.ebuild 7089 BLAKE2B 8db47834c459c15cb14497a53ed5b5bca8dc388b8ec3b07a17d150ec45872f68a513e188b0075fb6d824a9d4c6532c9b85027a290aa024aff2bdf73933bfd1fd SHA512 7d835d5ac85a206c09d9b07cb7c5044b6f2cf70257dfef1c1e3fdab711356585e288e4804fb17008ee98dc97d992d895e820d569c37390f5d3f6b3d7bc125327
+EBUILD eudev-9999.ebuild 7125 BLAKE2B 182deb57725a17ad62c3af21ba85ae6d2734410ae268845f4c022b24f00f93688a3a300e3f6fb4b480830ba61f336f0d58f7b8b67bff7a4a9ef755b2dff2017b SHA512 f1b24d8ed035f90c4a22b9f507d266820da1f234ad14a8aa86a043f0a3ed7982e27414104c1aedc629cfd9bf0c57123fd1a56e4799ada6bd9906752bdba3e80c
 MISC metadata.xml 858 BLAKE2B dda0b6f29e9bce44b437db2236a94db9924c1e0999bcd68833ffae35fb6b390cfe0b6373d2e66d45eaa78059a89e9824f14c8ec775d085f51aa2b9ee7eb80a42 SHA512 bfffbea2229a0beabe8e979857b9f9761ade64faa0fc421a5f4d8ec1030aed60cce1505ff7d964f0128220773865d7f564db746fee1d68e611851c73406d1a79
diff --git a/sys-fs/eudev/eudev-3.2.7-r1.ebuild b/sys-fs/eudev/eudev-3.2.7-r2.ebuild
index 63a4096b3f0d..21b78a5bbe09 100644
--- a/sys-fs/eudev/eudev-3.2.7-r1.ebuild
+++ b/sys-fs/eudev/eudev-3.2.7-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -190,6 +190,8 @@ pkg_postinst() {
 	# https://bugs.gentoo.org/246847
 	# https://bugs.gentoo.org/514174
 	enewgroup input
+	enewgroup kvm 78
+	enewgroup render
 
 	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
 	# process it as a list.  We only care about the zero case (new install) or the case where
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 63a4096b3f0d..21b78a5bbe09 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -190,6 +190,8 @@ pkg_postinst() {
 	# https://bugs.gentoo.org/246847
 	# https://bugs.gentoo.org/514174
 	enewgroup input
+	enewgroup kvm 78
+	enewgroup render
 
 	# REPLACING_VERSIONS should only ever have zero or 1 values but in case it doesn't,
 	# process it as a list.  We only care about the zero case (new install) or the case where
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index d670a1aca3bb..60f49dc4e234 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -9,6 +9,6 @@ DIST fuse-3.4.2.tar.xz 1019864 BLAKE2B babb8454438b5c4a924e83112ee5c319c0fa37c54
 EBUILD fuse-2.9.7.ebuild 2206 BLAKE2B eb1f3ee67657e03d572bea6895655ab43f39cf41e6eef422baf6643184080a224f72e773afe496784d0e60d12ce63d9e678b3f1c43a867042f93fea2fc350cfa SHA512 5b44ada149cf1cc4028307ee6e11657e7e1de98f9893a5061aada592037ca54b16644354f970d222687b3f07d3673c1352c02e8ddf5fe60d031244a617d13d23
 EBUILD fuse-2.9.8.ebuild 1942 BLAKE2B 160c38daa8321d980347079e0ab8677526c639e0d6f20b8fffaa481b7072146f1aced7f61cfc5ae05b483d7178beed551e6df44d5e319c9274a3c1c5cb530e58 SHA512 35efa56282f0a9a4aca7e284af1da587d6a5545439c50258ecc31c47159fa777c70400f28b4fd9c8392a39d1b43ba8c3c1935e0860d7689dc7ad40f5134e7da8
 EBUILD fuse-2.9.9.ebuild 1883 BLAKE2B 7cbd50df85e6eaea2e89b3e36bf819bba20cc1589dc2607bff8e2fe97155a7f1f6ae34b9589c3965e29dffd311682a259cbbd06bd9cce215121837b2c29022c0 SHA512 876c5d8760383847d59db3ceed3dcb074fe48e87ef4192cbb8bd586eac9e5e2becfd7a0a49a76cb213426e961ac2e353d9421865fb5801507e59a584a89da5e0
-EBUILD fuse-3.4.1.ebuild 1659 BLAKE2B fb830f40d7c535864111a02277aef8d51da505be9d497e09bf1d7e60c44831d13421261f24e4be82785aa275f78e3b7ba20f21d27fbe9edaed2fc33c5512c2b2 SHA512 d92104cda402f7497d2417012298558fcd532fdac41cdf8897c70a061c093a26aab04ac774f652c25e6d10e00ebd913bd8140502c8517c1a9df7d5b424407609
+EBUILD fuse-3.4.1.ebuild 1657 BLAKE2B 7b51b31552b827d810c9ebbef25711049de95f9967dbe112ef1dc70aa56617cf7771dd44cd5aad917030288f2e68169d0abfd3e8673a49604d5f19ff590e7c99 SHA512 58c53a644bc8a70cbc4cfe6afd039d8e747f70bd0231274400d7d46d71eba15a07620564ca7094dd94228b9c9c9e01f59c2968e13117ce2227d630fc92680704
 EBUILD fuse-3.4.2.ebuild 1651 BLAKE2B a2f92916463994570422db3ac73c26363ee6551c9385e51f73d666c3a8fa5eaf762cc3bc4f0edcd37f74eebbf8511c2f19f9a1d66738fe9f581cfc5abb5e7f84 SHA512 94415c24288b1c08d44c220f8fd5fdf28631201941ef9c046a5e21784fda025ede2659c33b2846d1537dec1b9d0f389acb9cf1a4fe81af0ed494b5abe15b36ea
 MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180
diff --git a/sys-fs/fuse/fuse-3.4.1.ebuild b/sys-fs/fuse/fuse-3.4.1.ebuild
index 9910cea42b18..dddc7c719957 100644
--- a/sys-fs/fuse/fuse-3.4.1.ebuild
+++ b/sys-fs/fuse/fuse-3.4.1.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
 
 inherit meson multilib-minimal flag-o-matic udev python-any-r1
 
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index d534ba5b27f6..a1c38ed29ff8 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,5 +1,6 @@
 AUX device-mapper.conf-1.02.22-r3 15 BLAKE2B c8954f4cad3090e95c8ab985f7f93b65add66b9014351aab82d270c371c3b7571a73b37b2002664b50c21bb7dd494c7196857de75b41ca534cb15e0127f080ae SHA512 1846e0ca1be7170d4c0beb694a23aea4d19b24b99a248bb0f4e034286a6beede0a8efc474b0c237e33ee72c86c93b6238f2d5ea23e224765acba99c90633261e
 AUX device-mapper.rc-2.02.105-r2 3707 BLAKE2B 1f1f38fd377e77e082985146de8a32fb88f794e4db28d6790cccbc6a87b63b0d28617e5fa7eb4974e2dcf8a80265accf8b69ff0719fa3de1c6788e7d5a1bd705 SHA512 9940b1154a8c07cf2f2c975e209bfb1e78913d3ea77ac6334684a9b38c4f4bd34b349b71c078c9ad5700f554046771ee05e17f07b75dc4e7d839f1df2305cc4f
+AUX dmeventd.initd-2.02.184-r2 595 BLAKE2B fe87c9a034f9a9924c4c6e31365619cf5809a9756112925ca50233198ab052139f8151a81ee8db69fa6a7eda8e3aacaa128faa30e5d99a52d15f5a07a9da4179 SHA512 f46fa3d0a0a0047801c0d3a3817f9d7c5dbe0daa2237c2537f5a3faef3dd2d7030780471bb1ba19746c26ce6035092477c06806156718a7526e5222339fa01ec
 AUX dmeventd.initd-2.02.67-r1 565 BLAKE2B ca1f5d205191076114d4a89717b304df04a520a22630ed84e78550e83b9364e049457bacfcadcc8ca1328a78c97412a445fcf153871266355379eab423c38138 SHA512 c0f5317ab0cba700eab3b643fd134d8a23fe4b332c47fd94728e43dfdf97250561f60ecb47808d2c65e55cdec65cccbd51f264540c0d973b2df7ded4ec129c34
 AUX dmtab 319 BLAKE2B 5753b72e44325e467c0e4ea1bbce8faafe1c5e2509d2e02a5ad428b39e531c655014a3b151f7bc57513aae74983a60cfe3034432ffd21d39716fc6893ec7da8f SHA512 a8cc69ff832eafd64d7e45854df3380a9c5f9648297e2606c5b9b47e0015c93c7da6ef3dfd35800f36a3371635fa1906605c524be82d6740fd435c7f6bf2807b
 AUX lvm-monitoring.initd-2.02.105-r2 963 BLAKE2B 2a193578c642e05a2a492fb025bdacd2594953405a58517bf6a93a04db29be03e16a33b2c5cd57c463f55f30fd47a4fb7766f52b149a298db4dcefed4ed30012 SHA512 dc13304e8d644a55f0490c84acc36b95f43fc0e86c4b44f85f54f6ed3213ad665454e7432b3621f307b3468af0c33525c24705f4a2783e35a26e02ff1c828779
@@ -7,6 +8,7 @@ AUX lvm.confd-2.02.28-r2 173 BLAKE2B 4b9d115ed31b3777bd3c925b75bd0ebb186bace92b6
 AUX lvm.rc-2.02.105-r2 2960 BLAKE2B 40cdd0e6c3a717367fe6854524b5f355e952f2640823242e5fd18374e3a161e97fff6ce9ec7c052d25ea04f60e75cc2d89e2c48b0e218b62d917916e110c0461 SHA512 8d8ccac694110e3538aeb246244b1b129d960f35d54eb583d77e9d54bed243248b121262557fc0c69bc734a04ca35c0485428e65b1a4d06c438828a239053fae
 AUX lvm.rc-2.02.116-r6 3783 BLAKE2B 5150d5c15db03d65b43fd29a23043c2dbb16805a00f79fbec398980f93f9c490474a03b6b7d0d2748ac9a39619b81ac04f6aaa14e700322b09c3e1372f843cd2 SHA512 f819faf7844c3b946b437aee8eb5dd52bfdbb9b820a2024ad42166895e72e194898b16a34c44c69786539d19e5458c12a333f99db02c26589567bb6aabb23639
 AUX lvm.rc-2.02.172 4269 BLAKE2B a53fb5302293f7afb800400a0bb1e4f60ad8c3f7951c0872ecc3940016613faa1d141ab040beb66b3bb0b89ffe0db6be69d9924be071f57263b1c9a54eeaaa85 SHA512 1c2a246959420ab0e05e537a29b3c99c6be4a92c329cfc1c2955f0025333c2a1a48abaf864fde5b552e9c03aa31ca204c3ea49b69112f66f4df5fea7148f1953
+AUX lvm.rc-2.02.183 4363 BLAKE2B b80351d20a87937f331b34c2007b2ccd27543273b672d002607b02f56d5a15fb142111c5f0939fcc40c52b3123b3b3fc15aa39424139bd00692158f20784489b SHA512 7cd6aa621d022190cd45c44e39ac48445f244643e5c537adbe61e4fbc2d688ce450bfddece92853cc324b0bb2c52c32c4169fc251914eda429de418a0ffe8aba
 AUX lvm2-2.02.106-pthread-pkgconfig.patch 860 BLAKE2B 73c23ba460787dccc1412a8fdba9cdf60172fecab9a732b154af7e7bc4c927a751fbd1107c86cd997221b963748644885a4f525eae351aa2857c4d7e1498f755 SHA512 ae073936ee15fdeabde4d3948a65f6a435b82e62aa0ddadbad399b69bd5c9bfc181d5e0be1beae9f6e899a6e8b9d7c21add13f7a1606cb5ed4762ed5aa5aa223
 AUX lvm2-2.02.108-example.conf.in.patch 1681 BLAKE2B 3b7f1fcd005687aa3b4469d88a6fea71c6d5745df0b8ec76dbc6e4e6ad11828785f705503a992a25bae9fc77772fca03f023dbf515bc34e498dd718ed97aaa63 SHA512 b4e983892b7ff47e5e7617376197daa62cfd063cf398235dc4a436fd9025ec4b1e263d7418e2c2943d53be494cba4209e9d4230d54a78762b0ca526f92e9746c
 AUX lvm2-2.02.108-static-pkgconfig-libs.patch 3302 BLAKE2B c44b0602e010c7e774d87de808d739987b0bed6e1c963b6a6005b42933edbcaf43dabfbcb26a668c6ba4f0b1e3ddcb2f727f7b57d1c5b8e0c41b201d974a15ac SHA512 246f1029f9346d6bc57c2062c8a223535d0b832fa6bd86947b8b91b094dbc388706a9914f9ca0531666f77e73544612e2819335435b7576b4e91cdb1b0e4f041
@@ -22,6 +24,7 @@ AUX lvm2-2.02.178-asneeded.patch 452 BLAKE2B 6d7013e7a0e1aae933e22b2c30b85cf744f
 AUX lvm2-2.02.178-dynamic-static-ldflags.patch 2279 BLAKE2B 526104c96dbef36568a11898193c5d0a7d69a63df2011e1f1a778a4317248a683470e331ddbf8b07fe8654abca5a96e9a53d0b13715c860f8c1e8b33b8e95384 SHA512 83f253ca629e90380164edc74f3900f6e40fcd0002d357dbcaecf4a75c2a2213c55cce1291a27afd2e07c72838e46fe7438217f8a103c20233ffa2621cf02cb1
 AUX lvm2-2.02.178-example.conf.in.patch 1650 BLAKE2B f5e04bb7524cffb5ee3f6f819541eba0681e8a32f884be4c78537a38848fdbe03d3028b90568e03810df86012cfb497c9050fb949c6c8b1d4460174a6794205b SHA512 fe30018b3f0ebd6f99e63a5d8b423365b8f2c5d5b17b19810ca1bea52f49a5c07e059cfcb1851be752024ba5acad6fbb736f20264b83bdf385f845c3b68d5b5b
 AUX lvm2-2.02.178-static-pkgconfig-libs.patch 3495 BLAKE2B 85869e4f46b001c4a8d43692ae7e3d73731deb9bc6094b4cdb3059058dfb819ecf507f5c5a5b47d4be4db18e6d0765c652f5b0e18ea17ecb55112fc70f7033bd SHA512 9a8b3d2296e4966d7209bdef3cd4c40f65a81ab5c2220d6b8ea06fd35ebad272a09a39b7f4e352eff32ad82babfbbec6c4f108d200193b3f84b225f739e0afc6
+AUX lvm2-2.02.184-dmeventd-no-idle-exit.patch 2468 BLAKE2B e59873c7da99a8e62f71c78b1e93d54c342258949719fabdf2b08b0fcbf00ddcd3c8eb2a937416c646a948dda91474d2ad2187fcb880152986c7f6936bbee1ee SHA512 02a82cde3affd8e84b9800ad06c0c2ec9562f9412157e4f9ba96ef502a22d7870ece3d867684cf90c32ebc77bad8ae3beef5a3fe606ef7c30ad1b2b73e81de1a
 AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 BLAKE2B 5533ceb7a601d58995e7a90b1355508907edb30d14704b397a8c8ba0d66dbcd3d6b02ace1cadef1dfbb1d927449403f76f0f38e5d034344b3232deb512507cb6 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de
 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 BLAKE2B baf7010b5965f5c2b9a32ec812cb259cb3ceccea0d56e48d75e9f8e872634913f160fcfff0c2c77854ddfeaafb3b48bbca16d569041ab6f45aecb950f8e5bf4a SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c
 AUX lvm2-2.02.67-createinitrd.patch 660 BLAKE2B 23e784e6769bc1f47fa57d690e6bebdf16d784d775a06af1c8eb7c54dd63a12abb0edd8331c8d033d7a0dda058252453a46dd35bd820fd47ba1407e9568b3858 SHA512 17fbba5d34ece5c1c25ef35fa3bbc3d6fcd20b44bd766c049bbc120853a8d60c9544db5790645a7814db5c272fd12d383699a8a9be6f4e9c56a7c0a1bb29ade2
@@ -31,10 +34,15 @@ AUX lvm2-2.02.99-locale-muck.patch 405 BLAKE2B 07ac7c7f54d06dbdeae1c6bf0959fd0c2
 AUX lvmetad.initd-2.02.105-r2 287 BLAKE2B 613baa6c794a971257ea25061d51ce2923475e919c6753e99e8fd2f7e8542ac48b1207f851c3c200b7a4113a62ef5bc2dc5507bcd5ad6c47bec8c9a3abc1ad63 SHA512 5fe1a47a1c54546af70c64fc001db3111e519cb81d8672761b64f50b4c552d0fa79bd0770fb4f4f3e0e0ac584b1e13ea91ac1a33cea1cc1f484cff0dde1a3b0b
 AUX lvmetad.initd-2.02.116-r3 348 BLAKE2B 6ad8f51dc6498703840a0917cdbcb5d1f179e2f8f0b2bc06f08e1c65e0dce2e63da3ca7295a8fcfc01019724bc9468d9d1338f3c2d879b4446980b5aa3e10441 SHA512 19aafd07aa6ebe3f05e321048480f746a9aafd1ad4e0323486db5c54035430f607e171d2246e91bbbf8a2a7e15278d793ad13d84e824df7af65345070483a696
 AUX lvmlockd.initd-2.02.166-r1 393 BLAKE2B 83eb337aa1069e66d7746b23141da24717303552016497d29d4df304bb174b2c380cc7c09df7b3529e355cf172150c7cf254afb984a6561e1fa3459aeed43421 SHA512 11d6f186799d8628220eccb4823e5bd251bc3c447e6c3f8a63c025dc4e08e0a7638a8439967ea2ee8a717264887597be4992afca59571ebaa651441782288081
+AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
 DIST LVM2.2.02.116.tgz 1538340 BLAKE2B 718261b60626f2eca5ba13011646bf551523ed8e59aaceceb9097221c000268b7533ac43151ff1d9229911d87e764fbdb29ffa1d305f2aae99220a68e301559a SHA512 992541339637d597257850b4ff7f5348fb7cdcccf806ac8d986a3be1ad1edc5f6bfaedeed5128690c541d1a485cdc75742e90a766363c39867901003518fb84d
 DIST LVM2.2.02.145.tgz 1986370 BLAKE2B 0c9e5efae17f26ff86152cecbf0b11a74e85007b2fa9491f44dec03ac8c11375bacf6685213b4be19037c8fbf70e13549516716ecf8fa262919a44625e6aab34 SHA512 84e28b3efc940837ea9da70fce620744aea0945ba29383b76ad7bcd4b5259b897c714162a8e8b7cfe26ae736a3ad2eca633a3e0df4d6280a32b28bd4cf472d27
 DIST LVM2.2.02.183.tgz 2380574 BLAKE2B b1fe71b6cdb8ee20dd53d0ad3399c553487baafa12657ec81a794c84ad161988afdb8693ac247877a2645d693a0740c74c8b991047ed2ba4adc9ec75f1c261a9 SHA512 3947523c6b0862ada40677ed171ed0cf95e070119e377296fc5ccb153e9c4212d34c0b16a887dbd68ccf265525345dabfed2aa59fb3604555429a7e2ecfff4d7
+DIST LVM2.2.02.184.tgz 2383698 BLAKE2B b6e308d76d541b9461dfcc6e82db256a175ccdabfae9c9d57d84eabd0d5ea50e3e09954b34741903e027412c2c26f72a5005fe934261576337a810738139deb8 SHA512 9db74f675e7c58f663a39afb79b6f33a33ad2cfbda63e9783ef5027f33977b4a1262a2e6754aa67c586eed083ee119a2e837c32a7746dcc53f13877c9d65c390
 EBUILD lvm2-2.02.116.ebuild 8431 BLAKE2B 5b17d1ff4ee12c1e8ed040711eb2501a42ff72c371901ca4b9e4ec24a7eab71c8b71bcf52b27e5aeb2548d4aa6cfcab4278d92f5259e22c98190038b019948f6 SHA512 5e8655e7d70566a2b06ef50baa62339b1f26d20385b8a9fc261188bc0012af8d4ed4ab451305e4df5289a44bafe3e2a1252f6264439d6539ab1ae54cda1373f7
 EBUILD lvm2-2.02.145-r2.ebuild 8627 BLAKE2B 63c09b396d802d131aaaa94442a26c4be8b75fc12f1bf097f07a0e52aeba28e4f3b406706ca0ef62a77d0557fc88d3f9d60963dc816026910ff6e90f2bd6439f SHA512 c4553842441409458c5bb339f5e22fa05f9b4bd34c865b907ed6b2396ff8c6fddbb78be1f480f7e189662e87141d7385a933e8f33850a7c6dcae7d611a7f37e9
-EBUILD lvm2-2.02.183.ebuild 8767 BLAKE2B 215e7c5e61420b610281fab0ca0fb37bcc54dd2a15876e3256132c002ce3fc0de27906e395029b2e403ffc4919625a0c54efee5020e48a2f1c7c64483a04e6af SHA512 e6b9dc0fe0b67ac02431bcd379f376908b24be175b7dccbbe4e70ff1708dc8c541cc5dffd0ea968813bdec876037951425a838264227e1ea4d8ccc94e674ab2b
+EBUILD lvm2-2.02.183.ebuild 8763 BLAKE2B 2885ee3d360cae58fc9dd6117a92209c26ffaa5305540496a476cfff7d129b2fc2c5a24a9858745a5abbee6e64c072bbbe62ded5410b90c63ad05cd5ed31792c SHA512 0e1682dad9834ea32a2351b9a4e71e8a27ce65cc0bfb1e0cb175d2098d8bfc4114f14a8eb8d3fba72fc7e5b87db4d0d1f12a35debec59f931ad256a1f0812d5c
+EBUILD lvm2-2.02.184-r1.ebuild 8955 BLAKE2B caa7021e7703bf50529b42425a36c1662943504dff7fe8d857996f226a02119db2f6bad377a80f1fb7fb808f82962fadbd52a5b561f571c5592ceb4524efa825 SHA512 4b337fac136367fe009993e65b84f66e26c3fc6c5517ef6415734843b793ece2dd8411c639771e11a680a092965dc30b589fb26350b490fff28b190559b7e836
+EBUILD lvm2-2.02.184-r2.ebuild 9014 BLAKE2B e016e38f56610bff72529ea22e7ad9de1c71cef034c028efe0d8641255d802c504c756899a1c319050cf780656f87e509fb50614adca39c3e14468d3ce503e55 SHA512 15567897f0448bb34980833b107b2e93d416b67df33c57d77269fa52b8fc0d2d6ffbeb19f7c9dccaa2845857dc8a9778d733f22792112fca74720df3f42e5f03
+EBUILD lvm2-2.02.184.ebuild 8769 BLAKE2B 8ff55443aee773e87a78842021820822e8ba2283b61b510dee16423b1e3eb6f48a7ca0badd7776a266c14a8e3a458da889bd548685cc9adcc72a31bbbc25ddd1 SHA512 8fb5b8587580b59869b784434662d771e78378158233633c650e0a445f7c808fa06ab37f744182a25c1fd293f6e9fcf24653a160f59f56b6696249c22d8f2ea0
 MISC metadata.xml 1146 BLAKE2B 7a4bbf38d2e752523c2909c240a2c90ada04aee8efe96c62c5989887f4997e00a4ed7312dd9803d8ddcae02e8bbc3ba8f0fa9e5da0f484bc9768e0ed99ab8be3 SHA512 24240ba35d93d9f9171f2b164d949846a5ea2126eceed4b4454dd0b4efb9b1132f9f6717d2c7364f20820b792bbaf26dc274f7c10767993b35a565a76e042f4f
diff --git a/sys-fs/lvm2/files/dmeventd.initd-2.02.184-r2 b/sys-fs/lvm2/files/dmeventd.initd-2.02.184-r2
new file mode 100644
index 000000000000..bc08c0a94f41
--- /dev/null
+++ b/sys-fs/lvm2/files/dmeventd.initd-2.02.184-r2
@@ -0,0 +1,21 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=/sbin/dmeventd
+command_args_foreground='-f'
+extra_started_commands=reload
+pidfile=/run/dmeventd.pid
+# Control idle exit behavior of daemon
+export DMEVENTD_IDLE_EXIT_TIMEOUT=${DMEVENTD_IDLE_EXIT_TIMEOUT:=-1}
+
+depend() {
+	# As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that
+	# means dmeventd is NOT notified, as it cannot be safely running
+	after lvm device-mapper
+}
+
+reload() {
+	# TODO: this is not supported under supervisors
+	${command} -R
+}
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.183 b/sys-fs/lvm2/files/lvm.rc-2.02.183
new file mode 100644
index 000000000000..ce499a6dd21b
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm.rc-2.02.183
@@ -0,0 +1,152 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+_get_lvm_path() {
+	local lvm_path=
+	for lvm_path in /bin/lvm /sbin/lvm ; do
+		[ -x "$lvm_path" ] && break
+	done
+	echo "${lvm_path}"
+}
+
+_need_lvmetad()
+{
+	local lvm_path="$(_get_lvm_path)"
+	[ ! -x "${lvm_path}" ] && return 1
+	${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmetad=1'
+}
+
+_need_lvmlockd()
+{
+	local lvm_path="$(_get_lvm_path)"
+	[ ! -x "${lvm_path}" ] && return 1
+	${lvm_path} dumpconfig global 2>/dev/null | grep -q 'use_lvmlockd=1'
+}
+
+depend() {
+	before checkfs fsck
+	after modules device-mapper
+	# We may use lvmetad based on the configuration. If we added lvmetad
+	# support while lvm2 is running then we aren't dependent on it. For the
+	# more common case, if its disabled in the config we aren't dependent
+	# on it.
+	config /etc/lvm/lvm.conf
+	local _need=
+	if service_started; then
+		_need=$(service_get_value need)
+	else
+		if _need_lvmetad; then
+			_need="${_need} lvmetad"
+		fi
+		if _need_lvmlockd; then
+			_need="${_need} lvmlockd"
+		fi
+	fi
+	need sysfs udev ${_need}
+}
+
+config='global { locking_dir = "/run/lock/lvm" }'
+
+dm_in_proc() {
+	local retval=0
+	for x in devices misc ; do
+		grep -qs 'device-mapper' /proc/${x}
+		retval=$((${retval} + $?))
+	done
+	return ${retval}
+}
+
+start() {
+	# LVM support for /usr, /home, /opt ....
+	# This should be done *before* checking local
+	# volumes, or they never get checked.
+
+	# NOTE: Add needed modules for LVM or RAID, etc
+	#       to /etc/modules.autoload if needed
+	lvm_path="$(_get_lvm_path)"
+	for lvm_path in /bin/lvm /sbin/lvm ; do
+		[ -x "$lvm_path" ] && break
+	done
+	if [ ! -x "$lvm_path" ]; then
+		eerror "Cannot find lvm binary in /sbin or /bin!"
+		return 1
+	fi
+	if [ -z "${CDBOOT}" ] ; then
+		if [ -e /proc/modules ] && ! dm_in_proc ; then
+			modprobe dm-mod 2>/dev/null
+		fi
+		if [ -d /proc/lvm ] || dm_in_proc ; then
+			ebegin "Setting up the Logical Volume Manager"
+			#still echo stderr for debugging
+			lvm_commands="#!${lvm_path}\n"
+			# Extra PV find pass because some devices might not have been available until very recently
+			lvm_commands="${lvm_commands}pvscan --config '${config}'\n"
+			# Now make the nodes
+			lvm_commands="${lvm_commands}vgscan --config '${config}' --mknodes\n"
+			# And turn them on!
+			lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ly\n"
+			if _need_lvmlockd; then
+				# Start lockd VGs as required
+				lvm_commands="${lvm_commands}vgchange --config '${config}' --lock-start --lock-opt auto\n"
+			fi
+			# Order of this is important, have to work around dash and LVM readline
+			printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 >/dev/null
+			eend $? "Failed to setup the LVM"
+		fi
+	fi
+}
+
+start_post()
+{
+	# Save if we needed lvmetad
+	if _need_lvmetad; then
+		service_set_value need lvmetad
+	fi
+}
+
+stop() {
+	for lvm_path in /bin/lvm /sbin/lvm ; do
+		[ -x "$lvm_path" ] && break
+	done
+	if [ ! -x "$lvm_path" ]; then
+		eerror "Cannot find lvm binary in /sbin or /bin!"
+		return 1
+	fi
+
+	# Stop LVM2
+	if [ -x /sbin/vgs ] && \
+		[ -x /sbin/vgchange ] && \
+		[ -x /sbin/lvchange ] && \
+		[ -f /etc/lvmtab -o -d /etc/lvm ] && \
+		[ -d /proc/lvm  -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
+	then
+		einfo "Shutting down the Logical Volume Manager"
+
+		VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
+
+		if [ "$VGS" ]
+		then
+			local _ending="eend"
+			[ "$RC_RUNLEVEL" = shutdown ] && _ending="ewend"
+			ebegin "  Shutting Down LVs & VGs"
+				#still echo stderr for debugging
+				lvm_commands="#!${lvm_path}\n"
+				# Extra PV find pass because some devices might not have been available until very recently
+				lvm_commands="${lvm_commands}lvchange --config '${config}' --sysinit -a ln ${VGS}\n"
+				# Now make the nodes
+				lvm_commands="${lvm_commands}vgchange --config '${config}' --sysinit -a ln ${VGS}\n"
+				# Order of this is important, have to work around dash and LVM readline
+				printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
+			rc=$?
+			msg="Failed (possibly some LVs still needed for /usr or root)"
+			[ "$RC_RUNLEVEL" = shutdown ] && msg="${msg} [rc=$rc]" && rc=0
+			${_ending} $rc "${msg}"
+		fi
+
+		einfo "Finished shutting down the Logical Volume Manager"
+		return 0
+	fi
+}
+
+# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm2-2.02.184-dmeventd-no-idle-exit.patch b/sys-fs/lvm2/files/lvm2-2.02.184-dmeventd-no-idle-exit.patch
new file mode 100644
index 000000000000..c80bd2ba2bec
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.184-dmeventd-no-idle-exit.patch
@@ -0,0 +1,68 @@
+From: "Robin H. Johnson" <robbat2@gentoo.org>
+Date: Wed, 17 Apr 2019 06:54:27 +0000
+Subject: [PATCH] dmeventd configurable idle exit time
+
+dmeventd nominally exits after 1 hour of idle time. There are use cases for
+this, esp. with socket activation, but also cases where users don't expect
+dmeventd to exit.
+
+Provide a tuning knob via environment variable, DMEVENTD_IDLE_EXIT_TIMEOUT,
+that can be -1 to not exit, or a configurable time for different idle exit.
+
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+Fixes: https://bugs.gentoo.org/682556
+
+diff -Nuar LVM2.2.02.184.orig/daemons/dmeventd/dmeventd.c LVM2.2.02.184/daemons/dmeventd/dmeventd.c
+--- LVM2.2.02.184.orig/daemons/dmeventd/dmeventd.c	2019-03-22 03:14:59.000000000 -0700
++++ LVM2.2.02.184/daemons/dmeventd/dmeventd.c	2019-04-17 00:18:23.535029906 -0700
+@@ -2158,6 +2158,18 @@
+ 		.server_path = DM_EVENT_FIFO_SERVER
+ 	};
+ 	time_t now, idle_exit_timeout = DMEVENTD_IDLE_EXIT_TIMEOUT;
++
++	/* Provide a basic way to config the idle timeout */
++	char* idle_exit_timeout_env = getenv("DMEVENTD_IDLE_EXIT_TIMEOUT") ? : NULL;
++	if(NULL != idle_exit_timeout_env) {
++		char* endptr;
++		idle_exit_timeout = strtol(idle_exit_timeout_env, &endptr, 10);
++		if (errno == ERANGE || *endptr != '\0') {
++			fprintf(stderr, "DMEVENTD_IDLE_EXIT_TIMEOUT: bad time input\n");
++			exit(EXIT_FAILURE);
++		}
++	}
++
+ 	opterr = 0;
+ 	optind = 0;
+ 
+@@ -2253,7 +2265,7 @@
+ 		_process_initial_registrations();
+ 
+ 	for (;;) {
+-		if (_idle_since) {
++		if (_idle_since || _exit_now) {
+ 			if (_exit_now) {
+ 				if (_exit_now == DM_SCHEDULED_EXIT)
+ 					break; /* Only prints shutdown message */
+@@ -2262,7 +2274,7 @@
+ 					 (long) (time(NULL) - _idle_since));
+ 				break;
+ 			}
+-			if (idle_exit_timeout) {
++			if (idle_exit_timeout && idle_exit_timeout > 0) {
+ 				now = time(NULL);
+ 				if (now < _idle_since)
+ 					_idle_since = now; /* clock change? */
+diff -Nuar LVM2.2.02.184.orig/man/dmeventd.8_main LVM2.2.02.184/man/dmeventd.8_main
+--- LVM2.2.02.184.orig/man/dmeventd.8_main	2019-03-22 03:15:00.000000000 -0700
++++ LVM2.2.02.184/man/dmeventd.8_main	2019-04-17 00:17:46.076023638 -0700
+@@ -143,6 +143,10 @@
+ Variable is set by thin plugin to prohibit recursive interation
+ with dmeventd by any executed lvm2 command from
+ a thin_command environment.
++.TP
++.B DMEVENTD_IDLE_EXIT_TIMEOUT
++Configure the dmeventd idle exit timeout behavior, value in seconds. Default
++is 3600 (1 hour). -1 means do not exit.
+ .
+ .SH SEE ALSO
+ .
diff --git a/sys-fs/lvm2/files/lvmpolld.initd-2.02.183 b/sys-fs/lvm2/files/lvmpolld.initd-2.02.183
new file mode 100644
index 000000000000..6b260109a668
--- /dev/null
+++ b/sys-fs/lvm2/files/lvmpolld.initd-2.02.183
@@ -0,0 +1,17 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+pidfile="/run/lvmpolld.pid"
+command="/sbin/lvmpolld"
+command_args="${LVMPOLLD_OPTS:=-p ${pidfile}}"
+start_stop_daemon_args="--pidfile ${pidfile}"
+
+depend() {
+	:
+}
+
+start_pre()
+{
+	checkpath --directory /run/lvm || return 1
+}
diff --git a/sys-fs/lvm2/lvm2-2.02.183.ebuild b/sys-fs/lvm2/lvm2-2.02.183.ebuild
index 6da7f66176f9..eab4e163331f 100644
--- a/sys-fs/lvm2/lvm2-2.02.183.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.183.ebuild
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
 REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
 	systemd? ( udev )"
diff --git a/sys-fs/lvm2/lvm2-2.02.184-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.184-r1.ebuild
new file mode 100644
index 000000000000..dcbcd854bf32
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.184-r1.ebuild
@@ -0,0 +1,262 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
+HOMEPAGE="https://sourceware.org/lvm2/"
+SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+	ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+	systemd? ( udev )"
+
+DEPEND_COMMON="
+	dev-libs/libaio[static-libs?]
+	static? ( dev-libs/libaio[static-libs] )
+	!static? ( dev-libs/libaio[static-libs?] )
+	readline? ( sys-libs/readline:0= )
+	sanlock? ( sys-cluster/sanlock )
+	systemd? ( >=sys-apps/systemd-205:0= )
+	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+RDEPEND="${DEPEND_COMMON}
+	>=sys-apps/baselayout-2.2
+	!<sys-apps/openrc-0.11
+	!<sys-fs/cryptsetup-1.1.2
+	!!sys-fs/lvm-user
+	>=sys-apps/util-linux-2.16
+	lvm2create_initrd? ( sys-apps/makedev )
+	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
+# USE 'static' currently only works with eudev, bug 520450
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig
+	>=sys-devel/binutils-2.20.1-r1
+	sys-devel/autoconf-archive
+	static? (
+		selinux? ( sys-libs/libselinux[static-libs] )
+		udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
+		>=sys-apps/util-linux-2.16[static-libs]
+	)"
+
+S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+
+PATCHES=(
+	# Gentoo specific modification(s):
+	"${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch
+
+	# For upstream -- review and forward:
+	"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
+	"${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
+	"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
+	"${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905
+	"${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid
+	"${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450
+	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
+	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
+	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+
+	if use udev; then
+		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+		fi
+	fi
+
+	check_extra_config
+
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "1iAR = $(tc-getAR)" \
+		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
+		make.tmpl.in || die #444082
+
+	sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212
+
+	if use udev && ! use device-mapper-only; then
+		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
+		elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
+		elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
+		elog "if it was previously disabled."
+	fi
+
+	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
+
+	# Without thin-privision-tools, there is nothing to install for target install_man7:
+	if ! use thin ; then
+		sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -flto
+	local myeconfargs=()
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	myeconfargs+=(
+		$(use_enable !device-mapper-only dmfilemapd)
+		$(use_enable !device-mapper-only dmeventd)
+		$(use_enable !device-mapper-only cmdlib)
+		$(use_enable !device-mapper-only applib)
+		$(use_enable !device-mapper-only fsadm)
+		$(use_enable !device-mapper-only lvmetad)
+		$(use_enable !device-mapper-only lvmpolld)
+		$(usex device-mapper-only --disable-udev-systemd-background-jobs '')
+
+		# This only causes the .static versions to become available
+		$(usex static --enable-static_link '')
+
+		# dmeventd requires mirrors to be internal, and snapshot available
+		# so we cannot disable them
+		--with-mirrors="$(usex device-mapper-only none internal)"
+		--with-snapshots="$(usex device-mapper-only none internal)"
+
+		# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+		$(usex hppa --disable-o_direct '')
+	)
+
+	if use thin; then
+		myeconfargs+=( --with-thin=internal --with-cache=internal )
+		local texec
+		for texec in check dump repair restore; do
+			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
+			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
+		done
+	else
+		myeconfargs+=( --with-thin=none --with-cache=none )
+	fi
+
+	myeconfargs+=( --with-clvmd=none --with-cluster=none )
+
+	myeconfargs+=(
+		$(use_enable readline)
+		$(use_enable selinux)
+		--enable-pkgconfig
+		--with-confdir="${EPREFIX}"/etc
+		--exec-prefix="${EPREFIX}"
+		--sbindir="${EPREFIX}/sbin"
+		--with-staticdir="${EPREFIX}"/sbin
+		--libdir="${EPREFIX}/$(get_libdir)"
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-default-dm-run-dir=/run
+		--with-default-run-dir=/run/lvm
+		--with-default-locking-dir=/run/lock/lvm
+		--with-default-pid-dir=/run
+		$(use_enable udev udev_rules)
+		$(use_enable udev udev_sync)
+		$(use_with udev udevdir "$(get_udevdir)"/rules.d)
+		$(use_enable sanlock lvmlockd-sanlock)
+		$(use_enable systemd udev-systemd-background-jobs)
+		$(use_enable systemd notify-dbus)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		CLDFLAGS="${LDFLAGS}"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	pushd include >/dev/null
+	emake
+	popd >/dev/null
+
+	if use device-mapper-only ; then
+		emake device-mapper
+	else
+		emake
+		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
+	fi
+}
+
+src_install() {
+	local inst INSTALL_TARGETS
+	INSTALL_TARGETS=( install install_tmpfiles_configuration )
+	# install systemd related files only when requested, bug #522430
+	use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators )
+	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
+	for inst in ${INSTALL_TARGETS[@]}; do
+		emake DESTDIR="${D}" ${inst}
+	done
+
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+	if use !device-mapper-only ; then
+		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
+		newinitd "${FILESDIR}"/lvm.rc-2.02.172 lvm
+		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
+
+		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
+		newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
+		newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
+	fi
+
+	if use sanlock; then
+		newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
+	fi
+
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a
+		dolib.a libdaemon/client/libdaemonclient.a #462908
+		#gen_usr_ldscript libdevmapper.so
+		dolib.a daemons/dmeventd/libdevmapper-event.a
+		#gen_usr_ldscript libdevmapper-event.so
+	else
+		rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+	fi
+
+	if use lvm2create_initrd; then
+		dosbin scripts/lvm2create_initrd/lvm2create_initrd
+		doman scripts/lvm2create_initrd/lvm2create_initrd.8
+		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+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."
+}
+
+src_test() {
+	einfo "Tests are disabled because of device-node mucking, if you want to"
+	einfo "run tests, compile the package and see ${S}/tests"
+}
diff --git a/sys-fs/lvm2/lvm2-2.02.184-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.184-r2.ebuild
new file mode 100644
index 000000000000..8ff1308f5846
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.184-r2.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
+HOMEPAGE="https://sourceware.org/lvm2/"
+SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+	ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+	systemd? ( udev )"
+
+DEPEND_COMMON="
+	dev-libs/libaio[static-libs?]
+	static? ( dev-libs/libaio[static-libs] )
+	!static? ( dev-libs/libaio[static-libs?] )
+	readline? ( sys-libs/readline:0= )
+	sanlock? ( sys-cluster/sanlock )
+	systemd? ( >=sys-apps/systemd-205:0= )
+	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+RDEPEND="${DEPEND_COMMON}
+	>=sys-apps/baselayout-2.2
+	!<sys-apps/openrc-0.11
+	!<sys-fs/cryptsetup-1.1.2
+	!!sys-fs/lvm-user
+	>=sys-apps/util-linux-2.16
+	lvm2create_initrd? ( sys-apps/makedev )
+	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
+# USE 'static' currently only works with eudev, bug 520450
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig
+	>=sys-devel/binutils-2.20.1-r1
+	sys-devel/autoconf-archive
+	static? (
+		selinux? ( sys-libs/libselinux[static-libs] )
+		udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
+		>=sys-apps/util-linux-2.16[static-libs]
+	)"
+
+S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+
+PATCHES=(
+	# Gentoo specific modification(s):
+	"${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch
+
+	# For upstream -- review and forward:
+	"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
+	"${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
+	"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
+	"${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905
+	"${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid
+	"${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450
+	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
+	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
+	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
+	"${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+
+	if use udev; then
+		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+		fi
+	fi
+
+	check_extra_config
+
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "1iAR = $(tc-getAR)" \
+		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
+		make.tmpl.in || die #444082
+
+	sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212
+
+	if use udev && ! use device-mapper-only; then
+		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
+		elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
+		elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
+		elog "if it was previously disabled."
+	fi
+
+	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
+
+	# Without thin-privision-tools, there is nothing to install for target install_man7:
+	if ! use thin ; then
+		sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -flto
+	local myeconfargs=()
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	myeconfargs+=(
+		$(use_enable !device-mapper-only dmfilemapd)
+		$(use_enable !device-mapper-only dmeventd)
+		$(use_enable !device-mapper-only cmdlib)
+		$(use_enable !device-mapper-only applib)
+		$(use_enable !device-mapper-only fsadm)
+		$(use_enable !device-mapper-only lvmetad)
+		$(use_enable !device-mapper-only lvmpolld)
+		$(usex device-mapper-only --disable-udev-systemd-background-jobs '')
+
+		# This only causes the .static versions to become available
+		$(usex static --enable-static_link '')
+
+		# dmeventd requires mirrors to be internal, and snapshot available
+		# so we cannot disable them
+		--with-mirrors="$(usex device-mapper-only none internal)"
+		--with-snapshots="$(usex device-mapper-only none internal)"
+
+		# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+		$(usex hppa --disable-o_direct '')
+	)
+
+	if use thin; then
+		myeconfargs+=( --with-thin=internal --with-cache=internal )
+		local texec
+		for texec in check dump repair restore; do
+			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
+			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
+		done
+	else
+		myeconfargs+=( --with-thin=none --with-cache=none )
+	fi
+
+	myeconfargs+=( --with-clvmd=none --with-cluster=none )
+
+	myeconfargs+=(
+		$(use_enable readline)
+		$(use_enable selinux)
+		--enable-pkgconfig
+		--with-confdir="${EPREFIX}"/etc
+		--exec-prefix="${EPREFIX}"
+		--sbindir="${EPREFIX}/sbin"
+		--with-staticdir="${EPREFIX}"/sbin
+		--libdir="${EPREFIX}/$(get_libdir)"
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-default-dm-run-dir=/run
+		--with-default-run-dir=/run/lvm
+		--with-default-locking-dir=/run/lock/lvm
+		--with-default-pid-dir=/run
+		$(use_enable udev udev_rules)
+		$(use_enable udev udev_sync)
+		$(use_with udev udevdir "$(get_udevdir)"/rules.d)
+		$(use_enable sanlock lvmlockd-sanlock)
+		$(use_enable systemd udev-systemd-background-jobs)
+		$(use_enable systemd notify-dbus)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		CLDFLAGS="${LDFLAGS}"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	pushd include >/dev/null
+	emake
+	popd >/dev/null
+
+	if use device-mapper-only ; then
+		emake device-mapper
+	else
+		emake
+		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
+	fi
+}
+
+src_install() {
+	local inst INSTALL_TARGETS
+	INSTALL_TARGETS=( install install_tmpfiles_configuration )
+	# install systemd related files only when requested, bug #522430
+	use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators )
+	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
+	for inst in ${INSTALL_TARGETS[@]}; do
+		emake DESTDIR="${D}" ${inst}
+	done
+
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+	if use !device-mapper-only ; then
+		newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
+		newinitd "${FILESDIR}"/lvm.rc-2.02.183 lvm
+		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
+
+		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
+		newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
+		newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
+	fi
+
+	if use sanlock; then
+		newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
+	fi
+
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a
+		dolib.a libdaemon/client/libdaemonclient.a #462908
+		#gen_usr_ldscript libdevmapper.so
+		dolib.a daemons/dmeventd/libdevmapper-event.a
+		#gen_usr_ldscript libdevmapper-event.so
+	else
+		rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+	fi
+
+	if use lvm2create_initrd; then
+		dosbin scripts/lvm2create_initrd/lvm2create_initrd
+		doman scripts/lvm2create_initrd/lvm2create_initrd.8
+		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+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."
+}
+
+src_test() {
+	einfo "Tests are disabled because of device-node mucking, if you want to"
+	einfo "run tests, compile the package and see ${S}/tests"
+}
diff --git a/sys-fs/lvm2/lvm2-2.02.184.ebuild b/sys-fs/lvm2/lvm2-2.02.184.ebuild
new file mode 100644
index 000000000000..19b3acffaf85
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.184.ebuild
@@ -0,0 +1,258 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
+HOMEPAGE="https://sourceware.org/lvm2/"
+SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+	ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only"
+REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin )
+	systemd? ( udev )"
+
+DEPEND_COMMON="
+	dev-libs/libaio[static-libs?]
+	static? ( dev-libs/libaio[static-libs] )
+	!static? ( dev-libs/libaio[static-libs?] )
+	readline? ( sys-libs/readline:0= )
+	sanlock? ( sys-cluster/sanlock )
+	systemd? ( >=sys-apps/systemd-205:0= )
+	udev? ( >=virtual/libudev-208:=[static-libs?] )"
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available -- thus, pull in recent enough baselayout for /run.
+# This version of LVM is incompatible with cryptsetup <1.1.2.
+RDEPEND="${DEPEND_COMMON}
+	>=sys-apps/baselayout-2.2
+	!<sys-apps/openrc-0.11
+	!<sys-fs/cryptsetup-1.1.2
+	!!sys-fs/lvm-user
+	>=sys-apps/util-linux-2.16
+	lvm2create_initrd? ( sys-apps/makedev )
+	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
+# USE 'static' currently only works with eudev, bug 520450
+DEPEND="${DEPEND_COMMON}
+	virtual/pkgconfig
+	>=sys-devel/binutils-2.20.1-r1
+	sys-devel/autoconf-archive
+	static? (
+		selinux? ( sys-libs/libselinux[static-libs] )
+		udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
+		>=sys-apps/util-linux-2.16[static-libs]
+	)"
+
+S=${WORKDIR}/${PN/lvm/LVM}.${PV}
+
+PATCHES=(
+	# Gentoo specific modification(s):
+	"${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch
+
+	# For upstream -- review and forward:
+	"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
+	"${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
+	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
+	"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
+	"${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905
+	"${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid
+	"${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450
+	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
+	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
+	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
+)
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+
+	if use udev; then
+		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+		if linux_config_exists; then
+			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
+			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
+				ewarn "It's recommended to set an empty value to the following kernel config option:"
+				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
+			fi
+		fi
+	fi
+
+	check_extra_config
+
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "1iAR = $(tc-getAR)" \
+		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
+		make.tmpl.in || die #444082
+
+	sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212
+
+	if use udev && ! use device-mapper-only; then
+		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
+		elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
+		elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
+		elog "if it was previously disabled."
+	fi
+
+	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
+
+	# Without thin-privision-tools, there is nothing to install for target install_man7:
+	if ! use thin ; then
+		sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die
+	fi
+
+	eautoreconf
+}
+
+src_configure() {
+	filter-flags -flto
+	local myeconfargs=()
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	myeconfargs+=(
+		$(use_enable !device-mapper-only dmeventd)
+		$(use_enable !device-mapper-only cmdlib)
+		$(use_enable !device-mapper-only applib)
+		$(use_enable !device-mapper-only fsadm)
+		$(use_enable !device-mapper-only lvmetad)
+		$(usex device-mapper-only --disable-udev-systemd-background-jobs '')
+
+		# This only causes the .static versions to become available
+		$(usex static --enable-static_link '')
+
+		# dmeventd requires mirrors to be internal, and snapshot available
+		# so we cannot disable them
+		--with-mirrors="$(usex device-mapper-only none internal)"
+		--with-snapshots="$(usex device-mapper-only none internal)"
+
+		# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+		$(usex hppa --disable-o_direct '')
+	)
+
+	if use thin; then
+		myeconfargs+=( --with-thin=internal --with-cache=internal )
+		local texec
+		for texec in check dump repair restore; do
+			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
+			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
+		done
+	else
+		myeconfargs+=( --with-thin=none --with-cache=none )
+	fi
+
+	myeconfargs+=( --with-clvmd=none --with-cluster=none )
+
+	myeconfargs+=(
+		$(use_enable readline)
+		$(use_enable selinux)
+		--enable-pkgconfig
+		--with-confdir="${EPREFIX}"/etc
+		--exec-prefix="${EPREFIX}"
+		--sbindir="${EPREFIX}/sbin"
+		--with-staticdir="${EPREFIX}"/sbin
+		--libdir="${EPREFIX}/$(get_libdir)"
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
+		--with-default-dm-run-dir=/run
+		--with-default-run-dir=/run/lvm
+		--with-default-locking-dir=/run/lock/lvm
+		--with-default-pid-dir=/run
+		$(use_enable udev udev_rules)
+		$(use_enable udev udev_sync)
+		$(use_with udev udevdir "$(get_udevdir)"/rules.d)
+		$(use_enable sanlock lvmlockd-sanlock)
+		$(use_enable systemd udev-systemd-background-jobs)
+		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
+		CLDFLAGS="${LDFLAGS}"
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	pushd include >/dev/null
+	emake
+	popd >/dev/null
+
+	if use device-mapper-only ; then
+		emake device-mapper
+	else
+		emake
+		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
+	fi
+}
+
+src_install() {
+	local inst INSTALL_TARGETS
+	INSTALL_TARGETS=( install install_tmpfiles_configuration )
+	# install systemd related files only when requested, bug #522430
+	use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators )
+	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
+	for inst in ${INSTALL_TARGETS[@]}; do
+		emake DESTDIR="${D}" ${inst}
+	done
+
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
+
+	if use !device-mapper-only ; then
+		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
+		newinitd "${FILESDIR}"/lvm.rc-2.02.172 lvm
+		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
+
+		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
+		newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
+	fi
+
+	if use sanlock; then
+		newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
+	fi
+
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a
+		dolib.a libdaemon/client/libdaemonclient.a #462908
+		#gen_usr_ldscript libdevmapper.so
+		dolib.a daemons/dmeventd/libdevmapper-event.a
+		#gen_usr_ldscript libdevmapper-event.so
+	else
+		rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+	fi
+
+	if use lvm2create_initrd; then
+		dosbin scripts/lvm2create_initrd/lvm2create_initrd
+		doman scripts/lvm2create_initrd/lvm2create_initrd.8
+		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
+	fi
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
+}
+
+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."
+}
+
+src_test() {
+	einfo "Tests are disabled because of device-node mucking, if you want to"
+	einfo "run tests, compile the package and see ${S}/tests"
+}
diff --git a/sys-fs/mhddfs/Manifest b/sys-fs/mhddfs/Manifest
index 99b22e0af57d..be8b0d1815d4 100644
--- a/sys-fs/mhddfs/Manifest
+++ b/sys-fs/mhddfs/Manifest
@@ -1,5 +1,6 @@
 AUX mhddfs-0.1.39-segfault-fix.patch 4711 BLAKE2B fc75c9e1fa8f3844feeb9d301a48aef977feeee14aadf8763c0abf9817b1a37e80c4421a9cd1b5be8f4ac9b3ed24c8cf563d1fd6d08cd70552b89ded7fb1b9d4 SHA512 4a2242c1d6344d651288c5f6c1c714d98d707b5d6b9c839f5100fd4b3476b74d681fb6502b6559959665470dfc7b00954a0781eedc461a96e972c8df1632a1fd
+AUX mhddfs-0.1.39-xattr.patch 498 BLAKE2B e0a1a72c2883135956f885e974473fb3df10f4e1eb5e4781badde84d1545f4e2943583a62f3f93c68036aab83510d78970ead98ad45f24da1ac95620da4863c0 SHA512 5d2ffffea05499fbcacbae1d7b9062dd4bdbe7d0ee30b2e5ca30fcfc3e5a3de81a7664b09fe847b34f7e8016c7038b40a49a6f008fc8ea5bb377a0581c3d6bb7
 AUX mhddfs-respect-compiler-vars.patch 1556 BLAKE2B f032b6de368aa8c51ea743aa00a2561bc2bd29a652a4c6b34a2ce072345f2ada14995599ee5185a6ff5d06a0ca5dae2da33aa17199e2d6307ef3ff1ac8feb147 SHA512 91035e5474f333545236330ce46ee80e2c3cfed679d68588e22e9db64cb6d4af5c0019ea32972cc347e4b9f73300334f97828fae4b13c2e4de0e2b5f734246e5
 DIST mhddfs_0.1.39.tar.gz 40665 BLAKE2B 5f7fa51d606985085fdb6346af5fdc6526d6f236b93a4deaad8143ac870cc3e85b5a6d9c94150567e2b34fd8ab0edaf4e0dfbf9c1cfc503f29386998bf84ed2d SHA512 cf1952e665e82a92ccfef9215d4faf78cd235566b67e6ebc3a60ab53089d9391bc41a08e6b203ad052e4a08bdd14428f2d9abe48f341aeb0c80ae1da80f83f89
-EBUILD mhddfs-0.1.39-r1.ebuild 1041 BLAKE2B 9d387333d6b4b28eaabd228b1e98d3c59e8e9755ab0b36de7ce99fd329fcfe785d8b6152e5f5f26797859a5d9238ab3dd2dca264b549e2d9e263998765664094 SHA512 251466af90085c6400b9a33c88d5940734b9c95d01706dcd7e238a534220216d29bd8bf052306b7dfe9e3f4eccecc5827681e542f2bc9c595fc0af78efa2d782
+EBUILD mhddfs-0.1.39-r1.ebuild 1070 BLAKE2B 7947f4528c846f5b0cfd38071eb5002985d019e19f07d286d681d3d72deba3bdb5ce69baf7477af417a47345f594559874e584b4f6a2c817add2950a568e4472 SHA512 dac1768c13003215ebb361d9bfd750ecad7daf08b3910767426d68e71ef9a407c4a48215048f6ea88f399350cd1b54dc539a8399acdc5df7ba2cf9a44033d6db
 MISC metadata.xml 247 BLAKE2B 61049845c1ffb66aea9959f984983735ad8d7d9d37aab6da3a19951bbf8d67af657cacde1701da8a3dd93b0704c10430d511bea11d56bf98702950f0707436ec SHA512 96c55c2979dd6a4c4761fce9b5a0be387b11fcf197ef903d8680ae82f01a2caea93b1238bed1ac96d3eb250744e2149a507e0424ac017b4324f0806a54e72c4a
diff --git a/sys-fs/mhddfs/files/mhddfs-0.1.39-xattr.patch b/sys-fs/mhddfs/files/mhddfs-0.1.39-xattr.patch
new file mode 100644
index 000000000000..57a64281d653
--- /dev/null
+++ b/sys-fs/mhddfs/files/mhddfs-0.1.39-xattr.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/648670
+
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+
+--- mhddfs-0.1.39/src/main.c
++++ mhddfs-0.1.39/src/main.c
+@@ -34,7 +34,7 @@
+ #include <utime.h>
+ 
+ #ifndef WITHOUT_XATTR
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #endif
+ 
+ #include "parse_options.h"
+--- mhddfs-0.1.39/src/tools.c
++++ mhddfs-0.1.39/src/tools.c
+@@ -32,7 +32,7 @@
+ #include <dirent.h>
+ 
+ #ifndef WITHOUT_XATTR
+-#include <attr/xattr.h>
++#include <sys/xattr.h>
+ #endif
+ 
+ #include "tools.h"
diff --git a/sys-fs/mhddfs/mhddfs-0.1.39-r1.ebuild b/sys-fs/mhddfs/mhddfs-0.1.39-r1.ebuild
index f161e79fa0f9..1c4db46a0fa0 100644
--- a/sys-fs/mhddfs/mhddfs-0.1.39-r1.ebuild
+++ b/sys-fs/mhddfs/mhddfs-0.1.39-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,6 +24,7 @@ DOCS=( ChangeLog README )
 PATCHES=(
 	"${FILESDIR}/${PN}-respect-compiler-vars.patch"
 	"${FILESDIR}/${P}-segfault-fix.patch"
+	"${FILESDIR}/${P}-xattr.patch"
 )
 
 src_compile() {
diff --git a/sys-fs/multipath-tools/Manifest b/sys-fs/multipath-tools/Manifest
index bd4c9c408db0..8eae9f2217d5 100644
--- a/sys-fs/multipath-tools/Manifest
+++ b/sys-fs/multipath-tools/Manifest
@@ -6,7 +6,9 @@ AUX rc-multipathd 402 BLAKE2B c44befc14ff361d27278bd7850aada4fb8e309c0459d9d1bdb
 DIST multipath-tools-0.6.4.tar.gz 285448 BLAKE2B 1b63c4e712e682965c595ed988a6590e181abd4d37779b72b52f4e415d4caba33df518a1ea1e3b460d15b5a78f4db5a75c1066439eb40c503023007c1f70752a SHA512 ec35c6c26c3b233ebece7136ea99dd4c0dff2927e7b543e7091219dc7065fe87e609a1eda9ab6d08399d44fe882d70c8dbe6be9ab175d154c5dd2d12ee1d86ea
 DIST multipath-tools-0.7.9.tar.gz 419377 BLAKE2B 29003b7ce2d673eb59d869e2165028654361ca31f49b8e810d90611db249a5183492959d3aef778b870df7c1d283004bda88f3cc6f760569247f1ccc61617379 SHA512 6b237f148c239938b9f46a1a8118fc070372d5f2cfe2021c26ad9ca15d37e8866390168b6a4f13adcc5538001354247e072559a0add33ce1fe8245ae64ed0a3c
 DIST multipath-tools-0.8.0.tar.gz 447076 BLAKE2B 10a93a2654decd2377414188013d2141e34288fe119fa7c54047d95b825ef9ae64b20de1067d3f37a904b58be587997842f7a62088701fe1c1e6a078283b56e4 SHA512 8b6081109e535d0e392233bcedda930bc6d4b529ebe23bc45b276026311bc997e3cf8b39c1a86e4962c464faa69512202c0f6fb3d1f06c6445f8141853ad1bc4
+DIST multipath-tools-0.8.1.tar.gz 447883 BLAKE2B c840ede03fd15763cd947a71596bf3a2e5935433d956208225f4fd6ed55074e2d9709f8b0e6c059a58d44b6649f52b3564d6651ea1af6186138357ba37f86b14 SHA512 1f87f974aace746ecac8af6ae330de16affe49cc89a5660b28be3b1c4a69f822da01042432176e64b5de6ad3a6568044954fdce8e3aa31e85611a595a4939947
 EBUILD multipath-tools-0.6.4-r1.ebuild 2545 BLAKE2B f22afaabe21080d64175063c82e5a731d9e789968d1502b3771ade1eeb3ba3bf539d9cd1d100b75875a5f86fe85ef1ed77b8fee5178829ae301df23eadb0765c SHA512 21c5474be753c3762af2e1b73aab89d666d6f477d04b612360925ff10d994b1fd1152204a5254a39d87438cce274c0d57cb7003e37679b49d22b159fe5c0cfce
 EBUILD multipath-tools-0.7.9.ebuild 2068 BLAKE2B ec54d156a55c25a9c7cc9c6c3854a48c8bb1d404119398bfdb9defcb5c011e1824ce82f53cd5cc4d8e81a63bb412d11cb79ac276406e140f2808b911f7912947 SHA512 8e1fff8d8c71b2cac948e5501edef63acb7e0ba760e7b56a22644e0e08ce3cb9b70c29e69550f6a356113154f740a4e95199ac14e44b3d2db338605954d19be4
 EBUILD multipath-tools-0.8.0.ebuild 2068 BLAKE2B 5c9ca01560d80aeb6a2bb008f029f3782e539f41b5705c2cfacc428203572d5f343555b41107964c5082c476230f4b270293c49d2553ffb8f1e972ee1b54dcb7 SHA512 e23cdd535e66844c1ec622b896449184f950112a28e603361c76ad44b6e35591b0c8d0600758611be157ce49f919167b893d5b7346756902925bc3c39d8e578f
+EBUILD multipath-tools-0.8.1.ebuild 2068 BLAKE2B 5c9ca01560d80aeb6a2bb008f029f3782e539f41b5705c2cfacc428203572d5f343555b41107964c5082c476230f4b270293c49d2553ffb8f1e972ee1b54dcb7 SHA512 e23cdd535e66844c1ec622b896449184f950112a28e603361c76ad44b6e35591b0c8d0600758611be157ce49f919167b893d5b7346756902925bc3c39d8e578f
 MISC metadata.xml 364 BLAKE2B d1d285f68ff773055f374ad7f6790708b7fed62a0d9787aff638c6ced762ff34d62a94a90d79426dbf4a81d86cf2447f41947d7650d3f1bc366a9d3338af94ce SHA512 91654145796f3e879d14dc7aab2261099dc0e2cb44e7563bf3c006893b81aa0f84fdd52870aaf317197b87e6c4d9e1341e456daeb2f3b40c926bdaf31c797134
diff --git a/sys-fs/multipath-tools/multipath-tools-0.8.1.ebuild b/sys-fs/multipath-tools/multipath-tools-0.8.1.ebuild
new file mode 100644
index 000000000000..956caa89e080
--- /dev/null
+++ b/sys-fs/multipath-tools/multipath-tools-0.8.1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info systemd toolchain-funcs udev vcs-snapshot toolchain-funcs
+
+DESCRIPTION="Device mapper target autoconfig"
+HOMEPAGE="http://christophe.varoqui.free.fr/"
+SRC_URI="https://git.opensvc.com/?p=multipath-tools/.git;a=snapshot;h=${PV};sf=tgz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="systemd rbd"
+
+RDEPEND="
+	dev-libs/json-c:=
+	dev-libs/libaio
+	dev-libs/userspace-rcu:=
+	>=sys-fs/lvm2-2.02.45
+	>=virtual/udev-171
+	sys-libs/readline:0=
+	rbd? ( sys-cluster/ceph )
+	systemd? ( sys-apps/systemd )
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+"
+
+CONFIG_CHECK="~DM_MULTIPATH"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}"/${PN}-0.7.5-respect-flags.patch )
+
+get_systemd_pv() {
+	use systemd && \
+		$(tc-getPKG_CONFIG) --modversion systemd
+}
+
+pkg_pretend() {
+	linux-info_pkg_setup
+}
+
+pkg_setup() {
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# The upstream lacks any way to configure the build at present
+	# and ceph is a huge dependency, so we're using sed to make it
+	# optional until the upstream has a proper configure system
+	if ! use rbd ; then
+		sed \
+			-e "s/libcheckrbd.so/# libcheckrbd.so/" \
+			-e "s/-lrados//" \
+			-i libmultipath/checkers/Makefile \
+			|| die
+	fi
+}
+
+src_compile() {
+	# LIBDM_API_FLUSH involves grepping files in /usr/include,
+	# so force the test to go the way we want #411337.
+	emake \
+		CC="$(tc-getCC)" \
+		LIBDM_API_FLUSH=1 SYSTEMD="$(get_systemd_pv)"
+}
+
+src_install() {
+	dodir /sbin /usr/share/man/man{5,8}
+	emake \
+		DESTDIR="${D}" \
+		SYSTEMD=$(get_systemd_pv) \
+		unitdir="$(systemd_get_systemunitdir)" \
+		libudevdir='${prefix}'/"$(get_udevdir)" \
+		install
+
+	newinitd "${FILESDIR}"/rc-multipathd multipathd
+	newinitd "${FILESDIR}"/multipath.rc multipath
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "If you need multipath on your system, you must"
+		elog "add 'multipath' into your boot runlevel!"
+	fi
+}
diff --git a/sys-fs/ntfs3g/Manifest b/sys-fs/ntfs3g/Manifest
index 1c21d207202f..c35f9fc6f0d4 100644
--- a/sys-fs/ntfs3g/Manifest
+++ b/sys-fs/ntfs3g/Manifest
@@ -9,5 +9,5 @@ DIST ntfs-3g_ntfsprogs-2016.2.22.tgz 1264364 BLAKE2B 6028048d676372c062cda1cf9ee
 DIST ntfs-3g_ntfsprogs-2017.3.23.tgz 1259054 BLAKE2B 4f12a6061ef0c116f26225eb3fb5cb84e469b63710115fbfb54fa3802ea94192afa973a553742818ff6849b72919069ec92aca2d4d6f58d8cabca1b0fefa3abe SHA512 3a607f0d7be35204c992d8931de0404fbc52032c13b4240d2c5e6f285c318a28eb2a385d7cf5ac4cd445876aee5baa5753bb636ada0d870d84a9d3fdbce794ef
 EBUILD ntfs3g-2016.2.22-r2.ebuild 2450 BLAKE2B 8178b192162c011703272b7876b6b0b56a13698f2c673862789998b09f316c4cb06370a63a9cff9ab367562220284dfc38e614e80e27085a3e26615f4913cb14 SHA512 7a06505e8ca1d54b78bbe6da8975a69fcea297c36a74092bcd3259eacf3fd4cbaedceec5184c0b0e560f13141d6ca62692dc4a7a4e454090c844454a74adca0a
 EBUILD ntfs3g-2017.3.23-r1.ebuild 2360 BLAKE2B 4929f0847741acef18f7078d0f62246aada50f35312398e068ceb2438751aa34245dc0af5ddd1d06a85da8e8f084fd35c7beaf1380efd24fe6ce3f9b94d0a85d SHA512 3760806c53d47b38cd1b5416d76c1bdeb2854b1b831139ca86ef1de64de0933c8804e78a333f55751812c4a8bb1cc8c8757f002b3aa36181fba5ee43db7a5041
-EBUILD ntfs3g-2017.3.23-r2.ebuild 2794 BLAKE2B 00c1b7e33e335b1ce3a325f14b80650be7adca757b9574f17689cca3460dcdd7d5223987048830076c23de3c318ae0eb0a78c23837568214f1677814de9ee52a SHA512 528946f6a0fbec94fe8aa07e6a8add8c53aff6820c9b2d002c0a5dcba091509ddf1370bbcc388b5f393786da5d5861f59ae63b0a9e9b48562b9b831e01752581
+EBUILD ntfs3g-2017.3.23-r2.ebuild 2789 BLAKE2B 90c1cd72ba461cd6fddd11cd67e944d7eacd4c7ab58c27bc14496daad9df8a8a25695f46c03c03a762f66006500f70cecf658b92f0a416a3eebc4de60bbcf829 SHA512 32d146befbe410645e0aff2ad23746e2b1a5dea6e124c67186b438b662eeb82041fea424fea22bb4e3be0a2e1862131b348c9d2a112ad9dc859afffab0b2ec50
 MISC metadata.xml 1188 BLAKE2B cd693b8b1281d056a5e75baeb04019684a67033607e16479c58830fbf9a19b88ba6e263c5e0637b5501cd5fe2fd000f92e8212354576242fa31c513158b38774 SHA512 6d9aa23202090132c37fe6915aa300597f2c88474065749de36143b8a47090c5bdb2e6449dffbb3843c9b7d30254fdde849b1aa230641910189d00134bd88c85
diff --git a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild
index fb67e549b9c8..de551002bf0d 100644
--- a/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild
+++ b/sys-fs/ntfs3g/ntfs3g-2017.3.23-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
 LICENSE="GPL-2"
 # The subslot matches the SONAME major #.
 SLOT="0/88"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="acl debug +external-fuse ntfsdecrypt +ntfsprogs static-libs suid xattr"
 
 RDEPEND="!<sys-apps/util-linux-2.20.1-r2
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index 5efd370a863c..8359420297bc 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -22,6 +22,6 @@ DIST quota-4.04.tar.gz 577303 BLAKE2B 8ee1e8f99b70f626ec051e4e9afe53c788b625a29f
 DIST quota-4.05.tar.gz 577313 BLAKE2B ab0adc04a2bee46f5b4f528c3a1b7f1dfbfc93cc153aebef91cf563e0b03344479b4d465f7d91cfee60c533052f27ce54f24a937c0c1ec312a5fff763cb82bd1 SHA512 a13ca93fb6fad032cb032874dda2f5d792e619b41e89b481e6aaa4f06ac5774e2728b09dd625addfbe22efccb1d85892b093736084c72f75675a60df168b92f2
 EBUILD quota-4.03.ebuild 1961 BLAKE2B 306162b56dabbb3796c8e5f62c5f1bf675905a1c723a0d9ba34bc7c72b02880f8ab7aa87b9be271b86b19f9396b95514f5f627bec97641599fd9f7e01a35ba85 SHA512 be1868451e07ecdc03dd204357d61a84851801d5426eee81a9c5590f998e54ebf5cb1f7ffee73260d43f82efdbfe439942f633397c70ae4ca83b6b082ef174a8
 EBUILD quota-4.04-r1.ebuild 1597 BLAKE2B 1bf5b4269b3fb2a7dfef5407dd2d0be2ad7f1cf730b0b59f6bdc6eddf5a5d9c595013cd4b98c90711da2aa4fb8f04319922d1a37eb4cc7b283728b3ff027f116 SHA512 72dab78bee71c09181e85855d38f79318b952b48aaca910edaf27b018c827b7ab106631662e67616c13ed8de8427d9730f515305d3479e6fbb07712463702784
-EBUILD quota-4.04-r2.ebuild 1642 BLAKE2B d721a074b1849ca52de06efc4170b26ddd8cf8117e8fff06c00a9f6a5d1a4bd6a9f378b9a34f5d51b5927616d59864b84c9ffb6c5f0fd292e82af276a15626e6 SHA512 a4276b27a96a85bcf33032f30b30cc4ef9c521936c57a2968db1416184f66644e1b625c00c5274b399586368b870ed26453ab6be480a89906923c8ebaba89178
+EBUILD quota-4.04-r2.ebuild 1638 BLAKE2B f404f119082dd4a36747e105fc83fdc765c439518601ba636a5d569d6ea78dcd139c07dfa8167eb1c81d84bd3d2b0f6c9a40541dde55ba2d18cc7078c1fc334c SHA512 9f5747db1f00fcd0458324ed5a53e562876733aebfc839c690af4b67ee32e93816badcaeb50f398310e74e10e6576a2fada3ca7c54b32e30eec11d374cf64742
 EBUILD quota-4.05.ebuild 1548 BLAKE2B 4d62b492ee718f0b2ce05c84706f5ea634f23676f7d24f05451b5f98e363fc74146aba045524be0c85ef7c9de82b4326cc1914c87fdbfc36712ce04547634bea SHA512 9ed6d2fd53401b74d27614d0060957554d7909b1cc2e1ed2f4f91cfbed8d9dacb78612290be33ac59dac1ce4f0882c13e20580d25f593d6fd8676f716db5d9d4
 MISC metadata.xml 482 BLAKE2B 4b2afb537080bc15a4cd9756de6fcbb8df9a19a5a6ea3a7a4e024756be844415d46c07c3321c9dc6bfde8956ec4fb5f3ef87d0dcd090a3f4ed606e724d25fbf4 SHA512 50b2143425f8ab315784fab4d9e569d2f80893c91ba64b4c209947eb79688ed9e8e23955b9f04406d699de6f28e9c10dad78889853d05f84191af65911d7a38e
diff --git a/sys-fs/quota/quota-4.04-r2.ebuild b/sys-fs/quota/quota-4.04-r2.ebuild
index 3ee741ee0951..a7dc2fb0040d 100644
--- a/sys-fs/quota/quota-4.04-r2.ebuild
+++ b/sys-fs/quota/quota-4.04-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="ldap netlink nls rpc tcpd"
 
 RDEPEND="
diff --git a/sys-fs/squashfs-tools/Manifest b/sys-fs/squashfs-tools/Manifest
index 6c0fe1ad5c84..6a1de1c5b1b7 100644
--- a/sys-fs/squashfs-tools/Manifest
+++ b/sys-fs/squashfs-tools/Manifest
@@ -7,12 +7,14 @@ AUX squashfs-tools-4.3-musl.patch 688 BLAKE2B c5c7dc479fe50e581c7546265be622a88c
 AUX squashfs-tools-4.3-sysmacros.patch 611 BLAKE2B eb4a634987a902329d1debcb992b5ed60e1b70feae03860b09267d76abfb19c817887e613b0cedc9d02e265c10f34f8b697e9f390fdb011d2931f13705b30804 SHA512 c21466b2f0aa6d6ae65b3693148274250bc42d8e7ea5142d6d4048d663ff4343dc539822320cf732d88c5bac048766a9771e1d2b739b1176cb9fafa96c4d306a
 AUX squashfs-tools-4.3-xattrs.patch 1076 BLAKE2B deca0eb05d6ac4302b82193b333dec531c0165041af2777d914039671d228d426a2576ae06f6edf86886bd59e7a76fc3a6443337976d7c96b40a1c5dbd7ea8be SHA512 3899bb72cabeb296eb12fdd1c2e77e82a4354e58c91c69be918950c7fc88f56fbc0265c915b7363704579b710a69a35312fa9ab3d43236900774ae97efd473a8
 DIST squashfs-tools_4.3-11.debian.tar.xz 27108 BLAKE2B 948a69f79fbec6af2467a56457410253676d693e1d67efef034f85523c17e6db6d85f1f9e9b2f8ae391ac5783d37b7d2cdb3434acee96c19880bbf6a5b771e40 SHA512 ef22436a6da925f8ac0c61ae4450b4cc9a87930b456035dd2588c3edf0d7530cd1a9d1e7bde90c9462e39687a9a8d0caedea5f181cd2414e4caa8af1d3965b0a
+DIST squashfs-tools_4.3-12.debian.tar.xz 27300 BLAKE2B 60e127f0ab2fde08c58bf255926b47812b8103793ee187633bf0ee12c9b74ae55faf930f992be3eee87b998da9ed7bb42b1150e58903b2855b159b861b542669 SHA512 13b04a85b1237b5a88a0e01f82b992d98e1b29e3a90a29230607c5232e0188d5402de55a08b6cf78b09f7da2eea05ccc6d15ac0de375af8004c468cfac1fe940
 DIST squashfs-tools_4.3-3.debian.tar.xz 15252 BLAKE2B 5273eb8007192190786513f49be68eded38a7acae80d0c84067e8d239d53304a79be454cc4970af0d1c1eff6e58b75403201497dfd18d175f9d5aae5e0102834 SHA512 ab1a707e04e92697549f7e7c667c5da835d39d5e2cb791e47bf549b232e7173e6981c33a87cd373c4a7a4815e4af1b7294fe13e54422a5ccdcff90904bfc51ae
 DIST squashfs-tools_4.3-7.debian.tar.xz 19612 BLAKE2B 7894b6fa27e7e46aec82b680a1ce521c895436ccb1cafcfd3d95e09f56546e08539a7c152854ee14e9516e217339617d25e68c0cc1a4c41b3bdd689caeefa94a SHA512 88df37e0c13483c5591f925156628b3ae27279f56d2453f7f1f82558da1bc3338e23e9481d704b785a40846c6dedc6b0a0e1dd2ea70fe26ea2f1e855fd6d6fdf
 DIST squashfs4.3.tar.gz 182550 BLAKE2B f56ff33a505f7d60cced11224526bfce003bc06184ad7e8cb9cd08b14854164da8d2ecc64694d44085c46bcfa3aaa85939c97820415345053f7956af04066fdb SHA512 854ed7acc99920f24ecf11e0da807e5a2a162eeda55db971aba63a03f0da2c13b20ec0564a906c4b0e415bd8258b273a10208c7abc0704f2ceea773aa6148a79
 EBUILD squashfs-tools-4.3-r2.ebuild 2129 BLAKE2B c5c6b8fb86ae83ddc1c4c22c528665123ab08b9d2fc212faea1f460d8be277ff26f7d9f58c4fd912d1b3a4d2a36d8a65028d922e9e50fbc2198859207ee44103 SHA512 f6623c42b03d85ec1d60b5c591d9467ce22ba202c3b8d73c303550825f5b9c0cd9bd62feafae4c615bea9301a1d8cb20aee9194bc8d26d20372ca974a5715fec
 EBUILD squashfs-tools-4.3_p11-r1.ebuild 2261 BLAKE2B 621d709448cb692443f1719d2337b6f1e275d70c381aa07291aba2cd9e9c06b04ec1fb30770567983cf8d14034586e56373c09a7e239e41e1e74a03dc6859101 SHA512 d1f85f6eb6fc21d2da1ef708d8a823de71f6e014196cbd9f97ffc93a2c9dc87b87244b7a841529bb1939c244c914d45239619ca1162ac4124c267b2fe8aaebf8
 EBUILD squashfs-tools-4.3_p11.ebuild 2169 BLAKE2B efc0e6110c461d7a36415f782e07d2b5f6681b2ac5271c185c62a573bb5c1df36d18bf967fccdb959851c5de3518fd433022b8aa59f3cd6ce5c59fb43812b58f SHA512 78315a8b0617dcaff29805f05b0245b32e86665a3c3e554e7545219800776bccdf03e3a5b05794c64e6938ad22187cd2e81f96222f6103ad69d222d3b9c3f77b
-EBUILD squashfs-tools-4.3_p7.ebuild 2086 BLAKE2B 2d2368923220cfa9b65faa54572ac0a42045b428b024361021fd20b38d8fee32bb26c7b8778a8f9f4fc6675610da7241ab931b5f56736e5c53c307bfac052bcc SHA512 14ac135fe1191e7a34ba9fbed2ddd6c1c96ea72e46faf5f05e28ceee408f5dad806415893e976cbac3424227eccf2e3603524bf4c35f9753390ab6f18624f71b
+EBUILD squashfs-tools-4.3_p12.ebuild 2169 BLAKE2B efc0e6110c461d7a36415f782e07d2b5f6681b2ac5271c185c62a573bb5c1df36d18bf967fccdb959851c5de3518fd433022b8aa59f3cd6ce5c59fb43812b58f SHA512 78315a8b0617dcaff29805f05b0245b32e86665a3c3e554e7545219800776bccdf03e3a5b05794c64e6938ad22187cd2e81f96222f6103ad69d222d3b9c3f77b
+EBUILD squashfs-tools-4.3_p7.ebuild 2082 BLAKE2B d601c94217cec7ddfcc5cbb43801b1b5c68bc0e7710ecf7959e03a5a07990a9fb3964330eb8aed711c7c71e65654553ec69869af89405785edab87852ec7f681 SHA512 7e84bef886c2d10573c86aca5221f4012917fae4ae87fb959bc36d03da9528cef71cb376cd588fd0a3d78804a8ddff4c8529a48659c2f74aca6ed5c342862a13
 EBUILD squashfs-tools-9999.ebuild 1657 BLAKE2B ad5692c2f5cc0ab9a33b47cfcba96361a26fd07ea36d2f8ca23826deedc563978ae74aeb52884806db45b531f3b9b9c6691b2462ae7546e27be8188683c0b484 SHA512 2a90c73888a9f7295ba19a884eabf52d97b562741f015df5bf6a712ea7bbc18c39af6c03c57735a60462e3cca83d4ed1c8a5951eb87789d9d1c06bf708dc5257
-MISC metadata.xml 619 BLAKE2B d54bfccd3de76d4c236ad8514d966713f72b61b6306d9c443ef72565ebb90c08e424b94d99276c499e403aeb28ce15e93a7fd4df00140a2200e99ab9cfa12fe5 SHA512 8da433deb63f3665c0423570472415dcb6b901686ba2cebe6e0f2a72a61a3226ebb6845755eb82dbc80478ec0a521793473c82f42938ad779877de11238195a9
+MISC metadata.xml 527 BLAKE2B 05e98989ffc60b95f4436d733483025dd1b60dd108aa9116d99b7c6e219a30344815ce1c9a269424f0e0e42b587f08b43ad76bc49a95b0e835f71be097259db5 SHA512 802855b76ddf5d220fbc6f8b6562a27d8f32a43e8dde7ec451fd6c2d1aefb5362d79db35023634a9b6d4ec94588f12e06ba29d9bd0b434cad93d4e34ea043cf1
diff --git a/sys-fs/squashfs-tools/metadata.xml b/sys-fs/squashfs-tools/metadata.xml
index 4a5bc2d698e3..afefbbcf3f0b 100644
--- a/sys-fs/squashfs-tools/metadata.xml
+++ b/sys-fs/squashfs-tools/metadata.xml
@@ -8,7 +8,6 @@
 <use>
 <flag name="lz4">Enable support for LZ4 compression using <pkg>app-arch/lz4</pkg></flag>
 <flag name="xz">Enable support for XZ ("LZMA2") compression using <pkg>app-arch/xz-utils</pkg></flag>
-<flag name="zstd">Enable support for ZSTD compression using <pkg>app-arch/zstd</pkg></flag>
 </use>
 <upstream>
 <remote-id type="sourceforge">squashfs</remote-id>
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild
new file mode 100644
index 000000000000..48c56a335453
--- /dev/null
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p12.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="tools to create and extract Squashfs filesystems"
+HOMEPAGE="http://squashfs.sourceforge.net"
+SRC_URI="
+	mirror://sourceforge/squashfs/squashfs${PV/_p*}.tar.gz
+	mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV/_p*}-${PV/*_p}.debian.tar.xz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug lz4 lzma lzo static xattr +xz zstd"
+
+LIB_DEPEND="
+	sys-libs/zlib[static-libs(+)]
+	!xz? ( !lzo? ( sys-libs/zlib[static-libs(+)] ) )
+	lz4? ( app-arch/lz4[static-libs(+)] )
+	lzma? ( app-arch/xz-utils[static-libs(+)] )
+	lzo? ( dev-libs/lzo[static-libs(+)] )
+	xattr? ( sys-apps/attr[static-libs(+)] )
+	xz? ( app-arch/xz-utils[static-libs(+)] )
+	zstd? ( app-arch/zstd[static-libs(+)] )
+"
+RDEPEND="
+	!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+"
+DEPEND="
+	${RDEPEND}
+	static? ( ${LIB_DEPEND} )
+"
+PATCHES=(
+	"${FILESDIR}"/${P/_p*}-sysmacros.patch
+	"${FILESDIR}"/${P/_p*}-aligned-data.patch
+	"${FILESDIR}"/${P/_p*}-local-cve-fix.patch
+	"${FILESDIR}"/${P/_p*}-mem-overflow.patch
+	"${FILESDIR}"/${P/_p*}-extmatch.patch
+	"${FILESDIR}"/${P/_p*}-musl.patch
+)
+
+S="${WORKDIR}/squashfs${PV/_p*}/${PN}"
+
+src_prepare() {
+	eapply -p2 "${WORKDIR}"/debian/patches/*.patch
+	eapply -p2 ${PATCHES[@]}
+	eapply_user
+}
+
+use10() { usex $1 1 0 ; }
+
+src_configure() {
+	# restore GNU89 inline semantics to
+	# emit function symbols, bug 595290
+	append-cflags -std=gnu89
+
+	# set up make command line variables in EMAKE_SQUASHFS_CONF
+	EMAKE_SQUASHFS_CONF=(
+		LZMA_XZ_SUPPORT=$(use10 lzma)
+		LZO_SUPPORT=$(use10 lzo)
+		LZ4_SUPPORT=$(use10 lz4)
+		XATTR_SUPPORT=$(use10 xattr)
+		XZ_SUPPORT=$(use10 xz)
+		ZSTD_SUPPORT=$(use10 zstd)
+	)
+
+	tc-export CC
+	use debug && append-cppflags -DSQUASHFS_TRACE
+	use static && append-ldflags -static
+}
+
+src_compile() {
+	emake "${EMAKE_SQUASHFS_CONF[@]}"
+}
+
+src_install() {
+	dobin mksquashfs unsquashfs
+	cd ..
+	dodoc CHANGES PERFORMANCE.README pseudo-file.example README* OLD-READMEs/*
+	doman "${WORKDIR}"/debian/manpages/*.[0-9]
+}
diff --git a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
index be500fe6c33a..623cbad1b177 100644
--- a/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
+++ b/sys-fs/squashfs-tools/squashfs-tools-4.3_p7.ebuild
@@ -13,7 +13,7 @@ SRC_URI="
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh ~sparc x86"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86"
 IUSE="debug lz4 lzma lzo static xattr +xz"
 
 LIB_DEPEND="
diff --git a/sys-fs/squashfuse/Manifest b/sys-fs/squashfuse/Manifest
index cb73d189f3b4..f553ef5e47e8 100644
--- a/sys-fs/squashfuse/Manifest
+++ b/sys-fs/squashfuse/Manifest
@@ -2,4 +2,4 @@ DIST squashfuse-0.1.100.tar.gz 393548 BLAKE2B 642f0b00023f1914e6f4efd0e03c77d61c
 DIST squashfuse-0.1.103.tar.gz 399524 BLAKE2B 985ce64052c55a03d4889674682cf8b3bf6fab96de18d38b5b6125a6b2bdf0ec40e9f18a13bb77ea1a963fd0e7debf08d5f4819c543a62a818389b5fa7884815 SHA512 bc640898a5756ceed3260d9dea61dcb54588381b787a50c0fbfce35658fdf7d2788babf4882c369d1981ff853a91f043de8c68727aedc33646c26db4fb0ab2c0
 EBUILD squashfuse-0.1.100.ebuild 924 BLAKE2B 99357eef0d573291d34becd2b9cc92050ba78975f537966175fd2dcfd997e91192af9ced64e6938a4b3e3da59fc091f19d6f1944cef2f8f327aabe76beb92ea3 SHA512 7f0f52f26553938d77e829f6220d5b3b6b47ae5e9716e1547e56f70a409935b88cacb289d11b67ef852bd7ad115a35edd2cdbae2c597c0a3e073d6e5fd3e1896
 EBUILD squashfuse-0.1.103.ebuild 1168 BLAKE2B e03ee8f22545f0fcf123803857c6f0912d304c801ba16f0bbaaf20fecc1863a66d4889c3634781a808a0d335226143add282403bf048879108da2c94c45cc028 SHA512 ec825ccd56dd1479562154cb3452f9a132a1bd1b8cef4924c23bc4bde154f49353753907c55bb50d359615e18f3106316d547ad8abb70f98bcebecdf55420652
-MISC metadata.xml 651 BLAKE2B d8db9c1df606853d465c231478f66829333019c41064e928d7922ba54058739c4d8130a43f23b7d2eb6c0e18c239ee0ceaee51cde0012ebbae977a6f4cdf6784 SHA512 18d13b243667404511e34d85b6b6530313dbc02d28e409f243486b050282556f398dabbe04dcbde8dcb43c15182d693e89ab168a4e9525f0a0b6f5f9ed3da23c
+MISC metadata.xml 588 BLAKE2B 89e02c1b93c1a834c81fc6ffd3e6f859e8a37651b3d3f2b68995eb3ceb035b4c49ff66b160e35829dee4416f4bfb16dcea6fedaf21e6b305f5674e8e52ecd1d3 SHA512 359590ef302a574ac485f43cf78d3e618ce2562983fc21941961dc7624919ae8c88ae53be3ec19ed6e36f777d3665b133b2972c94d9b9b7829fdaeecc0b3710a
diff --git a/sys-fs/squashfuse/metadata.xml b/sys-fs/squashfuse/metadata.xml
index c8a507a9926c..4b36f192fd0d 100644
--- a/sys-fs/squashfuse/metadata.xml
+++ b/sys-fs/squashfuse/metadata.xml
@@ -13,6 +13,5 @@
 	</maintainer>
 	<use>
 		<flag name="lz4">Enable support for lz4 compression</flag>
-		<flag name="zstd">Enable support for zstd compression</flag>
 	</use>
 </pkgmetadata>
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 7ad4db4b1fca..8ca86f738cc8 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -12,6 +12,7 @@ DIST systemd-240.tar.gz 7582001 BLAKE2B cf53595a83424984dd9f533f7cd0c9905366c5a5
 DIST systemd-241-rc1.tar.gz 7617965 BLAKE2B 6c491297b71ad3c473d644de04bb334f902ee4110d647b654c5452f34401cfc11c7564b290022072555f3fbd46674ce009f587622f412f8a66330a7089db34c5 SHA512 168ba80d6e8abadbf1ed84270f2b02e257f1490b61021bb6fb704d9b5fad2670b63e0fc0cb26071e8d56c993faa30274e80d53cf49154cce2b609f47c73b30e0
 DIST systemd-241-rc2.tar.gz 7619504 BLAKE2B 610940b3141d36a0534cf477d303eb681f418f8c04d7e9ff1d28832d02c05d68195aec108b15392662b134020c28df5b35f6c1c85f8eea8e7090cdc210ce5e26 SHA512 69932b1e5d48fbf6fd650a91354763b1e7e8d490def98a011d6377ee8623abc21244f2c8ddd97a500c4d3e6ab11bae2a6148ddc84e325d75a0273b3d456d8f41
 DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
+DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
 EBUILD udev-236-r1.ebuild 10048 BLAKE2B 8813b56cbd71890b974be9597f75d864eeaccfed35e474d3278069e7c1c362100e7790409768e1d5dfe786313cff8cc9f5ba996798c1a1119a11f7de468ea201 SHA512 f740b9d26efe64e42a7e8b64f0d4222aca3606e8f98471d934674213874ceab76afe2a8ed9c0a677aac9a3246fb0eb6cc97f5c662e9d33dc0591e1ad4ba230a2
 EBUILD udev-238.ebuild 9594 BLAKE2B 8f708567f1629fda0e96f72c53ced2618f9201f6ca996f74d972795597adca12f89fff6852b6624fe461aa810d13d821dad15be68c24973d2a8d09f67ae5e0bc SHA512 145d3adb943a29c75e8b97b01a154fc5d0b21973696bc86c034d997bfda060ade5d72e255d3752539cdfa160c4d2cce7b8ab0ab928b34cd7c510d65e53decd0d
 EBUILD udev-239.ebuild 9762 BLAKE2B 6ebde1a54f3286af157878f3c0f942dad12d4473ea72362dc925308638b59415393776098f7364c36ed81b75d1ebdca8d8ace8c05bca6da1f5f693497c372336 SHA512 e1b321ca73c09fb4f26a768a8bc7c93de926d3924fe6b7e0b4d0dfe232dd558ff881ed0690452e70546d7d263abba9cc60b2a14e061ab4f3f1eec4b406deb46b
@@ -20,5 +21,6 @@ EBUILD udev-240-r3.ebuild 9664 BLAKE2B 2daaa3124df1ce0ea5b3247200a55020d75b92383
 EBUILD udev-241.ebuild 9673 BLAKE2B 33c6d4cf7c1d58645481dcb957f1a3e28587911dc5a2ead16d1a91d2b0eca5ad0765203661a8088fac4699e501162759cc927f2692bfb170c98394b8e03e7978 SHA512 f1d6f1aa6d131605b6a63aea994bd7c7c2354714a41f0de85fe884389d0893d737ebbacea2a34d9a15f7173cf10f0d225125aacef33725684565044c6d1edcd8
 EBUILD udev-241_rc1.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
 EBUILD udev-241_rc2.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
+EBUILD udev-242.ebuild 9673 BLAKE2B 33c6d4cf7c1d58645481dcb957f1a3e28587911dc5a2ead16d1a91d2b0eca5ad0765203661a8088fac4699e501162759cc927f2692bfb170c98394b8e03e7978 SHA512 f1d6f1aa6d131605b6a63aea994bd7c7c2354714a41f0de85fe884389d0893d737ebbacea2a34d9a15f7173cf10f0d225125aacef33725684565044c6d1edcd8
 EBUILD udev-9999.ebuild 9637 BLAKE2B 0c5f05d169bf4e7318e46d7b5a2eff8f31cae9c4b5b14ac6fa0ec5029b120cb97d71341ddad3d89a197653b4b3fda330d03d15fd2f45507c808dba375437d6cf SHA512 03ae6bd7929e67d557e347e0c4a034deb3f802c34b9ecd9faeeb4970230f2bac12a77544fdb36986744f87711fd326c3d928587bcfbd1d6042bb9e44c740cc20
 MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d
diff --git a/sys-fs/udev/udev-242.ebuild b/sys-fs/udev/udev-242.ebuild
new file mode 100644
index 000000000000..e3c9cbfb5d88
--- /dev/null
+++ b/sys-fs/udev/udev-242.ebuild
@@ -0,0 +1,328 @@
+# Copyright 2003-2019 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 user
+
+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 ~sh ~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}
+	!<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
+
+	local PATCHES=(
+		"${FILESDIR}/236-uucp-group.patch"
+	)
+
+	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
+
+	# https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69
+	# https://bugs.gentoo.org/246847
+	# https://bugs.gentoo.org/514174
+	enewgroup input
+	enewgroup kvm 78
+	enewgroup render
+
+	# 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/udisks/Manifest b/sys-fs/udisks/Manifest
index cc72fe6fbba3..f2443afbf57d 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -6,8 +6,8 @@ DIST udisks-1.0.5.tar.gz 736221 BLAKE2B 9a709c5d4fcd390d9a52ac764d0e3c678983a146
 DIST udisks-2.7.4.tar.gz 1286465 BLAKE2B 8c52199215bc4ee3840ded2ccf9e3d61bc99bf0f505abb55a5ce18aa2676a60f788bc235e0f6be308c8bb50ec653a559010970e827d3bb4c1212afea291e7a8d SHA512 d0ad6c6d44f53414de3da68e0cdff1be0e9e6e03f900d5fdb4912560db36af52be32a2615d3d2efeaf134d4721a4a0c3e03515fd670f42e96f42ded08c3bf849
 DIST udisks-2.8.1.tar.bz2 1354879 BLAKE2B c2e5fc11dc29d43c6ff2cfb048c8f5540e72ea9c966e75b70754ed9491e3d4bfa9693718ab735c61ec110c480037064d610d238df92a839b4b4222dd624397bf SHA512 a3c7d26cd1bbd9cce59b25d118076c34482a698d7dca9e0468b6f9c928f40c8dbdd0b1cb61cf288ae77151643dc4a3eacf31e22af2c7b35a2828e49ee335e70b
 DIST udisks-2.8.2.tar.bz2 1589149 BLAKE2B eaa9d95e175bbdd4255c627a0dcd93ff6f0a3660134d2117551c2d61298733570409481393ceeafc92ff26b74277b3a754b70d9359ed402c19d73fea2f39ec04 SHA512 dc0087ed2d3ab71dc66f63f868a6e2cd0e4e7578c40b2240739cecaffd6f50f5a2cecfc7ef7df9304e291d84ab12f59a940b9fb42b34a5a60d12061e6aaffc1a
-EBUILD udisks-1.0.5-r2.ebuild 2748 BLAKE2B 3970cd26a0d7661f05d74f8f71d678ba0903da3ca34828e523891354ba6d5bde0fec54f71026c4c58ab865d900cd99950f58219d38206bb83252ba9d98cea44d SHA512 bf49bb19bbddc413b06af20f5a1863f1d870c4ff5286e6c736a27f9e9ce769f6d1fc81e00edd0ee3a84b16241105eb91588046e2e2dc3b8767248b32703b61ee
+EBUILD udisks-1.0.5-r3.ebuild 2795 BLAKE2B 45da28dd3571bad3921197cb8aa68487067a58e905a6802581924d54a64bc39b4a203129c2bdb7a69bbfa63da6259ab48aeb21e039799bce547f6c4c58ff31d6 SHA512 d795d5a8c564afccb2f41c1062ad5485074db7daa4416e2c4babd8665633a21038107e8e8c5356c9d49edb7108a7126a905b57420741239de41b9925a320e80d
 EBUILD udisks-2.7.4-r1.ebuild 3328 BLAKE2B f97ca16814ccf01e774c7a44474c95d0876795024578985023031e42ac429377167718f6de01e093dc658db9e3855f6c5801993fb4870c39d7c1e2ea0a6e2897 SHA512 8b319ed1f9e9f76fe93e4a8ae4fdd5aad1610ad22f3fdc6f7d6f5f5c2a77db27ad8aedc18e15f8e8dc6cccb003c5e8221397142d14a75aaa693c2eac4184ebe5
 EBUILD udisks-2.8.1.ebuild 3234 BLAKE2B b0be42f25f2a9c3a5b3305bc9907f2b8fcd81470e25b0910f72f733dad6e6803f528bbfe2c450e97ab257cd42311ede04c5b9d65c37b13068729563c3a649f99 SHA512 cfe0d8c6b1b60f160b2eceac6eec64951a56aadd930cadd0c38a6c6b8a9d5fb9d74a13738a3d40dd1afe71373e8106143586126da9de62d57afe49f0e498cccf
-EBUILD udisks-2.8.2.ebuild 3250 BLAKE2B d6d03713258187074cbccf5b5b088bafe3ef0f7be9134051136a5855ceb858b00961a10cde4b098d24d9cdf933171eb780c0bcfff136b957cc8fbd7988488d22 SHA512 9509455b4b82c8c39ece13d6ede774bca9097a71954408f0a06f299409ce513ea75abfc7aef9de679ca63d974ef7e8d48ed508b2d392f6f99d131988862e8523
+EBUILD udisks-2.8.2.ebuild 3240 BLAKE2B a887061b0302b102597b146f6597b365b4964f372ec829f8178c419a3e3bcb2b3ed00e11157b75ef0ff8766e2d851391a1ae6a76c4d4a5119966ff4b4e441ea5 SHA512 99278667326d8ae9e4e316eae3eca0628b89cb04c8750a6f822b6f9a024c8d26bfb8d2399988e6f8b9ded8aff4691dd382df68a7aa99b423fcba71cefa67d97f
 MISC metadata.xml 868 BLAKE2B 8d4ef3d2fae9d22074a87c65ced87d1e523b8b935084845b4cdd11389648e5071852cde39b18afb34c33dd352f3b1acb6ffbed68a5dc6c999033c5567693967e SHA512 e5b0ccda409fe0b7c7be656f5834399f2819da68ee811e70c2cdf97370b860efa1ca58188543f9cc46f17cfa340c9d31c18b050b6e6f049928afe8d1ad7ffae5
diff --git a/sys-fs/udisks/udisks-1.0.5-r2.ebuild b/sys-fs/udisks/udisks-1.0.5-r3.ebuild
index 513b9e8dcb5a..74ffc984dd33 100644
--- a/sys-fs/udisks/udisks-1.0.5-r2.ebuild
+++ b/sys-fs/udisks/udisks-1.0.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="https://hal.freedesktop.org/releases/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86"
-IUSE="debug nls remote-access selinux"
+IUSE="debug +lvm nls remote-access selinux"
 
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
 	>=dev-libs/glib-2.30
@@ -20,7 +20,10 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.100
 	>=sys-apps/dbus-1.6
 	>=sys-apps/sg3_utils-1.27.20090411
 	>=sys-block/parted-3
-	>=sys-fs/lvm2-2.02.66
+	lvm? (
+		>=sys-fs/lvm2-2.02.66
+		<sys-fs/lvm2-2.02.183
+	)
 	virtual/libgudev:=
 	virtual/libudev:=
 	virtual/udev
@@ -69,7 +72,7 @@ src_configure() {
 		$(use_enable debug verbose-mode) \
 		--enable-man-pages \
 		--disable-gtk-doc \
-		--enable-lvm2 \
+		$(use_enable lvm lvm2) \
 		--enable-dmmp \
 		$(use_enable remote-access) \
 		$(use_enable nls) \
diff --git a/sys-fs/udisks/udisks-2.8.2.ebuild b/sys-fs/udisks/udisks-2.8.2.ebuild
index b95599147fc8..50ffc5f311e2 100644
--- a/sys-fs/udisks/udisks-2.8.2.ebuild
+++ b/sys-fs/udisks/udisks-2.8.2.ebuild
@@ -8,7 +8,7 @@ DESCRIPTION="Daemon providing interfaces to work with storage devices"
 HOMEPAGE="https://www.freedesktop.org/wiki/Software/udisks"
 SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.tar.bz2"
 
-LICENSE="GPL-2"
+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"
@@ -43,11 +43,10 @@ BDEPEND="
 	>=dev-util/gdbus-codegen-2.32
 	>=dev-util/gtk-doc-am-1.3
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
+	nls? ( >=sys-devel/gettext-0.19.8 )
 "
 # If adding a eautoreconf, then these might be needed at buildtime:
 # dev-libs/gobject-introspection-common
-# gnome-base/gnome-common:3
 # sys-devel/autoconf-archive
 
 DOCS=( AUTHORS HACKING NEWS README.md )
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index ca98f9084c45..c445fc464d91 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,5 +1,5 @@
-DIST vhba-module-20170610.tar.bz2 15622 BLAKE2B 7556f13dba719779a8c9c2acb03c51f9f4b33153b46146109cd3387094a9e3ca2ad9750e4564139696c2a417a5aad347c32a33eeb7b69594477efc2ceab0e12e SHA512 bf27a6a7a6aabf6c1a4c1f16b1a08dce460ee675ea53b141c6db8edf0637dffa900e03b9141f9f1a672fcd8f84e6f2be86a07e1f78bc5667a7a7669d45f1f687
 DIST vhba-module-20190302.tar.bz2 15708 BLAKE2B 4a6f1f22e893597e50e78fa06e1296079b600ad6b2cf7b319267ef44d1ff07795f2aca22541993a7fc57d15550297e71046ce4147226d0731aa2b4d691dd5299 SHA512 6df59112b9b0597ce98de85744acd8158dbc015841740649fa3538fec32f1d7cbf4e489062998cc13dc85a1b3558bcffc2ea65285e17ee5b3f1c0a7d49cd6a38
-EBUILD vhba-20170610.ebuild 2146 BLAKE2B 7b02077e20c319d2d9197719c00e115119b3e825c706fbfbc64de6a018b374605a5d06e4ac7d830c365b3ee1cae7299a207a49eb8d55385d775a73a0bc3f8c8f SHA512 ab5fc77641921817989917b9b47e0f4766db4e02238c8826d2eeb90d6a23c7ef7a1fc21d4ed99ddd1ea002f06d4ff7f63c7df660923cd71db5ab34d9a8b0dc5c
-EBUILD vhba-20190302.ebuild 2148 BLAKE2B 8b3d1dd8f8d8e21da1a6d59356b789cc1cc703c6f68ecc6cbdf04890ed3942024753b3e26f6855e757a68a338a2c4c9e7ae9c35125035ea1580ffb99505b9555 SHA512 4a23aa165510d5b3f518bc47e8aea33053a42b14db27d3b3682a726f2ca840f114a34cbdeb34a0c3661d98a4c059cc9a2dcd351d1930d19d4ad8c54d5989a4a7
+DIST vhba-module-20190410.tar.bz2 15741 BLAKE2B 6d513877c771b1c4c5805231cf8bb13333d29dd3c6de7d91879ef1898fdc424df026b0835a772f398dcdc7d8900db462164a40e46c9b66b38ed70f5b5f6a0e7e SHA512 e4b30bea8464d8ac24fd2fddca9d41052af2f5b3dc9e054ead47991bff41366be377600075627c40261722c88c20ed2eaf65fa7afb34690ef09a6f4ea6f9351f
+EBUILD vhba-20190302.ebuild 2146 BLAKE2B 7b02077e20c319d2d9197719c00e115119b3e825c706fbfbc64de6a018b374605a5d06e4ac7d830c365b3ee1cae7299a207a49eb8d55385d775a73a0bc3f8c8f SHA512 ab5fc77641921817989917b9b47e0f4766db4e02238c8826d2eeb90d6a23c7ef7a1fc21d4ed99ddd1ea002f06d4ff7f63c7df660923cd71db5ab34d9a8b0dc5c
+EBUILD vhba-20190410.ebuild 2148 BLAKE2B 8b3d1dd8f8d8e21da1a6d59356b789cc1cc703c6f68ecc6cbdf04890ed3942024753b3e26f6855e757a68a338a2c4c9e7ae9c35125035ea1580ffb99505b9555 SHA512 4a23aa165510d5b3f518bc47e8aea33053a42b14db27d3b3682a726f2ca840f114a34cbdeb34a0c3661d98a4c059cc9a2dcd351d1930d19d4ad8c54d5989a4a7
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/sys-fs/vhba/vhba-20190302.ebuild b/sys-fs/vhba/vhba-20190302.ebuild
index 8969ab8b663f..157ae2ff9f9d 100644
--- a/sys-fs/vhba/vhba-20190302.ebuild
+++ b/sys-fs/vhba/vhba-20190302.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="virtual/udev"
diff --git a/sys-fs/vhba/vhba-20170610.ebuild b/sys-fs/vhba/vhba-20190410.ebuild
index 157ae2ff9f9d..8969ab8b663f 100644
--- a/sys-fs/vhba/vhba-20170610.ebuild
+++ b/sys-fs/vhba/vhba-20190410.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/cdemu/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND="virtual/udev"
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index b18c3a554495..c5df3d4dc923 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,19 +1,11 @@
-AUX zfs-kmod-0.7.12-kernel-4.20-compat.patch 1213 BLAKE2B 037d0979fe16d3693f3ae60176f737bfaa9e4df2fcd36d785469f0aa548f50a5014b0806bc83070e07c82ef8353ff4093776b4b624bb78a7f56e14182c671309 SHA512 48d7e08951f6f91831636b89d6031394641eb0a021ce5c944b5e7f69aae71d1b48ee81dc9ac3cd7c95b037afc2a83cd243b17fb98bb7308234e38f557fcadc35
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
-DIST zfs-0.7.11.tar.gz 6561125 BLAKE2B ee579aa01272d5565fe78ae6074dc1acdd34c8e9a26838462aea937132c322b0fb915c4dadec230560d586db2b2af129735ed6b5e41def4183c9c7ed456ca7aa SHA512 b53c92de2c2542a1b0189368e4b298e93bea13aec8ba415559e86bfc01a9c7deaf436e694aa047ef8a302c79224f96edd150ea93a57eb88c9e26d054cf7ccd2b
 DIST zfs-0.7.12.tar.gz 6565017 BLAKE2B 493df30ecce1f169e02d6c8262ba71cc9e7b01d5b17ce188004f522f0c93943b858434067cba8173ccb3e08cde24a1d3e8a3996b2e852f8bc35251f8c4ab3809 SHA512 278e411eac5fb2a91108671b64521c2bd5c08024d5829e1679d8f243dfc3c6317363ed9c79dabfddecf425acb6b3003eeaf4e7d991513cbcae4d2644f5d30bf2
 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
-DIST zfs-0.7.8.tar.gz 6514969 BLAKE2B 689d96ad7afeb422cbeca724f248ac56b6fcdc0a7ef215f735180406a7fc0d4d3c9700a41e855186d8044b304c9f0c142c2bdca387299c499974e424965970a4 SHA512 cdeabe10acd2feeeff8a6362987c757b716bfea6ebad42ce022a081106661f774150c113bdaa9e1ac441efdd6da4cf11e6119323ad60ae15ab445a872d952e35
-DIST zfs-0.7.9-r1-patches.tar.xz 10920 BLAKE2B 50a0b8533061b5eecc103179e6fd51499d87f1c3b331b0629efa29a5a7d405c03448db2245fed9389d149cc83021a2c263bc2f02133a5fdd11b088516c353fff SHA512 a9e8c04bf7449b0a63420202b2f6dd8a6aea96ac57e5925c2ca0223f662210f42316ada25aa6113103909de8c9976945828cdb91a6ff9932f282c01316d7b3ec
-DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe97c693356e1e0b15967ea512c25454f2d77285600f2209d778e4299f420754932e403a390b87b4f488dc94 SHA512 af5d9c320885ee84019fb04250c4b12c7ac3bb3d1037b1961ec4584701a737558374dc22521743e197356efb1d1f0ced9beff675ae9cfcccf3cd8407467f18fa
+DIST zfs-0.8.0-rc4.tar.gz 8874029 BLAKE2B 17dd408bfe5133339548c124529b22312c70f527cca9329a7198c415ee2010e03a967d06d6b56ba25c667c8586476daed97c812ffc26331827aac818eda27282 SHA512 0a1137cf5ed2859dd3876867c4f63b74f117847276a3d9de67736a92cbe5a0c9b2e599bb0e84664f5feb89be36188baacdcc2aa233b498fcfeb6fd946c8b73ea
 EBUILD zfs-kmod-0.6.5.11.ebuild 4086 BLAKE2B 77042a670913df7a0fbb47e594028d56f6733827192b68ae13b0c52598bf728550b59ef0c850d1498e265765552ba3e6f1e4ea6dd8d8608af3fb994de375135b SHA512 efbc887b8f613a94af230916dd0c6ddbf9fcf29a73d4bfeda19680eb514ad12f75cc75d45f8d01fa56cf909e34e518ec5a91bf70310370dd3cc7db7ab7aa72ef
-EBUILD zfs-kmod-0.7.11.ebuild 4073 BLAKE2B 85d1ae2a9292914fe768f59d753a57be220005fcbeaff709dd3587f0cdcbfbb39ad3d2da40478b52aff8787c4e4a55e6dbfc8cb63d4350cab3f917c35c3d4664 SHA512 7ffaee7a4ef75bdca727786dae9cc5cc4441d274c568210b654a6f150e6efcdc61c1a35f48db98a4bb52ee1f68b4c209e8855aaead9da9fb17053db0ca4a9ca1
-EBUILD zfs-kmod-0.7.12-r1.ebuild 4130 BLAKE2B 4881bbcc95739423581845787a08ec4ea4928133e18e40c91d7e775aedf64742d413caebac4063b7ff75e75e439293e2d0accbbc06b3f095ef3165fb63bb50ec SHA512 7da379848280164cbde951978bd43c6fc4734b174fafc7f0336fdf938017532fd3bedd416fefa5369187eab530b78888dfcb5b983302476bf47f5e5df8982cba
 EBUILD zfs-kmod-0.7.12.ebuild 4072 BLAKE2B bd174bbce39a1634c40ba20c26066e15c660b18382f6c2c7ada46759fa19339e39e2490e209f319cf80041151c074aaeb86c456441fdf814e46a6a3a37c2316f SHA512 1a52bec71a66de3cb79ab32e68b95ae6a0590a8acb715e4a025516840d8a21252e524a25044897661c2977217a6ec7bbc6da1e60846dcf414f97324bbc564ee2
 EBUILD zfs-kmod-0.7.13.ebuild 4120 BLAKE2B 298fde00329e55a4445f06cb2f27d49bdd0c60c585b70415c5587c0bcc21820ffea1851e5411d79deb691bcf0fb51a79e7d6b1d22c390335c0b29cad1068a586 SHA512 c25172c59bf26a8bb93f98b555c7f8dca31c425aa209477314015103c2a05a6cde742190b5de77d785bc4ccce15b355571ba70ec1399fb9e85cec90d756f9122
-EBUILD zfs-kmod-0.7.8.ebuild 4072 BLAKE2B d148372b05ac609549329f337792e8087841b51e5c5097d9a1d24f6c6b07756ec8ff416359774272f7d0a79ad61e79fd6c4679826558b1416b34ae4acdb3be5f SHA512 17b077dc8d0007e1d1be419c98a00184494835e17d5ddf31928c1bd20a0882898e3701ceea7b33195d3afbecac93eb30d511a82d4a58af52366a792416dfef6e
-EBUILD zfs-kmod-0.7.9-r1.ebuild 4279 BLAKE2B 793f8e6257e52f67b2a6aeae8da3e6f86e3ac76798e3afcbc253b3b56d203548e883740031f4a973730c50da8c4309ae4804e5b9b95ec91af5489e82faa9765c SHA512 e5a6c17c6fb4f6ab37cbcc5fc4fbdace31585a41292ced5eda922a19178c8e3d85c0b7a1e52eaea94490416111922e5b85a5f7abd7c5aa3f4b815eebae17e7ca
-EBUILD zfs-kmod-0.7.9.ebuild 4072 BLAKE2B 301b09e71e36e279d2fb8532884bbf7599ae7c1bdc81188b008420039a227ea2efa251b00ebf8b434d5d0e6c3fe41fe0b4dfb27fe599ceb414045a64848f8914 SHA512 d22123433d5cf24e385737076743a515ab2280b5a4e851ab657f78225aed2315c05edf13e15156be172218fcce2d049a1d2f5a353bca39e2061fb61504b0675f
 EBUILD zfs-kmod-0.7.9999.ebuild 4131 BLAKE2B 10f0553102967537d42f5b2da8ede7c8894ca9134a1421efadd1db538b3381d588fe6729dc37c84ab025212ca01a74c2e60768fe8f7808acbd21f0179b2a9abb SHA512 ad59815b9e2ce844e6caa5232d1e4f17c70b930b8295a28e44f37b8293c602fb8b98f939bb1ea22cef68c8e724de6a581b09073d41fd7a14aa181a0cadb6250c
+EBUILD zfs-kmod-0.8.0_rc4.ebuild 4223 BLAKE2B 2b98b8f626bac4a0c1d4687f5ecae8b3c43cea57ac12f756bda1f1f2fd7815053528d1c5bd57a7aa85a59e694b5d8f550f5cd5fbd4f7cb4d2399f83094024cc1 SHA512 7f7881e867d1672fc2cda783c88c5e9d8d7e751c4997a121f40c79e2c3cffdf0a975d7445ae89014e8d0fc59838381674322e00e949ef7c5e87eaf66156eb358
 EBUILD zfs-kmod-9999.ebuild 4189 BLAKE2B 716f0a07888b59592e5bc0ad063f5865b1ddbee07617dedb1744a6c5b13f98e3658b01d00260ee60f6ac921f3c64b3038cc2581df45019964e7028487503bc58 SHA512 ea0972a782e3e25fd12156f1b13d07eb89155ac3dbf8bc3026557ba04c11f224f12f603e90672abd6899a6153ce96612359d4907a779abada3b4f53ca8519cab
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/files/zfs-kmod-0.7.12-kernel-4.20-compat.patch b/sys-fs/zfs-kmod/files/zfs-kmod-0.7.12-kernel-4.20-compat.patch
deleted file mode 100644
index 75ed3c579920..000000000000
--- a/sys-fs/zfs-kmod/files/zfs-kmod-0.7.12-kernel-4.20-compat.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4f981f6ab614a908f912f7dc147b248f96b498a2 Mon Sep 17 00:00:00 2001
-From: satmandu <satadru@umich.edu>
-Date: Wed, 26 Dec 2018 12:36:28 -0500
-Subject: [PATCH] Additional fixes for current_kernel_time in 4.20 on 0.7.x
-
-While https://github.com/zfsonlinux/spl/commit/cd1b28e0cfa923db988611df28958f7b84b53530 fixed the 4.20 current_kernel_time issues in spl as per https://github.com/zfsonlinux/zfs/pull/8074 in .07.x, current_kernel_time is still being used inside zpios-ctl.h in 0.7.x.
-
-I believe this may fix this issue in 0.7.x to allow it to compile successfully for kernel 4.2.0.
----
- include/zpios-ctl.h | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/include/zpios-ctl.h b/include/zpios-ctl.h
-index f17f1153260..068c9eaf173 100644
---- a/include/zpios-ctl.h
-+++ b/include/zpios-ctl.h
-@@ -181,9 +181,12 @@ zpios_timespec_t
- zpios_timespec_now(void)
- {
- 	zpios_timespec_t zts_now;
--	struct timespec ts_now;
-+	#if defined(HAVE_INODE_TIMESPEC64_TIMES)
-+		inode_timespec_t ts_now = current_kernel_time64();
-+	#else
-+		inode_timespec_t ts_now = current_kernel_time();
-+	#endif
- 
--	ts_now = current_kernel_time();
- 	zts_now.ts_sec  = ts_now.tv_sec;
- 	zts_now.ts_nsec = ts_now.tv_nsec;
- 
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.11.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.11.ebuild
deleted file mode 100644
index d326057ceda2..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.11.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://zfsonlinux.org/"
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="debug? ( strip ) test"
-
-DEPEND="
-	=sys-kernel/spl-${PV}*
-	dev-lang/perl
-	virtual/awk
-"
-
-RDEPEND="${DEPEND}
-	!sys-fs/zfs-fuse
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
-	"
-
-	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 4 18 || die "Linux 4.18 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	# Remove GPLv2-licensed ZPIOS unless we are debugging
-	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
-
-	# Set module revision number
-	[ ${PV} != "9999" ] && \
-		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(${myeconfargs}
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-spl="${EROOT}usr/src/${SPL_PATH}"
-		--with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
-		$(use_enable debug)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-
-	if use x86 || use arm
-	then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	ewarn "This version of ZFSOnLinux includes support for new feature flags"
-	ewarn "that are incompatible with previous versions. GRUB2 support for"
-	ewarn "/boot with the new feature flags is not yet available."
-	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-	ewarn "Any new pools will be created with the new feature flags by default"
-	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
-	ewarn "create a newpool that is backward compatible wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.8.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.8.ebuild
deleted file mode 100644
index aa4823774737..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.8.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS="amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://zfsonlinux.org/"
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="debug? ( strip ) test"
-
-DEPEND="
-	=sys-kernel/spl-${PV}*
-	dev-lang/perl
-	virtual/awk
-"
-
-RDEPEND="${DEPEND}
-	!sys-fs/zfs-fuse
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
-	"
-
-	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 4 16 || die "Linux 4.16 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	# Remove GPLv2-licensed ZPIOS unless we are debugging
-	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
-
-	# Set module revision number
-	[ ${PV} != "9999" ] && \
-		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(${myeconfargs}
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-spl="${EROOT}usr/src/${SPL_PATH}"
-		--with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
-		$(use_enable debug)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-
-	if use x86 || use arm
-	then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	ewarn "This version of ZFSOnLinux includes support for new feature flags"
-	ewarn "that are incompatible with previous versions. GRUB2 support for"
-	ewarn "/boot with the new feature flags is not yet available."
-	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-	ewarn "Any new pools will be created with the new feature flags by default"
-	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
-	ewarn "create a newpool that is backward compatible wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.9-r1.ebuild
deleted file mode 100644
index c702d6ed35bf..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.9-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-AUTOTOOLS_AUTORECONF="1"
-if [ ${PV} == "9999" ]; then
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz
-		https://dev.gentoo.org/~ryao/dist/zfs-${PVR}-patches.tar.xz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS="~amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://zfsonlinux.org/"
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="debug? ( strip ) test"
-
-DEPEND="
-	=sys-kernel/spl-${PVR}
-	dev-lang/perl
-	virtual/awk
-"
-
-RDEPEND="${DEPEND}
-	!sys-fs/zfs-fuse
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
-	"
-
-	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 4 18 || die "Linux 4.18 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/zfs-${PVR}-patches"
-	fi
-
-	# Remove GPLv2-licensed ZPIOS unless we are debugging
-	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
-
-	# Set module revision number
-	[ ${PV} != "9999" ] && \
-		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(${myeconfargs}
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-spl="${EROOT}usr/src/${SPL_PATH}"
-		--with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
-		$(use_enable debug)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-
-	if use x86 || use arm
-	then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	ewarn "This version of ZFSOnLinux includes support for new feature flags"
-	ewarn "that are incompatible with previous versions. GRUB2 support for"
-	ewarn "/boot with the new feature flags is not yet available."
-	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-	ewarn "Any new pools will be created with the new feature flags by default"
-	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
-	ewarn "create a newpool that is backward compatible wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild
deleted file mode 100644
index c0e759e6be36..000000000000
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
-	KEYWORDS="amd64"
-fi
-
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://zfsonlinux.org/"
-
-LICENSE="CDDL debug? ( GPL-2+ )"
-SLOT="0"
-IUSE="custom-cflags debug +rootfs"
-RESTRICT="debug? ( strip ) test"
-
-DEPEND="
-	=sys-kernel/spl-${PV}*
-	dev-lang/perl
-	virtual/awk
-"
-
-RDEPEND="${DEPEND}
-	!sys-fs/zfs-fuse
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
-
-pkg_setup() {
-	linux-info_pkg_setup
-	CONFIG_CHECK="
-		!DEBUG_LOCK_ALLOC
-		EFI_PARTITION
-		IOSCHED_NOOP
-		MODULES
-		!PAX_KERNEXEC_PLUGIN_METHOD_OR
-		!TRIM_UNUSED_KSYMS
-		ZLIB_DEFLATE
-		ZLIB_INFLATE
-	"
-
-	use debug && CONFIG_CHECK="${CONFIG_CHECK}
-		FRAME_POINTER
-		DEBUG_INFO
-		!DEBUG_INFO_REDUCED
-	"
-
-	use rootfs && \
-		CONFIG_CHECK="${CONFIG_CHECK}
-			BLK_DEV_INITRD
-			DEVTMPFS
-	"
-
-	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
-
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 4 17 || die "Linux 4.17 is the latest supported version."; }
-
-	check_extra_config
-}
-
-src_prepare() {
-	# Remove GPLv2-licensed ZPIOS unless we are debugging
-	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
-
-	# Set module revision number
-	[ ${PV} != "9999" ] && \
-		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
-	use custom-cflags || strip-flags
-	filter-ldflags -Wl,*
-
-	set_arch_to_kernel
-	local myeconfargs=(${myeconfargs}
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=kernel
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-spl="${EROOT}usr/src/${SPL_PATH}"
-		--with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
-		$(use_enable debug)
-	)
-
-	autotools-utils_src_configure
-}
-
-src_install() {
-	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
-}
-
-pkg_postinst() {
-	linux-mod_pkg_postinst
-
-	# Remove old modules
-	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
-		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
-	fi
-
-	if use x86 || use arm
-	then
-		ewarn "32-bit kernels will likely require increasing vmalloc to"
-		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
-	fi
-
-	ewarn "This version of ZFSOnLinux includes support for new feature flags"
-	ewarn "that are incompatible with previous versions. GRUB2 support for"
-	ewarn "/boot with the new feature flags is not yet available."
-	ewarn "Do *NOT* upgrade root pools to use the new feature flags."
-	ewarn "Any new pools will be created with the new feature flags by default"
-	ewarn "and will not be compatible with older versions of ZFSOnLinux. To"
-	ewarn "create a newpool that is backward compatible wih GRUB2, use "
-	ewarn
-	ewarn "zpool create -d -o feature@async_destroy=enabled "
-	ewarn "	-o feature@empty_bpobj=enabled -o feature@lz4_compress=enabled"
-	ewarn "	-o feature@spacemap_histogram=enabled"
-	ewarn "	-o feature@enabled_txg=enabled "
-	ewarn "	-o feature@extensible_dataset=enabled -o feature@bookmarks=enabled"
-	ewarn "	..."
-	ewarn
-	ewarn "GRUB2 support will be updated as soon as either the GRUB2"
-	ewarn "developers do a tag or the Gentoo developers find time to backport"
-	ewarn "support from GRUB2 HEAD."
-}
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.12-r1.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.0_rc4.ebuild
index ad9bf31d87c5..32fe064aded2 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.7.12-r1.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.0_rc4.ebuild
@@ -1,51 +1,50 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=7
 
-if [ ${PV} == "9999" ]; then
-	AUTOTOOLS_AUTORECONF="1"
+inherit flag-o-matic linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
+HOMEPAGE="https://zfsonlinux.org/"
+
+if [[ ${PV} == "9999" ]]; then
+	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
-	inherit git-r3
 else
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
-	S="${WORKDIR}/zfs-${PV}"
+	MY_PV="${PV/_rc/-rc}"
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
 	KEYWORDS="~amd64"
+	ZFS_KERNEL_COMPAT="${ZFS_KERNEL_COMPAT_OVERRIDE:-5.0}"
+	S="${WORKDIR}/zfs-${PV%_rc*}"
 fi
 
-inherit flag-o-matic linux-info linux-mod toolchain-funcs autotools-utils
-
-DESCRIPTION="Linux ZFS kernel module for sys-fs/zfs"
-HOMEPAGE="https://zfsonlinux.org/"
-
 LICENSE="CDDL debug? ( GPL-2+ )"
 SLOT="0"
 IUSE="custom-cflags debug +rootfs"
-RESTRICT="debug? ( strip ) test"
 
-DEPEND="
-	=sys-kernel/spl-${PV}*
-	dev-lang/perl
-	virtual/awk
-"
+DEPEND=""
 
 RDEPEND="${DEPEND}
 	!sys-fs/zfs-fuse
+	!sys-kernel/spl
 "
 
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
+BDEPEND="
+	dev-lang/perl
+	virtual/awk
+"
 
-DOCS=( AUTHORS COPYRIGHT DISCLAIMER README.markdown )
+RESTRICT="debug? ( strip ) test"
 
-PATCHES=( "${FILESDIR}/${P}-kernel-4.20-compat.patch" )
+DOCS=( AUTHORS COPYRIGHT META README.md )
 
 pkg_setup() {
 	linux-info_pkg_setup
+
 	CONFIG_CHECK="
 		!DEBUG_LOCK_ALLOC
 		EFI_PARTITION
-		IOSCHED_NOOP
 		MODULES
 		!PAX_KERNEXEC_PLUGIN_METHOD_OR
 		!TRIM_UNUSED_KSYMS
@@ -65,64 +64,84 @@ pkg_setup() {
 			DEVTMPFS
 	"
 
-	kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required"
+	kernel_is -lt 5 && CONFIG_CHECK="${CONFIG_CHECK} IOSCHED_NOOP"
 
-	[ ${PV} != "9999" ] && \
-		{ kernel_is le 4 20 || die "Linux 4.20 is the latest supported version."; }
+	kernel_is -ge 2 6 32 || die "Linux 2.6.32 or newer required"
+
+	if [[ ${PV} != "9999" ]]; then
+		local KV_MAJOR_MAX="${ZFS_KERNEL_COMPAT%%.*}"
+		local KV_MINOR_MAX="${ZFS_KERNEL_COMPAT##*.}"
+		kernel_is -le "${KV_MAJOR_MAX}" "${KV_MINOR_MAX}" || die \
+			"Linux ${KV_MAJOR_MAX}.${KV_MINOR_MAX} is the latest supported version"
+	fi
 
 	check_extra_config
 }
 
 src_prepare() {
-	# Remove GPLv2-licensed ZPIOS unless we are debugging
-	use debug || sed -e 's/^subdir-m += zpios$//' -i "${S}/module/Makefile.in"
+	default
 
-	# Set module revision number
-	[ ${PV} != "9999" ] && \
-		{ sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" "${S}/META" || die "Could not set Gentoo release"; }
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	else
+		# Set module revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
 
-	autotools-utils_src_prepare
+	# Remove GPLv2-licensed ZPIOS unless we are debugging
+	use debug || sed -e 's/^subdir-m += zpios$//' -i module/Makefile.in
 }
 
 src_configure() {
-	local SPL_PATH="$(basename $(echo "${EROOT}usr/src/spl-"*))"
+	set_arch_to_kernel
+
 	use custom-cflags || strip-flags
+
 	filter-ldflags -Wl,*
 
-	set_arch_to_kernel
-	local myeconfargs=(${myeconfargs}
+	local myconf=(
 		--bindir="${EPREFIX}/bin"
 		--sbindir="${EPREFIX}/sbin"
 		--with-config=kernel
 		--with-linux="${KV_DIR}"
 		--with-linux-obj="${KV_OUT_DIR}"
-		--with-spl="${EROOT}usr/src/${SPL_PATH}"
-		--with-spl-obj="${EROOT}usr/src/${SPL_PATH}/${KV_FULL}"
 		$(use_enable debug)
 	)
 
-	autotools-utils_src_configure
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	set_arch_to_kernel
+
+	default
 }
 
 src_install() {
-	autotools-utils_src_install INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+	set_arch_to_kernel
+
+	emake \
+		DEPMOD="/bin/true" \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" \
+		install
+
+	einstalldocs
 }
 
 pkg_postinst() {
 	linux-mod_pkg_postinst
 
 	# Remove old modules
-	if [ -d "${EROOT}lib/modules/${KV_FULL}/addon/zfs" ]
-	then
-		ewarn "${PN} now installs modules in ${EROOT}lib/modules/${KV_FULL}/extra/zfs"
-		ewarn "Old modules were detected in ${EROOT}lib/modules/${KV_FULL}/addon/zfs"
+	if [[ -d "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" ]]; then
+		ewarn "${PN} now installs modules in ${EROOT}/lib/modules/${KV_FULL}/extra/zfs"
+		ewarn "Old modules were detected in ${EROOT}/lib/modules/${KV_FULL}/addon/zfs"
 		ewarn "Automatically removing old modules to avoid problems."
-		rm -r "${EROOT}lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
-		rmdir --ignore-fail-on-non-empty "${EROOT}lib/modules/${KV_FULL}/addon"
+		rm -r "${EROOT}/lib/modules/${KV_FULL}/addon/zfs" || die "Cannot remove modules"
+		rmdir --ignore-fail-on-non-empty "${EROOT}/lib/modules/${KV_FULL}/addon"
 	fi
 
-	if use x86 || use arm
-	then
+	if use x86 || use arm; then
 		ewarn "32-bit kernels will likely require increasing vmalloc to"
 		ewarn "at least 256M and decreasing zfs_arc_max to some value less than that."
 	fi
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index d43babd66714..ffcad9250a39 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -3,19 +3,13 @@ AUX bash-completion-sudo.patch 905 BLAKE2B 92e58ff097893436d589f7df0134e09d2e069
 AUX zfs-init.sh.in 582 BLAKE2B 27e5c1aff398c42178b3d7c005e91a1f8f3afa303a22e49c93a2cd7134016a8d07d68483126d60e46ed4ff5cbaeb87f050e9c9fb5bff5352d5dc32b4d94db7b4 SHA512 bed7eae5f902f13489241782d3d560b53a5a3258de492763b7b25783ca9417975afb9000f68f58be5c2057e1db50a569374ed0ff572140aa65e401e20e646461
 AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b9243f111c6c882c3480eb6396e347eac91670e3a67d7f122953d6fa82ec61a6467163b788b31858 SHA512 7a167b389723e5f55fea6956e5546e46c89ebf3e2d1c25f6b56c357e6d3ffc765226549d78cdeb79b4dc90c798ec6326a13996215b40eb49179376e32c3c3287
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
-DIST zfs-0.7.11.tar.gz 6561125 BLAKE2B ee579aa01272d5565fe78ae6074dc1acdd34c8e9a26838462aea937132c322b0fb915c4dadec230560d586db2b2af129735ed6b5e41def4183c9c7ed456ca7aa SHA512 b53c92de2c2542a1b0189368e4b298e93bea13aec8ba415559e86bfc01a9c7deaf436e694aa047ef8a302c79224f96edd150ea93a57eb88c9e26d054cf7ccd2b
 DIST zfs-0.7.12.tar.gz 6565017 BLAKE2B 493df30ecce1f169e02d6c8262ba71cc9e7b01d5b17ce188004f522f0c93943b858434067cba8173ccb3e08cde24a1d3e8a3996b2e852f8bc35251f8c4ab3809 SHA512 278e411eac5fb2a91108671b64521c2bd5c08024d5829e1679d8f243dfc3c6317363ed9c79dabfddecf425acb6b3003eeaf4e7d991513cbcae4d2644f5d30bf2
 DIST zfs-0.7.13.tar.gz 6614047 BLAKE2B c59c46287715779eb04d69333b0a417fa9865eb0d61c642b043188c4c97d4eed369f76a48327326ed1d4dd608ff95d91d20d26c80ed0b120a8fcd5f83cea638f SHA512 457d8f110b68c9656194cd3738b216d5d807d680e5cfc6ed1f3cf5ebde67860476387c6b862ba3ba7f972d8945075963e6c325543ab84468e3eff5dbce68476e
-DIST zfs-0.7.8.tar.gz 6514969 BLAKE2B 689d96ad7afeb422cbeca724f248ac56b6fcdc0a7ef215f735180406a7fc0d4d3c9700a41e855186d8044b304c9f0c142c2bdca387299c499974e424965970a4 SHA512 cdeabe10acd2feeeff8a6362987c757b716bfea6ebad42ce022a081106661f774150c113bdaa9e1ac441efdd6da4cf11e6119323ad60ae15ab445a872d952e35
-DIST zfs-0.7.9-r1-patches.tar.xz 10920 BLAKE2B 50a0b8533061b5eecc103179e6fd51499d87f1c3b331b0629efa29a5a7d405c03448db2245fed9389d149cc83021a2c263bc2f02133a5fdd11b088516c353fff SHA512 a9e8c04bf7449b0a63420202b2f6dd8a6aea96ac57e5925c2ca0223f662210f42316ada25aa6113103909de8c9976945828cdb91a6ff9932f282c01316d7b3ec
-DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe97c693356e1e0b15967ea512c25454f2d77285600f2209d778e4299f420754932e403a390b87b4f488dc94 SHA512 af5d9c320885ee84019fb04250c4b12c7ac3bb3d1037b1961ec4584701a737558374dc22521743e197356efb1d1f0ced9beff675ae9cfcccf3cd8407467f18fa
-EBUILD zfs-0.6.5.11-r2.ebuild 6067 BLAKE2B bc73c185a2988241145db2f5bee2e569dd67729b6e0b2bef27a22023a11134f9d4406350fc5fc8a658deb988607172ef4bd9fa0880af86a5fac80fd0800ada74 SHA512 d3ea86b9364e92349c1535437f49bf29e81a787bd929abf31c18fbd59fce8ec32c8ab414a4456ff56e2cc1ec3f0b2931f98320650ff5c84c555fa9366e3dc2be
-EBUILD zfs-0.7.11.ebuild 6074 BLAKE2B 33b02df834ab770e8e46d69c8b34d1cd22b75a4f916ddbdbf5341779fdfaab6792c7ad8a05692c4d838dc868d81fd0c8fa407a7acc46aa0660a3ce7466210be8 SHA512 94bac4ab1d74f733ea24fb2dd3f7772c78d1ea49a91b333b8b739e2df053e953b2f81593144b26cf451c095b4580e04a3229298af47fd402053ef6d8598bd55f
-EBUILD zfs-0.7.12.ebuild 6080 BLAKE2B 677e2e7c534e6c4e986fbd275b8404bf6162820cccd0df338b5429f9a10d09c9a3413afe913902b6284c7065cfcb143ea2154678ee399eb34d28e855e8333275 SHA512 73003efe6f803063c96c33e39b81480784b43915790a85c0b3fff5fdd5b7dbaa9789cce3c6c2a5bef0b4a01081570a51230134a4654bdd09b003c5ac3b8cef09
-EBUILD zfs-0.7.13.ebuild 6278 BLAKE2B f5bf619c6ab510495b106c390647f2646f9e9e2f97d0a083ac9d4d016f9054da9bdaa2d44d11544af0d4dad045abd25b263682b276937ea839d502ad9d551081 SHA512 074de204a7fa40988ff30c7b9eec31853eb5945726cc911fc605b80d3ba02dea3ea6dd3fa4278733c01b3227f12d73d0ab41da533a0adf47ca5482e76c7fdd15
-EBUILD zfs-0.7.8.ebuild 6075 BLAKE2B a64e55ee89c210962c3b40fa08b233a57a473f317f12fb1230367559d27975fe66a5b84e463a4dff194229ba4b1bd576f076151da4e1948a70702e85f0bacf99 SHA512 1a6064b0a61025c5b068a9adec8d4982cac8ef3da30ee83960bf3f1fabf3b9b4170419265a418f8d77b37f84a31b1989ecd23d57a13971a8fd43f26a55a50c19
-EBUILD zfs-0.7.9-r1.ebuild 6270 BLAKE2B 65a3f5776ab6b8f35e273120d76241be3e65ef7cfa4541263f1175fe1865a2ed08048cb5fde7289323394e52831409bce63aa9dce7140d44f14a3cfa6a1ba7c2 SHA512 76ef51ba6bf80ec63b26613eb528049aa1bfbb741ca58458d6c8635fbbab4c8a0e2a85b523b98912037402a33a3e75764850997457204d3146453a274cebe0ef
-EBUILD zfs-0.7.9.ebuild 6073 BLAKE2B 380d85c5fc958d461781bdf8326c723a52800406cbbeaec4414453397d4a4f4fea9100d8a8096608b7025eac4e424072fe62b4bb1cd9dae36268e42ad1c04106 SHA512 b2dca9e72c53447030e6605a2a0a8469e9676da88e038f66afe784f70668c719bc9e5ad02092a40dc20c1345a2c74126256a42dcf0f979401fe84858cffc8b44
-EBUILD zfs-0.7.9999.ebuild 5977 BLAKE2B ac507d39effe8be9bdca30a0c158b109e00d471958643770c567a7000efb996417398f6e9bc8a9e4d597cc1af3a91486b46d9ba2af292cca57b684f05db6dcde SHA512 62bf3008f373b44652a91c191f72d167946d26202da51ffef0d15fa57a1705f2d0c9b11afbe7c409d657a1a08efc8f69dc95efaeec0b63f28eaa3f2b7ce47e89
+DIST zfs-0.8.0-rc4.tar.gz 8874029 BLAKE2B 17dd408bfe5133339548c124529b22312c70f527cca9329a7198c415ee2010e03a967d06d6b56ba25c667c8586476daed97c812ffc26331827aac818eda27282 SHA512 0a1137cf5ed2859dd3876867c4f63b74f117847276a3d9de67736a92cbe5a0c9b2e599bb0e84664f5feb89be36188baacdcc2aa233b498fcfeb6fd946c8b73ea
+EBUILD zfs-0.6.5.11-r2.ebuild 6063 BLAKE2B dfeb1cb507428711a7aabb08a1a25deb4cabde7a66a7c6708634a7a6919b7a8e009d4f33870d1461b76985866547357c5cd2731ebec6bedc3219c4758bac54b0 SHA512 c4506ebd3be9c6e3037dca9d600f9e964c77b0b15fd554f5e7463136a7f98778d04c477a9a6fc1ae6feb2f54bf9c3968c26167bd45a32d1c0f117f8eb53d3e07
+EBUILD zfs-0.7.12.ebuild 6076 BLAKE2B c26271d1252a199e93b20868f962582864d2b50f102efb046fc0c4b3ad26ef5dc552d6b043979eb5c757889e671210bee202fe71453dc2e16dcf00592884fe8d SHA512 2cc0d649737fbed063bb57ac1eaa25669ad7098b477009f8b0b9507ce3c5c9ff1f0c2ded2c5ea348a84e03413c0c2035fd76dbe17f2a0d755876a792d9796f70
+EBUILD zfs-0.7.13.ebuild 6274 BLAKE2B 20495ae19dd9f45809aae6e94985e1e81730ab41250b54455d122ad828bcfaf094e2c6556766a4257e643586ccd9d27a2d6d221925a444e2d8e018d77225232e SHA512 2fe22ff8f76cfd56da450d27a732c3fbf8d50f2c7d6e8358976c9443267ce6f23a81756e4d2f807c61416e6a191de4352c89658affdeb4d144c7ecd75e108599
+EBUILD zfs-0.7.9999.ebuild 5973 BLAKE2B 521149bd89635e86c8fc2dd3b3bbc3cc85ec3c79a4ab372910984abd75fbec617080503074da5dff34064807fc9a1cfdfd4946406c4aa6b9e1e6a478db6f6e33 SHA512 90914f61584760f399dcc6eb84995adbb3e31e22dc6a1aa0da2996f854362e8f5d99a73ad1270a6d01fa73e5327c0b04582ec2256ceb623bb62a7d1606de210a
+EBUILD zfs-0.8.0_rc4.ebuild 6424 BLAKE2B cf07a7e5f5d629062f68b87cf0e4e9918e70301dde1aae6443bb1e02f63572e39295e4fab36cf4db8d14187b72cf8b0212fbe57d6839da487687d0929794d414 SHA512 9f69e3022adc68d309703a7c18d5e685b1ba6d658b367def32d5b972ec3ee6eeab2e57fbe8f5988bc75911d83231270cde46b14af7dcaa5e8de63bb01f3bb709
 EBUILD zfs-9999.ebuild 6359 BLAKE2B 5d1ddfa83a289f4772076d525578799d21493fdfe1980c34b6eb9e686241375dab5aa7311f6e57df4b7a99177c0a59dab1211791e6dd201a277f060a7903e17b SHA512 369e8f25ee675972d34bbe873db7719c7d83dfbf967e6094d78f0a831d180064c0603ca4fb43618524ff2402a1087a7992f675dc97cb5b656a8a1e446b67501a
 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild b/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild
index c47bc1f430b4..de5c91273626 100644
--- a/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild
+++ b/sys-fs/zfs/zfs-0.6.5.11-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_5} )
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-r3 linux-mod
diff --git a/sys-fs/zfs/zfs-0.7.11.ebuild b/sys-fs/zfs/zfs-0.7.11.ebuild
deleted file mode 100644
index 10d61e3bfeb4..000000000000
--- a/sys-fs/zfs/zfs-0.7.11.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	net-libs/libtirpc
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!=sys-apps/grep-2.13*
-	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
-	!sys-fs/zfs-fuse
-	!prefix? ( virtual/udev )
-	test-suite? (
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-		virtual/modutils
-		)
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-boot/grub-2.00-r2:2
-		!<sys-kernel/genkernel-3.5.1.1
-		!<sys-kernel/genkernel-next-67
-		!<sys-kernel/bliss-initramfs-7.1.0
-		!<sys-kernel/dracut-044-r1
-		)
-	sys-fs/udev-init-scripts
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	# Update paths
-	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
-		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
-		-e "s|/sbin/parted|/usr/sbin/parted|" \
-		-i scripts/common.sh.in
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-
-	# prepare systemd unit and helper script
-	cat "${FILESDIR}/zfs.service.in" | \
-		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
-			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
-		> "${T}/zfs.service" || die
-	cat "${FILESDIR}/zfs-init.sh.in" | \
-		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
-			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
-		> "${T}/zfs-init.sh" || die
-}
-
-src_install() {
-	autotools-utils_src_install
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	exeinto /usr/libexec
-	doexe "${T}/zfs-init.sh"
-	systemd_dounit "${T}/zfs.service"
-}
-
-pkg_postinst() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
-	then
-		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
-		rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
-	fi
-
-	systemd_reenable zfs-zed.service
-	systemd_reenable zfs-import-cache.service
-	systemd_reenable zfs-import-scan.service
-	systemd_reenable zfs-mount.service
-	systemd_reenable zfs-share.service
-	systemd_reenable zfs-import.target
-	systemd_reenable zfs.target
-	systemd_reenable zfs.service
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-0.7.12.ebuild b/sys-fs/zfs/zfs-0.7.12.ebuild
index 286e747e870a..2d1df0a92e3d 100644
--- a/sys-fs/zfs/zfs-0.7.12.ebuild
+++ b/sys-fs/zfs/zfs-0.7.12.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-r3 linux-mod
diff --git a/sys-fs/zfs/zfs-0.7.13.ebuild b/sys-fs/zfs/zfs-0.7.13.ebuild
index a7afd7254aa9..ad1d5dc8326a 100644
--- a/sys-fs/zfs/zfs-0.7.13.ebuild
+++ b/sys-fs/zfs/zfs-0.7.13.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 if [ ${PV} == "9999" ] ; then
 	inherit git-r3 linux-mod
diff --git a/sys-fs/zfs/zfs-0.7.8.ebuild b/sys-fs/zfs/zfs-0.7.8.ebuild
deleted file mode 100644
index 06ecc91c23c3..000000000000
--- a/sys-fs/zfs/zfs-0.7.8.ebuild
+++ /dev/null
@@ -1,212 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	net-libs/libtirpc
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!=sys-apps/grep-2.13*
-	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
-	!sys-fs/zfs-fuse
-	!prefix? ( virtual/udev )
-	test-suite? (
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-		virtual/modutils
-		)
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-boot/grub-2.00-r2:2
-		!<sys-kernel/genkernel-3.5.1.1
-		!<sys-kernel/genkernel-next-67
-		!<sys-kernel/bliss-initramfs-7.1.0
-		!<sys-kernel/dracut-044-r1
-		)
-	sys-fs/udev-init-scripts
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-
-}
-
-src_prepare() {
-	# Update paths
-	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
-		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
-		-e "s|/sbin/parted|/usr/sbin/parted|" \
-		-i scripts/common.sh.in
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-
-	# prepare systemd unit and helper script
-	cat "${FILESDIR}/zfs.service.in" | \
-		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
-			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
-		> "${T}/zfs.service" || die
-	cat "${FILESDIR}/zfs-init.sh.in" | \
-		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
-			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
-		> "${T}/zfs-init.sh" || die
-}
-
-src_install() {
-	autotools-utils_src_install
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	exeinto /usr/libexec
-	doexe "${T}/zfs-init.sh"
-	systemd_dounit "${T}/zfs.service"
-}
-
-pkg_postinst() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
-	then
-		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
-		rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
-	fi
-
-	systemd_reenable zfs-zed.service
-	systemd_reenable zfs-import-cache.service
-	systemd_reenable zfs-import-scan.service
-	systemd_reenable zfs-mount.service
-	systemd_reenable zfs-share.service
-	systemd_reenable zfs-import.target
-	systemd_reenable zfs.target
-	systemd_reenable zfs.service
-
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-0.7.9.ebuild b/sys-fs/zfs/zfs-0.7.9.ebuild
deleted file mode 100644
index 6a84b40cba73..000000000000
--- a/sys-fs/zfs/zfs-0.7.9.ebuild
+++ /dev/null
@@ -1,210 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	AUTOTOOLS_AUTORECONF="1"
-	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="amd64"
-fi
-
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
-
-DESCRIPTION="Userland utilities for ZFS Linux kernel module"
-HOMEPAGE="https://zfsonlinux.org/"
-
-LICENSE="BSD-2 CDDL MIT"
-SLOT="0"
-IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
-RESTRICT="test"
-
-COMMON_DEPEND="
-	net-libs/libtirpc
-	sys-apps/util-linux[static-libs?]
-	sys-libs/zlib[static-libs(+)?]
-	virtual/awk
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
-	!=sys-apps/grep-2.13*
-	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
-	!sys-fs/zfs-fuse
-	!prefix? ( virtual/udev )
-	test-suite? (
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-		virtual/modutils
-		)
-	rootfs? (
-		app-arch/cpio
-		app-misc/pax-utils
-		!<sys-boot/grub-2.00-r2:2
-		!<sys-kernel/genkernel-3.5.1.1
-		!<sys-kernel/genkernel-next-67
-		!<sys-kernel/bliss-initramfs-7.1.0
-		!<sys-kernel/dracut-044-r1
-		)
-	sys-fs/udev-init-scripts
-"
-
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
-
-pkg_setup() {
-	if use kernel_linux && use test-suite; then
-		linux-info_pkg_setup
-		if  ! linux_config_exists; then
-			ewarn "Cannot check the linux kernel configuration."
-		else
-			# recheck that we don't have usblp to collide with libusb
-			if use test-suite; then
-				if linux_chkconfig_present BLK_DEV_LOOP; then
-					eerror "The ZFS test suite requires loop device support enabled."
-					eerror "Please enable it:"
-					eerror "    CONFIG_BLK_DEV_LOOP=y"
-					eerror "in /usr/src/linux/.config or"
-					eerror "    Device Drivers --->"
-					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
-				fi
-			fi
-		fi
-	fi
-}
-
-src_prepare() {
-	# Update paths
-	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
-		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
-		-e "s|/sbin/parted|/usr/sbin/parted|" \
-		-i scripts/common.sh.in
-
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	use custom-cflags || strip-flags
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--sbindir="${EPREFIX}/sbin"
-		--with-config=user
-		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
-		--with-linux="${KV_DIR}"
-		--with-linux-obj="${KV_OUT_DIR}"
-		--with-udevdir="$(get_udevdir)"
-		--with-systemdunitdir="$(systemd_get_systemunitdir)"
-		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
-		$(use_enable debug)
-	)
-	autotools-utils_src_configure
-
-	# prepare systemd unit and helper script
-	cat "${FILESDIR}/zfs.service.in" | \
-		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
-			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
-		> "${T}/zfs.service" || die
-	cat "${FILESDIR}/zfs-init.sh.in" | \
-		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
-			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
-		> "${T}/zfs-init.sh" || die
-}
-
-src_install() {
-	autotools-utils_src_install
-	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-	use test-suite || rm -rf "${ED}usr/share/zfs"
-
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
-	bashcomp_alias zfs zpool
-
-	exeinto /usr/libexec
-	doexe "${T}/zfs-init.sh"
-	systemd_dounit "${T}/zfs.service"
-}
-
-pkg_postinst() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		einfo "Adding ${P} to the module database to ensure that the"
-		einfo "kernel modules and userland utilities stay in sync."
-		update_moduledb
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
-		einfo 'The zfs boot script has been split into the zfs-import,'
-		einfo 'zfs-mount and zfs-share scripts.'
-		einfo
-		einfo 'You had the zfs script in your boot runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the three'
-		einfo 'scripts that replace it have been configured to start.'
-		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
-		einfo 'runlevel while the zfs-share script is in the default runlevel.'
-
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
-	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
-			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
-			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
-			einfo "You should add zfs-share to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
-		einfo 'The downstream OpenRC zed script has replaced by the upstream'
-		einfo 'OpenRC zfs-zed script.'
-		einfo
-		einfo 'You had the zed script in your default runlevel. For your'
-		einfo 'convenience, it has been automatically removed and the zfs-zed'
-		einfo 'script that replaced it has been configured to start.'
-
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
-	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
-			einfo "You should add zfs-zed to the default runlevel."
-	fi
-
-	if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
-	then
-		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
-		rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
-	fi
-
-	systemd_reenable zfs-zed.service
-	systemd_reenable zfs-import-cache.service
-	systemd_reenable zfs-import-scan.service
-	systemd_reenable zfs-mount.service
-	systemd_reenable zfs-share.service
-	systemd_reenable zfs-import.target
-	systemd_reenable zfs.target
-	systemd_reenable zfs.service
-}
-
-pkg_postrm() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
-		remove_moduledb
-	fi
-}
diff --git a/sys-fs/zfs/zfs-0.7.9999.ebuild b/sys-fs/zfs/zfs-0.7.9999.ebuild
index 0adc1213090e..b5d23507354f 100644
--- a/sys-fs/zfs/zfs-0.7.9999.ebuild
+++ b/sys-fs/zfs/zfs-0.7.9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_5,3_6} )
 
 if [[ ${PV} == *"9999" ]] ; then
 	AUTOTOOLS_AUTORECONF="1"
diff --git a/sys-fs/zfs/zfs-0.7.9-r1.ebuild b/sys-fs/zfs/zfs-0.8.0_rc4.ebuild
index 50d9bb9bdc75..aae398b670ba 100644
--- a/sys-fs/zfs/zfs-0.7.9-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.8.0_rc4.ebuild
@@ -1,53 +1,54 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+EAPI=7
 
-AUTOTOOLS_AUTORECONF="1"
-if [ ${PV} == "9999" ] ; then
-	inherit git-r3 linux-mod
-	EGIT_REPO_URI="git://github.com/zfsonlinux/${PN}.git"
-else
-	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz
-		https://dev.gentoo.org/~ryao/dist/${PF}-patches.tar.xz"
-	KEYWORDS="~amd64"
-fi
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
 
-inherit autotools-utils bash-completion-r1 flag-o-matic linux-info python-r1 systemd toolchain-funcs udev
+inherit bash-completion-r1 flag-o-matic linux-info linux-mod distutils-r1 systemd toolchain-funcs udev
 
 DESCRIPTION="Userland utilities for ZFS Linux kernel module"
 HOMEPAGE="https://zfsonlinux.org/"
 
+if [[ ${PV} == "9999" ]] ; then
+	inherit autotools git-r3
+	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
+else
+	MY_P="${PN}-${PV/_rc/-rc}"
+	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/zfs-${PV%_rc*}"
+fi
+
 LICENSE="BSD-2 CDDL MIT"
 SLOT="0"
-IUSE="custom-cflags debug kernel-builtin +rootfs test-suite static-libs"
-RESTRICT="test"
+IUSE="custom-cflags debug kernel-builtin python +rootfs test-suite static-libs"
 
 COMMON_DEPEND="
+	${PYTHON_DEPS}
 	net-libs/libtirpc
 	sys-apps/util-linux[static-libs?]
 	sys-libs/zlib[static-libs(+)?]
 	virtual/awk
+	python? (
+		virtual/python-cffi[${PYTHON_USEDEP}]
+	)
 "
-DEPEND="${COMMON_DEPEND}
+
+BDEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
+	python? (
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
 "
 
 RDEPEND="${COMMON_DEPEND}
 	!=sys-apps/grep-2.13*
-	!kernel-builtin? ( =sys-fs/zfs-kmod-${PV}* )
+	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )
 	!sys-fs/zfs-fuse
 	!prefix? ( virtual/udev )
-	test-suite? (
-		sys-apps/util-linux
-		sys-devel/bc
-		sys-block/parted
-		sys-fs/lsscsi
-		sys-fs/mdadm
-		sys-process/procps
-		virtual/modutils
-		)
+	sys-fs/udev-init-scripts
 	rootfs? (
 		app-arch/cpio
 		app-misc/pax-utils
@@ -56,20 +57,31 @@ RDEPEND="${COMMON_DEPEND}
 		!<sys-kernel/genkernel-next-67
 		!<sys-kernel/bliss-initramfs-7.1.0
 		!<sys-kernel/dracut-044-r1
-		)
-	sys-fs/udev-init-scripts
+	)
+	test-suite? (
+		sys-apps/util-linux
+		sys-devel/bc
+		sys-block/parted
+		sys-fs/lsscsi
+		sys-fs/mdadm
+		sys-process/procps
+		virtual/modutils
+	)
 "
 
-AT_M4DIR="config"
-AUTOTOOLS_IN_SOURCE_BUILD="1"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/bash-completion-sudo.patch" )
 
 pkg_setup() {
 	if use kernel_linux && use test-suite; then
 		linux-info_pkg_setup
+
 		if  ! linux_config_exists; then
 			ewarn "Cannot check the linux kernel configuration."
 		else
-			# recheck that we don't have usblp to collide with libusb
 			if use test-suite; then
 				if linux_chkconfig_present BLK_DEV_LOOP; then
 					eerror "The ZFS test suite requires loop device support enabled."
@@ -78,7 +90,7 @@ pkg_setup() {
 					eerror "in /usr/src/linux/.config or"
 					eerror "    Device Drivers --->"
 					eerror "        Block devices --->"
-					eerror "            [ ] Loopback device support"
+					eerror "            [X] Loopback device support"
 				fi
 			fi
 		fi
@@ -86,27 +98,30 @@ pkg_setup() {
 }
 
 src_prepare() {
-	if [ ${PV} != "9999" ]
-	then
-		# Apply patch set
-		EPATCH_SUFFIX="patch" \
-		EPATCH_FORCE="yes" \
-		epatch "${WORKDIR}/${PF}-patches"
-	fi
+	default
+
+	[[ ${PV} == "9999" ]] && eautoreconf
 
 	# Update paths
 	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
 		-e "s|/usr/bin/scsi-rescan|/usr/sbin/rescan-scsi-bus|" \
 		-e "s|/sbin/parted|/usr/sbin/parted|" \
-		-i scripts/common.sh.in
+		-i scripts/common.sh.in || die
 
-	autotools-utils_src_prepare
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_prepare
+		popd >/dev/null || die
+	fi
 }
 
 src_configure() {
 	use custom-cflags || strip-flags
-	local myeconfargs=(
+
+	local myconf=(
 		--bindir="${EPREFIX}/bin"
+		--enable-systemd
+		--enable-sysvinit
 		--sbindir="${EPREFIX}/sbin"
 		--with-config=user
 		--with-dracutdir="${EPREFIX}/usr/lib/dracut"
@@ -116,43 +131,53 @@ src_configure() {
 		--with-systemdunitdir="$(systemd_get_systemunitdir)"
 		--with-systemdpresetdir="${EPREFIX}/lib/systemd/system-preset"
 		$(use_enable debug)
+		$(use_enable python pyzfs)
 	)
-	autotools-utils_src_configure
-
-	# prepare systemd unit and helper script
-	cat "${FILESDIR}/zfs.service.in" | \
-		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
-			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
-		> "${T}/zfs.service" || die
-	cat "${FILESDIR}/zfs-init.sh.in" | \
-		sed -e "s:@sbindir@:${EPREFIX}/sbin:g" \
-			-e "s:@sysconfdir@:${EPREFIX}/etc:g" \
-		> "${T}/zfs-init.sh" || die
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	default
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_compile
+		popd >/dev/null || die
+	fi
 }
 
 src_install() {
-	autotools-utils_src_install
+	default
+
 	gen_usr_ldscript -a uutil nvpair zpool zfs zfs_core
-	use test-suite || rm -rf "${ED}usr/share/zfs"
 
-	newbashcomp "${FILESDIR}/bash-completion-r1" zfs
+	use test-suite || rm -rf "${ED}/usr/share/zfs"
+
+	dobashcomp contrib/bash_completion.d/zfs
 	bashcomp_alias zfs zpool
 
-	exeinto /usr/libexec
-	doexe "${T}/zfs-init.sh"
-	systemd_dounit "${T}/zfs.service"
+	# strip executable bit from conf.d file
+	fperms 0644 /etc/conf.d/zfs
+
+	if use python; then
+		pushd contrib/pyzfs >/dev/null || die
+		distutils-r1_src_install
+		popd >/dev/null || die
+	fi
+
+	# enforce best available python implementation
+	python_setup
+	python_fix_shebang "${ED}/bin"
 }
 
 pkg_postinst() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
+	if ! use kernel-builtin && [[ ${PV} = "9999" ]]; then
 		einfo "Adding ${P} to the module database to ensure that the"
 		einfo "kernel modules and userland utilities stay in sync."
 		update_moduledb
 	fi
 
-	if [ -e "${EROOT}etc/runlevels/boot/zfs" ]
-	then
+	if [[ -e "${EROOT}/etc/runlevels/boot/zfs" ]]; then
 		einfo 'The zfs boot script has been split into the zfs-import,'
 		einfo 'zfs-mount and zfs-share scripts.'
 		einfo
@@ -162,24 +187,23 @@ pkg_postinst() {
 		einfo 'The zfs-import and zfs-mount scripts have been added to the boot'
 		einfo 'runlevel while the zfs-share script is in the default runlevel.'
 
-		rm "${EROOT}etc/runlevels/boot/zfs"
-		ln -snf "${EROOT}etc/init.d/zfs-import" \
-			"${EROOT}etc/runlevels/boot/zfs-import"
-		ln -snf "${EROOT}etc/init.d/zfs-mount" \
-			"${EROOT}etc/runlevels/boot/zfs-mount"
-		ln -snf "${EROOT}etc/init.d/zfs-share" \
-			"${EROOT}etc/runlevels/default/zfs-share"
+		rm "${EROOT}/etc/runlevels/boot/zfs"
+		ln -snf "${EROOT}/etc/init.d/zfs-import" \
+			"${EROOT}/etc/runlevels/boot/zfs-import"
+		ln -snf "${EROOT}/etc/init.d/zfs-mount" \
+			"${EROOT}/etc/runlevels/boot/zfs-mount"
+		ln -snf "${EROOT}/etc/init.d/zfs-share" \
+			"${EROOT}/etc/runlevels/default/zfs-share"
 	else
-		[ -e "${EROOT}etc/runlevels/boot/zfs-import" ] || \
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-import" ]] || \
 			einfo "You should add zfs-import to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/boot/zfs-mount" ] || \
+		[[ -e "${EROOT}/etc/runlevels/boot/zfs-mount" ]]|| \
 			einfo "You should add zfs-mount to the boot runlevel."
-		[ -e "${EROOT}etc/runlevels/default/zfs-share" ] || \
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-share" ]] || \
 			einfo "You should add zfs-share to the default runlevel."
 	fi
 
-	if [ -e "${EROOT}etc/runlevels/default/zed" ]
-	then
+	if [[ -e "${EROOT}/etc/runlevels/default/zed" ]]; then
 		einfo 'The downstream OpenRC zed script has replaced by the upstream'
 		einfo 'OpenRC zfs-zed script.'
 		einfo
@@ -187,18 +211,17 @@ pkg_postinst() {
 		einfo 'convenience, it has been automatically removed and the zfs-zed'
 		einfo 'script that replaced it has been configured to start.'
 
-		rm "${EROOT}etc/runlevels/boot/zed"
-		ln -snf "${EROOT}etc/init.d/zfs-sed" \
-			"${EROOT}etc/runlevels/default/zfs-zed"
+		rm "${EROOT}/etc/runlevels/boot/zed"
+		ln -snf "${EROOT}/etc/init.d/zfs-zed" \
+			"${EROOT}/etc/runlevels/default/zfs-zed"
 	else
-		[ -e "${EROOT}etc/runlevels/default/zfs-zed" ] || \
+		[[ -e "${EROOT}/etc/runlevels/default/zfs-zed" ]] || \
 			einfo "You should add zfs-zed to the default runlevel."
 	fi
 
-	if [ -e "${EROOT}etc/runlevels/shutdown/zfs-shutdown" ]
-	then
+	if [[ -e "${EROOT}/etc/runlevels/shutdown/zfs-shutdown" ]]; then
 		einfo "The zfs-shutdown script is obsolete. Removing it from runlevel."
-		rm "${EROOT}etc/runlevels/shutdown/zfs-shutdown"
+		rm "${EROOT}/etc/runlevels/shutdown/zfs-shutdown"
 	fi
 
 	systemd_reenable zfs-zed.service
@@ -208,12 +231,10 @@ pkg_postinst() {
 	systemd_reenable zfs-share.service
 	systemd_reenable zfs-import.target
 	systemd_reenable zfs.target
-	systemd_reenable zfs.service
 }
 
 pkg_postrm() {
-	if ! use kernel-builtin && [ ${PV} = "9999" ]
-	then
+	if ! use kernel-builtin && [[ ${PV} == "9999" ]]; then
 		remove_moduledb
 	fi
 }