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

[Sam James]

commit:     93c764bb648eebcb1c878f4019b33ebdadc2233b
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 04:14:44 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 04:14:44 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93c764bb

sys-devel/patch: sync live, fix verify-sig dep

See aea62d8988f0c4da2d9d522046ccad12e51edd32.

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

 sys-devel/patch/patch-2.7.6_p20250206.ebuild |  2 +-
 sys-devel/patch/patch-9999.ebuild            | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/sys-devel/patch/patch-2.7.6_p20250206.ebuild 
b/sys-devel/patch/patch-2.7.6_p20250206.ebuild
index 15df468ab034..c410f22ffd4f 100644
--- a/sys-devel/patch/patch-2.7.6_p20250206.ebuild
+++ b/sys-devel/patch/patch-2.7.6_p20250206.ebuild
@@ -34,7 +34,7 @@ RDEPEND="xattr? ( sys-apps/attr )"
 DEPEND="${RDEPEND}"
 BDEPEND="
        test? ( sys-apps/ed )
-       verify-sig? ( sec-keys/openpgp-keys-patch )
+       verify-sig? ( >=sec-keys/openpgp-keys-patch-20250206 )
 "
 
 src_unpack() {

diff --git a/sys-devel/patch/patch-9999.ebuild 
b/sys-devel/patch/patch-9999.ebuild
index df6c6cec8db2..c410f22ffd4f 100644
--- a/sys-devel/patch/patch-9999.ebuild
+++ b/sys-devel/patch/patch-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,6 +11,13 @@ HOMEPAGE="https://www.gnu.org/software/patch/patch.html";
 if [[ ${PV} == 9999 ]] ; then
        EGIT_REPO_URI="https://git.savannah.gnu.org/git/patch.git";
        inherit git-r3
+elif [[ ${PV} = *_p* ]] ; then
+       # Note: could put this in devspace, but if it's gone, we don't want
+       # it in tree anyway. It's just for testing.
+       MY_SNAPSHOT="$(ver_cut 1-3).211-86ac"
+       SRC_URI="https://alpha.gnu.org/gnu/patch/patch-${MY_SNAPSHOT}.tar.xz -> 
${P}.tar.xz"
+       SRC_URI+=" verify-sig? ( 
https://alpha.gnu.org/gnu/patch/patch-${MY_SNAPSHOT}.tar.xz.sig -> 
${P}.tar.xz.sig )"
+       S="${WORKDIR}"/${PN}-${MY_SNAPSHOT}
 else
        SRC_URI="mirror://gnu/patch/${P}.tar.xz"
        SRC_URI+=" verify-sig? ( mirror://gnu/patch/${P}.tar.xz.sig )"
@@ -27,7 +34,7 @@ RDEPEND="xattr? ( sys-apps/attr )"
 DEPEND="${RDEPEND}"
 BDEPEND="
        test? ( sys-apps/ed )
-       verify-sig? ( sec-keys/openpgp-keys-patch )
+       verify-sig? ( >=sec-keys/openpgp-keys-patch-20250206 )
 "
 
 src_unpack() {