[gentoo-commits] repo/gentoo:master commit in: dev-libs/elfutils/

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

commit:     47bf391f0270b9ccc06977910cb42a78966af378
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 01:34:44 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 01:34:59 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47bf391f

dev-libs/elfutils: add verify-sig

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

 dev-libs/elfutils/Manifest              |  1 +
 dev-libs/elfutils/elfutils-0.187.ebuild | 25 +++++++++++++++++--------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/dev-libs/elfutils/Manifest b/dev-libs/elfutils/Manifest
index cc1d6f1fbaae..c236589fa1bc 100644
--- a/dev-libs/elfutils/Manifest
+++ b/dev-libs/elfutils/Manifest
@@ -3,3 +3,4 @@ DIST elfutils-0.185.tar.bz2 9187627 BLAKE2B 57cfa7e4060975c4bf6170dbd354687a19a9
 DIST elfutils-0.186-patches.tar.gz 3323 BLAKE2B 360365597d3a08d6f4fe843d04bcddd07a44ca93dae2034615abc450517e1be21c81a55aa379c409902e134ae795b38bb7461c65cdba3934ac7ef1e4e0e53091 SHA512 e2d427be505fdc416751a1fbc3bb4f39577859d94ce43990faa83c135fe36be2ddb3a2ef0f1020cfa37060e6d43dc7b8cf3db0d07d62b31bf29cb9a4a5945ce1
 DIST elfutils-0.186.tar.bz2 9230491 BLAKE2B 49573d0a1f3519eab81d1ba3e94354cbc0935a36a94a3fdb22fe223a47b78cca8fd6e322870b0e335a809529fa6f54180b13c67936dec0242123c54ba20c9fc9 SHA512 c9180b27ec62935f18b9431268d176f6023d1bb938731d2af6e7626ae460af6608a70ba68483aa1ec7e6cb0fa0528b661ca8b68bc4f58ea8e18af527c5950c78
 DIST elfutils-0.187.tar.bz2 9240221 BLAKE2B 00ba3efa689d137808f5f53ecda93fd006be0c18d690ce76616ed1dba442281098579fa4b9a9e91b8ba865a3de15968f0ae06703a7b50b15c48a4beb5c970a46 SHA512 a9b9e32b503b8b50a62d4e4001097ed2721d3475232a6380e6b9853bd1647aec016440c0ca7ceb950daf1144f8db9814ab43cf33cc0ebef7fc91e9e775c9e874
+DIST elfutils-0.187.tar.bz2.sig 310 BLAKE2B b23f656de269030cc3dd518a008e22e22726138a3bd619ad269166d3b9fac4b1064d98c81a02fcc6250ca1a996cc3e81322b50e7692fe23cbee92e2908f0300d SHA512 2619d8d537364386491d5e54f2add7ffa5bab21cd19c94a29249f2d9c5cc5dac53e2031a5515268ddeee4799b71115a5d98bdbcafd361aa75bcc13a1d9b70b14

diff --git a/dev-libs/elfutils/elfutils-0.187.ebuild b/dev-libs/elfutils/elfutils-0.187.ebuild
index 388c2d20d007..e0eaa90ae431 100644
--- a/dev-libs/elfutils/elfutils-0.187.ebuild
+++ b/dev-libs/elfutils/elfutils-0.187.ebuild
@@ -3,12 +3,14 @@
 
 EAPI=7
 
-inherit flag-o-matic multilib-minimal
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/elfutils.gpg
+inherit flag-o-matic multilib-minimal verify-sig
 
 DESCRIPTION="Libraries/utilities to handle ELF objects (drop in replacement for libelf)"
 HOMEPAGE="https://sourceware.org/elfutils/"
 SRC_URI="https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2"
 SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-0.186-patches.tar.gz"
+SRC_URI+=" verify-sig? ( https://sourceware.org/elfutils/ftp/${PV}/${P}.tar.bz2.sig )"
 
 LICENSE="|| ( GPL-2+ LGPL-3+ ) utils? ( GPL-3+ )"
 SLOT="0"
@@ -25,21 +27,28 @@ RDEPEND=">=sys-libs/zlib-1.2.8-r1[static-libs?,${MULTILIB_USEDEP}]
 		sys-libs/fts-standalone
 		sys-libs/obstack-standalone
 	)
-	!dev-libs/libelf
-"
+	!dev-libs/libelf"
 DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )
-"
-BDEPEND="nls? ( sys-devel/gettext )
-	>=sys-devel/flex-2.5.4a
+	valgrind? ( dev-util/valgrind )"
+BDEPEND=">=sys-devel/flex-2.5.4a
 	sys-devel/m4
-"
+	nls? ( sys-devel/gettext )
+	verify-sig? ( sec-keys/openpgp-keys-elfutils )"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${WORKDIR}"/${PN}-0.186-patches/
 )
 
+src_unpack() {
+	if use verify-sig ; then
+		# Needed for downloaded patch (which is unsigned, which is fine)
+		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.bz2{,.sig}
+	fi
+
+	default
+}
+
 src_prepare() {
 	default