6 files changed, 140 insertions, 179 deletions
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 5a5f33a2993e..8c18d7f521a9 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -4,11 +4,9 @@ AUX assimp-5.2.5-drop-failing-tests-for-abi_x86_32.patch 5237 BLAKE2B 04f0cf8661
 AUX assimp-5.2.5-fix-version.patch 881 BLAKE2B dd859c3437ea89b35a463e3aef64868f49a7c5d157d86b1c618bc15390b67950d9b40ae8717db0d21d7048b177c1ba61f6f871919cdf49e5576fc5be46553cd5 SHA512 9e1515624bc8f9d4eaa0c5d103b386e5cca12817b26e7002af7b0dd412e744fb1296e513371b9f3b0f87e566c9ca9b1b68e216a7f0e5a2ed11096d89b2fab0ae
 AUX assimp-5.2.5-float-comparison.patch 3809 BLAKE2B 6a0474c759d6a4ff68ced5c7f929062b98ae37594f6bf00a12bdfe787eaeaf24af9704e800114e4f2ccd485547165a09debbbf34820138c047a3830b95cdbc57 SHA512 6e4b55744fe5413e681f67af99f1050695cea15563e5e5f2406f9fd34cfdcfe58b40727e1071ecd98151b756c373d9f189d6e42c0705d4456ca5b676704b5d50
 AUX assimp-5.2.5-gtest.patch 843 BLAKE2B 044019d2036755c52f780e1bc4e842f181e067c1084432efe2fa6ce769fdd3f919224a7aece04a30593b477637e7e3760f023b50139ab9daecb741d5239dc021 SHA512 431ecd0dec29837a97323227311d795d1774cbe645098a945a05a8b5c36d3dd83f79ec99e99c3c27ec89adb5b90add09f030a0fdde6086381affdf91c83150ff
-DIST assimp-5.2.5.tar.gz 49543936 BLAKE2B 77e0eecd1307646211a86244a371e24401dffd03dceb569acdd63751cdb38bd169c8b12c942efd2e77b5f541653f2775739150b9fe352b8c903dcc4fe7bccca8 SHA512 ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb
-DIST assimp-5.3.1.tar.gz 52826870 BLAKE2B 1f3eac17deb6d19777f2a7cdf74e5be9d6df12a70e9b0449a90f3cc6f85b6d4170de2b870c028e2ad9c7f6ac7269daa0cbb3971dd1feb83a5b12a683ff8bb72f SHA512 49963f84ed0a8145f3af249890a533f0b12f5553ae09581289cb1f20cb49cb1a3ed3f3c4c966ceb43aa897b90deca268aa6554066b2bd34f2ac9c15041420ddb
 DIST assimp-5.4.2.tar.gz 53807656 BLAKE2B cfa069cefdddcfdb756db6a72a5f67c528fa2c6a2cc15d8a98432c5a0149288429b76cd125b01471d082caac0a4a13781a853fd0dd8f4de9801e0ef209be0238 SHA512 4bfcc3a1b5a0cf3f382560564cac67088e13c62500c3c77dcef03811e67debe72ff318f5ed145b204d5017b56cb4293f3fe14b4060ca193813cef42b12eebe9d
