media-gfx/krita: enable py3.12, add IUSE media, xsimd; re-add jpeg2k

IUSE raw switched back to kde-apps/libkdcraw
Upstream commit 02f4f845eaf789d3840805e69bdbb38f131a3cc7

IUSE media w/ media-video/mlt replaces IUSE qtmedia w/ dev-qt/qtmultimedia
Upstream commits:
7f976690636071a2387d8ca9c4203edb59489b0d
c76debce1c39b337bdd21c5dc2048605dc6d267d

New dependency on dev-libs/libunibreak
Upstream commit 3d0ba2926f576e9dd059c2bed5264cbd8f6adcf6

Rebase tests-optional.patch on 5.2.3
Upstream commit 2acfac835adf5cb39dd6d9149c739648da060385

Sync with ::gentoo w/ minor sorting fixes, plus:

- Pin down kde-apps/libkdcraw to SLOT 5
- Raise minimum dep on dev-cpp/xsimd to 13.0.0
- Drop unnecessary openjpeg patch

See also:
https://github.com/gentoo/gentoo/pull/34736

Bug: https://bugs.gentoo.org/921972
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

4 files changed, 55 insertions, 13 deletions

diff --git a/media-gfx/krita/files/krita-5.2.2-fftw.patch b/media-gfx/krita/files/krita-5.2.2-fftw.patch
new file mode 100644
index 0000000000..b805be6a21
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.2-fftw.patch
@@ -0,0 +1,18 @@
+Disable the cmake find_package method. It will instead fallback to use pkgconfig.
+Without this, it will fail to find fftw3 and error out.
+
+--- a/cmake/modules/FindFFTW3.cmake	2023-11-24 19:59:45.904059240 +0100
++++ b/cmake/modules/FindFFTW3.cmake	2023-11-24 20:00:17.029563107 +0100
+@@ -74,9 +74,9 @@
+ endforeach()
+ mark_as_advanced(PKG_FFTW_CONFIG_DIR)
+ 
+-find_package(FFTW3 QUIET NO_MODULE
+-    HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3 /usr/local/lib/cmake/fftw3
+-)
++#find_package(FFTW3 QUIET NO_MODULE
++#    HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3 /usr/local/lib/cmake/fftw3
++#)
+ mark_as_advanced(FFTW3_DIR)
+ 
+ # if we found the FFTW3 CMake package then we can start
diff --git a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch b/media-gfx/krita/files/krita-5.2.3-tests-optional.patch
index 37f2ac50ff..48d9e314a2 100644
--- a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
+++ b/media-gfx/krita/files/krita-5.2.3-tests-optional.patch
@@ -76,5 +76,15 @@ index 88c0516360..01f2383ddb 100644
 +if(BUILD_TESTING)
 +    add_subdirectory(tests)
 +endif()
--- 
-2.27.0
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1246,7 +1246,9 @@
+                            ${CMAKE_CURRENT_BINARY_DIR}
+ )
+ 
++if(BUILD_TESTING)
+ add_subdirectory(sdk/tests)
++endif()
+ 
+ add_subdirectory(libs)
+ add_subdirectory(plugins)
diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 425c755041..506ff60ab9 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -4,14 +4,14 @@
 EAPI=8
 
 ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 KFMIN=5.115.0
 QTMIN=5.15.12
 inherit ecm kde.org python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
@@ -19,7 +19,7 @@ HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
 
 LICENSE="GPL-3"
 SLOT="5"
-IUSE="color-management fftw gif +gsl heif jpegxl +mypaint-brush-engine openexr pdf qtmedia +raw webp"
+IUSE="color-management fftw gif +gsl heif jpeg2k jpegxl +mypaint-brush-engine openexr pdf media +raw +xsimd webp"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # bug 630508
@@ -27,6 +27,7 @@ RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
 	dev-libs/boost:=
+	dev-libs/libunibreak:=
 	dev-libs/quazip:0=[qt5(+)]
 	$(python_gen_cond_dep '
 		dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
@@ -68,23 +69,34 @@ RDEPEND="${PYTHON_DEPS}
 	fftw? ( sci-libs/fftw:3.0= )
 	gif? ( media-libs/giflib )
 	gsl? ( sci-libs/gsl:= )
+	jpeg2k? ( media-libs/openjpeg:= )
 	jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825:= )
 	heif? ( >=media-libs/libheif-1.11:=[x265] )
+	media? ( media-libs/mlt:= )
 	mypaint-brush-engine? ( media-libs/libmypaint:= )
 	openexr? ( media-libs/openexr:= )
 	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
+	raw? ( kde-apps/libkdcraw:5 )
 	webp? ( >=media-libs/libwebp-1.2.0:= )
+	xsimd? ( >=dev-cpp/xsimd-13.0.0 )
+
+"
+DEPEND="${RDEPEND}
+	dev-libs/immer
+	dev-libs/lager
+	dev-libs/zug
 "
-DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-cpp/eigen:3
 	dev-lang/perl
 	sys-devel/gettext
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+PATCHES=(
+	# downstream
+	"${FILESDIR}"/${PN}-5.2.3-tests-optional.patch
+	"${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
+)
 
 pkg_setup() {
 	python-single-r1_pkg_setup
@@ -100,19 +112,20 @@ src_configure() {
 		-DENABLE_UPDATERS=OFF
 		-DKRITA_ENABLE_PCH=OFF # big mess.
 		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
-		-DCMAKE_DISABLE_FIND_PACKAGE_xsimd=ON # not packaged
 		$(cmake_use_find_package color-management OpenColorIO)
 		$(cmake_use_find_package fftw FFTW3)
 		$(cmake_use_find_package gif GIF)
 		$(cmake_use_find_package gsl GSL)
 		$(cmake_use_find_package heif HEIF)
+		$(cmake_use_find_package jpeg2k OpenJPEG)
 		$(cmake_use_find_package jpegxl JPEGXL)
+		$(cmake_use_find_package media Mlt7)
 		$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
 		$(cmake_use_find_package openexr OpenEXR)
 		$(cmake_use_find_package pdf Poppler)
-		$(cmake_use_find_package qtmedia Qt5Multimedia)
-		$(cmake_use_find_package raw LibRaw)
+		$(cmake_use_find_package raw KF5KDcraw)
 		$(cmake_use_find_package webp WebP)
+		$(cmake_use_find_package xsimd xsimd)
 	)
 
 	ecm_src_configure
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index ff6c095b3a..82ce837b71 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -10,7 +10,8 @@
 	</upstream>
 	<use>
 		<flag name="color-management">Enable color management via <pkg>media-libs/opencolorio</pkg></flag>
+		<flag name="media">Enable sound support for animations via <pkg>media-libs/mlt</pkg></flag>
 		<flag name="mypaint-brush-engine">Enable MyPaint brush engine support <pkg>media-libs/libmypaint</pkg></flag>
-		<flag name="qtmedia">Enable sound support for animations via <pkg>dev-qt/qtmultimedia</pkg></flag>
+		<flag name="xsimd">Enable usage of SIMD instructions via <pkg>dev-cpp/xsimd</pkg></flag>
 	</use>
 </pkgmetadata>