gentoo resync : 02.06.2019

3 files changed, 28 insertions, 8 deletions

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."