[gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/

["Sam James" <sam@gentoo.org>]

commit:     abe6cccfc75fac99646ed066c8a8162c152d67ee
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun  6 01:26:49 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun  6 01:26:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe6cccf

media-gfx/krita: drop 4.4.8-r1, 5.0.6-r1

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/krita/Manifest                           |   3 -
 media-gfx/krita/files/krita-4.4.2-quazip1.patch    |  36 ------
 .../files/krita-4.4.7-pykrita-crash-on-exit.patch  |  41 -------
 .../krita-4.4.8-prefer-newer-sip-to-build.patch    |  56 ---------
 media-gfx/krita/krita-4.4.8-r1.ebuild              | 130 ---------------------
 media-gfx/krita/krita-5.0.6-r1.ebuild              | 123 -------------------
 6 files changed, 389 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 62dc7f3bd25f..f4dfa19da4cd 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,5 +1,2 @@
-DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de SHA512 36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
-DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb SHA512 53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81
 DIST krita-5.0.2.tar.xz 179049488 BLAKE2B a58ee0e7d654f18509f970d32a680a9a993c7172a3818517ddf0a41f500c2d1f9102a432b728b9d9254f39f1be0c926602e3b1806ae19b6efc49f99becdffcdd SHA512 5dd2d6961feabf20dbcef49f3499281e34b409e96d379b0247eec70449f82c05ed3cf3ca09014535adb7ce66659d58e988f1f054364637c9851181fa8ee926a5
-DIST krita-5.0.6.tar.xz 179335700 BLAKE2B dc164fec0ed39d8c9fc8b3624d0ceaeeb25bb55b32cabf56f655116448cea94451421e67069de1d1fbaed1e949b88c982f3e01cf66de40518d1b4e2b9b079bdb SHA512 7ad92b750a1c54bf79b279730ad84119030ff532f5a8a77f2040776304dbb768a67dfa1bf67ac72c0c984b7e508e59476640f1b41ea38d3f525d52c7eb6cde9f
 DIST krita-5.0.8.tar.xz 179344256 BLAKE2B f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682 SHA512 652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777

diff --git a/media-gfx/krita/files/krita-4.4.2-quazip1.patch b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
deleted file mode 100644
index 6a49bd3ba2e7..000000000000
--- a/media-gfx/krita/files/krita-4.4.2-quazip1.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3eaf480ae5d615e8e26153cca98115ff0f23135f Mon Sep 17 00:00:00 2001
-From: Antonio Rojas <arojas@archlinux.org>
-Date: Mon, 5 Oct 2020 20:11:26 +0200
-Subject: [PATCH] Support quazip 1.0
-
-Update FindQuaZip to find the QuaZip 1.0 library names and include dirs. Once support for quazip<1 is dropped this should be ported to use quazip's own QuaZipConfig
----
- cmake/modules/FindQuaZip.cmake | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/cmake/modules/FindQuaZip.cmake b/cmake/modules/FindQuaZip.cmake
-index 7e628fcd4b..345c7909ab 100644
---- a/cmake/modules/FindQuaZip.cmake
-+++ b/cmake/modules/FindQuaZip.cmake
-@@ -25,15 +25,15 @@ ELSE (QUAZIP_INCLUDE_DIRS AND QUAZIP_LIBRARIES)
- 	ELSE(WIN32)
- 		FIND_PACKAGE(PkgConfig)
- #     pkg_check_modules(PC_QCA2 QUIET qca2)
--		pkg_check_modules(PC_QUAZIP quazip)
-+		pkg_check_modules(PC_QUAZIP quazip quazip1-qt5)
- 		FIND_LIBRARY(QUAZIP_LIBRARIES
- 			WIN32_DEBUG_POSTFIX d
--            NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX}
-+            NAMES quazip${QUAZIP_LIB_VERSION_SUFFIX} quazip1-qt5
- 			HINTS /usr/lib /usr/lib64
- 		)
- 		FIND_PATH(QUAZIP_INCLUDE_DIR quazip.h
- 			HINTS /usr/include /usr/local/include
--			PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX}
-+			PATH_SUFFIXES quazip${QUAZIP_LIB_VERSION_SUFFIX} QuaZip-Qt5-1.0/quazip
- 		)
- 		FIND_PATH(QUAZIP_ZLIB_INCLUDE_DIR zlib.h HINTS /usr/include /usr/local/include)
- 	ENDIF (WIN32)
--- 
-GitLab
-

diff --git a/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch b/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
deleted file mode 100644
index f896a3920efc..000000000000
--- a/media-gfx/krita/files/krita-4.4.7-pykrita-crash-on-exit.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From a0c29913114164ff3f2ba4e255ccee1c52cb3e86 Mon Sep 17 00:00:00 2001
-From: Alvin Wong <alvin@alvinhc.com>
-Date: Sat, 19 Jun 2021 16:29:45 +0800
-Subject: [PATCH] Fix PyKrita cleanup using qApp::aboutToQuit to prevent crash
-
-Suspecting that we can't have Python clean up its QObject's inside
-QCoreApplication's destructor, but must be done before it.
-
-BUG: 417465
----
- plugins/extensions/pykrita/plugin/plugin.cpp | 15 ++++++++++-----
- 1 file changed, 10 insertions(+), 5 deletions(-)
-
-diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp b/plugins/extensions/pykrita/plugin/plugin.cpp
-index ef0e27eb65..66f552b007 100644
---- a/plugins/extensions/pykrita/plugin/plugin.cpp
-+++ b/plugins/extensions/pykrita/plugin/plugin.cpp
-@@ -13,6 +13,8 @@
- #include <kis_preference_set_registry.h>
- #include "pyqtpluginsettings.h"
- 
-+#include <QCoreApplication>
-+
- #include <Krita.h>
- 
- K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", registerPlugin<KritaPyQtPlugin>();)
-@@ -74,6 +76,12 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const QVariantList &)
-     Q_FOREACH (Extension *extension, Krita::instance()->extensions()) {
-         extension->setup();
-     }
-+
-+    // This ensures that QObject's owned by Python are destructed before
-+    // the destructor of QCoreApplication is called, in order to prevent
-+    // a crash on exit.
-+    // See https://bugs.kde.org/show_bug.cgi?id=417465
-+    connect(QCoreApplication::instance(), &QCoreApplication::aboutToQuit, this, []() { PyKrita::finalize(); });
- }
- 
- KritaPyQtPlugin::~KritaPyQtPlugin()
--- 
-GitLab

