gentoo auto-resync : 12:03:2025 - 01:49:51HEADmaster

10 files changed, 48 insertions, 21 deletions

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 84f0d3150850..56182978a228 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -9,13 +9,13 @@ DIST blender-4.1.1.tar.xz 82146268 BLAKE2B 1ab4a6c1046851ef619394c62fc73794430dc
 DIST blender-4.2.1.tar.xz 72789532 BLAKE2B 74494e851e9e2e9fdcf4a77fa4e1c177d6b9f01ab1cde9daec40468e5399d84b04225ff3a6919191e685624e9094ea4cb2257a62344d3b0e87072f339253aa82 SHA512 20162bd1185e34c481a0520f4999f8c76018471b485fa72afa446f590638c564a370d036cc4a941bf204fce821d8305d4244b3ba9ec7f09f1839b8a276dfde39
 DIST blender-4.2.4.tar.xz 72804204 BLAKE2B 613ae4671cc9263d18fe988b07e8744eb04f67fe53f1c14ad3fbc7d80c58a577e7753871ca775cd40ab5f26ef2bc9030cda57012dda0c4785769f04263aea15b SHA512 1f61c1866aaa680c91fc6e3402b1e10533c8cce32572ffb825c53dc7c15ca51f1157a32d10134ca9e612fbf719406421ccc920b2d8ddd2993675784797381c6a
 DIST blender-4.3.2.tar.xz 74473996 BLAKE2B 9a5c8973561f3296b0ec35990ab4951e34f7c0dd5bee3dd120a49989dc8ca7ebfc9610654e8be9d14463af2197626f490324cdd03118db755f5d0b1f7acce375 SHA512 44697faf9acc2c1e75783d432a1a0040339c3445834961a995e95974d4088e75ee5cb647a3908125259d1910d180910e5bc50d34d40d35f33e03197893581477