-EBUILD assimp-5.2.5-r1.ebuild 1595 BLAKE2B a5e9c3a46add37729d9de5ce35776c406b3d91df1ad42f214c461231e66134eedab162230396af91adcd97f5a0d1f50d9947d0bc64d866674472ca6c8fdcdc34 SHA512 d201e464b78da2c2d727ac10c66b49aa4ce0b29b20843bd6d6c0ac00332c0a6fab720f5d9740b0b890584bd7a4a521b97bff9b6cfa09368a74725612210ad991
-EBUILD assimp-5.2.5-r2.ebuild 2138 BLAKE2B 552e176e867a7bf7f07b8c06d0174dceeeeca1473e6f78e62382d1eb45bf35b070c7ed58818ee4bccc9b57ebbcfe6a3d2c59cbc55e435db74a8ad4993c867020 SHA512 4edeef319197a0f7beae869551b6d376975da525abfc2eb4f08b11232aa1c105bdff7d62badf349dd173be4d4595c909f7d6f3f2cba9187204185320d20e9cf0
-EBUILD assimp-5.3.1.ebuild 4110 BLAKE2B 331260ac82d44d82f9bda70c1ef725d026da3fea49cb92e9ad9e8ec9f268e12ae281693d2e0b3b1207b5372cb40aca331f43a000f37359ac667012dcdd61f781 SHA512 463148006ae5a61b3969a05f5ace1a5741a9f7a07dd3a27fe8938b519af90d357f2a59feb25ed7c14ab9a63aa0d6e0e9ab385a0bd5afec9caddcf14742ce6f17
+DIST assimp-5.4.3.tar.gz 53964510 BLAKE2B f08711881600d708ad523b2c36488c79a39463b5baa32261b674499582e0f4aa5fd4e8ade4bca0ceff93917f685f240b7dcee4d9140a65e3a9b888559a7b0433 SHA512 4738db84068d36face8caf61c0789178fdfc1310fa8e81ffb9b025e14183bde546b784d691c92438ab310a79ab7b75ab62ee0247d5f01e81ddf04fb94b7a9c0b
+EBUILD assimp-5.4.2-r1.ebuild 4135 BLAKE2B 609a17d3b1ee3ebf47a9351317640f41ef8075df413b4aeff56ec93d96f8ca529d4a80046db5c4b8a1fac1dc6f3468f87ce8455883fc99f0d17b17cdef831f82 SHA512 29a211cfc18319a165414ffb418acc631ef4c9f60fa007762b2841a1ff448317612fecb37fce08a477f559a3ef1d9ae9df37974f8d66c3b1fe7f5f9aaa4bd98c
 EBUILD assimp-5.4.2.ebuild 4110 BLAKE2B 331260ac82d44d82f9bda70c1ef725d026da3fea49cb92e9ad9e8ec9f268e12ae281693d2e0b3b1207b5372cb40aca331f43a000f37359ac667012dcdd61f781 SHA512 463148006ae5a61b3969a05f5ace1a5741a9f7a07dd3a27fe8938b519af90d357f2a59feb25ed7c14ab9a63aa0d6e0e9ab385a0bd5afec9caddcf14742ce6f17
