Adding metadata

31 files changed, 811 insertions, 619 deletions

diff --git a/media-libs/SoQt/SoQt-1.6.4-r1.ebuild b/media-libs/SoQt/SoQt-1.6.4-r1.ebuild
new file mode 100644
index 000000000000..3db848d95347
--- /dev/null
+++ b/media-libs/SoQt/SoQt-1.6.4-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt"
+HOMEPAGE="https://github.com/coin3d/soqt https://github.com/coin3d/coin/wiki"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/coin3d/${PN,,}.git"
+else
+	SRC_URI="https://github.com/coin3d/${PN,,}/releases/download/v${PV}/${P/${PN}/${PN,,}}-src.tar.gz"
+	S="${WORKDIR}/${PN,,}"
+
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,opengl,widgets]
+	media-libs/coin
+	virtual/opengl[X]
+	x11-libs/libX11
+	x11-libs/libXi
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? ( app-text/doxygen )
+"
+
+DOCS=(
+	AUTHORS
+	ChangeLog
+	HACKING
+	NEWS
+	README
+)
+
+src_configure() {
+	use debug && CMAKE_BUILD_TYPE="Debug"
+
+	local mycmakeargs=(
+		-D${PN^^}_BUILD_SHARED_LIBS="yes"
+
+		-D${PN^^}_BUILD_AWESOME_DOCUMENTATION="$(usex doc)"
+		-D${PN^^}_BUILD_DOCUMENTATION="$(usex doc)"
+		-D${PN^^}_BUILD_DOC_MAN="$(usex doc)"
+		-D${PN^^}_BUILD_INTERNAL_DOCUMENTATION="no"
+
+		# Interactive test programs
+		-D${PN^^}_BUILD_TESTS="$(usex test)"
+		-D${PN^^}_USE_QT5="no"
+		-D${PN^^}_USE_QT6="yes"
+		-D${PN^^}_VERBOSE="$(usex debug)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/SoQt/SoQt-1.6.4.ebuild b/media-libs/SoQt/SoQt-1.6.4.ebuild
deleted file mode 100644
index 202d12d40171..000000000000
--- a/media-libs/SoQt/SoQt-1.6.4.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt"
-HOMEPAGE="https://github.com/coin3d/coin/wiki"
-SRC_URI="https://github.com/coin3d/soqt/releases/download/v${PV}/${P/SoQt/soqt}-src.tar.gz"
-S="${WORKDIR}/soqt"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
-IUSE="debug doc"
-
-RDEPEND="
-	dev-qt/qtbase:6[gui,opengl,widgets]
-	media-libs/coin
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README )
-
-src_configure() {
-	use debug && append-cppflags -DSOQT_DEBUG=1
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DSOQT_BUILD_DOCUMENTATION=$(usex doc)
-		-DSOQT_BUILD_INTERNAL_DOCUMENTATION=OFF
-		-DSOQT_USE_QT6=ON
-		-DSOQT_VERBOSE=$(usex debug)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/SoQt/metadata.xml b/media-libs/SoQt/metadata.xml
index 8b6ca8c13206..4ef21a68d7ca 100644
--- a/media-libs/SoQt/metadata.xml
+++ b/media-libs/SoQt/metadata.xml
@@ -1,10 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>negril.nx+gentoo@gmail.com</email>
+    <name>Paul Zander</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Gentoo Proxy Maintainers</name>
+  </maintainer>
   <longdescription lang="en">
-  SoQt is a Qt GUI component toolkit library for Coin. It is also compatible
-  with SGI and TGS Open Inventor, and the API is based on the API of the
-  InventorXt GUI component toolkit.
-  </longdescription>
+		SoQt is a Qt GUI component toolkit library for Coin. It is also compatible with SGI and TGS Open Inventor, and the API is based on the API of the InventorXt GUI component toolkit.
+	</longdescription>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/media-libs/SoXt/Manifest b/media-libs/SoXt/Manifest
index bde1fc9d4b78..b3acdf4d42e1 100644
--- a/media-libs/SoXt/Manifest
+++ b/media-libs/SoXt/Manifest
@@ -1,2 +1,2 @@
 DIST SoXt-1.4.1-src.tar.gz 1402559 BLAKE2B fd0f0433e1d5c231f4392f7cfa4e6e08bd9d872b46619c6daa9f4fa2157da27780b0a28d4cbb7ea8f3f3a881f90c789760cad2c2709f27bf9f4edb1cdfc1f86c SHA512 c379acb14b7f3a03664a3b1c10bdd14e836a54fb72f62cb728301755ee148b423203513a085534c2ea74704fd3c9a77ceabe1de089aa168c848518a9d690e53e
-DIST SoXt-1.4.2-src.tar.gz 7366540 BLAKE2B 00b0dab81473bf7eb0c5857ed3f1b1182917160021c7aa6d9f8df82d73d9e16e4eef59e681995eb719cbce35a1039775f35e769f8e9dff1dc61c02352f68aaca SHA512 6fdc942a2f6b48406c9e6c67bddd03f7067581ea072845634bee0eb825fca642829f92e0ee8054886e7f5bf553e394b6253da568ce445432d1a1ecd744b22475
+DIST soxt-1.4.2-src.tar.gz 7366540 BLAKE2B 00b0dab81473bf7eb0c5857ed3f1b1182917160021c7aa6d9f8df82d73d9e16e4eef59e681995eb719cbce35a1039775f35e769f8e9dff1dc61c02352f68aaca SHA512 6fdc942a2f6b48406c9e6c67bddd03f7067581ea072845634bee0eb825fca642829f92e0ee8054886e7f5bf553e394b6253da568ce445432d1a1ecd744b22475
diff --git a/media-libs/SoXt/SoXt-1.4.2-r1.ebuild b/media-libs/SoXt/SoXt-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..aa6f77bcfcbd
--- /dev/null
+++ b/media-libs/SoXt/SoXt-1.4.2-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="GUI binding for using Coin/Open Inventor with Xt/Motif"
+HOMEPAGE="https://github.com/coin3d/soxt https://github.com/coin3d/coin/wiki"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/coin3d/${PN,,}.git"
+else
+	SRC_URI="https://github.com/coin3d/${PN,,}/releases/download/v${PV}/${P/${PN}/${PN,,}}-src.tar.gz"
+	S="${WORKDIR}/${PN,,}"
+
+	KEYWORDS="amd64 ~arm x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug doc test"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	media-libs/coin
+	x11-libs/motif:0=
+	x11-libs/libX11
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt
+	virtual/opengl[X]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	x11-base/xorg-proto
+	doc? ( app-text/doxygen )
+"
+
+DOCS=(
+	AUTHORS
+	ChangeLog
+	HACKING
+	NEWS
+	README
+	TODO
+	BUGS.txt
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	if has_version ">=x11-libs/motif-2.3.9"; then
+		eapply "${FILESDIR}/${PN}-1.4.2-motif-2.3.9-version.h.patch"
+	fi
+}
+
+src_configure() {
+	use debug && CMAKE_BUILD_TYPE="Debug"
+
+	local mycmakeargs=(
+		-D${PN^^}_BUILD_SHARED_LIBS="yes"
+
+		-D${PN^^}_BUILD_AWESOME_DOCUMENTATION="$(usex doc)"
+		-D${PN^^}_BUILD_DOCUMENTATION="$(usex doc)"
+		-D${PN^^}_BUILD_DOC_MAN="$(usex doc)"
+		-D${PN^^}_BUILD_INTERNAL_DOCUMENTATION="no"
+
+		# Interactive test programs
+		-D${PN^^}_BUILD_TESTS="$(usex test)"
+		-D${PN^^}_VERBOSE="$(usex debug)"
+	)
+
+	cmake_src_configure
+}
diff --git a/media-libs/SoXt/SoXt-1.4.2.ebuild b/media-libs/SoXt/SoXt-1.4.2.ebuild
deleted file mode 100644
index e8188aac9c08..000000000000
--- a/media-libs/SoXt/SoXt-1.4.2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-MY_P=${P/soxt/SoXt}
-
-DESCRIPTION="GUI binding for using Coin/Open Inventor with Xt/Motif"
-HOMEPAGE="https://github.com/coin3d/coin/wiki"
-SRC_URI="https://github.com/coin3d/soxt/releases/download/v${PV}/${P}-src.tar.gz"
-S="${WORKDIR}/soxt"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug doc"
-
-RDEPEND="
-	media-libs/coin
-	x11-libs/motif:0
-	virtual/opengl
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	x11-base/xorg-proto
-	doc? ( app-text/doxygen )
-"
-
-DOCS=( AUTHORS ChangeLog HACKING NEWS README TODO BUGS.txt )
-
-src_configure() {
-	use debug && append-cppflags -DSOXT_DEBUG=1
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DSOXT_BUILD_DOCUMENTATION=$(usex doc)
-		-DSOXT_BUILD_INTERNAL_DOCUMENTATION=OFF
-		# Interactive test programs
-		-DSOXT_BUILD_TESTS=OFF
-		-DSOXT_VERBOSE=$(usex debug)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/SoXt/files/SoXt-1.4.2-motif-2.3.9-version.h.patch b/media-libs/SoXt/files/SoXt-1.4.2-motif-2.3.9-version.h.patch
new file mode 100644
index 000000000000..8a52b74147bb
--- /dev/null
+++ b/media-libs/SoXt/files/SoXt-1.4.2-motif-2.3.9-version.h.patch
@@ -0,0 +1,23 @@
+From d99ca72e2df57f96f94083460f5bb90e8a8a2ae3 Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Tue, 15 Sep 2026 14:11:51 +0000
+Subject: use version.h for >=motif-2.3.9
+
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b8b6106..8caf2cf 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -175,7 +175,7 @@ foreach (_config ${CMAKE_CONFIGURATION_TYPES})
+ endforeach()
+ 
+ # gets the Motif toolkit version
+-file(STRINGS "${MOTIF_INCLUDE_DIR}/Xm/Xm.h" _motif REGEX "#define XmVERSION_STRING")
++file(STRINGS "${MOTIF_INCLUDE_DIR}/Xm/version.h" _motif REGEX "#define XmVERSION_STRING")
+ string(REGEX MATCH "Motif Version ([0-9]+)\\.([0-9]+)\\.([0-9]+)" dummy ${_motif})
+ set(MOTIF_VERSION_MAJOR ${CMAKE_MATCH_1})
+ set(MOTIF_VERSION_MINOR ${CMAKE_MATCH_2})
+-- 
+2.55.0
+
diff --git a/media-libs/SoXt/metadata.xml b/media-libs/SoXt/metadata.xml
index 0f28cf7ab92b..6f4439cde45c 100644
--- a/media-libs/SoXt/metadata.xml
+++ b/media-libs/SoXt/metadata.xml
@@ -6,10 +6,8 @@
     <description>Feel free to maintain/fix</description>
   </maintainer>
   <longdescription lang="en">
-  SoXt is an alternative to SGIs InventorXt library, which is a GUI
-  binding for using Open Inventor with Xt/Motif. While SoXt has been developed
-  for use with Coin, it is also possible to compile it against Open Inventor
-  from SGI or TGS.
-  </longdescription>
+		SoXt is an alternative to SGIs InventorXt library, which is a GUI binding for using Open Inventor with Xt/Motif.
+		While SoXt has been developed for use with Coin, it is also possible to compile it against Open Inventor from SGI or TGS.
+	</longdescription>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/media-libs/coin/Manifest b/media-libs/coin/Manifest
index 183b1a9dee68..0468d733cda5 100644
--- a/media-libs/coin/Manifest
+++ b/media-libs/coin/Manifest
@@ -1,2 +1,4 @@
+DIST coin-4.0.10-src.tar.gz 11855404 BLAKE2B eab33a33cd4449762cc61195d3501956f2ea141044fbf2e67a05dd6b37761cefc8dee74e0f3628ed22e366ea50fa41fa83cf6445d5c76532696e16d3b06e9cd5 SHA512 cdd0da0f34fa599f791d504bd740f3ced09ecdb26b5ddf8bc3708b697cddbcfab73b00c2ce7722c083cfbb30716d93621d85000aa298c3aafe6eb136f80f2fef
 DIST coin-4.0.4-src.tar.gz 13110106 BLAKE2B fac92cb99b2eb37fe52a3e1bc9c9c8b72c956e135236052dcde2a257374be217d94f3f3a1d908c78dc1ce55adee2d79e6f95e88866600a88bbcf2d4903adcc29 SHA512 5d13c9d03b8da1b6de2be6632434184ff05370039906a34cf9812ab51b849f99cf59db844b32577d2c155218d8ad8fe515e757d445dbbeddda3f4740b0e384a2
 DIST coin-4.0.6-src.tar.gz 13114463 BLAKE2B 7760186d86f54188f33357b310bff6e3457d1de04de8d1cf9dcf959516a3828493f47d789d83d2bc628d9dbbb70ba3d36a7e6af34a10a4934d1be6bc07b801e2 SHA512 eaf6d20328abba86d77ec78b38f80149bbcf3a61fd0c33ac22a2cd77f971f29197d2e20498cdd3b317271ca502882864833877f65381f3dded44e4bb51fa439d
+DIST coin-PR590.patch 635 BLAKE2B d5a8d8da1a1532065a63e8308fced55510c9e8c35978ab853f531946fdc18f94a3083b3a817eebcc4902a7a884a9ed423fc03ba947af94efcf326f1fe087fc4a SHA512 35b57c678a72920273a71e4361d7003a68b6fbc0432477e0e61dfc278fec8b1a0dc1abbc61ed797564802379d9c4265b4a593df7739781408f484b13cd420b8e
diff --git a/media-libs/coin/coin-4.0.10.ebuild b/media-libs/coin/coin-4.0.10.ebuild
new file mode 100644
index 000000000000..116296dec650
--- /dev/null
+++ b/media-libs/coin/coin-4.0.10.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="High-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1"
+HOMEPAGE="https://github.com/coin3d/coin https://github.com/coin3d/coin/wiki"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/coin3d/${PN,,}.git"
+else
+	SRC_URI="https://github.com/coin3d/${PN,,}/releases/download/v${PV}/${P/${PN}/${PN,,}}-src.tar.gz"
+	S="${WORKDIR}/${PN,,}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 PEL )"
+SLOT="0"
+IUSE="debug doc +exceptions openal qch test threads"
+
+REQUIRED_USE="qch? ( doc )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/expat
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/simage:=
+	virtual/glu
+	virtual/opengl[X]
+	virtual/zlib:=
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXext
+	openal? ( media-libs/openal )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost:0
+"
+BDEPEND="
+	x11-base/xorg-proto
+	doc? (
+		app-text/doxygen
+		qch? ( dev-qt/qttools:6[assistant] )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.3-find-qhelpgenerator.patch"
+)
+
+DOCS=(
+	AUTHORS
+	FAQ
+	FAQ.legal
+	NEWS
+	THANKS
+	docs/HACKING
+)
+
+src_configure() {
+	use debug && CMAKE_BUILD_TYPE="Debug"
+
+	local mycmakeargs=(
+		-DCOIN_BUILD_SHARED_LIBS=ON
+		-DCOIN_BUILD_TESTS=$(usex test)
+
+		-DCOIN_BUILD_AWESOME_DOCUMENTATION=$(usex doc)
+		-DCOIN_BUILD_DOCUMENTATION=$(usex doc)
+		-DCOIN_BUILD_DOCUMENTATION_MAN=$(usex doc)
+		-DCOIN_BUILD_DOCUMENTATION_QTHELP=$(usex qch)
+		-DCOIN_BUILD_DOCUMENTATION_CHM=OFF
+		-DCOIN_BUILD_INTERNAL_DOCUMENTATION=OFF
+
+		-DCOIN_THREADSAFE=$(usex threads)
+		-DHAVE_VRML97=ON
+		-DCOIN_HAVE_JAVASCRIPT=OFF
+		-DHAVE_NODEKITS=ON
+		-DHAVE_DRAGGERS=ON
+		-DHAVE_MANIPULATORS=ON
+		-DHAVE_SOUND=$(usex openal)
+		-DHAVE_3DS_IMPORT_CAPABILITIES=ON
+		-DUSE_EXTERNAL_EXPAT=ON
+		-DUSE_EXCEPTIONS=$(usex exceptions)
+		-DUSE_SUPERGLU=OFF
+
+		-DFONTCONFIG_RUNTIME_LINKING=OFF
+		-DFREETYPE_RUNTIME_LINKING=OFF
+		-DLIBBZIP2_RUNTIME_LINKING=OFF
+		-DOPENAL_RUNTIME_LINKING=OFF
+		-DSIMAGE_RUNTIME_LINKING=OFF
+		-DZLIB_RUNTIME_LINKING=OFF
+		-DGLU_RUNTIME_LINKING=OFF
+		-DSPIDERMONKEY_RUNTIME_LINKING=ON
+
+		-DCOIN_VERBOSE=$(usex debug)
+		-DHAVE_MULTIPLE_VERSION=OFF
+
+		-DCOIN_BUILD_SINGLE_LIB=ON
+	)
+
+	use doc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON )
+
+	cmake_src_configure
+}
+
+src_test() {
+	pushd "${BUILD_DIR}/bin" > /dev/null || die
+	./CoinTests -r detailed || die "Tests failed."
+	popd > /dev/null || die
+}
diff --git a/media-libs/coin/coin-4.0.6.ebuild b/media-libs/coin/coin-4.0.6-r1.ebuild
index fd31873eb309..0771af73eb75 100644
--- a/media-libs/coin/coin-4.0.6.ebuild
+++ b/media-libs/coin/coin-4.0.6-r1.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-inherit cmake flag-o-matic
+inherit cmake
 
 DESCRIPTION="High-level 3D graphics toolkit, fully compatible with SGI Open Inventor 2.1"
 HOMEPAGE="https://github.com/coin3d/coin/wiki"
-SRC_URI="https://github.com/coin3d/coin/releases/download/v${PV}/${P}-src.tar.gz"
+SRC_URI="
+	https://github.com/coin3d/coin/releases/download/v${PV}/${P}-src.tar.gz
+	https://github.com/coin3d/coin/commit/1bba57bd0d9f41666d72857f75263068aeeeefcb.patch -> ${PN}-PR590.patch
+"
 S="${WORKDIR}/${PN}"
 
 LICENSE="|| ( GPL-2 PEL )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 x86"
 IUSE="debug doc +exceptions openal qch test threads"
 
 REQUIRED_USE="qch? ( doc )"
@@ -25,7 +28,7 @@ RDEPEND="
 	media-libs/freetype:2
 	media-libs/simage:=
 	virtual/zlib:=
-	virtual/opengl
+	virtual/opengl[X]
 	virtual/glu
 	x11-libs/libICE
 	x11-libs/libSM
@@ -35,21 +38,24 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}
 	dev-libs/boost:0
-	x11-base/xorg-proto
 "
 BDEPEND="
+	x11-base/xorg-proto
 	doc? (
 		app-text/doxygen
 		qch? ( dev-qt/qttools:6[assistant] )
 	)
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-4.0.3-find-qhelpgenerator.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0.3-find-qhelpgenerator.patch
+	"${DISTDIR}/${PN}-PR590.patch"
+)
 
 DOCS=( AUTHORS FAQ FAQ.legal NEWS THANKS docs/HACKING )
 
 src_configure() {
-	use debug && append-cppflags -DCOIN_DEBUG=1
+	use debug && CMAKE_BUILD_TYPE="Debug"
 
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
diff --git a/media-libs/coin/metadata.xml b/media-libs/coin/metadata.xml
index 77c9af81af84..edee3e8e504d 100644
--- a/media-libs/coin/metadata.xml
+++ b/media-libs/coin/metadata.xml
@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>negril.nx+gentoo@gmail.com</email>
+    <name>Paul Zander</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Gentoo Proxy Maintainers</name>
+  </maintainer>
   <use>
     <flag name="exceptions">Compile with C++ exceptions</flag>
     <flag name="qch">Install API documentation in QCH format</flag>
diff --git a/media-libs/lib3mf/Manifest b/media-libs/lib3mf/Manifest
index 0dd615930de7..6b7481c3488b 100644
--- a/media-libs/lib3mf/Manifest
+++ b/media-libs/lib3mf/Manifest
@@ -1 +1,2 @@
 DIST lib3mf-2.4.1.tar.gz 36313494 BLAKE2B f5fea473e2e28480372cc39178e78022c3612e705d4ea95366a9b9988bdf729a09ee6045af234bc3b4d817d2cd77c1523b27c93abc86c10893a04268276aa251 SHA512 91d3928315bd5d1a8553284505d28c7d839a3cbd8b07a87bca5a21087fffa8ba7a1738ed14313212815a09e33f7a82318f7b069f1bbe40456b57ec528379ab4b
+DIST lib3mf-2.5.0.tar.gz 39105759 BLAKE2B 50007420c2e9d15795409504a1170e5eff6faf07d1d9488af1e6dcbcc3a1f2eaeb31fbd6d893fe05392fd62363b175dbbffc4cd3b82f043484b9b4f513dd15ff SHA512 acfd0e4862248c475c674f7ee7855f809965a854e62ea0cd847008be7a9ca3c5a03ac87cac889f036555229762405094ca9811817dd45dbdaae941b5b41ae356
diff --git a/media-libs/lib3mf/files/lib3mf-2.5.0-remove-std-and-opt-flags.patch b/media-libs/lib3mf/files/lib3mf-2.5.0-remove-std-and-opt-flags.patch
new file mode 100644
index 000000000000..622b92fec12d
--- /dev/null
+++ b/media-libs/lib3mf/files/lib3mf-2.5.0-remove-std-and-opt-flags.patch
@@ -0,0 +1,32 @@
+From 5989c293eb369742afff546173e7ec96b00d050d Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx@gmail.com>
+Date: Tue, 22 Apr 2025 13:28:03 +0200
+Subject: remove optimization flags and C++ standard
+
+Signed-off-by: Paul Zander <negril.nx@gmail.com>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ec1d7dde..201f5aa2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,9 +74,7 @@ set (CMAKE_CXX_STANDARD 17)
+ 		  add_compile_options(-Wall)
+ 		  if (CMAKE_BUILD_TYPE MATCHES DEBUG)
+ 		    add_compile_options(-g)
+-	    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Og")
+ 	  else()
+-    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O2")
+   endif(CMAKE_BUILD_TYPE MATCHES DEBUG)
+   
+ 		elseif ("${CMAKE_SYSTEM_NAME}" MATCHES "Darwin")
+@@ -85,7 +83,6 @@ set (CMAKE_CXX_STANDARD 17)
+ 		    add_definitions(-DBUILD_DLL)
+ 		  endif()
+ 		  add_compile_options(-Wall) 
+-		  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O2")
+ 		  set(CMAKE_MACOSX_RPATH ON)
+ 	endif()
+ 
+-- 
+2.53.0
+
diff --git a/media-libs/lib3mf/lib3mf-2.4.1-r1.ebuild b/media-libs/lib3mf/lib3mf-2.4.1-r1.ebuild
index 788c6132f0f0..68133b58df57 100644
--- a/media-libs/lib3mf/lib3mf-2.4.1-r1.ebuild
+++ b/media-libs/lib3mf/lib3mf-2.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -28,7 +28,6 @@ BDEPEND="
 	test? (
 		dev-cpp/gtest
 		dev-libs/openssl
-		dev-debug/valgrind
 	)
 "
 
@@ -56,6 +55,8 @@ src_configure() {
 		-DUSE_INCLUDED_LIBZIP=OFF
 		-DUSE_INCLUDED_ZLIB=OFF
 		-DSTRIP_BINARIES=OFF
+		# we don't want valgrind tests
+		-DVALGRIND=NOTFOUND
 	)
 
 	if use test; then
diff --git a/media-libs/lib3mf/lib3mf-2.5.0.ebuild b/media-libs/lib3mf/lib3mf-2.5.0.ebuild
new file mode 100644
index 000000000000..9ea789782bfb
--- /dev/null
+++ b/media-libs/lib3mf/lib3mf-2.5.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
+HOMEPAGE="https://3mf.io/ https://github.com/3MFConsortium/lib3mf"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/3MFConsortium/lib3mf.git"
+else
+	SRC_URI="
+		https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/fast_float
+	dev-libs/libzip:=
+	virtual/zlib:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-cpp/gtest
+		dev-libs/openssl
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.0-remove-std-and-opt-flags.patch"
+)
+
+src_prepare() {
+	# DO NOT WANT!
+	rm -r Libraries/ || die
+
+	# DO NOT WANT!
+	rm -r SDK || die
+	rm -r AutomaticComponentToolkit || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/${PN}"
+		-DLIB3MF_TESTS=$(usex test)
+		-DUSE_INCLUDED_FASTFLOAT=OFF
+		-DUSE_INCLUDED_LIBZIP=OFF
+		-DUSE_INCLUDED_ZLIB=OFF
+		-DUSE_INCLUDED_CPPBASE64=ON # TODO not packaged
+		-DSTRIP_BINARIES=OFF
+		-DLIB3MF_BUILD_WASM=OFF
+		# we don't want valgrind tests
+		-DVALGRIND=NOTFOUND
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			# code says it uses , but works with openssl too
+			-DUSE_INCLUDED_SSL=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	for suf in abi types implicit; do
+		dosym -r "/usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp" "/usr/include/${PN}/${PN}_${suf}.hpp"
+	done
+}
diff --git a/media-libs/lib3mf/lib3mf-9999.ebuild b/media-libs/lib3mf/lib3mf-9999.ebuild
new file mode 100644
index 000000000000..9ea789782bfb
--- /dev/null
+++ b/media-libs/lib3mf/lib3mf-9999.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Implementation of the 3D Manufacturing Format file standard"
+HOMEPAGE="https://3mf.io/ https://github.com/3MFConsortium/lib3mf"
+
+if [[ "${PV}" == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/3MFConsortium/lib3mf.git"
+else
+	SRC_URI="
+		https://github.com/3MFConsortium/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0/$(ver_cut 1)"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/fast_float
+	dev-libs/libzip:=
+	virtual/zlib:=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	test? (
+		dev-cpp/gtest
+		dev-libs/openssl
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.5.0-remove-std-and-opt-flags.patch"
+)
+
+src_prepare() {
+	# DO NOT WANT!
+	rm -r Libraries/ || die
+
+	# DO NOT WANT!
+	rm -r SDK || die
+	rm -r AutomaticComponentToolkit || die
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/${PN}"
+		-DLIB3MF_TESTS=$(usex test)
+		-DUSE_INCLUDED_FASTFLOAT=OFF
+		-DUSE_INCLUDED_LIBZIP=OFF
+		-DUSE_INCLUDED_ZLIB=OFF
+		-DUSE_INCLUDED_CPPBASE64=ON # TODO not packaged
+		-DSTRIP_BINARIES=OFF
+		-DLIB3MF_BUILD_WASM=OFF
+		# we don't want valgrind tests
+		-DVALGRIND=NOTFOUND
+	)
+
+	if use test; then
+		mycmakeargs+=(
+			# code says it uses , but works with openssl too
+			-DUSE_INCLUDED_SSL=OFF
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+
+	for suf in abi types implicit; do
+		dosym -r "/usr/include/${PN}/Bindings/Cpp/${PN}_${suf}.hpp" "/usr/include/${PN}/${PN}_${suf}.hpp"
+	done
+}
diff --git a/media-libs/libxmp/Manifest b/media-libs/libxmp/Manifest
index 3879cdf4d90d..d333e9ca3830 100644
--- a/media-libs/libxmp/Manifest
+++ b/media-libs/libxmp/Manifest
@@ -1,2 +1,2 @@
 DIST libxmp-4.6.3.tar.gz 805616 BLAKE2B 5cf99574d990d48f069f1ebb3f06d6b0658f41adb5f032b11c7d8849f4a8ad08597e3881d8804c10ef895c4620c329bf3369a2f7f84b553f5350407c520e06c9 SHA512 fc87fafa392ebd07f6f9823801cdf296d5f5a6216e15a437d0539bc4ebf0f963bb8d868c73499d1ece33a238b71a8da6da303be23d409975a62b166225853bec
-DIST libxmp-4.7.2.tar.gz 857784 BLAKE2B 0c519d50791a396069aa9e38463ebbdee6bb6119ae7c77db2d9b702c01c5fa690f8858710d362d2d2097d661cd62e4517160df55b89d2fe128338b37a384b759 SHA512 f05d46fcb7ba8060f44964a366487b191ff6a4c379ecc3cb7b34977bfec803417ba6ef7eb1d08fb23bde59d5b10c898b4908093583a470cf3f0e5ec595d9f57a
+DIST libxmp-4.7.3.tar.gz 858590 BLAKE2B 14ca792584f9791bd99a107425530cec4e026a6fd455a733c1030cf5c3906231965fcebc83284564412d9860457317dc01a825fe05fa339d83b5455766a747cf SHA512 b8048711ddec131c4186bc710e64b542b6845327d97cfc167839c2cf96dbc4fc8882776ab7902446ae18de9c57718543c18c6d2ffdbfe032fedaf5a836ba3f32
diff --git a/media-libs/libxmp/libxmp-4.7.2.ebuild b/media-libs/libxmp/libxmp-4.7.3.ebuild
index c7c43b0ff092..c7c43b0ff092 100644
--- a/media-libs/libxmp/libxmp-4.7.2.ebuild
+++ b/media-libs/libxmp/libxmp-4.7.3.ebuild
diff --git a/media-libs/quarter/metadata.xml b/media-libs/quarter/metadata.xml
index 4d0d711291c3..ad5ab06f5219 100644
--- a/media-libs/quarter/metadata.xml
+++ b/media-libs/quarter/metadata.xml
@@ -2,18 +2,16 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
   <maintainer type="person" proxied="yes">
-    <email>waebbl-gentoo@posteo.net</email>
-    <name>Bernd Waibel</name>
+    <email>negril.nx+gentoo@gmail.com</email>
+    <name>Paul Zander</name>
   </maintainer>
   <maintainer type="project" proxied="proxy">
     <email>proxy-maint@gentoo.org</email>
     <name>Gentoo Proxy Maintainers</name>
   </maintainer>
   <longdescription lang="en">
-	Quarter is a light-weight glue library that provides seamless
-	integration between Systems in Motions's Coin high-level 3D
-	visualization library and Trolltech's Qt 2D user interface library.
-	It supersedes previous Qt binding - SoQt - by subclassing QGLWidget.
+		Quarter is a light-weight glue library that provides seamless integration between Systems in Motions's Coin high-level 3D visualization library and Trolltech's Qt 2D user interface library.
+		It supersedes previous Qt binding - SoQt - by subclassing QGLWidget.
 	</longdescription>
   <use>
     <flag name="designer">Install plugin for <pkg>dev-qt/qttools</pkg>[designer]</flag>
diff --git a/media-libs/quarter/quarter-1.2.3-r1.ebuild b/media-libs/quarter/quarter-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..23173a1d4ee6
--- /dev/null
+++ b/media-libs/quarter/quarter-1.2.3-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt"
+HOMEPAGE="https://github.com/coin3d/quarter https://github.com/coin3d/coin/wiki"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/coin3d/${PN,,}.git"
+else
+	SRC_URI="https://github.com/coin3d/${PN,,}/releases/download/v${PV}/${P/${PN}/${PN,,}}-src.tar.gz"
+	S="${WORKDIR}/${PN,,}"
+
+	KEYWORDS="amd64 x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug designer doc qch"
+
+REQUIRED_USE="qch? ( doc )"
+RESTRICT="test"
+
+RDEPEND="
+	dev-qt/qtbase:6[gui,opengl,widgets]
+	dev-qt/qttools:6[widgets,designer?]
+	media-libs/coin
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? (
+		app-text/doxygen[dot]
+		qch? ( dev-qt/qttools:6[assistant] )
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.1-cmake.patch"
+	"${FILESDIR}/${PN}-1.2.2-find-qhelpgenerator.patch" # bug 933432
+)
+
+DOCS=( AUTHORS NEWS README.md )
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -e 's|/lib$|/lib@LIB_SUFFIX@|' \
+		-i Quarter.pc.cmake.in || die
+}
+
+src_configure() {
+	use debug && CMAKE_BUILD_TYPE="Debug"
+
+	local mycmakeargs=(
+		-D${PN^^}_BUILD_SHARED_LIBS=ON
+
+		-D${PN^^}_BUILD_PLUGIN=$(usex designer)
+		-D${PN^^}_BUILD_EXAMPLES=OFF
+
+		-D${PN^^}_BUILD_AWESOME_DOCUMENTATION=$(usex doc)
+		-D${PN^^}_BUILD_DOCUMENTATION=$(usex doc)
+		-D${PN^^}_BUILD_DOC_MAN=$(usex doc)
+		-D${PN^^}_BUILD_DOC_QTHELP=$(usex qch)
+		-D${PN^^}_BUILD_DOC_CHM=OFF
+		-D${PN^^}_BUILD_INTERNAL_DOCUMENTATION=OFF
+
+		-D${PN^^}_USE_QT5="no"
+		-D${PN^^}_USE_QT6="yes"
+	)
+
+	use doc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON )
+
+	cmake_src_configure
+}
diff --git a/media-libs/quarter/quarter-1.2.3.ebuild b/media-libs/quarter/quarter-1.2.3.ebuild
deleted file mode 100644
index db81f795c25f..000000000000
--- a/media-libs/quarter/quarter-1.2.3.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="GUI binding for using Coin/Open Inventor with Qt"
-HOMEPAGE="https://github.com/coin3d/coin/wiki"
-SRC_URI="https://github.com/coin3d/quarter/releases/download/v${PV}/${P}-src.tar.gz"
-S="${WORKDIR}/quarter"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug designer doc qch"
-
-REQUIRED_USE="qch? ( doc )"
-
-RDEPEND="
-	dev-qt/qtbase:6[gui,opengl,widgets]
-	dev-qt/qttools:6[widgets]
-	media-libs/coin
-	virtual/opengl
-	designer? ( dev-qt/qttools:6[designer] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-text/doxygen[dot]
-		qch? ( dev-qt/qttools:6[assistant] )
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.1-cmake.patch
-	"${FILESDIR}"/${PN}-1.2.2-find-qhelpgenerator.patch # bug 933432
-)
-
-DOCS=( AUTHORS NEWS README.md )
-
-src_prepare() {
-	cmake_src_prepare
-	sed -e 's|/lib$|/lib@LIB_SUFFIX@|' \
-		-i Quarter.pc.cmake.in || die
-}
-
-src_configure() {
-	use debug && append-cppflags -DQUARTER_DEBUG=1
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
-		-DQUARTER_BUILD_SHARED_LIBS=ON
-		-DQUARTER_BUILD_PLUGIN=$(usex designer)
-		-DQUARTER_BUILD_EXAMPLES=OFF
-		-DQUARTER_BUILD_DOCUMENTATION=$(usex doc)
-		-DQUARTER_BUILD_AWESOME_DOCUMENTATION=$(usex doc)
-		-DQUARTER_BUILD_DOC_MAN=$(usex doc)
-		-DQUARTER_BUILD_INTERNAL_DOCUMENTATION=OFF
-		-DQUARTER_BUILD_DOC_QTHELP=$(usex qch)
-		-DQUARTER_BUILD_DOC_CHM=OFF
-		-DQUARTER_USE_QT6=ON
-	)
-	use doc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Git=ON )
-	cmake_src_configure
-}
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 16fb95241389..0363f696c178 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -1,2 +1,3 @@
 DIST simage-1.8.3.tar.gz 829994 BLAKE2B 794ee3a1c71727af7e92839542470a4732584715b01cbfd5be7b34d8ea8295ca65f5634e10027e0e7e4eb36a024d31704ad31d9aa0a6ad6b66c08612879a1603 SHA512 193137bd00a322fe6c170d3ff318ac81e4cc685bdfa40a0415c5bb95802b6290174fea630eb79956f362b4e79fa0b60916976c63ef26d6a65a6a51d5d9f7de03
