From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1716352-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 411CA1582EF
for <garchives@archives.gentoo.org>; Sun, 09 Feb 2025 04:32:39 +0000 (UTC)
Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id 027D0343093
for <garchives@archives.gentoo.org>; Sun, 09 Feb 2025 04:32:39 +0000 (UTC)
Received: from bobolink.gentoo.org (localhost [127.0.0.1])
by bobolink.gentoo.org (Postfix) with ESMTP id 09D171103CB;
Sun, 09 Feb 2025 04:32:38 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by bobolink.gentoo.org (Postfix) with ESMTPS id F41831103CB
for <gentoo-commits@lists.gentoo.org>; Sun, 09 Feb 2025 04:32:37 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id AA52D343092
for <gentoo-commits@lists.gentoo.org>; Sun, 09 Feb 2025 04:32:37 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0ADC913CF
for <gentoo-commits@lists.gentoo.org>; Sun, 09 Feb 2025 04:32:36 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1739074484.93c764bb648eebcb1c878f4019b33ebdadc2233b.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-devel/patch/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-devel/patch/patch-2.7.6_p20250206.ebuild sys-devel/patch/patch-9999.ebuild
X-VCS-Directories: sys-devel/patch/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 93c764bb648eebcb1c878f4019b33ebdadc2233b
X-VCS-Branch: master
Date: Sun, 09 Feb 2025 04:32:36 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 10066387-3088-49f3-8e77-a9b758afc1d4
X-Archives-Hash: 1545f8a7bd787542226bff9d6d465733
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() {