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

[Jakov Smolić]

commit:     bd38b6de2c77dd7e36a127b16ff495ed7d5a6e2e
Author:     Eric Joldasov <bratishkaerik <AT> getgoogleoff <DOT> me>
AuthorDate: Thu Nov 10 03:18:53 2022 +0000
Commit:     Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 01:23:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd38b6de

sys-fs/ncdu: add verify-sig integration

Signed-off-by: Eric Joldasov <bratishkaerik <AT> getgoogleoff.me>
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>

 sys-fs/ncdu/Manifest             |  4 ++++
 sys-fs/ncdu/ncdu-1.17.ebuild     | 16 +++++++++++++---
 sys-fs/ncdu/ncdu-2.1.2-r1.ebuild | 10 +++++++++-
 sys-fs/ncdu/ncdu-2.2.1.ebuild    | 14 +++++++++++++-
 sys-fs/ncdu/ncdu-2.2.ebuild      | 10 +++++++++-
 5 files changed, 48 insertions(+), 6 deletions(-)

diff --git a/sys-fs/ncdu/Manifest b/sys-fs/ncdu/Manifest
index 78d477465b48..904e788067a4 100644
--- a/sys-fs/ncdu/Manifest
+++ b/sys-fs/ncdu/Manifest
@@ -1,5 +1,9 @@
 DIST ncdu-1.17.tar.gz 157187 BLAKE2B 7d36a648b8fb0a26d3b6bcc533ed8f510e7f37b3084cb585a0c785d73fd82f537e0f2f9493c3b56173eae1324255e7acf7617a1cd1614c92a3b7bf0d53b7d77f SHA512 aa2366797760f0c0b2bea866f0ae0446b8113e3ff6460192a4a42d4d888d473d7f37bc4acff6220fa86003bd96d71761168a2ae0ded36456072176a69564c775
+DIST ncdu-1.17.tar.gz.asc 833 BLAKE2B 8e285bc92351bcd5d3ae83e97772df96f98149e1f7a2aca882518b37448412756ecc24e89fd471b42dc960727dc272b17e05e3a602672e6712711d3bc342afac SHA512 7386901449a5bd98f2d7344dd8147a9facc274b59ec3676be2b3f78797f03b51154b3a6d85f657860e8260c5423140b561ca7e8067863face3320ca5a4951132
 DIST ncdu-2.1.2.tar.gz 52702 BLAKE2B fb64058bec2e8f286fa82e16986cddd9126e5c94d513740d48ff1c971e7ee95270fe6c1cfbbe240bb8e99fba4e3fd6d2624f99870422835da44447a2507f0b8b SHA512 ff48f2b9625e1aba29e5598051d16c4b5dc1a634fab897709226dd69d3b48031e6e62527c8514ec4753874d2d96800e538d6ad90b4a5f9851410d10579ccc67c
+DIST ncdu-2.1.2.tar.gz.asc 833 BLAKE2B 35144f60c76ac4be90e87af3b62954894a4714af7b664015b59cfd19b676a2ad86383feb1cd8fc4ccf3d0ce9e91a66391c3273a97c9b2d7929addb847373b16c SHA512 351b7955e82d9eac7f1c2796c75e343882893bfe6bd783fbecdd8e1bff7eec62cdb09940c04f5a0f749eed93ba791fac23d7845db6abea91cc059ebe8c37de09
 DIST ncdu-2.2.1-upstream-zig-0.10-updates-r1.patch 47546 BLAKE2B e805010c5d575ac01cc02794905ec08185cf7bc2810571b18021bedca9c7d1079f3d8206295da307c5db70b661b9fd85a35172f8ee1495c88cdb7e52a32ad697 SHA512 a5f703db236842f54f8ce91eadd513283a1c721fa5a2ab00e38f0b7b96e3becf3e086ad43e4284abe6712113ecb3ba3a7c0d149baa3eb16b52d84a7b7a976424
 DIST ncdu-2.2.1.tar.gz 55972 BLAKE2B ac7f281b2fd12144a3498b105594a60478c49049eabeb7b3951c4aac4d5b9c025f823806dc948327e4a6608e629da9d7b15a8073bdb79043116ba095d3becdce SHA512 63a3b0d12c1c265d826276a01b37f7785d50721da5dc35c2934ee6ba7923254c02ab906bc49df60b26b8bf18b7d4c49b0cc02eb7e805cf32cde3e0cd35187973
+DIST ncdu-2.2.1.tar.gz.asc 833 BLAKE2B 0582851ae5a04910765cc1d775a9462f81e966b56ba9aa053964fc38dbaa2dd93b953bfa99bdf7fd01592bcf2a029413e6cc28b04c277ed420731e828200b826 SHA512 e8b2844ecca28de3920512966a8dc1ec6b14c66e132d1e30b11eda0660d70d5152891b6f90524fc795ff7990cba275472242421133761c883ea1a7112efc7894
 DIST ncdu-2.2.tar.gz 55903 BLAKE2B 568760748ec54b193f17e31fa285d95085389a4f8e1abfe8e5fe5e2d67b0ca221cb7ca94cba248206808d6369058384286de690338f67faee7ff18f09832ebd9 SHA512 d491976b5e19726afe856860e07974c9c70b161c96cd17960a9f36dbc6fc1a51fd3d84da2e22e21cd3d384ab004a7d248096212e762d1ad3849e2cf8a036fc19
