4 files changed, 40 insertions, 14 deletions
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 57d759051f77..bbd34e94d1bf 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/mathmod/Manifest b/sci-mathematics/mathmod/Manifest
index 9e9461e3d287..d931a81002cb 100644
--- a/sci-mathematics/mathmod/Manifest
+++ b/sci-mathematics/mathmod/Manifest
@@ -1,3 +1,4 @@
-DIST mathmod-11.1.tar.gz 7934535 BLAKE2B ccb5ba1ee74b0e6f2d605bf76f107ce43f695f2dc81fe0ef8498fdb29978f3da214178ed433eea9536f3ee801c24887988e0c1064833a6a1069e0349fb209a05 SHA512 50485094a5c0f08077a27215d4189ba28085ad9d6cc3323043955d63723271adf80ba2c8a75afd0b50ea7443a55f5d4efd8f8d5eae32a9c0718450784ff728ab
-EBUILD mathmod-11.1.ebuild 987 BLAKE2B 8a268805b9c413c0b30016636d76b6027ee4062fd7e05b25971bac1c4c1c087031dbb4032e1867dfa83d21e0fd4ebedb8513dd8135adec30da35aa455bbaef81 SHA512 61e29fcea7f87dd831de30bfc9afc496dc007ba9bcca9645d3aa671ebeaffc0322aadd71d6f6bfa73e82912fe656d396bf77b848065bbecf1984943a1706b582
+AUX mathmod-12.0-rm_complex.patch 570 BLAKE2B 46e741101efe176dee35f6b9ddcfa1eb804417db618a084be6ccbb3d6754ca5cddf95954bb2769c2ae2d71d302868ca2429c8ff43f0c05d356ba25f3e169526e SHA512 de079a64f2ebca3f5c45c29e7cc1e600f713ed098ddc87d405d2621fe71e7862b8bc3025c763d3b50a89ffff0cb664902cc6b8b1cf7a7c6a8fb23cbb1de51998
+DIST mathmod-12.0.tar.gz 9392067 BLAKE2B 2144c4aa06c3c13bdb5dca333134195d92bea5dcf0478e80f2ca25b41e4c74344725cced3bc72fc4b4f571da5b3ec734b0ea05fc7b1f80566f8b83d229e5627f SHA512 d8a247a14e03c4d6fb4812b4404338162d7ff79745ebe31c467a444fdb48441b950a9d39c7b31fedb3f2bb1961d3075e44eb264b863708bd48f949b8185d60c6
+EBUILD mathmod-12.0.ebuild 998 BLAKE2B 5868c888e059b58203332229eac5572029f336186e0ba9d77107c3bb231c927e79dd007a97d45ffc9a6b724813ba2a22d6488d34f38c76679236e13ee5090cfe SHA512 0b16cc81eb99b076a85aa26f3bc69e6b5ae541ba3de3a32c0077d42fd2c75d7895a3dfcca89b117b05478698de9363adc6c38907db97241d9be349ab7ec66586
 MISC metadata.xml 741 BLAKE2B a4c1d87fbd5b528cd93a9b3d0ce7464ff635965d6a981dfd65421e3407110c10bf9211293a2494329ad281f9f3672df96096b9adab73c8187665dd270032b3d6 SHA512 a904fbfac085f23da922b771c775206aae44a0d78e0fb4aa91812c9643b0ac22c9b9cb7458e6cdaa6a10311d3c8b179aa091dead0474129839a535fb6c8e28de
diff --git a/sci-mathematics/mathmod/files/mathmod-12.0-rm_complex.patch b/sci-mathematics/mathmod/files/mathmod-12.0-rm_complex.patch
new file mode 100644
index 000000000000..51ba2930a306
--- /dev/null
+++ b/sci-mathematics/mathmod/files/mathmod-12.0-rm_complex.patch
@@ -0,0 +1,21 @@
+From 61b94a59728fd691fb363ccc4e5f5bbb35e2b3c2 Mon Sep 17 00:00:00 2001
+From: Abderrahman Taha <taha_ab@yahoo.fr>
+Date: Wed, 2 Apr 2025 01:04:49 -0400
+Subject: [PATCH] #269 Collision between <complex.h> and QT
+
+---
+ pariso/commun.h | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/pariso/commun.h b/pariso/commun.h
+index 2d647f3..0827cb8 100644
+--- a/pariso/commun.h
++++ b/pariso/commun.h
+@@ -22,7 +22,6 @@
+ 
+ #include "../fparser/fparser.hh"
+ #include <qthread.h>
+-#include <complex.h>
+ #include <tgmath.h>
+ 
+ #define PI (double(314159265) / double(100000000))
diff --git a/sci-mathematics/mathmod/mathmod-11.1.ebuild b/sci-mathematics/mathmod/mathmod-12.0.ebuild
index 54833f046640..ff8480ffbff9 100644
--- a/sci-mathematics/mathmod/mathmod-11.1.ebuild
+++ b/sci-mathematics/mathmod/mathmod-12.0.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
@@ -11,28 +11,32 @@ HOMEPAGE="https://github.com/parisolab/mathmod
 	https://www.facebook.com/parisolab"
 SRC_URI="https://github.com/parisolab/mathmod/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
-LICENSE="GPL-2+ GPL-3"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtopengl:5
-	dev-qt/qtwidgets:5"
+	dev-qt/qtbase:6[gui,opengl,widgets]
+"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	# Fix collision between <complex.h> and QT
+	# Merged, to be removed with release 12.1
+	"${FILESDIR}"/${P}-rm_complex.patch
+)
+
 src_configure() {
-	eqmake5 MathMod.pro
+	eqmake6 MathMod.pro
 }
 
 src_install() {
-	exeinto /usr/bin
-	doexe MathMod
+	dobin MathMod
 	insinto /usr/share/${P}
 	doins mathmodconfig.js mathmodcollection.js advancedmodels.js
-	newicon -s 16 images/icon/catenoid_mini_16x16.png catenoid.png
-	newicon -s 32 images/icon/catenoid_mini_32x32.png catenoid.png
-	newicon -s 64 images/icon/catenoid_mini_64x64.png catenoid.png
+	local size
+	for size in 16 32 64; do
+		newicon -s ${size} images/icon/catenoid_mini_${size}x${size}.png catenoid.png
+	done
 	make_desktop_entry MathMod MathMod catenoid
 }