diff --git a/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch b/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch
deleted file mode 100644
index c60b53ffc64b..000000000000
--- a/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From d2f29d77db58b54a8bcabfb68df66e4dd44f0c27 Mon Sep 17 00:00:00 2001
-From: Heiko Becker <heiko.becker@kde.org>
-Date: Fri, 12 Nov 2021 12:27:07 +0100
-Subject: [PATCH] Try (and thus prefer) sip >=5 first
-
-If one has sip 4.x and sip 6.x installed sip 4 is picked up
-("Found SIP version: 4.19.24") just because it is searched first.
-
-This matters not only because it is nice to use the "latest and
-greatest", but also because software using the latest PyQt5 (including
-krita) can't be built with sip 4 at the moment and the maintainer is
-apparently in no hurry to fix it [1].
-
-[1] https://www.riverbankcomputing.com/pipermail/pyqt/2021-November/044345.html
----
- cmake/modules/FindSIP.py | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/cmake/modules/FindSIP.py b/cmake/modules/FindSIP.py
-index 7b92abd36e..600805c329 100644
---- a/cmake/modules/FindSIP.py
-+++ b/cmake/modules/FindSIP.py
-@@ -15,6 +15,16 @@ def osAwareSuffix():
-     return os.path.join("lib", "python3.8", "site-packages","sipconfig.py") if os.name != 'nt' else os.path.join("lib","krita-python-libs","sipconfig.py")
- 
- try:
-+    import sipbuild
-+
-+    print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION)
-+    print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
-+
-+    import shutil
-+
-+    # sip v5 and higher need to invoke sip-build
-+    print("sip_bin:%s" % shutil.which("sip-build"))
-+except ImportError:  # Code for SIP <5
-     import sipconfig
- 
-     sipcfg = sipconfig.Configuration()
-@@ -41,13 +51,4 @@ try:
-     print("sip_bin:%s" % sip_bin)
-     print("default_sip_dir:%s" % default_sip_dir)
-     print("sip_inc_dir:%s" % sip_inc_dir)
--except ImportError:  # Code for SIP v5+
--    import sipbuild
--
--    print("sip_version:%06.0x" % sipbuild.version.SIP_VERSION)
--    print("sip_version_str:%s" % sipbuild.version.SIP_VERSION_STR)
- 
--    import shutil
--
--    # sip v5 and higher need to invoke sip-build
--    print("sip_bin:%s" % shutil.which("sip-build"))
--- 
-GitLab
-

diff --git a/media-gfx/krita/krita-4.4.8-r1.ebuild b/media-gfx/krita/krita-4.4.8-r1.ebuild
deleted file mode 100644
index dedc461115e7..000000000000
--- a/media-gfx/krita/krita-4.4.8-r1.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{8..10} )
-KFMIN=5.82.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz
-		https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz"
-	KEYWORDS="amd64 ~arm64 ~ppc64 ~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 +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip:0=
-	$(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/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/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXi
-	color-management? ( =media-libs/opencolorio-1* )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		<media-libs/openexr-3.0.0:0=
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${RDEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
-	"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
-	"${FILESDIR}"/${PN}-4.4.2-quazip1.patch
-	"${FILESDIR}"/${PN}-4.4.7-pykrita-crash-on-exit.patch # KDE-Bug #417465, git master
-	"${FILESDIR}"/${P}-prefer-newer-sip-to-build.patch # bug 822843
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	ecm_pkg_setup
-}
-
-src_prepare() {
-	ecm_src_prepare
-	sed -e "/CMAKE_CXX_STANDARD/s/11/14/" -i CMakeLists.txt || die
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
-		$(cmake_use_find_package color-management OCIO)
-		$(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 jpeg JPEG)
-		$(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 tiff TIFF)
-		$(cmake_use_find_package vc Vc)
-	)
-
-	ecm_src_configure
-}

diff --git a/media-gfx/krita/krita-5.0.6-r1.ebuild b/media-gfx/krita/krita-5.0.6-r1.ebuild
deleted file mode 100644
index dd01742d3d40..000000000000
--- a/media-gfx/krita/krita-5.0.6-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{8..10} )
-KFMIN=5.82.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-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"
-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 +jpeg +mypaint-brush-engine openexr pdf qtmedia +raw vc webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-	dev-libs/boost:=
-	dev-libs/quazip:0=
-	$(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/libpng:0=
-	media-libs/tiff:0
-	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:= )
-	jpeg? ( media-libs/libjpeg-turbo:= )
-	heif? ( >=media-libs/libheif-1.11:= )
-	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:= )
-	webp? ( >=media-libs/libwebp-1.2.0:= )
-"
-DEPEND="${RDEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
-)
-
-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
-		-DFETCH_TRANSLATIONS=OFF
-		-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 jpeg JPEG)
-		$(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 vc Vc)
-		$(cmake_use_find_package webp WebP)
-	)
-
-	ecm_src_configure
-}