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

5 files changed, 32 insertions, 24 deletions

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 93c7025a9168..c07a8a13f02f 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -39,10 +39,10 @@ DIST ffmpeg-rpi-7.1.1.patch.asc 833 BLAKE2B a30e8d0216325ac86a3b7f8ac132a61a1d3e
 DIST ffmpeg-rpi-7.1.patch 759127 BLAKE2B 90588440a30ba6cd1cb32e92cccc1ae11a85d518f654a9e8148564b843553af911f33ee0fa938d56fe175c27dab95bdeaa4aa2296ced493e8e7aaab7a5d02e47 SHA512 675a4c8197a59b11e014dd2344b6d7262ea0fbb97c34b1f038d94904759cad8888fd396611e0137b0e196996ab2123db72ddfe17d7fcf8f0c34ca4a22889c172
 DIST ffmpeg-rpi-7.1.patch.asc 833 BLAKE2B a0874b58be460f512f924c07db93ecb198d1399c6c99d7921d5fa3db220b05b2ca7e7d34d5c68eae66fb4d03e03eaf0b5c7e019e2a293364b50395c575a36a94 SHA512 7f62d98c7c64329c353881fd441f5af8745f76c31a39485c44ea50ce9dead74c05465f310974fc2ceb23e9ac2c8b5b97a9be8957c574e478d883c65cb3041840
 EBUILD ffmpeg-4.4.5-r1.ebuild 19956 BLAKE2B b7ca0c144bc5250f4455e55d78954dab2f07adb7fedbc5171d56d26a38c831e841535a5a3e1055220f0b50b327205bf569a7ac40747cd095a5f2f5138c5a5de0 SHA512 6e8807befe505591f79ccafaca9aae56d08b0ab10c151ec0d743727514c9c3c84368c8cf0e56441d9b20379c24d4e01a48f7264b11a1da1e3a4954f18306f196
-EBUILD ffmpeg-4.4.5-r2.ebuild 14409 BLAKE2B d048d28498f200c3e1587931b822dbca7faaf30999be51715711e16d484d511160452e80e9406ee4e908656539bc337e865186540e324b8565067b92ec7847db SHA512 6af2f4f570074e6f146f558ef9596b39eb8b05ba87c2cf3939ab47be52d531e66a6f85f4550b16f68f272c75b78b3e3938f938dcb03839294ff2729e4d3f5918
-EBUILD ffmpeg-6.1.2-r1.ebuild 16538 BLAKE2B 723fa6b72bf020386ba64d8435bae59eccc8961a19ee3a865f1747d4e0dbf6ae9051a13a25334a2e4aa819bb3eca16cae90355f7af80d3f6986ad196821b00ca SHA512 c0da5de68124cbcea8edfbe85dd4eb32aacfa75ce60e4b390d4686fbe7cb5ced9ea494fbae0daff450e3c1de0da1abfbc1d84c95dcc1c96f92ed961362af3179
+EBUILD ffmpeg-4.4.5-r2.ebuild 14380 BLAKE2B 522979a885667ef4c3b2b76e29ede102abe12cdd2bd196c74517b840fce813316a85a4d30c2140a30a6983512d60fa58c301b1c6dc135949d8291e4a5b7824a5 SHA512 e263b8c4c979b7e362736825604c0e06e70bc8d3e374e46ccfff561e1d9ac8ad8391177150d293a0699c5fcc8bcb2cafed44db620de055eb1a8b81202b3b50f5
+EBUILD ffmpeg-6.1.2-r1.ebuild 16509 BLAKE2B f6f0cfa83fab6815c6514a046cc66cee2a2b58b1a508f123d55581b3f7dd686ec64bf0293e707ef264e867539db1bcdb45f9e7b52d66067edf6c65c7fc783b37 SHA512 5c4c4fca4338a6defc18fd16ea7c1b269b0bbde158be20b3fcb66d02bacacbaec37ca3d386df306f010b9a7eb045b8145692cb6abe3f17e6851dd276fea90141
 EBUILD ffmpeg-6.1.2.ebuild 20422 BLAKE2B e97868eb815439d994a4a80018eaeca23e9e25a18b58cb841710e560ed0467bc54ffeeba7a18257d8f91a6e948f52a382519cd7f7caf34b467d1a8d6c56bde4e SHA512 40dec5943ce7641360d6500df8f5843f863064b75d074b0b2e948449c592f761634c9c2064ec7b6b2854ec07b1e4d003b0c6c11fcee729ec6c3e5ea9a0e4ee81
