[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/

["Ionen Wolkens" <ionen@gentoo.org>]

commit:     e463e6d44412345df105f193f8f0b087687161e8
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 00:30:00 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 04:21:53 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e463e6d4

media-video/ffmpeg: drop USE=doc if slotted

This USE is a no-op in ffmpeg-compat because of --disable-doc,
may as well hide it.

fwiw also hide the perl dependency while here given this is only
for man pages (pod2man) that are likewise disabled by that option.

Also drop man pages comment, left over from back when was still
installing man pages in testing -- but installing them there felt
weird so disabled them instead.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild | 10 ++++++----
 media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild | 10 ++++++----
 media-video/ffmpeg/ffmpeg-7.1.1.ebuild    | 10 ++++++----
 media-video/ffmpeg/ffmpeg-9999.ebuild     | 10 ++++++----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild
index e86d43b6f530..1085d45b8621 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)"

diff --git a/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild
index bde869a247e0..396b1de2b931 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)"

diff --git a/media-video/ffmpeg/ffmpeg-7.1.1.ebuild b/media-video/ffmpeg/ffmpeg-7.1.1.ebuild
index a7eaa68c0f14..0bbcbec0085a 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)"

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 81d185eef1da..816127d9f8d8 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)"