gentoo auto-resync : 15:07:2024 - 12:27:33

3 files changed, 8 insertions, 6 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 4e27bca6cd8b..4a9278ee0d8f 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -38,12 +38,14 @@ DIST ffmpeg-7.0.1.tar.xz 10793572 BLAKE2B 7468bb0768da56794c57b43db5fb8a1c5471f8
 DIST ffmpeg-7.0.1.tar.xz.asc 520 BLAKE2B 3fe3bdd8da390591849ac3784bf8e68e021124715de1a8d142a42096d625df9d9a27b224258f2f0c24b20397bfea7a8035ced4202904ca12fe0eef109516dbf1 SHA512 bd787bfa6dbb147800f5f79a3fe5e4c20054d48ea9e6af4d5c84ace68c19459f4ea677f5921b084eab889ed7b9f81dc138fa2ecf9ae306ac7fb19434a68aeced
 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
+DIST ffmpeg-rpi-7.0.patch 807653 BLAKE2B 2d7d4fb55313c0ea227bf714af08fe17c118969aef972cf85bd8bf33643da08b2a224b2ea7c369a58e62fb758c0e8747c6cc6694672b889016fdb16b3d33f530 SHA512 cf65f68f6b0fa351d273c1b4fd74fca63a40cbd802bcd14124018784164fd1c6a09de3d9b0e0631eaf4c8b4fbcb846cc47a7831ad70eb0cfac6d21a51bd09941
+DIST ffmpeg-rpi-7.0.patch.asc 833 BLAKE2B 3086d77e2cc05b7c295fcaef26a9a0d32775999d1bab9075eeeb0a80804b35928698efe870a432558ece55d7873e016422a00013e7d0cca160b71172c31ab449 SHA512 cc885f01b9547f17c6ef1d26d7d1d053186fdf57aa31c0a411a2ab1c0246cec9c2aeef8687e7f8eb0c998d3379712541c60432bc2521a3db1b45d72d316c2d2b
 EBUILD ffmpeg-4.4.4-r9.ebuild 20312 BLAKE2B 50dd3e95cf6277261dc983dc3d807a4a5ed1a06c046fff5d6cb53ab7e17088e04fb62fd5bd45ffdf034a0bd7c419e69afef490145d1da4ac1c89d07d89a44db2 SHA512 9a7da74b1ef83289b697681e4e7f0e699865e156af24617dfabc88934b3374bf8aa8416759d120a016debfded168d3e9c0d4ef07e712e70f778a10d0af872c44
 EBUILD ffmpeg-6.0-r12.ebuild 20022 BLAKE2B 1d27958625368f9748d5a2a4a06bad7042795fd7cc0080285ee07ec98bef187ede3f0a327ce442a2c61d2f60adf84de014a916acd405ae4455ab2acfcf25cb6b SHA512 9469da9701053831748314d4a3ef750e260106113197384ecabca51cdfbacab79018e26096b3b5ea96080f849de9ec032462f093bd41eb57e73064185e40df06
 EBUILD ffmpeg-6.0.1-r4.ebuild 20020 BLAKE2B c19d2af1c04d2c202fc84efda51da246f265b472ab414a3f613542cbc845e8d6e3e78d02ea4ef448866d6a711534ef181c4850bb75fc04c6c499755c0c4046ca SHA512 2f7e5866ce0f1d47332a1d8233b436a6d3680a75e5e406519387f177e3574cb9b7181169d8eb51273cf5fc5695f410ad12e1062ed3fc2d05fbdfa80c37d0a15e
 EBUILD ffmpeg-6.1.1-r5.ebuild 20309 BLAKE2B 724f6222ac5999f1aa80296dcb90390fd854688d76acf9981eaed04652e41dbe6c982907f26d8d02b1240d220ac0c43c365ec0eda2bc8f52d50641762d2d7f7b SHA512 8dc0b5537bb702bf08a71103c5a38a004790432b6865f8f4e657d6f7d1b32152532fbd0bc717a4a2b237a48f80805b26f11674f2bd533f23110194ffde906140
 EBUILD ffmpeg-6.1.1-r6.ebuild 20510 BLAKE2B 924d8763c95647138ef578a0a912c54f35d3b6c16281c17d7e46ba82546c13905b0e2fdb1d757b324832204e657845e77b4d9a802559bda65e3b7c17c8124630 SHA512 9653f6bf8dd6b69b11ad8b0cb3cf3446edeffd55625f923fd65023cd3189bf3505250d81f06d2c6dd354eaa8bc687256f32c4068c3187752cfb5f8e1632f8239
 EBUILD ffmpeg-6.1.1-r7.ebuild 20571 BLAKE2B 8a34d134759e473bd3473b5aadbe8b82d8f889d800afa149ad898b68a31b4fb0797619b5eff7cacbbd708ed307e0032772383c9bd6793e4e61c009d3e7e00e67 SHA512 aa8c9064afb83ebf1d35cdfc314b0c75ead778726c3210afedcd06844d55f52add0f0567023d8a4c6ecd6b3be261cf51fd10ee2512f0fd83e23d4613a9d2e254
