gentoo resync : 02.06.2019

30 files changed, 195 insertions, 64 deletions

diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index dfaeed86c823..dffb734116c0 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/aufs-util/Manifest b/sys-fs/aufs-util/Manifest
index d088e32cb4ea..c1cffa05e7f7 100644
--- a/sys-fs/aufs-util/Manifest
+++ b/sys-fs/aufs-util/Manifest
@@ -1,5 +1,5 @@
 DIST aufs-util-4.14_p20180709.tar.xz 103724 BLAKE2B 50df13812b090e5d8aa9a07009822f9a324091471243a76c9432ea22698a6167273e661f5ebf176fb3cc419fbe560e82ff73d6e3b37ed0a85a01e6315b06c8ac SHA512 f6330dfc0ddc36102473d9931c62a7f9a5549a3ad2b78ababedf68d335ef02b155a90327dd0c7d446182530db755b9ff756533f90c540bf8aacca5eb117555df
 DIST aufs-util-4.1_p20170130.tar.xz 100144 BLAKE2B d3032feeb787e3864247890c2b77468cb39ac1936cebc7e2044a2a58bd84817401b0cf7ab42413ca2c6307430552b49fb642d45e04c42f2729c0a5f1ccfb1589 SHA512 bf47829bdd93472a318e3eb1fd76332a95a42b3ec39b4d3392baac419ca70bd47b7b0c6209592ad70c284ee997a71e3448e79fa0ad6b4a6db16ffa0c47ed11ca
-EBUILD aufs-util-4.14_p20180709.ebuild 1037 BLAKE2B 81e6529bf6bcdaf2a835e3320f0fe9a066eefe27621686029a8554be9f0597b4d2c2d2fd61dfae34bdd5dddc43ed29707f9fe7dda729bebeecb98928a5be0653 SHA512 e4570de61254349baaa8472987e51548e86631a5443e370869061637017292855e2ae56657f2b04f9d672469f8376717b0eabc09300d155df742288eaf6e9473
+EBUILD aufs-util-4.14_p20180709.ebuild 1078 BLAKE2B d1627bfcac4d66856cff0040f6dec53cdf48d3e5ba8ff6b90b5722ed86b349d83f5200927c3e28bee34427e2b09462d7df076d6adbda8a2e947941d321fb6426 SHA512 d3e970e5b98fec4ccb5750614c25a5ccc27696fd00e2167d6ed1871de0c968c97649cc8c0b02597196e60637efd9a083aed30851f29064397b399274bf01ccb8
 EBUILD aufs-util-4.1_p20170130.ebuild 1020 BLAKE2B e111c9619c4045c0c01d594429cbc0ba048607b0ad1724890c0e3576cf51dbf183837e9fe8f80b2e1388353a5a3d3d108e0e43cacddf9be457e7cbf92e9fc34c SHA512 e568606dcd2d50839433cb5acaa1e41be730f7feadec891541fc1ab7b8fd6a1d59a5b00fe6140a2b8d5604a55bdd8054a98de907109ff1f5992e7e785fff6f33
 MISC metadata.xml 297 BLAKE2B a731cab2c80385c087edc64d31769ae6344ee80a5aee2cd5d8693c398da639f6a79cc124b11b79795e096519a70155ad4b2d3af22d92f8fc3b0f7611eb1c763e SHA512 fdf9bf9558a618fd070f65d91b96b9037498503a4df0d06f1b595a9157c34ddaf3c13de9922f32663fb9499394d8c669fe7957dd213ec8e0ed4e66e3638d837f
diff --git a/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild b/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild
index d68a80251fa5..98b1a6c96eae 100644
--- a/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild
+++ b/sys-fs/aufs-util/aufs-util-4.14_p20180709.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -26,6 +26,7 @@ src_prepare() {
 	sed \
 		-e "/LDFLAGS += -static -s/d" \
 		-e "/CFLAGS/s:-O::g" \
+		-e "s:/usr/lib:/usr/$(get_libdir):g" \
 		-i Makefile || die
 
 	sed \
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index dc2f8c0c2a0c..8cacbbc9be26 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -25,6 +25,6 @@ EBUILD btrfs-progs-4.20.2.ebuild 2853 BLAKE2B e655b6e505031d6e1e304d5d5bba4f0b19
 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-5.1-r1.ebuild 2917 BLAKE2B 62d9f108de66e823ea9468a15d110b8ffb1513ddaa752165282d4630bbd546429ad98394423f36c7d578e11206c65035e3b8dd3434029397df61303ebe926108 SHA512 268b3a8b48c24401650f60f25e559142d10d8fcc0e820e8f94f42a967f206c670fc0e0df5edae6a11ca1272857f706491cf4cab0712b0993d9a72c5262b811cb
-EBUILD btrfs-progs-9999.ebuild 2865 BLAKE2B 49cef92ae8c8f89507dd8d58675a7e6ce64ffe93191dddc0810900027b9f2ac5bb0d83827e6e97f74938396a7bccd1c0592283bc9bbb4b96a28ea4563a56451f SHA512 3f9a677a5394c8a925822467f8e0e49de1246252f65d3bd5b7c4ac713bbca0124478a81bc153c3861d2599adc93b4965c7a7426e4976ff14e98ed3c1a0d2974d
+EBUILD btrfs-progs-5.1-r1.ebuild 3075 BLAKE2B 565c20a00dff58014d6fc76591dffaeff105dfdfea9a951d8b8340be018068f4dc53ee6311e8d6665356b8f5b3fa802dc268b010823bd9b075dc78791182aaea SHA512 a6c2e8a3578916d7a0f515b192fbe75c6d16f16bc7080321496c78899b7e5013db92455aab79c8f55ceb7d170106ca5ce6e6e02d067148e72b781225ae803724
+EBUILD btrfs-progs-9999.ebuild 3023 BLAKE2B 87b24bf878d1d28694dacd151814aa0e00bb092dacd48280a145b456de518b4cdab83a633e10417a78c942bb0bb9caf376032e58e6ffb6e5449c5bc4b5ad233a SHA512 8b3cea0186074f52163f452a4aeef28f8713121d1fca032ebf3c941906b1c5bed53b0513ecce63daedce96403bb9eeda89674ef1344015a547c76dc3c5c09f4b
 MISC metadata.xml 759 BLAKE2B 3f94ebaadb23c54121e8ffa1b80549b9e8a9d977d26ddcfdd8772e549e55fc762fcca5c8e2374a562dd9992086949eff626be71aa6da8326f8847cbc4f791fb7 SHA512 ababf03834be253af5402e167e7883fc73c6ad47198369eba02557e07ec8baaa81140837315e98979dc4b95ca160d2d984e970acdbf0ea4db9c2a9e9deddc9a8
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
index d8977bdf6b94..033e0ad66d1c 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.1-r1.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="https://btrfs.wiki.kernel.org"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python reiserfs static static-libs +zstd"
+IUSE="+convert doc python reiserfs static static-libs +zstd"
 
 RESTRICT=test # tries to mount repared filesystems
 
@@ -63,9 +63,11 @@ DEPEND="${RDEPEND}
 	)
 "
 BDEPEND="
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
+	doc? (
+		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
+		app-text/docbook-xml-dtd:4.5
+		app-text/xmlto
+	)
 "
 
 if [[ ${PV} == 9999 ]]; then