-EBUILD blender-3.6.15.ebuild 14132 BLAKE2B 0f533ce9cc66019fb6410ca26cd3c434e360d7ac454676711597776c425ae7749d9ec5402c94206a20e3473dd1e7a13adfbc34c74a91457d641dde8de22dcce2 SHA512 7bf2d8f5d85909773f614335f668bb21d19d1de39fae83f06a81c28e678dc8584d00f08e00ae1409066c04d99cea24d402e495fe46afc6c37f66712ae33c4bee
-EBUILD blender-3.6.18.ebuild 14132 BLAKE2B 10be9999a9fc9321afc73cb4c41234784020a8cd98c54c13be80970fb04679f579f4856a7a4c18e3bdf45cb1d0a8080979146da8d06fe6e22077bc3ba6b8156f SHA512 f1b7245dc53ede9d1aa5dc2eb310255cae8f57ec2e0dc52050eae7276b71c0e2f9c502990df4c6d9d494f906a715d03c3ded9cab0602da7402ddb046c598c13e
-EBUILD blender-3.6.8.ebuild 14127 BLAKE2B 1de13a7ef689f16a899698c7262bf0a59a9d6ca1a9ed27c446e11b1cfc4b39b94231f08d96b17323f2049b1ec05a28319718402c083061a2b805838ca90931ad SHA512 0647e31bef93c125c407611a690437de86c710beb5b7771801e27e2e561c3d7bfbc350e67fe0275bcbe4a5f049e87c3e600b95bcef9013f156677624b1ce445c
-EBUILD blender-4.1.1-r2.ebuild 17507 BLAKE2B 3a8cdba99e034870bfcec6000d8741fcce4884433407096c8013d2e70c0d85eb9443b26114b394c602bf8e59a9d8925bdae919e70f87b0793d1eb94b1ac2a503 SHA512 314916cb50e3a187604f87e3ff539448837f933de540aa7f80fe3d13e3af957d0698943498d19d9293cd799071bd3a41e68f99f61f3e0b1b5d8a13e870541647
-EBUILD blender-4.1.1.ebuild 17169 BLAKE2B 96ac5b0d84b5c45008ca67d07f55617833801220064e77e37d1f6f0b47a141f29ddc063667ebf09f482899640b02830c31b1cd8b148f3f5fbe61421f931ffd53 SHA512 ed20d53f7bcb93b0f0541145dabf903a10fe3811288c3cebf80396885a4d7aa4552687e86608d5510f8fe87adea9432956e6c21dec47f1e08adc0cc6e399b1c4
-EBUILD blender-4.2.1.ebuild 17362 BLAKE2B b1b8682c938df961fdf9fda3c004382b432a3721d7ba1e9c7f3f42ce13fa8364bd7d383b7b62bc367556377495a5a793b21804ebdc770dd3cbd7b4fe463872a8 SHA512 c2f65b3d7e697740b6ec1675f714ce3e1b29b1c57f602efcf47a7b4a164817ee3efc56600db258c285673842aa8cef4764103d16a83f54e131b93c1ce48157ba
-EBUILD blender-4.2.4.ebuild 17329 BLAKE2B 3f5025bff33bda819349a0dad78042176dbcfb1ab25528bd4ee2b5f8f8aa8fede7756a59eff0740a727ba73a02a2d2ff3f55beb026bd3a658fd6e7c6f19fe290 SHA512 7b3fa4d45d28db1f52ee3c9b85f8a22f2dc7490646bf1883bd29a343b5dccca56d019117891e7326f344661cf8adbd82faf1bbe45ed847977a479d84e99d71cd
-EBUILD blender-4.3.2.ebuild 17330 BLAKE2B 7738747ff2a90b7d25cdd5ece7f2f708a7b0ca7898aabc2cdb93cb280a3a2b676f53faf356d8eb64e58cb0d90a732a4c5169b1e4d7887a06142a7d09b360ea40 SHA512 46c1bb7fbd184148ec795e40b53a1dfaee32035f13a60b187e10e2808d050e7cecd7a0a07b7308cf2d47e0a238634fee7989638d8fe9c133bd4061b8fc3b6f8a
-EBUILD blender-9999.ebuild 17331 BLAKE2B cddce99cd86891ffc2ec1b7601eb381ff6e414b8d64c2e98e7c39a0dcd5ea308dc49a59c1c052b332e28bd5a3b7a0fc5bfbbd8014265e0b52848e0c30ad2d64c SHA512 6ce6cfae46518a067e3848dfbafdd5d0d6071a8c715065b6d7180d54da8b927818f97aa9d56d91049dec68f4f8dda464043cd01452d0ae1be1433e3fa7478e6c
+EBUILD blender-3.6.15-r1.ebuild 14198 BLAKE2B 932660d4e8152ffbb95ede17b5c8f0bec863ea891d7483ca48ada515050f2815797a0822dea5d40edeb55147f92c2d1731d5dd0ef50b12c18cc5361ee271e66d SHA512 4720debf6013ae7c346193fa7a6b96eef555ae8300be3e519d78681a658b918353ab9e5443e9227e19229e24ba8d5cc6230f2adc7d51987ccc632c3e8c2251e4
+EBUILD blender-3.6.18-r1.ebuild 14198 BLAKE2B 932660d4e8152ffbb95ede17b5c8f0bec863ea891d7483ca48ada515050f2815797a0822dea5d40edeb55147f92c2d1731d5dd0ef50b12c18cc5361ee271e66d SHA512 4720debf6013ae7c346193fa7a6b96eef555ae8300be3e519d78681a658b918353ab9e5443e9227e19229e24ba8d5cc6230f2adc7d51987ccc632c3e8c2251e4
+EBUILD blender-3.6.8-r1.ebuild 14193 BLAKE2B 60d195b78be39cb8fc9c6b2f13f5dff256d10196842d8c2a42d2279ed0cf27a23dbbf720baf9199f3dbbea0f4ca38cf5854158dfe8c9c8fb6e3119cfc134673e SHA512 c519f9db9a7f21c6174d905a662622865292f79c2ec1880f50a87f96a217fb5ac359b092ede3b15146bf86255074034e9ca4252d1b0acaec6b654e08c782ee96
+EBUILD blender-4.1.1-r3.ebuild 17235 BLAKE2B 4d1407dc17edb954fa541ee02a77e2014de68a755c3366bc447cad7400fcfdb124967108d4fdb7edc2dcfb5630a49f9f1283a37e8121cf498b4d738d563512ae SHA512 626d5953bca31545c8320e35f41705b5faa799fa85e8d3e19f24c947a3970587f2a957d0e9605139f159805296c927e4fe0740e3a784c0141c1942634a6a5fa2
+EBUILD blender-4.1.1-r4.ebuild 17573 BLAKE2B f1cd3d3759b1d9a71cdf867774362eabd9d5ae9cbd6f0ce4a3f4c70128e60e57fbebb1925ba246ddfa51a38fa92d3e2d63c852495ad1e41729ec5de00149bf62 SHA512 022341394de302bd1e720b17512f8affb17666eeeff7a84dffedbaccc5ee0798b36f32c1d524f4df121413800de5351d4fc6fb93c873413d431f8b34ac91ba05
+EBUILD blender-4.2.1-r1.ebuild 17428 BLAKE2B 55763969360cbad48fc6e81ce32464e15208f6dc1fc9b50b89c0ba94f797a61d8c61596a9d22dfe714e2e055aef273b50621f7579bb917746aeaf4d35bb17433 SHA512 315b44eb42a29e94b5d3df899eeaf10797e86934b47c33d17cb6fdb5d33cd8d903bc6a455eeb58a32e7188ff9f9933a7361e0611bc3f9638b3ce23b3604780cc
+EBUILD blender-4.2.4-r1.ebuild 17395 BLAKE2B a3ac1b5cd7c56cab4c11390fbaef6ae6f20e2d31642b939f6b357593617ef5582f31a47d6b52d8df79db4f7d14eb5cae7fac54fd3b83dcdde8851bf7cd62479a SHA512 20f6714ea1e5f180b9232a2b7c3d32ee24e884b46b9bdf56462fb8e23781e40549af07595347a3833bf0a8f102100275d6d7a89abe2cb687f5c568439a15849b
+EBUILD blender-4.3.2-r1.ebuild 17396 BLAKE2B de587ba8d0b4089eb3fa29b46be2b1d40fd26623a5aa8d073302c85f00ccc3f95eabfd54c36ed32a5b1b597da98a1eaf534a3c785476c3e4921aa7c30c2bf595 SHA512 63bcbb77a1f871004efc36124259d5fd508ca104e3dea0a6015fccc78239924275c21ea3af7686979b0d3e494021fe0826ea8a6fb5c79306ef39a25ac6e21116
+EBUILD blender-9999.ebuild 17397 BLAKE2B a5120c3cd94f1e9989c640124bf12929fa1029c5a1129798183583a58302a8ab94c63df4a459b3436895988af31569fe7bf72b0d3cc4a9e62c69b755a5868a8a SHA512 61e10abcf36278f107c96da3fdee1a92633e5892374677a9c6855d894af5f29007eac526963fccd5ce7706dcb83a0b347c27f114db27211dbeaab31af672bf0b
 MISC metadata.xml 3459 BLAKE2B 6fb5c60150a6ff87ef3011bd439886dbba0d41137cd7eb36afe5ce13daf4038178880f19a3afda52decc576132d6b44b17d99bafb611207b8417790706b299f9 SHA512 8057e29057a0a2d3851c44c95116b5ac8c04fbbf3efd1540df63ffe7837201007a99883fca9c6e31f89fb20a099959a81f97d88b14f99cf4910ae9e771b5fdbc