-EBUILD ffmpeg-7.0.1.ebuild 20549 BLAKE2B 11da77d16d5dbb4cbf43213af68c6ab4806ae137b8fe9e3efbefdea5a6c4bb9683a495f3cd53be9210c79942618f715d204f05e92baeb88357dff6bf5ddf5b97 SHA512 c733af3d9f43774b55223431e247399a4fdf38d34c890e8e323c95c8c5744ac400423fc4988eff8196d65d90be4b65440bf8fc729b8e61eb99fd04f1e029ef21
-EBUILD ffmpeg-9999.ebuild 20611 BLAKE2B e5cabc4d6eb5cae004bb17ba28816c0af519f8784ed3636f273f3d42ae31ec0006e55bb6a6b71a3253f861079de43413083f63c488300caccc575364e2f2c760 SHA512 5d4df431f34cc8cc53bafcb1f1426cb2a368a2fa021529ec096524158ff3f7e3ff5d004a220a51174eed32f883141918f12856b23013ce35a39cb1a379569901
+EBUILD ffmpeg-7.0.1.ebuild 20557 BLAKE2B a1d849d9aded5d1c6a045b5691065e4da6a11930d448f805aabf83ed499d433b44957bc48ca2812227fd554d8f0b64a61b4e40a4afa4454d32a0654f6c443b8f SHA512 32aa9365b3bfa5c3fba0d0d292684c6cfa696e9913ffccf3c5f33efcb1b666a67df190a41bfb7f639b077410312ecf460d0992cf55db084a6b2eb2e4b16b40c1
+EBUILD ffmpeg-9999.ebuild 20619 BLAKE2B 015e7f0308fb8f7553c48270efa42dc08fd60236ac0ffad31ec22a174c4609acd16af29450d606e187151b4fe974902f868dc60949b5cebbd0428541b44f8f99 SHA512 4832eb520f6d9309762c6da27f4e2be6688330af18caeb8f77193a661816409a44403b9985f7b5ab9f5008a1a52e0e50589390a6b4306584c4f681bdb27f7db0
 MISC metadata.xml 8343 BLAKE2B 4fa89eaccf10b2b691d66fc20df7cc09b31b848d0c054040664f6d9b132ba422c3a9cae2b239a95f307b4f15d1a5432e751a72fe1e4239376252bee9b814c59a SHA512 9b085513512c323c524d88837a517ebeb6a9db7212e4353ae1330c1db763761aa8114a47337a2f85a18ad2adae210cb56fb0472b09dfd78fdcac0fecf08ea7b3
diff --git a/media-video/ffmpeg/ffmpeg-7.0.1.ebuild b/media-video/ffmpeg/ffmpeg-7.0.1.ebuild
index fa7e8bbf4005..797aa00fb30e 100644
--- a/media-video/ffmpeg/ffmpeg-7.0.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.0.1.ebuild
@@ -14,7 +14,7 @@ EAPI=8
 # doing so since such a case is unlikely.
 FFMPEG_SUBSLOT=58.60.60
 
-SOC_PATCH="ffmpeg-rpi-6.1-r3.patch"
+SOC_PATCH="ffmpeg-rpi-7.0.patch"
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -46,7 +46,7 @@ else # Release
 	BDEPEND="
 		verify-sig? (
 			sec-keys/openpgp-keys-ffmpeg
-			soc? ( sec-keys/openpgp-keys-gentoo-developers )
+			soc? ( >=sec-keys/openpgp-keys-gentoo-developers-20240708 )
 		)
 	"
 
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index a7e9087b1df6..8294c24da0d7 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -14,7 +14,7 @@ EAPI=8
 # doing so since such a case is unlikely.
 FFMPEG_SUBSLOT=58.60.60
 
-SOC_PATCH="ffmpeg-rpi-6.1-r3.patch"
+SOC_PATCH="ffmpeg-rpi-7.0.patch"
 
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
@@ -46,7 +46,7 @@ else # Release
 	BDEPEND="
 		verify-sig? (
 			sec-keys/openpgp-keys-ffmpeg
-			soc? ( sec-keys/openpgp-keys-gentoo-developers )
+			soc? ( >=sec-keys/openpgp-keys-gentoo-developers-20240708 )
 		)
 	"