gentoo auto-resync : 22:02:2024 - 05:40:04

4 files changed, 56 insertions, 23 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index c2d0d4de5cf6..f07c486b71ad 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -28,11 +28,12 @@ DIST ffmpeg-6.0.tar.xz 10234012 BLAKE2B c70884911f3a3e40fe87473f241a2a56b303f5ab
 DIST ffmpeg-6.0.tar.xz.asc 520 BLAKE2B be294d375108b57bca3c687620ce2517c54c99012d82dc7aa1a83d5fe6d5453bd3c8620fdfb743df780cf588983a06a66a458c4e3e454dbe535cbba9da30c48c SHA512 a64cd0f8578fcea4537f5a38634c930d66c8ba4abd3e8e9dcffaeb95c3ad2e754d7bc4fbb5272409d4d32abf8180ef83f7204c6a570b52a37e635efd96cb94ed
 DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370fe23501169cb1eab08ff5ede77cfd5b397e8fb1d38756812cc82277898fd5c74b7d8495842556570c0c5570daeb SHA512 fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5
 DIST ffmpeg-6.1.1.tar.xz.asc 520 BLAKE2B 801cd976d10363d1f9fc302351b330cb57e609a266407627ef378172f28974f4a18435b8a77b9cc7a8ff7b75701185211739f685629bbda961c3588c15af1221 SHA512 0e10c1f560bab0812d759d286656593dea5940f02bb52d88d9ba7f10b12b9cc3d7aa2a41c5f7a45b319069e04dce22dc1286b3c1ba685b35cd6d04cd81c5a0f5
-DIST ffmpeg-rpi-6.1-r2.patch 797985 BLAKE2B 0678a2439361897698c6dd3d878a4d798ce1e45d3f117489882114e6b227a99ad97e9bf5a655daf051ee587afb161ca37f869c03a9585f3fc2ef6d58938f4323 SHA512 821126b311130ed408367765854d7e856767a25aef5acfc5e87cd555586aef81b5a6c86135d371a0d740a1305718da43ed98ec9851ade2e33f7cdd09425cfa5b
+DIST ffmpeg-rpi-6.1-r3.patch 800738 BLAKE2B b7e449ee5eec8b50a3b3bba233c5269f3b6845dbd18a619b844c841a97345ce24c7a5d7f4da05b08e3cb49668426b9044f3d3553d9c2ef3a50aec7199bfa3c09 SHA512 aeaf12afabf5f2192fb0b6ef47397d8477b109e49cee8c02a890d1656a27b1985c62c719ef72966d8c97b0709918233b65ea2e0ef988771507e4be137fcd9158
+DIST ffmpeg-rpi-6.1-r3.patch.asc 833 BLAKE2B 31fd5823c06d5884f7b0980de9072c35bbf4e1d6c0ed20b089439325d50956127238ca29469b003dba623b888a5aae3c4d8ad177862534e77b8e51f29cbed96c SHA512 3d8943b7151e20f73e9c14b121c501847bd7e01f2cf57ff135fc8c223653ec9d433bfe4012fa564f70c0471980b66d7ec3d9b5b1b14865187187719ba110cb5f
 EBUILD ffmpeg-4.4.4-r8.ebuild 20269 BLAKE2B 2d42f92ce34afbd49b4764e59bd3ac4e05e2e052d88000c6b0f0cdeae09b7170998cd52b951145fede6db9a18d480d0eb6e0f87a498bc34f1b61e4aa656d00b4 SHA512 d6a81f4ce5be09ea5ec7e8480c9fd5f4ad9417020f0607de8356fa87f47fe4237d734270ea3224402720451ef123b3354ccc472e011963e2cb1528028b74c229
 EBUILD ffmpeg-6.0-r11.ebuild 20020 BLAKE2B a40a46d38cf91778bac13235c227dcb6c9b2d37a7760deb5ffcd2aea4fd0f12cec0a9a6cf9000882b6595b68f619dacc721365f8491bff7c0dda2739d53af97d SHA512 abeb9fba7ee4d2b704a9420c850b9cc8e87a74ceb08b9b6229c2a33aa806d576bb93396646235c41e18bfb4f36ad3d1260244386f1c7a981c5e1a95f1d80da93