+DIST ncdu-2.2.tar.gz.asc 833 BLAKE2B 62dda735b6c552f5f44a75229851815d3f8b4ddbd812a7ca0844fe1e11169f5a996d83af66f665ca48af880551d2e65469dda139015541ec50002015d335adbe SHA512 61cb5ed9c574e68d9109f3ee0de1fe13198fd5e4018d8d6b6f09eed8d19df3c36edacb4246a31350f6a7a662276514a782c009b88c7bc123512a3f94b74df8ce

diff --git a/sys-fs/ncdu/ncdu-1.17.ebuild b/sys-fs/ncdu/ncdu-1.17.ebuild
index 69646594d053..49b7d752a4e9 100644
--- a/sys-fs/ncdu/ncdu-1.17.ebuild
+++ b/sys-fs/ncdu/ncdu-1.17.ebuild
@@ -1,11 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="8"
+EAPI=8
+
+inherit verify-sig
 
 DESCRIPTION="NCurses Disk Usage"
 HOMEPAGE="https://dev.yorhel.nl/ncdu/"
-SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
+SRC_URI="
+	https://dev.yorhel.nl/download/${P}.tar.gz
+	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
+"
 
 LICENSE="MIT"
 SLOT="0"
@@ -13,4 +18,9 @@ KEYWORDS="~alpha amd64 arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux
 
 DEPEND="sys-libs/ncurses:=[unicode(+)]"
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-yorhel )
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/yoranheling.asc

diff --git a/sys-fs/ncdu/ncdu-2.1.2-r1.ebuild b/sys-fs/ncdu/ncdu-2.1.2-r1.ebuild
index b1f2a22f2abc..3a49b52e19db 100644
--- a/sys-fs/ncdu/ncdu-2.1.2-r1.ebuild
+++ b/sys-fs/ncdu/ncdu-2.1.2-r1.ebuild
@@ -3,9 +3,14 @@
 
 EAPI=8
 
+inherit verify-sig
+
 DESCRIPTION="NCurses Disk Usage"
 HOMEPAGE="https://dev.yorhel.nl/ncdu/"
-SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
+SRC_URI="
+	https://dev.yorhel.nl/download/${P}.tar.gz
+	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
+"
 
 LICENSE="MIT"
 SLOT="0"
@@ -16,8 +21,11 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	|| ( ~dev-lang/zig-0.9.1 ~dev-lang/zig-bin-0.9.1 )
 	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-yorhel )
 "
 
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/yoranheling.asc
+
 # see https://github.com/ziglang/zig/issues/3382
 # For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
 QA_FLAGS_IGNORED="usr/bin/ncdu"

diff --git a/sys-fs/ncdu/ncdu-2.2.1.ebuild b/sys-fs/ncdu/ncdu-2.2.1.ebuild
index ee095fee9c6f..b3093d206928 100644
--- a/sys-fs/ncdu/ncdu-2.2.1.ebuild
+++ b/sys-fs/ncdu/ncdu-2.2.1.ebuild
@@ -3,17 +3,19 @@
 
 EAPI=8
 
+inherit verify-sig
+
 DESCRIPTION="NCurses Disk Usage"
 HOMEPAGE="https://dev.yorhel.nl/ncdu/"
 SRC_URI="
 	https://dev.yorhel.nl/download/${P}.tar.gz
+	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
 	https://codeberg.org/BratishkaErik/distfiles/media/branch/master/${P}-upstream-zig-0.10-updates-r1.patch
 "
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64"
-
 PATCHES=(
 	"${DISTDIR}/${P}-upstream-zig-0.10-updates-r1.patch"
 )
@@ -23,12 +25,22 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	|| ( ~dev-lang/zig-0.10.0 ~dev-lang/zig-bin-0.10.0 )
 	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-yorhel )
 "
 
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/yoranheling.asc
+
 # see https://github.com/ziglang/zig/issues/3382
 # For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
 QA_FLAGS_IGNORED="usr/bin/ncdu"
 
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc}
+	fi
+	default
+}
+
 src_test() {
 	zig build test || die "Tests failed"
 }

diff --git a/sys-fs/ncdu/ncdu-2.2.ebuild b/sys-fs/ncdu/ncdu-2.2.ebuild
index b1f2a22f2abc..3a49b52e19db 100644
--- a/sys-fs/ncdu/ncdu-2.2.ebuild
+++ b/sys-fs/ncdu/ncdu-2.2.ebuild
@@ -3,9 +3,14 @@
 
 EAPI=8
 
+inherit verify-sig
+
 DESCRIPTION="NCurses Disk Usage"
 HOMEPAGE="https://dev.yorhel.nl/ncdu/"
-SRC_URI="https://dev.yorhel.nl/download/${P}.tar.gz"
+SRC_URI="
+	https://dev.yorhel.nl/download/${P}.tar.gz
+	verify-sig? ( https://dev.yorhel.nl/download/${P}.tar.gz.asc )
+"
 
 LICENSE="MIT"
 SLOT="0"
@@ -16,8 +21,11 @@ RDEPEND="${DEPEND}"
 BDEPEND="
 	|| ( ~dev-lang/zig-0.9.1 ~dev-lang/zig-bin-0.9.1 )
 	virtual/pkgconfig
+	verify-sig? ( sec-keys/openpgp-keys-yorhel )
 "
 
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/yoranheling.asc
+
 # see https://github.com/ziglang/zig/issues/3382
 # For now, Zig doesn't support CFLAGS/LDFLAGS/etc.
 QA_FLAGS_IGNORED="usr/bin/ncdu"