diff --git a/media-gfx/blender/blender-3.6.18.ebuild b/media-gfx/blender/blender-3.6.15-r1.ebuild
index bdf6973efd45..b2b0c67be6c0 100644
--- a/media-gfx/blender/blender-3.6.18.ebuild
+++ b/media-gfx/blender/blender-3.6.15-r1.ebuild
@@ -69,7 +69,10 @@ 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:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	ffmpeg? (
+		media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
+		|| ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] )
+	)
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? ( dev-libs/gmp[cxx] )
 	jack? ( virtual/jack )
diff --git a/media-gfx/blender/blender-3.6.15.ebuild b/media-gfx/blender/blender-3.6.18-r1.ebuild
index 8780d66cc455..b2b0c67be6c0 100644
--- a/media-gfx/blender/blender-3.6.15.ebuild
+++ b/media-gfx/blender/blender-3.6.18-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -69,7 +69,10 @@ 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:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	ffmpeg? (
+		media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
+		|| ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] )
+	)
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? ( dev-libs/gmp[cxx] )
 	jack? ( virtual/jack )
diff --git a/media-gfx/blender/blender-3.6.8.ebuild b/media-gfx/blender/blender-3.6.8-r1.ebuild
index f127201b747a..24171b70d5a7 100644
--- a/media-gfx/blender/blender-3.6.8.ebuild
+++ b/media-gfx/blender/blender-3.6.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -69,7 +69,10 @@ 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:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	ffmpeg? (
+		media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
+		|| ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] )
+	)
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? ( dev-libs/gmp )
 	jack? ( virtual/jack )
