gentoo auto-resync : 15:02:2023 - 08:00:21

7 files changed, 13 insertions, 9 deletions

diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 43f74f3d80dc..17dd2fef0e19 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/chromaprint/Manifest b/media-libs/chromaprint/Manifest
index c9f917f88825..968418def306 100644
--- a/media-libs/chromaprint/Manifest
+++ b/media-libs/chromaprint/Manifest
@@ -1,4 +1,4 @@
 DIST chromaprint-1.5.1.tar.gz 1581159 BLAKE2B 9f7f030e97d3114cf679df298d313ea826c0fb05e7e7d8a10090d0a27ed0811b380b81b29fce973e0493826c478964367396311fd0484619cb2fc4c2d8e0d4c0 SHA512 ea16e4d2b879c15b1d9b9ec93878da8b893f1834c70942663e1d2d106c2e0a661094fe2dd3bae7a6c2a1f9d5d8fab5e0b0ba493561090cf57b2228606fad1e66
 DIST gtest-1.10.0.tar.gz 904227 BLAKE2B 96b97b06730a9f55505a4d40bd4861560503a1437d29dadc6e8d3c743ccde020e61b3f96082fb9bda0666d739e69d3990bad06161e9c531c40021dc0826f5547 SHA512 7ebf5b4a80f364564066ccc7ce2e2092b12942a754c4854afd97380f19811e0fd45c300d423234cda0e05966ddbdaebcb1625e856ce55b0c81b0bae0dd971532
-EBUILD chromaprint-1.5.1-r2.ebuild 1628 BLAKE2B eeb24b160b059cc607771bcb04ba51d1c23520043d87cc52e41a16a46f130ac17eaa12c0ad3ab1b0d272ba7a8dac173407a7b44292d5205f0aa75e90a0f03e4f SHA512 0fc3ce04321d4b9b83238964b8fa9b7ceb07736eb8b6c13250c7fb21d5d96621fc405cfe74522331c6d91259849c0601c245b26aba6b5434eb1299b73f5b03d6
+EBUILD chromaprint-1.5.1-r2.ebuild 1740 BLAKE2B f508904baf30cf4202450e69c2767e3edf32accfca50943e337c4a77be0931f4afef639a5e695f20278296654911da86b6a1852f88316c9c49e1ff9936f57cfa SHA512 4f4dec8760e70bcb4d53404701563be187e85975137fe132e7d6e0485934077cb6e5303e250264d62bcacf09c7909988bf23c50b156666d9d8e14d4d67ccf306
 MISC metadata.xml 503 BLAKE2B badb1250c59d72306e528508fe7016028a5aec5f349ad050437ba4c818ed0fc9d63efcdab5774b5ad94956067fe4243f6f4aff5423e25a2ac9685e147590d976 SHA512 b10104402e9b04d904a9ef4e6876bb52764ccf4a0b38b1f5ef7b5b9534737e64b285bfafdb3e9f7582fc21d0204f52014cd7eea6e22c8097ac46f15c111971c3
diff --git a/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
index 123873b60767..df7811180d4a 100644
--- a/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
+++ b/media-libs/chromaprint/chromaprint-1.5.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -19,9 +19,11 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
 IUSE="test tools"
 RESTRICT="!test? ( test )"
 
-# Default to fftw to avoid awkward circular dependency w/ ffmpeg
+# - Default to fftw to avoid awkward circular dependency w/ ffmpeg
 # See bug #833821 for an example
