Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/m4/
Date: Thu, 07 Apr 2022 03:58:08
Message-Id: 1649303851.01750098caa939e1f18f7f94c5b30aae59f5e2c8.sam@gentoo
1 commit: 01750098caa939e1f18f7f94c5b30aae59f5e2c8
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Thu Apr 7 03:55:26 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Thu Apr 7 03:57:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01750098
7
8 sys-devel/m4: add verify-sig
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 sys-devel/m4/Manifest | 1 +
13 sys-devel/m4/m4-1.4.19.ebuild | 20 +++++++++++++++++---
14 2 files changed, 18 insertions(+), 3 deletions(-)
15
16 diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
17 index bc43b9b6b9ac..90afb460c0a7 100644
18 --- a/sys-devel/m4/Manifest
19 +++ b/sys-devel/m4/Manifest
20 @@ -1,2 +1,3 @@
21 DIST m4-1.4.19-test-198-sysval-r1.patch.gz 6292 BLAKE2B 62f52c8bb75e7b8f11e487906f1ce47069ea6d3095fd6532aa6b47bcd8109b7cd733fde26915d449a1cfc326f27f5ed83ba29a5a80687b8b9bdb73c8d87e96b8 SHA512 c3e7d4c1631e401c6b5477c22fd5de837188acf9d72551b116c665a927d1799b1fb249e90c9fb4f6f2f328ee84b2e4dd0bf54f684139997c19ee5b69a3e9284d
22 DIST m4-1.4.19.tar.xz 1654908 BLAKE2B 08694485a49c542761fa9a7db4d7609f4dfb08a5c6b785b57f2e14cf1f696c2a1c788bb5eb934e8159a632b63ff071dfe42511d0109d7b1828f46d33c8bf416a SHA512 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b
23 +DIST m4-1.4.19.tar.xz.sig 488 BLAKE2B 99e89b1ed0bf158d29a652392fb122e23227e895c75a8c63057ebe33f11b433ab205ae99a991578a89df8c3e723fc00669d8cdb290fbc86eaa6c704b112e4370 SHA512 d6ac9c6a54c57e9b53fb3e34a60d49df2f46a6e494da0a0c9ae8246b984e68a853b5d8c42677c1a0485c3f36b0bce10a481d3775c0edc1dbdfb27b43545bc31e
24
25 diff --git a/sys-devel/m4/m4-1.4.19.ebuild b/sys-devel/m4/m4-1.4.19.ebuild
26 index a30e5e26214d..744de66535d5 100644
27 --- a/sys-devel/m4/m4-1.4.19.ebuild
28 +++ b/sys-devel/m4/m4-1.4.19.ebuild
29 @@ -3,16 +3,20 @@
30
31 EAPI=7
32
33 +VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/m4.asc
34 +inherit verify-sig
35 +
36 DESCRIPTION="GNU macro processor"
37 HOMEPAGE="https://www.gnu.org/software/m4/m4.html"
38 -if [[ "${PV}" == *_beta* ]] ; then
39 +if [[ ${PV} == *_beta* ]] ; then
40 MY_P="${PN}-1.4.18d"
41 - #SRC_URI="mirror://gnu-alpha/${PN}/${MY_P}.tar.xz"
42 SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
43 + SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig )"
44 S="${WORKDIR}/${MY_P}"
45 else
46 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
47 SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-test-198-sysval-r1.patch.gz"
48 + SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
49 KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
50 fi
51
52 @@ -29,13 +33,23 @@ RDEPEND="
53 DEPEND="${RDEPEND}"
54 # Remember: cannot dep on autoconf since it needs us
55 BDEPEND="app-arch/xz-utils
56 - nls? ( sys-devel/gettext )"
57 + nls? ( sys-devel/gettext )
58 + verify-sig? ( sec-keys/openpgp-keys-m4 )"
59
60 PATCHES=(
61 "${FILESDIR}"/ppc-musl.patch
62 "${WORKDIR}"/${P}-test-198-sysval-r1.patch
63 )
64
65 +src_unpack() {
66 + if use verify-sig ; then
67 + # Needed for downloaded patch (which is unsigned, which is fine)
68 + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
69 + fi
70 +
71 + default
72 +}
73 +
74 src_configure() {
75 local -a myeconfargs=(
76 --enable-changeword