diff --git a/media-gfx/blender/blender-4.1.1.ebuild b/media-gfx/blender/blender-4.1.1-r3.ebuild
index 66f6aa0684a0..12c75c6e0dcf 100644
--- a/media-gfx/blender/blender-4.1.1.ebuild
+++ b/media-gfx/blender/blender-4.1.1-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -81,7 +81,10 @@ RDEPEND="${PYTHON_DEPS}
 	color-management? ( media-libs/opencolorio:= )
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	embree? ( media-libs/embree:=[raymask] )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	ffmpeg? (
+		media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
+		|| ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] )
+	)
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? ( dev-libs/gmp )
 	gnome? ( gui-libs/libdecor )
diff --git a/media-gfx/blender/blender-4.1.1-r2.ebuild b/media-gfx/blender/blender-4.1.1-r4.ebuild
index fb05122a58e1..6498f3f3abcc 100644
--- a/media-gfx/blender/blender-4.1.1-r2.ebuild
+++ b/media-gfx/blender/blender-4.1.1-r4.ebuild
@@ -82,7 +82,10 @@ RDEPEND="${PYTHON_DEPS}
 	color-management? ( media-libs/opencolorio:= )
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	embree? ( media-libs/embree:=[raymask] )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	ffmpeg? (
+		media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
+		|| ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] )
+	)
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? ( dev-libs/gmp[cxx] )
 	gnome? ( gui-libs/libdecor )
diff --git a/media-gfx/blender/blender-4.2.1.ebuild b/media-gfx/blender/blender-4.2.1-r1.ebuild
index c58782732586..fc0bfc69fa26 100644
--- a/media-gfx/blender/blender-4.2.1.ebuild
+++ b/media-gfx/blender/blender-4.2.1-r1.ebuild
@@ -81,7 +81,10 @@ RDEPEND="${PYTHON_DEPS}
 	color-management? ( media-libs/opencolorio:= )
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	embree? ( media-libs/embree:=[raymask] )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	ffmpeg? (
+		media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
+		|| ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] )
+	)
 	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.ebuild b/media-gfx/blender/blender-4.2.4-r1.ebuild
index 7d8618e63bae..c6813514bc00 100644
--- a/media-gfx/blender/blender-4.2.4.ebuild
+++ b/media-gfx/blender/blender-4.2.4-r1.ebuild
@@ -81,7 +81,10 @@ RDEPEND="${PYTHON_DEPS}
 	color-management? ( media-libs/opencolorio:= )
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	embree? ( media-libs/embree:=[raymask] )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	ffmpeg? (
+		media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
+		|| ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] )
+	)
 	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.ebuild b/media-gfx/blender/blender-4.3.2-r1.ebuild
index c5735ca5f00f..8e849ba27514 100644
--- a/media-gfx/blender/blender-4.3.2.ebuild
+++ b/media-gfx/blender/blender-4.3.2-r1.ebuild
@@ -81,7 +81,10 @@ RDEPEND="${PYTHON_DEPS}
 	color-management? ( media-libs/opencolorio:= )
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	embree? ( media-libs/embree:=[raymask] )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	ffmpeg? (
+		media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
+		|| ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] )
+	)
 	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 47a316667ba0..6304da04d1cb 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -81,7 +81,10 @@ RDEPEND="${PYTHON_DEPS}
 	color-management? ( media-libs/opencolorio:= )
 	cuda? ( dev-util/nvidia-cuda-toolkit:= )
 	embree? ( media-libs/embree:=[raymask] )
-	ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+	ffmpeg? (
+		media-video/ffmpeg:=[encode(+),jpeg2k?,opus,theora,vorbis,vpx,x264,xvid]
+		|| ( media-video/ffmpeg[lame(-)] media-video/ffmpeg[mp3(-)] )
+	)
 	fftw? ( sci-libs/fftw:3.0= )
 	gmp? ( dev-libs/gmp[cxx] )
 	gnome? ( gui-libs/libdecor )