gentoo auto-resync : 14:03:2025 - 00:28:41

3 files changed, 16 insertions, 12 deletions

diff --git a/media-video/ffmpeg-compat/Manifest b/media-video/ffmpeg-compat/Manifest
index 7839e7a7eadc..ed4e26ee8ce7 100644
--- a/media-video/ffmpeg-compat/Manifest
+++ b/media-video/ffmpeg-compat/Manifest
@@ -6,6 +6,6 @@ DIST ffmpeg-6.1.2.tar.xz 10466152 BLAKE2B ff1f2b2bb60ccc4c37b6ffda2a0e6a0be80c45
 DIST ffmpeg-6.1.2.tar.xz.asc 520 BLAKE2B f26a2d6f5423f93090f2a448172e49f3858aeb5a00f326207d374bbb70fa8942c7ee1a7c55338b2db664b647c983cd5ab4fd8d71efe5c37af4c90385ca17d0ab SHA512 a26dba1f4870b964080b45f8468f5ce3591eb6aa69be426bf4afbe5a60c3cbd0fe5056dc86ca7bb817c04ae30d39160cb7773772a9a2123ae7f095b18a6d7050
 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-compat-4.4.5.ebuild 14405 BLAKE2B a0a8a42312931989c78824f73df98f58e5761fa7d4c574a5862a30147bdfb18b4dae6b8d4b4c21dbe22e37e529dee243d3484b2c67562cac4ed3707e730ea452 SHA512 363d03ce392f1c2722ba46c43fe3cf65509a7a93189f52b4a98d2c6356726b77481994b3b9cde9eaab1c11f624651e047bcbd3f25eb11236731f340b05c1e898
-EBUILD ffmpeg-compat-6.1.2.ebuild 16534 BLAKE2B e3b437939e78885bca1b09a59fb637653434223313c354d3af066590fde07a6763ed904c89b42e4a5fe61fc608fc7431c80c956bb4ebac2baf6fcae7201a76e7 SHA512 aa4a56b39a05f7d83aba3fda9d4db895627f2e071ea5086d86a4394d9f83119ec4dcf196c6f2821ba5224851b9be252e606ad2258af256c63b02e737848e651b
+EBUILD ffmpeg-compat-4.4.5.ebuild 14376 BLAKE2B 6f9fd27318679ac57b1e913e1ae4332ceaf58e0bea4025a020b860cd39da4b6ce208ea33e862f61cea47df7da6698e26e8c9bee907bb170473422f9ccd1dc3bb SHA512 6ba19edbc98b0cbb6f728c9d3dcad33ba0f89038081bb78b60dba385a02c68759b51d46cadc1bf18ffd05156d094f27941969780e625960b80a6dcb20fe117ae
+EBUILD ffmpeg-compat-6.1.2.ebuild 16505 BLAKE2B a2f6d599c78b599aafefcb2a4341f4ac0de2ee20edc848514bbb699e4a7c1c697544df2fe3d3190b5bf56852fdf3cb0d0427e51d1abc271b131b43cad8b276cf SHA512 74226812d37f3145173aefc7d1931bcd005e5f7aeed89e8b4c39bb86535636183af248952ff26eed3ce408935bc47a6954ed5e8a6f8d8d146d8268b0b9f97577
 MISC metadata.xml 7605 BLAKE2B af1dae9179eb75099f73330e42f95be290f59e99e4062f265e0cf339d9d2e9fd3ef5265600e8e497b2edd58d2501ded48fb92fe6e3c92f1c5015fe79a999c187 SHA512 6093fd6f4c22221cc3ee7bde293f0ea9bffbcaecac8c3735f515cc37a1c48b69b6ee38acd34c892c1c72e14bc4f823714e446224f1bc4806e7bad52190fd63e2
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild
index d2dd0ae3f456..47ec3dad892a 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild
@@ -45,7 +45,7 @@ FFMPEG_IUSE_MAP=(
 	codec2:libcodec2
 	cuda:cuda-llvm
 	+dav1d:libdav1d
-	doc:^htmlpages
+	${FFMPEG_UNSLOTTED:+doc:^htmlpages}
 	+drm:libdrm
 	fdk:libfdk-aac@nonfree
 	flite:libflite
@@ -263,7 +263,6 @@ DEPEND="
 "
 BDEPEND="
 	app-alternatives/awk
-	dev-lang/perl
 	virtual/pkgconfig
 	amd64? (
 		|| (
@@ -272,7 +271,10 @@ BDEPEND="
 		)
 	)
 	cuda? ( llvm-core/clang:*[llvm_targets_NVPTX] )
-	doc? ( sys-apps/texinfo )
+	${FFMPEG_UNSLOTTED:+"
+		dev-lang/perl
+		doc? ( sys-apps/texinfo )
+	"}
 "
 [[ ${PV} != 9999 ]] &&
 	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )"
@@ -345,7 +347,7 @@ multilib_src_configure() {
 		--prefix="${prefix}"
 		--libdir="${prefix}"/$(get_libdir)
 		--shlibdir="${prefix}"/$(get_libdir)
-		--mandir="${prefix}"/share/man # ignoring slotted MANPATH
+		--mandir="${prefix}"/share/man
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
 
 		--ar="$(tc-getAR)"
@@ -466,7 +468,7 @@ multilib_src_configure() {
 		${EXTRA_ECONF}
 	)
 
-	einfo "${conf[*]}" # no edo.eclass due to noisy long command in errors
+	einfo "${conf[*]}"
 	"${conf[@]}" || die "configure failed, see ${BUILD_DIR}/ffbuild/config.log"
 }
 
diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild
index 6f0a6291b109..43d1208117b9 100644
--- a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild
+++ b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild
@@ -53,7 +53,7 @@ FFMPEG_IUSE_MAP=(
 	codec2:libcodec2
 	cuda:cuda-llvm
 	+dav1d:libdav1d
-	doc:^htmlpages
+	${FFMPEG_UNSLOTTED:+doc:^htmlpages}
 	+drm:libdrm
 	fdk:libfdk-aac@nonfree
 	flite:libflite
@@ -306,7 +306,6 @@ DEPEND="
 "
 BDEPEND="
 	app-alternatives/awk
-	dev-lang/perl
 	virtual/pkgconfig
 	amd64? (
 		|| (
@@ -315,7 +314,10 @@ BDEPEND="
 		)
 	)
 	cuda? ( llvm-core/clang:*[llvm_targets_NVPTX] )
-	doc? ( sys-apps/texinfo )
+	${FFMPEG_UNSLOTTED:+"
+		dev-lang/perl
+		doc? ( sys-apps/texinfo )
+	"}
 "
 [[ ${PV} != 9999 ]] &&
 	BDEPEND+="
@@ -413,7 +415,7 @@ multilib_src_configure() {
 		--prefix="${prefix}"
 		--libdir="${prefix}"/$(get_libdir)
 		--shlibdir="${prefix}"/$(get_libdir)
-		--mandir="${prefix}"/share/man # ignoring slotted MANPATH
+		--mandir="${prefix}"/share/man
 		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html
 
 		--ar="$(tc-getAR)"
@@ -540,7 +542,7 @@ multilib_src_configure() {
 		${EXTRA_ECONF}
 	)
 
-	einfo "${conf[*]}" # no edo.eclass due to noisy long command in errors
+	einfo "${conf[*]}"
 	"${conf[@]}" || die "configure failed, see ${BUILD_DIR}/ffbuild/config.log"
 }