-MISC metadata.xml 603 BLAKE2B 7f4388ccc6ecdc57b05eef962e349d4d1b3cb973b22918bc36a33814adf707f134ec35fa6cf9089f00bec166fbf49aa6b373f72177347a7ddd5f5cd074a353f1 SHA512 7276490bb3ce6e15d98060739d0002bf8de543ca962f958fad4bcfb4a0451a4bc0d2d882004cf70d97414b986e95f6732b206ab40af2bb2b24315e6858c8f560
+EBUILD assimp-5.4.3.ebuild 4135 BLAKE2B 609a17d3b1ee3ebf47a9351317640f41ef8075df413b4aeff56ec93d96f8ca529d4a80046db5c4b8a1fac1dc6f3468f87ce8455883fc99f0d17b17cdef831f82 SHA512 29a211cfc18319a165414ffb418acc631ef4c9f60fa007762b2841a1ff448317612fecb37fce08a477f559a3ef1d9ae9df37974f8d66c3b1fe7f5f9aaa4bd98c
+MISC metadata.xml 718 BLAKE2B 8f29648faf86ab8d49a42c9aa01b7e164e599ab0815bb57ac4941b1df0dea31f753adb206d3137e7283443111f2c550cb8409b4fa5783340c261fc5fc84489c2 SHA512 ef8e22391931d5cab643ea2d9e83cebedcb21ca4ffb231b394205a9421895df0f2929b4c3a73863eda75a47d22e45751c538b74dbd39565bc1857ec65b4fe34b
diff --git a/media-libs/assimp/assimp-5.2.5-r1.ebuild b/media-libs/assimp/assimp-5.2.5-r1.ebuild
deleted file mode 100644
index a8b3bd836a56..000000000000
--- a/media-libs/assimp/assimp-5.2.5-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/5.2.5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="samples test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/boost:=
-	sys-libs/zlib[minizip]
-	samples? (
-		media-libs/freeglut
-		virtual/opengl
-		x11-libs/libX11
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.5-fix-version.patch
-	"${FILESDIR}"/${PN}-5.2.5-disable-failing-tests.patch
-	"${FILESDIR}"/${PN}-5.2.5-disable-collada-tests.patch
-)
-
-DOCS=( CodeConventions.md Readme.md )
-
-src_prepare() {
-	if use x86 ; then
-		eapply "${FILESDIR}"/${PN}-5.2.5-drop-failing-tests-for-abi_x86_32.patch
-	fi
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DASSIMP_ASAN=OFF
-		-DASSIMP_BUILD_ASSIMP_TOOLS=ON
-		-DASSIMP_BUILD_DOCS=OFF
-		-DASSIMP_BUILD_SAMPLES=$(usex samples)
-		-DASSIMP_BUILD_TESTS=$(usex test)
-		-DASSIMP_BUILD_ZLIB=OFF
-		-DASSIMP_DOUBLE_PRECISION=OFF
-		-DASSIMP_INJECT_DEBUG_POSTFIX=OFF
-		-DASSIMP_IGNORE_GIT_HASH=ON
-		-DASSIMP_UBSAN=OFF
-		-DASSIMP_WARNINGS_AS_ERRORS=OFF
-		# bug #891787, intentionally not in alphabetic ordering
-		-DASSIMP_BUILD_COLLADA_IMPORTER=OFF
-		-DASSIMP_BUILD_COLLADA_EXPORTER=OFF
-	)
-
-	if use samples; then
-		mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" )
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	"${BUILD_DIR}/bin/unit" || die
-}
diff --git a/media-libs/assimp/assimp-5.2.5-r2.ebuild b/media-libs/assimp/assimp-5.2.5-r2.ebuild
deleted file mode 100644
index 5e1d140d1642..000000000000
--- a/media-libs/assimp/assimp-5.2.5-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Importer library to import assets from 3D files"
-HOMEPAGE="https://github.com/assimp/assimp"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="samples test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib[minizip]
-	samples? (
-		media-libs/freeglut
-		media-libs/libglvnd
-	)
-	test? (
-		dev-cpp/gtest
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.2.5-gtest.patch"
-	"${FILESDIR}/${PN}-5.2.5-float-comparison.patch"
-)
-
-DOCS=( CodeConventions.md Readme.md )
-
-src_prepare() {
-	sed -r \
-		-e "s#PROJECT\(Assimp VERSION [0-9]+\.[0-9]+\.[0-9]+\)#PROJECT(Assimp VERSION ${PV})#g" \
-		-i CMakeLists.txt || die
-	sed -r \
-		-e "s#EXPECT_EQ\(aiGetVersionPatch\(\), [0-9]+U \);#EXPECT_EQ(aiGetVersionPatch(), $(ver_cut 3)U );#g" \
-		-e "s#EXPECT_NE\( aiGetVersionRevision#EXPECT_EQ\( aiGetVersionRevision#g" \
-		-i test/unit/utVersion.cpp || die
-	sed \
-		-e "s# -O0 -g # #g" \
-		-i \
-			cmake-modules/Coveralls.cmake \
-			contrib/android-cmake/android.toolchain.cmake \
-			contrib/openddlparser/CMakeLists.txt \
-			CMakeLists.txt \
-		|| die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DASSIMP_ASAN=OFF
-		-DASSIMP_BUILD_ASSIMP_TOOLS=ON
-		-DASSIMP_BUILD_DOCS=OFF
-		-DASSIMP_BUILD_SAMPLES=$(usex samples)
-		-DASSIMP_BUILD_TESTS=$(usex test)
-		-DASSIMP_BUILD_ZLIB=OFF
-		-DASSIMP_DOUBLE_PRECISION=OFF
-		-DASSIMP_INJECT_DEBUG_POSTFIX=OFF
-		-DASSIMP_IGNORE_GIT_HASH=ON
-		-DASSIMP_UBSAN=OFF
-		-DASSIMP_WARNINGS_AS_ERRORS=OFF
-		# bug #891787 (CVE-2022-45748), intentionally not in alphabetic ordering
-		-DASSIMP_BUILD_COLLADA_IMPORTER=OFF
-		-DASSIMP_BUILD_COLLADA_EXPORTER=OFF
-	)
-
-	if use samples; then
-		mycmakeargs+=( -DOpenGL_GL_PREFERENCE="GLVND" )
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	local CMAKE_SKIP_TESTS=(
-		# ( Failed )
-		"^utCollada.*"
-		"^utIssues.OpacityBugWhenExporting_727$"
-	)
-	myctestargs+=(
-		--repeat until-pass:100
-	)
-
-	cmake_src_test
-}
diff --git a/media-libs/assimp/assimp-5.3.1.ebuild b/media-libs/assimp/assimp-5.4.2-r1.ebuild
index 6d6e3b40b1f3..ca6c5eae4ed8 100644
--- a/media-libs/assimp/assimp-5.3.1.ebuild
+++ b/media-libs/assimp/assimp-5.4.2-r1.ebuild
@@ -11,13 +11,14 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0/${PV}"
-KEYWORDS="amd64 arm arm64 ~loong ppc64 ~riscv x86"
-IUSE="doc samples test"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="collada doc samples test"
 
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-libs/zlib[minizip]
+	collada? ( media-libs/opencollada )
 	doc? ( app-text/doxygen )
 	samples? (
 		media-libs/freeglut
@@ -89,9 +90,8 @@ src_configure() {
 		# -DASSIMP_UBSAN=yes # Enable Undefined Behavior sanitizer.
 		-DASSIMP_WARNINGS_AS_ERRORS=no # Treat all warnings as errors.
 		# -DBUILD_SHARED_LIBS=yes # Build package with shared libraries.
-		# bug #891787 (CVE-2022-45748), intentionally not in alphabetic ordering
-		-DASSIMP_BUILD_COLLADA_IMPORTER=OFF
-		-DASSIMP_BUILD_COLLADA_EXPORTER=OFF
+		-DASSIMP_BUILD_COLLADA_IMPORTER="$(use collada)"
+		-DASSIMP_BUILD_COLLADA_EXPORTER="$(use collada)"
 	)
 
 	if use doc; then
@@ -106,7 +106,9 @@ src_configure() {
 	fi
 	if use test; then
 		# adds the target headercheck which compiles every header file, default disabled because it adds many targets
-		-DASSIMP_HEADERCHECK=$(usex test)
+		mycmakeargs+=(
+			-DASSIMP_HEADERCHECK="$(usex test)"
+		)
 	fi
 
 	cmake_src_configure
diff --git a/media-libs/assimp/assimp-5.4.3.ebuild b/media-libs/assimp/assimp-5.4.3.ebuild
new file mode 100644
index 000000000000..ca6c5eae4ed8
--- /dev/null
+++ b/media-libs/assimp/assimp-5.4.3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Importer library to import assets from 3D files"
+HOMEPAGE="https://github.com/assimp/assimp"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="collada doc samples test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	sys-libs/zlib[minizip]
+	collada? ( media-libs/opencollada )
+	doc? ( app-text/doxygen )
+	samples? (
+		media-libs/freeglut
+		media-libs/libglvnd
+	)
+	test? (
+		dev-cpp/gtest
+	)
+"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.2.5-gtest.patch"
+	"${FILESDIR}/${PN}-5.2.5-float-comparison.patch"
+)
+
+DOCS=( CodeConventions.md Readme.md )
+
+src_prepare() {
+	sed -r \
+		-e "s#PROJECT\(Assimp VERSION [0-9]+\.[0-9]+\.[0-9]+\)#PROJECT(Assimp VERSION ${PV})#g" \
+		-i CMakeLists.txt || die
+	sed -r \
+		-e "s#EXPECT_EQ\(aiGetVersionPatch\(\), [0-9]+U \);#EXPECT_EQ(aiGetVersionPatch(), $(ver_cut 3)U );#g" \
+		-e "s#EXPECT_NE\( aiGetVersionRevision#EXPECT_EQ\( aiGetVersionRevision#g" \
+		-i test/unit/utVersion.cpp || die
+	sed \
+		-e "s# -g -O0 # #g" \
+		-i \
+			cmake-modules/Coveralls.cmake \
+			contrib/android-cmake/android.toolchain.cmake \
+			contrib/openddlparser/CMakeLists.txt \
+			CMakeLists.txt \
+		|| die
+	sed -r \
+		-e "s#(PROJECT_NUMBER *= \").*\"#\1v${PV}\"#g" \
+		-e "s#(GENERATE_XML *= )(YES|NO)#\1NO#g" \
+		-e "s#(GENERATE_HTML *= )(YES|NO)#\1YES#g" \
+		-i doc/Doxyfile.in || die
+	sed -r \
+		-e "s#AssimpDoc_Html(/AnimationOverview)#architecture\1#g" \
+		-e "s#AssimpDoc_Html(/dragonsplash)#images\1#g" \
+		-i doc/CMakeLists.txt || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		# -DASSIMP_ASAN=yes # Enable AddressSanitizer.
+		-DASSIMP_BUILD_ASSIMP_TOOLS=yes # If the supplementary tools for Assimp are built in addition to the library.
+		-DASSIMP_BUILD_DOCS=$(usex doc) # Build documentation using Doxygen.
+		# -DASSIMP_BUILD_DRACO=no # If the Draco libraries are to be built. Primarily for glTF
+		# -DASSIMP_BUILD_NONFREE_C4D_IMPORTER=no # Build the C4D importer, which relies on the non-free Cineware SDK.
+		-DASSIMP_BUILD_SAMPLES=$(usex samples) # If the official samples are built as well (needs Glut).
+		-DASSIMP_BUILD_TESTS=$(usex test) # If the test suite for Assimp is built in addition to the library.
+		-DASSIMP_BUILD_ZLIB=no # Build your own zlib
+		-DASSIMP_COVERALLS=$(usex test) # Enable this to measure test coverage.
+		# breaks tests
+		# -DASSIMP_DOUBLE_PRECISION=no # Set to yes to enable double precision processing
+		# -DASSIMP_HUNTER_ENABLED=no # Enable Hunter package manager support
+		-DASSIMP_IGNORE_GIT_HASH=yes # Don't call git to get the hash.
+		-DASSIMP_INJECT_DEBUG_POSTFIX=no # Inject debug postfix in .a/.so/.dll lib names
+		# -DASSIMP_INSTALL=yes # Disable this if you want to use assimp as a submodule.
+		# -DASSIMP_LIBRARY_SUFFIX= # Suffix to append to library names
+		# -DASSIMP_NO_EXPORT=no # Disable Assimp's export functionality.
+		# -DASSIMP_OPT_BUILD_PACKAGES=no # Set to yes to generate CPack configuration files and packaging targets
+		-DASSIMP_RAPIDJSON_NO_MEMBER_ITERATOR=no # Suppress rapidjson warning on MSVC (NOTE: breaks android build)
+		# -DASSIMP_UBSAN=yes # Enable Undefined Behavior sanitizer.
+		-DASSIMP_WARNINGS_AS_ERRORS=no # Treat all warnings as errors.
+		# -DBUILD_SHARED_LIBS=yes # Build package with shared libraries.
+		-DASSIMP_BUILD_COLLADA_IMPORTER="$(use collada)"
+		-DASSIMP_BUILD_COLLADA_EXPORTER="$(use collada)"
+	)
+
+	if use doc; then
+		mycmakeargs+=(
+			-DHTML_OUTPUT="html"
+		)
+	fi
+	if use samples; then
+		mycmakeargs+=(
+			-DOpenGL_GL_PREFERENCE="GLVND"
+		)
+	fi
+	if use test; then
+		# adds the target headercheck which compiles every header file, default disabled because it adds many targets
+		mycmakeargs+=(
+			-DASSIMP_HEADERCHECK="$(usex test)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	local CMAKE_SKIP_TESTS=(
+		# ( Failed )
+		"^utCollada.*"
+		"^utIssues.OpacityBugWhenExporting_727$"
+	)
+	myctestargs+=(
+		--repeat until-pass:100
+	)
+	cmake_src_test
+}
diff --git a/media-libs/assimp/metadata.xml b/media-libs/assimp/metadata.xml
index 0d6bbab44f23..60c8036d86fe 100644
--- a/media-libs/assimp/metadata.xml
+++ b/media-libs/assimp/metadata.xml
@@ -10,6 +10,7 @@
 		<name>Gentoo Proxy Maintainers</name>
 	</maintainer>
 	<use>
+		<flag name="collada">Add support for Collada interchange format through <pkg>media-libs/opencollada</pkg></flag>
 		<flag name="samples">Build viewer library</flag>
 	</use>
 	<upstream>