6 files changed, 59 insertions, 45 deletions
diff --git a/media-libs/assimp/assimp-6.0.2.ebuild b/media-libs/assimp/assimp-6.0.2.ebuild
index 28cb47f680e5..ac6337050926 100644
--- a/media-libs/assimp/assimp-6.0.2.ebuild
+++ b/media-libs/assimp/assimp-6.0.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="BSD"
 # SONAME -> ASSIMP_SOVERSION
 SLOT="0/$(ver_cut 1)"
-KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="collada doc samples test"
 
 RESTRICT="!test? ( test )"
@@ -34,6 +34,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
 	"${FILESDIR}/${PN}-5.2.5-gtest.patch"
 	"${FILESDIR}/${PN}-5.2.5-float-comparison.patch"
+	"${FILESDIR}/${PN}-6.0.2-optional-collada-tests.patch"
 )
 
 DOCS=( CodeConventions.md Readme.md )
@@ -80,7 +81,7 @@ src_configure() {
 		# -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_USE_CCACHE=off
+		-DASSIMP_BUILD_USE_CCACHE="no"
 		-DASSIMP_BUILD_ZLIB=no # Build your own zlib
 		-DASSIMP_COVERALLS=$(usex test) # Enable this to measure test coverage.
 		# breaks tests
@@ -105,11 +106,13 @@ src_configure() {
 			-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+=(
@@ -122,10 +125,18 @@ src_configure() {
 
 src_test() {
 	local CMAKE_SKIP_TESTS=(
-		"$(usex collada '' 'utCollada.*')"
+		# these are reproducer tests that will always fail
+		# like https://github.com/assimp/assimp/issues/727#issuecomment-175809243
+		'^utIssues'
+
+		# these show fp comparison related failures on certain seed values, we just repeat them often enough to pass
+		# '^AssimpAPITest_aiQuaternion.aiQuaternionFromNormalizedQuaternionTest$'
+		# '^AssimpAPITest_aiVector3D.aiTransformVecByMatrix3Test$'
 	)
+
 	local myctestargs=(
 		--repeat until-pass:100
 	)
+
 	cmake_src_test
 }
diff --git a/media-libs/assimp/files/assimp-6.0.2-optional-collada-tests.patch b/media-libs/assimp/files/assimp-6.0.2-optional-collada-tests.patch
new file mode 100644
index 000000000000..23c21819d3cf
--- /dev/null
+++ b/media-libs/assimp/files/assimp-6.0.2-optional-collada-tests.patch
@@ -0,0 +1,43 @@
+From 3b0bab987d0e90f7481aed77affb6b3863d1e369 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Tue, 9 Sep 2025 15:42:18 +0200
+Subject: [PATCH] Only build collada test when importer/exporter is build
+
+See-also: https://bugs.gentoo.org/962559
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
+index 74a00fd..a3ef574 100644
+--- a/test/CMakeLists.txt
++++ b/test/CMakeLists.txt
+@@ -143,8 +143,6 @@ SET( IMPORTERS
+   unit/utBlendImportMaterials.cpp
+   unit/utBlenderWork.cpp
+   unit/utBVHImportExport.cpp
+-  unit/utColladaExport.cpp
+-  unit/utColladaImportExport.cpp
+   unit/utCSMImportExport.cpp
+   unit/utB3DImportExport.cpp
+   #unit/utM3DImportExport.cpp
+@@ -176,6 +174,18 @@ if(ASSIMP_BUILD_USD_IMPORTER)
+   )
+ endif()
+ 
++if(ASSIMP_BUILD_COLLADA_EXPORTER)
++  list( APPEND IMPORTERS
++    unit/utColladaExport.cpp
++  )
++endif()
++
++if(ASSIMP_BUILD_COLLADA_IMPORTER)
++  list( APPEND IMPORTERS
++    unit/utColladaImportExport.cpp
++  )
++endif()
++
+ SET( MATERIAL
+   unit/utMaterialSystem.cpp
+ )
+-- 
+2.51.0
+
diff --git a/media-libs/gegl/gegl-0.4.64-r1.ebuild b/media-libs/gegl/gegl-0.4.64-r1.ebuild
index feaab1c71b62..b30c1c90e0e7 100644
--- a/media-libs/gegl/gegl-0.4.64-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.64-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://gitlab.gnome.org/GNOME/gegl.git"
 else
 	SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~mips ~ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/libffado/libffado-2.4.9-r1.ebuild b/media-libs/libffado/libffado-2.4.9-r1.ebuild
index d785ef8d2080..ef6e04019417 100644
--- a/media-libs/libffado/libffado-2.4.9-r1.ebuild
+++ b/media-libs/libffado/libffado-2.4.9-r1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	ESVN_REPO_URI="http://subversion.ffado.org/ffado/trunk/${PN}"
 else
 	SRC_URI="https://ffado.org/files/${P}.tgz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="GPL-2 GPL-3"
diff --git a/media-libs/libnsgif/Manifest b/media-libs/libnsgif/Manifest
index 8892066d55d4..5fb39a5d9cf6 100644
--- a/media-libs/libnsgif/Manifest
+++ b/media-libs/libnsgif/Manifest
@@ -1,2 +1 @@
-DIST libnsgif-0.2.1-src.tar.gz 268328 BLAKE2B ccebd1830db1caa016ebc0c1f2c421523963df16e38cdf85c5300d2a9a325dc9c52c89c79ccbddbc315535a20607458bbfedcde8df02b5e2977d383cd6603220 SHA512 29affce6de38574103a9777e741a44b448145d96ef63e4b86056f268c5d1389f6c5f25240a9f3ef2208fab229eabef2542f3d7ce7b37a0137071f204fbd736af
 DIST libnsgif-1.0.0-src.tar.gz 282568 BLAKE2B bc104972b94b6b7b62fa9740f8d742fc5124d4cc55240b3483cbe72ce0ac3972fc0917397f0cfade6abdb579084f454bd8919c5391281b738dfb3dcb0d9d28e9 SHA512 e87d5faaa4f586a098357a23bed58a8a7a79c94549b21c3338dd04bd5e074e93a7719d93d79515287b15514a2cf39aaa2abd88fd9aec8785a27594ee5cc2ddc0
diff --git a/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild b/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild
deleted file mode 100644
index 9300f78d7c4f..000000000000
--- a/media-libs/libnsgif/libnsgif-0.2.1-r3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit netsurf
-
-DESCRIPTION="decoding library for the GIF image file format, written in C"
-HOMEPAGE="https://www.netsurf-browser.org/projects/libnsgif/"
-SRC_URI="https://download.netsurf-browser.org/libs/releases/${P}-src.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~ppc ppc64 ~riscv x86"
-IUSE=""
-
-BDEPEND="
-	>=dev-build/netsurf-buildsystem-1.7-r1
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	sed -e '1i#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"' \
-		-i src/lzw.c || die
-}
-
-_emake() {
-	netsurf_define_makeconf
-	emake "${NETSURF_MAKECONF[@]}" COMPONENT_TYPE=lib-shared $@
-}
-
-src_compile() {
-	_emake
-}
-
-src_install() {
-	_emake DESTDIR="${D}" install
-}