-EBUILD ffmpeg-6.0.1-r2.ebuild 19932 BLAKE2B a061f4479a123e5718eddb266099c3026092e566b3de0f1402f5ea06bf0138d2996c15f71679e44ca28cc48c87506b98cd46c4ee1ef8b230260a4d45e8b61955 SHA512 eba2afb8851ed6ead9db8443d80b6b782139a0f02e33a64371442f7c02d1b901885c34116923e029091e4caa67f57ee2179a21908c0da98454586935fa73920b
+EBUILD ffmpeg-6.0.1-r2.ebuild 19931 BLAKE2B e266fa8c6477720df77d257542d536df15242132ed2d9b15412026d145f4bb5814873182ba870c71461cb75ac1bc14ed6a5cc2e83b591df2f7ec004cac5ec120 SHA512 052c5fe5c7333f6d35eb01a1455042fb613495ad8bc1b95a1981b3e25b03c58617b3a944e25c35543b42a2cbf8cddc20f61dbe950b431ca12300d66ccbfd2f63
 EBUILD ffmpeg-6.1.1-r2.ebuild 19557 BLAKE2B 37f2d46bce4dbbd0fdc1be54c718075da95fadfc6caa28fd4391960af022a2cac54374708a7e8f57455e66fdacaf69b580faaa2a532729c694c5e01faff3da4b SHA512 f04da11f41143394565733af05667e504a5d012c7b4ad669e8be46896f33f71caa3f8fc3b9fd7751667b92b40e412cb15c700423efbb1db5f7c3308fca07e288
-EBUILD ffmpeg-6.1.1-r3.ebuild 19898 BLAKE2B fede5054e2ce9385bb4f6076be8448c0410ac703bde8b9df1eb51c6f2742c1599029bc55dde9b1c01d4481b7bcda7dd0d5fed0d5a456b45648c4dd01ce74224b SHA512 c1302551d91d36d754c57157cb0243a676639a97871db3639c92e3ecc87a8d45e5b57229f6ea5b9d3c5ed9eaaeba46031bb050d4fd51717687d4aa51a290d656
-EBUILD ffmpeg-9999.ebuild 19712 BLAKE2B b403029bc7b41b992692dab7514650ea50a267af4080205de8bdb8b75345f92c20068a1d86d1763f65081195f08319c0ca5fc8de775f7498dfa848ee1dea1bc2 SHA512 04b25bf216f97ca4a3366881de6fed2494b2d9c6a1f37be5a10cc900c714d30cde9db042d0b0a63ca061ada3f8a7c053049f6d8bc61649fe214ca6b66c3b86d4
+EBUILD ffmpeg-6.1.1-r3.ebuild 20222 BLAKE2B c6f97623ca85962d72a50f16e219fcbb200c5bae9e510f650d97d7b4dd02c5e4be85de2442a02ab98b4289f412ac1791c84482c89d49aef8407aae46be537845 SHA512 792af976d057ec799aff4bdbf5766f891f45f26401eabeef62435be52915cdebb026038c964a43de02be6ec3b49b968ceebe11e52c0345b3772efb0d2fcf2d4b
+EBUILD ffmpeg-9999.ebuild 20036 BLAKE2B a43010a5fbe76d398e3971d476c27057c8a61c47af980a74391e23eaf63d743b10d1a8033fad7d461b880ffdea164d898d85900963a42b2ef572b62a07769efb SHA512 a17dc4198cc358490f129c865eb57fc1611c922c6ed08272373cf5da774b2084f2046079333df1a6f0b480f19f5f1cda9e51f221ea40474fe2208bc753dcc3ef
 MISC metadata.xml 7897 BLAKE2B 911f673353c480db243c202046f876840849cb27155fb109ee365e009d20af086fe188d91c7d33d509a7362330cea853a808c8e0a463aca8de3c304a3ed52ed0 SHA512 bdf26ee26d65a5ce58bc958eaad682cf4b5101100566cd4a4adf0b671418a2a7958a54baa2abff480f17bfcfe2d33aae20ba7d37f0d7b116f210d40796483da1
diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild
index 675c19801444..d50d1b93465a 100644
--- a/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.0.1-r2.ebuild
@@ -64,7 +64,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild
index 888e0620aa5c..596ee769ea0d 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.1-r3.ebuild
@@ -14,9 +14,7 @@ EAPI=8
 # doing so since such a case is unlikely.
 FFMPEG_SUBSLOT=58.60.60
 
-SOC_PATCHES=(
-	ffmpeg-rpi-6.1-r2.patch
-)
+SOC_PATCH="ffmpeg-rpi-6.1-r3.patch"
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -29,18 +27,36 @@ inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
 HOMEPAGE="https://ffmpeg.org/"
-SRC_URI="soc? ( "${SOC_PATCHES[@]/#/https://dev.gentoo.org/~chewi/distfiles/}" )"
+SRC_URI="soc? ( https://dev.gentoo.org/~chewi/distfiles/${SOC_PATCH} )"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	:
 elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
 	SRC_URI+=" mirror://gentoo/${P}.tar.xz"
 else # Release
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc
 	inherit verify-sig
-	SRC_URI+=" https://ffmpeg.org/releases/${P/_/-}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )"
 
-	BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )"
+	SRC_URI+="
+		https://ffmpeg.org/releases/${P/_/-}.tar.xz
+		verify-sig? (
+			https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc
+			soc? ( https://dev.gentoo.org/~chewi/distfiles/${SOC_PATCH}.asc )
+		)
+	"
+
+	BDEPEND="
+		verify-sig? (
+			sec-keys/openpgp-keys-ffmpeg
+			soc? ( sec-keys/openpgp-keys-gentoo-developers )
+		)
+	"
+
+	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
+		fi
+		default
+	}
 fi
 FFMPEG_REVISION="${PV#*_p}"
 
@@ -390,7 +406,7 @@ src_prepare() {
 	fi
 
 	use soc &&
-		eapply "${SOC_PATCHES[@]/#/${DISTDIR}/}"
+		eapply "${DISTDIR}"/${SOC_PATCH}
 
 	default
 
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index db1b3604cfde..12bc542e102c 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -14,9 +14,7 @@ EAPI=8
 # doing so since such a case is unlikely.
 FFMPEG_SUBSLOT=58.60.60
 
-SOC_PATCHES=(
-	ffmpeg-rpi-6.1-r2.patch
-)
+SOC_PATCH="ffmpeg-rpi-6.1-r3.patch"
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -29,18 +27,36 @@ inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
 
 DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec"
 HOMEPAGE="https://ffmpeg.org/"
-SRC_URI="soc? ( "${SOC_PATCHES[@]/#/https://dev.gentoo.org/~chewi/distfiles/}" )"
+SRC_URI="soc? ( https://dev.gentoo.org/~chewi/distfiles/${SOC_PATCH} )"
 if [ "${PV#9999}" != "${PV}" ] ; then
 	:
 elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
 	SRC_URI+=" mirror://gentoo/${P}.tar.xz"
 else # Release
-	VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc
 	inherit verify-sig
-	SRC_URI+=" https://ffmpeg.org/releases/${P/_/-}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )"
 
-	BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )"
+	SRC_URI+="
+		https://ffmpeg.org/releases/${P/_/-}.tar.xz
+		verify-sig? (
+			https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc
+			soc? ( https://dev.gentoo.org/~chewi/distfiles/${SOC_PATCH}.asc )
+		)
+	"
+
+	BDEPEND="
+		verify-sig? (
+			sec-keys/openpgp-keys-ffmpeg
+			soc? ( sec-keys/openpgp-keys-gentoo-developers )
+		)
+	"
+
+	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
+		fi
+		default
+	}
 fi
 FFMPEG_REVISION="${PV#*_p}"
 
@@ -387,7 +403,7 @@ src_prepare() {
 	fi
 
 	use soc &&
-		eapply "${SOC_PATCHES[@]/#/${DISTDIR}/}"
+		eapply "${DISTDIR}"/${SOC_PATCH}
 
 	default