[gentoo-commits] repo/gentoo:master commit in: sys-fs/zfs/

["Sam James" <sam@gentoo.org>]

commit:     1c18c01ccb451b9b327cd0994c7f83dfdc5948f6
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 19 00:00:37 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Apr 19 00:18:20 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c18c01c

sys-fs/zfs: add 2.1.0_rc3, drop 2.1.0_rc2

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-fs/zfs/Manifest                                       | 3 ++-
 sys-fs/zfs/{zfs-2.1.0_rc2.ebuild => zfs-2.1.0_rc3.ebuild} | 8 ++++++++
 sys-fs/zfs/zfs-9999.ebuild                                | 8 ++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/sys-fs/zfs/Manifest b/sys-fs/zfs/Manifest
index 252fa5ca000..99ccdb885b6 100644
--- a/sys-fs/zfs/Manifest
+++ b/sys-fs/zfs/Manifest
@@ -1,4 +1,5 @@
 DIST zfs-0.8.6.tar.gz 9295260 BLAKE2B 45424d710aaf75a05f766ae523ae157a24b5cbdcefe72a59e4cede81e42f7a92ae7f01150388437b78cd49f3d28b9664599f2a624516e6b3f1073497194a99f2 SHA512 626b172554f39a5c70f6ea5c599a92fae52534590d1b0273de2bbfc3676d29dff0eade8ca17e5f179a59870c12bc758fb53b7900f8a1fdbdef3a9161b93f9cce
 DIST zfs-2.0.3.tar.gz 13114404 BLAKE2B 71b3f68e681d51a78a38f9e11012074d2a4483b68437a17b5766d5db557be6fc8080179f20c1abc60f61b983eb0f126b887d762dc9aa8e480a3ee311d9067bf5 SHA512 8b2a6e0edfb3c85441076b2c6163ad3d7d239e11db128ab74d60bf8dc802d67b7f5b8d1cc7227316a7dc3917f14e9ac072ebf1583957f2a45c1b8438e4068200
 DIST zfs-2.0.4.tar.gz 13123872 BLAKE2B 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c SHA512 1dda92d424372bce7020f5215545485eae69211b6f0fb6bea3c7c22efac76c6a2662f0dd14a03f723b6a6fe73b1228ecca211a4034b86cf885bcadf38ba0dc6b
-DIST zfs-2.1.0-rc2.tar.gz 34775453 BLAKE2B cf098f288439d4c11552cc5a88138c2b3b64b9c3eb9a92e019404fa6713999e71c5a42310b2bb3edd9466dd43678d6946dc4e353057b5cba77dee0fdd213dbbc SHA512 d85e8d32ed3f60e4079f676f3e11c60680a910eb3f207562a0caeffe385becc754edd5974864cd6460dbaa754e290f86c6faa7c52ee77d4452b22efab1775efe
+DIST zfs-2.1.0-rc3.tar.gz 34791288 BLAKE2B c2868a8e99c72a7153c93f3d34ac5a6c9b74d6aef4faaff02a5e4fb4e8ca28b77e2de60219000269611fe60b3ba67c838b341bf9bc5e7aa17feb27101f64313a SHA512 226bd529176861ab8ceab96aab6fccd04711c3dd801132fdd86fb711116c931b224995be6e86750f14f141f8cdd2bbc086918465dc47dea952b890b316f666ab
+DIST zfs-2.1.0-rc3.tar.gz.asc 195 BLAKE2B 0a25b1bbaded05283656cdbb62ac3caa3335773972fff82b4de033679a203f50f9d99f022b8b578c3a71208f0426f7b55410ca2e888f8f4554034e2c2f8bbdc5 SHA512 5c2eb215e1a556af171f19802585c2be83dcd8a3bed1f601928e2a45f4773a03dfbd2a2e118b371e039693eb51802286d3cefc68db503b5a8f7ace26dcc3de56

diff --git a/sys-fs/zfs/zfs-2.1.0_rc2.ebuild b/sys-fs/zfs/zfs-2.1.0_rc3.ebuild
similarity index 95%
rename from sys-fs/zfs/zfs-2.1.0_rc2.ebuild
rename to sys-fs/zfs/zfs-2.1.0_rc3.ebuild
index fbce8715910..d4e6a719e7d 100644
--- a/sys-fs/zfs/zfs-2.1.0_rc2.ebuild
+++ b/sys-fs/zfs/zfs-2.1.0_rc3.ebuild
@@ -15,8 +15,12 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
 	MY_P="${P/_rc/-rc}"
 	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
 	S="${WORKDIR}/${P%_rc?}"
 
 	if [[ ${PV} != *_rc* ]]; then
@@ -52,6 +56,10 @@ BDEPEND="virtual/awk
 	)
 "
 
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
+fi
+
 # awk is used for some scripts, completions, and the Dracut module
 RDEPEND="${DEPEND}
 	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )

diff --git a/sys-fs/zfs/zfs-9999.ebuild b/sys-fs/zfs/zfs-9999.ebuild
index fbce8715910..d4e6a719e7d 100644
--- a/sys-fs/zfs/zfs-9999.ebuild
+++ b/sys-fs/zfs/zfs-9999.ebuild
@@ -15,8 +15,12 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3 linux-mod
 	EGIT_REPO_URI="https://github.com/openzfs/zfs.git"
 else
+	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/openzfs.asc
+	inherit verify-sig
+
 	MY_P="${P/_rc/-rc}"
 	SRC_URI="https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz"
+	SRC_URI+=" verify-sig? ( https://github.com/openzfs/${PN}/releases/download/${MY_P}/${MY_P}.tar.gz.asc )"
 	S="${WORKDIR}/${P%_rc?}"
 
 	if [[ ${PV} != *_rc* ]]; then
@@ -52,6 +56,10 @@ BDEPEND="virtual/awk
 	)
 "
 
+if [[ ${PV} != "9999" ]] ; then
+	BDEPEND+=" verify-sig? ( app-crypt/openpgp-keys-openzfs )"
+fi
+
 # awk is used for some scripts, completions, and the Dracut module
 RDEPEND="${DEPEND}
 	!kernel-builtin? ( ~sys-fs/zfs-kmod-${PV} )