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

[Ionen Wolkens]

commit:     83ee1f13c9cd0a9d3ce8b955d750b8d23f2a1844
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 13 00:37:25 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=83ee1f13

media-video/ffmpeg-compat: sync with ffmpeg

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

 media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild | 10 ++++++----
 media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild | 10 ++++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

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..1a11a7e185f5 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)"

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..2ebfe16cc928 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)"