Adding metadata

6 files changed, 53 insertions, 154 deletions

diff --git a/media-gfx/blender/blender-4.5.5.ebuild b/media-gfx/blender/blender-4.5.5.ebuild
index a45adf6874d9..6dd2b4bdcc7b 100644
--- a/media-gfx/blender/blender-4.5.5.ebuild
+++ b/media-gfx/blender/blender-4.5.5.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
 
 # shellcheck disable=SC2207
@@ -57,7 +57,7 @@ else
 			https://download.blender.org/source/blender-test-data-${BLENDER_BRANCH}.0-1.tar.xz
 		)
 	"
-	KEYWORDS="~amd64 ~arm64"
+	KEYWORDS="amd64 ~arm64"
 fi
 
 # assets is CC0-1.0
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index 0c9dffc39e0a..ffd5645f196e 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.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
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 134d7edfe8ca..6e0bfdd6f4da 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-DIST krita-6.0.1.tar.xz 203100664 BLAKE2B 6d8865973cab26cf1fb7c0e53b24fdfddd98f295a73c00f0b9f7f8f6ae1bbb344487d930ab7588e30718e20aeed05fd14ce54e5b7bf3a9d7c7a75d97a0b6da5f SHA512 2c00cb04675f8e936f300adbc121fe231edd64a2b1d5f9a16b4aa0fc60a54f4a7089ca332fb144426f9dea1d429b835f0cf1fa6e26c2f04fc6c73558a0eabad3
 DIST krita-6.0.2_pre20260509.tar.xz 184458368 BLAKE2B 26c81dbba6f8d38b706cd18bfb4ac929e36ad08427c0e3f68a71392674facfecace3ff223787b4d0f7ad1c7ea84ace7bcd43e3f0b3f9528f987c5d0a7898dc6f SHA512 83c1bd68da933abfb62d9f8e8ca87588925e9e326117ddcfa208d78f5ec13237d74906e7b6d63dac7cc86f5960f5967c28298f578f10e419c674bae9d9442ba7
