[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/

[Ionen Wolkens]

commit:     8d3fd1732a600dc123aa10b4cfb5ef6dbe9ffa35
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 30 16:14:49 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Mar 30 16:16:00 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d3fd173

media-gfx/blender: cleanup ffmpeg[mp3] alternative

Versions that had this are gone. No need for a revbump given
vdb's recorded || ( ) is valid nonetheless.

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

 media-gfx/blender/blender-3.6.18-r1.ebuild | 5 +----
 media-gfx/blender/blender-4.1.1-r4.ebuild  | 5 +----
 media-gfx/blender/blender-4.2.4-r1.ebuild  | 5 +----
 media-gfx/blender/blender-4.3.2-r1.ebuild  | 5 +----
 media-gfx/blender/blender-9999.ebuild      | 5 +----
 5 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/media-gfx/blender/blender-3.6.18-r1.ebuild 
b/media-gfx/blender/blender-3.6.18-r1.ebuild
index b2b0c67be6c0..c5e81c940568 100644
--- a/media-gfx/blender/blender-3.6.18-r1.ebuild
+++ b/media-gfx/blender/blender-3.6.18-r1.ebuild
@@ -69,10 +69,7 @@ RDEPEND="${PYTHON_DEPS}
        color-management? ( media-libs/opencolorio:= )
        cuda? ( dev-util/nvidia-cuda-toolkit:= )
        embree? ( >=media-libs/embree-3.10.0:=[raymask] )
-       ffmpeg? (
-               
media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
-               || ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] )
-       )
+       ffmpeg? ( 
media-video/ffmpeg:=[encode(+),lame(-),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
 )
        fftw? ( sci-libs/fftw:3.0= )
        gmp? ( dev-libs/gmp[cxx] )
        jack? ( virtual/jack )

diff --git a/media-gfx/blender/blender-4.1.1-r4.ebuild 
b/media-gfx/blender/blender-4.1.1-r4.ebuild
index 6498f3f3abcc..3fbedcbe3c5f 100644
--- a/media-gfx/blender/blender-4.1.1-r4.ebuild
+++ b/media-gfx/blender/blender-4.1.1-r4.ebuild
@@ -82,10 +82,7 @@ RDEPEND="${PYTHON_DEPS}
        color-management? ( media-libs/opencolorio:= )
        cuda? ( dev-util/nvidia-cuda-toolkit:= )
        embree? ( media-libs/embree:=[raymask] )
-       ffmpeg? (
-               
media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
-               || ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] )
-       )
+       ffmpeg? ( 
media-video/ffmpeg:=[encode(+),lame(-),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
 )
        fftw? ( sci-libs/fftw:3.0= )
        gmp? ( dev-libs/gmp[cxx] )
        gnome? ( gui-libs/libdecor )

diff --git a/media-gfx/blender/blender-4.2.4-r1.ebuild 
b/media-gfx/blender/blender-4.2.4-r1.ebuild
index c6813514bc00..8fcb55057a7b 100644
--- a/media-gfx/blender/blender-4.2.4-r1.ebuild
+++ b/media-gfx/blender/blender-4.2.4-r1.ebuild
@@ -81,10 +81,7 @@ RDEPEND="${PYTHON_DEPS}
        color-management? ( media-libs/opencolorio:= )
        cuda? ( dev-util/nvidia-cuda-toolkit:= )
        embree? ( media-libs/embree:=[raymask] )
-       ffmpeg? (
-               
media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
-               || ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] )
-       )
+       ffmpeg? ( 
media-video/ffmpeg:=[encode(+),lame(-),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
 )
        fftw? ( sci-libs/fftw:3.0= )
        gmp? ( dev-libs/gmp[cxx] )
        gnome? ( gui-libs/libdecor )

diff --git a/media-gfx/blender/blender-4.3.2-r1.ebuild 
b/media-gfx/blender/blender-4.3.2-r1.ebuild
index 71102af8a31b..105a047649fb 100644
--- a/media-gfx/blender/blender-4.3.2-r1.ebuild
+++ b/media-gfx/blender/blender-4.3.2-r1.ebuild
@@ -81,10 +81,7 @@ RDEPEND="${PYTHON_DEPS}
        color-management? ( media-libs/opencolorio:= )
        cuda? ( dev-util/nvidia-cuda-toolkit:= )
        embree? ( media-libs/embree:=[raymask] )
-       ffmpeg? (
-               
media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
-               || ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] )
-       )
+       ffmpeg? ( 
media-video/ffmpeg:=[encode(+),lame(-),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
 )
        fftw? ( sci-libs/fftw:3.0= )
        gmp? ( dev-libs/gmp[cxx] )
        gnome? ( gui-libs/libdecor )

diff --git a/media-gfx/blender/blender-9999.ebuild 
b/media-gfx/blender/blender-9999.ebuild
index 6304da04d1cb..8cf95a7b4ed5 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -81,10 +81,7 @@ RDEPEND="${PYTHON_DEPS}
        color-management? ( media-libs/opencolorio:= )
        cuda? ( dev-util/nvidia-cuda-toolkit:= )
        embree? ( media-libs/embree:=[raymask] )
-       ffmpeg? (
-               
media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
-               || ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] )
-       )
+       ffmpeg? ( 
media-video/ffmpeg:=[encode(+),lame(-),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
 )
        fftw? ( sci-libs/fftw:3.0= )
        gmp? ( dev-libs/gmp[cxx] )
        gnome? ( gui-libs/libdecor )