-DIST simage-1.8.4.tar.gz 6798392 BLAKE2B 8135d26075516d35f11917b1c5b0ebc60c559ee6fb4e84c9601e85b28d15ff83eb5031d45e9332b9fcfc113d20c26639e6d118d73601e59a36f15797c2cbe60e SHA512 8dcd55a5ce4b2b135acc3dd2e5e7b589697e545ca68aaf496350202d9bdeeed2c4623d85a56fc8c73f28ece5f02c0047088c8b68732d5067020d487e2ff99965
+DIST simage-1.8.4-src.tar.gz 6798392 BLAKE2B 8135d26075516d35f11917b1c5b0ebc60c559ee6fb4e84c9601e85b28d15ff83eb5031d45e9332b9fcfc113d20c26639e6d118d73601e59a36f15797c2cbe60e SHA512 8dcd55a5ce4b2b135acc3dd2e5e7b589697e545ca68aaf496350202d9bdeeed2c4623d85a56fc8c73f28ece5f02c0047088c8b68732d5067020d487e2ff99965
+DIST simage-1.8.5-src.tar.gz 6797333 BLAKE2B 21064d0b78796d233f08d3d10a70a8fcd7aa8de5eb19cc42da1cb2fec9b2a60fba2c12cf41f8cb9fe6109931102d9d5e98d6097705e612961fab0436b1a2bb84 SHA512 9853e071126a1b38325b8e0b0c67f3fd7b03b0e9b372469708785f5425ccc2ca93bfa78d1c83818241b882cf49f145a515b099385731f5086d42f3d43f92cc0d
diff --git a/media-libs/simage/metadata.xml b/media-libs/simage/metadata.xml
index 5f33304011d5..a8a403c7547c 100644
--- a/media-libs/simage/metadata.xml
+++ b/media-libs/simage/metadata.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
+  <maintainer type="person" proxied="yes">
+    <email>negril.nx+gentoo@gmail.com</email>
+    <name>Paul Zander</name>
+  </maintainer>
+  <maintainer type="project" proxied="proxy">
+    <email>proxy-maint@gentoo.org</email>
+    <name>Gentoo Proxy Maintainers</name>
+  </maintainer>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/media-libs/simage/simage-1.8.4-r1.ebuild b/media-libs/simage/simage-1.8.4-r1.ebuild
new file mode 100644
index 000000000000..3ede28c1a3c3
--- /dev/null
+++ b/media-libs/simage/simage-1.8.4-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Image and video texturing library"
+HOMEPAGE="https://github.com/coin3d/simage https://github.com/coin3d/coin/wiki"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/coin3d/${PN,,}.git"
+else
+	SRC_URI="https://github.com/coin3d/${PN,,}/releases/download/v${PV}/${P/${PN}/${PN,,}}-src.tar.gz"
+	S="${WORKDIR}/${PN,,}"
+
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ppc ppc64 ~sparc x86"
+fi
+
+LICENSE="BSD-1"
+# SONAME
+SLOT="0/20"
+IUSE="gif jpeg png qt6 sndfile test tiff vorbis zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gif? ( media-libs/giflib:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:= )
+	qt6? ( dev-qt/qtbase:6[gui] )
+	sndfile? (
+		media-libs/libsndfile
+		media-libs/flac:=
+	)
+	tiff? (
+		media-libs/tiff:=[lzma,zstd]
+		app-arch/xz-utils
+		app-arch/zstd:=
+	)
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/opus
+	)
+	zlib? ( virtual/zlib:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( media-libs/libsndfile )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	local mycmakeargs=(
+		-D${PN^^}_BUILD_SHARED_LIBS=ON
+		-D${PN^^}_BUILD_EXAMPLES=OFF
+		-D${PN^^}_BUILD_TESTS=$(usex test)
+		-D${PN^^}_BUILD_DOCUMENTATION=OFF
+		-D${PN^^}_USE_AVIENC=OFF # Windows only
+		-D${PN^^}_USE_GDIPLUS=OFF # Windows
+		-D${PN^^}_USE_CGIMAGE=OFF # OS X only
+		-D${PN^^}_USE_QUICKTIME=OFF # OS X only
+		-D${PN^^}_USE_QIMAGE=$(usex qt6)
+		-D${PN^^}_USE_QT5=OFF
+		-D${PN^^}_USE_QT6=$(usex qt6)
+		-D${PN^^}_USE_CPACK=OFF
+		-D${PN^^}_USE_STATIC_LIBS=OFF
+		-D${PN^^}_LIBJASPER_SUPPORT=OFF
+		-D${PN^^}_LIBSNDFILE_SUPPORT=$(usex sndfile)
+		-D${PN^^}_OGGVORBIS_SUPPORT=$(usex vorbis)
+		-D${PN^^}_EPS_SUPPORT=ON
+		-D${PN^^}_MPEG2ENC_SUPPORT=ON
+		-D${PN^^}_PIC_SUPPORT=ON
+		-D${PN^^}_RGB_SUPPORT=ON
+		-D${PN^^}_TGA_SUPPORT=ON
+		-D${PN^^}_XWD_SUPPORT=ON
+		-D${PN^^}_ZLIB_SUPPORT=$(usex zlib)
+		-D${PN^^}_GIF_SUPPORT=$(usex gif)
+		-D${PN^^}_JPEG_SUPPORT=$(usex jpeg)
+		-D${PN^^}_PNG_SUPPORT=$(usex png)
+		-D${PN^^}_TIFF_SUPPORT=$(usex tiff)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/simage/simage-1.8.4.ebuild b/media-libs/simage/simage-1.8.4.ebuild
deleted file mode 100644
index abd806b3375c..000000000000
--- a/media-libs/simage/simage-1.8.4.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="Image and video texturing library"
-HOMEPAGE="https://github.com/coin3d/simage/"
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/coin3d/simage.git"
-else
-	SRC_URI="https://github.com/coin3d/simage/releases/download/v${PV}/${P}-src.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-	S="${WORKDIR}/${PN}"
-fi
-
-LICENSE="BSD-1"
-# SONAME
-SLOT="0/20"
-IUSE="gif jpeg png qt6 sndfile test tiff vorbis zlib"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gif? ( media-libs/giflib:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	png? ( media-libs/libpng:= )
-	qt6? ( dev-qt/qtbase:6[gui] )
-	sndfile? (
-		media-libs/libsndfile
-		media-libs/flac:=
-	)
-	tiff? (
-		media-libs/tiff:=[lzma,zstd]
-		app-arch/xz-utils
-		app-arch/zstd:=
-	)
-	vorbis? (
-		media-libs/libogg
-		media-libs/libvorbis
-		media-libs/opus
-	)
-	zlib? ( virtual/zlib:= )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="test? ( media-libs/libsndfile )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	local mycmakeargs=(
-		-DSIMAGE_BUILD_SHARED_LIBS=ON
-		-DSIMAGE_BUILD_EXAMPLES=OFF
-		-DSIMAGE_BUILD_TESTS=$(usex test)
-		-DSIMAGE_BUILD_DOCUMENTATION=OFF
-		-DSIMAGE_USE_AVIENC=OFF # Windows only
-		-DSIMAGE_USE_GDIPLUS=OFF # Windows
-		-DSIMAGE_USE_CGIMAGE=OFF # OS X only
-		-DSIMAGE_USE_QUICKTIME=OFF # OS X only
-		-DSIMAGE_USE_QIMAGE=$(usex qt6)
-		-DSIMAGE_USE_QT5=OFF
-		-DSIMAGE_USE_QT6=$(usex qt6)
-		-DSIMAGE_USE_CPACK=OFF
-		-DSIMAGE_USE_STATIC_LIBS=OFF
-		-DSIMAGE_LIBJASPER_SUPPORT=OFF
-		-DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile)
-		-DSIMAGE_OGGVORBIS_SUPPORT=$(usex vorbis)
-		-DSIMAGE_EPS_SUPPORT=ON
-		-DSIMAGE_MPEG2ENC_SUPPORT=ON
-		-DSIMAGE_PIC_SUPPORT=ON
-		-DSIMAGE_RGB_SUPPORT=ON
-		-DSIMAGE_TGA_SUPPORT=ON
-		-DSIMAGE_XWD_SUPPORT=ON
-		-DSIMAGE_ZLIB_SUPPORT=$(usex zlib)
-		-DSIMAGE_GIF_SUPPORT=$(usex gif)
-		-DSIMAGE_JPEG_SUPPORT=$(usex jpeg)
-		-DSIMAGE_PNG_SUPPORT=$(usex png)
-		-DSIMAGE_TIFF_SUPPORT=$(usex tiff)
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/simage/simage-1.8.5.ebuild b/media-libs/simage/simage-1.8.5.ebuild
new file mode 100644
index 000000000000..713eba4a16cc
--- /dev/null
+++ b/media-libs/simage/simage-1.8.5.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Image and video texturing library"
+HOMEPAGE="https://github.com/coin3d/simage https://github.com/coin3d/coin/wiki"
+
+if [[ ${PV} == *9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/coin3d/${PN,,}.git"
+else
+	SRC_URI="https://github.com/coin3d/${PN,,}/releases/download/v${PV}/${P/${PN}/${PN,,}}-src.tar.gz"
+	S="${WORKDIR}/${PN,,}"
+
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+fi
+
+LICENSE="BSD-1"
+# SONAME
+SLOT="0/20"
+IUSE="gif jpeg png qt6 sndfile test tiff vorbis zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	gif? ( media-libs/giflib:= )
+	jpeg? ( media-libs/libjpeg-turbo:= )
+	png? ( media-libs/libpng:= )
+	qt6? ( dev-qt/qtbase:6[gui] )
+	sndfile? (
+		media-libs/libsndfile
+		media-libs/flac:=
+	)
+	tiff? (
+		media-libs/tiff:=[lzma,zstd]
+		app-arch/xz-utils
+		app-arch/zstd:=
+	)
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		media-libs/opus
+	)
+	zlib? ( virtual/zlib:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( media-libs/libsndfile )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.8.1-0001-Gentoo-specific-remove-RELEASE-flag-from-pkg-config.patch
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	local mycmakeargs=(
+		-D${PN^^}_BUILD_SHARED_LIBS=ON
+		-D${PN^^}_BUILD_EXAMPLES=OFF
+		-D${PN^^}_BUILD_TESTS=$(usex test)
+		-D${PN^^}_BUILD_DOCUMENTATION=OFF
+		-D${PN^^}_USE_AVIENC=OFF # Windows only
+		-D${PN^^}_USE_GDIPLUS=OFF # Windows
+		-D${PN^^}_USE_CGIMAGE=OFF # OS X only
+		-D${PN^^}_USE_QUICKTIME=OFF # OS X only
+		-D${PN^^}_USE_QIMAGE=$(usex qt6)
+		-D${PN^^}_USE_QT5=OFF
+		-D${PN^^}_USE_QT6=$(usex qt6)
+		-D${PN^^}_USE_CPACK=OFF
+		-D${PN^^}_USE_STATIC_LIBS=OFF
+		-D${PN^^}_LIBJASPER_SUPPORT=OFF
+		-D${PN^^}_LIBSNDFILE_SUPPORT=$(usex sndfile)
+		-D${PN^^}_OGGVORBIS_SUPPORT=$(usex vorbis)
+		-D${PN^^}_EPS_SUPPORT=ON
+		-D${PN^^}_MPEG2ENC_SUPPORT=ON
+		-D${PN^^}_PIC_SUPPORT=ON
+		-D${PN^^}_RGB_SUPPORT=ON
+		-D${PN^^}_TGA_SUPPORT=ON
+		-D${PN^^}_XWD_SUPPORT=ON
+		-D${PN^^}_ZLIB_SUPPORT=$(usex zlib)
+		-D${PN^^}_GIF_SUPPORT=$(usex gif)
+		-D${PN^^}_JPEG_SUPPORT=$(usex jpeg)
+		-D${PN^^}_PNG_SUPPORT=$(usex png)
+		-D${PN^^}_TIFF_SUPPORT=$(usex tiff)
+	)
+	cmake_src_configure
+}
diff --git a/media-libs/wivrn/Manifest b/media-libs/wivrn/Manifest
index c7094f32a15b..9eba3114a00a 100644
--- a/media-libs/wivrn/Manifest
+++ b/media-libs/wivrn/Manifest
@@ -1,8 +1,4 @@
-DIST wivrn-26.2.3-server-build-deps.tar.xz 24510700 BLAKE2B d6bcff5e36e570f91cded17e9287e2514d29f44a1d0b894755f503d1a44d807ed5c3a76d6b3dd6fcbaeda7e50e2ba7d8aaadd1190555173e6a1507111ac94960 SHA512 647e46231ed1f58ae5d6e9e7781332145c13d43c518d17b353e8f2ed9a0f95704792bee4aedd9e6aa4b64a499516ddef6ca5b24d06f88e7a80a960b65b58a383
-DIST wivrn-26.2.3.tar.gz 3895976 BLAKE2B e54a419b5fd45fa837a4302d4612712b866a87916848a5a30b53a5a631bac6f13ae6cd5df9a193517a5e2d77d3503022f0a5b3521aa719a4f1b04c5baa6636ad SHA512 95f15cc827f86e98f01fe2791e8acc1a641853765ce355ca8f124b3364eb600aa839d8d7e54447af9bbb42cef40f83c6426c930f019ae1b8db416d1be89dcd4f
-DIST wivrn-26.6-server-build-deps.tar.xz 25581664 BLAKE2B 02c2b01f36c2992763e24ef8151e83ccd7238f130d980dc731ab49d8ec3d41dd028f8d18ea3bdd65c8927ff53a72a1d791a30efcf5b013592065ba24c398d38e SHA512 53af04985a1596c0253fc4ca495eeff43ab692c51a69e79a07b0dcd8c2516518e4982274d5efb9e8e3a74f24ddc5e1bba102a4d05eb01052f668c8a4683eaa5f
-DIST wivrn-26.6.1-server-build-deps.tar.xz 25754132 BLAKE2B 95429bebd79474339845344b7cc8c0067a39c4755dcd922248b9221262c66648a53d2b2c2f402590a62a5b4540421ef27b177e3b7607e43e075cf85cf1a70aae SHA512 812b61173503269dd27107a1d4431d7ebdfc86beb138880152f2a8c21e56bd4b1aea7ce0d159b47b3fdfc3b8bff32dff95cdcec0c346c49249389f6496084633
-DIST wivrn-26.6.1.tar.gz 4102890 BLAKE2B 81f1e48328d70e01e37a4cf6dc3cb0c25d69b2129a11241ea5c4b8e0774b217f5b7ba5452b86d3ea353eead658757b5cb22d715789b414bf870bc8403e733ba2 SHA512 ffed2ab892fdce5a302378e16f8b2c2cda4cf43a1648e2d25db8b2fdce4094780025750836a0fad642852bf17c61fd5302dfd6cd02f1e67f55058857d7dbed32
 DIST wivrn-26.6.2-server-build-deps.tar.xz 25965996 BLAKE2B 882d6c5357b8ae30ae86554c6ddc01db2edba9ad152c7d9e2924e084285609942c8f9a216e3edfdba9b15d44aec3b95fda5dded8171faee1242c966b301be96a SHA512 803c6c1aab4fcb47708b01471629b84400ce71b70c8cf4f7439edaad61f9aa45c695c7763836fb845619182279432b622d09328441533dbe5c8a4f4bcff5674b
 DIST wivrn-26.6.2.tar.gz 4104326 BLAKE2B 724e312244b277b232ffdffcff6596b903782b794804e55353ca04c8720eb847dc8196b90bf249bf7df999e53051e7767ff662d08277bda7b44c0dd1492eb70c SHA512 ce210881d43a09a4fc8a6c6fe6e40b6925a110d715a3f15ad38d5210b9ef06361e62ee6e267ffcb8fbc0f50ff9a71254c6bcd3a3e13c7bff2b09eb2532fc0db8
-DIST wivrn-26.6.tar.gz 4103403 BLAKE2B 05d1dfa9a18dd94d94b2fda6f44091e49c529db93744d4638131e7ddf6621f7eb8ffb78ce1e2838bc0ce006d268cc634de3468cb6f6040d3d42e59030ec4aafa SHA512 dd3c948348981ad4cf62b16a52b950e3c9e8827dc8c83c733af23e9cc35f51434d6e9f798dda323adc29dc3b1e167c5c29f390fec2469183e45c096ea358e84c
+DIST wivrn-26.9-server-build-deps.tar.xz 4256496 BLAKE2B 1b470f490da47e094c93f83890a39a04b25fc83522e6dd56273c11d9958ceefa06234ff62126459b7d458b2345dc9b250d02d963fbe2efede9c8427eaa9f2750 SHA512 096daf43cb0849a986802ead071ddc0a7a25f277006ca44ef947a991e25d0eb473d3e4e2db2db0d79e485849e5dbc06eaf3af45a00affa7868ebbb7d3d642365
+DIST wivrn-26.9.tar.gz 4119144 BLAKE2B 57b539051feb3c1b571efb993b7563b3a88c49da29a9a18eb0164d9881c205096c7514ed1fb7ea08f2c7fc23c0e782688e6aa970250bc06217d8d7500ad522a8 SHA512 4a550ccc698a2c8926d5d71b91551df1bb00976540b3920e90b52231d615559d4adef882afb22ded7a6789bdd71e3a52a299b0d1cee5f56a7c9bf811c41f8d47
diff --git a/media-libs/wivrn/wivrn-26.2.3.ebuild b/media-libs/wivrn/wivrn-26.2.3.ebuild
deleted file mode 100644
index 0111449b4d37..000000000000
--- a/media-libs/wivrn/wivrn-26.2.3.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib fcaps flag-o-matic xdg
-
-DESCRIPTION="WiVRn OpenXR streaming"
-HOMEPAGE="https://github.com/WiVRn/WiVRn"
-
-LICENSE="GPL-3 Apache-2.0 MIT"
-SLOT="0"
-IUSE="debug gui nvenc +pipewire pulseaudio systemd vaapi wireshark-plugins x264"
-REQUIRED_USE="|| ( nvenc vaapi x264 )"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/WiVRn/WiVRn.git"
-	EGIT_MIN_CLONE_TYPE="single+tags"
-	MONADO_REPO_URI="https://gitlab.freedesktop.org/monado/monado.git"
-else
-	SRC_URI="
-		https://github.com/WiVRn/WiVRn/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/WiVRn/WiVRn/releases/download/v${PV}/server-build-deps.tar.xz -> ${P}-server-build-deps.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	app-arch/libarchive
-	dev-libs/glib
-	dev-libs/libbsd
-	dev-libs/openssl
-	gnome-base/librsvg
-	media-libs/libpng
-	media-libs/openxr-loader
-	net-dns/avahi
-	x11-libs/libnotify
-	|| (
-		sys-apps/systemd
-		sys-auth/elogind
-	)
-	gui? (
-		dev-libs/kirigami-addons
-		dev-libs/qcoro[qml]
-		kde-frameworks/kcoreaddons:6
-		kde-frameworks/ki18n:6
-		kde-frameworks/kiconthemes:6
-		kde-frameworks/kirigami:6
-		kde-frameworks/qqc2-desktop-style:6
-	)
-	pipewire? (
-		media-video/pipewire
-	)
-	pulseaudio? (
-		media-libs/libpulse
-	)
-	systemd? (
-		sys-apps/systemd
-	)
-	vaapi? (
-		media-video/ffmpeg[drm(-),vaapi]
-	)
-	x264? (
-		media-libs/x264
-	)
-	wireshark-plugins? (
-		!=net-analyzer/wireshark-4.6.0
-		net-analyzer/wireshark
-	)
-"
-DEPEND="
-	${RDEPEND}
-
-	dev-libs/boost
-	dev-cpp/cli11
-	dev-cpp/eigen
-	dev-cpp/nlohmann_json
-	dev-util/vulkan-headers
-"
-BDEPEND="
-	dev-util/glslang
-	dev-util/gdbus-codegen
-"
-
-if [[ ${PV} == 9999 ]]; then
-	src_unpack() {
-		git-r3_src_unpack
-		default_src_unpack
-
-		# export those before Monado is checked out
-		export GIT_DESC=$(git -C "${EGIT_DIR}" describe "${EGIT_VERSION}" --tags --always)
-		export GIT_COMMIT=${EGIT_VERSION}
-
-		# Only use those for the main repo
-		unset EGIT_BRANCH EGIT_COMMIT
-		local MONADO_COMMIT=$(cat "${P}/monado-rev")
-		git-r3_fetch "${MONADO_REPO_URI}" "${MONADO_COMMIT}"
-		git-r3_checkout "${MONADO_REPO_URI}" "${WORKDIR}/monado-src"
-	}
-
-	src_prepare() {
-		default_src_prepare
-		eapply --directory="${WORKDIR}/monado-src" "${WORKDIR}/${P}/patches/monado"/*
-		cmake_src_prepare
-	}
-else
-	src_unpack() {
-		default_src_unpack
-		cd "${WORKDIR}"
-		mv "WiVRn-${PV}" "${P}"
-	}
-fi
-
-multilib_src_configure() {
-	use debug || append-cflags "-DNDEBUG"
-	use debug || append-cxxflags "-DNDEBUG"
-	if [[ ${PV} != 9999 ]]; then
-		GIT_DESC=v${PV}
-		GIT_COMMIT=v${PV}
-	fi
-	local mycmakeargs=(
-		-DGIT_DESC=${GIT_DESC}
-		-DGIT_COMMIT=${GIT_COMMIT}
-		-DWIVRN_BUILD_CLIENT=OFF
-		-DWIVRN_BUILD_SERVER=$(multilib_is_native_abi && echo ON || echo OFF)
-		-DWIVRN_BUILD_SERVER_LIBRARY=ON
-		-DWIVRN_OPENXR_MANIFEST_TYPE=relative
-		-DWIVRN_OPENXR_MANIFEST_ABI=$(multilib_is_native_abi && echo OFF || echo ON)
-		-DWIVRN_BUILD_DASHBOARD=$(multilib_native_usex gui)
-		-DWIVRN_BUILD_DISSECTOR=$(multilib_native_usex wireshark-plugins)
-		-DWIVRN_BUILD_WIVRNCTL=$(multilib_is_native_abi && echo ON || echo OFF)
-		-DWIVRN_FEATURE_STEAMVR_LIGHTHOUSE=ON
-		-DWIVRN_USE_PIPEWIRE=$(multilib_native_usex pipewire)
-		-DWIVRN_USE_PULSEAUDIO=$(multilib_native_usex pulseaudio)
-		-DWIVRN_USE_NVENC=$(multilib_native_usex nvenc)
-		-DWIVRN_USE_VAAPI=$(multilib_native_usex vaapi)
-		-DWIVRN_USE_VULKAN_ENCODE=ON
-		-DWIVRN_USE_X264=$(multilib_native_usex x264)
-		-DWIVRN_USE_SYSTEMD=$(multilib_native_usex systemd)
-		-DWIVRN_USE_SYSTEM_OPENXR=ON
-		-DWIVRN_USE_SYSTEM_BOOST=ON
-		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
-		-DFETCHCONTENT_BASE_DIR="${WORKDIR}"
-		-DENABLE_COLOURED_OUTPUT=OFF
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	newenvd - "50${PN}" <<-_EOF_
-PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES=1
-	_EOF_
-}
-
-pkg_postinst()
-{
-	fcaps cap_sys_nice usr/bin/wivrn-server
-	xdg_pkg_postinst
-	elog "WiVRn requires a compatible client on VR headset to run."
-	if [[ ${PV} == 9999 ]]; then
-		elog "For most headsets it can be downloaded from CI artifacts on https://github.com/WiVRn/WiVRn/actions/workflows/Build.yml"
-	else
-		elog "For most headsets it can be downloaded on https://github.com/WiVRn/WiVRn/releases/tag/v${PV}"
-	fi
-}
diff --git a/media-libs/wivrn/wivrn-26.6.1.ebuild b/media-libs/wivrn/wivrn-26.6.1.ebuild
deleted file mode 100644
index bdec9faed3df..000000000000
--- a/media-libs/wivrn/wivrn-26.6.1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib flag-o-matic xdg
-
-DESCRIPTION="WiVRn OpenXR streaming"
-HOMEPAGE="https://github.com/WiVRn/WiVRn"
-
-LICENSE="GPL-3 Apache-2.0 MIT"
-SLOT="0"
-IUSE="debug gui nvenc +pipewire pulseaudio systemd vaapi wireshark-plugins x264"
-REQUIRED_USE="|| ( nvenc vaapi x264 )"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/WiVRn/WiVRn.git"
-	EGIT_MIN_CLONE_TYPE="single+tags"
-	MONADO_REPO_URI="https://gitlab.freedesktop.org/monado/monado.git"
-else
-	SRC_URI="
-		https://github.com/WiVRn/WiVRn/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
-		https://github.com/WiVRn/WiVRn/releases/download/v${PV}/server-build-deps.tar.xz -> ${P}-server-build-deps.tar.xz"
-	KEYWORDS="~amd64"
-fi
-
-RDEPEND="
-	app-arch/libarchive
-	dev-libs/glib
-	dev-libs/libbsd
-	dev-libs/openssl
-	gnome-base/librsvg
-	media-libs/libpng
-	media-libs/openxr-loader
-	net-dns/avahi
-	x11-libs/libnotify
-	|| (
-		sys-apps/systemd
-		sys-auth/elogind
-	)
-	gui? (
-		dev-libs/kirigami-addons
-		dev-libs/qcoro[qml]
-		kde-frameworks/kcoreaddons:6
-		kde-frameworks/ki18n:6
-		kde-frameworks/kiconthemes:6
-		kde-frameworks/kirigami:6
-		kde-frameworks/qqc2-desktop-style:6
-	)
-	pipewire? (
-		media-video/pipewire
-	)
-	pulseaudio? (
-		media-libs/libpulse
-	)
-	systemd? (
-		sys-apps/systemd
-	)
-	vaapi? (
-		media-video/ffmpeg[drm(-),vaapi]
-	)
-	x264? (
-		media-libs/x264
-	)
-	wireshark-plugins? (
-		!=net-analyzer/wireshark-4.6.0
-		net-analyzer/wireshark
-	)
-"
-DEPEND="
-	${RDEPEND}
-
-	dev-libs/boost
-	dev-cpp/cli11
-	dev-cpp/eigen
-	dev-cpp/nlohmann_json
-	dev-util/vulkan-headers
-"
-BDEPEND="
-	dev-util/glslang
-	dev-util/gdbus-codegen
-"
-
-if [[ ${PV} == 9999 ]]; then
-	src_unpack() {
-		git-r3_src_unpack
-		default_src_unpack
-
-		# export those before Monado is checked out
-		export GIT_DESC=$(git -C "${EGIT_DIR}" describe "${EGIT_VERSION}" --tags --always)
-		export GIT_COMMIT=${EGIT_VERSION}
-
-		# Only use those for the main repo
-		unset EGIT_BRANCH EGIT_COMMIT
-		local MONADO_COMMIT=$(cat "${P}/monado-rev")
-		git-r3_fetch "${MONADO_REPO_URI}" "${MONADO_COMMIT}"
-		git-r3_checkout "${MONADO_REPO_URI}" "${WORKDIR}/monado-src"
-	}
-
-	src_prepare() {
-		default_src_prepare
-		eapply --directory="${WORKDIR}/monado-src" "${WORKDIR}/${P}/patches/monado"/*
-		cmake_src_prepare
-	}
-else
-	src_unpack() {
-		default_src_unpack
-		cd "${WORKDIR}"
-		mv "WiVRn-${PV}" "${P}"
-	}
-fi
-
-multilib_src_configure() {
-	use debug || append-cflags "-DNDEBUG"
-	use debug || append-cxxflags "-DNDEBUG"
-	if [[ ${PV} != 9999 ]]; then
-		GIT_DESC=v${PV}
-		GIT_COMMIT=v${PV}
-	fi
-	local mycmakeargs=(
-		-DGIT_DESC=${GIT_DESC}
-		-DGIT_COMMIT=${GIT_COMMIT}
-		-DWIVRN_BUILD_CLIENT=OFF
-		-DWIVRN_BUILD_SERVER=$(multilib_is_native_abi && echo ON || echo OFF)
-		-DWIVRN_BUILD_SERVER_LIBRARY=ON
-		-DWIVRN_OPENXR_MANIFEST_TYPE=relative
-		-DWIVRN_OPENXR_MANIFEST_ABI=$(multilib_is_native_abi && echo OFF || echo ON)
-		-DWIVRN_BUILD_DASHBOARD=$(multilib_native_usex gui)
-		-DWIVRN_BUILD_DISSECTOR=$(multilib_native_usex wireshark-plugins)
-		-DWIVRN_BUILD_WIVRNCTL=$(multilib_is_native_abi && echo ON || echo OFF)
-		-DWIVRN_FEATURE_STEAMVR_LIGHTHOUSE=ON
-		-DWIVRN_USE_PIPEWIRE=$(multilib_native_usex pipewire)
-		-DWIVRN_USE_PULSEAUDIO=$(multilib_native_usex pulseaudio)
-		-DWIVRN_USE_NVENC=$(multilib_native_usex nvenc)
-		-DWIVRN_USE_VAAPI=$(multilib_native_usex vaapi)
-		-DWIVRN_USE_VULKAN_ENCODE=ON
-		-DWIVRN_USE_X264=$(multilib_native_usex x264)
-		-DWIVRN_USE_SYSTEMD=$(multilib_native_usex systemd)
-		-DWIVRN_USE_SYSTEM_OPENXR=ON
-		-DWIVRN_USE_SYSTEM_BOOST=ON
-		-DFETCHCONTENT_FULLY_DISCONNECTED=ON
-		-DFETCHCONTENT_BASE_DIR="${WORKDIR}"
-		-DENABLE_COLOURED_OUTPUT=OFF
-	)
-
-	cmake_src_configure
-}
-
-multilib_src_install() {
-	cmake_src_install
-
-	newenvd - "50${PN}" <<-_EOF_
-PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES=1
-	_EOF_
-}
-
-pkg_postinst()
-{
-	xdg_pkg_postinst
-	elog "WiVRn requires a compatible client on VR headset to run."
-	if [[ ${PV} == 9999 ]]; then
-		elog "For most headsets it can be downloaded from CI artifacts on https://github.com/WiVRn/WiVRn/actions/workflows/Build.yml"
-	else
-		elog "For most headsets it can be downloaded on https://github.com/WiVRn/WiVRn/releases/tag/v${PV}"
-	fi
-}
diff --git a/media-libs/wivrn/wivrn-26.6.ebuild b/media-libs/wivrn/wivrn-26.9.ebuild
index bdec9faed3df..2244242ba241 100644
--- a/media-libs/wivrn/wivrn-26.6.ebuild
+++ b/media-libs/wivrn/wivrn-26.9.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://github.com/WiVRn/WiVRn"
 
 LICENSE="GPL-3 Apache-2.0 MIT"
 SLOT="0"
-IUSE="debug gui nvenc +pipewire pulseaudio systemd vaapi wireshark-plugins x264"
+IUSE="debug gui nvenc +pipewire pulseaudio vaapi wireshark-plugins x264"
 REQUIRED_USE="|| ( nvenc vaapi x264 )"
 
 if [[ ${PV} == 9999 ]]; then
@@ -54,9 +54,6 @@ RDEPEND="
 	pulseaudio? (
 		media-libs/libpulse
 	)
-	systemd? (
-		sys-apps/systemd
-	)
 	vaapi? (
 		media-video/ffmpeg[drm(-),vaapi]
 	)
@@ -115,10 +112,14 @@ multilib_src_configure() {
 	use debug || append-cflags "-DNDEBUG"
 	use debug || append-cxxflags "-DNDEBUG"
 	if [[ ${PV} != 9999 ]]; then
-		GIT_DESC=v${PV}
-		GIT_COMMIT=v${PV}
+		GIT_TAG=v${PV}
+		GIT_DESC=""
+		GIT_COMMIT=""
+	else
+		GIT_TAG=""
 	fi
 	local mycmakeargs=(
+		-DGIT_TAG=${GIT_TAG}
 		-DGIT_DESC=${GIT_DESC}
 		-DGIT_COMMIT=${GIT_COMMIT}
 		-DWIVRN_BUILD_CLIENT=OFF
@@ -136,7 +137,6 @@ multilib_src_configure() {
 		-DWIVRN_USE_VAAPI=$(multilib_native_usex vaapi)
 		-DWIVRN_USE_VULKAN_ENCODE=ON
 		-DWIVRN_USE_X264=$(multilib_native_usex x264)
-		-DWIVRN_USE_SYSTEMD=$(multilib_native_usex systemd)
 		-DWIVRN_USE_SYSTEM_OPENXR=ON
 		-DWIVRN_USE_SYSTEM_BOOST=ON
 		-DFETCHCONTENT_FULLY_DISCONNECTED=ON