-RDEPEND="tools? ( media-video/ffmpeg:=[${MULTILIB_USEDEP}] )
+# - <ffmpeg-5 dep for 1.5.1 for bug #884393, newer versions likely have
+# a hard requirement on >=ffmpeg-5
+RDEPEND="tools? ( <media-video/ffmpeg-5:=[${MULTILIB_USEDEP}] )
 	!tools? ( sci-libs/fftw:=[${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}
 	test? ( dev-cpp/gtest[${MULTILIB_USEDEP}] )"
diff --git a/media-libs/libquicktime/Manifest b/media-libs/libquicktime/Manifest
index 868d6a571a46..5c6d89297836 100644
--- a/media-libs/libquicktime/Manifest
+++ b/media-libs/libquicktime/Manifest
@@ -6,5 +6,5 @@ AUX libquicktime-1.2.4-ffmpeg29.patch 13436 BLAKE2B 8a1e7b5df65f5297f59aa17c4a52
 AUX libquicktime-1.2.4-ffmpeg4.patch 14723 BLAKE2B bd1299c24b738b3752e4d8d50ed1b2fa2f208c83e577876118d115fca22293e102614ae0cdc168060115f7145d951d290bccf21154fda4aabf55329d310b6aca SHA512 1b11a82d694654976a5f79cd8feb27eec3810e09a66dc58ca576eaf1f96e4948abd4dae7955a7da6cf99ae6ffef9e183b39090d96cc6b5fe216b4c4f4faff7a8
 AUX libquicktime-1.2.4-implicit-func-decl.patch 235 BLAKE2B 275b71da56e9d499865e95b4c84e8a7b4e0b294daa8dc95bfeb1ad6588cace9822b17d7645561195e8d8c569ec7de94f7319e2f2ad8dfd13e6a18667b479e80f SHA512 e3ebd066dcdf393a7b08e7c592f664261b87ba7d2cfa5cad2d4bf364c25477b9290ffd30ea124dce7f09ce3b3c3139026d5685f2059b3d277f227c8eec4a9cc4
 DIST libquicktime-1.2.4.tar.gz 1028626 BLAKE2B 6c50965be5d19fb4c57ea6b36f2581ebd575d78a34f2df7029ce2c6ee560e8135a953a2e85d91d189e2c01b97c99804d0eab602866b88a5f07c36351174680f0 SHA512 6ab6cd62ae2361bb3ad73725e9e8baa2b03361bc23e9e34b24f90c0e2bec4337de950ed7f30a6a1d2e67ab33e8f0c43538369fd07e417f54b84583a3c331f8dd
-EBUILD libquicktime-1.2.4-r4.ebuild 3687 BLAKE2B fe7a96852d64f5026b106e9486e2e0417c903cb235a3df7c62a7743a97449855a60c8e14f0c9f986dad5f9afd54dc8f82d814ece5e87ee575b620615d294a98f SHA512 778ca0702d83347d1ce7b5b231136becdcabcbb582ee3b57d0e3c2b0251fe54b51615e28ca5136ffa975c8a5cc496e60883edd7bbfe437cc41ff533bb16007e2
+EBUILD libquicktime-1.2.4-r4.ebuild 3769 BLAKE2B 243d7c07f1f7af09004d01eec642c36c7e700e36b472877a79480e19dac5e68cdfb2ee638a9ad5f4e51648965400b50e9046617e613cb7091f8b0657e835f0af SHA512 455eb9fa498de181b488dab53dd9084f4858caad4965f0026d054391b30b89b0b416d785c4e8fb4b00f839d0292626801bc359d6d8dba8c79ef201a23c43c27e
 MISC metadata.xml 306 BLAKE2B 5dde92ce1f7506afb07de09c7c6148c2c4d2f82a2bcd5a7cb6397af0353b6b867d68a504e5eb0f9cce160c444f69b64708d3e737ec0f71309b8fad6510586d8a SHA512 83fe67ab5171754f4c61fd1546c39ffef692be44cd1a76ae00744a0587f8d03cdd37c02a952c8ee231adf32ee510fe362c6b36ff8bf235524d6f7510adb63686
diff --git a/media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild b/media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild
index 42a5ddc7da46..44db60e328ff 100644
--- a/media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild
+++ b/media-libs/libquicktime/libquicktime-1.2.4-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,6 +14,8 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
 IUSE="aac alsa doc dv encode ffmpeg gtk jpeg lame cpu_flags_x86_mmx opengl png static-libs vorbis X x264"
 
+# <ffmpeg-5 dep for bug #834384, Debian has disabled ffmpeg support entirely
+# as well.
 RDEPEND="
 	sys-libs/zlib
 	>=virtual/libintl-0-r1[${MULTILIB_USEDEP}]
@@ -23,7 +25,7 @@ RDEPEND="
 	)
 	alsa? ( >=media-libs/alsa-lib-1.0.20 )
 	dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] )
-	ffmpeg? ( >=media-video/ffmpeg-3.2.6:0=[${MULTILIB_USEDEP}] )
+	ffmpeg? ( <media-video/ffmpeg-5:=[${MULTILIB_USEDEP}] )
 	gtk? ( x11-libs/gtk+:2 )
 	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
 	lame? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest
