[gentoo-commits] repo/gentoo:master commit in: sys-devel/autoconf/

[Sam James]

commit:     58e4fde4f5cdb9a17c6192cf539a0659def2907f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 17:08:18 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 17:28:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58e4fde4

sys-devel/autoconf: wire up verify-sig for 2.71

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

 sys-devel/autoconf/Manifest                |  1 +
 sys-devel/autoconf/autoconf-2.71-r7.ebuild | 27 ++++++++++++++++++++-------
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 6205dc360ab0..55e4c8e929d5 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -2,5 +2,6 @@ DIST autoconf-2.13.tar.gz 443844 BLAKE2B 
ade10f9d4a0b1a0e8b752eee817cfe100d77b07
 DIST autoconf-2.69-runstatedir_patches.tar.xz 257096 BLAKE2B 
ae765e0ca7fe8261117f6f6b75611c232fc3d4016c22c86346afa72f2b7e6c3b7ccc1f9dfe134b2443f8bde6d578b503d79cf88472f76ce75b6c2e843ef55b8e
 SHA512 
55f93299fe5243151f6bb782986a7935270f06d5065929f4d365a37aba05703e3ce66ecf7981d30413db50ee6b4f77d81d10a71b539c8a366c5c5a156c5443da
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 
71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d
 SHA512 
995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
 DIST autoconf-2.71.tar.xz 1292296 BLAKE2B 
7fd4b98b4cfff10720e8da6ee91045637991643b50fcb3e47a0ecfcc01600f7b7b36fd1c0a5f08b68a418f1bdbd8d5a98de1008157595dd37cc3a31facb61416
 SHA512 
73d32b4adcbe24e3bafa9f43f59ed3b6efbd3de0f194e5ec90375f35da1199c583f5d3e89139b7edbad35171403709270e339ffa56a2ecb9b3123e9285021ff0
+DIST autoconf-2.71.tar.xz.sig 833 BLAKE2B 
a2641a0bec3b475874811dd21dc32d34672f4f084ea16d48bd0655df37251be810026c20e35869503e664701edcb64f260b142db671e160a554c2ee982838355
 SHA512 
83e6bf4504f5d188cad1387ce1f1ce4b14f5ee4961bbfd5c83dd281d724392a95b394079bfaa093eb81129873e668b6ca1eee013a60cfb76edf34454756f6667
 DIST autoconf-2.72.tar.xz 1389680 BLAKE2B 
01caeced9e53d8bd39fb0cf4929322f0d463971b0a96368aa55892026897a9e98c2ca84a77db1b3c6c4483aea54b96da16a7bc00b7ac15e23c6b0471438012db
 SHA512 
c4e9fbd858666d3e5c3b4fe7f89aa3e8e3a0a00dc7e166f8147d937d911b77ba3ac6a016f9d223ccdd830bc8960b3e60397c0607cc6a1fd2c50c7492839ddd17
 DIST autoconf-2.72.tar.xz.sig 833 BLAKE2B 
cc33101c5d2bd28f233e54a2843d3c81dc9729238b0900a8f23ef17b982aa0e0194892c07b1365246b6c9c0ea74becd288ae581ee34d593131b83538c69a6204
 SHA512 
7a0d350b23cf47c45811ae35928a4fec67ce1f3adb1965904fe6d9a0fad68139df4902662bcf4731a2f809381cae0b265a8f1f57d0a9a39777250a97a3c481d9

diff --git a/sys-devel/autoconf/autoconf-2.71-r7.ebuild 
b/sys-devel/autoconf/autoconf-2.71-r7.ebuild
index db7dca39d2e7..fec14a8ce2f0 100644
--- a/sys-devel/autoconf/autoconf-2.71-r7.ebuild
+++ b/sys-devel/autoconf/autoconf-2.71-r7.ebuild
@@ -11,14 +11,23 @@ else
        MY_PV="${PV}"
        MY_P="${PN}-${MY_PV}"
        #PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
-       SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-               https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz";
+
+       VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/zackweinberg.asc
+       inherit verify-sig
+
+       SRC_URI="
+               mirror://gnu/${PN}/${MY_P}.tar.xz
+               https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz
+               verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.xz.sig )
+       "
        #SRC_URI+=" 
https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz";
+       S="${WORKDIR}"/${MY_P}
 
        if ! [[ ${PV} == *_beta* ]] ; then
                KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k 
~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos 
~ppc-macos ~x64-macos ~x64-solaris"
        fi
-       S="${WORKDIR}"/${MY_P}
+
+       BDEPEND="verify-sig? ( sec-keys/openpgp-keys-zackweinberg )"
 fi
 
 inherit toolchain-autoconf
@@ -32,12 +41,16 @@ IUSE="emacs"
 
 # for 2.71, our Perl time resolution patch changes our min Perl from 5.6
 # (vanilla upstream for 2.71) to 5.8.
-BDEPEND=">=sys-devel/m4-1.4.16
-       >=dev-lang/perl-5.8"
-RDEPEND="${BDEPEND}
+BDEPEND+="
+       >=sys-devel/m4-1.4.16
+       >=dev-lang/perl-5.8
+"
+RDEPEND="
+       ${BDEPEND}
        >=sys-devel/autoconf-wrapper-15
        sys-devel/gnuconfig
-       !~sys-devel/${P}:2.5"
+       !~sys-devel/${P}:2.5
+"
 [[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
 PDEPEND="emacs? ( app-emacs/autoconf-mode )"