@@ -99,6 +101,7 @@ src_configure() {
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/sbin
 		$(use_enable convert)
+		$(use_enable doc documentation)
 		$(use_enable elibc_glibc backtrace)
 		$(use_enable python)
 		$(use_enable static-libs static)
@@ -120,4 +123,7 @@ src_install() {
 	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
 	newbashcomp btrfs-completion btrfs
 	use python && python_optimize
+
+	# install prebuilt subset of manuals
+	use doc || doman Documentation/*.[58]
 }
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 4076d30d2382..4680b387969c 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -27,7 +27,7 @@ HOMEPAGE="https://btrfs.wiki.kernel.org"
 
 LICENSE="GPL-2"
 SLOT="0/${libbtrfs_soname}"
-IUSE="+convert python reiserfs static static-libs +zstd"
+IUSE="+convert doc python reiserfs static static-libs +zstd"
 
 RESTRICT=test # tries to mount repared filesystems
 
@@ -63,9 +63,11 @@ DEPEND="${RDEPEND}
 	)
 "
 BDEPEND="
-	>=app-text/asciidoc-8.6.0
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
+	doc? (
+		|| ( >=app-text/asciidoc-8.6.0 dev-ruby/asciidoctor )
+		app-text/docbook-xml-dtd:4.5
+		app-text/xmlto
+	)
 "
 
 if [[ ${PV} == 9999 ]]; then
@@ -95,6 +97,7 @@ src_configure() {
 	local myeconfargs=(
 		--bindir="${EPREFIX}"/sbin
 		$(use_enable convert)
+		$(use_enable doc documentation)
 		$(use_enable elibc_glibc backtrace)
 		$(use_enable python)
 		$(use_enable static-libs static)
@@ -116,4 +119,7 @@ src_install() {
 	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
 	newbashcomp btrfs-completion btrfs
 	use python && python_optimize
+
+	# install prebuilt subset of manuals
+	use doc || doman Documentation/*.[58]
 }
diff --git a/sys-fs/cryfs/Manifest b/sys-fs/cryfs/Manifest
index 9beb78ea364f..9d8d7d1c870a 100644
--- a/sys-fs/cryfs/Manifest
+++ b/sys-fs/cryfs/Manifest
@@ -2,6 +2,6 @@ DIST cryfs-0.9.7-spdlog.patch.xz 28204 BLAKE2B 0905971713b2d709aa34bfd11333a0aae
 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 2195 BLAKE2B 59279b53ecd9acd372f6aeed6996ec5d33a20beb5599fbd7119f8f68c5445630e5bd39b5bf736dfb4f69766510897438ebbdf51b64697e26015dffc181f21179 SHA512 27c020e374be8e31072be14de1ce2f27e03466fb46e72e79b621d07ebeff834a729b0d7b1f2d626933ccf42e33dd874902d6b23bd100e5d8ea326429e50ff561
-EBUILD cryfs-0.9.9.ebuild 2418 BLAKE2B fcf9a626b3ece3fe35134677e3801920daf9c3c3a4e2eb2bda4cf1c9ff6be62e90d36d9337634c9ae07afb7f81ab8008b6b60f32a1fb5176e203c73d73aeb612 SHA512 42966adf9eae75f7e64b20bbbe64a5c85dc17a7ce06c29d3d7d2a1599f2f3ef185473822f480b032e752dad9486bfd9b9ea7464293fc89dc043b1975e22500fe
+EBUILD cryfs-0.9.9.ebuild 2417 BLAKE2B 12f97673529667e8896b28f0cb2eb2955566252d1c363dc96a8de5e1a07b99ed79f10f3695fd82afc3894f945397a8fd8c4f8dbd02b5d910987dc6c40e6d309a SHA512 67d73e33975be8d8afe588d9c91da6ac025576c6fb92f08b86b5ae2a55e131c49af6e826de2d453ce77fa6494c232be731cffad2c9050837d04669c62101d41c
 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.9.ebuild b/sys-fs/cryfs/cryfs-0.9.9.ebuild
index 73f1da161ea1..61780cc28cc6 100644
--- a/sys-fs/cryfs/cryfs-0.9.9.ebuild
+++ b/sys-fs/cryfs/cryfs-0.9.9.ebuild
@@ -23,7 +23,7 @@ if [[ "${PV}" == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/cryfs/cryfs"
 else
 	SRC_URI="https://github.com/cryfs/cryfs/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
+	KEYWORDS="amd64 ~arm arm64 x86"
 	S="${WORKDIR}"
 fi
 
diff --git a/sys-fs/dmg2img/Manifest b/sys-fs/dmg2img/Manifest
index fba67b513357..e10243d3b3d7 100644
--- a/sys-fs/dmg2img/Manifest
+++ b/sys-fs/dmg2img/Manifest
@@ -1,5 +1,5 @@
 AUX dmg2img-1.6.7-openssl11.patch 7080 BLAKE2B 9815c1c0b3c23f2dae7da65e380ee4a2f2c460ddfa1c5e8e153c2b5b1213139d2052957b40f9c15042b750ed2c7318c36acc6de470b9da66a93550eb913964f4 SHA512 1addd0d349ad21c0fae423fe558583d9457aa2bcdf4f8fe16d408e703437faaa5b1324f38dfb66e9f3d811e89181fc0378978ffc852e87675fde0e416fccb136
 DIST dmg2img-1.6.7.tar.gz 23238 BLAKE2B d4dc8da2974bc296e8aba21de816413df797322c6194e4ece3d0900d64fcd33084b29be6172a45bdc3f515c2e10544f107be2c7f0e6b7d247cf5d6bc5ad03e2f SHA512 4c42841c5cdbf868b6038648a6c83e78d4b7f2010f7065d7b3f4c2c04d13af9489716c1dfa867aff5f3c3b3eef96dc3fc0610eff13fec139265f37f468e339e6
-EBUILD dmg2img-1.6.7-r1.ebuild 771 BLAKE2B 66d01106cc1ed84588b87e5b33e44cd8c2a8e6b8e60d5c3af589adbe14ebbd904d5dc2d5179781bcb27d798bda27a593171ad51cbc286ff5eb0762be00e355a3 SHA512 4d482e934e2ae1ae7fdba331bb7e80798eb8f7ce08a01b7830ce73a4c4b0345dbdf8a059f909c949f913baffbf9d16a3315dc78cbde7441cc04c56ba5c48c829
+EBUILD dmg2img-1.6.7-r1.ebuild 778 BLAKE2B 6fb3b1ecfa7ee62561a77587af81390e7559ecb22277f6c81126eebaa7d4599040a8658d5cf08ae3ce2484aa15482f0b6809451e4782ef944e5df7ec5f919ed1 SHA512 917f22b817dfb33419d4144c5b56924fcdfa5d7528d9a6d626f82e84fe5cf644dd233bce235f9286e6f37bc231dadff4f3ff0ed65b8f557d373ea251cd5fd489
 EBUILD dmg2img-1.6.7.ebuild 663 BLAKE2B 27da57b4e2e2c63c00352e665853af8fb8def684229348d9492c8bb32e57b52f14df37983737ff65e0b120061509baba3fe8d5eac6a5042501e77d29cce81c1e SHA512 ed1bff42a9b43b941685e88d03144743a20ce5ef00720eff5d0ee2159185dda5101ef40b1755e8ee9c7bb0c0ab727b00ca14eb95290fc3b5ea25856c97895f8d
 MISC metadata.xml 446 BLAKE2B 3600c0ef451adcf401547ce76a13372182ea3c40c8670ace741f8a342dfc9cc3be3a6910a5e93883e3d77b55709ac996d8a1380724fae8da5f02efbdea637da0 SHA512 412c28e15abe2581fa29247d58b239a140171b018bcdfd5b437cb1991239eff33ce4bee9ecb14dada6bf74105f13ae230dc6dc46e1906952b81cb7491d3e9449
diff --git a/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild b/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild
index 93c306ff1a8e..95ea794b2742 100644
--- a/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild
+++ b/sys-fs/dmg2img/dmg2img-1.6.7-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://vu1tur.eu.org/tools/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="libressl"
 
 RDEPEND="app-arch/bzip2
diff --git a/sys-fs/e2fsprogs/Manifest b/sys-fs/e2fsprogs/Manifest
index 0b63fbb56990..ccadd43aa2e6 100644
--- a/sys-fs/e2fsprogs/Manifest
+++ b/sys-fs/e2fsprogs/Manifest
@@ -9,10 +9,10 @@ AUX fsck_ext2fs.c 2793 BLAKE2B 65294fc9026bdb859a58d010f885fdbee2db4372a81b82ffa
 DIST e2fsprogs-1.42.9-mint-r1.patch.xz 9012 BLAKE2B ae6421587c3cca2f9b26805c5f8d236d3fecde78cc7df3776ae9c23c7f254d7240e06507568fdd2154a16113c47609a8143535ab9cb2925426d3c578d077ce26 SHA512 591a7c80d65082eebcdc455028be6ade05c9aae96c94f654106be0facef330a8875dae82891e6e3ad2b48dece2b4e1c1940dbc47cd3eba3e6eea3b5ddba9a8fc
 DIST e2fsprogs-1.44.5.tar.xz 5375996 BLAKE2B a6069e7c4889cdd3a30d94994d179c024edf098205012446677c76ed206f18e71a0f241527ac33ee35eebdfa8fe87a81dde5228694186fc4e1e55e5b7bc87862 SHA512 c0faec90b2be81460d374c150be917cd6beb1d10dc7cd0c6c4747de19de9af1763e90d48aec5b3c0fbff1b59bf79a35f93536cd52e68d1e45d4db610e158bb2e
 DIST e2fsprogs-1.44.6.tar.xz 5378560 BLAKE2B 1430e87fbfc81cf299c3b577c46309e2ca2ff5a8de7121a9aab7a8ea49693fd1053f3f034c4f9105b2cc0c3395b7887d3284493c9105287c4f03deebc237ace5 SHA512 725ff908148b55d9417aa9e01f514feb434c43441f7104c61d200fcdf6b30b528f62475bdffc9e1c49d3d44e1e3f2cc1e9df60025c8e3d113d6edabfccf356bf
-DIST e2fsprogs-1.45.0.tar.xz 5520532 BLAKE2B de7c27b90e68e822a8157e99d103933d98afe094765016a58dbdce4d5bebda86493c94dbf3bd009aa25063edf34a0c8229cbc1045f1041a357448619aee55de8 SHA512 208f0508dd355f29f9428758123e84d7f73d1a0bba4fcdc5abb561dc492ed1ab7e36ce369acde5c26e9efff0b980d75047d2d5910d3e49614cc68ec770dc9014
 DIST e2fsprogs-1.45.1.tar.xz 5507236 BLAKE2B d454f0228df2079edd3b7f8ad406417ee48cacb5b62fc1c869eff21b35dafc9bbc4ffd80e6040629a8da1edac230beb3981bc43eb12b6feecf4225a9b9f335e6 SHA512 2e8974d30e92d7f194ccad7f152b495d2a6e41328b1532351f13af27ceaef5ee01d52963e17801cc7317f7b5208791bd20c9028f15a9859225f0e64d175be779
+DIST e2fsprogs-1.45.2.tar.xz 5560504 BLAKE2B c7764eb7fd67c422007cf2d884496babf78663ce6dab674fb023738b69e270c601dded89fc65fe4e7e1853cf8234772bfc2e28a1189b8dfd3f9e6fa34677f664 SHA512 50fdb7769c789fb143b2e4bd56e6b55eac8f84be5b7074008134fa56d980342c2307e62380f9ba6a8ab9bbc6bbf45b349aad540c8f239cf859706fd33e521e5e
 EBUILD e2fsprogs-1.44.5.ebuild 3915 BLAKE2B 910133a809c3d28f21623a38b1aa4a5ec162298e32360db7cfa8e7a345bb440c0208e47fecc9a57a56eccaf59d2ff0699cf793167cdbb4c59b92acae00199d3f SHA512 bb486fadb929ffe64df5066d3bb5c1a96e604ad17f164ddd06956ca35cfcb2f0283a4e1161ebe4ae5a5aecea5db927a3a48d6215aa24373d91508d05b517f15a
 EBUILD e2fsprogs-1.44.6.ebuild 3863 BLAKE2B 57d1ab60969ce206b11aae22c1c5f214bcdac17a9e741829cc5b3ac105919e68a736f9f2f5263d037965e63a692263b58e5615ce6c14a0c3dd16710d2299bd80 SHA512 ef1981716a3f7495ea68ff8ff2800549f51390eb3f1d9ef037f141fa1e2fbc2bdcc945277456d453dae40e5fea6b092100526cfc8cd750128ebf45920075c149
-EBUILD e2fsprogs-1.45.0-r1.ebuild 4037 BLAKE2B 9003905aa14158acfa765ec97c0865f11248d46c138eda355bde393e1540afad7104dc04d57ea68d70a245bf34a7579871bd204661ef8ef5bbf05ba8f002ae12 SHA512 2d076c6de2451d604629a6bf9b70bb98de5d4ce64116cf2a726f673c0e9c42aa62ea4032c7871caedafc71ae9ebc877826ab7a7d590928aaa90ee81cca25e2dc
 EBUILD e2fsprogs-1.45.1-r1.ebuild 4094 BLAKE2B 1ed574459a9121ee18c9963d9311b320b0e37838167223f94d27b35b6093e4dea10f9fe6c931cbf1628d6908e5d9e9f3146a4e1c341c1cd2982f7c8ed874d92d SHA512 adc9340b6eec174d8a3d481581e1a5db9c051bda3e25c3aef3d0ddbb24da6c76eadbbd5c698bda4bfe613011cd7549457bd1a4435b70018b04f30c4d1c0a0665
+EBUILD e2fsprogs-1.45.2.ebuild 4094 BLAKE2B 1ed574459a9121ee18c9963d9311b320b0e37838167223f94d27b35b6093e4dea10f9fe6c931cbf1628d6908e5d9e9f3146a4e1c341c1cd2982f7c8ed874d92d SHA512 adc9340b6eec174d8a3d481581e1a5db9c051bda3e25c3aef3d0ddbb24da6c76eadbbd5c698bda4bfe613011cd7549457bd1a4435b70018b04f30c4d1c0a0665
 MISC metadata.xml 578 BLAKE2B 08094a62570e432f1ed7370d2eb402523f17e7cea8ca1370302b602de949e812e6d277a280be23d0a0f515b6b39ee18d974b1ef0d008d2267fcc4e7bb41ff3d9 SHA512 094625d323bca75af0884ee4d2c1503437a50aa1a323c52e054b49edf890afc0b20f936b2833c82e944b58615996b76e7fc2a502aa87b3c66a385e7698d2d6cf
diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.45.0-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild
index c87cb951ed5a..c0ce32929e1b 100644
--- a/sys-fs/e2fsprogs/e2fsprogs-1.45.0-r1.ebuild
+++ b/sys-fs/e2fsprogs/e2fsprogs-1.45.2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
 inherit flag-o-matic systemd toolchain-funcs udev
 
@@ -14,16 +14,19 @@ SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.xz
 LICENSE="GPL-2 BSD"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 -x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint"
-IUSE="fuse nls static-libs elibc_FreeBSD"
+IUSE="cron fuse nls static-libs elibc_FreeBSD"
 
 RDEPEND="~sys-libs/${PN}-libs-${PV}
 	>=sys-apps/util-linux-2.16
+	cron? ( sys-fs/lvm2[-device-mapper-only(-)] )
 	fuse? ( sys-fs/fuse:0 )
 	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
 	nls? ( sys-devel/gettext )
 	virtual/pkgconfig
-	sys-apps/texinfo"
+	sys-apps/texinfo
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.44.6-parallel_install.patch
@@ -69,10 +72,10 @@ src_configure() {
 	append-cppflags -D_GNU_SOURCE
 
 	local myeconfargs=(
-		--with-root-prefix="${EPREFIX%/}/"
-		--with-crond-dir="${EPREFIX%/}/etc/cron.d"
+		--with-root-prefix="${EPREFIX}"
+		$(use_with cron crond-dir "${EPREFIX}/etc/cron.d")
 		--with-systemd-unit-dir="$(systemd_get_systemunitdir)"
-		--with-udev-rules-dir="${EPREFIX%/}$(get_udevdir)/rules.d"
+		--with-udev-rules-dir="${EPREFIX}$(get_udevdir)/rules.d"
 		--enable-symlink-install
 		--enable-elf-shlibs
 		$(tc-has-tls || echo --disable-tls)
@@ -109,8 +112,8 @@ src_install() {
 	# econf above (i.e. multilib) will screw up the default #276465
 	emake \
 		STRIP=: \
-		root_libdir="${EPREFIX%/}/usr/$(get_libdir)" \
-		DESTDIR="${D%/}" \
+		root_libdir="${EPREFIX}/usr/$(get_libdir)" \
+		DESTDIR="${D}" \
 		install install-libs
 
 	einstalldocs
@@ -135,7 +138,7 @@ src_install() {
 
 		# filefrag is linux only
 		rm \
-			"${ED%/}"/usr/sbin/filefrag \
-			"${ED%/}"/usr/share/man/man8/filefrag.8 || die
+			"${ED}"/usr/sbin/filefrag \
+			"${ED}"/usr/share/man/man8/filefrag.8 || die
 	fi
 }
diff --git a/sys-fs/fuse/Manifest b/sys-fs/fuse/Manifest
index cb57d37111ef..0044050200eb 100644
--- a/sys-fs/fuse/Manifest
+++ b/sys-fs/fuse/Manifest
@@ -9,8 +9,8 @@ DIST fuse-3.4.2.tar.xz 1019864 BLAKE2B babb8454438b5c4a924e83112ee5c319c0fa37c54
 DIST fuse-3.5.0.tar.xz 1021676 BLAKE2B 9e2ec6b5df75c3427ad99ca30f5c88cb1e2291ac05d005280f6a9b121abf978990e7ee84df83b8d866cc996b8fda7e99fdc626d1a24347472aacbfa2531182fe SHA512 953066a25ab2f67fd5a1f15e97f8d739271c42a6260aa29ccc7b9ffddb9c972d2797d93d9ff0d34c6b51a20f3254ef6f748c14f852603280b318b36899867a27
 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 1657 BLAKE2B 7b51b31552b827d810c9ebbef25711049de95f9967dbe112ef1dc70aa56617cf7771dd44cd5aad917030288f2e68169d0abfd3e8673a49604d5f19ff590e7c99 SHA512 58c53a644bc8a70cbc4cfe6afd039d8e747f70bd0231274400d7d46d71eba15a07620564ca7094dd94228b9c9c9e01f59c2968e13117ce2227d630fc92680704
-EBUILD fuse-3.4.2.ebuild 1651 BLAKE2B a2f92916463994570422db3ac73c26363ee6551c9385e51f73d666c3a8fa5eaf762cc3bc4f0edcd37f74eebbf8511c2f19f9a1d66738fe9f581cfc5abb5e7f84 SHA512 94415c24288b1c08d44c220f8fd5fdf28631201941ef9c046a5e21784fda025ede2659c33b2846d1537dec1b9d0f389acb9cf1a4fe81af0ed494b5abe15b36ea
-EBUILD fuse-3.5.0.ebuild 1651 BLAKE2B a2f92916463994570422db3ac73c26363ee6551c9385e51f73d666c3a8fa5eaf762cc3bc4f0edcd37f74eebbf8511c2f19f9a1d66738fe9f581cfc5abb5e7f84 SHA512 94415c24288b1c08d44c220f8fd5fdf28631201941ef9c046a5e21784fda025ede2659c33b2846d1537dec1b9d0f389acb9cf1a4fe81af0ed494b5abe15b36ea
+EBUILD fuse-2.9.9.ebuild 1882 BLAKE2B 4f789ad332f80dbd3c012aeb7286e2d0615717f2afc8dd7078c0148f607cdf4fbac5fd1c515d7c49c189f2eb7e1ec9a79a1e2a25b9ded1a4e79e5e705772912e SHA512 834caa3c39f615fa440688c8bad60b725358ba9c3ac88fbabceeaa86f0027b2a6cea3bc563435cd430adda5f16e76efa86fff46b8ecfbe025ebbd33940a098eb
+EBUILD fuse-3.4.1.ebuild 1656 BLAKE2B 6e556878bce6e6851104a52b29ed2f63306daa675af9bf6eab4d27140f0b9f81ac51c8a3ceeeea45d572b98a2354fe8ce3568a0116c52f7e9f8bab3614d0b267 SHA512 6b093f0fba44af3e4dbfaf0d3ca6f9ca106b669706b91c94c563cbe613fe625bed7ae471ac68cfe8742e0d9e64567a7affd7a9762fc6032981011bce7c38754b
+EBUILD fuse-3.4.2.ebuild 1650 BLAKE2B 04d6572ea92e27205a216f2be84af3dfbdff0d05940df5691a2f889617806134f39165ec570c40c9cf8a930bc078aaeec9ee404e8edb27db230a90c247cd1df9 SHA512 b4b19fade4bddfc3a9d4e6c778af0eb7aecc5e928dce7e9f6513b2ed9650691626e81c05ee1f07ef60f16ba27d3035147e0c0c1eda3387118ee03f901d718a26
+EBUILD fuse-3.5.0.ebuild 1650 BLAKE2B 04d6572ea92e27205a216f2be84af3dfbdff0d05940df5691a2f889617806134f39165ec570c40c9cf8a930bc078aaeec9ee404e8edb27db230a90c247cd1df9 SHA512 b4b19fade4bddfc3a9d4e6c778af0eb7aecc5e928dce7e9f6513b2ed9650691626e81c05ee1f07ef60f16ba27d3035147e0c0c1eda3387118ee03f901d718a26
 MISC metadata.xml 391 BLAKE2B 69aa72b5ba983496e0b682bcde7d61b33d982031e1c5ca1f4b0181384daeff3a47482fc23e68ae9097321dfa5a0203abc60de4fae5aa99c7e32542e9b8e59f0a SHA512 181d574140e8459c76d7392cf63eec85e1b40142b31b9ac1a19bf657c8482b581c1ea23fdae6a523bbad4943e3245409dfc14eea38243b78ef541e3cad49a180
diff --git a/sys-fs/fuse/fuse-2.9.9.ebuild b/sys-fs/fuse/fuse-2.9.9.ebuild
index e36b63cd9381..c2933b58a93e 100644
--- a/sys-fs/fuse/fuse-2.9.9.ebuild
+++ b/sys-fs/fuse/fuse-2.9.9.ebuild
@@ -67,5 +67,5 @@ src_install() {
 	rm -r "${ED}"/{etc,$(get_udevdir)} || die
 
 	# handled by the device manager
-	rm -r "${ED}"/dev || die
+	rm -r "${D}"/dev || die
 }
diff --git a/sys-fs/fuse/fuse-3.4.1.ebuild b/sys-fs/fuse/fuse-3.4.1.ebuild
index dddc7c719957..f4468b461435 100644
--- a/sys-fs/fuse/fuse-3.4.1.ebuild
+++ b/sys-fs/fuse/fuse-3.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -65,7 +65,7 @@ multilib_src_install_all() {
 	rm -r "${ED%/}"/{etc,$(get_udevdir)} || die
 
 	# handled by the device manager
-	rm -r "${ED%/}"/dev || die
+	rm -r "${D%/}"/dev || die
 
 	# manually install man pages to respect compression
 	rm -r "${ED%/}"/usr/share/man || die
diff --git a/sys-fs/fuse/fuse-3.4.2.ebuild b/sys-fs/fuse/fuse-3.4.2.ebuild
index 80ef87425176..36c655c869a1 100644
--- a/sys-fs/fuse/fuse-3.4.2.ebuild
+++ b/sys-fs/fuse/fuse-3.4.2.ebuild
@@ -65,7 +65,7 @@ multilib_src_install_all() {
 	rm -r "${ED}"/{etc,$(get_udevdir)} || die
 
 	# handled by the device manager
-	rm -r "${ED}"/dev || die
+	rm -r "${D}"/dev || die
 
 	# manually install man pages to respect compression
 	rm -r "${ED}"/usr/share/man || die
diff --git a/sys-fs/fuse/fuse-3.5.0.ebuild b/sys-fs/fuse/fuse-3.5.0.ebuild
index 80ef87425176..36c655c869a1 100644
--- a/sys-fs/fuse/fuse-3.5.0.ebuild
+++ b/sys-fs/fuse/fuse-3.5.0.ebuild
@@ -65,7 +65,7 @@ multilib_src_install_all() {
 	rm -r "${ED}"/{etc,$(get_udevdir)} || die
 
 	# handled by the device manager
-	rm -r "${ED}"/dev || die
+	rm -r "${D}"/dev || die
 
 	# manually install man pages to respect compression
 	rm -r "${ED}"/usr/share/man || die
diff --git a/sys-fs/udisks/Manifest b/sys-fs/udisks/Manifest
index f2443afbf57d..7ed5251f824b 100644
--- a/sys-fs/udisks/Manifest
+++ b/sys-fs/udisks/Manifest
@@ -8,6 +8,6 @@ DIST udisks-2.8.1.tar.bz2 1354879 BLAKE2B c2e5fc11dc29d43c6ff2cfb048c8f5540e72ea
 DIST udisks-2.8.2.tar.bz2 1589149 BLAKE2B eaa9d95e175bbdd4255c627a0dcd93ff6f0a3660134d2117551c2d61298733570409481393ceeafc92ff26b74277b3a754b70d9359ed402c19d73fea2f39ec04 SHA512 dc0087ed2d3ab71dc66f63f868a6e2cd0e4e7578c40b2240739cecaffd6f50f5a2cecfc7ef7df9304e291d84ab12f59a940b9fb42b34a5a60d12061e6aaffc1a
 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.1.ebuild 3233 BLAKE2B 2e6032785c926aec9cd36a2e12e7984825a44190b72d0c76edf60abf9903d04f005a94b258eaac299fa310ba7f801de45ca1cd194e5cf194cf7752cfdbd21f02 SHA512 00a2ad198df800bcc4e2faa99d98d80a3cbccd8d9b63071ec07d49dcf0e85d5e5bc14a36de73ac20ff20cddab21c82f38ee4f422f0d0f6e500d6bc51f4e9aee6
 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-2.8.1.ebuild b/sys-fs/udisks/udisks-2.8.1.ebuild
index ad43058e4b97..39172881d7dc 100644
--- a/sys-fs/udisks/udisks-2.8.1.ebuild
+++ b/sys-fs/udisks/udisks-2.8.1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="https://github.com/storaged-project/udisks/releases/download/${P}/${P}.
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="alpha amd64 arm ~arm64 ~ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE="acl debug elogind +introspection lvm nls selinux systemd vdo"
 
 REQUIRED_USE="?? ( elogind systemd )"
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index c445fc464d91..2d703f818c6f 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,5 +1,5 @@
 DIST vhba-module-20190302.tar.bz2 15708 BLAKE2B 4a6f1f22e893597e50e78fa06e1296079b600ad6b2cf7b319267ef44d1ff07795f2aca22541993a7fc57d15550297e71046ce4147226d0731aa2b4d691dd5299 SHA512 6df59112b9b0597ce98de85744acd8158dbc015841740649fa3538fec32f1d7cbf4e489062998cc13dc85a1b3558bcffc2ea65285e17ee5b3f1c0a7d49cd6a38
 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
+EBUILD vhba-20190410.ebuild 2147 BLAKE2B a066190d6867675253e387a2d6d03356f6c601c049b0d8cf797736c208e0302ce2e84bfc71c8cae293cb53eec29107e34fce7ecc942c7d8a680cf794bfcecc2b SHA512 ccf087347d20f672e458b5413c49161f72a43984b1ecaf8d78586a88251f5d59ba385d7af588908bd9db3fcfd9ae3c43939518e314e167df67556f1e45ed8b37
 MISC metadata.xml 332 BLAKE2B 0be8fdf09b872003fbd913a72966a059ad2d0870b281e6b86b19cf52f8c32b113d392dd71c85281f2f1abcb0933b592fb2112c18fe70359af7c7aacc9ff3a011 SHA512 d8bf249636b4dfda07c67e935bdd4b7392543fe31e2bf8c153954f4d680db45b0090f9bd89399f0241554a311b604185737c2bb7e64df43ea25adda9ee7468a0
diff --git a/sys-fs/vhba/vhba-20190410.ebuild b/sys-fs/vhba/vhba-20190410.ebuild
index 8969ab8b663f..cb0c86737164 100644
--- a/sys-fs/vhba/vhba-20190410.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/xwmfs/Manifest b/sys-fs/xwmfs/Manifest
index 166f2919cacd..caadc5d5dbf6 100644
--- a/sys-fs/xwmfs/Manifest
+++ b/sys-fs/xwmfs/Manifest
@@ -1,3 +1,3 @@
-DIST xwmfs-0.82.tar.gz 193014 BLAKE2B 2e12ceb4fa1340e05342fccd0cb8978caa38525c59d646633aa32965a4d32efb9fecc4ef0ab0ed72ad57eb07ea821048a629943cbc3bde8d46f32ee1357bcdf0 SHA512 bcf0994a9f1c8dd9d22a4d41b074e406c7ded1e8b179155c6cd7272ad9720e3837b6aad1c70fb732848ded6f8c48261f30b6674ee8584fd1cae9325e6c25379d
-EBUILD xwmfs-0.82-r1.ebuild 616 BLAKE2B b8f9c0892fff04af35eee88faa38bef4efd38d0c1f6dad0e4aaa5cbe58a7a31debd2c6bc57a42ec0c06cdab7a97fc967091596c1b6b152b517bf2b8164364eff SHA512 ffd312368d74a46462937d1f75540046bee94d9c19708ebbd46695fdaa1fd86265a57f457b39f9c0b544239fcd7fdc491891e61f5f995b4fa2aeda3f16979e36
+DIST xwmfs-0.83.tar.gz 193702 BLAKE2B 14319cc47b28f8ca7e0d8f18878d30c8c48eac8d1ef2238d82a18c59f6c4d3a4a11dc435627102b4fe1d41cc27201a59c9c9d04a73bede05996f053c5af08d03 SHA512 eeabf41d537cab53a34fe3b685a0d7bda8ff690bddd7d38271df71cb7638b045c8b1156fbb3a19220362590abb7a5808085bec30ce1652c9ba06c9af886cfdcc
+EBUILD xwmfs-0.83.ebuild 616 BLAKE2B 56b90a826fa615d12546db28010490abd1ba9a8cc12bd558f554729b3d1812d818b5024982a82ceea5f5bccadd75d5e1ab03d909e3cb6a7d72f7c4000257a59d SHA512 9b78eb2777f219aebdef3916fd643d17006f5b99fd33260f3b2a19dcc4a43113ff0da23da5995b913ac53e7f9be1bdd0dc88241ff16e0faa007233b1577e1c8b
 MISC metadata.xml 1393 BLAKE2B f9f7389edcc5535cddf0e0c34ebacc0272b57e65c42ad76c2930534913e12d90c3a06dae5dda49fef8e14935b5376576bf1bc2118c528535c289cf436573457c SHA512 143ed4a1f942d55be296a6b909d56d853e7b27a9710f9d4248bd7102a47a49b804f3687abc2d508209889b12cbfcfdd07f8bdba94883858f1605e59964675951
diff --git a/sys-fs/xwmfs/xwmfs-0.82-r1.ebuild b/sys-fs/xwmfs/xwmfs-0.83.ebuild
index 0a3213274d9f..b64c09fda99b 100644
--- a/sys-fs/xwmfs/xwmfs-0.82-r1.ebuild
+++ b/sys-fs/xwmfs/xwmfs-0.83.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest
index 645fb4a3066e..587a484cb1c9 100644
--- a/sys-fs/zfs-kmod/Manifest
+++ b/sys-fs/zfs-kmod/Manifest
@@ -1,11 +1,13 @@
+AUX 0.8.0_Fix_integer_overflow_in_get_next_chunk.patch 1223 BLAKE2B d2286ad668d7ee1a80dfc01972cb33d12a189087100dd8f52814fd31475f40624501d0a4e026c8eb2acffac9ccbbca941c0d2edd7b32138f6c2b5682e5d32074 SHA512 89126799f50da5482b13c0b23bf156f06341970d201e19022fe9b067ab955100b91f2775928349f97a03d6d078b3d2ac1f83cd456e172bee8bd2642e9f74a86b
+AUX 0.8.0_revert_Report_holes.patch 1344 BLAKE2B 1dfab8f711a821932b213060c8f327406901fa86c5fcab3fc75f7f61d753d506fa75f99b62c3284a2baaa6d3a4efe093db19eed94783aed964b08cd4ed1b757d SHA512 d529fbbbae351cf45dce263ae342aaa5a37f3ce742292b387c39dc0ed378c7ab8d1bb1e302f355adae62ea48074f4bcac14071378e1d365fd4141dd51fff3d41
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
 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.8.0-rc5.tar.gz 8994022 BLAKE2B f29b9f6d264bbd04553f6855fbdf039808903eb02989e06082d9db8494723e611736db753fa4d27443527fbac189c1ee282ac89fdf799f6182ae428e178d0d10 SHA512 e54a3f9c7947baf619d737a832a545609bc03774a53f9a65147b8c23d9fb5148400a33d99216205a3e45821f8300108882c4eab9995778611775035441428551
+DIST zfs-0.8.0.tar.gz 9084737 BLAKE2B c3095ca07b7c36fa204274be1166fd244894de70b97a11da32606b08e9bb150bc1326ac8424d5c001eb33d2d94e214d3944ddfce885844885c55291a82f11a2f SHA512 ba29f1644ec6807f4cad574e4950e56026316c3d405c9fc40a63ab34c2400d508521b09f656ac97898e5feaca5e0b259d9d4d85f75a4b1782a9db13d3b14cdc6
 EBUILD zfs-kmod-0.6.5.11.ebuild 4086 BLAKE2B 77042a670913df7a0fbb47e594028d56f6733827192b68ae13b0c52598bf728550b59ef0c850d1498e265765552ba3e6f1e4ea6dd8d8608af3fb994de375135b SHA512 efbc887b8f613a94af230916dd0c6ddbf9fcf29a73d4bfeda19680eb514ad12f75cc75d45f8d01fa56cf909e34e518ec5a91bf70310370dd3cc7db7ab7aa72ef
 EBUILD zfs-kmod-0.7.12.ebuild 4072 BLAKE2B bd174bbce39a1634c40ba20c26066e15c660b18382f6c2c7ada46759fa19339e39e2490e209f319cf80041151c074aaeb86c456441fdf814e46a6a3a37c2316f SHA512 1a52bec71a66de3cb79ab32e68b95ae6a0590a8acb715e4a025516840d8a21252e524a25044897661c2977217a6ec7bbc6da1e60846dcf414f97324bbc564ee2
 EBUILD zfs-kmod-0.7.13.ebuild 4119 BLAKE2B f8d921251bc94644a7331762054935518bb9fb68425b404572876466bff118b9ae20cf297f34d9267c933d7ea28840c84fe8e4a867e9a9f191b627f29207798b SHA512 8e4eb43e5b4edd7dcb8b0ecb13a809340ee20247017e7cb141b8489dc4c9988b84b40e866028e8d3b73aea69981a923e4fc4b237389115fb8e72d8b6ed450340
 EBUILD zfs-kmod-0.7.9999.ebuild 4131 BLAKE2B 10f0553102967537d42f5b2da8ede7c8894ca9134a1421efadd1db538b3381d588fe6729dc37c84ab025212ca01a74c2e60768fe8f7808acbd21f0179b2a9abb SHA512 ad59815b9e2ce844e6caa5232d1e4f17c70b930b8295a28e44f37b8293c602fb8b98f939bb1ea22cef68c8e724de6a581b09073d41fd7a14aa181a0cadb6250c
-EBUILD zfs-kmod-0.8.0_rc5.ebuild 4292 BLAKE2B bb740f7b6eda3a3f2c12dbe672436a50b407d5363d6244eb5d0d507ebe7f4f02fab6fe4da0954955572d9afa55b7be39de6b56d225b5a4be35da004e46591503 SHA512 d1cd8ed3be7ff20b25927fc417038deea66ab283ce69c4782d64822787d0a17a57c70cec6f9577387959098f32aa962e2ccd1c9cb3c10ad977adefcb1847ba5e
+EBUILD zfs-kmod-0.8.0-r1.ebuild 4455 BLAKE2B a46c12e4547b5ad0564cd43fd63af6f646ab21f4cb7ec581a09c3c91bef6901321f10b92c4048de072ed6a3bdfcb36827c2189a04e63f86a4e9243adddb457ee SHA512 9ad94fff5362229432c5d817dfea53a9e17311d7caa7e6b6966de906b1020e393d841ffc277ec4a40d7e9b4a961c80bcfd8a5467557a6a5f69db61d9b2952421
 EBUILD zfs-kmod-9999.ebuild 4328 BLAKE2B b7304dd03f2a189b434837b337a8ae7a46b4b3b823880542bd4751496bd2f63e0976652402266552e822b073a8ea262b8bbbf03ef79a15c0b56da8e840aab63e SHA512 30c91bb159521bfa37b7bed7cf4c25c0415b9f302fbf0aaad6494a1039d1928fd6e8c154ab461ffbe911d53b8f2c60da13bbdba8656cae691149a1f84354d56e
 MISC metadata.xml 551 BLAKE2B c8dc35c8f884d3f5d8720ad838c34ae5be7dc3b3cc63ab7713330a5611bca2829942eeb640b7e00ef285af9b52dd2d134cd793a20baeecff2af56f6b60116e21 SHA512 1cfd4a6a6ec4a120c8e02d3dde831b1f73294a06b798388ff8d4e761ef986e625a56fa980f8d412fab082630f58932116cf795bc5e5728c6485dd9ad54e22a7a
diff --git a/sys-fs/zfs-kmod/files/0.8.0_Fix_integer_overflow_in_get_next_chunk.patch b/sys-fs/zfs-kmod/files/0.8.0_Fix_integer_overflow_in_get_next_chunk.patch
new file mode 100644
index 000000000000..0042bfdc99c4
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/0.8.0_Fix_integer_overflow_in_get_next_chunk.patch
@@ -0,0 +1,32 @@
+From ec4afd27f198d93a7bd32a05cb288708ba754ada Mon Sep 17 00:00:00 2001
+From: madz <olivier.mazouffre@ims-bordeaux.fr>
+Date: Wed, 29 May 2019 19:17:25 +0200
+Subject: [PATCH] Fix integer overflow in get_next_chunk()
+
+dn->dn_datablksz type is uint32_t and need to be casted to uint64_t
+to avoid an overflow when the record size is greater than 4 MiB.
+
+Reviewed-by: Tom Caputi <tcaputi@datto.com>
+Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
+Signed-off-by: Olivier Mazouffre <olivier.mazouffre@ims-bordeaux.fr>
+Closes #8778
+Closes #8797
+---
+ module/zfs/dmu.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/module/zfs/dmu.c b/module/zfs/dmu.c
+index 1697a632078..a283b062238 100644
+--- a/module/zfs/dmu.c
++++ b/module/zfs/dmu.c
+@@ -719,8 +719,8 @@ get_next_chunk(dnode_t *dn, uint64_t *start, uint64_t minimum, uint64_t *l1blks)
+ 	uint64_t blks;
+ 	uint64_t maxblks = DMU_MAX_ACCESS >> (dn->dn_indblkshift + 1);
+ 	/* bytes of data covered by a level-1 indirect block */
+-	uint64_t iblkrange =
+-	    dn->dn_datablksz * EPB(dn->dn_indblkshift, SPA_BLKPTRSHIFT);
++	uint64_t iblkrange = (uint64_t)dn->dn_datablksz *
++	    EPB(dn->dn_indblkshift, SPA_BLKPTRSHIFT);
+ 
+ 	ASSERT3U(minimum, <=, *start);
+ 
diff --git a/sys-fs/zfs-kmod/files/0.8.0_revert_Report_holes.patch b/sys-fs/zfs-kmod/files/0.8.0_revert_Report_holes.patch
new file mode 100644
index 000000000000..f8d67ccc7cef
--- /dev/null
+++ b/sys-fs/zfs-kmod/files/0.8.0_revert_Report_holes.patch
@@ -0,0 +1,53 @@
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Wed, 29 May 2019 14:38:15 -0700
+Subject: Revert [PATCH] Report holes when there are only metadata changes
+
+This reverts ec4f9b8f30391a3fb46c8d4a31c2dc9250dca1bb
+Issue: https://github.com/zfsonlinux/zfs/issues/8816
+Bug: https://bugs.gentoo.org/635002
+---
+--- b/module/zfs/dmu.c
++++ a/module/zfs/dmu.c
+@@ -2366,39 +2366,14 @@
+ 		return (err);
+ 
+ 	/*
++	 * Check if dnode is dirty
+-	 * Check if there are dirty data blocks or frees which have not been
+-	 * synced.  Dirty spill and bonus blocks which are external to the
+-	 * object can ignored when reporting holes.
+ 	 */
+-	mutex_enter(&dn->dn_mtx);
+ 	for (i = 0; i < TXG_SIZE; i++) {
+ 		if (multilist_link_active(&dn->dn_dirty_link[i])) {
++			clean = B_FALSE;
++			break;
+-
+-			if (dn->dn_free_ranges[i] != NULL) {
+-				clean = B_FALSE;
+-				break;
+-			}
+-
+-			list_t *list = &dn->dn_dirty_records[i];
+-			dbuf_dirty_record_t *dr;
+-
+-			for (dr = list_head(list); dr != NULL;
+-			    dr = list_next(list, dr)) {
+-				dmu_buf_impl_t *db = dr->dr_dbuf;
+-
+-				if (db->db_blkid == DMU_SPILL_BLKID ||
+-				    db->db_blkid == DMU_BONUS_BLKID)
+-					continue;
+-
+-				clean = B_FALSE;
+-				break;
+-			}
+ 		}
+-
+-		if (clean == B_FALSE)
+-			break;
+ 	}
+-	mutex_exit(&dn->dn_mtx);
+ 
+ 	/*
+ 	 * If compatibility option is on, sync any current changes before
diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.8.0_rc5.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.8.0-r1.ebuild
index 9474ad475580..0108a7a9b3b7 100644
--- a/sys-fs/zfs-kmod/zfs-kmod-0.8.0_rc5.ebuild
+++ b/sys-fs/zfs-kmod/zfs-kmod-0.8.0-r1.ebuild
@@ -12,10 +12,9 @@ if [[ ${PV} == "9999" ]]; then
 	inherit autotools git-r3
 	EGIT_REPO_URI="https://github.com/zfsonlinux/zfs.git"
 else
-	MY_PV="${PV/_rc/-rc}"
-	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${MY_PV}/zfs-${MY_PV}.tar.gz"
+	SRC_URI="https://github.com/zfsonlinux/zfs/releases/download/zfs-${PV}/zfs-${PV}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/zfs-${PV%_rc*}"
+	S="${WORKDIR}/zfs-${PV}"
 	ZFS_KERNEL_COMPAT="5.1"
 fi
 
@@ -39,6 +38,11 @@ RESTRICT="debug? ( strip ) test"
 
 DOCS=( AUTHORS COPYRIGHT META README.md )
 
+PATCHES=( 
+	"${FILESDIR}"/0.8.0_revert_Report_holes.patch
+	"${FILESDIR}"/0.8.0_Fix_integer_overflow_in_get_next_chunk.patch
+)
+
 pkg_setup() {
 	linux-info_pkg_setup
 
@@ -117,17 +121,21 @@ src_configure() {
 src_compile() {
 	set_arch_to_kernel
 
-	default
+	myemakeargs=( V=1 )
+
+	emake "${myemakeargs[@]}"
 }
 
 src_install() {
 	set_arch_to_kernel
 
-	emake \
-		DEPMOD="/bin/true" \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}" \
-		install
+	myemakeargs+=(
+		DEPMOD="/bin/true"
+		DESTDIR="${D}"
+		INSTALL_MOD_PATH="${INSTALL_MOD_PATH:-$EROOT}"
+	)
+
+	emake "${myemakeargs[@]}" install
 
 	einstalldocs
 }
diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index d4fe46c9abab..c7dbb5e1a0d5 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -5,11 +5,11 @@ AUX zfs.service.in 335 BLAKE2B a18ad1d70975df98cfb7b5196ad17b7197d5eb59cac2ccb3b
 DIST zfs-0.6.5.11.tar.gz 2521959 BLAKE2B 95b145a26620995343df1a468367b882bc71ab3e4812c05839d49d0cd877b756185c91b2609986f91939fbfda322809ddefc8ff9207fe076db03e0038e585ea2 SHA512 877052da2a0cdc78b10cb5041da55e31242db2618c502997f4df9aa46a14482c7f33adce8d21aaf16164a9fe52edc358922ea89c8e109c3247e107bf607d6451
 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.8.0-rc5.tar.gz 8994022 BLAKE2B f29b9f6d264bbd04553f6855fbdf039808903eb02989e06082d9db8494723e611736db753fa4d27443527fbac189c1ee282ac89fdf799f6182ae428e178d0d10 SHA512 e54a3f9c7947baf619d737a832a545609bc03774a53f9a65147b8c23d9fb5148400a33d99216205a3e45821f8300108882c4eab9995778611775035441428551
+DIST zfs-0.8.0.tar.gz 9084737 BLAKE2B c3095ca07b7c36fa204274be1166fd244894de70b97a11da32606b08e9bb150bc1326ac8424d5c001eb33d2d94e214d3944ddfce885844885c55291a82f11a2f SHA512 ba29f1644ec6807f4cad574e4950e56026316c3d405c9fc40a63ab34c2400d508521b09f656ac97898e5feaca5e0b259d9d4d85f75a4b1782a9db13d3b14cdc6
 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 6273 BLAKE2B 2bc2247efd975f46320d964c71764a4382255b1acd37d94d1f800f1ae9e7fd06d08fae70b574189136ae373723d505b49ba9ad1ac033aada5ba178bbb1b8d9fc SHA512 bdec6a25dc8d7c9f41ea7c3d505e6e6ba4ead69393826432ff24b898b16d99a0a023469cf932c3c4e86f1641f3192c8110362a7603ec06ec34266c0dc9b19b08
 EBUILD zfs-0.7.9999.ebuild 5973 BLAKE2B 521149bd89635e86c8fc2dd3b3bbc3cc85ec3c79a4ab372910984abd75fbec617080503074da5dff34064807fc9a1cfdfd4946406c4aa6b9e1e6a478db6f6e33 SHA512 90914f61584760f399dcc6eb84995adbb3e31e22dc6a1aa0da2996f854362e8f5d99a73ad1270a6d01fa73e5327c0b04582ec2256ceb623bb62a7d1606de210a
-EBUILD zfs-0.8.0_rc5-r1.ebuild 6459 BLAKE2B 7c0e40742d943d3b858355af9c60e8dd7f9456dc9ab9251e8a9f271d76e14ca9396d16f61f840b8aefca63fd94dd578d8edc4ef2098aaedd7f0d7f2a4c2b2d91 SHA512 1cd06d6d347dc5d3f8f03d296e0567133c122d61c0a70a8efeefd441cd00c2e6c391d68df381f895d3a5da5e809ed18a13757cb6205fbacefddbc1603b8dc64f
-EBUILD zfs-9999.ebuild 6394 BLAKE2B 35227abea28569721684fde714df0317217c2534ff0f9ba8cc84675655714036331da4c57db3ce62ee45f1bcfbf5ef3d5854481ee2a812cb1e9bebf84ab39488 SHA512 1f1078b05602c9a56ea394ca0c211722f0adacfd52f421ebea887176f4e0994480b1d529707da5d4ff241199ce5bb91efcb60154202b8578351f041ab2c6051a
+EBUILD zfs-0.8.0.ebuild 6798 BLAKE2B 378df0e7ea0fbad2ba174d09cdb4fcea31bf2a9e476a0f85bd1d3fbb340f67c42cf8771102aa172cad4c8bc99de88cc4c4a58b3b0c9059b30d3372ac79ea58e7 SHA512 604ebad57f5e8b25c8a513a446a8eb2aaa03197fe40059fddaddb7d0835dff0d32a0e697ee6a88c7fc4734bec2d1b069f46d311be585cabda648caa867e36200
+EBUILD zfs-9999.ebuild 6798 BLAKE2B 378df0e7ea0fbad2ba174d09cdb4fcea31bf2a9e476a0f85bd1d3fbb340f67c42cf8771102aa172cad4c8bc99de88cc4c4a58b3b0c9059b30d3372ac79ea58e7 SHA512 604ebad57f5e8b25c8a513a446a8eb2aaa03197fe40059fddaddb7d0835dff0d32a0e697ee6a88c7fc4734bec2d1b069f46d311be585cabda648caa867e36200
 MISC metadata.xml 751 BLAKE2B 84331bb699e48773412c2b3a26786e746428a111b64d1a309d0acd6f2454220e917a6650b2a35e88269f77c725f848493f46516adf72a0deb149dbb1e0275bf3 SHA512 a16f2fff439157fa1910926bd5b90ccfc3cab262fe7b41e5565b645f29774b14f1d9ac11aceaee57b8685ec1c782d826e08715559fb0b2e06031a165ca5f6295
diff --git a/sys-fs/zfs/zfs-0.8.0_rc5-r1.ebuild b/sys-fs/zfs/zfs-0.8.0.ebuild
index 3ed40d3591bf..129f34845447 100644
--- a/sys-fs/zfs/zfs-0.8.0_rc5-r1.ebuild
+++ b/sys-fs/zfs/zfs-0.8.0.ebuild
@@ -15,10 +15,8 @@ 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"
+	SRC_URI="https://github.com/zfsonlinux/${PN}/releases/download/${P}/${P}.tar.gz"
 	KEYWORDS="~amd64"
-	S="${WORKDIR}/zfs-${PV%_rc*}"
 fi
 
 LICENSE="BSD-2 CDDL MIT"
@@ -100,7 +98,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	[[ ${PV} == "9999" ]] && eautoreconf
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	else
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
 
 	# Update paths
 	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
@@ -172,6 +175,12 @@ src_install() {
 }
 
 pkg_postinst() {
+	if has_version "<=sys-kernel/genkernel-3.5.3.3"; then
+		einfo "genkernel version 3.5.3.3 and earlier does NOT support"
+		einfo " unlocking pools with native zfs encryption enabled at boot"
+		einfo " use dracut or genkernel-9999 if you requre this functionality"
+	fi
+
 	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."
diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index e24458b4194f..129f34845447 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -98,7 +98,12 @@ pkg_setup() {
 src_prepare() {
 	default
 
-	[[ ${PV} == "9999" ]] && eautoreconf
+	if [[ ${PV} == "9999" ]]; then
+		eautoreconf
+	else
+		# Set revision number
+		sed -i "s/\(Release:\)\(.*\)1/\1\2${PR}-gentoo/" META || die "Could not set Gentoo release"
+	fi
 
 	# Update paths
 	sed -e "s|/sbin/lsmod|/bin/lsmod|" \
@@ -170,6 +175,12 @@ src_install() {
 }
 
 pkg_postinst() {
+	if has_version "<=sys-kernel/genkernel-3.5.3.3"; then
+		einfo "genkernel version 3.5.3.3 and earlier does NOT support"
+		einfo " unlocking pools with native zfs encryption enabled at boot"
+		einfo " use dracut or genkernel-9999 if you requre this functionality"
+	fi
+
 	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."