diff --git a/media-gfx/krita/files/krita-6.0.1-pyqt6.11-sip13.8.patch b/media-gfx/krita/files/krita-6.0.1-pyqt6.11-sip13.8.patch
new file mode 100644
index 000000000000..bc3e2edefc59
--- /dev/null
+++ b/media-gfx/krita/files/krita-6.0.1-pyqt6.11-sip13.8.patch
@@ -0,0 +1,49 @@
+From 634c5720ccce706ce189fd82f9248b80061093a9 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 12 May 2026 22:46:18 +0200
+Subject: [PATCH] Fix build w/ Qt 6.11/PyQt6-6.11
+
+Contains git master cherry-picks, fixed for distribution purpose:
+
+- Update SIP ABI to 13.8
+  This API is used in the updated version of PyQt6 6.11.0
+  (cherry picked from commit 30182dbfe789c9b44e5762978bf9ebb22c4f72b6)
+- Make the selection of SIP ABI automatic
+  Ideally, we should selection the ABI level depending
+  on the version of PyQt6, not of the version of Qt itself,
+  but let's keep it simpler for now.
+  (cherry picked from commit bf7fa438058f95df35d98da73f6ba8b6751c01d4)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ cmake/modules/SIPMacros.cmake | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/modules/SIPMacros.cmake b/cmake/modules/SIPMacros.cmake
+index 113a3b3234..6e48224492 100644
+--- a/cmake/modules/SIPMacros.cmake
++++ b/cmake/modules/SIPMacros.cmake
+@@ -152,13 +152,19 @@ else()
+         endif()
+ 
+         if (QT_MAJOR_VERSION STREQUAL "6")
+-            set(abi_version "13.0")
++            if (${Qt6_VERSION} VERSION_GREATER_EQUAL "6.11.0")
++                set(abi_version "13.8")
++            else()
++                set(abi_version "13.0")
++            endif()
+             set(sip_disabled_features "[\"Krita_Qt5\"]")
+         else()
+             set(abi_version "12.8")
+             set(sip_disabled_features "[]")
+         endif()
+ 
++        message(STATUS "SIP ABI version: ${abi_version}")
++
+         set(module_tags)
+         if (QT_MAJOR_VERSION STREQUAL "5")
+             foreach(_tag ${SIP_TAGS})
+-- 
+2.54.0
+
diff --git a/media-gfx/krita/krita-6.0.1.ebuild b/media-gfx/krita/krita-6.0.1.ebuild
deleted file mode 100644
index 70e6b015032f..000000000000
--- a/media-gfx/krita/krita-6.0.1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2026 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PATCHSET=
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{10..14} )
-KFMIN=6.16.0
-QTMIN=6.10.1
-inherit ecm kde.org python-single-r1 xdg
-
-if [[ ${KDE_BUILD_TYPE} == release ]]; then
-	COMMIT=
-	MY_PV="${PV/_/-}"
-	MY_P="${PN}-${MY_PV}"
-	if [[ -n ${COMMIT} ]] ; then
-		SRC_URI="https://dev.gentoo.org/~asturm/distfiles/kde/${P}-${COMMIT:0:8}.tar.xz"
-		S="${WORKDIR}/${PN}"
-	else
-		if [[ ${MY_P} == ${P} ]] ; then
-			SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-		else
-			SRC_URI="mirror://kde/unstable/${PN}/${MY_PV}/${MY_P}.tar.xz"
-		fi
-		S="${WORKDIR}/${MY_P}"
-	fi
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
-fi
-if [[ -n ${PATCHSET} ]]; then
-	SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/kde/${PATCHSET}.tar.xz"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="color-management fftw gif +gsl heif jpeg2k jpegxl +mypaint-brush-engine openexr pdf media +raw wayland webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-cpp/eigen:=
-	>=dev-cpp/xsimd-13.0.0
-	dev-libs/boost:=
-	dev-libs/libunibreak:=
-	>=dev-libs/quazip-1.3-r2:0=[qt6(+)]
-	$(python_gen_cond_dep '
-		dev-python/pyqt6[gui,qml,widgets,xml,${PYTHON_USEDEP}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-	')
-	>=dev-qt/qt5compat-${QTMIN}:6
-	>=dev-qt/qtbase-${QTMIN}:6=[concurrent,dbus,-gles2-only,gui,network,opengl,sql,wayland?,widgets,X,xml]
-	>=dev-qt/qtdeclarative-${QTMIN}:6
-	>=dev-qt/qtsvg-${QTMIN}:6
-	>=kde-frameworks/kcolorscheme-${KFMIN}:6
-	>=kde-frameworks/kcompletion-${KFMIN}:6
-	>=kde-frameworks/kconfig-${KFMIN}:6
-	>=kde-frameworks/kcoreaddons-${KFMIN}:6
-	>=kde-frameworks/kcrash-${KFMIN}:6
-	>=kde-frameworks/kguiaddons-${KFMIN}:6
-	>=kde-frameworks/ki18n-${KFMIN}:6
-	>=kde-frameworks/kiconthemes-${KFMIN}:6
-	>=kde-frameworks/kitemviews-${KFMIN}:6
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
-	>=kde-frameworks/kxmlgui-${KFMIN}:6
-	media-gfx/exiv2:=
-	media-libs/fontconfig
-	media-libs/freetype
-	media-libs/harfbuzz:=
-	media-libs/lcms
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	virtual/zlib:=
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( >=media-libs/opencolorio-2.0.0 )
-	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[qt6(-)] )
-	raw? ( kde-apps/libkdcraw:6 )
-	webp? ( >=media-libs/libwebp-1.2.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	!${CATEGORY}/${PN}:5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/immer
-	dev-libs/lager
-	dev-libs/zug
-"
-BDEPEND="
-	dev-lang/perl
-	sys-devel/gettext
-"
-
-PATCHES=(
-	# downstream
-	"${FILESDIR}"/${PN}-5.3.0-tests-optional.patch
-	"${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
-)
-if [[ -n ${PATCHSET} ]]; then
-	PATCHES+=( "${WORKDIR}/${PATCHSET}" )
-fi
-
-src_prepare() {
-	rm -r packaging || die # unused and too low CMake minimum
-	ecm_src_prepare
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		-DBUILD_WITH_QT6=ON
-		-DALLOW_UNSTABLE=QT6
-		-DENABLE_UPDATERS=OFF
-		-DKRITA_ENABLE_PCH=OFF # big mess.
-		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=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 raw KDcrawQt6)
-		$(cmake_use_find_package wayland Qt6WaylandClient)
-		$(cmake_use_find_package webp WebP)
-	)
-	ecm_src_configure
-}
diff --git a/media-gfx/krita/krita-6.0.2_pre20260509.ebuild b/media-gfx/krita/krita-6.0.2_pre20260509.ebuild
index f484250d63e0..a6bfbd15ca3a 100644
--- a/media-gfx/krita/krita-6.0.2_pre20260509.ebuild
+++ b/media-gfx/krita/krita-6.0.2_pre20260509.ebuild
@@ -109,6 +109,7 @@ PATCHES=(
 	# downstream
 	"${FILESDIR}"/${PN}-5.3.0-tests-optional.patch
 	"${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
+	"${FILESDIR}"/${PN}-6.0.1-pyqt6.11-sip13.8.patch # bug 974789, unfortunately, also downstream
 )
 if [[ -n ${PATCHSET} ]]; then
 	PATCHES+=( "${WORKDIR}/${PATCHSET}" )