index 5ef292ebc9d3..4026b88fca50 100644
--- a/media-libs/libsndfile/Manifest
+++ b/media-libs/libsndfile/Manifest
@@ -1,6 +1,6 @@
 DIST libsndfile-1.1.0.tar.xz 730604 BLAKE2B ff2d27bff460c4d3c549bdf70c84c6f17a2c3e10674a44216ed83e657e603ddfbc33afe0827676fc4f5dc7745a9fb6aa866023fe589d0c00714477e3a246e5f2 SHA512 d01696a8a88a4444e5eb91a137cf7b26b55b12c1fe3b648653f7e78674bbdf61870066216c9ff2f6a1e63bdf7b558af9a759480cf6523b607d29347b12762006
 DIST libsndfile-1.2.0.tar.xz 730268 BLAKE2B cb13fde9b9f44c6279a9ee7741457824eb41fc17261bf9c669d757e9e506eba2c3d4ad259e4625b8a11c82308188cc19f7399e9d1fc0299a3a11794e4b653e47 SHA512 c0dee6b33cd3c619aa13ec2854a5480e826640ca98a438758346194e83752af576a39f9de118824f0d0c61288632d87b489dc5793c025296e0f15564d87ca12a
 EBUILD libsndfile-1.1.0-r1.ebuild 1912 BLAKE2B b20f8339faa259f3f0381480910e24d5fb69d974a9d6ae52273c13891cb914e7a80ce38fde21b74a3135c5d4961efccd0cd3d3e079b128d22dc130c05a9c2aba SHA512 8d4c0d9d01e54df1f5289cc04a856f6ba8c3529a2a11df100ecb35106662feaeb08a962360b1f2282c79284d840d2667ef296c6bbec144cff3cb90cccdce2d85
-EBUILD libsndfile-1.2.0.ebuild 1915 BLAKE2B 29ab0ce7ac24d36d11cc9681249b8ef8c45e8056d1330eded217cfa9f907b31a05b71fcd6b9073f3242cbdf04f08250cfa330e41874824c27f65bd884ffa31e1 SHA512 99e83353deb0f0f71701e8060307dee9f36362368caeee511bffad6c6780c23638ed8380391f60b1275e6c45f21db4a025b836383b4a1e1d0ed77225f9deb9a8
+EBUILD libsndfile-1.2.0.ebuild 1914 BLAKE2B 203fe58545cddad9126ad14a91e47f604e87b5552b2bb089a619d9271c347b1d308df9999eee16330e0ba8246b32ff2f6f621ccda6e2b19f7bf047a78497f25d SHA512 c79fd9f4da998ae2d16eb16e326b12c96e2403ed660605e1a178eff5d7d8715ad720654cef8984460b6a24a2e69c4ebde937c5004ba2b6e63d4383dd72b492f2
 EBUILD libsndfile-9999.ebuild 1912 BLAKE2B 9f3eb737c48715633a9b3ff701f70813fbc6c60291ccb6d82b2e23fe3798ad5e6862e1fbe7daa80497804eccba4f8895382bdd026e5667e588415bcd7d328f6d SHA512 87b39080034d5f4166b9e73079abe489b3af5b58ff16ca638c79575bd4834c729904ab097e167d7f6adec058418a3fb1d097a3961c6cb66badb9640d4f23d37f
 MISC metadata.xml 340 BLAKE2B 26c245d58463cd3d14645b476de30407e51e47777d36dff251f0f68d9e981e8b6d95cf9aacc51d08feb4f1e550152f38b66d8dae23c40fd1b65702d59044b05a SHA512 54f132b485fc720dc0e1c311370dbc5f7ed4d3a1c8271aafeb9f01fef411df95f0cd55d605debcc3477fcc07aab4b298c240084e70df19a10b1b22c33d57b9c2
diff --git a/media-libs/libsndfile/libsndfile-1.2.0.ebuild b/media-libs/libsndfile/libsndfile-1.2.0.ebuild
index c3587d2d7fad..3dbd9c80ca43 100644
--- a/media-libs/libsndfile/libsndfile-1.2.0.ebuild
+++ b/media-libs/libsndfile/libsndfile-1.2.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/libsndfile/libsndfile.git"
 else
 	SRC_URI="https://github.com/libsndfile/libsndfile/releases/download/${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 inherit python-any-r1 multilib-minimal