[patch] 0001-media-video-ffmpeg-fix-verify-sig-on-prefix-systems.patch

0001-media-video-ffmpeg-fix-verify-sig-on-prefix-systems.patch (text/plain), 4.91 KB, created by jlucas on 2024-12-31 00:40:58 UTC

From cabc2a3bffe04535d2022bfdda15643a120bce63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Lucas?= <[e-mail]>
Date: Mon, 30 Dec 2024 23:39:50 +0000
Subject: [PATCH] media-video/ffmpeg: fix verify-sig on prefix systems
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Specify PGP key path in VERIFY_SIG_OPENPGP_KEY_PATH env variable instead
of passing as an argument to verify-sig_verify_detached, since the
latter does not prepend the prefix to the path.

Signed-off-by: João Lucas <[e-mail]>
---
 media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild | 4 ++--
 media-video/ffmpeg/ffmpeg-6.1.2.ebuild    | 4 ++--
 media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild | 4 ++--
 media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild | 4 ++--
 media-video/ffmpeg/ffmpeg-9999.ebuild     | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
index a2ffb7f3e2..b79d92995f 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild
@@ -52,8 +52,8 @@ else # Release
 
 	src_unpack() {
 		if use verify-sig; then
-			verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc} /usr/share/openpgp-keys/ffmpeg.asc
-			use soc && verify-sig_verify_detached "${DISTDIR}"/${SOC_PATCH}{,.asc} /usr/share/openpgp-keys/gentoo-developers.asc
+			VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc}
+			use soc && VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gentoo-developers.asc verify-sig_verify_detached "${DISTDIR}"/${SOC_PATCH}{,.asc}
 		fi
 		default
 	}
diff --git a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
index cc483e695f..2a5017a1ff 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild
@@ -52,8 +52,8 @@ else # Release
 
 	src_unpack() {
 		if use verify-sig; then
-			verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc} /usr/share/openpgp-keys/ffmpeg.asc
-			use soc && verify-sig_verify_detached "${DISTDIR}"/${SOC_PATCH}{,.asc} /usr/share/openpgp-keys/gentoo-developers.asc
+			VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc}
+			use soc && VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gentoo-developers.asc verify-sig_verify_detached "${DISTDIR}"/${SOC_PATCH}{,.asc}
 		fi
 		default
 	}
diff --git a/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild b/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild
index aa31d2b98e..86fd94b92e 100644
--- a/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.0.1-r1.ebuild
@@ -52,8 +52,8 @@ else # Release
 
 	src_unpack() {
 		if use verify-sig; then
-			verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc} /usr/share/openpgp-keys/ffmpeg.asc
-			use soc && verify-sig_verify_detached "${DISTDIR}"/${SOC_PATCH}{,.asc} /usr/share/openpgp-keys/gentoo-developers.asc
+			VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc}
+			use soc && VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gentoo-developers.asc verify-sig_verify_detached "${DISTDIR}"/${SOC_PATCH}{,.asc}
 		fi
 		default
 	}
diff --git a/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild
index aa31d2b98e..86fd94b92e 100644
--- a/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.0.2-r1.ebuild
@@ -52,8 +52,8 @@ else # Release
 
 	src_unpack() {
 		if use verify-sig; then
-			verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc} /usr/share/openpgp-keys/ffmpeg.asc
-			use soc && verify-sig_verify_detached "${DISTDIR}"/${SOC_PATCH}{,.asc} /usr/share/openpgp-keys/gentoo-developers.asc
+			VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc}
+			use soc && VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gentoo-developers.asc verify-sig_verify_detached "${DISTDIR}"/${SOC_PATCH}{,.asc}
 		fi
 		default
 	}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 3fd22d65a0..bc61763dde 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -52,8 +52,8 @@ else # Release
 
 	src_unpack() {
 		if use verify-sig; then
-			verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc} /usr/share/openpgp-keys/ffmpeg.asc
-			use soc && verify-sig_verify_detached "${DISTDIR}"/${SOC_PATCH}{,.asc} /usr/share/openpgp-keys/gentoo-developers.asc
+			VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc}
+			use soc && VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gentoo-developers.asc verify-sig_verify_detached "${DISTDIR}"/${SOC_PATCH}{,.asc}
 		fi
 		default
 	}
-- 
2.47.1