-EBUILD ffmpeg-7.1.1.ebuild 16967 BLAKE2B 6aa88f806c9e07250203df0407b34e6ed5e40a12e8883477a847e3c3b6b2a3e7e1ac019f6b757c2503f8b21889e54ea59cdd783da3364724049c3a8fc4c82b6a SHA512 4574118055f19c7964a60a58ed3e70116f4af17e124199ecd6c7a08f6b6d41f73ff18e97492234784a31f0b95eac4b4c68fac8994ececf19b23013915feb0003
+EBUILD ffmpeg-7.1.1.ebuild 16938 BLAKE2B b001261e1620d4d1c76ce6a66c5a4f632ffd19ab3b570a63015d7ee623ef77947731a99ad026ff9c9b1959e78e121d722c35cbf53832941d847a5433997a25b3 SHA512 655ce59c909d9d853c9a9100ed91272d7ac465296e4fc952bd5eed14d626b5216aa1d31cb09ee1270ba08b25fe449fdf72027cb7282dded4ea1e5ca173699e57
 EBUILD ffmpeg-7.1.ebuild 20587 BLAKE2B 359f402ab63c8b3c3cc91b8e41238f20eb6f335e40610d5d6391052f71a5b3e40437a0665b9b593dbd6b08f473bb7988909bd29210dd094a8966924d98565df9 SHA512 cc3c593ef6c1058e555bc50fae407187a13344b36c544fdc448d769f787567107df37237ae238808b3cb2496e036fa62055c6dcca97102d86947ba6cb8929d8c
-EBUILD ffmpeg-9999.ebuild 16929 BLAKE2B dee76a675d7f2efc3f46f34726457764036fca43a05906d345038d6cf602cf821dad7a2305e99c559a6400a0be3f7b3b5955d0d79b651e83f72d391fe031cb46 SHA512 72637ecf4d43c5087bd1d6ddd1588ca96b3ee0d9f1baf84066189064116c224b975b57d624098be8e051b27ea6b65a0dceb614efc3a490225681593aa0f6715c
+EBUILD ffmpeg-9999.ebuild 16900 BLAKE2B 1b59955c23a7a7744ee858ebcaf6df44b19a34cb3e8e52aa752f3a6576aa56936390aaf6035490edef0390bc2e44f977590f7aefeaca34eae2b912d458d7e1da SHA512 e3ec5216ef777aa236ecf538b48e3907a090818c9446b9a5b7d29c19ab00bcdef35324f5ff14ab4c9cd176d4bc4bd30509d7217aaf3e35f22bef145474e1c1a9
 MISC metadata.xml 10000 BLAKE2B a051697826b39351c38b74cbed0113b0a7a20715b3405040a4e0b1411f49578f471e359567c1692bd6783557cd24cbffb9c850744c445abb6354bcb038db0ad3 SHA512 d67578f7f63dfa33d480bd0883ffb98e49c9bc4a02adddbb75fdfe6729b1d8bdc90d1d1536fcf34287577997fe29663573755c014072614b96e64af97d30b691
diff --git a/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild
index e86d43b6f530..65a166b2236f 100644
--- a/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-4.4.5-r2.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/ffmpeg-6.1.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild
index bde869a247e0..036bca40c424 100644
--- a/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-6.1.2-r1.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"
 }
 
diff --git a/media-video/ffmpeg/ffmpeg-7.1.1.ebuild b/media-video/ffmpeg/ffmpeg-7.1.1.ebuild
index a7eaa68c0f14..78c6328aae0c 100644
--- a/media-video/ffmpeg/ffmpeg-7.1.1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-7.1.1.ebuild
@@ -52,7 +52,7 @@ FFMPEG_IUSE_MAP=(
 	codec2:libcodec2
 	cuda:cuda-llvm
 	+dav1d:libdav1d
-	doc:^htmlpages
+	${FFMPEG_UNSLOTTED:+doc:^htmlpages}
 	+drm:libdrm
 	dvd:libdvdnav,libdvdread
 	fdk:libfdk-aac@nonfree
@@ -316,7 +316,6 @@ DEPEND="
 "
 BDEPEND="
 	app-alternatives/awk
-	dev-lang/perl
 	virtual/pkgconfig
 	amd64? (
 		|| (
@@ -325,7 +324,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+="
@@ -422,7 +424,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)"
@@ -554,7 +556,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/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 81d185eef1da..a2db69e97ad0 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -52,7 +52,7 @@ FFMPEG_IUSE_MAP=(
 	codec2:libcodec2
 	cuda:cuda-llvm
 	+dav1d:libdav1d
-	doc:^htmlpages
+	${FFMPEG_UNSLOTTED:+doc:^htmlpages}
 	+drm:libdrm
 	dvd:libdvdnav,libdvdread
 	fdk:libfdk-aac@nonfree
@@ -316,11 +316,13 @@ DEPEND="
 "
 BDEPEND="
 	app-alternatives/awk
-	dev-lang/perl
 	virtual/pkgconfig
 	amd64? ( dev-lang/nasm )
 	cuda? ( llvm-core/clang:*[llvm_targets_NVPTX] )
-	doc? ( sys-apps/texinfo )
+	${FFMPEG_UNSLOTTED:+"
+		dev-lang/perl
+		doc? ( sys-apps/texinfo )
+	"}
 "
 [[ ${PV} != 9999 ]] &&
 	BDEPEND+="
@@ -416,7 +418,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)"
@@ -548,7 +550,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"
 }