gentoo auto-resync : 29:11:2024 - 02:06:03

5 files changed, 2 insertions, 178 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 69a58cd8a9f5..e1ba70c9c80a 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 870111805576..a63a972890a0 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,10 +1,7 @@
 AUX krita-5.1.5-sip-6.8.patch 770 BLAKE2B b63fb65ffc4ea733e8698b255b5531ff55299ec8f7cd6c153f50faaf938795618c675a7c6fbf33c1f7225c8dddaec806a9fbd6f88b621ebcff52eb13aacc0479 SHA512 5f21376508c603ca33447119ad9fa492e83992f74314cd59053f270d2020a540b4c6708b67028a7567b9db460a6fbc0aa842020b4fe5b7d4be4265d2dc78ceff
 AUX krita-5.2.2-fftw.patch 689 BLAKE2B a0b62a65d8de4c661a571f0f671387d0571982bbc0acdf4dc879c21711093e7a3d6ef17e6a24f04d066ecd1f861b98f8a37e626075d3fdd445f408e77484eb3f SHA512 6db10de30c0f47ea3d65490d82176685144af580a6581d0ff2fc0363e6b65166c154ad3dd05a0dadf967afc39417936275d71911e89fcf79ecfa84b1bb6b94fa
 AUX krita-5.2.3-tests-optional.patch 2807 BLAKE2B 7d0c0d26ce0cb1bf86f7933e8510bb5ea1e98986b811641874b4db6f622e5a31bf9b9c3b7e12267bf54f2d57d56459211df3e004dbc261e0d519f69d190e2149 SHA512 021d6d8fa1b976091088b317f54cf0be66f73b0dd9031497abc3101e4e43b69a0d4b5302e004b3ec81193bfecc0066cc4563a50b15e2c30109d3a57bafe23ca5
-AUX krita-5.2.3-znver4-xsimd.patch 1650 BLAKE2B a534c96c1fdbaf3aeb59499c88079d70574e0ac4eda170637d187fd66338b80c53e3d85fe003f75c59512eb484522403e785b0a9bdb6dca0e6a7bce8d7a0a936 SHA512 2aeb300d6230fa29c97f086aad98df16ed71d1199716739467b7c25014ba7e3a84b368cc9945042e2ce8fca0e42c03579b1e26048304498c194cff01d7d7d7cf
 AUX krita-5.2.6-py3.13.patch 4520 BLAKE2B cd190b438952853207f6d5f35fadb28d0044273dc4e6d6bb8aac4c623aadd7111a6c852de302da9c72c4444ef422c64c9b2a46ee74328af8b37d77d56a645fbc SHA512 65b2cff6ddcf2e6b3be9e993be61fbcb60ea89c58ba2aa2119582d5eb80b8c230b6323072dd6fc9b56a60899459cbfe433ec4deea3a3fbdaf796111383dbf206
-DIST krita-5.2.3.tar.xz 186685456 BLAKE2B 42943e7ebffdb46b9da085b2069701895e37ad9c457273b9217a095f1dfdf15c715cde0b88d440abb2d73dee656730da38844f11f27022885f87bb9cc9adab26 SHA512 69a0477e3119765dd53e0502fe5a64fcdc921dfcba3ddc5dec5c1bc4342a77b172b38276f134cc56f79741e6c47b51ef51786aadf0d178ce3955e24a9fd27b74
 DIST krita-5.2.6.tar.xz 186560016 BLAKE2B 788385983b371626214898391b08b1276a74b2ee3c9f01c1b1ae19d8791bfcf1ea1f59f6304643aeb6b16a2559fd2e45464596c721eb5d53546672d0efe17903 SHA512 8502ebef11ae066b298e999aba06df7858605cca14b889cec167b7ee3953b8ed86459b44ed90508d59bd7a9968cc9957309cefaa140a8d20293344f4dcb7fea7
-EBUILD krita-5.2.3.ebuild 3789 BLAKE2B 41a5c3d4a5b0ecc3b15783993d8a0a39601e5b873e3f5bbf521607b8c85caa39ff94bb7ac91ac17ef844581892dfbe50d1c95dd1a7cff206e702210986de7748 SHA512 15efb4f7e6ed150a91565255a06fd3fd5e24a705607be5d04c23b42d03b9e0221edf87eb95a7db6449152dc293dd6144027a789480fee68abb5e5a401458e885
-EBUILD krita-5.2.6.ebuild 3818 BLAKE2B a17dc30ba414794e9184a57acfc2b4eb8938a791b36ecb329c64d9a39b7b8849fafb77697a056550ba5031a30f35b2f2e58addf60eb499e956c8af01963712d2 SHA512 299919c2e51ed3db36cc631b1750e4e7ae6158725c8244028706f9a64423689d4eac35277c6c5fdf2dedac245984e4181e10028af399a4b5f1bdb4abada42697
+EBUILD krita-5.2.6.ebuild 3817 BLAKE2B 3d0bb2a382f99f8335efde4f44e3e36e5525b4c02c7504f6864be4a6915c5538401b623877d8bb873649cf5bc0eb4e2fd8a1db9b04292aaf495dcacfc6ec05b3 SHA512 54d5b8eec5865e31cb45083d1a103a40049a8f616e14850f7da768e5672a8514340f7af5540b016a56fd038af7f1b5d00c1934691947ac6b19bf2d84b2d48f47
 MISC metadata.xml 731 BLAKE2B 0acb0a6a6b5fe482c0fdc0a8d2eef10d41ea5f2d270b9880d87cc8159ccfe27b3d9e9ff75babdd4219ea9af8b76248cc591f621d94cac54bc0312e37493ac746 SHA512 c8627e7739acb6e8b030812fc25907cedc29a62e3a66bc7cd3087c3d7684e089a73f673235af9f5cd77ded4b4a8f438206b156fbd4ddb73fc4a1ce1640e26f70
diff --git a/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch b/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch
deleted file mode 100644
index df5fffb41d47..000000000000
--- a/media-gfx/krita/files/krita-5.2.3-znver4-xsimd.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://bugs.gentoo.org/936296
-https://invent.kde.org/graphics/krita/-/commit/cf2c74220b7edfae53a0715346cb4e2c7dfc38ae
-
-From cf2c74220b7edfae53a0715346cb4e2c7dfc38ae Mon Sep 17 00:00:00 2001
-From: Dmitry Kazakov <dimula73@gmail.com>
-Date: Mon, 26 Aug 2024 14:38:03 +0200
-Subject: [PATCH] Don't use xsimd::default_arch in the pixel scaler code
-
-Gentoo seems to build Krita with a global -march=znver4 flag,
-which causes "scalar" version of the code to be compiled with
-AVX512. Even though it is not how the system is supposed to work
-(and this avx512-optimization will never be used in real runtime),
-we shouldn't fail compilation.
-
-https://bugs.gentoo.org/936296
-https://github.com/xtensor-stack/xsimd/issues/1044
---- a/libs/pigment/KoOptimizedPixelDataScalerU8ToU16.h
-+++ b/libs/pigment/KoOptimizedPixelDataScalerU8ToU16.h
-@@ -28,7 +28,7 @@ public:
-         const int numColorChannels = m_channelsPerPixel * numColumns;
- 
- #if defined(HAVE_XSIMD) && XSIMD_WITH_AVX2
--        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::default_arch>;
-+        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::avx2>;
-         using uint16_v = xsimd::batch<uint16_t, xsimd::sse4_1>;
-         using uint8_v = xsimd::batch<uint8_t, xsimd::sse4_1>;
- 
-@@ -129,7 +129,7 @@ public:
-         const int numColorChannels = m_channelsPerPixel * numColumns;
- 
- #if defined(HAVE_XSIMD) && XSIMD_WITH_AVX2
--        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::default_arch>;
-+        using uint16_avx_v = xsimd::batch<uint16_t, xsimd::avx2>;
-         using uint16_v = xsimd::batch<uint16_t, xsimd::sse4_1>;
- 
-         const int channelsPerAvx2Block = 32;
--- 
-GitLab
diff --git a/media-gfx/krita/krita-5.2.3.ebuild b/media-gfx/krita/krita-5.2.3.ebuild
deleted file mode 100644
index 2c081af6668e..000000000000
--- a/media-gfx/krita/krita-5.2.3.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-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 ~riscv ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/"
-
-LICENSE="GPL-3"
-SLOT="5"
-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
-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}]
-		dev-python/sip:=[${PYTHON_USEDEP}]
-	')
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kguiaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	media-libs/tiff:=
-	sys-libs/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[qt5] )
-	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
-"
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-
-PATCHES=(
-	# downstream
-	"${FILESDIR}"/${P}-tests-optional.patch
-	"${FILESDIR}"/${PN}-5.2.2-fftw.patch # bug 913518
-	# git master
-	"${FILESDIR}"/${PN}-5.1.5-sip-6.8.patch # bug 919139
-	"${FILESDIR}"/${PN}-5.2.3-znver4-xsimd.patch # bug 936296
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		-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 KF5KDcraw)
-		$(cmake_use_find_package webp WebP)
-		$(cmake_use_find_package xsimd xsimd)
-	)
-
-	ecm_src_configure
-}
diff --git a/media-gfx/krita/krita-5.2.6.ebuild b/media-gfx/krita/krita-5.2.6.ebuild
index 526f9814a518..057f0f3539d7 100644
--- a/media-gfx/krita/krita-5.2.6.ebuild
+++ b/media-gfx/krita/krita-5.2.6.ebuild
@@ -11,7 +11,7 @@ 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 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"