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

2024-04-20 Thread Andreas Sturmlechner
commit: bdd3a8c5a1c8f0b348853e90646211e2cbe3b9fa
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr 20 12:32:30 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr 20 12:57:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdd3a8c5

media-gfx/krita: enable py3.12

Closes: https://bugs.gentoo.org/929622
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/krita-5.1.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-5.1.5.ebuild 
b/media-gfx/krita/krita-5.1.5.ebuild
index 3c49122dc318..854bb12e9593 100644
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{9..12} )
 KFMIN=5.82.0
 QTMIN=5.15.5
 VIRTUALX_REQUIRED="test"



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

2024-02-05 Thread Andreas Sturmlechner
commit: 89c10a643b2a5c5de926b94dddbd124d69b492b8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Feb  5 20:25:32 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Feb  5 20:26:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89c10a64

media-gfx/krita: Fix build w/ LTO

Closes: https://bugs.gentoo.org/922520
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/files/krita-5.1.5-lto.patch | 58 +
 media-gfx/krita/krita-5.1.5.ebuild  |  1 +
 2 files changed, 59 insertions(+)

diff --git a/media-gfx/krita/files/krita-5.1.5-lto.patch 
b/media-gfx/krita/files/krita-5.1.5-lto.patch
new file mode 100644
index ..0cccee5be00e
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.5-lto.patch
@@ -0,0 +1,58 @@
+From 2c4dd042df1518d67c117ced08c5a2f3729c3193 Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov 
+Date: Tue, 30 Jan 2024 15:30:53 +0100
+Subject: [PATCH] Possibly fix ODR violation in the transform tool strategies
+
+BUG:480520
+
+
+(cherry picked from commit e33c7d7d533d5289c3a37007f8cf574af5bc7102)
+---
+ plugins/tools/tool_transform2/kis_free_transform_strategy.cpp  | 2 ++
+ .../tool_transform2/kis_perspective_transform_strategy.cpp | 3 ++-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp 
b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
+index 49486b6bd7c..8a63bce74e3 100644
+--- a/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
 b/plugins/tools/tool_transform2/kis_free_transform_strategy.cpp
+@@ -23,6 +23,7 @@
+ #include "kis_algebra_2d.h"
+ 
+ 
++namespace {
+ enum StrokeFunction {
+ ROTATE = 0,
+ MOVE,
+@@ -41,6 +42,7 @@ enum StrokeFunction {
+ MOVECENTER,
+ PERSPECTIVE
+ };
++}
+ 
+ struct KisFreeTransformStrategy::Private
+ {
+diff --git 
a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp 
b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
+index ad1d9ffe4d3..bca5b51e13f 100644
+--- a/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
 b/plugins/tools/tool_transform2/kis_perspective_transform_strategy.cpp
+@@ -23,7 +23,7 @@
+ #include "kis_transform_utils.h"
+ #include "kis_free_transform_strategy_gsl_helpers.h"
+ 
+-
++namespace {
+ enum StrokeFunction {
+ DRAG_HANDLE = 0,
+ DRAG_X_VANISHING_POINT,
+@@ -43,6 +43,7 @@ enum HandleIndexes {
+ HANDLE_MIDDLE_RIGHT,
+ HANDLE_COUNT,
+ };
++}
+ 
+ struct KisPerspectiveTransformStrategy::Private
+ {
+-- 
+GitLab
+

diff --git a/media-gfx/krita/krita-5.1.5.ebuild 
b/media-gfx/krita/krita-5.1.5.ebuild
index 283b2c2e7a76..3c49122dc318 100644
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -92,6 +92,7 @@ PATCHES=(
"${FILESDIR}/${P}-ocio-2.3.0.patch" # bug 915107
"${FILESDIR}/${P}-sip-6.8.patch" # bug 919139
"${FILESDIR}/${P}-libjxl-0.9.patch" # bug 922524
+   "${FILESDIR}/${P}-lto.patch" # bug 922520
 )
 
 pkg_setup() {



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

2024-01-21 Thread Andreas Sturmlechner
commit: e4809498c27efa079b477bfcc80b32a403d5e594
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jan 21 18:37:51 2024 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jan 21 19:14:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4809498

media-gfx/krita: Fix build with >=media-libs/libjxl-0.9

Closes: https://bugs.gentoo.org/922524
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch | 73 ++
 media-gfx/krita/krita-5.1.5.ebuild |  5 +-
 2 files changed, 76 insertions(+), 2 deletions(-)

diff --git a/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch 
b/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch
new file mode 100644
index ..a578f22c67f9
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.5-libjxl-0.9.patch
@@ -0,0 +1,73 @@
+From ace7edcca6ad322581ab39620f21ccf3ffbd3b5a Mon Sep 17 00:00:00 2001
+From: Timo Gurr 
+Date: Fri, 5 Jan 2024 14:04:50 +
+Subject: [PATCH] Fix build with libjxl 0.9.0
+
+Fix build with libjxl 0.9.0
+
+BUG:478987
+
+Test Plan
+-
+
+* Upgrade to libjxl 0.9.0
+* Apply patch from MR and build krita (5.2.2)
+* Open/Display a sample image e.g. https://jpegxl.info/test-page/red-room.jxl
+
+Formalities Checklist
+-
+
+- [x] I confirmed this builds.
+- [x] I confirmed Krita ran and the relevant functions work (Could 
successfully open/display a sample image 
https://jpegxl.info/test-page/red-room.jxl).
+- [ ] I tested the relevant unit tests and can confirm they are not broken. 
(If not possible, don't hesitate to ask for help!)
+- [x] I made sure my commits build individually and have good descriptions as 
per [KDE guidelines](https://community.kde.org/Policies/Commit_Policy).
+- [x] I made sure my code conforms to the standards set in the HACKING file.
+- [x] I can confirm the code is licensed and attributed appropriately, and 
that unattributed code is mine, as per [KDE Licensing 
Policy](https://community.kde.org/Policies/Licensing_Policy).
+
+_**Reminder: the reviewer is responsible for merging the patch, this is to 
ensure at the least two people can build the patch. In case a patch breaks the 
build, both the author and the reviewer should be contacted to fix the build.**_
+_**If this is not possible, the commits shall be reverted, and a notification 
with the reasoning and any relevant logs shall be sent to the mailing list, 
kimages...@kde.org.**_
+---
+ plugins/impex/jxl/JPEGXLImport.cpp | 15 ++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/plugins/impex/jxl/JPEGXLImport.cpp 
b/plugins/impex/jxl/JPEGXLImport.cpp
+index 573bae41247..f5b989b3b70 100644
+--- a/plugins/impex/jxl/JPEGXLImport.cpp
 b/plugins/impex/jxl/JPEGXLImport.cpp
+@@ -511,7 +511,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice 
*io, KisPropertiesConfigu
+ JxlColorEncoding colorEncoding{};
+ if (JXL_DEC_SUCCESS
+ == JxlDecoderGetColorAsEncodedProfile(dec.get(),
++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0, 9, 0)
+   nullptr,
++#endif
+   
JXL_COLOR_PROFILE_TARGET_DATA,
+   )) {
+ const TransferCharacteristics transferFunction = [&]() {
+@@ -635,7 +637,12 @@ JPEGXLImport::convert(KisDocument *document, QIODevice 
*io, KisPropertiesConfigu
+ size_t iccSize = 0;
+ QByteArray iccProfile;
+ if (JXL_DEC_SUCCESS
+-!= JxlDecoderGetICCProfileSize(dec.get(), nullptr, 
JXL_COLOR_PROFILE_TARGET_DATA, )) {
++!= JxlDecoderGetICCProfileSize(dec.get(),
++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
++   nullptr,
++#endif
++   
JXL_COLOR_PROFILE_TARGET_DATA,
++   )) {
+ errFile << "ICC profile size retrieval failed";
+ document->setErrorMessage(i18nc("JPEG-XL errors", "Unable 
to read the image profile."));
+ return ImportExportCodes::ErrorWhileReading;
+@@ -643,7 +650,9 @@ JPEGXLImport::convert(KisDocument *document, QIODevice 
*io, KisPropertiesConfigu
+ iccProfile.resize(static_cast(iccSize));
+ if (JXL_DEC_SUCCESS
+ != JxlDecoderGetColorAsICCProfile(dec.get(),
++#if JPEGXL_NUMERIC_VERSION < JPEGXL_COMPUTE_NUMERIC_VERSION(0,9,0)
+   nullptr,
++#endif
+   
JXL_COLOR_PROFILE_TARGET_DATA,
+   
reinterpret_cast(iccProfile.data()),
+  

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

2023-12-26 Thread Andreas Sturmlechner
commit: 039e05313098a299f93038ea55934ebfd5b6bb9a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 26 08:58:54 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 26 08:59:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=039e0531

media-gfx/krita: Fix build w/ >=dev-python/sip-6.8.0

Closes: https://bugs.gentoo.org/919139
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/files/krita-5.1.5-sip-6.8.patch | 26 +
 media-gfx/krita/krita-5.1.5.ebuild  |  1 +
 2 files changed, 27 insertions(+)

diff --git a/media-gfx/krita/files/krita-5.1.5-sip-6.8.patch 
b/media-gfx/krita/files/krita-5.1.5-sip-6.8.patch
new file mode 100644
index ..d9bcd937a3d2
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.5-sip-6.8.patch
@@ -0,0 +1,26 @@
+From 2d71c47661d43a4e3c1ab0c27803de980bdf2bb2 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas 
+Date: Mon, 11 Dec 2023 20:26:13 +0100
+Subject: [PATCH] Bump SIP ABI version to 12.8
+
+Fixes build with SIP 6.8
+---
+ cmake/modules/pyproject.toml.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/pyproject.toml.in b/cmake/modules/pyproject.toml.in
+index 090b2d4b0cb..085ddf41799 100644
+--- a/cmake/modules/pyproject.toml.in
 b/cmake/modules/pyproject.toml.in
+@@ -9,7 +9,7 @@ name = "@module_name_toml@"
+ sip-module = "@sip_name@"
+ sip-include-dirs = @sip_include_dirs@
+ sip-files-dir = "@module_srcs@"
+-abi-version = "12"
++abi-version = "12.8"
+ 
+ [tool.sip.bindings.@module_name_toml@]
+ tags = @module_tags@
+-- 
+GitLab
+

diff --git a/media-gfx/krita/krita-5.1.5.ebuild 
b/media-gfx/krita/krita-5.1.5.ebuild
index f313dc477e04..ab68ac1db844 100644
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -90,6 +90,7 @@ PATCHES=(
"${FILESDIR}/${PN}-4.3.1-tests-optional.patch"
"${WORKDIR}/${P}-exiv2-0.28.patch" # bug 906472
"${FILESDIR}/${P}-ocio-2.3.0.patch" # bug 915107
+   "${FILESDIR}/${P}-sip-6.8.patch" # bug 919139
 )
 
 pkg_setup() {



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

2023-10-27 Thread Michał Górny
commit: 478578104b5016e61a0588975c10b7579ea33522
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Oct 22 12:50:24 2023 +
Commit: Michał Górny  gentoo  org>
CommitDate: Fri Oct 27 15:18:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47857810

media-gfx/krita: Remove redundant local flag descs

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/krita/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index 99adf7a4786d..ff6c095b3acd 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -10,7 +10,6 @@


Enable color management via 
media-libs/opencolorio
-   Support for JPEG XL image format
Enable MyPaint brush engine 
support media-libs/libmypaint
Enable sound support for animations via 
dev-qt/qtmultimedia




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

2023-10-03 Thread Andreas Sturmlechner
commit: 55f75efa4e03aa1e1dc18bf1374de7d75212aca1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Oct  3 18:57:00 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Oct  3 19:20:58 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55f75efa

media-gfx/krita: Fix build with >=media-libs/opencolorio-2.3.0

Picked from https://invent.kde.org/graphics/krita/-/merge_requests/1942
after sanitising unrelated changes.

Closes: https://bugs.gentoo.org/915107
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch | 37 ++
 media-gfx/krita/krita-5.1.5.ebuild |  1 +
 2 files changed, 38 insertions(+)

diff --git a/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch 
b/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch
new file mode 100644
index ..534e24469e8a
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.5-ocio-2.3.0.patch
@@ -0,0 +1,37 @@
+From 48edd05f32241c537cedf2831efc5eb91a112291 Mon Sep 17 00:00:00 2001
+From: killy |0veufOrever <80536...@qq.com>
+Date: Tue, 19 Sep 2023 02:18:54 +
+Subject: [PATCH] Update OCIO to version 2.3.0
+
+---
+ 3rdparty/ext_ocio/CMakeLists.txt| 4 ++--
+ plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+From 21d384fe9fafde2f45f7339a2234f4022c53152f Mon Sep 17 00:00:00 2001
+From: killy |0veufOrever <80536...@qq.com>
+Date: Tue, 19 Sep 2023 03:17:17 +
+Subject: [PATCH] Dimensions are not required when the OCIO version is less
+ than 2.3.0
+
+---
+ plugins/dockers/lut/ocio_display_filter_vfx2021.cpp | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+ 
+diff --git a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp 
b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
+--- a/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
 b/plugins/dockers/lut/ocio_display_filter_vfx2021.cpp
+@@ -507,7 +507,13 @@
+ unsigned height = 0;
+ OCIO::GpuShaderDesc::TextureType channel = 
OCIO::GpuShaderDesc::TEXTURE_RGB_CHANNEL;
+ OCIO::Interpolation interpolation = OCIO::INTERP_LINEAR;
++
++#if OCIO_VERSION_HEX >= 0x203
++OCIO::GpuShaderCreator::TextureDimensions dimensions;
++shaderDesc->getTexture(idx, textureName, samplerName, width, height, 
channel, dimensions, interpolation);
++#else
+ shaderDesc->getTexture(idx, textureName, samplerName, width, height, 
channel, interpolation);
++#endif
+ 
+ if (!textureName || !*textureName || !samplerName || !*samplerName || 
width == 0) {
+ errOpenGL << "The texture data is corrupted";

diff --git a/media-gfx/krita/krita-5.1.5.ebuild 
b/media-gfx/krita/krita-5.1.5.ebuild
index c8945c944730..f313dc477e04 100644
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -89,6 +89,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}/${PN}-4.3.1-tests-optional.patch"
"${WORKDIR}/${P}-exiv2-0.28.patch" # bug 906472
+   "${FILESDIR}/${P}-ocio-2.3.0.patch" # bug 915107
 )
 
 pkg_setup() {



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

2023-06-08 Thread Andreas Sturmlechner
commit: 5163f3c95c5ef2e09b7f5d1c45ffb1bc8aeaae39
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun  8 13:22:55 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  8 14:05:03 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5163f3c9

media-gfx/krita: Fix build with >=exiv2-0.28

Closes: https://bugs.gentoo.org/906472
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   | 1 +
 media-gfx/krita/krita-5.1.5.ebuild | 8 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 5bc573c625ab..a0de04766714 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1 +1,2 @@
+DIST krita-5.1.5-exiv2-0.28.patch.xz 4664 BLAKE2B 
e364325be3d8e40e293a7d268136be3737ce5d2b9b5607f140b30ba3e687dc8d86545f4463348587711150f1652b521f87efc859a1bf2bc3b5ed704cf3236781
 SHA512 
130ba9cce7d6c0138f7ef6dab1445816c2e29752aa16643c32a7d9c00d7a156ac88f01afdb782ab03fc1e0822660a070f74c02e7cde4dfbcec30baaf3c3dba7f
 DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 
3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716
 SHA512 
b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1

diff --git a/media-gfx/krita/krita-5.1.5.ebuild 
b/media-gfx/krita/krita-5.1.5.ebuild
index c7ffd26bfae8..c8945c944730 100644
--- a/media-gfx/krita/krita-5.1.5.ebuild
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -11,7 +11,8 @@ 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"
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz
+   https://dev.gentoo.org/~asturm/distfiles/${P}-exiv2-0.28.patch.xz;
KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
@@ -85,7 +86,10 @@ BDEPEND="
sys-devel/gettext
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+PATCHES=(
+   "${FILESDIR}/${PN}-4.3.1-tests-optional.patch"
+   "${WORKDIR}/${P}-exiv2-0.28.patch" # bug 906472
+)
 
 pkg_setup() {
python-single-r1_pkg_setup



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

2023-01-24 Thread Andreas Sturmlechner
commit: 6df2216bbbd544adfed8929a91ca46760d50242e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 24 14:24:28 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 24 16:11:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6df2216b

media-gfx/krita: drop 5.1.3-r3, 5.1.4-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   2 -
 .../krita/files/krita-5.1.4-libraw-0.21.patch  |  28 -
 media-gfx/krita/krita-5.1.3-r3.ebuild  | 121 
 media-gfx/krita/krita-5.1.4-r1.ebuild  | 123 -
 4 files changed, 274 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index bd1d190ff922..5bc573c625ab 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1 @@
-DIST krita-5.1.3.tar.xz 185166464 BLAKE2B 
2fa93e06cd4b5b68016bc1af83464c3e44e1ece0e786734def030bf8e333086ed9d36b23d56dc8b742ceef85273b9d88d754286e85d2d1384ffc92a3592693fd
 SHA512 
4025033cbbe48f2e0d52961320c08920691a3c5b48029c67560c3c28e699cec6a02432bc1ec706204b1f5f3199c7fc66e10c01607ce06b113211cae0194f5d88
-DIST krita-5.1.4.tar.xz 184969232 BLAKE2B 
3452504c1ce973d0670508b143ee45d2a75fe72d87f1a3f94a56c4b36f4a179e2a651a0663a04aab8e75484065a78140b3c8c51fda1215c14924a4895be5
 SHA512 
316b9333f416a4d8739a7201910069211d1da1b0f2eebfc48de08f6cf4736f3e7b8fa242bc97eebe8536e483c214cb584d459f26f8ce7bd10e36da467eb67446
 DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 
3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716
 SHA512 
b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1

diff --git a/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch 
b/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
deleted file mode 100644
index 9cdd0a9f8161..
--- a/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e753d2453d1614b65b288e49fa5d5371764feaa8 Mon Sep 17 00:00:00 2001
-From: Antonio Rojas 
-Date: Sun, 18 Dec 2022 16:28:38 +0100
-Subject: [PATCH] Fix build with libraw 0.21
-

- plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp | 4 
- 1 file changed, 4 insertions(+)
-
-diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp 
b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
-index dcaecc6fa7..71425f909c 100644
 a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
-+++ b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
-@@ -383,7 +383,11 @@ bool KDcraw::extractRAWData(const QString& filePath, 
QByteArray& rawData, DcrawI
- d->setProgress(0.3);
- 
- raw.imgdata.params.output_bps  = 16;
-+#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
-+raw.imgdata.rawparams.shot_select = shotSelect;
-+#else
- raw.imgdata.params.shot_select = shotSelect;
-+#endif
- ret= raw.unpack();
- 
- if (ret != LIBRAW_SUCCESS)
--- 
-GitLab
-

diff --git a/media-gfx/krita/krita-5.1.3-r3.ebuild 
b/media-gfx/krita/krita-5.1.3-r3.ebuild
deleted file mode 100644
index 310b28bf65bc..
--- a/media-gfx/krita/krita-5.1.3-r3.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{9..11} )
-KFMIN=5.82.0
-QTMIN=5.15.5
-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 jpegxl +mypaint-brush-engine openexr 
pdf qtmedia +raw webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-   dev-libs/boost:=
-   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
- 

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

2023-01-05 Thread Andreas Sturmlechner
commit: e5cf26144a473c6e9297b694365dd1d8df32b710
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jan  5 15:46:04 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jan  5 18:02:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5cf2614

media-gfx/krita: add 5.1.5

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/krita-5.1.5.ebuild | 120 +
 2 files changed, 121 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index e81551de6fed..bd1d190ff922 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-5.1.3.tar.xz 185166464 BLAKE2B 
2fa93e06cd4b5b68016bc1af83464c3e44e1ece0e786734def030bf8e333086ed9d36b23d56dc8b742ceef85273b9d88d754286e85d2d1384ffc92a3592693fd
 SHA512 
4025033cbbe48f2e0d52961320c08920691a3c5b48029c67560c3c28e699cec6a02432bc1ec706204b1f5f3199c7fc66e10c01607ce06b113211cae0194f5d88
 DIST krita-5.1.4.tar.xz 184969232 BLAKE2B 
3452504c1ce973d0670508b143ee45d2a75fe72d87f1a3f94a56c4b36f4a179e2a651a0663a04aab8e75484065a78140b3c8c51fda1215c14924a4895be5
 SHA512 
316b9333f416a4d8739a7201910069211d1da1b0f2eebfc48de08f6cf4736f3e7b8fa242bc97eebe8536e483c214cb584d459f26f8ce7bd10e36da467eb67446
+DIST krita-5.1.5.tar.xz 184981952 BLAKE2B 
3d8d26849d8508dc040fb3ac5ab4d0ce724f670bf7d5782b37702b55afe5063543e6aa564a1c9326c90fb16f7905941e3f1ffd4296efd6f8a1c7cb34c0b41716
 SHA512 
b745eb9f51bb08df0948d6b97b85aee6a74b496df3e8423fb9107d79551daadb21960b4bb5c438348f662c67d0ec5b2fa6da18cfa5feb418659881cddd24d8f1

diff --git a/media-gfx/krita/krita-5.1.5.ebuild 
b/media-gfx/krita/krita-5.1.5.ebuild
new file mode 100644
index ..d5c5568cc3fd
--- /dev/null
+++ b/media-gfx/krita/krita-5.1.5.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{8..11} )
+KFMIN=5.82.0
+QTMIN=5.15.5
+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 jpegxl +mypaint-brush-engine openexr 
pdf qtmedia +raw webp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bug 630508
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/boost:=
+   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:= )
+   jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825 )
+   heif? ( >=media-libs/libheif-1.11:=[x265] )
+   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}"
+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 

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

2022-12-20 Thread Andreas Sturmlechner
commit: 436675c61eaefced99e20f8edc9e01355a2b2e70
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 20 18:45:59 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Dec 20 18:59:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=436675c6

media-gfx/krita: Fix build against >=media-libs/libraw-0.21.0

Closes: https://bugs.gentoo.org/887473
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../krita/files/krita-5.1.4-libraw-0.21.patch  | 28 ++
 media-gfx/krita/krita-5.1.4-r1.ebuild  |  5 +++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch 
b/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
new file mode 100644
index ..9cdd0a9f8161
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.1.4-libraw-0.21.patch
@@ -0,0 +1,28 @@
+From e753d2453d1614b65b288e49fa5d5371764feaa8 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas 
+Date: Sun, 18 Dec 2022 16:28:38 +0100
+Subject: [PATCH] Fix build with libraw 0.21
+
+---
+ plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp | 4 
+ 1 file changed, 4 insertions(+)
+
+diff --git a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp 
b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+index dcaecc6fa7..71425f909c 100644
+--- a/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
 b/plugins/impex/raw/3rdparty/libkdcraw/src/kdcraw.cpp
+@@ -383,7 +383,11 @@ bool KDcraw::extractRAWData(const QString& filePath, 
QByteArray& rawData, DcrawI
+ d->setProgress(0.3);
+ 
+ raw.imgdata.params.output_bps  = 16;
++#if LIBRAW_COMPILE_CHECK_VERSION_NOTLESS(0, 21)
++raw.imgdata.rawparams.shot_select = shotSelect;
++#else
+ raw.imgdata.params.shot_select = shotSelect;
++#endif
+ ret= raw.unpack();
+ 
+ if (ret != LIBRAW_SUCCESS)
+-- 
+GitLab
+

diff --git a/media-gfx/krita/krita-5.1.4-r1.ebuild 
b/media-gfx/krita/krita-5.1.4-r1.ebuild
index abf1cf77bf49..86ce7588ec21 100644
--- a/media-gfx/krita/krita-5.1.4-r1.ebuild
+++ b/media-gfx/krita/krita-5.1.4-r1.ebuild
@@ -85,7 +85,10 @@ BDEPEND="
sys-devel/gettext
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+   "${FILESDIR}"/${P}-libraw-0.21.patch # bug 887473
+)
 
 pkg_setup() {
python-single-r1_pkg_setup



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

2022-12-15 Thread Andreas Sturmlechner
commit: 45944bd237b97cc5d846c9c73ef0c8480ba64165
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 15 19:25:08 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 15 19:26:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45944bd2

media-gfx/krita: drop 5.1.1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 media-gfx/krita/krita-5.1.1.ebuild | 121 -
 2 files changed, 122 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 9cec29b5..e81551de6fed 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
-DIST krita-5.1.1.tar.xz 185119812 BLAKE2B 
c59a6431d8711dd5e00c2c7c91e50a9e218acc08c4ddbb33d10f315bbb09f0cbcf57961a56c0b36a5a5fe8815d88d3788b257bddd0c76d730f3e0a4b6abddf5a
 SHA512 
6878e022f1bae183f7565cdeadc3f229d3c0d3997557208b351c5128c4c499b53a120c965760c41ad075b09f017d66ca11046ab34765cccf5463fce7df64bf14
 DIST krita-5.1.3.tar.xz 185166464 BLAKE2B 
2fa93e06cd4b5b68016bc1af83464c3e44e1ece0e786734def030bf8e333086ed9d36b23d56dc8b742ceef85273b9d88d754286e85d2d1384ffc92a3592693fd
 SHA512 
4025033cbbe48f2e0d52961320c08920691a3c5b48029c67560c3c28e699cec6a02432bc1ec706204b1f5f3199c7fc66e10c01607ce06b113211cae0194f5d88
 DIST krita-5.1.4.tar.xz 184969232 BLAKE2B 
3452504c1ce973d0670508b143ee45d2a75fe72d87f1a3f94a56c4b36f4a179e2a651a0663a04aab8e75484065a78140b3c8c51fda1215c14924a4895be5
 SHA512 
316b9333f416a4d8739a7201910069211d1da1b0f2eebfc48de08f6cf4736f3e7b8fa242bc97eebe8536e483c214cb584d459f26f8ce7bd10e36da467eb67446

diff --git a/media-gfx/krita/krita-5.1.1.ebuild 
b/media-gfx/krita/krita-5.1.1.ebuild
deleted file mode 100644
index fe5ac2ec59ae..
--- a/media-gfx/krita/krita-5.1.1.ebuild
+++ /dev/null
@@ -1,121 +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..11} )
-KFMIN=5.82.0
-QTMIN=5.15.5
-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 jpegxl +mypaint-brush-engine openexr 
pdf qtmedia +raw webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-   dev-libs/boost:=
-   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: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:= )
-   jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220329 )
-   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}"
-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 

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

2022-12-14 Thread Arthur Zamarin
commit: a4bf4c5bdbe036d4c4e0e51a118cd7499a779930
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Dec 15 04:43:34 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Dec 15 04:43:34 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4bf4c5b

media-gfx/krita: Stabilize 5.1.3-r1 amd64, #882627

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/krita/krita-5.1.3-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-5.1.3-r1.ebuild 
b/media-gfx/krita/krita-5.1.3-r1.ebuild
index 6bca4884e8e3..294de506bf5b 100644
--- a/media-gfx/krita/krita-5.1.3-r1.ebuild
+++ b/media-gfx/krita/krita-5.1.3-r1.ebuild
@@ -12,7 +12,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!"



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

2022-12-14 Thread Andreas Sturmlechner
commit: de20b45121fa4c04fd558b15a4a0640e7e04dbbe
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 14 19:39:25 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 14 20:00:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de20b451

media-gfx/krita: 5.1.4 version bump

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/krita-5.1.4.ebuild | 120 +
 2 files changed, 121 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 73835b4c9c6e..9cec29b5 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-5.1.1.tar.xz 185119812 BLAKE2B 
c59a6431d8711dd5e00c2c7c91e50a9e218acc08c4ddbb33d10f315bbb09f0cbcf57961a56c0b36a5a5fe8815d88d3788b257bddd0c76d730f3e0a4b6abddf5a
 SHA512 
6878e022f1bae183f7565cdeadc3f229d3c0d3997557208b351c5128c4c499b53a120c965760c41ad075b09f017d66ca11046ab34765cccf5463fce7df64bf14
 DIST krita-5.1.3.tar.xz 185166464 BLAKE2B 
2fa93e06cd4b5b68016bc1af83464c3e44e1ece0e786734def030bf8e333086ed9d36b23d56dc8b742ceef85273b9d88d754286e85d2d1384ffc92a3592693fd
 SHA512 
4025033cbbe48f2e0d52961320c08920691a3c5b48029c67560c3c28e699cec6a02432bc1ec706204b1f5f3199c7fc66e10c01607ce06b113211cae0194f5d88
+DIST krita-5.1.4.tar.xz 184969232 BLAKE2B 
3452504c1ce973d0670508b143ee45d2a75fe72d87f1a3f94a56c4b36f4a179e2a651a0663a04aab8e75484065a78140b3c8c51fda1215c14924a4895be5
 SHA512 
316b9333f416a4d8739a7201910069211d1da1b0f2eebfc48de08f6cf4736f3e7b8fa242bc97eebe8536e483c214cb584d459f26f8ce7bd10e36da467eb67446

diff --git a/media-gfx/krita/krita-5.1.4.ebuild 
b/media-gfx/krita/krita-5.1.4.ebuild
new file mode 100644
index ..37a85704ec7d
--- /dev/null
+++ b/media-gfx/krita/krita-5.1.4.ebuild
@@ -0,0 +1,120 @@
+# 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..11} )
+KFMIN=5.82.0
+QTMIN=5.15.5
+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 jpegxl +mypaint-brush-engine openexr 
pdf qtmedia +raw webp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bug 630508
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/boost:=
+   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: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:= )
+   jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825 )
+   heif? ( >=media-libs/libheif-1.11:=[x265] )
+   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}"
+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 

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

2022-11-08 Thread Andreas Sturmlechner
commit: eb8e67ded23637bce85d3ccede4c65bcbd551022
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov  8 20:18:07 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov  8 20:27:43 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb8e67de

media-gfx/krita: Add missing IUSE heif usedep on media-libs/heif[x265]

Otherwise fails to safe in .heic format with an error message.

Bug: https://bugs.gentoo.org/879223
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/{krita-5.1.3.ebuild => krita-5.1.3-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-5.1.3.ebuild 
b/media-gfx/krita/krita-5.1.3-r1.ebuild
similarity index 98%
rename from media-gfx/krita/krita-5.1.3.ebuild
rename to media-gfx/krita/krita-5.1.3-r1.ebuild
index 044988c1a390..6bca4884e8e3 100644
--- a/media-gfx/krita/krita-5.1.3.ebuild
+++ b/media-gfx/krita/krita-5.1.3-r1.ebuild
@@ -70,7 +70,7 @@ RDEPEND="${PYTHON_DEPS}
gif? ( media-libs/giflib )
gsl? ( sci-libs/gsl:= )
jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825 )
-   heif? ( >=media-libs/libheif-1.11:= )
+   heif? ( >=media-libs/libheif-1.11:=[x265] )
mypaint-brush-engine? ( media-libs/libmypaint:= )
openexr? ( media-libs/openexr:= )
pdf? ( app-text/poppler[qt5] )



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

2022-11-08 Thread Andreas Sturmlechner
commit: 1943b9c3496c64109167d2d92f293401eeaf90f2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Nov  8 11:25:05 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Nov  8 11:25:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1943b9c3

media-gfx/krita: add 5.1.3, drop 5.1.2

See also: https://krita.org/en/item/krita-5-1-3-released/

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   | 2 +-
 media-gfx/krita/{krita-5.1.2.ebuild => krita-5.1.3.ebuild} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index ed55cc1ae345..73835b4c9c6e 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,2 @@
 DIST krita-5.1.1.tar.xz 185119812 BLAKE2B 
c59a6431d8711dd5e00c2c7c91e50a9e218acc08c4ddbb33d10f315bbb09f0cbcf57961a56c0b36a5a5fe8815d88d3788b257bddd0c76d730f3e0a4b6abddf5a
 SHA512 
6878e022f1bae183f7565cdeadc3f229d3c0d3997557208b351c5128c4c499b53a120c965760c41ad075b09f017d66ca11046ab34765cccf5463fce7df64bf14
-DIST krita-5.1.2.tar.xz 185167428 BLAKE2B 
f0baa96a74e0dc7f15be42d81ce029d95c39617730c23ed8396792058349ccb0e7d633c8945ddfea1326be8c7386f32e3774fd9d4059888970f30b8f848ea6a8
 SHA512 
6d4adb3a8e75c2f26a4b46d0c7927e8a5af9bc468e9f833ff9df689ca630f8c60035c1eb4544d9813d56df0eaed697ec186ce97a8d4ccbe19c881645cb116155
+DIST krita-5.1.3.tar.xz 185166464 BLAKE2B 
2fa93e06cd4b5b68016bc1af83464c3e44e1ece0e786734def030bf8e333086ed9d36b23d56dc8b742ceef85273b9d88d754286e85d2d1384ffc92a3592693fd
 SHA512 
4025033cbbe48f2e0d52961320c08920691a3c5b48029c67560c3c28e699cec6a02432bc1ec706204b1f5f3199c7fc66e10c01607ce06b113211cae0194f5d88

diff --git a/media-gfx/krita/krita-5.1.2.ebuild 
b/media-gfx/krita/krita-5.1.3.ebuild
similarity index 100%
rename from media-gfx/krita/krita-5.1.2.ebuild
rename to media-gfx/krita/krita-5.1.3.ebuild



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

2022-11-06 Thread Andreas Sturmlechner
commit: 85159a3301f789973e5f602d67a18e16f14111d6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Nov  6 11:53:03 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Nov  6 11:53:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85159a33

media-gfx/krita: add 5.1.2

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/krita-5.1.2.ebuild | 121 +
 2 files changed, 122 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 92e3fab34d43..ed55cc1ae345 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1 +1,2 @@
 DIST krita-5.1.1.tar.xz 185119812 BLAKE2B 
c59a6431d8711dd5e00c2c7c91e50a9e218acc08c4ddbb33d10f315bbb09f0cbcf57961a56c0b36a5a5fe8815d88d3788b257bddd0c76d730f3e0a4b6abddf5a
 SHA512 
6878e022f1bae183f7565cdeadc3f229d3c0d3997557208b351c5128c4c499b53a120c965760c41ad075b09f017d66ca11046ab34765cccf5463fce7df64bf14
+DIST krita-5.1.2.tar.xz 185167428 BLAKE2B 
f0baa96a74e0dc7f15be42d81ce029d95c39617730c23ed8396792058349ccb0e7d633c8945ddfea1326be8c7386f32e3774fd9d4059888970f30b8f848ea6a8
 SHA512 
6d4adb3a8e75c2f26a4b46d0c7927e8a5af9bc468e9f833ff9df689ca630f8c60035c1eb4544d9813d56df0eaed697ec186ce97a8d4ccbe19c881645cb116155

diff --git a/media-gfx/krita/krita-5.1.2.ebuild 
b/media-gfx/krita/krita-5.1.2.ebuild
new file mode 100644
index ..044988c1a390
--- /dev/null
+++ b/media-gfx/krita/krita-5.1.2.ebuild
@@ -0,0 +1,121 @@
+# 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..11} )
+KFMIN=5.82.0
+QTMIN=5.15.5
+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 jpegxl +mypaint-brush-engine openexr 
pdf qtmedia +raw webp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bug 630508
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/boost:=
+   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: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:= )
+   jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825 )
+   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}"
+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
+   -DKRITA_ENABLE_PCH=OFF # big mess.
+   -DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged

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

2022-10-12 Thread Andreas Sturmlechner
commit: d3af24e6da554da46ce395771c3bd94a305465bf
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Oct 12 20:07:08 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 12 20:07:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3af24e6

media-gfx/krita: Drop UnusedLocalUse vc

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/metadata.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index 3ce3466cdd1d..27c873d15e6a 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -14,6 +14,5 @@
Support for JPEG XL image format
Enable MyPaint brush engine 
support media-libs/libmypaint
Enable sound support for animations via 
dev-qt/qtmultimedia
-   Enable support for dev-libs/vc, 
could be a significant speed boost

 



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

2022-10-12 Thread Andreas Sturmlechner
commit: b7f9eebc09ad5ee32290478cf078e7e286c1c081
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Oct 12 19:39:25 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Oct 12 19:41:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7f9eebc

media-gfx/krita: drop 5.0.8-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest  |   1 -
 media-gfx/krita/krita-5.0.8-r1.ebuild | 123 --
 2 files changed, 124 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 50a4ada61b90..92e3fab34d43 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-DIST krita-5.0.8.tar.xz 179344256 BLAKE2B 
f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682
 SHA512 
652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777
 DIST krita-5.1.1.tar.xz 185119812 BLAKE2B 
c59a6431d8711dd5e00c2c7c91e50a9e218acc08c4ddbb33d10f315bbb09f0cbcf57961a56c0b36a5a5fe8815d88d3788b257bddd0c76d730f3e0a4b6abddf5a
 SHA512 
6878e022f1bae183f7565cdeadc3f229d3c0d3997557208b351c5128c4c499b53a120c965760c41ad075b09f017d66ca11046ab34765cccf5463fce7df64bf14

diff --git a/media-gfx/krita/krita-5.0.8-r1.ebuild 
b/media-gfx/krita/krita-5.0.8-r1.ebuild
deleted file mode 100644
index 5d78d631d14f..
--- a/media-gfx/krita/krita-5.0.8-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=[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/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
-   

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

2022-10-12 Thread Sam James
commit: 930959be94685ba05fd38cc23112cf7ec5b84221
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct 12 19:21:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct 12 19:21:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=930959be

media-gfx/krita: Stabilize 5.1.1 amd64, #875608

Signed-off-by: Sam James  gentoo.org>

 media-gfx/krita/krita-5.1.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-5.1.1.ebuild 
b/media-gfx/krita/krita-5.1.1.ebuild
index 767fb155def2..fe5ac2ec59ae 100644
--- a/media-gfx/krita/krita-5.1.1.ebuild
+++ b/media-gfx/krita/krita-5.1.1.ebuild
@@ -12,7 +12,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!"



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

2022-09-14 Thread Andreas Sturmlechner
commit: 29651bd5a0b69c18811afc665bbf10aea3622bf8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 14 11:52:51 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 14 11:58:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29651bd5

media-gfx/krita: drop 5.1.0_rc1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 media-gfx/krita/krita-5.1.0_rc1.ebuild | 124 -
 2 files changed, 125 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 9434c4042007..50a4ada61b90 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
 DIST krita-5.0.8.tar.xz 179344256 BLAKE2B 
f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682
 SHA512 
652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777
-DIST krita-5.1.0-RC1.tar.xz 185049352 BLAKE2B 
4719fb435fc28da8691bdc572f66521d2dd62e0d4b3dce8e5efd7e8cbb7434be8c08be0ff1265c049e4469dbf03881d34c7e7ad670fb04d3a6ba8570aaa83e0f
 SHA512 
cdbdc4b946ee55a978a0d16e6791fd8fb01ddfaac7008e2f0649729d91d322c0b9cebf676d48870f9a9970c1e8d03e73ab56cc51ab93d6faba400f51e2219020
 DIST krita-5.1.1.tar.xz 185119812 BLAKE2B 
c59a6431d8711dd5e00c2c7c91e50a9e218acc08c4ddbb33d10f315bbb09f0cbcf57961a56c0b36a5a5fe8815d88d3788b257bddd0c76d730f3e0a4b6abddf5a
 SHA512 
6878e022f1bae183f7565cdeadc3f229d3c0d3997557208b351c5128c4c499b53a120c965760c41ad075b09f017d66ca11046ab34765cccf5463fce7df64bf14

diff --git a/media-gfx/krita/krita-5.1.0_rc1.ebuild 
b/media-gfx/krita/krita-5.1.0_rc1.ebuild
deleted file mode 100644
index 8339c9414fcb..
--- a/media-gfx/krita/krita-5.1.0_rc1.ebuild
+++ /dev/null
@@ -1,124 +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..11} )
-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/unstable/${PN}/${PV/_rc/-RC}/${PN}-${PV/_rc/-RC}.tar.xz"
-   S="${WORKDIR}/${PN}-${PV/_rc/-RC}"
-   #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 jpegxl +mypaint-brush-engine 
openexr pdf qtmedia +raw webp"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# bug 630508
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-   dev-libs/boost:=
-   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/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:= )
-   jpegxl? ( >=media-libs/libjxl-0.7.0 )
-   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}"
-BDEPEND="
-   dev-cpp/eigen:3
-   dev-lang/perl
-   sys-devel/gettext
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
-
-pkg_setup() {
-   

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

2022-09-14 Thread Andreas Sturmlechner
commit: 27b5d2b339be6aaa7d701676204c517ef4892e38
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 14 11:50:39 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 14 11:58:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27b5d2b3

media-gfx/krita: add 5.1.1

See also:
https://krita.org/en/item/krita-5-1-0-released/
https://krita.org/en/item/krita-5-1-1-released/

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/krita-5.1.1.ebuild | 121 +
 2 files changed, 122 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 10523a6908fd..9434c4042007 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-5.0.8.tar.xz 179344256 BLAKE2B 
f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682
 SHA512 
652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777
 DIST krita-5.1.0-RC1.tar.xz 185049352 BLAKE2B 
4719fb435fc28da8691bdc572f66521d2dd62e0d4b3dce8e5efd7e8cbb7434be8c08be0ff1265c049e4469dbf03881d34c7e7ad670fb04d3a6ba8570aaa83e0f
 SHA512 
cdbdc4b946ee55a978a0d16e6791fd8fb01ddfaac7008e2f0649729d91d322c0b9cebf676d48870f9a9970c1e8d03e73ab56cc51ab93d6faba400f51e2219020
+DIST krita-5.1.1.tar.xz 185119812 BLAKE2B 
c59a6431d8711dd5e00c2c7c91e50a9e218acc08c4ddbb33d10f315bbb09f0cbcf57961a56c0b36a5a5fe8815d88d3788b257bddd0c76d730f3e0a4b6abddf5a
 SHA512 
6878e022f1bae183f7565cdeadc3f229d3c0d3997557208b351c5128c4c499b53a120c965760c41ad075b09f017d66ca11046ab34765cccf5463fce7df64bf14

diff --git a/media-gfx/krita/krita-5.1.1.ebuild 
b/media-gfx/krita/krita-5.1.1.ebuild
new file mode 100644
index ..767fb155def2
--- /dev/null
+++ b/media-gfx/krita/krita-5.1.1.ebuild
@@ -0,0 +1,121 @@
+# 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..11} )
+KFMIN=5.82.0
+QTMIN=5.15.5
+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 jpegxl +mypaint-brush-engine openexr 
pdf qtmedia +raw webp"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# bug 630508
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/boost:=
+   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: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:= )
+   jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220329 )
+   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}"
+BDEPEND="
+   dev-cpp/eigen:3
+   dev-lang/perl
+   sys-devel/gettext
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+
+pkg_setup() {
+   

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

2022-09-09 Thread Sam James
commit: d100a4e3db4b91ce0549b0cb946f8d62f50321b4
Author: Sam James  gentoo  org>
AuthorDate: Sat Sep 10 00:25:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Sep 10 00:25:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d100a4e3

media-gfx/krita: revbump for quazip USE-dep change

Fixes: ceca8a7c857f200204c2ec835d1ffd3b625a5397
Signed-off-by: Sam James  gentoo.org>

 media-gfx/krita/{krita-5.0.8.ebuild => krita-5.0.8-r1.ebuild} | 0
 media-gfx/krita/krita-5.1.0_rc1.ebuild| 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-5.0.8.ebuild 
b/media-gfx/krita/krita-5.0.8-r1.ebuild
similarity index 100%
rename from media-gfx/krita/krita-5.0.8.ebuild
rename to media-gfx/krita/krita-5.0.8-r1.ebuild

diff --git a/media-gfx/krita/krita-5.1.0_rc1.ebuild 
b/media-gfx/krita/krita-5.1.0_rc1.ebuild
index a62441dfffb8..8339c9414fcb 100644
--- a/media-gfx/krita/krita-5.1.0_rc1.ebuild
+++ b/media-gfx/krita/krita-5.1.0_rc1.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then

SRC_URI="mirror://kde/unstable/${PN}/${PV/_rc/-RC}/${PN}-${PV/_rc/-RC}.tar.xz"
S="${WORKDIR}/${PN}-${PV/_rc/-RC}"
-#  KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+   #KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2022-09-09 Thread Andrew Ammerlaan
commit: ceca8a7c857f200204c2ec835d1ffd3b625a5397
Author: Andrew Ammerlaan  gentoo  org>
AuthorDate: Fri Sep  9 16:02:36 2022 +
Commit: Andrew Ammerlaan  gentoo  org>
CommitDate: Fri Sep  9 16:09:19 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ceca8a7c

media-gfx/krita: depend on quazip[qt5(+)]

Signed-off-by: Andrew Ammerlaan  gentoo.org>

 media-gfx/krita/krita-5.0.8.ebuild | 2 +-
 media-gfx/krita/krita-5.1.0_rc1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/krita/krita-5.0.8.ebuild 
b/media-gfx/krita/krita-5.0.8.ebuild
index 4f7f33b41aa6..5d78d631d14f 100644
--- a/media-gfx/krita/krita-5.0.8.ebuild
+++ b/media-gfx/krita/krita-5.0.8.ebuild
@@ -28,7 +28,7 @@ RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=
-   dev-libs/quazip:0=
+   dev-libs/quazip:0=[qt5(+)]
$(python_gen_cond_dep '
dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
dev-python/sip:=[${PYTHON_USEDEP}]

diff --git a/media-gfx/krita/krita-5.1.0_rc1.ebuild 
b/media-gfx/krita/krita-5.1.0_rc1.ebuild
index e3dc0050a7d7..a62441dfffb8 100644
--- a/media-gfx/krita/krita-5.1.0_rc1.ebuild
+++ b/media-gfx/krita/krita-5.1.0_rc1.ebuild
@@ -29,7 +29,7 @@ RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=
-   dev-libs/quazip:0=
+   dev-libs/quazip:0=[qt5(+)]
$(python_gen_cond_dep '
dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
dev-python/sip:=[${PYTHON_USEDEP}]



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

2022-08-05 Thread Andreas Sturmlechner
commit: a3d3ce81e8a81f901641eddf643bdc1ac29e6216
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Aug  5 07:44:23 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Aug  5 15:10:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3d3ce81

media-gfx/krita: add 5.1.0_rc1, drop 5.1.0_beta2

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest | 2 +-
 media-gfx/krita/{krita-5.1.0_beta2.ebuild => krita-5.1.0_rc1.ebuild} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 6a28832100b7..10523a6908fd 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,2 @@
 DIST krita-5.0.8.tar.xz 179344256 BLAKE2B 
f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682
 SHA512 
652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777
-DIST krita-5.1.0-beta2.tar.xz 185034556 BLAKE2B 
9861818a35c69cf0dda546e229cdaff0065345199160fe410c3f3ef5b29f1916d6183130472a7977e08af18c470449427b3a955db032875e1c54abf513cee671
 SHA512 
5b7ca521c19cfc7639bdfd513465b9ff7a1e73287d5452c312e6682919ae3601a409e7f153bf20322e2a6a13352c7eb5b74c914c8aa9b730e1e6930010fcac5a
+DIST krita-5.1.0-RC1.tar.xz 185049352 BLAKE2B 
4719fb435fc28da8691bdc572f66521d2dd62e0d4b3dce8e5efd7e8cbb7434be8c08be0ff1265c049e4469dbf03881d34c7e7ad670fb04d3a6ba8570aaa83e0f
 SHA512 
cdbdc4b946ee55a978a0d16e6791fd8fb01ddfaac7008e2f0649729d91d322c0b9cebf676d48870f9a9970c1e8d03e73ab56cc51ab93d6faba400f51e2219020

diff --git a/media-gfx/krita/krita-5.1.0_beta2.ebuild 
b/media-gfx/krita/krita-5.1.0_rc1.ebuild
similarity index 96%
rename from media-gfx/krita/krita-5.1.0_beta2.ebuild
rename to media-gfx/krita/krita-5.1.0_rc1.ebuild
index 4cf834f9be2d..e3dc0050a7d7 100644
--- a/media-gfx/krita/krita-5.1.0_beta2.ebuild
+++ b/media-gfx/krita/krita-5.1.0_rc1.ebuild
@@ -11,8 +11,8 @@ VIRTUALX_REQUIRED="test"
 inherit ecm kde.org python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-   SRC_URI="mirror://kde/unstable/${PN}/${PV/_/-}/${P/_/-}.tar.xz"
-   S="${WORKDIR}/${P/_/-}"
+   
SRC_URI="mirror://kde/unstable/${PN}/${PV/_rc/-RC}/${PN}-${PV/_rc/-RC}.tar.xz"
+   S="${WORKDIR}/${PN}-${PV/_rc/-RC}"
 #  KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 



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

2022-07-19 Thread Andreas Sturmlechner
commit: 99079f4552833a0aed2298045b1db7dd786a2344
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jul 15 19:53:03 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jul 19 10:48:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99079f45

media-gfx/krita: 5.1.0_beta2 version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   | 2 +-
 media-gfx/krita/{krita-5.1.0_beta1.ebuild => krita-5.1.0_beta2.ebuild} | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 50cf7357344c..6a28832100b7 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,2 @@
 DIST krita-5.0.8.tar.xz 179344256 BLAKE2B 
f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682
 SHA512 
652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777
-DIST krita-5.1.0-beta1.tar.xz 184780464 BLAKE2B 
3eccdc82d2c9cba6e7b6faa4929d90d683020d3ae9a2a1c65823d5d18dcf2bd2623c05a2d000664210d9951fe5977ef0ebbdba92d211ec079aabff1146ef776d
 SHA512 
ba27e0253cace00425b3e410466a1bf5435774d9407912e68173473c73ba3129de396260cdc367ac96a3b010353a7422d141174fe59ed9d6aa9af0ecc6c345e3
+DIST krita-5.1.0-beta2.tar.xz 185034556 BLAKE2B 
9861818a35c69cf0dda546e229cdaff0065345199160fe410c3f3ef5b29f1916d6183130472a7977e08af18c470449427b3a955db032875e1c54abf513cee671
 SHA512 
5b7ca521c19cfc7639bdfd513465b9ff7a1e73287d5452c312e6682919ae3601a409e7f153bf20322e2a6a13352c7eb5b74c914c8aa9b730e1e6930010fcac5a

diff --git a/media-gfx/krita/krita-5.1.0_beta1.ebuild 
b/media-gfx/krita/krita-5.1.0_beta2.ebuild
similarity index 98%
rename from media-gfx/krita/krita-5.1.0_beta1.ebuild
rename to media-gfx/krita/krita-5.1.0_beta2.ebuild
index 1efecd299f2e..4cf834f9be2d 100644
--- a/media-gfx/krita/krita-5.1.0_beta1.ebuild
+++ b/media-gfx/krita/krita-5.1.0_beta2.ebuild
@@ -110,6 +110,7 @@ src_configure() {
$(cmake_use_find_package gsl GSL)
$(cmake_use_find_package heif HEIF)
$(cmake_use_find_package jpeg JPEG)
+   $(cmake_use_find_package jpeg libjpeg-turbo)
$(cmake_use_find_package jpegxl JPEGXL)
$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
$(cmake_use_find_package openexr OpenEXR)



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

2022-07-04 Thread Andreas Sturmlechner
commit: 90493a077488e41ad1851c0c65fb030a9d1b7d26
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul  4 16:17:14 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul  4 16:28:55 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90493a07

media-gfx/krita: 5.1.0_beta1 version bump w/o KEYWORDS; python3_11

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest |   1 +
 media-gfx/krita/krita-5.1.0_beta1.ebuild | 123 +++
 media-gfx/krita/metadata.xml |   1 +
 3 files changed, 125 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 5991619dfdc1..50cf7357344c 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1 +1,2 @@
 DIST krita-5.0.8.tar.xz 179344256 BLAKE2B 
f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682
 SHA512 
652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777
+DIST krita-5.1.0-beta1.tar.xz 184780464 BLAKE2B 
3eccdc82d2c9cba6e7b6faa4929d90d683020d3ae9a2a1c65823d5d18dcf2bd2623c05a2d000664210d9951fe5977ef0ebbdba92d211ec079aabff1146ef776d
 SHA512 
ba27e0253cace00425b3e410466a1bf5435774d9407912e68173473c73ba3129de396260cdc367ac96a3b010353a7422d141174fe59ed9d6aa9af0ecc6c345e3

diff --git a/media-gfx/krita/krita-5.1.0_beta1.ebuild 
b/media-gfx/krita/krita-5.1.0_beta1.ebuild
new file mode 100644
index ..1efecd299f2e
--- /dev/null
+++ b/media-gfx/krita/krita-5.1.0_beta1.ebuild
@@ -0,0 +1,123 @@
+# 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..11} )
+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/unstable/${PN}/${PV/_/-}/${P/_/-}.tar.xz"
+   S="${WORKDIR}/${P/_/-}"
+#  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 jpegxl +mypaint-brush-engine 
openexr pdf qtmedia +raw 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:= )
+   jpegxl? ( >=media-libs/libjxl-0.7.0 )
+   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}"
+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 

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

2022-06-15 Thread Andreas Sturmlechner
commit: 1f2b04f517bfa021c6539b88eba36b8a82b3f201
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 15 17:18:27 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun 15 17:18:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f2b04f5

media-gfx/krita: Drop 5.0.2

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest  |   1 -
 media-gfx/krita/files/krita-5.0.0-clang.patch |  50 ---
 media-gfx/krita/krita-5.0.2.ebuild| 124 --
 3 files changed, 175 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index f4dfa19da4cd..5991619dfdc1 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-DIST krita-5.0.2.tar.xz 179049488 BLAKE2B 
a58ee0e7d654f18509f970d32a680a9a993c7172a3818517ddf0a41f500c2d1f9102a432b728b9d9254f39f1be0c926602e3b1806ae19b6efc49f99becdffcdd
 SHA512 
5dd2d6961feabf20dbcef49f3499281e34b409e96d379b0247eec70449f82c05ed3cf3ca09014535adb7ce66659d58e988f1f054364637c9851181fa8ee926a5
 DIST krita-5.0.8.tar.xz 179344256 BLAKE2B 
f8a020b726c2b4f7776b3a31d18028d19f274243fa085ca49e46cd06c2d9e4f8f166e4d77018b1bef7ef2820962759f362e3d00274b3bbb33ac1544ce17d5682
 SHA512 
652a24206f955739dbd188f4c35d10fdfe42bb660f4e046f15a31ee90647786b501e4ad8760c0656b24aa5fbdeda0c009b744dfc16a92cf545c2147a5ad1c777

diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch 
b/media-gfx/krita/files/krita-5.0.0-clang.patch
deleted file mode 100644
index 6c9c71d4fca2..
--- a/media-gfx/krita/files/krita-5.0.0-clang.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
-From: Sharaf Zaman 
-Date: Wed, 27 Oct 2021 22:19:07 +
-Subject: [PATCH] Fix build on linux clang targets
-
-In CheckAtomic.cmake we include is_lock_free because these routines
-don't seem to be included in the compiler's "simple atomics". This
-triggers a failure in clang toolchain, forcing it to link libatomic.
-
-Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
-
-CCBUG:444247
-CCBUG:444547

- cmake/modules/CheckAtomic.cmake | 1 +
- libs/image/CMakeLists.txt   | 6 ++
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
-index b061e2d65b..df6b70504c 100644
 a/cmake/modules/CheckAtomic.cmake
-+++ b/cmake/modules/CheckAtomic.cmake
-@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
-   std::atomic x (0);
-   int main() {
-   uint64_t i = x.load(std::memory_order_relaxed);
-+  x.is_lock_free();
-   return 0;
-   }
-   " ${varname})
-diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
-index e883c7f1c8..43c945fad3 100644
 a/libs/image/CMakeLists.txt
-+++ b/libs/image/CMakeLists.txt
-@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
- 
- target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
- 
--if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
--if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
--target_link_libraries(kritaimage PUBLIC atomic)
--endif()
-+if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
-+   target_link_libraries(kritaimage PUBLIC atomic)
- endif()
- 
- if(OpenEXR_FOUND)
--- 
-GitLab
-

diff --git a/media-gfx/krita/krita-5.0.2.ebuild 
b/media-gfx/krita/krita-5.0.2.ebuild
deleted file mode 100644
index 0c5864b918f4..
--- a/media-gfx/krita/krita-5.0.2.ebuild
+++ /dev/null
@@ -1,124 +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
-   

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

2022-06-14 Thread Jakov Smolić
commit: a4410ccc03690724161a85af9c130ad05496c4cb
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jun 14 21:17:07 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jun 14 21:17:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4410ccc

media-gfx/krita: Stabilize 5.0.8 amd64, #851930

Signed-off-by: Jakov Smolić  gentoo.org>

 media-gfx/krita/krita-5.0.8.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-5.0.8.ebuild 
b/media-gfx/krita/krita-5.0.8.ebuild
index dd01742d3d40..4f7f33b41aa6 100644
--- a/media-gfx/krita/krita-5.0.8.ebuild
+++ b/media-gfx/krita/krita-5.0.8.ebuild
@@ -12,7 +12,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!"



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

2022-06-05 Thread Sam James
commit: abe6cccfc75fac99646ed066c8a8162c152d67ee
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun  6 01:26:49 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun  6 01:26:49 2022 +
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  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..
--- 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 
-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..
--- 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 
-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 

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

2022-06-01 Thread Andreas Sturmlechner
commit: eb9daf0995428748fd69a2168c3828e3607127b5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun  1 10:15:31 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun  1 11:26:04 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9daf09

media-gfx/krita: 5.0.8 version bump

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/krita-5.0.8.ebuild | 123 +
 2 files changed, 124 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 800d7fd84501..62dc7f3bd25f 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -2,3 +2,4 @@ DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613
 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/krita-5.0.8.ebuild 
b/media-gfx/krita/krita-5.0.8.ebuild
new file mode 100644
index ..dd01742d3d40
--- /dev/null
+++ b/media-gfx/krita/krita-5.0.8.ebuild
@@ -0,0 +1,123 @@
+# 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 

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

2022-05-06 Thread Sam James
commit: 0286a7f26d3c82208e459983b618265f83f47488
Author: Sam James  gentoo  org>
AuthorDate: Sat May  7 05:33:18 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  7 05:33:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0286a7f2

media-gfx/krita: use libjpeg-turbo

Signed-off-by: Sam James  gentoo.org>

 media-gfx/krita/{krita-5.0.6.ebuild => krita-5.0.6-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-5.0.6.ebuild 
b/media-gfx/krita/krita-5.0.6-r1.ebuild
similarity index 98%
rename from media-gfx/krita/krita-5.0.6.ebuild
rename to media-gfx/krita/krita-5.0.6-r1.ebuild
index c4414bd5fa4e..dd01742d3d40 100644
--- a/media-gfx/krita/krita-5.0.6.ebuild
+++ b/media-gfx/krita/krita-5.0.6-r1.ebuild
@@ -68,7 +68,7 @@ RDEPEND="${PYTHON_DEPS}
fftw? ( sci-libs/fftw:3.0= )
gif? ( media-libs/giflib )
gsl? ( sci-libs/gsl:= )
-   jpeg? ( virtual/jpeg:0 )
+   jpeg? ( media-libs/libjpeg-turbo:= )
heif? ( >=media-libs/libheif-1.11:= )
mypaint-brush-engine? ( media-libs/libmypaint:= )
openexr? ( media-libs/openexr:= )



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

2022-05-06 Thread Sam James
commit: b41ef5f04d2f39a282951d4b641b50d004c48574
Author: Sam James  gentoo  org>
AuthorDate: Sat May  7 05:24:09 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat May  7 05:28:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b41ef5f0

media-gfx/krita: add 5.0.6

Signed-off-by: Sam James  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/krita-5.0.6.ebuild | 123 +
 2 files changed, 124 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index acf71edf3439..800d7fd84501 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,4 @@
 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

diff --git a/media-gfx/krita/krita-5.0.6.ebuild 
b/media-gfx/krita/krita-5.0.6.ebuild
new file mode 100644
index ..c4414bd5fa4e
--- /dev/null
+++ b/media-gfx/krita/krita-5.0.6.ebuild
@@ -0,0 +1,123 @@
+# 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? ( virtual/jpeg:0 )
+   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="
+   

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

2022-02-27 Thread Yixun Lan
commit: 9b7c5dbc183d170c6aefe8eb35370cab504d6083
Author: Alex Fan  gmail  com>
AuthorDate: Mon Feb 28 01:45:39 2022 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Mon Feb 28 07:04:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b7c5dbc

media-gfx/krita: keyword 5.0.2 for ~riscv

Closes: https://github.com/gentoo/gentoo/pull/24373
Signed-off-by: Alex Fan  gmail.com>
Signed-off-by: Yixun Lan  gentoo.org>

 media-gfx/krita/krita-5.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-5.0.2.ebuild 
b/media-gfx/krita/krita-5.0.2.ebuild
index 851f63d807d0..0c5864b918f4 100644
--- a/media-gfx/krita/krita-5.0.2.ebuild
+++ b/media-gfx/krita/krita-5.0.2.ebuild
@@ -12,7 +12,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 ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2022-02-27 Thread Sam James
commit: aa1211d321c2afb7e9afdb73495c69b3dba219e2
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 28 05:20:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 28 05:20:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa1211d3

media-gfx/krita: Stabilize 5.0.2 amd64, #833158

Signed-off-by: Sam James  gentoo.org>

 media-gfx/krita/krita-5.0.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-5.0.2.ebuild 
b/media-gfx/krita/krita-5.0.2.ebuild
index 685904486932..851f63d807d0 100644
--- a/media-gfx/krita/krita-5.0.2.ebuild
+++ b/media-gfx/krita/krita-5.0.2.ebuild
@@ -12,7 +12,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 ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2022-02-19 Thread Andreas Sturmlechner
commit: 36938034e92b826ba1436f01b4af7ae762d72d4a
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 29 11:50:41 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 19 16:26:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36938034

media-gfx/krita: Fix build with clang

Reported-by: Michael Egger  protonmail.com>
Closes: https://bugs.gentoo.org/830225
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/files/krita-5.0.0-clang.patch | 50 +++
 media-gfx/krita/krita-5.0.2.ebuild|  5 ++-
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch 
b/media-gfx/krita/files/krita-5.0.0-clang.patch
new file mode 100644
index ..6c9c71d4fca2
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.0.0-clang.patch
@@ -0,0 +1,50 @@
+From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
+From: Sharaf Zaman 
+Date: Wed, 27 Oct 2021 22:19:07 +
+Subject: [PATCH] Fix build on linux clang targets
+
+In CheckAtomic.cmake we include is_lock_free because these routines
+don't seem to be included in the compiler's "simple atomics". This
+triggers a failure in clang toolchain, forcing it to link libatomic.
+
+Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
+
+CCBUG:444247
+CCBUG:444547
+---
+ cmake/modules/CheckAtomic.cmake | 1 +
+ libs/image/CMakeLists.txt   | 6 ++
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
+index b061e2d65b..df6b70504c 100644
+--- a/cmake/modules/CheckAtomic.cmake
 b/cmake/modules/CheckAtomic.cmake
+@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
+   std::atomic x (0);
+   int main() {
+   uint64_t i = x.load(std::memory_order_relaxed);
++  x.is_lock_free();
+   return 0;
+   }
+   " ${varname})
+diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
+index e883c7f1c8..43c945fad3 100644
+--- a/libs/image/CMakeLists.txt
 b/libs/image/CMakeLists.txt
+@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
+ 
+ target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
+ 
+-if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
+-if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+-target_link_libraries(kritaimage PUBLIC atomic)
+-endif()
++if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
++   target_link_libraries(kritaimage PUBLIC atomic)
+ endif()
+ 
+ if(OpenEXR_FOUND)
+-- 
+GitLab
+

diff --git a/media-gfx/krita/krita-5.0.2.ebuild 
b/media-gfx/krita/krita-5.0.2.ebuild
index e880d07ce0b2..685904486932 100644
--- a/media-gfx/krita/krita-5.0.2.ebuild
+++ b/media-gfx/krita/krita-5.0.2.ebuild
@@ -86,7 +86,10 @@ BDEPEND="
sys-devel/gettext
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+   "${FILESDIR}"/${PN}-5.0.0-clang.patch # bug 830225
+)
 
 pkg_setup() {
python-single-r1_pkg_setup



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

2021-12-29 Thread Andreas Sturmlechner
commit: 5d9d5c938890de6f96c7754fe7b4827508f3cbe5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 28 17:01:01 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 29 15:41:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d9d5c93

media-gfx/krita: Add missing DEPEND

Upstream commits:
e544ef889f164e4db3021fab7942421c8798885b
0e7683d3c0f74468f23270141c28f8c7fd8f2685

Reported-by: Doppler  cock.li>
Bug: https://bugs.gentoo.org/829964
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/krita-5.0.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/krita/krita-5.0.0.ebuild 
b/media-gfx/krita/krita-5.0.0.ebuild
index f6f7c94470a5..80d88c6840a7 100644
--- a/media-gfx/krita/krita-5.0.0.ebuild
+++ b/media-gfx/krita/krita-5.0.0.ebuild
@@ -39,6 +39,7 @@ RDEPEND="${PYTHON_DEPS}
>=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



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

2021-12-29 Thread Andreas Sturmlechner
commit: 9b4dbc2b6eab22ae41faf217a6b261898de346ba
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 29 11:52:52 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 29 16:33:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b4dbc2b

media-gfx/krita: Fix desktop file QA warning

Reported-by: Marco Scardovi  scardovi.com>
Closes: https://bugs.gentoo.org/829987
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/krita-5.0.0-krita_jp2.desktop.patch  | 24 ++
 media-gfx/krita/krita-5.0.0-r1.ebuild  |  1 +
 2 files changed, 25 insertions(+)

diff --git a/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch 
b/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch
new file mode 100644
index ..c678a9f05492
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.0.0-krita_jp2.desktop.patch
@@ -0,0 +1,24 @@
+From e1b2760966b738f1d467013272035433f1666406 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Mon, 27 Dec 2021 15:25:25 +0100
+Subject: [PATCH] Fix duplicate "Type" key
+
+Introduced by 542dcd306e236ec776a81e389d0a601387739e48
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ plugins/impex/jp2/krita_jp2.desktop | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/plugins/impex/jp2/krita_jp2.desktop 
b/plugins/impex/jp2/krita_jp2.desktop
+index 26c448f48b..7de190b247 100644
+--- a/plugins/impex/jp2/krita_jp2.desktop
 b/plugins/impex/jp2/krita_jp2.desktop
+@@ -120,4 +120,3 @@ Icon=krita
+ StartupNotify=true
+ NoDisplay=true
+ Terminal=false
+-Type=Application
+-- 
+GitLab
+

diff --git a/media-gfx/krita/krita-5.0.0-r1.ebuild 
b/media-gfx/krita/krita-5.0.0-r1.ebuild
index 757396adc400..d2782068ebcc 100644
--- a/media-gfx/krita/krita-5.0.0-r1.ebuild
+++ b/media-gfx/krita/krita-5.0.0-r1.ebuild
@@ -89,6 +89,7 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
"${FILESDIR}"/${P}-clang.patch # bug 830225
+   "${FILESDIR}"/${P}-krita_jp2.desktop.patch # bug 829987
 )
 
 pkg_setup() {



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

2021-12-29 Thread Andreas Sturmlechner
commit: 8e8f74afb6662f813be78b857d6a88a852548e17
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec 29 11:50:41 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec 29 15:41:22 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e8f74af

media-gfx/krita: Fix build with clang

Reported-by: Michael Egger  protonmail.com>
Closes: https://bugs.gentoo.org/830225
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/files/krita-5.0.0-clang.patch  | 50 ++
 .../{krita-5.0.0.ebuild => krita-5.0.0-r1.ebuild}  |  5 ++-
 2 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/media-gfx/krita/files/krita-5.0.0-clang.patch 
b/media-gfx/krita/files/krita-5.0.0-clang.patch
new file mode 100644
index ..6c9c71d4fca2
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.0.0-clang.patch
@@ -0,0 +1,50 @@
+From 0b755beaa1fdba03d38f887b93a15a58fc0830c7 Mon Sep 17 00:00:00 2001
+From: Sharaf Zaman 
+Date: Wed, 27 Oct 2021 22:19:07 +
+Subject: [PATCH] Fix build on linux clang targets
+
+In CheckAtomic.cmake we include is_lock_free because these routines
+don't seem to be included in the compiler's "simple atomics". This
+triggers a failure in clang toolchain, forcing it to link libatomic.
+
+Resulting in error: ld.lld: error: undefined symbol: __atomic_is_lock_free
+
+CCBUG:444247
+CCBUG:444547
+---
+ cmake/modules/CheckAtomic.cmake | 1 +
+ libs/image/CMakeLists.txt   | 6 ++
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/modules/CheckAtomic.cmake b/cmake/modules/CheckAtomic.cmake
+index b061e2d65b..df6b70504c 100644
+--- a/cmake/modules/CheckAtomic.cmake
 b/cmake/modules/CheckAtomic.cmake
+@@ -46,6 +46,7 @@ function(check_working_cxx_atomics64 varname)
+   std::atomic x (0);
+   int main() {
+   uint64_t i = x.load(std::memory_order_relaxed);
++  x.is_lock_free();
+   return 0;
+   }
+   " ${varname})
+diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
+index e883c7f1c8..43c945fad3 100644
+--- a/libs/image/CMakeLists.txt
 b/libs/image/CMakeLists.txt
+@@ -372,10 +372,8 @@ target_link_libraries(kritaimage
+ 
+ target_link_libraries(kritaimage PUBLIC ${Boost_SYSTEM_LIBRARY})
+ 
+-if(NOT HAVE_CXX_ATOMICS_WITHOUT_LIB)
+-if(NOT HAVE_CXX_ATOMICS64_WITHOUT_LIB)
+-target_link_libraries(kritaimage PUBLIC atomic)
+-endif()
++if(HAVE_CXX_ATOMICS_WITH_LIB OR HAVE_CXX_ATOMICS64_WITH_LIB)
++   target_link_libraries(kritaimage PUBLIC atomic)
+ endif()
+ 
+ if(OpenEXR_FOUND)
+-- 
+GitLab
+

diff --git a/media-gfx/krita/krita-5.0.0.ebuild 
b/media-gfx/krita/krita-5.0.0-r1.ebuild
similarity index 96%
rename from media-gfx/krita/krita-5.0.0.ebuild
rename to media-gfx/krita/krita-5.0.0-r1.ebuild
index 80d88c6840a7..757396adc400 100644
--- a/media-gfx/krita/krita-5.0.0.ebuild
+++ b/media-gfx/krita/krita-5.0.0-r1.ebuild
@@ -86,7 +86,10 @@ BDEPEND="
sys-devel/gettext
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+   "${FILESDIR}"/${P}-clang.patch # bug 830225
+)
 
 pkg_setup() {
python-single-r1_pkg_setup



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

2021-12-23 Thread Andreas Sturmlechner
commit: a804c3a1f0c9217c507a8d5b3ae1dda7512472ff
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 23 11:08:13 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 23 11:37:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a804c3a1

media-gfx/krita: 5.0.0 version bump

See also: https://krita.org/en/krita-5-0-release-notes/

Bug: https://bugs.gentoo.org/821925
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/krita-5.0.0.ebuild | 120 +
 media-gfx/krita/metadata.xml   |   1 +
 3 files changed, 122 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index a30c36b95551..f71d11c50fad 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 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.0.tar.xz 179036344 BLAKE2B 
cde7684931363a30598e626fd21751e2b3c0418aa3908e527d2888e41f8cc26065e6d74f000530e153b9a47627b149eb0f834985a84d92b2d87a2d398b59e9eb
 SHA512 
29ad09f00b85688b7150a2705e0b3317e449d932b9906bc994397c4686d6d1058573f5ce84449e7c611d04385ee5ec82182b361fd067630a292ec5f88f0c9007

diff --git a/media-gfx/krita/krita-5.0.0.ebuild 
b/media-gfx/krita/krita-5.0.0.ebuild
new file mode 100644
index ..f6f7c94470a5
--- /dev/null
+++ b/media-gfx/krita/krita-5.0.0.ebuild
@@ -0,0 +1,120 @@
+# 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.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 +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/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? ( virtual/jpeg:0 )
+   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 )
+

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

2021-11-15 Thread Andreas Sturmlechner
commit: 62306e5005656ea05a0ef00b2ffb57ebba8d7e24
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Nov 15 13:28:37 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Nov 15 13:37:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62306e50

media-gfx/krita: Fix build with >=PyQt5-5.15.6

See also:
ttps://www.riverbankcomputing.com/pipermail/pyqt/2021-November/044346.html

Closes: https://bugs.gentoo.org/822843
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../krita-4.4.8-prefer-newer-sip-to-build.patch| 56 ++
 media-gfx/krita/krita-4.4.8-r1.ebuild  |  1 +
 2 files changed, 57 insertions(+)

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
new file mode 100644
index ..c60b53ffc64b
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.4.8-prefer-newer-sip-to-build.patch
@@ -0,0 +1,56 @@
+From d2f29d77db58b54a8bcabfb68df66e4dd44f0c27 Mon Sep 17 00:00:00 2001
+From: Heiko Becker 
+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
index 614c5a0ad5d4..dedc461115e7 100644
--- a/media-gfx/krita/krita-4.4.8-r1.ebuild
+++ b/media-gfx/krita/krita-4.4.8-r1.ebuild
@@ -92,6 +92,7 @@ PATCHES=(
"${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() {



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

2021-10-10 Thread Jakov Smolić
commit: 821e207f0213a7b6f54e0eeb0fddf1373012c2b2
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Oct 10 18:19:19 2021 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Sun Oct 10 19:05:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=821e207f

media-gfx/krita: remove unused patch

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/22549
Signed-off-by: Jakov Smolić  gentoo.org>

 .../files/krita-4.4.5-pykrita-crash-on-exit.patch  | 32 --
 1 file changed, 32 deletions(-)

diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch 
b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
deleted file mode 100644
index 12ebb2fa95a..000
--- a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 86a38621fbbf96edf489a0efd2b9c24c123e2051 Mon Sep 17 00:00:00 2001
-From: Dmitry Kazakov 
-Date: Tue, 3 Aug 2021 11:57:33 +0300
-Subject: [PATCH] Disable finalizing of the PyQt to prevent crash on exit
-
-CCBUG:417465

- plugins/extensions/pykrita/plugin/plugin.cpp | 9 -
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp 
b/plugins/extensions/pykrita/plugin/plugin.cpp
-index 028798e2f4..cc06c07fbe 100644
 a/plugins/extensions/pykrita/plugin/plugin.cpp
-+++ b/plugins/extensions/pykrita/plugin/plugin.cpp
-@@ -89,11 +89,10 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const 
QVariantList &)
- 
- KritaPyQtPlugin::~KritaPyQtPlugin()
- {
--// XXX: With Qt 5.14, this crashes Krita on exit. See 
https://bugs.kde.org/show_bug.cgi?id=417465
--//  So, for now, we just don't call finalize...
--#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
--PyKrita::finalize();
--#endif
-+/// XXX: Don't call PyKrita::finalize here, because that can result in a 
crash
-+///  deep inside Qt. See https://bugs.kde.org/show_bug.cgi?id=417465
-+
-+// PyKrita::finalize();
- }
- 
- #include "plugin.moc"
--- 
-GitLab



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

2021-10-08 Thread Andreas Sturmlechner
commit: d66a369116083bfb32484501b456269c3c30b236
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct  8 07:18:15 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Oct  8 07:26:05 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d66a3691

media-gfx/krita: Drop 4.4.5-r1

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest  |   1 -
 media-gfx/krita/krita-4.4.5-r1.ebuild | 130 --
 2 files changed, 131 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 30321e6704f..a30c36b9555 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
 SHA512 
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
-DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 
6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc
 SHA512 
9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4
 DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 
251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb
 SHA512 
53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81

diff --git a/media-gfx/krita/krita-4.4.5-r1.ebuild 
b/media-gfx/krita/krita-4.4.5-r1.ebuild
deleted file mode 100644
index 5c4bd6209e5..000
--- a/media-gfx/krita/krita-4.4.5-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=7
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{8,9,10} )
-KFMIN=5.74.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[${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:=
-   =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}"/${P}-pykrita-crash-on-exit.patch # KDE-Bug #417465
-   

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

2021-10-06 Thread Sam James
commit: a0a354398f059ed4c469d26fb74297b631da03cf
Author: Sam James  gentoo  org>
AuthorDate: Wed Oct  6 23:03:47 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Oct  6 23:05:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a0a35439

media-gfx/krita: Stabilize 4.4.8-r1 amd64, #815478

Signed-off-by: Sam James  gentoo.org>

 media-gfx/krita/krita-4.4.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-4.4.8-r1.ebuild 
b/media-gfx/krita/krita-4.4.8-r1.ebuild
index 866a9e4645e..614c5a0ad5d 100644
--- a/media-gfx/krita/krita-4.4.8-r1.ebuild
+++ b/media-gfx/krita/krita-4.4.8-r1.ebuild
@@ -13,7 +13,7 @@ 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"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2021-09-30 Thread Andreas Sturmlechner
commit: 6ccc1e4b9fa3e027b13068fd7cfd84277be68ec0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 30 17:52:35 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep 30 17:53:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ccc1e4b

media-gfx/krita: DEPEND on dev-python/PyQt5[declarative,gui,widgets]

Thanks-to: YOSHIOKA Takuma  hard-wi.red>
Closes: https://bugs.gentoo.org/815157
Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/krita-4.4.8-r1.ebuild | 129 ++
 1 file changed, 129 insertions(+)

diff --git a/media-gfx/krita/krita-4.4.8-r1.ebuild 
b/media-gfx/krita/krita-4.4.8-r1.ebuild
new file mode 100644
index 000..866a9e4645e
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.8-r1.ebuild
@@ -0,0 +1,129 @@
+# 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:=
+   =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
+)
+
+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 

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

2021-09-30 Thread Andreas Sturmlechner
commit: 04f1cddf2e0f63c8e72b15eff53871d63880f931
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Sep 30 17:52:55 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Sep 30 17:53:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04f1cddf

media-gfx/krita: Drop 4.4.8 (r0)

Package-Manager: Portage-3.0.26, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/krita-4.4.8.ebuild | 129 -
 1 file changed, 129 deletions(-)

diff --git a/media-gfx/krita/krita-4.4.8.ebuild 
b/media-gfx/krita/krita-4.4.8.ebuild
deleted file mode 100644
index b54ea50988e..000
--- a/media-gfx/krita/krita-4.4.8.ebuild
+++ /dev/null
@@ -1,129 +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[${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:=
-   =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
-)
-
-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
-}



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

2021-09-04 Thread Andreas Sturmlechner
commit: cf9a14a8f42a768676647278cb6d735507b70e93
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  4 16:54:20 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep  4 16:57:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9a14a8

media-gfx/krita: Drop 4.4.7

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 media-gfx/krita/krita-4.4.7.ebuild | 129 -
 2 files changed, 130 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 85b87b2e835..30321e6704f 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,4 +1,3 @@
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
 SHA512 
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 
6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc
 SHA512 
9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4
-DIST krita-4.4.7.tar.gz 254871508 BLAKE2B 
c7e964ddec3fdf16db0644f6d61daa278b0fed2969bbcad99ca476240196ff4da3371af718049482ffe09e314bc96d40f28929fccb8cf0d3a9c98d7f20658695
 SHA512 
b1fbab9f69e700a1e9e562adfa1776c2de481a5dd92cee2a0ea533a0233a7277b512823023736784c41b387210a35c07cc23b3e2b3a89ed9cb60d440cc5906d5
 DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 
251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb
 SHA512 
53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81

diff --git a/media-gfx/krita/krita-4.4.7.ebuild 
b/media-gfx/krita/krita-4.4.7.ebuild
deleted file mode 100644
index c80ed32f998..000
--- a/media-gfx/krita/krita-4.4.7.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{8,9,10} )
-KFMIN=5.74.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[${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:=
-   =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

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

2021-09-04 Thread Andreas Sturmlechner
commit: 33121bff0f46524aed11d2cff17d1460b58ef516
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Sep  4 16:59:34 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Sep  4 16:59:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33121bff

media-gfx/krita: EAPI-8 bump

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/krita-4.4.8.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/krita/krita-4.4.8.ebuild 
b/media-gfx/krita/krita-4.4.8.ebuild
index 30ca71bc92a..b54ea50988e 100644
--- a/media-gfx/krita/krita-4.4.8.ebuild
+++ b/media-gfx/krita/krita-4.4.8.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_TEST="forceoptional"
 PYTHON_COMPAT=( python3_{8..10} )
@@ -25,7 +25,7 @@ IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf 
qtmedia +raw tiff vc
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # bug 630508
-RESTRICT+=" test"
+RESTRICT="test"
 
 RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=



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

2021-08-25 Thread Andreas Sturmlechner
commit: a6da0e26d96b05183652ad054810420cdc95cf5b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Aug 25 09:47:18 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Aug 25 14:46:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6da0e26

media-gfx/krita: 4.4.8 version bump

Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/krita-4.4.8.ebuild | 129 +
 2 files changed, 130 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 15f1fd23ee2..85b87b2e835 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,4 @@
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
 SHA512 
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 
6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc
 SHA512 
9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4
 DIST krita-4.4.7.tar.gz 254871508 BLAKE2B 
c7e964ddec3fdf16db0644f6d61daa278b0fed2969bbcad99ca476240196ff4da3371af718049482ffe09e314bc96d40f28929fccb8cf0d3a9c98d7f20658695
 SHA512 
b1fbab9f69e700a1e9e562adfa1776c2de481a5dd92cee2a0ea533a0233a7277b512823023736784c41b387210a35c07cc23b3e2b3a89ed9cb60d440cc5906d5
+DIST krita-4.4.8.tar.gz 254887779 BLAKE2B 
251c621a235b8d977c886d3d31f07187efb6d45eab1960eab84ba4078216a1ecf5c7f0b90bdbf791e0c219867c6df59bb99b47c4b23c7658e1d2990f3e869cdb
 SHA512 
53b9814fcf61fbaee06e81f456aa9de7ab09df99e04932251984c8ae190248e48fa20762bdb7be503ea267e1fb835095b105ce4bf2078fd510ab5a8ef6d82f81

diff --git a/media-gfx/krita/krita-4.4.8.ebuild 
b/media-gfx/krita/krita-4.4.8.ebuild
new file mode 100644
index 000..30ca71bc92a
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.8.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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[${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:=
+   =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
+   

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

2021-08-10 Thread Andreas Sturmlechner
commit: ba2af85078920c0523791faca18cb299626799af
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug 10 17:56:49 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug 10 18:14:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba2af850

media-gfx/krita: 4.4.7 version bump

See also: https://krita.org/en/item/krita-4-4-7-released/

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |  1 +
 .../files/krita-4.4.5-pykrita-crash-on-exit.patch  | 49 ++
 ...tch => krita-4.4.7-pykrita-crash-on-exit.patch} | 16 +--
 media-gfx/krita/krita-4.4.5-r1.ebuild  |  1 +
 .../{krita-4.4.5-r1.ebuild => krita-4.4.7.ebuild}  |  4 +-
 5 files changed, 18 insertions(+), 53 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 25e38181019..15f1fd23ee2 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
 SHA512 
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 
6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc
 SHA512 
9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4
+DIST krita-4.4.7.tar.gz 254871508 BLAKE2B 
c7e964ddec3fdf16db0644f6d61daa278b0fed2969bbcad99ca476240196ff4da3371af718049482ffe09e314bc96d40f28929fccb8cf0d3a9c98d7f20658695
 SHA512 
b1fbab9f69e700a1e9e562adfa1776c2de481a5dd92cee2a0ea533a0233a7277b512823023736784c41b387210a35c07cc23b3e2b3a89ed9cb60d440cc5906d5

diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch 
b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
index 1939c962815..12ebb2fa95a 100644
--- a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
+++ b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
@@ -1,42 +1,18 @@
-From a0c29913114164ff3f2ba4e255ccee1c52cb3e86 Mon Sep 17 00:00:00 2001
-From: Alvin Wong 
-Date: Sat, 19 Jun 2021 16:29:45 +0800
-Subject: [PATCH] Fix PyKrita cleanup using qApp::aboutToQuit to prevent crash
+From 86a38621fbbf96edf489a0efd2b9c24c123e2051 Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov 
+Date: Tue, 3 Aug 2021 11:57:33 +0300
+Subject: [PATCH] Disable finalizing of the PyQt to prevent crash on exit
 
-Suspecting that we can't have Python clean up its QObject's inside
-QCoreApplication's destructor, but must be done before it.
-
-BUG: 417465
-
-* asturm 2021-06-20: mangled w/ a6296beb25c98d9a4b5a136e0088959bf51d550a
+CCBUG:417465
 ---
- plugins/extensions/pykrita/plugin/plugin.cpp | 15 ++-
- 1 file changed, 10 insertions(+), 5 deletions(-)
+ plugins/extensions/pykrita/plugin/plugin.cpp | 9 -
+ 1 file changed, 4 insertions(+), 5 deletions(-)
 
 diff --git a/plugins/extensions/pykrita/plugin/plugin.cpp 
b/plugins/extensions/pykrita/plugin/plugin.cpp
-index ef0e27eb65..66f552b007 100644
+index 028798e2f4..cc06c07fbe 100644
 --- a/plugins/extensions/pykrita/plugin/plugin.cpp
 +++ b/plugins/extensions/pykrita/plugin/plugin.cpp
-@@ -13,6 +13,8 @@
- #include 
- #include "pyqtpluginsettings.h"
- 
-+#include 
-+
- #include 
- 
- K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", 
registerPlugin();)
-@@ -74,15 +76,18 @@ 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(), ::aboutToQuit, 
this, []() { PyKrita::finalize(); });
- }
+@@ -89,11 +89,10 @@ KritaPyQtPlugin::KritaPyQtPlugin(QObject *parent, const 
QVariantList &)
  
  KritaPyQtPlugin::~KritaPyQtPlugin()
  {
@@ -45,11 +21,12 @@ index ef0e27eb65..66f552b007 100644
 -#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
 -PyKrita::finalize();
 -#endif
-+// Don't call PyKrita::finalize here, because that can result in a crash
-+// deep inside Qt.
++/// XXX: Don't call PyKrita::finalize here, because that can result in a 
crash
++///  deep inside Qt. See https://bugs.kde.org/show_bug.cgi?id=417465
++
++// PyKrita::finalize();
  }
  
  #include "plugin.moc"
 -- 
 GitLab
-

diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch 

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

2021-07-21 Thread Marek Szuba
commit: 6fc153bc58e1d26d32858c7f06e26f7d9cfd2da1
Author: Bernd Waibel  posteo  net>
AuthorDate: Wed Jul 21 16:00:39 2021 +
Commit: Marek Szuba  gentoo  org>
CommitDate: Wed Jul 21 21:57:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fc153bc

media-gfx/krita: add slot operator for openexr

- restrict to  posteo.net>
Signed-off-by: Marek Szuba  gentoo.org>

 media-gfx/krita/{krita-4.4.5.ebuild => krita-4.4.5-r1.ebuild} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-4.4.5.ebuild 
b/media-gfx/krita/krita-4.4.5-r1.ebuild
similarity index 99%
rename from media-gfx/krita/krita-4.4.5.ebuild
rename to media-gfx/krita/krita-4.4.5-r1.ebuild
index 2e2e0dc2845..fe539d73926 100644
--- a/media-gfx/krita/krita-4.4.5.ebuild
+++ b/media-gfx/krita/krita-4.4.5-r1.ebuild
@@ -71,7 +71,7 @@ RDEPEND="${PYTHON_DEPS}
heif? ( media-libs/libheif:= )
openexr? (
media-libs/ilmbase:=
-   media-libs/openexr
+   =dev-qt/qtmultimedia-${QTMIN}:5 )



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

2021-07-05 Thread Andreas Sturmlechner
commit: 2680602d9fbeb025f43c580b070177b86d223dfd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jul  5 06:27:48 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jul  5 06:27:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2680602d

media-gfx/krita: Drop 4.4.3

Closes: https://bugs.gentoo.org/793887
Closes: https://bugs.gentoo.org/795786
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 media-gfx/krita/krita-4.4.3.ebuild | 128 -
 2 files changed, 129 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 33c5f73c48e..25e38181019 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
 SHA512 
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
-DIST krita-4.4.3.tar.gz 254855083 BLAKE2B 
5ffc5d7c887d409c2669a2c75f2dae3d6b1c6e83f30d330c37c6e8eb96e590c4abb7b26aea82a18f13b01ed2f053d2a4ddca780cab2995c10c9c0c07d67ee689
 SHA512 
44052f5bc02c31b8e5eb7990192c1b1d6a4ca9d91117b0b8e9ddf794df83cfdde233754064ad6692516bc8d756871bf4b34190653f04956cb851333b8d15645f
 DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 
6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc
 SHA512 
9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4

diff --git a/media-gfx/krita/krita-4.4.3.ebuild 
b/media-gfx/krita/krita-4.4.3.ebuild
deleted file mode 100644
index f96ef5a942f..000
--- a/media-gfx/krita/krita-4.4.3.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.74.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"
-
-BDEPEND="
-   dev-cpp/eigen:3
-   dev-lang/perl
-   sys-devel/gettext
-"
-RDEPEND="${PYTHON_DEPS}
-   dev-libs/boost:=
-   dev-libs/quazip:0=
-   $(python_gen_cond_dep '
-   dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
-   dev-python/sip[${PYTHON_MULTI_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 )
-   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
-   )
-   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 )
-"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
-   

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

2021-07-04 Thread Sam James
commit: c8da833913f0ac1011e4a52a9aa3996e149a0fb1
Author: Sam James  gentoo  org>
AuthorDate: Sun Jul  4 22:17:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul  4 22:17:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8da8339

media-gfx/krita: Stabilize 4.4.5 amd64, #798306

Signed-off-by: Sam James  gentoo.org>

 media-gfx/krita/krita-4.4.5.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-4.4.5.ebuild 
b/media-gfx/krita/krita-4.4.5.ebuild
index 9b1b2c73a5e..24eb620839d 100644
--- a/media-gfx/krita/krita-4.4.5.ebuild
+++ b/media-gfx/krita/krita-4.4.5.ebuild
@@ -13,7 +13,7 @@ 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"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2021-06-20 Thread Andreas Sturmlechner
commit: 75651b0d83a785d1cb8411d36317b0452cb1144b
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 19 20:36:00 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 20 08:32:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75651b0d

media-gfx/krita: 4.4.5 version bump

Introduce dev-python/sip slot op
Restrict to =media-libs/opencolorio-1*

Bug: https://bugs.gentoo.org/793887
Bug: https://bugs.gentoo.org/795786
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 .../files/krita-4.4.5-pykrita-crash-on-exit.patch  |  55 +
 media-gfx/krita/krita-4.4.5.ebuild | 129 +
 3 files changed, 185 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 50f9dd6da41..33c5f73c48e 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
 SHA512 
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.3.tar.gz 254855083 BLAKE2B 
5ffc5d7c887d409c2669a2c75f2dae3d6b1c6e83f30d330c37c6e8eb96e590c4abb7b26aea82a18f13b01ed2f053d2a4ddca780cab2995c10c9c0c07d67ee689
 SHA512 
44052f5bc02c31b8e5eb7990192c1b1d6a4ca9d91117b0b8e9ddf794df83cfdde233754064ad6692516bc8d756871bf4b34190653f04956cb851333b8d15645f
+DIST krita-4.4.5.tar.gz 254879190 BLAKE2B 
6eb12bba3ff2a5a6400eb7719faa3ffa1a4b1863e177aad0a737e13ce59dc53feb27083ccbeea51db6d69322871cc159eda5dff67e4daf1e7b4806edeb49adfc
 SHA512 
9926e1cae7db2b89b8cd5f1e45631ff8cbf63cdbd367fc2f4b901a3f1d708dabaa6ac293a8f53b9ca67d7afc263ff51fe6f6b6a9a70017ee23fbf8aa2732abc4

diff --git a/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch 
b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
new file mode 100644
index 000..1939c962815
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.4.5-pykrita-crash-on-exit.patch
@@ -0,0 +1,55 @@
+From a0c29913114164ff3f2ba4e255ccee1c52cb3e86 Mon Sep 17 00:00:00 2001
+From: Alvin Wong 
+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
+
+* asturm 2021-06-20: mangled w/ a6296beb25c98d9a4b5a136e0088959bf51d550a
+---
+ 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 
+ #include "pyqtpluginsettings.h"
+ 
++#include 
++
+ #include 
+ 
+ K_PLUGIN_FACTORY_WITH_JSON(KritaPyQtPluginFactory, "kritapykrita.json", 
registerPlugin();)
+@@ -74,15 +76,18 @@ 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(), ::aboutToQuit, 
this, []() { PyKrita::finalize(); });
+ }
+ 
+ KritaPyQtPlugin::~KritaPyQtPlugin()
+ {
+-// XXX: With Qt 5.14, this crashes Krita on exit. See 
https://bugs.kde.org/show_bug.cgi?id=417465
+-//  So, for now, we just don't call finalize...
+-#if QT_VERSION < QT_VERSION_CHECK(5,14,0)
+-PyKrita::finalize();
+-#endif
++// Don't call PyKrita::finalize here, because that can result in a crash
++// deep inside Qt.
+ }
+ 
+ #include "plugin.moc"
+-- 
+GitLab
+

diff --git a/media-gfx/krita/krita-4.4.5.ebuild 
b/media-gfx/krita/krita-4.4.5.ebuild
new file mode 100644
index 000..9b1b2c73a5e
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.5.ebuild
@@ -0,0 +1,129 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{8,9,10} )
+KFMIN=5.74.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. 

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

2021-06-01 Thread Sam James
commit: 8158469f88fe3f02d616396664fe9f29b5557535
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun  1 08:59:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun  1 08:59:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8158469f

media-gfx/krita: Stabilize 4.4.3 amd64, #788835

Signed-off-by: Sam James  gentoo.org>

 media-gfx/krita/krita-4.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-4.4.3.ebuild 
b/media-gfx/krita/krita-4.4.3.ebuild
index 6186e7e98ba..f96ef5a942f 100644
--- a/media-gfx/krita/krita-4.4.3.ebuild
+++ b/media-gfx/krita/krita-4.4.3.ebuild
@@ -13,7 +13,7 @@ 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"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2021-03-25 Thread Andreas Sturmlechner
commit: 2cbf185501966d370d61b567fe2a9db1eed8c7f2
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar  7 21:53:03 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Mar 25 23:13:18 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cbf1855

media-gfx/krita: 4.4.3 version bump

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/krita-4.4.3.ebuild | 128 +
 2 files changed, 129 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 333f01ff520..630b72f7d78 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
 SHA512 
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.2.tar.xz 174168244 BLAKE2B 
95f22853ee31c8121b7d54e6771f8fbb708b19a106bf78026344ac6f2cb02ffbd446d291601359042579ba0e89d6d0a641015e95070c17369a2a8e9e01560660
 SHA512 
a75925e9690eaea03900cdb8da20dc25f1bf22fdb4515f685111f3503bf7c334acf79e6668b55a70464c77a04229ca34d6f160d5490987592af783ca9fc7d7ef
+DIST krita-4.4.3.tar.gz 254855083 BLAKE2B 
5ffc5d7c887d409c2669a2c75f2dae3d6b1c6e83f30d330c37c6e8eb96e590c4abb7b26aea82a18f13b01ed2f053d2a4ddca780cab2995c10c9c0c07d67ee689
 SHA512 
44052f5bc02c31b8e5eb7990192c1b1d6a4ca9d91117b0b8e9ddf794df83cfdde233754064ad6692516bc8d756871bf4b34190653f04956cb851333b8d15645f

diff --git a/media-gfx/krita/krita-4.4.3.ebuild 
b/media-gfx/krita/krita-4.4.3.ebuild
new file mode 100644
index 000..b82ee9f7399
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.3.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.74.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/en/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"
+
+BDEPEND="
+   dev-cpp/eigen:3
+   dev-lang/perl
+   sys-devel/gettext
+"
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/boost:=
+   dev-libs/quazip:0=
+   $(python_gen_cond_dep '
+   dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+   dev-python/sip[${PYTHON_MULTI_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 )
+   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
+   )
+   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 )
+"
+
+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
+)
+
+pkg_setup() 

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

2021-02-27 Thread Andreas Sturmlechner
commit: c9eabfbcc1c903fe0203a5cb7dfac39269dd40ee
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 27 17:43:02 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Feb 27 17:43:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9eabfbc

media-gfx/krita: Drop 4.4.1

Package-Manager: Portage-3.0.16, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 media-gfx/krita/krita-4.4.1.ebuild | 127 -
 2 files changed, 128 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 60a9e526970..333f01ff520 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
 SHA512 
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
-DIST krita-4.4.1.tar.xz 169788052 BLAKE2B 
fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190
 SHA512 
8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccdbc1b1f8bcbcdeb607909fee710afe
 DIST krita-4.4.2.tar.xz 174168244 BLAKE2B 
95f22853ee31c8121b7d54e6771f8fbb708b19a106bf78026344ac6f2cb02ffbd446d291601359042579ba0e89d6d0a641015e95070c17369a2a8e9e01560660
 SHA512 
a75925e9690eaea03900cdb8da20dc25f1bf22fdb4515f685111f3503bf7c334acf79e6668b55a70464c77a04229ca34d6f160d5490987592af783ca9fc7d7ef

diff --git a/media-gfx/krita/krita-4.4.1.ebuild 
b/media-gfx/krita/krita-4.4.1.ebuild
deleted file mode 100644
index 14f14250e7c..000
--- a/media-gfx/krita/krita-4.4.1.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{7,8,9} )
-KFMIN=5.74.0
-QTMIN=5.15.1
-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
-   
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/en/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}"
-
-BDEPEND="
-   dev-cpp/eigen:3
-   dev-lang/perl
-   sys-devel/gettext
-"
-RDEPEND="${PYTHON_DEPS}
-   dev-libs/boost:=
-   dev-libs/quazip
-   $(python_gen_cond_dep '
-   dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
-   dev-python/sip[${PYTHON_MULTI_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 )
-   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
-   )
-   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 )
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
-   "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
-   "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
-)
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-   

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

2021-02-27 Thread Sam James
commit: 45177c324dfbbf0675fb68d6f38f26f10449b189
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 27 16:15:35 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 27 16:15:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45177c32

media-gfx/krita: Stabilize 4.4.2 amd64, #770301

Signed-off-by: Sam James  gentoo.org>

 media-gfx/krita/krita-4.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-4.4.2.ebuild 
b/media-gfx/krita/krita-4.4.2.ebuild
index 62d25fd3463..f6d505b9971 100644
--- a/media-gfx/krita/krita-4.4.2.ebuild
+++ b/media-gfx/krita/krita-4.4.2.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz

https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz;
-   KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2021-02-23 Thread Andreas Sturmlechner
commit: 1176cc65055bad4ebaf56465578afa995da6e5a7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Feb 20 16:31:29 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb 23 19:52:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1176cc65

media-gfx/krita: Support build with >=dev-libs/quazip-1.0

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/files/krita-4.4.2-quazip1.patch | 36 +
 media-gfx/krita/krita-4.4.2.ebuild  |  3 ++-
 2 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/media-gfx/krita/files/krita-4.4.2-quazip1.patch 
b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
new file mode 100644
index 000..6a49bd3ba2e
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.4.2-quazip1.patch
@@ -0,0 +1,36 @@
+From 3eaf480ae5d615e8e26153cca98115ff0f23135f Mon Sep 17 00:00:00 2001
+From: Antonio Rojas 
+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/krita-4.4.2.ebuild 
b/media-gfx/krita/krita-4.4.2.ebuild
index 3a09834e46d..62d25fd3463 100644
--- a/media-gfx/krita/krita-4.4.2.ebuild
+++ b/media-gfx/krita/krita-4.4.2.ebuild
@@ -31,7 +31,7 @@ BDEPEND="
 "
 RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=
-   dev-libs/quazip
+   dev-libs/quazip:0=
$(python_gen_cond_dep '
dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
dev-python/sip[${PYTHON_MULTI_USEDEP}]
@@ -90,6 +90,7 @@ RESTRICT+=" test"
 PATCHES=(
"${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
"${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+   "${FILESDIR}"/${P}-quazip1.patch
 )
 
 pkg_setup() {



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

2021-01-19 Thread Andreas Sturmlechner
commit: cb97f50af568ca7f1b0c29d4a70f7307eb0424e0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jan 19 16:10:08 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jan 19 16:10:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb97f50a

media-gfx/krita: 4.4.2 version bump

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/krita-4.4.2.ebuild | 127 +
 2 files changed, 128 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 789a2b08b4f..60a9e526970 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
 SHA512 
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.4.1.tar.xz 169788052 BLAKE2B 
fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190
 SHA512 
8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccdbc1b1f8bcbcdeb607909fee710afe
+DIST krita-4.4.2.tar.xz 174168244 BLAKE2B 
95f22853ee31c8121b7d54e6771f8fbb708b19a106bf78026344ac6f2cb02ffbd446d291601359042579ba0e89d6d0a641015e95070c17369a2a8e9e01560660
 SHA512 
a75925e9690eaea03900cdb8da20dc25f1bf22fdb4515f685111f3503bf7c334acf79e6668b55a70464c77a04229ca34d6f160d5490987592af783ca9fc7d7ef

diff --git a/media-gfx/krita/krita-4.4.2.ebuild 
b/media-gfx/krita/krita-4.4.2.ebuild
new file mode 100644
index 000..3a09834e46d
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.2.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{7,8,9} )
+KFMIN=5.74.0
+QTMIN=5.15.1
+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
+   
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/en/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}"
+
+BDEPEND="
+   dev-cpp/eigen:3
+   dev-lang/perl
+   sys-devel/gettext
+"
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/boost:=
+   dev-libs/quazip
+   $(python_gen_cond_dep '
+   dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+   dev-python/sip[${PYTHON_MULTI_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 )
+   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
+   )
+   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 )
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch
+   "${WORKDIR}"/${PN}-4.2.9-patchset/${PN}-4.2.9-ecm-findopenexr.patch
+)
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+   

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

2020-12-21 Thread Sam James
commit: fd99c206c64ad367227abb22c8cc5b1edf00f8a8
Author: Sam James  gentoo  org>
AuthorDate: Mon Dec 21 18:05:33 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Dec 21 18:05:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd99c206

media-gfx/krita: Keyword 4.4.1 arm64, #758152

Signed-off-by: Sam James  gentoo.org>

 media-gfx/krita/krita-4.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-4.4.1.ebuild 
b/media-gfx/krita/krita-4.4.1.ebuild
index c33ac85cc1b..14f14250e7c 100644
--- a/media-gfx/krita/krita-4.4.1.ebuild
+++ b/media-gfx/krita/krita-4.4.1.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz

https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz;
-   KEYWORDS="amd64 ~ppc64 ~x86"
+   KEYWORDS="amd64 ~arm64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2020-12-17 Thread Andreas Sturmlechner
commit: 7329bad3b388d903d42986336279e0b7a25bf09e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Dec 17 10:11:31 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Dec 17 10:23:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7329bad3

media-gfx/krita: Drop 4.3.0

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 .../krita/files/krita-4.3.0-tests-optional.patch   | 536 -
 media-gfx/krita/krita-4.3.0.ebuild | 127 -
 3 files changed, 664 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2d039017079..789a2b08b4f 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
 SHA512 
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
-DIST krita-4.3.0.tar.xz 166246720 BLAKE2B 
74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c
 SHA512 
5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4
 DIST krita-4.4.1.tar.xz 169788052 BLAKE2B 
fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190
 SHA512 
8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccdbc1b1f8bcbcdeb607909fee710afe

diff --git a/media-gfx/krita/files/krita-4.3.0-tests-optional.patch 
b/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
deleted file mode 100644
index b58dcf1f4a8..000
--- a/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
+++ /dev/null
@@ -1,536 +0,0 @@
-From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Wed, 17 Jun 2020 20:18:28 +0200
-Subject: [PATCH] Don't build tests when testing not requested
-
-Signed-off-by: Andreas Sturmlechner 
-
-diff --git a/libs/brush/CMakeLists.txt b/libs/brush/CMakeLists.txt
-index 536b1a4ac5..7d8435eec4 100644
 a/libs/brush/CMakeLists.txt
-+++ b/libs/brush/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
- ${EIGEN3_INCLUDE_DIR}
-diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
-index cbdac265d2..1a50c1620a 100644
 a/libs/flake/CMakeLists.txt
-+++ b/libs/flake/CMakeLists.txt
-@@ -9,8 +9,10 @@ include_directories(
- )
- 
- add_subdirectory(styles)
--add_subdirectory(tests)
--add_subdirectory(resources/tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+add_subdirectory(resources/tests)
-+endif()
- 
- set(kritaflake_SRCS
- KoGradientHelper.cpp
-diff --git a/libs/global/CMakeLists.txt b/libs/global/CMakeLists.txt
-index e8162c5e46..f6ea6bc840 100644
 a/libs/global/CMakeLists.txt
-+++ b/libs/global/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- 
- include(CheckFunctionExists)
- check_function_exists(backtrace HAVE_BACKTRACE)
-diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
-index 810dee2f16..44c72ba2d5 100644
 a/libs/image/CMakeLists.txt
-+++ b/libs/image/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- 
- add_subdirectory( tiles3 )
- 
-diff --git a/libs/image/tiles3/CMakeLists.txt 
b/libs/image/tiles3/CMakeLists.txt
-index 88c0516360..01f2383ddb 100644
 a/libs/image/tiles3/CMakeLists.txt
-+++ b/libs/image/tiles3/CMakeLists.txt
-@@ -1 +1,3 @@
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
-diff --git a/libs/libkis/CMakeLists.txt b/libs/libkis/CMakeLists.txt
-index 958104aaaf..3b8a33eadc 100644
 a/libs/libkis/CMakeLists.txt
-+++ b/libs/libkis/CMakeLists.txt
-@@ -48,4 +48,6 @@ set_target_properties(kritalibkis PROPERTIES
- install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
-diff --git a/libs/metadata/CMakeLists.txt b/libs/metadata/CMakeLists.txt
-index d33aff38fc..abdc2f7a36 100644
 a/libs/metadata/CMakeLists.txt
-+++ b/libs/metadata/CMakeLists.txt
-@@ -29,4 +29,6 @@ set_target_properties(kritametadata PROPERTIES
- 
- install(TARGETS kritametadata  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
-diff --git a/libs/odf/CMakeLists.txt b/libs/odf/CMakeLists.txt
-index 6acbf4d1a5..50e60b55d8 100644
 

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

2020-12-16 Thread Sam James
commit: b41dcfed578bcbf9d03ba492d5a573ffb281ca88
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec 17 00:45:37 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec 17 00:45:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b41dcfed

media-gfx/krita: Stabilize 4.4.1 amd64, #759829

Signed-off-by: Sam James  gentoo.org>

 media-gfx/krita/krita-4.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-4.4.1.ebuild 
b/media-gfx/krita/krita-4.4.1.ebuild
index 1b8485696af..c33ac85cc1b 100644
--- a/media-gfx/krita/krita-4.4.1.ebuild
+++ b/media-gfx/krita/krita-4.4.1.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz

https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz;
-   KEYWORDS="~amd64 ~ppc64 ~x86"
+   KEYWORDS="amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2020-10-31 Thread Andreas Sturmlechner
commit: 675e8e6afc49ade90e2bf49ec12166dce0670cae
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Oct 30 15:28:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 31 09:20:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=675e8e6a

media-gfx/krita: 4.4.1 version bump

See also: https://krita.org/en/item/krita-4-4-1-released/

Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 .../krita/files/krita-4.3.1-tests-optional.patch   |  80 +
 media-gfx/krita/krita-4.4.1.ebuild | 127 +
 3 files changed, 208 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index bb2ae2c5f9f..2d039017079 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
 SHA512 
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.3.0.tar.xz 166246720 BLAKE2B 
74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c
 SHA512 
5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4
+DIST krita-4.4.1.tar.xz 169788052 BLAKE2B 
fe0cbba0e63a3873578c54055b0a11941518a52a9fab17e54f13d26325717a5d6e7f0d6c79d29df2bcc91c39174bc992d2e1e14e1012a5fdd8c447f224e3a190
 SHA512 
8832202384bae5c73715087b1b3230e459eb780cfa71b7c7bfb92ba4498b8b78575a7b3437aa4b88f396cec47080ccdbc1b1f8bcbcdeb607909fee710afe

diff --git a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch 
b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
new file mode 100644
index 000..37f2ac50ffd
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
@@ -0,0 +1,80 @@
+From 2e9369281d44a2701ac7364568d381cca0d92ec5 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 12 Jul 2020 18:55:31 +0200
+Subject: [PATCH] KritaAddBrokenUnitTest.cmake, MacroKritaAddBenchmark.cmake:
+ Skip ecm_add_test early if Qt5::Test is not available
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ cmake/modules/KritaAddBrokenUnitTest.cmake | 4 
+ cmake/modules/MacroKritaAddBenchmark.cmake | 4 
+ 2 files changed, 8 insertions(+)
+
+diff --git a/cmake/modules/KritaAddBrokenUnitTest.cmake 
b/cmake/modules/KritaAddBrokenUnitTest.cmake
+index b7d0e8d852..901a0a1f99 100644
+--- a/cmake/modules/KritaAddBrokenUnitTest.cmake
 b/cmake/modules/KritaAddBrokenUnitTest.cmake
+@@ -23,6 +23,10 @@ function(KRITA_ADD_BROKEN_UNIT_TEST)
+ message(FATAL_ERROR "ecm_add_test() called with multiple source files but 
without setting \"TEST_NAME\"")
+   endif()
+ 
++  if(NOT TARGET Qt5::Test)
++return()
++  endif()
++
+   set(_testname ${ARG_NAME_PREFIX}${_targetname})
+ 
+   # add test to the global list of disabled tests
+diff --git a/cmake/modules/MacroKritaAddBenchmark.cmake 
b/cmake/modules/MacroKritaAddBenchmark.cmake
+index c748d8e319..f804d9b8f4 100644
+--- a/cmake/modules/MacroKritaAddBenchmark.cmake
 b/cmake/modules/MacroKritaAddBenchmark.cmake
+@@ -23,6 +23,10 @@ macro (KRITA_ADD_BENCHMARK _test_NAME)
+ set(_nogui "NOGUI")
+ endif()
+ 
++if(NOT TARGET Qt5::Test)
++return()
++endif()
++
+ add_executable( ${_test_NAME} ${_srcList} )
+ ecm_mark_as_test(${_test_NAME})
+ 
+-- 
+2.27.0
+
+From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Wed, 17 Jun 2020 20:18:28 +0200
+Subject: [PATCH] Don't build tests when testing not requested
+
+Signed-off-by: Andreas Sturmlechner 
+
+diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
+index cbdac265d2..1a50c1620a 100644
+--- a/libs/flake/CMakeLists.txt
 b/libs/flake/CMakeLists.txt
+@@ -9,8 +9,10 @@ include_directories(
+ )
+ 
+ add_subdirectory(styles)
+-add_subdirectory(tests)
+-add_subdirectory(resources/tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++add_subdirectory(resources/tests)
++endif()
+ 
+ set(kritaflake_SRCS
+ KoGradientHelper.cpp
+diff --git a/libs/image/tiles3/CMakeLists.txt 
b/libs/image/tiles3/CMakeLists.txt
+index 88c0516360..01f2383ddb 100644
+--- a/libs/image/tiles3/CMakeLists.txt
 b/libs/image/tiles3/CMakeLists.txt
+@@ -1 +1,3 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+-- 
+2.27.0

diff --git a/media-gfx/krita/krita-4.4.1.ebuild 
b/media-gfx/krita/krita-4.4.1.ebuild
new file mode 100644
index 000..1b8485696af
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.1.ebuild
@@ -0,0 +1,127 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed 

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

2020-10-13 Thread Agostino Sarubbo
commit: ff034b300bf03e29514119bc760181ef9d55d717
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue Oct 13 09:24:10 2020 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue Oct 13 09:24:10 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff034b30

media-gfx/krita: amd64 stable wrt bug #747661

Package-Manager: Portage-3.0.4, Repoman-3.0.1
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/krita/krita-4.3.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-4.3.0.ebuild 
b/media-gfx/krita/krita-4.3.0.ebuild
index 55f079f7482..6bbf5eded0b 100644
--- a/media-gfx/krita/krita-4.3.0.ebuild
+++ b/media-gfx/krita/krita-4.3.0.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz

https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz;
-   KEYWORDS="~amd64 ~ppc64 ~x86"
+   KEYWORDS="amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2020-06-21 Thread Andreas Sturmlechner
commit: 2674d8d5720f7e45851a8323a2a33dfb37a7eb1d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 21 07:59:48 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jun 21 08:00:07 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2674d8d5

media-gfx/krita: Fix build with boost-1.73.0

Closes: https://bugs.gentoo.org/728744
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/krita-4.3.0.ebuild | 5 +
 1 file changed, 5 insertions(+)

diff --git a/media-gfx/krita/krita-4.3.0.ebuild 
b/media-gfx/krita/krita-4.3.0.ebuild
index 2bd200f968e..55f079f7482 100644
--- a/media-gfx/krita/krita-4.3.0.ebuild
+++ b/media-gfx/krita/krita-4.3.0.ebuild
@@ -98,6 +98,11 @@ 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



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

2020-06-18 Thread Andreas Sturmlechner
commit: 4823065bff02a67c88b3d685354b4062c74dd4e8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jun 17 16:49:55 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 18 23:03:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4823065b

media-gfx/krita: 4.3.0 version bump

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 .../krita/files/krita-4.3.0-tests-optional.patch   | 536 +
 media-gfx/krita/krita-4.3.0.ebuild | 122 +
 3 files changed, 659 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index acb7f9fd647..65b1492d8b1 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
 SHA512 
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.2.9.tar.xz 170082028 BLAKE2B 
dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66
 SHA512 
66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0
+DIST krita-4.3.0.tar.xz 166246720 BLAKE2B 
74a6e02968a2abdeb59ca2702f0a4a7be23473657667b14592ad08b81d25d9e4815fb5d206a23f33a82268974e9369450525c53b43fef46831ad4c501c34546c
 SHA512 
5633a6ccacc140b119082f14fe792b1219b8065304fccc55a84a2373a46cb036ad40f718beb8719e1f664e35d679b18e86f5f3db8685166a187d8cf3a77722f4

diff --git a/media-gfx/krita/files/krita-4.3.0-tests-optional.patch 
b/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
new file mode 100644
index 000..b58dcf1f4a8
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.3.0-tests-optional.patch
@@ -0,0 +1,536 @@
+From 3c9fe10e25e94bdb1eb5e7b07ac2696635fdc5a3 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Wed, 17 Jun 2020 20:18:28 +0200
+Subject: [PATCH] Don't build tests when testing not requested
+
+Signed-off-by: Andreas Sturmlechner 
+
+diff --git a/libs/brush/CMakeLists.txt b/libs/brush/CMakeLists.txt
+index 536b1a4ac5..7d8435eec4 100644
+--- a/libs/brush/CMakeLists.txt
 b/libs/brush/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+ ${EIGEN3_INCLUDE_DIR}
+diff --git a/libs/flake/CMakeLists.txt b/libs/flake/CMakeLists.txt
+index cbdac265d2..1a50c1620a 100644
+--- a/libs/flake/CMakeLists.txt
 b/libs/flake/CMakeLists.txt
+@@ -9,8 +9,10 @@ include_directories(
+ )
+ 
+ add_subdirectory(styles)
+-add_subdirectory(tests)
+-add_subdirectory(resources/tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++add_subdirectory(resources/tests)
++endif()
+ 
+ set(kritaflake_SRCS
+ KoGradientHelper.cpp
+diff --git a/libs/global/CMakeLists.txt b/libs/global/CMakeLists.txt
+index e8162c5e46..f6ea6bc840 100644
+--- a/libs/global/CMakeLists.txt
 b/libs/global/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ 
+ include(CheckFunctionExists)
+ check_function_exists(backtrace HAVE_BACKTRACE)
+diff --git a/libs/image/CMakeLists.txt b/libs/image/CMakeLists.txt
+index 810dee2f16..44c72ba2d5 100644
+--- a/libs/image/CMakeLists.txt
 b/libs/image/CMakeLists.txt
+@@ -1,4 +1,6 @@
+-add_subdirectory( tests )
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ 
+ add_subdirectory( tiles3 )
+ 
+diff --git a/libs/image/tiles3/CMakeLists.txt 
b/libs/image/tiles3/CMakeLists.txt
+index 88c0516360..01f2383ddb 100644
+--- a/libs/image/tiles3/CMakeLists.txt
 b/libs/image/tiles3/CMakeLists.txt
+@@ -1 +1,3 @@
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+diff --git a/libs/libkis/CMakeLists.txt b/libs/libkis/CMakeLists.txt
+index 958104aaaf..3b8a33eadc 100644
+--- a/libs/libkis/CMakeLists.txt
 b/libs/libkis/CMakeLists.txt
+@@ -48,4 +48,6 @@ set_target_properties(kritalibkis PROPERTIES
+ install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+diff --git a/libs/metadata/CMakeLists.txt b/libs/metadata/CMakeLists.txt
+index d33aff38fc..abdc2f7a36 100644
+--- a/libs/metadata/CMakeLists.txt
 b/libs/metadata/CMakeLists.txt
+@@ -29,4 +29,6 @@ set_target_properties(kritametadata PROPERTIES
+ 
+ install(TARGETS kritametadata  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+diff --git a/libs/odf/CMakeLists.txt b/libs/odf/CMakeLists.txt
+index 6acbf4d1a5..50e60b55d8 100644
+--- 

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

2020-06-05 Thread Andreas Sturmlechner
commit: 036a92fe9a804576beaee5a8bc67326c3d7fca52
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jun  5 18:46:08 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Jun  5 22:42:32 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=036a92fe

media-gfx/krita: python3_9

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/krita-4.2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-4.2.9.ebuild 
b/media-gfx/krita/krita-4.2.9.ebuild
index e23f6afea05..150df39c706 100644
--- a/media-gfx/krita/krita-4.2.9.ebuild
+++ b/media-gfx/krita/krita-4.2.9.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 KFMIN=5.60.0
 QTMIN=5.12.3
 VIRTUALX_REQUIRED="test"



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

2020-05-19 Thread Andreas Sturmlechner
commit: 30e5ec13c1051ea2220f212d339cb69b064911f3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 19 19:57:33 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 19 19:57:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30e5ec13

media-gfx/krita: Drop 4.2.8.2-r3

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest|   2 -
 media-gfx/krita/krita-4.2.8.2-r3.ebuild | 122 
 2 files changed, 124 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index bf42126de16..acb7f9fd647 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,4 +1,2 @@
-DIST krita-4.2.8.2-patchset.tar.xz 13848 BLAKE2B 
86059e08833541b7d4dfda2c36cd1479809452171353b755ab3a264fa41fb99fc7ffacf064af3767aa095fda81aa9a2212b63c7242c72f94ca23a83b34c0502f
 SHA512 
79532700c967f94479af22e2fbd33c0b6d8c4295c872316935800b99258dceaedbac2b1c6314251d4d621c25a328ea602f49d415cc9275095bc3cd2f29756a61
-DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B 
fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4
 SHA512 
5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7
 DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
 SHA512 
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.2.9.tar.xz 170082028 BLAKE2B 
dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66
 SHA512 
66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0

diff --git a/media-gfx/krita/krita-4.2.8.2-r3.ebuild 
b/media-gfx/krita/krita-4.2.8.2-r3.ebuild
deleted file mode 100644
index e23f6afea05..000
--- a/media-gfx/krita/krita-4.2.8.2-r3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{6,7,8} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz
-   https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz;
-   KEYWORDS="amd64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/org.kde.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}"
-
-BDEPEND="
-   dev-cpp/eigen:3
-   dev-lang/perl
-   sys-devel/gettext
-"
-RDEPEND="${PYTHON_DEPS}
-   dev-libs/boost:=
-   dev-libs/quazip
-   $(python_gen_cond_dep '
-   dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
-   dev-python/sip[${PYTHON_MULTI_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/karchive-${KFMIN}: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 )
-   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
-   )
-   pdf? ( app-text/poppler[qt5] )
-   qtmedia? ( 

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

2020-05-19 Thread Andreas Sturmlechner
commit: 4348a76f7806ad1c834061dbda9e1e455e5501e8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue May 19 19:54:45 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue May 19 19:55:58 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4348a76f

media-gfx/krita: 4.2.9 amd64 stable

Closes: https://bugs.gentoo.org/720172
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/krita-4.2.9.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-4.2.9.ebuild 
b/media-gfx/krita/krita-4.2.9.ebuild
index e3e6c38ca03..e23f6afea05 100644
--- a/media-gfx/krita/krita-4.2.9.ebuild
+++ b/media-gfx/krita/krita-4.2.9.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz
https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz;
-   KEYWORDS="~amd64 ~ppc64 ~x86"
+   KEYWORDS="amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2020-04-18 Thread Andreas Sturmlechner
commit: 4adb681e309103d6306caa0cb1f31e8a3b1037bc
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr 18 19:15:43 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr 18 19:32:48 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4adb681e

media-gfx/krita: Fix build with Qt 5.15

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 .../krita/files/krita-4.2.9-ecm-findopenexr.patch  | 352 -
 media-gfx/krita/krita-4.2.9.ebuild |   5 +-
 3 files changed, 4 insertions(+), 354 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2bab9ddbf4a..bf42126de16 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,4 @@
 DIST krita-4.2.8.2-patchset.tar.xz 13848 BLAKE2B 
86059e08833541b7d4dfda2c36cd1479809452171353b755ab3a264fa41fb99fc7ffacf064af3767aa095fda81aa9a2212b63c7242c72f94ca23a83b34c0502f
 SHA512 
79532700c967f94479af22e2fbd33c0b6d8c4295c872316935800b99258dceaedbac2b1c6314251d4d621c25a328ea602f49d415cc9275095bc3cd2f29756a61
 DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B 
fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4
 SHA512 
5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7
+DIST krita-4.2.9-patchset.tar.xz 7928 BLAKE2B 
57256884edafd528cfca529e020a226613a37682df445ece24d434e816f218d822c03d668a13806f775d02757bafd9627ed8073406e5506023767d06c78c30de
 SHA512 
36ec902afec082fcf18c0e523a83a08aa54d54bd5393691b0f17dcab0969e69973d8e842fac44fcf66232f369b36f97937f67b5c0b0bdcff019cc1d323b3bf59
 DIST krita-4.2.9.tar.xz 170082028 BLAKE2B 
dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66
 SHA512 
66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0

diff --git a/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch 
b/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch
deleted file mode 100644
index 0a7c7ca6984..000
--- a/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch
+++ /dev/null
@@ -1,352 +0,0 @@
-From dae9ddcd45a95fd3b1ec3d42510556a671b08f15 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Tue, 31 Mar 2020 19:56:48 +0200
-Subject: [PATCH 1/2] Revert "Revert "Use e-c-m's findopenexr.cmake module""
-
-This reverts commit d978a33acebb724b862c38895788fc459111c364.
-
-Signed-off-by: Andreas Sturmlechner 

- CMakeLists.txt  |  2 +-
- cmake/modules/FindOpenEXR.cmake | 98 -
- 2 files changed, 1 insertion(+), 99 deletions(-)
- delete mode 100644 cmake/modules/FindOpenEXR.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a7d9adaa3f..7a4211da13 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -251,7 +251,7 @@ endif(MINGW)
- 
- 
- find_package(ECM 5.22 REQUIRED NOMODULE)
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} 
${ECM_KDE_MODULE_DIR})
-+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} 
${ECM_KDE_MODULE_DIR} ${ECM_FIND_MODULE_DIR})
- include(ECMOptionalAddSubdirectory)
- include(ECMAddAppIcon)
- include(ECMSetupVersion)
-diff --git a/cmake/modules/FindOpenEXR.cmake b/cmake/modules/FindOpenEXR.cmake
-deleted file mode 100644
-index bb75a03bf0..00
 a/cmake/modules/FindOpenEXR.cmake
-+++ /dev/null
-@@ -1,98 +0,0 @@
--#
--# Copyright 2016 Pixar
--#
--# Licensed under the Apache License, Version 2.0 (the "Apache License")
--# with the following modification; you may not use this file except in
--# compliance with the Apache License and the following modification to it:
--# Section 6. Trademarks. is deleted and replaced with:
--#
--# 6. Trademarks. This License does not grant permission to use the trade
--#names, trademarks, service marks, or product names of the Licensor
--#and its affiliates, except as required to comply with Section 4(c) of
--#the License and to reproduce the content of the NOTICE file.
--#
--# You may obtain a copy of the Apache License at
--#
--# http://www.apache.org/licenses/LICENSE-2.0
--#
--# Unless required by applicable law or agreed to in writing, software
--# distributed under the Apache License with the above modification is
--# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
--# KIND, either express or implied. See the Apache License for the specific
--# language governing permissions and limitations under the Apache License.
--#
--
--find_path(OPENEXR_INCLUDE_DIR
--OpenEXR/half.h
--HINTS
--"${OPENEXR_LOCATION}"
--"$ENV{OPENEXR_LOCATION}"
--PATH_SUFFIXES
--include/
--DOC
--"OpenEXR headers path"
--)
--

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

2020-04-03 Thread Andreas Sturmlechner
commit: 31751552e64dc3cb4ee0f77e9dee6c0f0b172cb9
Author: Haelwenn (lanodan) Monnier  hacktivis  me>
AuthorDate: Fri Mar 27 03:27:26 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  3 20:06:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31751552

media-gfx/krita: dev-qt/qtgui[-gles2 => -gles2-only]

Signed-off-by: Haelwenn (lanodan) Monnier  hacktivis.me>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/{krita-4.2.8.2-r2.ebuild => krita-4.2.8.2-r3.ebuild} | 2 +-
 media-gfx/krita/krita-4.2.9.ebuild   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/krita/krita-4.2.8.2-r2.ebuild 
b/media-gfx/krita/krita-4.2.8.2-r3.ebuild
similarity index 98%
rename from media-gfx/krita/krita-4.2.8.2-r2.ebuild
rename to media-gfx/krita/krita-4.2.8.2-r3.ebuild
index 8b43e56307e..e23f6afea05 100644
--- a/media-gfx/krita/krita-4.2.8.2-r2.ebuild
+++ b/media-gfx/krita/krita-4.2.8.2-r3.ebuild
@@ -39,7 +39,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5=[-gles2]
+   >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5

diff --git a/media-gfx/krita/krita-4.2.9.ebuild 
b/media-gfx/krita/krita-4.2.9.ebuild
index 0ac0bce413e..91a902cc805 100644
--- a/media-gfx/krita/krita-4.2.9.ebuild
+++ b/media-gfx/krita/krita-4.2.9.ebuild
@@ -38,7 +38,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5=[-gles2]
+   >=dev-qt/qtgui-${QTMIN}:5=[-gles2-only]
>=dev-qt/qtnetwork-${QTMIN}:5
>=dev-qt/qtprintsupport-${QTMIN}:5
>=dev-qt/qtsvg-${QTMIN}:5



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

2020-04-03 Thread Andreas Sturmlechner
commit: a8bb0bded01f24e82706af39c4efbfafb9107d07
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Apr  2 13:10:30 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Apr  3 14:56:44 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8bb0bde

media-gfx/krita: 4.2.9 version bump

Package-Manager: Portage-2.3.96, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 .../krita/files/krita-4.2.9-ecm-findopenexr.patch  | 352 +
 media-gfx/krita/krita-4.2.9.ebuild | 121 +++
 3 files changed, 474 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 8cf7a3d4191..2bab9ddbf4a 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.2.8.2-patchset.tar.xz 13848 BLAKE2B 
86059e08833541b7d4dfda2c36cd1479809452171353b755ab3a264fa41fb99fc7ffacf064af3767aa095fda81aa9a2212b63c7242c72f94ca23a83b34c0502f
 SHA512 
79532700c967f94479af22e2fbd33c0b6d8c4295c872316935800b99258dceaedbac2b1c6314251d4d621c25a328ea602f49d415cc9275095bc3cd2f29756a61
 DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B 
fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4
 SHA512 
5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7
+DIST krita-4.2.9.tar.xz 170082028 BLAKE2B 
dafe300a1ef56a743272ce5936a0640949b7cfd37322e30e8a7ef17c4e51bf9dc8175d1443f9943836a229933ecb9a5d28249b8c90155165f3f0ee800e3cfa66
 SHA512 
66eef3d1b5647e62551276662ef4332f15abc022f1032f27a2ad695a8d2dc5fa758146492a9da2b8cbd4a52e47c576473029d2aa9728dea3bec869b8173f08c0

diff --git a/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch 
b/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch
new file mode 100644
index 000..0a7c7ca6984
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.9-ecm-findopenexr.patch
@@ -0,0 +1,352 @@
+From dae9ddcd45a95fd3b1ec3d42510556a671b08f15 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Tue, 31 Mar 2020 19:56:48 +0200
+Subject: [PATCH 1/2] Revert "Revert "Use e-c-m's findopenexr.cmake module""
+
+This reverts commit d978a33acebb724b862c38895788fc459111c364.
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt  |  2 +-
+ cmake/modules/FindOpenEXR.cmake | 98 -
+ 2 files changed, 1 insertion(+), 99 deletions(-)
+ delete mode 100644 cmake/modules/FindOpenEXR.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a7d9adaa3f..7a4211da13 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -251,7 +251,7 @@ endif(MINGW)
+ 
+ 
+ find_package(ECM 5.22 REQUIRED NOMODULE)
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} 
${ECM_KDE_MODULE_DIR})
++set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} 
${ECM_KDE_MODULE_DIR} ${ECM_FIND_MODULE_DIR})
+ include(ECMOptionalAddSubdirectory)
+ include(ECMAddAppIcon)
+ include(ECMSetupVersion)
+diff --git a/cmake/modules/FindOpenEXR.cmake b/cmake/modules/FindOpenEXR.cmake
+deleted file mode 100644
+index bb75a03bf0..00
+--- a/cmake/modules/FindOpenEXR.cmake
 /dev/null
+@@ -1,98 +0,0 @@
+-#
+-# Copyright 2016 Pixar
+-#
+-# Licensed under the Apache License, Version 2.0 (the "Apache License")
+-# with the following modification; you may not use this file except in
+-# compliance with the Apache License and the following modification to it:
+-# Section 6. Trademarks. is deleted and replaced with:
+-#
+-# 6. Trademarks. This License does not grant permission to use the trade
+-#names, trademarks, service marks, or product names of the Licensor
+-#and its affiliates, except as required to comply with Section 4(c) of
+-#the License and to reproduce the content of the NOTICE file.
+-#
+-# You may obtain a copy of the Apache License at
+-#
+-# http://www.apache.org/licenses/LICENSE-2.0
+-#
+-# Unless required by applicable law or agreed to in writing, software
+-# distributed under the Apache License with the above modification is
+-# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+-# KIND, either express or implied. See the Apache License for the specific
+-# language governing permissions and limitations under the Apache License.
+-#
+-
+-find_path(OPENEXR_INCLUDE_DIR
+-OpenEXR/half.h
+-HINTS
+-"${OPENEXR_LOCATION}"
+-"$ENV{OPENEXR_LOCATION}"
+-PATH_SUFFIXES
+-include/
+-DOC
+-"OpenEXR headers path"
+-)
+-
+-if(OPENEXR_INCLUDE_DIR)
+-  set(openexr_config_file "${OPENEXR_INCLUDE_DIR}/OpenEXR/OpenEXRConfig.h")
+-  if(EXISTS ${openexr_config_file})
+-  file(STRINGS
+-   ${openexr_config_file}
+-   TMP
+-   REGEX "#define OPENEXR_VERSION_STRING.*$")
+-  string(REGEX MATCHALL "[0-9.]+" OPENEXR_VERSION 

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

2020-03-11 Thread Georgy Yakovlev
commit: c05aef9bcc8ccc38088e6a69419dc94e091cff69
Author: Georgy Yakovlev  gentoo  org>
AuthorDate: Wed Mar 11 07:04:15 2020 +
Commit: Georgy Yakovlev  gentoo  org>
CommitDate: Wed Mar 11 07:24:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c05aef9b

media-gfx/krita: keyword on ~ppc64

Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev  gentoo.org>

 media-gfx/krita/krita-4.2.8.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-4.2.8.2-r2.ebuild 
b/media-gfx/krita/krita-4.2.8.2-r2.ebuild
index a5a59ceb2b3..8b43e56307e 100644
--- a/media-gfx/krita/krita-4.2.8.2-r2.ebuild
+++ b/media-gfx/krita/krita-4.2.8.2-r2.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz
https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz;
-   KEYWORDS="amd64 ~x86"
+   KEYWORDS="amd64 ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2020-02-23 Thread Andreas Sturmlechner
commit: f5e55d6354d0586aea81c078582ad2d35bf1f861
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 23 11:43:22 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 23 11:44:17 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5e55d63

media-gfx/krita: Drop 4.2.7.1-r1

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest|   1 -
 media-gfx/krita/krita-4.2.7.1-r1.ebuild | 118 
 2 files changed, 119 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 922d9f7bcba..8cf7a3d4191 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
-DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 
99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48
 SHA512 
28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35
 DIST krita-4.2.8.2-patchset.tar.xz 13848 BLAKE2B 
86059e08833541b7d4dfda2c36cd1479809452171353b755ab3a264fa41fb99fc7ffacf064af3767aa095fda81aa9a2212b63c7242c72f94ca23a83b34c0502f
 SHA512 
79532700c967f94479af22e2fbd33c0b6d8c4295c872316935800b99258dceaedbac2b1c6314251d4d621c25a328ea602f49d415cc9275095bc3cd2f29756a61
 DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B 
fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4
 SHA512 
5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7

diff --git a/media-gfx/krita/krita-4.2.7.1-r1.ebuild 
b/media-gfx/krita/krita-4.2.7.1-r1.ebuild
deleted file mode 100644
index 2d2e1b4c654..000
--- a/media-gfx/krita/krita-4.2.7.1-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/;
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff 
vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-   dev-cpp/eigen:3
-   dev-lang/perl
-   sys-devel/gettext
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtconcurrent)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui '-gles2' '' '5=')
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtx11extras)
-   $(add_qt_dep qtxml)
-   dev-libs/boost:=
-   dev-libs/quazip
-   $(python_gen_cond_dep '
-   dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
-   dev-python/sip[${PYTHON_MULTI_USEDEP}]
-   ')
-   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 )
-   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
-   )
-   pdf? ( app-text/poppler[qt5] )
-   qtmedia? ( $(add_qt_dep qtmultimedia) )
-   raw? ( media-libs/libraw:= )
-   tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-   vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-   !app-office/calligra:4[calligra_features_krita]
-   !app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.4-tests-optional.patch )
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-   kde5_pkg_setup
-}
-
-src_configure() {
-   # Prevent sandbox violation from FindPyQt5.py module
-   # See Gentoo-bug 655918
-  

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

2020-02-23 Thread Andreas Sturmlechner
commit: d379e734f1e21e914905bf1bd08343dd948715e3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 23 11:41:57 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 23 11:44:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d379e734

media-gfx/krita: 4.2.8.2-r2 amd64 stable

Closes: https://bugs.gentoo.org/709540
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/krita-4.2.8.2-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-4.2.8.2-r2.ebuild 
b/media-gfx/krita/krita-4.2.8.2-r2.ebuild
index 1507a29d7b4..a5a59ceb2b3 100644
--- a/media-gfx/krita/krita-4.2.8.2-r2.ebuild
+++ b/media-gfx/krita/krita-4.2.8.2-r2.ebuild
@@ -13,7 +13,7 @@ inherit ecm kde.org python-single-r1
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz
https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz;
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2020-02-23 Thread Andreas Sturmlechner
commit: f4170bd8879015c764add3d83b4755cb051349b1
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 23 11:42:33 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 23 11:44:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4170bd8

media-gfx/krita: Drop 4.2.8.2-r1

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/krita-4.2.8.2-r1.ebuild | 116 
 1 file changed, 116 deletions(-)

diff --git a/media-gfx/krita/krita-4.2.8.2-r1.ebuild 
b/media-gfx/krita/krita-4.2.8.2-r1.ebuild
deleted file mode 100644
index 2348b287dfb..000
--- a/media-gfx/krita/krita-4.2.8.2-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional-recursive"
-PYTHON_COMPAT=( python3_{6,7,8} )
-KFMIN=5.60.0
-QTMIN=5.12.3
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/;
-
-LICENSE="GPL-3"
-SLOT="5"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff 
vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-   dev-cpp/eigen:3
-   dev-lang/perl
-   sys-devel/gettext
-"
-RDEPEND="${PYTHON_DEPS}
-   dev-libs/boost:=
-   dev-libs/quazip
-   $(python_gen_cond_dep '
-   dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
-   dev-python/sip[${PYTHON_MULTI_USEDEP}]
-   ')
-   >=dev-qt/qtconcurrent-${QTMIN}:5
-   >=dev-qt/qtdbus-${QTMIN}:5
-   >=dev-qt/qtdeclarative-${QTMIN}:5
-   >=dev-qt/qtgui-${QTMIN}:5=[-gles2]
-   >=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/karchive-${KFMIN}: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 )
-   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
-   )
-   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 )
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-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=(
-   $(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
-}



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

2020-02-13 Thread Andreas Sturmlechner
commit: 1c927b809633b53c6917a8dbec3efa4a55d9db30
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Feb 12 00:27:36 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Feb 13 23:19:27 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c927b80

media-gfx/krita: Update HOMEPAGE, add patchset w/ crash/memleak(fixes)

Upstream has blocked release of 4.2.9 for py38 woes on Windows -_-
We will need 4.2.8.2 +4.2 branch fixes to avoid a crashy experience w/ Qt 5.14.
Rolling our own patchset then.

Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest|   1 +
 media-gfx/krita/krita-4.2.8.2-r2.ebuild | 122 
 2 files changed, 123 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index b2e46d8b84c..922d9f7bcba 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 
99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48
 SHA512 
28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35
+DIST krita-4.2.8.2-patchset.tar.xz 13848 BLAKE2B 
86059e08833541b7d4dfda2c36cd1479809452171353b755ab3a264fa41fb99fc7ffacf064af3767aa095fda81aa9a2212b63c7242c72f94ca23a83b34c0502f
 SHA512 
79532700c967f94479af22e2fbd33c0b6d8c4295c872316935800b99258dceaedbac2b1c6314251d4d621c25a328ea602f49d415cc9275095bc3cd2f29756a61
 DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B 
fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4
 SHA512 
5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7

diff --git a/media-gfx/krita/krita-4.2.8.2-r2.ebuild 
b/media-gfx/krita/krita-4.2.8.2-r2.ebuild
new file mode 100644
index 000..1507a29d7b4
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.8.2-r2.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional"
+PYTHON_COMPAT=( python3_{6,7,8} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz
+   https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz;
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/org.kde.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}"
+
+BDEPEND="
+   dev-cpp/eigen:3
+   dev-lang/perl
+   sys-devel/gettext
+"
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/boost:=
+   dev-libs/quazip
+   $(python_gen_cond_dep '
+   dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+   dev-python/sip[${PYTHON_MULTI_USEDEP}]
+   ')
+   >=dev-qt/qtconcurrent-${QTMIN}:5
+   >=dev-qt/qtdbus-${QTMIN}:5
+   >=dev-qt/qtdeclarative-${QTMIN}:5
+   >=dev-qt/qtgui-${QTMIN}:5=[-gles2]
+   >=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/karchive-${KFMIN}: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 )
+   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
+   )
+   pdf? ( app-text/poppler[qt5] )
+   qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
+   raw? ( media-libs/libraw:= )
+   tiff? ( media-libs/tiff:0 )
+"

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

2020-02-09 Thread Michał Górny
commit: 8685f40f0b8503b1e80e7e53df117506fe6f6ba2
Author: Michał Górny  gentoo  org>
AuthorDate: Fri Feb  7 15:04:22 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Feb  9 16:26:50 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8685f40f

media-gfx/krita: Switch to PYTHON_MULTI_USEDEP API

Signed-off-by: Michał Górny  gentoo.org>

 media-gfx/krita/{krita-4.2.7.1.ebuild => krita-4.2.7.1-r1.ebuild} | 8 +---
 media-gfx/krita/{krita-4.2.8.2.ebuild => krita-4.2.8.2-r1.ebuild} | 8 +---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/media-gfx/krita/krita-4.2.7.1.ebuild 
b/media-gfx/krita/krita-4.2.7.1-r1.ebuild
similarity index 95%
rename from media-gfx/krita/krita-4.2.7.1.ebuild
rename to media-gfx/krita/krita-4.2.7.1-r1.ebuild
index 4c9525d74aa..2d2e1b4c654 100644
--- a/media-gfx/krita/krita-4.2.7.1.ebuild
+++ b/media-gfx/krita/krita-4.2.7.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -50,8 +50,10 @@ COMMON_DEPEND="${PYTHON_DEPS}
$(add_qt_dep qtxml)
dev-libs/boost:=
dev-libs/quazip
-   dev-python/PyQt5[${PYTHON_USEDEP}]
-   dev-python/sip[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+   dev-python/sip[${PYTHON_MULTI_USEDEP}]
+   ')
media-gfx/exiv2:=
media-libs/lcms
media-libs/libpng:0=

diff --git a/media-gfx/krita/krita-4.2.8.2.ebuild 
b/media-gfx/krita/krita-4.2.8.2-r1.ebuild
similarity index 95%
rename from media-gfx/krita/krita-4.2.8.2.ebuild
rename to media-gfx/krita/krita-4.2.8.2-r1.ebuild
index 99703d1a212..2348b287dfb 100644
--- a/media-gfx/krita/krita-4.2.8.2.ebuild
+++ b/media-gfx/krita/krita-4.2.8.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,8 +31,10 @@ BDEPEND="
 RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=
dev-libs/quazip
-   dev-python/PyQt5[${PYTHON_USEDEP}]
-   dev-python/sip[${PYTHON_USEDEP}]
+   $(python_gen_cond_dep '
+   dev-python/PyQt5[${PYTHON_MULTI_USEDEP}]
+   dev-python/sip[${PYTHON_MULTI_USEDEP}]
+   ')
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
>=dev-qt/qtdeclarative-${QTMIN}:5



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

2019-12-01 Thread Andreas Sturmlechner
commit: 622e258884cd3be61eaf2ae569b18574614636b3
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Nov 30 17:01:46 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Dec  1 19:29:48 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=622e2588

media-gfx/krita: 4.2.8.2 version bump, python3_8

Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest |   1 +
 media-gfx/krita/krita-4.2.8.2.ebuild | 114 +++
 2 files changed, 115 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index e27248b96e5..b2e46d8b84c 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1 +1,2 @@
 DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 
99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48
 SHA512 
28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35
+DIST krita-4.2.8.2.tar.xz 169994064 BLAKE2B 
fc390db9e3aaf3f4355e600a98ea479aa510895c26cb82e8800fbff64031bab7a26e0c37d6d274e6397a38c1bc33cff6b48cb5a7c6e61b56579e92e33279b1c4
 SHA512 
5482ebd62c530764b43439d6782fa7e1793877657620967ea0f6cdad166e3ff508b36cd04bd99c192d35a237c4a0da08477069e333ebaf2093785e207402dea7

diff --git a/media-gfx/krita/krita-4.2.8.2.ebuild 
b/media-gfx/krita/krita-4.2.8.2.ebuild
new file mode 100644
index 000..8d45b1ca065
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.8.2.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="forceoptional-recursive"
+PYTHON_COMPAT=( python3_{6,7,8} )
+KFMIN=5.60.0
+QTMIN=5.12.3
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/$(ver_cut 1-3)/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/;
+
+LICENSE="GPL-3"
+SLOT="5"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff 
vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+   dev-cpp/eigen:3
+   dev-lang/perl
+   sys-devel/gettext
+"
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/boost:=
+   dev-libs/quazip
+   dev-python/PyQt5[${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]
+   >=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/karchive-${KFMIN}: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 )
+   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
+   )
+   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 )
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+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=(
+   $(cmake-utils_use_find_package color-management OCIO)
+   $(cmake-utils_use_find_package fftw FFTW3)
+   $(cmake-utils_use_find_package gif GIF)
+   $(cmake-utils_use_find_package gsl GSL)
+   $(cmake-utils_use_find_package heif HEIF)
+   $(cmake-utils_use_find_package jpeg 

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

2019-11-15 Thread Andreas Sturmlechner
commit: 952ce9a0b17778e2341199167661a106eb073665
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Nov 15 14:25:57 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Nov 15 17:37:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=952ce9a0

media-gfx/krita: Drop 4.1.8-r1

Package-Manager: Portage-2.3.79, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 .../krita/files/krita-4.0.3-tests-optional.patch   | 324 -
 .../krita-4.1.8-fix-pre-5.12-tablet-support.patch  |  49 
 ...-qt-5.12-fix-unsupported-composition-mode.patch |  38 ---
 media-gfx/krita/krita-4.1.8-r1.ebuild  | 123 
 5 files changed, 535 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 6fff880799d..e27248b96e5 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1 @@
-DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
 DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 
99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48
 SHA512 
28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35

diff --git a/media-gfx/krita/files/krita-4.0.3-tests-optional.patch 
b/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
deleted file mode 100644
index c9e3ddc2aea..000
--- a/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
+++ /dev/null
@@ -1,324 +0,0 @@
-Autogenerated by KDE_TEST=forceoptional-recursive and edited.
-
 a/plugins/paintops/libpaintop/CMakeLists.txt   2018-08-29 
18:17:38.843385842 +0200
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt   2018-08-29 
18:17:38.846385865 +0200
-@@ -104,4 +104,6 @@
- install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
 a/plugins/paintops/defaultpaintops/CMakeLists.txt  2018-08-29 
18:17:38.851385903 +0200
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt  2018-08-29 
18:17:38.854385926 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(brush/tests)
-+endif()
- 
- include_directories(brush
- duplicate
 a/plugins/impex/libkra/CMakeLists.txt  2018-08-29 18:17:38.858385956 
+0200
-+++ b/plugins/impex/libkra/CMakeLists.txt  2018-08-29 18:17:38.861385978 
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritalibkra_LIB_SRCS
- kis_colorize_dom_utils.cpp
 a/plugins/impex/exr/CMakeLists.txt 2018-08-29 18:17:38.866386016 +0200
-+++ b/plugins/impex/exr/CMakeLists.txt 2018-08-29 18:17:38.869386039 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
- 
 a/plugins/impex/svg/CMakeLists.txt 2018-08-29 18:17:38.874386077 +0200
-+++ b/plugins/impex/svg/CMakeLists.txt 2018-08-29 18:17:38.878386107 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritasvgimport_SOURCES
- kis_svg_import.cc
 a/plugins/impex/jpeg/CMakeLists.txt2018-08-29 18:17:38.883386145 
+0200
-+++ b/plugins/impex/jpeg/CMakeLists.txt2018-08-29 18:17:38.887386175 
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
- 
 a/plugins/impex/heightmap/CMakeLists.txt   2018-08-29 18:17:38.892386213 
+0200
-+++ b/plugins/impex/heightmap/CMakeLists.txt   2018-08-29 18:17:38.896386243 
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
 a/plugins/impex/psd/CMakeLists.txt 2018-08-29 18:17:38.901386281 +0200
-+++ b/plugins/impex/psd/CMakeLists.txt 2018-08-29 18:17:38.904386304 +0200
-@@ -1,5 +1,7 @@
- if (NOT MSVC AND NOT APPLE)
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
 a/plugins/impex/ppm/CMakeLists.txt 2018-08-29 18:17:38.909386342 +0200
-+++ b/plugins/impex/ppm/CMakeLists.txt 2018-08-29 18:17:38.913386372 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
 a/plugins/impex/png/CMakeLists.txt 2018-08-29 18:17:38.918386410 +0200
-+++ b/plugins/impex/png/CMakeLists.txt 2018-08-29 18:17:38.922386440 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)

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

2019-11-15 Thread Agostino Sarubbo
commit: 9f33ef87ef2e2dcd9f9ea3ee6f91f612396321d6
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Fri Nov 15 13:48:32 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Fri Nov 15 13:48:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f33ef87

media-gfx/krita: amd64 stable wrt bug #694508

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/krita/krita-4.2.7.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-4.2.7.1.ebuild 
b/media-gfx/krita/krita-4.2.7.1.ebuild
index 30b6159d8dc..4f1797aa006 100644
--- a/media-gfx/krita/krita-4.2.7.1.ebuild
+++ b/media-gfx/krita/krita-4.2.7.1.ebuild
@@ -10,7 +10,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2019-10-10 Thread Andreas Sturmlechner
commit: cffa51919dc5b43cc1c254c61a1b6d1812ade664
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Oct  8 19:37:34 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct 10 18:57:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cffa5191

media-gfx/krita: Drop 4.2.6

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 media-gfx/krita/krita-4.2.6.ebuild | 117 -
 2 files changed, 118 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 3aefaca9e94..6fff880799d 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.6.tar.xz 164332440 BLAKE2B 
d60c87743de77d300b2c2c9d1f1b3a31b238e8ef434981d3762713094eeebbe5e51547987c981b9f50d82f2363881ec74ef488b35d27cd5271d568987607557e
 SHA512 
c6c6bb0b2d46b421c6edd38427f7a71636c78267413a4265a61123509ebac8f24d981ce5b5540f0813e26b89e655d44c2cc32395694161eb925f2789b0e8119e
 DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 
99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48
 SHA512 
28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35

diff --git a/media-gfx/krita/krita-4.2.6.ebuild 
b/media-gfx/krita/krita-4.2.6.ebuild
deleted file mode 100644
index 0cb6e37c988..000
--- a/media-gfx/krita/krita-4.2.6.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/;
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff 
vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-   dev-cpp/eigen:3
-   dev-lang/perl
-   sys-devel/gettext
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtconcurrent)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui '-gles2' '' '5=')
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtx11extras)
-   $(add_qt_dep qtxml)
-   dev-libs/boost:=
-   dev-libs/quazip
-   dev-python/PyQt5[${PYTHON_USEDEP}]
-   dev-python/sip[${PYTHON_USEDEP}]
-   media-gfx/exiv2:=
-   media-libs/lcms
-   media-libs/libpng:0=
-   sys-libs/zlib
-   virtual/opengl
-   x11-libs/libX11
-   x11-libs/libxcb
-   x11-libs/libXi
-   color-management? ( media-libs/opencolorio )
-   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
-   )
-   pdf? ( app-text/poppler[qt5] )
-   qtmedia? ( $(add_qt_dep qtmultimedia) )
-   raw? ( media-libs/libraw:= )
-   tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-   vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-   !app-office/calligra:4[calligra_features_krita]
-   !app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.4-tests-optional.patch )
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-   kde5_pkg_setup
-}
-
-src_configure() {
-   # Prevent sandbox violation from FindPyQt5.py module
-   # See Gentoo-bug 655918
-   addpredict /dev/dri
-
-   local mycmakeargs=(
-   

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

2019-10-03 Thread Andreas Sturmlechner
commit: 1a4007e0a43aee12c1aa52aaf840cabccfee7c3c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Oct  3 19:03:25 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Oct  3 20:38:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a4007e0

media-gfx/krita: 4.2.7.1 version bump

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest |   1 +
 media-gfx/krita/krita-4.2.7.1.ebuild | 116 +++
 2 files changed, 117 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2888c93e601..3aefaca9e94 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
 DIST krita-4.2.6.tar.xz 164332440 BLAKE2B 
d60c87743de77d300b2c2c9d1f1b3a31b238e8ef434981d3762713094eeebbe5e51547987c981b9f50d82f2363881ec74ef488b35d27cd5271d568987607557e
 SHA512 
c6c6bb0b2d46b421c6edd38427f7a71636c78267413a4265a61123509ebac8f24d981ce5b5540f0813e26b89e655d44c2cc32395694161eb925f2789b0e8119e
+DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 
99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48
 SHA512 
28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35

diff --git a/media-gfx/krita/krita-4.2.7.1.ebuild 
b/media-gfx/krita/krita-4.2.7.1.ebuild
new file mode 100644
index 000..30b6159d8dc
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.7.1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/;
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff 
vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+   dev-cpp/eigen:3
+   dev-lang/perl
+   sys-devel/gettext
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui '-gles2' '' '5=')
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtx11extras)
+   $(add_qt_dep qtxml)
+   dev-libs/boost:=
+   dev-libs/quazip
+   dev-python/PyQt5[${PYTHON_USEDEP}]
+   dev-python/sip[${PYTHON_USEDEP}]
+   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 )
+   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
+   )
+   pdf? ( app-text/poppler[qt5] )
+   qtmedia? ( $(add_qt_dep qtmultimedia) )
+   raw? ( media-libs/libraw:= )
+   tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+   vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+   !app-office/calligra:4[calligra_features_krita]
+   !app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.4-tests-optional.patch )
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+   kde5_pkg_setup
+}
+
+src_configure() {
+   # Prevent sandbox violation from FindPyQt5.py module
+   # See Gentoo-bug 655918
+   addpredict /dev/dri
+
+   local mycmakeargs=(
+   

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

2019-09-15 Thread Andreas Sturmlechner
commit: 6a25e66848d9ccbba45f22e7722bf02f72dfef89
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Sep 15 16:28:51 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Sep 15 16:51:41 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a25e668

media-gfx/krita: Drop 4.2.5

Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 media-gfx/krita/krita-4.2.5.ebuild | 117 -
 2 files changed, 118 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 78e58cd5158..2888c93e601 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.5.tar.xz 170060232 BLAKE2B 
fba124653edad23826fd6d4d932cb1ea4c63450d460bebf2b2e2d9167e437331a31d76b19d57d9f15f603195c0eea367463ea6d9e610e74d0844bb80d21f0741
 SHA512 
5134c0a889cb039c5253759965acfba5cef0c431e8230236c1288e0253628feba52a493eaa42c93adb1716014c17818232294c1c90ade760ad89940833599d9e
 DIST krita-4.2.6.tar.xz 164332440 BLAKE2B 
d60c87743de77d300b2c2c9d1f1b3a31b238e8ef434981d3762713094eeebbe5e51547987c981b9f50d82f2363881ec74ef488b35d27cd5271d568987607557e
 SHA512 
c6c6bb0b2d46b421c6edd38427f7a71636c78267413a4265a61123509ebac8f24d981ce5b5540f0813e26b89e655d44c2cc32395694161eb925f2789b0e8119e

diff --git a/media-gfx/krita/krita-4.2.5.ebuild 
b/media-gfx/krita/krita-4.2.5.ebuild
deleted file mode 100644
index 0cb6e37c988..000
--- a/media-gfx/krita/krita-4.2.5.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/;
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff 
vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-   dev-cpp/eigen:3
-   dev-lang/perl
-   sys-devel/gettext
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtconcurrent)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui '-gles2' '' '5=')
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtx11extras)
-   $(add_qt_dep qtxml)
-   dev-libs/boost:=
-   dev-libs/quazip
-   dev-python/PyQt5[${PYTHON_USEDEP}]
-   dev-python/sip[${PYTHON_USEDEP}]
-   media-gfx/exiv2:=
-   media-libs/lcms
-   media-libs/libpng:0=
-   sys-libs/zlib
-   virtual/opengl
-   x11-libs/libX11
-   x11-libs/libxcb
-   x11-libs/libXi
-   color-management? ( media-libs/opencolorio )
-   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
-   )
-   pdf? ( app-text/poppler[qt5] )
-   qtmedia? ( $(add_qt_dep qtmultimedia) )
-   raw? ( media-libs/libraw:= )
-   tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-   vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-   !app-office/calligra:4[calligra_features_krita]
-   !app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.4-tests-optional.patch )
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-   kde5_pkg_setup
-}
-
-src_configure() {
-   # Prevent sandbox violation from FindPyQt5.py module
-   # See Gentoo-bug 655918
-   addpredict /dev/dri
-
-   local mycmakeargs=(
-   

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

2019-09-11 Thread Andreas Sturmlechner
commit: ab517989e74ca85a8245565f498cdfc991f535e8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Sep 11 08:22:54 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Sep 11 09:08:25 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab517989

media-gfx/krita: 4.2.6 version bump

Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/krita-4.2.6.ebuild | 117 +
 2 files changed, 118 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 406296aa399..78e58cd5158 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
 DIST krita-4.2.5.tar.xz 170060232 BLAKE2B 
fba124653edad23826fd6d4d932cb1ea4c63450d460bebf2b2e2d9167e437331a31d76b19d57d9f15f603195c0eea367463ea6d9e610e74d0844bb80d21f0741
 SHA512 
5134c0a889cb039c5253759965acfba5cef0c431e8230236c1288e0253628feba52a493eaa42c93adb1716014c17818232294c1c90ade760ad89940833599d9e
+DIST krita-4.2.6.tar.xz 164332440 BLAKE2B 
d60c87743de77d300b2c2c9d1f1b3a31b238e8ef434981d3762713094eeebbe5e51547987c981b9f50d82f2363881ec74ef488b35d27cd5271d568987607557e
 SHA512 
c6c6bb0b2d46b421c6edd38427f7a71636c78267413a4265a61123509ebac8f24d981ce5b5540f0813e26b89e655d44c2cc32395694161eb925f2789b0e8119e

diff --git a/media-gfx/krita/krita-4.2.6.ebuild 
b/media-gfx/krita/krita-4.2.6.ebuild
new file mode 100644
index 000..0cb6e37c988
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.6.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/;
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff 
vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+   dev-cpp/eigen:3
+   dev-lang/perl
+   sys-devel/gettext
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui '-gles2' '' '5=')
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtx11extras)
+   $(add_qt_dep qtxml)
+   dev-libs/boost:=
+   dev-libs/quazip
+   dev-python/PyQt5[${PYTHON_USEDEP}]
+   dev-python/sip[${PYTHON_USEDEP}]
+   media-gfx/exiv2:=
+   media-libs/lcms
+   media-libs/libpng:0=
+   sys-libs/zlib
+   virtual/opengl
+   x11-libs/libX11
+   x11-libs/libxcb
+   x11-libs/libXi
+   color-management? ( media-libs/opencolorio )
+   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
+   )
+   pdf? ( app-text/poppler[qt5] )
+   qtmedia? ( $(add_qt_dep qtmultimedia) )
+   raw? ( media-libs/libraw:= )
+   tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+   vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+   !app-office/calligra:4[calligra_features_krita]
+   !app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.4-tests-optional.patch )
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+   kde5_pkg_setup
+}
+
+src_configure() {
+   # Prevent sandbox violation from FindPyQt5.py module
+   # See Gentoo-bug 655918
+   addpredict /dev/dri
+
+   local mycmakeargs=(
+   

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

2019-08-06 Thread Andreas Sturmlechner
commit: 0de6b7c5fddc5aeb04362b95ad9379ce11ff3200
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug  6 18:37:23 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug  6 20:10:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0de6b7c5

media-gfx/krita: Drop 4.2.4

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 media-gfx/krita/krita-4.2.4.ebuild | 117 -
 2 files changed, 118 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 13ab2b3704c..406296aa399 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.4.tar.gz 246227960 BLAKE2B 
94513a835526ee79c0747ed8c6004666b549d7070c02ad82800555282f319e5aa4dc1f35dafc6b4179284b244c8c80367b453548f5c8cd585154259a051a
 SHA512 
c778653f8e72724d16322405fffdff5b82418c5a19021ccbada6a15389afd58f9d9017bc562eb5d91b0d4e10587bca1e616fc7ecc9ec7dbf82fae5247b81ea5e
 DIST krita-4.2.5.tar.xz 170060232 BLAKE2B 
fba124653edad23826fd6d4d932cb1ea4c63450d460bebf2b2e2d9167e437331a31d76b19d57d9f15f603195c0eea367463ea6d9e610e74d0844bb80d21f0741
 SHA512 
5134c0a889cb039c5253759965acfba5cef0c431e8230236c1288e0253628feba52a493eaa42c93adb1716014c17818232294c1c90ade760ad89940833599d9e

diff --git a/media-gfx/krita/krita-4.2.4.ebuild 
b/media-gfx/krita/krita-4.2.4.ebuild
deleted file mode 100644
index 62966b4d812..000
--- a/media-gfx/krita/krita-4.2.4.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/;
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff 
vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-   dev-cpp/eigen:3
-   dev-lang/perl
-   sys-devel/gettext
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtconcurrent)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui '-gles2' '' '5=')
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtx11extras)
-   $(add_qt_dep qtxml)
-   dev-libs/boost:=
-   dev-libs/quazip
-   dev-python/PyQt5[${PYTHON_USEDEP}]
-   dev-python/sip[${PYTHON_USEDEP}]
-   media-gfx/exiv2:=
-   media-libs/lcms
-   media-libs/libpng:0=
-   sys-libs/zlib
-   virtual/opengl
-   x11-libs/libX11
-   x11-libs/libxcb
-   x11-libs/libXi
-   color-management? ( media-libs/opencolorio )
-   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
-   )
-   pdf? ( app-text/poppler[qt5] )
-   qtmedia? ( $(add_qt_dep qtmultimedia) )
-   raw? ( media-libs/libraw:= )
-   tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-   vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-   !app-office/calligra:4[calligra_features_krita]
-   !app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${P}-tests-optional.patch )
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-   kde5_pkg_setup
-}
-
-src_configure() {
-   # Prevent sandbox violation from FindPyQt5.py module
-   # See Gentoo-bug 655918
-   addpredict /dev/dri
-
-   local mycmakeargs=(
-   

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

2019-08-04 Thread Andreas Sturmlechner
commit: 97214867384bc1d93477c189fa7c79317a11d092
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Aug  4 19:11:23 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Aug  4 22:06:58 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97214867

media-gfx/krita: 4.2.5 version bump

Closes: https://bugs.gentoo.org/691316
Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/krita-4.2.5.ebuild | 117 +
 2 files changed, 118 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index a81da4ec9a4..13ab2b3704c 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
 DIST krita-4.2.4.tar.gz 246227960 BLAKE2B 
94513a835526ee79c0747ed8c6004666b549d7070c02ad82800555282f319e5aa4dc1f35dafc6b4179284b244c8c80367b453548f5c8cd585154259a051a
 SHA512 
c778653f8e72724d16322405fffdff5b82418c5a19021ccbada6a15389afd58f9d9017bc562eb5d91b0d4e10587bca1e616fc7ecc9ec7dbf82fae5247b81ea5e
+DIST krita-4.2.5.tar.xz 170060232 BLAKE2B 
fba124653edad23826fd6d4d932cb1ea4c63450d460bebf2b2e2d9167e437331a31d76b19d57d9f15f603195c0eea367463ea6d9e610e74d0844bb80d21f0741
 SHA512 
5134c0a889cb039c5253759965acfba5cef0c431e8230236c1288e0253628feba52a493eaa42c93adb1716014c17818232294c1c90ade760ad89940833599d9e

diff --git a/media-gfx/krita/krita-4.2.5.ebuild 
b/media-gfx/krita/krita-4.2.5.ebuild
new file mode 100644
index 000..0cb6e37c988
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.5.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/;
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff 
vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+   dev-cpp/eigen:3
+   dev-lang/perl
+   sys-devel/gettext
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui '-gles2' '' '5=')
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtx11extras)
+   $(add_qt_dep qtxml)
+   dev-libs/boost:=
+   dev-libs/quazip
+   dev-python/PyQt5[${PYTHON_USEDEP}]
+   dev-python/sip[${PYTHON_USEDEP}]
+   media-gfx/exiv2:=
+   media-libs/lcms
+   media-libs/libpng:0=
+   sys-libs/zlib
+   virtual/opengl
+   x11-libs/libX11
+   x11-libs/libxcb
+   x11-libs/libXi
+   color-management? ( media-libs/opencolorio )
+   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
+   )
+   pdf? ( app-text/poppler[qt5] )
+   qtmedia? ( $(add_qt_dep qtmultimedia) )
+   raw? ( media-libs/libraw:= )
+   tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+   vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+   !app-office/calligra:4[calligra_features_krita]
+   !app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.4-tests-optional.patch )
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+   kde5_pkg_setup
+}
+
+src_configure() {
+   # Prevent sandbox violation from FindPyQt5.py module
+   # See Gentoo-bug 655918
+   addpredict /dev/dri
+
+   

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

2019-07-31 Thread Andreas Sturmlechner
commit: 7c5b52a734a337fa6afe2e4ab1e5780aacdc8f25
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jul 31 09:25:46 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 31 09:45:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c5b52a7

media-gfx/krita: Drop 4.2.3

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 .../krita/files/krita-4.2.2-tests-optional.patch   | 405 -
 media-gfx/krita/krita-4.2.3.ebuild | 118 --
 3 files changed, 524 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 8865613c448..a81da4ec9a4 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.3.tar.gz 246136588 BLAKE2B 
1d7a371f7aeb8cf3747adcd4ab681b0ecf849e64ace16b456e9c2b8ed5fd958be895fd64c623931e47ae81bdf35b3e54161ecb204501f48c97b35ac2dcb8ac59
 SHA512 
6493740183b360a939d85cc7bc646cb173dc923a3dc63966d0f178bf308675ffead01d3bfefeeffb376f5efd7d90ee7f271b3ff412787123113dd125cc022ab5
 DIST krita-4.2.4.tar.gz 246227960 BLAKE2B 
94513a835526ee79c0747ed8c6004666b549d7070c02ad82800555282f319e5aa4dc1f35dafc6b4179284b244c8c80367b453548f5c8cd585154259a051a
 SHA512 
c778653f8e72724d16322405fffdff5b82418c5a19021ccbada6a15389afd58f9d9017bc562eb5d91b0d4e10587bca1e616fc7ecc9ec7dbf82fae5247b81ea5e

diff --git a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch 
b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
deleted file mode 100644
index 2df715be04f..000
--- a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
+++ /dev/null
@@ -1,405 +0,0 @@
 a/plugins/filters/CMakeLists.txt   2019-06-27 18:48:55.049823682 +0200
-+++ b/plugins/filters/CMakeLists.txt   2019-06-27 18:48:55.056823729 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- add_subdirectory( blur )
- add_subdirectory( colors )
- add_subdirectory( colorsfilters )
 a/plugins/filters/unsharp/CMakeLists.txt   2019-06-27 18:48:55.063823776 
+0200
-+++ b/plugins/filters/unsharp/CMakeLists.txt   2019-06-27 18:48:55.069823817 
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaunsharpfilter_SOURCES
- unsharp.cpp
 a/plugins/paintops/defaultpaintops/CMakeLists.txt  2019-06-27 
18:48:55.077823871 +0200
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt  2019-06-27 
18:48:55.084823918 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(brush/tests)
-+endif()
- 
- include_directories(brush
- duplicate
 a/plugins/paintops/libpaintop/CMakeLists.txt   2019-06-27 
18:48:55.092823972 +0200
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt   2019-06-27 
18:48:55.098824013 +0200
-@@ -104,4 +104,6 @@
- install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
 a/plugins/dockers/lut/CMakeLists.txt   2019-06-27 18:48:55.105824060 
+0200
-+++ b/plugins/dockers/lut/CMakeLists.txt   2019-06-27 18:48:55.112824107 
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
- ${OCIO_INCLUDE_DIR}
 a/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.120824161 
+0200
-+++ b/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.124824188 
+0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- set(KRITA_ANIMATIONDOCKER_SOURCES
 a/plugins/extensions/qmic/CMakeLists.txt   2019-06-27 18:48:55.132824242 
+0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt   2019-06-27 18:48:55.136824270 
+0200
-@@ -20,4 +20,6 @@
- target_link_libraries(kritaqmic kritaui)
- install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
 a/plugins/tools/basictools/CMakeLists.txt  2019-06-27 18:48:55.141824303 
+0200
-+++ b/plugins/tools/basictools/CMakeLists.txt  2019-06-27 18:48:55.146824337 
+0200
-@@ -1,5 +1,7 @@
- if (NOT APPLE)
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif ()
- 
- set(kritadefaulttools_SOURCES
 a/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 
18:48:55.151824371 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-27 
18:48:55.155824398 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--add_subdirectory(tests)
-+if(BUILD_TESTING)

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

2019-07-31 Thread Andreas Sturmlechner
commit: f3086ea525167697941c8a3edc8f0c0480679e6c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Jul 31 09:06:12 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jul 31 09:45:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3086ea5

media-gfx/krita: 4.2.4 version bump

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 .../krita/files/krita-4.2.4-tests-optional.patch   | 399 +
 media-gfx/krita/krita-4.2.4.ebuild | 117 ++
 3 files changed, 517 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2f9aa5dd8df..8865613c448 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
 DIST krita-4.2.3.tar.gz 246136588 BLAKE2B 
1d7a371f7aeb8cf3747adcd4ab681b0ecf849e64ace16b456e9c2b8ed5fd958be895fd64c623931e47ae81bdf35b3e54161ecb204501f48c97b35ac2dcb8ac59
 SHA512 
6493740183b360a939d85cc7bc646cb173dc923a3dc63966d0f178bf308675ffead01d3bfefeeffb376f5efd7d90ee7f271b3ff412787123113dd125cc022ab5
+DIST krita-4.2.4.tar.gz 246227960 BLAKE2B 
94513a835526ee79c0747ed8c6004666b549d7070c02ad82800555282f319e5aa4dc1f35dafc6b4179284b244c8c80367b453548f5c8cd585154259a051a
 SHA512 
c778653f8e72724d16322405fffdff5b82418c5a19021ccbada6a15389afd58f9d9017bc562eb5d91b0d4e10587bca1e616fc7ecc9ec7dbf82fae5247b81ea5e

diff --git a/media-gfx/krita/files/krita-4.2.4-tests-optional.patch 
b/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
new file mode 100644
index 000..2f13c999b67
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
@@ -0,0 +1,399 @@
+--- a/plugins/filters/CMakeLists.txt   2019-07-31 11:22:19.572862843 +0200
 b/plugins/filters/CMakeLists.txt   2019-07-31 11:22:19.576862870 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+--- a/plugins/filters/unsharp/CMakeLists.txt   2019-07-31 11:22:19.582862912 
+0200
 b/plugins/filters/unsharp/CMakeLists.txt   2019-07-31 11:22:19.587862947 
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaunsharpfilter_SOURCES
+ unsharp.cpp
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt  2019-07-31 
11:22:19.592862983 +0200
 b/plugins/paintops/defaultpaintops/CMakeLists.txt  2019-07-31 
11:22:19.595863003 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+ 
+ include_directories(brush
+ duplicate
+--- a/plugins/paintops/libpaintop/CMakeLists.txt   2019-07-31 
11:22:19.600863038 +0200
 b/plugins/paintops/libpaintop/CMakeLists.txt   2019-07-31 
11:22:19.603863060 +0200
+@@ -104,4 +104,6 @@
+ install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/dockers/lut/CMakeLists.txt   2019-07-31 11:22:19.608863094 
+0200
 b/plugins/dockers/lut/CMakeLists.txt   2019-07-31 11:22:19.613863129 
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+ ${OCIO_INCLUDE_DIR}
+--- a/plugins/dockers/animation/CMakeLists.txt 2019-07-31 11:22:19.619863171 
+0200
 b/plugins/dockers/animation/CMakeLists.txt 2019-07-31 11:22:19.624863206 
+0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ set(KRITA_ANIMATIONDOCKER_SOURCES
+--- a/plugins/extensions/qmic/CMakeLists.txt   2019-07-31 11:22:19.630863248 
+0200
 b/plugins/extensions/qmic/CMakeLists.txt   2019-07-31 11:22:19.635863283 
+0200
+@@ -20,4 +20,6 @@
+ target_link_libraries(kritaqmic kritaui)
+ install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/tools/basictools/CMakeLists.txt  2019-07-31 11:22:19.641863325 
+0200
 b/plugins/tools/basictools/CMakeLists.txt  2019-07-31 11:22:19.645863353 
+0200
+@@ -1,5 +1,7 @@
+ if (NOT APPLE)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif ()
+ 
+ set(kritadefaulttools_SOURCES
+--- a/plugins/tools/tool_transform2/CMakeLists.txt 2019-07-31 
11:22:19.650863388 +0200
 b/plugins/tools/tool_transform2/CMakeLists.txt 2019-07-31 
11:22:19.653863409 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-add_subdirectory(tests)
++

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

2019-07-16 Thread Andreas Sturmlechner
commit: 6d0bd1936c064b5f2a4a215a6872ad9952d42cf6
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jul 16 10:28:47 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jul 16 11:00:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d0bd193

media-gfx/krita: Drop 4.2.2

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 media-gfx/krita/files/krita-4.2.2-fixuifiles.patch |  25 -
 media-gfx/krita/krita-4.2.2.ebuild | 121 -
 3 files changed, 147 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 349c094aea4..2f9aa5dd8df 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.2.tar.gz 246075662 BLAKE2B 
0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e
 SHA512 
7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096
 DIST krita-4.2.3.tar.gz 246136588 BLAKE2B 
1d7a371f7aeb8cf3747adcd4ab681b0ecf849e64ace16b456e9c2b8ed5fd958be895fd64c623931e47ae81bdf35b3e54161ecb204501f48c97b35ac2dcb8ac59
 SHA512 
6493740183b360a939d85cc7bc646cb173dc923a3dc63966d0f178bf308675ffead01d3bfefeeffb376f5efd7d90ee7f271b3ff412787123113dd125cc022ab5

diff --git a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch 
b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
deleted file mode 100644
index 1703386a3c7..000
--- a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e46ad1f917705d84dc5562c2f261a06eb70a57b9 Mon Sep 17 00:00:00 2001
-From: Pino Toscano 
-Date: Tue, 25 Jun 2019 06:57:40 +0200
-Subject: fixuifiles
-

- libs/widgetutils/tests/dialogsavertestwidget.ui | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/libs/widgetutils/tests/dialogsavertestwidget.ui 
b/libs/widgetutils/tests/dialogsavertestwidget.ui
-index 66e70b3..ba0f54f 100644
 a/libs/widgetutils/tests/dialogsavertestwidget.ui
-+++ b/libs/widgetutils/tests/dialogsavertestwidget.ui
-@@ -10,9 +10,6 @@
- 300
-
-   
--  
--   Form
--  
-   
-
- 
--- 
-cgit v1.1

diff --git a/media-gfx/krita/krita-4.2.2.ebuild 
b/media-gfx/krita/krita-4.2.2.ebuild
deleted file mode 100644
index 5a7e08cbf68..000
--- a/media-gfx/krita/krita-4.2.2.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.12.3"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/;
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff 
vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-   dev-cpp/eigen:3
-   dev-lang/perl
-   sys-devel/gettext
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtconcurrent)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui '-gles2' '' '5=')
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtx11extras)
-   $(add_qt_dep qtxml)
-   dev-libs/boost:=
-   dev-libs/quazip
-   dev-python/PyQt5[${PYTHON_USEDEP}]
-   dev-python/sip[${PYTHON_USEDEP}]
-   media-gfx/exiv2:=
-   media-libs/lcms
-   media-libs/libpng:0=
-   sys-libs/zlib
-   virtual/opengl
-   x11-libs/libX11
-   x11-libs/libxcb
-   x11-libs/libXi
-   color-management? ( media-libs/opencolorio )
-   fftw? ( sci-libs/fftw:3.0= )
-   gif? ( 

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

2019-07-13 Thread Andreas Sturmlechner
commit: 994ad05cbb71a2e8c5c7b4dbcc60605568fe8706
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Jul 12 18:37:36 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jul 13 06:50:08 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=994ad05c

media-gfx/krita: 4.2.3 version bump

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/krita-4.2.3.ebuild | 118 +
 2 files changed, 119 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index e5583f50a1c..349c094aea4 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
 DIST krita-4.2.2.tar.gz 246075662 BLAKE2B 
0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e
 SHA512 
7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096
+DIST krita-4.2.3.tar.gz 246136588 BLAKE2B 
1d7a371f7aeb8cf3747adcd4ab681b0ecf849e64ace16b456e9c2b8ed5fd958be895fd64c623931e47ae81bdf35b3e54161ecb204501f48c97b35ac2dcb8ac59
 SHA512 
6493740183b360a939d85cc7bc646cb173dc923a3dc63966d0f178bf308675ffead01d3bfefeeffb376f5efd7d90ee7f271b3ff412787123113dd125cc022ab5

diff --git a/media-gfx/krita/krita-4.2.3.ebuild 
b/media-gfx/krita/krita-4.2.3.ebuild
new file mode 100644
index 000..b1daa80676c
--- /dev/null
+++ b/media-gfx/krita/krita-4.2.3.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.12.3"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
+HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/;
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff 
vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+BDEPEND="
+   dev-cpp/eigen:3
+   dev-lang/perl
+   sys-devel/gettext
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui '-gles2' '' '5=')
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtx11extras)
+   $(add_qt_dep qtxml)
+   dev-libs/boost:=
+   dev-libs/quazip
+   dev-python/PyQt5[${PYTHON_USEDEP}]
+   dev-python/sip[${PYTHON_USEDEP}]
+   media-gfx/exiv2:=
+   media-libs/lcms
+   media-libs/libpng:0=
+   sys-libs/zlib
+   virtual/opengl
+   x11-libs/libX11
+   x11-libs/libxcb
+   x11-libs/libXi
+   color-management? ( media-libs/opencolorio )
+   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
+   )
+   pdf? ( app-text/poppler[qt5] )
+   qtmedia? ( $(add_qt_dep qtmultimedia) )
+   raw? ( media-libs/libraw:= )
+   tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+   vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+   !app-office/calligra:4[calligra_features_krita]
+   !app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.2-tests-optional.patch )
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+   kde5_pkg_setup
+}
+
+src_configure() {
+   # Prevent sandbox violation from FindPyQt5.py module
+   # See Gentoo-bug 655918
+   addpredict /dev/dri
+
+   local 

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

2019-06-27 Thread Andreas Sturmlechner
commit: 01d6d2e44e75a77477ec077e76abfa078c1886c8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun 27 16:53:35 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 27 17:18:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01d6d2e4

media-gfx/krita: Drop 4.2.1

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 -
 .../krita/files/krita-4.2.0-tests-optional.patch   | 324 -
 media-gfx/krita/krita-4.2.1.ebuild | 118 
 3 files changed, 443 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 2e2c22bf373..e5583f50a1c 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.1.tar.gz 245929278 BLAKE2B 
06544424bae7965be2fbf7a0e9d4fc260de80f16e6f8beba600432139e20f4c9bde24244d5b8ce5573fbc354ee0461c6930255f47798618998b895828a682390
 SHA512 
879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1
 DIST krita-4.2.2.tar.gz 246075662 BLAKE2B 
0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e
 SHA512 
7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096

diff --git a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch 
b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
deleted file mode 100644
index b605e922aba..000
--- a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
+++ /dev/null
@@ -1,324 +0,0 @@
 a/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.442258240 
+0200
-+++ b/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.452257980 
+0200
-@@ -1,6 +1,8 @@
- project( lcmsengine )
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
- ${LCMS2_INCLUDE_DIR}
 a/plugins/extensions/qmic/CMakeLists.txt   2019-06-01 15:10:43.469257540 
+0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt   2019-06-01 15:10:43.477257332 
+0200
-@@ -20,4 +20,6 @@
- target_link_libraries(kritaqmic kritaui)
- install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
 a/plugins/filters/CMakeLists.txt   2019-06-01 15:10:43.488257047 +0200
-+++ b/plugins/filters/CMakeLists.txt   2019-06-01 15:10:43.497256813 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- add_subdirectory( blur )
- add_subdirectory( colors )
- add_subdirectory( colorsfilters )
 a/plugins/filters/unsharp/CMakeLists.txt   2019-06-01 15:10:43.508256528 
+0200
-+++ b/plugins/filters/unsharp/CMakeLists.txt   2019-06-01 15:10:43.516256320 
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaunsharpfilter_SOURCES
- unsharp.cpp
 a/plugins/dockers/lut/CMakeLists.txt   2019-06-01 15:10:43.527256035 
+0200
-+++ b/plugins/dockers/lut/CMakeLists.txt   2019-06-01 15:10:43.535255828 
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
- ${OCIO_INCLUDE_DIR}
 a/plugins/dockers/animation/CMakeLists.txt 2019-06-01 15:10:43.546255542 
+0200
-+++ b/plugins/dockers/animation/CMakeLists.txt 2019-06-01 15:10:43.555255309 
+0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- set(KRITA_ANIMATIONDOCKER_SOURCES
 a/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-01 
15:10:43.566255024 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-01 
15:10:43.574254816 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- set(kritatooltransform_SOURCES
 a/plugins/tools/basictools/CMakeLists.txt  2019-06-01 15:10:43.584254557 
+0200
-+++ b/plugins/tools/basictools/CMakeLists.txt  2019-06-01 15:10:43.592254349 
+0200
-@@ -1,5 +1,7 @@
- if (NOT APPLE)
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif ()
- 
- set(kritadefaulttools_SOURCES
 a/plugins/impex/tiff/CMakeLists.txt2019-06-01 15:10:43.602254090 
+0200
-+++ b/plugins/impex/tiff/CMakeLists.txt2019-06-01 15:10:43.609253908 
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- 

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

2019-06-27 Thread Andreas Sturmlechner
commit: a9b8decf11a9e648fc3e5cc175018b22a834f8d9
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun 27 16:08:05 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun 27 17:18:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9b8decf

media-gfx/krita: 4.2.2 version bump

Package-Manager: Portage-2.3.67, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/files/krita-4.2.2-fixuifiles.patch |  25 ++
 .../krita/files/krita-4.2.2-tests-optional.patch   | 405 +
 media-gfx/krita/krita-4.2.2.ebuild | 121 ++
 4 files changed, 552 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 41abb11141a..2e2c22bf373 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
 DIST krita-4.2.1.tar.gz 245929278 BLAKE2B 
06544424bae7965be2fbf7a0e9d4fc260de80f16e6f8beba600432139e20f4c9bde24244d5b8ce5573fbc354ee0461c6930255f47798618998b895828a682390
 SHA512 
879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1
+DIST krita-4.2.2.tar.gz 246075662 BLAKE2B 
0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e
 SHA512 
7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096

diff --git a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch 
b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
new file mode 100644
index 000..1703386a3c7
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
@@ -0,0 +1,25 @@
+From e46ad1f917705d84dc5562c2f261a06eb70a57b9 Mon Sep 17 00:00:00 2001
+From: Pino Toscano 
+Date: Tue, 25 Jun 2019 06:57:40 +0200
+Subject: fixuifiles
+
+---
+ libs/widgetutils/tests/dialogsavertestwidget.ui | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/libs/widgetutils/tests/dialogsavertestwidget.ui 
b/libs/widgetutils/tests/dialogsavertestwidget.ui
+index 66e70b3..ba0f54f 100644
+--- a/libs/widgetutils/tests/dialogsavertestwidget.ui
 b/libs/widgetutils/tests/dialogsavertestwidget.ui
+@@ -10,9 +10,6 @@
+ 300
+
+   
+-  
+-   Form
+-  
+   
+
+ 
+-- 
+cgit v1.1

diff --git a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch 
b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
new file mode 100644
index 000..2df715be04f
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
@@ -0,0 +1,405 @@
+--- a/plugins/filters/CMakeLists.txt   2019-06-27 18:48:55.049823682 +0200
 b/plugins/filters/CMakeLists.txt   2019-06-27 18:48:55.056823729 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+--- a/plugins/filters/unsharp/CMakeLists.txt   2019-06-27 18:48:55.063823776 
+0200
 b/plugins/filters/unsharp/CMakeLists.txt   2019-06-27 18:48:55.069823817 
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaunsharpfilter_SOURCES
+ unsharp.cpp
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt  2019-06-27 
18:48:55.077823871 +0200
 b/plugins/paintops/defaultpaintops/CMakeLists.txt  2019-06-27 
18:48:55.084823918 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+ 
+ include_directories(brush
+ duplicate
+--- a/plugins/paintops/libpaintop/CMakeLists.txt   2019-06-27 
18:48:55.092823972 +0200
 b/plugins/paintops/libpaintop/CMakeLists.txt   2019-06-27 
18:48:55.098824013 +0200
+@@ -104,4 +104,6 @@
+ install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/dockers/lut/CMakeLists.txt   2019-06-27 18:48:55.105824060 
+0200
 b/plugins/dockers/lut/CMakeLists.txt   2019-06-27 18:48:55.112824107 
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+ ${OCIO_INCLUDE_DIR}
+--- a/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.120824161 
+0200
 b/plugins/dockers/animation/CMakeLists.txt 2019-06-27 18:48:55.124824188 
+0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ set(KRITA_ANIMATIONDOCKER_SOURCES
+--- a/plugins/extensions/qmic/CMakeLists.txt   2019-06-27 

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

2019-06-05 Thread Andreas Sturmlechner
commit: fb562ab8c66b8e6e8d363ceea4e68c6a304b0446
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun  4 18:02:08 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Jun  5 09:19:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb562ab8

media-gfx/krita: 4.2.1 version bump

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   | 2 +-
 media-gfx/krita/{krita-4.2.0.ebuild => krita-4.2.1.ebuild} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 00caf204e91..41abb11141a 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,2 @@
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.0.tar.gz 240015177 BLAKE2B 
09992b50dfa4e244c809dd576c3b7c0d1cb09b19fde0985c3d72b57543e5a06aa863b9011d655432a089fb6869e2e7fdb23939877b0c4ee6aaf44a1c88e7084c
 SHA512 
a6f373839e47c4e97f5680d266d1ea9f438db6636d3f8749f7fbf6d93b5329e1d46f7233af901dd224722c08100c4fc3b162a163c721299ebfa2d4939032ae44
+DIST krita-4.2.1.tar.gz 245929278 BLAKE2B 
06544424bae7965be2fbf7a0e9d4fc260de80f16e6f8beba600432139e20f4c9bde24244d5b8ce5573fbc354ee0461c6930255f47798618998b895828a682390
 SHA512 
879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1

diff --git a/media-gfx/krita/krita-4.2.0.ebuild 
b/media-gfx/krita/krita-4.2.1.ebuild
similarity index 98%
rename from media-gfx/krita/krita-4.2.0.ebuild
rename to media-gfx/krita/krita-4.2.1.ebuild
index 3153c3eba36..f9b39e3a7af 100644
--- a/media-gfx/krita/krita-4.2.0.ebuild
+++ b/media-gfx/krita/krita-4.2.1.ebuild
@@ -87,7 +87,7 @@ RDEPEND="${COMMON_DEPEND}
 # bug 630508
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" )
+PATCHES=( "${FILESDIR}/${PN}-4.2.0-tests-optional.patch" )
 
 pkg_setup() {
python-single-r1_pkg_setup



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

2019-06-01 Thread Andreas Sturmlechner
commit: fec52e6f9767385205ce4037fbb88597f5ad73f7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed May 29 15:41:31 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun  1 14:26:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec52e6f

media-gfx/krita: 4.2.0 version bump

dev-qt/qtgui slot operator is necessary for QPA usage.

Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest   |   1 +
 .../krita/files/krita-4.2.0-tests-optional.patch   | 324 +
 media-gfx/krita/krita-4.2.0.ebuild | 118 
 3 files changed, 443 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 471a7accb4d..00caf204e91 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1 +1,2 @@
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
+DIST krita-4.2.0.tar.gz 240015177 BLAKE2B 
09992b50dfa4e244c809dd576c3b7c0d1cb09b19fde0985c3d72b57543e5a06aa863b9011d655432a089fb6869e2e7fdb23939877b0c4ee6aaf44a1c88e7084c
 SHA512 
a6f373839e47c4e97f5680d266d1ea9f438db6636d3f8749f7fbf6d93b5329e1d46f7233af901dd224722c08100c4fc3b162a163c721299ebfa2d4939032ae44

diff --git a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch 
b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
new file mode 100644
index 000..b605e922aba
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
@@ -0,0 +1,324 @@
+--- a/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.442258240 
+0200
 b/plugins/color/lcms2engine/CMakeLists.txt 2019-06-01 15:10:43.452257980 
+0200
+@@ -1,6 +1,8 @@
+ project( lcmsengine )
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+ ${LCMS2_INCLUDE_DIR}
+--- a/plugins/extensions/qmic/CMakeLists.txt   2019-06-01 15:10:43.469257540 
+0200
 b/plugins/extensions/qmic/CMakeLists.txt   2019-06-01 15:10:43.477257332 
+0200
+@@ -20,4 +20,6 @@
+ target_link_libraries(kritaqmic kritaui)
+ install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/filters/CMakeLists.txt   2019-06-01 15:10:43.488257047 +0200
 b/plugins/filters/CMakeLists.txt   2019-06-01 15:10:43.497256813 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+--- a/plugins/filters/unsharp/CMakeLists.txt   2019-06-01 15:10:43.508256528 
+0200
 b/plugins/filters/unsharp/CMakeLists.txt   2019-06-01 15:10:43.516256320 
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaunsharpfilter_SOURCES
+ unsharp.cpp
+--- a/plugins/dockers/lut/CMakeLists.txt   2019-06-01 15:10:43.527256035 
+0200
 b/plugins/dockers/lut/CMakeLists.txt   2019-06-01 15:10:43.535255828 
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+ ${OCIO_INCLUDE_DIR}
+--- a/plugins/dockers/animation/CMakeLists.txt 2019-06-01 15:10:43.546255542 
+0200
 b/plugins/dockers/animation/CMakeLists.txt 2019-06-01 15:10:43.555255309 
+0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ set(KRITA_ANIMATIONDOCKER_SOURCES
+--- a/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-01 
15:10:43.566255024 +0200
 b/plugins/tools/tool_transform2/CMakeLists.txt 2019-06-01 
15:10:43.574254816 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ set(kritatooltransform_SOURCES
+--- a/plugins/tools/basictools/CMakeLists.txt  2019-06-01 15:10:43.584254557 
+0200
 b/plugins/tools/basictools/CMakeLists.txt  2019-06-01 15:10:43.592254349 
+0200
+@@ -1,5 +1,7 @@
+ if (NOT APPLE)
+-add_subdirectory(tests)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif ()
+ 
+ set(kritadefaulttools_SOURCES
+--- a/plugins/impex/tiff/CMakeLists.txt2019-06-01 15:10:43.602254090 
+0200
 b/plugins/impex/tiff/CMakeLists.txt2019-06-01 15:10:43.609253908 
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(libkritatiffconverter_LIB_SRCS
+ kis_tiff_converter.cc
+--- a/plugins/impex/libkra/CMakeLists.txt  2019-06-01 15:10:43.620253623 
+0200
 b/plugins/impex/libkra/CMakeLists.txt  2019-06-01 15:10:43.627253441 
+0200
+@@ -1,4 +1,6 @@

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

2019-04-06 Thread Andreas Sturmlechner
commit: 641f771e09e054e4857311dfe289194abd16af3c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Apr  6 16:07:54 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Apr  6 20:28:55 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=641f771e

media-gfx/krita: Drop 4.1.7-r1

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/Manifest  |   2 -
 media-gfx/krita/krita-4.1.7-r1.ebuild | 126 --
 2 files changed, 128 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index b4f59c780b4..471a7accb4d 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1 @@
-DIST krita-4.1.7-patchset.tar.xz 7208 BLAKE2B 
0c5ca308d5d11878f63312a3980e66838d82a50ad64f67326a4cf35e36b500b22e5d56441516f65c3c09dd9ec7adf2f3b76ed90e3644c24e86a8ddbc499bf772
 SHA512 
a4290b7973cbe157c1d21f914130a3d43fcf6afa223795d1c52ca2ef22b552f0eac7714f97766d70cbfee2b88f5367c5da21baeb76febd7490cec5896791f3b4
-DIST krita-4.1.7.101.tar.gz 243977488 BLAKE2B 
84cfb0f7e6e7b63c3bb9303793c2b74f180982f66ed0756c8878bf8db64b5d9bf9d3cbdb28afba11a952737b02e46759a465d90a2e8822fbb382ae679ba3c3de
 SHA512 
8558501684bc686f431660f3dffeb75575fea3bd23662b6c598c27173cce3145c3ec2caff32b56dd597c50907a69b2faab5259cc6f518f5a0e160cae89004791
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9

diff --git a/media-gfx/krita/krita-4.1.7-r1.ebuild 
b/media-gfx/krita/krita-4.1.7-r1.ebuild
deleted file mode 100644
index 929971405f1..000
--- a/media-gfx/krita/krita-4.1.7-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.11.3"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{4,5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.101.tar.gz
-   https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz;
-   KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/;
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff 
vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: Drop subslot operator when QTBUG is fixed:
-# https://bugreports.qt.io/browse/QTBUG-72488
-COMMON_DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtconcurrent)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui '-gles2')
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtx11extras)
-   $(add_qt_dep qtxml)
-   dev-libs/boost:=
-   dev-python/PyQt5[${PYTHON_USEDEP}]
-   dev-python/sip[${PYTHON_USEDEP}]
-   media-gfx/exiv2:=
-   media-libs/lcms
-   media-libs/libpng:0=
-   sys-libs/zlib
-   virtual/opengl
-   x11-libs/libX11
-   x11-libs/libxcb
-   x11-libs/libXi
-   color-management? ( media-libs/opencolorio )
-   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
-   )
-   pdf? ( app-text/poppler[qt5] )
-   qtmedia? ( $(add_qt_dep qtmultimedia) )
-   raw? ( media-libs/libraw:= )
-   tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-   dev-cpp/eigen:3
-   dev-lang/perl
-   sys-devel/gettext
-   vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-   !app-office/calligra:4[calligra_features_krita]
-   !app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
-   "${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
-   "${WORKDIR}/${P}-exiv2-0.27.patch"
-   

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

2019-04-06 Thread Mikle Kolyada
commit: be56566100d2805483e3f941de0d8019679edfcb
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Apr  6 16:00:33 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Apr  6 16:00:33 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be565661

media-gfx/krita: amd64 stable wrt bug #682450

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 media-gfx/krita/krita-4.1.8-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/krita/krita-4.1.8-r1.ebuild 
b/media-gfx/krita/krita-4.1.8-r1.ebuild
index 46926f21e6a..dae8437cd87 100644
--- a/media-gfx/krita/krita-4.1.8-r1.ebuild
+++ b/media-gfx/krita/krita-4.1.8-r1.ebuild
@@ -11,7 +11,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"



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

2019-04-03 Thread Andreas Sturmlechner
commit: 97d474d5f62cbd7d37f4869d0de670b0920e4d93
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr  3 18:57:32 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr  3 18:58:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d474d5

media-gfx/krita: Drop 4.1.8 (r0)

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/krita/krita-4.1.8.ebuild | 119 -
 1 file changed, 119 deletions(-)

diff --git a/media-gfx/krita/krita-4.1.8.ebuild 
b/media-gfx/krita/krita-4.1.8.ebuild
deleted file mode 100644
index 09ab5c97fee..000
--- a/media-gfx/krita/krita-4.1.8.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.11.3"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/;
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff 
vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: drop qtgui subslot operator when QTBUG is fixed or QT_MINIMAL >= 
5.12.0:
-# https://bugreports.qt.io/browse/QTBUG-72488
-BDEPEND="
-   dev-cpp/eigen:3
-   dev-lang/perl
-   sys-devel/gettext
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-   $(add_frameworks_dep karchive)
-   $(add_frameworks_dep kcompletion)
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep kcrash)
-   $(add_frameworks_dep kguiaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kitemmodels)
-   $(add_frameworks_dep kitemviews)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_qt_dep qtconcurrent)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtdeclarative)
-   $(add_qt_dep qtgui '-gles2' '' '5=')
-   $(add_qt_dep qtnetwork)
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtsvg)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtx11extras)
-   $(add_qt_dep qtxml)
-   dev-libs/boost:=
-   dev-python/PyQt5[${PYTHON_USEDEP}]
-   dev-python/sip[${PYTHON_USEDEP}]
-   media-gfx/exiv2:=
-   media-libs/lcms
-   media-libs/libpng:0=
-   sys-libs/zlib
-   virtual/opengl
-   x11-libs/libX11
-   x11-libs/libxcb
-   x11-libs/libXi
-   color-management? ( media-libs/opencolorio )
-   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
-   )
-   pdf? ( app-text/poppler[qt5] )
-   qtmedia? ( $(add_qt_dep qtmultimedia) )
-   raw? ( media-libs/libraw:= )
-   tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-   vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-   !app-office/calligra:4[calligra_features_krita]
-   !app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" )
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-   kde5_pkg_setup
-}
-
-src_configure() {
-   # Prevent sandbox violation from FindPyQt5.py module
-   # See Gentoo-bug 655918
-   addpredict /dev/dri
-
-   local mycmakeargs=(
-   $(cmake-utils_use_find_package color-management OCIO)
-   $(cmake-utils_use_find_package fftw FFTW3)
-   $(cmake-utils_use_find_package gif GIF)
-   $(cmake-utils_use_find_package gsl GSL)
-   $(cmake-utils_use_find_package heif HEIF)
-   $(cmake-utils_use_find_package jpeg JPEG)
-   $(cmake-utils_use_find_package openexr OpenEXR)
-   $(cmake-utils_use_find_package pdf Poppler)
-   $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-   $(cmake-utils_use_find_package raw LibRaw)
-   $(cmake-utils_use_find_package tiff TIFF)
-   $(cmake-utils_use_find_package vc Vc)
-   )
-
-   kde5_src_configure
-}



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

2019-04-03 Thread Andreas Sturmlechner
commit: 68d2cb566ccf6c5b4cec5d6f021484b2216ad0a8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Apr  3 18:54:58 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Apr  3 18:58:40 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68d2cb56

media-gfx/krita: Add upstream tablet support and crash fix

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../krita-4.1.8-fix-pre-5.12-tablet-support.patch  |  49 
 ...-qt-5.12-fix-unsupported-composition-mode.patch |  38 +++
 media-gfx/krita/krita-4.1.8-r1.ebuild  | 123 +
 3 files changed, 210 insertions(+)

diff --git 
a/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch 
b/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
new file mode 100644
index 000..2928247e57a
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
@@ -0,0 +1,49 @@
+From 0218025b1725aa810f108d08802b590ce62f1044 Mon Sep 17 00:00:00 2001
+From: Dmitry Kazakov 
+Date: Mon, 25 Mar 2019 21:16:41 +0300
+Subject: Add a workaround for Qt 5.9...5.11.X to fix tablet support
+
+Basically, the patch mimics this Qt's patch that has been
+added in Qt 5.12.0 only:
+https://codereview.qt-project.org/#/c/239918/
+
+BUG:399696
+---
+ libs/ui/input/kis_input_manager_p.cpp | 22 ++
+ 1 file changed, 22 insertions(+)
+
+diff --git a/libs/ui/input/kis_input_manager_p.cpp 
b/libs/ui/input/kis_input_manager_p.cpp
+index 4f5a58f..0a26655 100644
+--- a/libs/ui/input/kis_input_manager_p.cpp
 b/libs/ui/input/kis_input_manager_p.cpp
+@@ -333,6 +333,28 @@ 
KisInputManager::Private::ProximityNotifier::ProximityNotifier(KisInputManager::
+ 
+ bool KisInputManager::Private::ProximityNotifier::eventFilter(QObject* 
object, QEvent* event )
+ {
++/**
++ * All Qt builds in range 5.7.0...5.11.X on X11 had a problem that made 
all
++ * the tablet events be accepted by default. It meant that no mouse
++ * events were synthesized, and, therefore, no Enter/Leave were generated.
++ *
++ * The fix for this bug has been added only in Qt 5.12.0:
++ * https://codereview.qt-project.org/#/c/239918/
++ *
++ * To avoid this problem we should explicitly ignore all the tablet 
events.
++ */
++#if defined Q_OS_LINUX && \
++QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) && \
++QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
++
++if (event->type() == QEvent::TabletMove ||
++event->type() == QEvent::TabletPress ||
++event->type() == QEvent::TabletRelease) {
++
++event->ignore();
++}
++#endif
++
+ switch (event->type()) {
+ case QEvent::TabletEnterProximity:
+ d->debugEvent(event);
+-- 
+cgit v1.1

diff --git 
a/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
 
b/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
new file mode 100644
index 000..dc65b1c49d2
--- /dev/null
+++ 
b/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
@@ -0,0 +1,38 @@
+From 9347112a77b3b628af8c0b8d4d7cbc0929eede9e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Wolthera=20van=20H=C3=B6vell=20tot=20Westerflier?=
+ 
+Date: Sat, 30 Mar 2019 21:47:37 +0100
+Subject: BUG:406032 Fix crash caused by unsupported composition mode in QT
+ 5.12
+
+Qt 5.12 doesn't support QPainter::RasterOp_SourceXorDestination anymore.
+
+Trying to paint with a painter that uses this while opengl is enabled
+will lead to a crash. The only relevant place this enum value is still used
+is in kis_tool.cc, where it is only painted on the regular non-accelerated 
canvas.
+
+Anyhow, told the smartpatch to use this function instead of doing something 
itself.
+
+The whole thing is a little bizar.
+---
+ plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp 
b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
+index 656ba38..32577a3 100644
+--- a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
 b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
+@@ -245,9 +245,8 @@ void KisToolSmartPatch::paint(QPainter , const 
KoViewConverter 
+ Q_UNUSED(converter);
+ 
+ painter.save();
+-painter.setCompositionMode(QPainter::RasterOp_SourceXorDestination);
+-painter.setPen(QColor(128, 255, 128));
+-painter.drawPath(pixelToView(m_d->brushOutline));
++QPainterPath path = pixelToView(m_d->brushOutline);
++paintToolOutline(, path);
+ painter.restore();
+ 
+ painter.save();
+-- 
+cgit v1.1

diff --git a/media-gfx/krita/krita-4.1.8-r1.ebuild 
b/media-gfx/krita/krita-4.1.8-r1.ebuild
new file mode 100644
index 000..46926f21e6a
--- /dev/null
+++ b/media-gfx/krita/krita-4.1.8-r1.ebuild
@@ -0,0 +1,123 @@
+# 

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

2019-03-06 Thread Andreas Sturmlechner
commit: 6cd23e1f9761badda2952398e886924f52f700f5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Mar  6 10:20:04 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Mar  6 11:13:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cd23e1f

media-gfx/krita: 4.1.8 version bump

Signed-off-by: Andreas Sturmlechner  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 media-gfx/krita/Manifest   |   1 +
 media-gfx/krita/krita-4.1.8.ebuild | 119 +
 2 files changed, 120 insertions(+)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index fc40c80ff6e..b4f59c780b4 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,2 +1,3 @@
 DIST krita-4.1.7-patchset.tar.xz 7208 BLAKE2B 
0c5ca308d5d11878f63312a3980e66838d82a50ad64f67326a4cf35e36b500b22e5d56441516f65c3c09dd9ec7adf2f3b76ed90e3644c24e86a8ddbc499bf772
 SHA512 
a4290b7973cbe157c1d21f914130a3d43fcf6afa223795d1c52ca2ef22b552f0eac7714f97766d70cbfee2b88f5367c5da21baeb76febd7490cec5896791f3b4
 DIST krita-4.1.7.101.tar.gz 243977488 BLAKE2B 
84cfb0f7e6e7b63c3bb9303793c2b74f180982f66ed0756c8878bf8db64b5d9bf9d3cbdb28afba11a952737b02e46759a465d90a2e8822fbb382ae679ba3c3de
 SHA512 
8558501684bc686f431660f3dffeb75575fea3bd23662b6c598c27173cce3145c3ec2caff32b56dd597c50907a69b2faab5259cc6f518f5a0e160cae89004791
+DIST krita-4.1.8.tar.gz 244065767 BLAKE2B 
ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157
 SHA512 
d02715bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9

diff --git a/media-gfx/krita/krita-4.1.8.ebuild 
b/media-gfx/krita/krita-4.1.8.ebuild
new file mode 100644
index 000..09ab5c97fee
--- /dev/null
+++ b/media-gfx/krita/krita-4.1.8.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_TEST="forceoptional"
+QT_MINIMAL="5.11.3"
+VIRTUALX_REQUIRED="test"
+PYTHON_COMPAT=( python3_{5,6,7} )
+inherit kde5 python-single-r1
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+   SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative 
Freedom!"
+HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/;
+LICENSE="GPL-3"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff 
vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# FIXME: drop qtgui subslot operator when QTBUG is fixed or QT_MINIMAL >= 
5.12.0:
+# https://bugreports.qt.io/browse/QTBUG-72488
+BDEPEND="
+   dev-cpp/eigen:3
+   dev-lang/perl
+   sys-devel/gettext
+"
+COMMON_DEPEND="${PYTHON_DEPS}
+   $(add_frameworks_dep karchive)
+   $(add_frameworks_dep kcompletion)
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep kcrash)
+   $(add_frameworks_dep kguiaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kitemmodels)
+   $(add_frameworks_dep kitemviews)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtdeclarative)
+   $(add_qt_dep qtgui '-gles2' '' '5=')
+   $(add_qt_dep qtnetwork)
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtsvg)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtx11extras)
+   $(add_qt_dep qtxml)
+   dev-libs/boost:=
+   dev-python/PyQt5[${PYTHON_USEDEP}]
+   dev-python/sip[${PYTHON_USEDEP}]
+   media-gfx/exiv2:=
+   media-libs/lcms
+   media-libs/libpng:0=
+   sys-libs/zlib
+   virtual/opengl
+   x11-libs/libX11
+   x11-libs/libxcb
+   x11-libs/libXi
+   color-management? ( media-libs/opencolorio )
+   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
+   )
+   pdf? ( app-text/poppler[qt5] )
+   qtmedia? ( $(add_qt_dep qtmultimedia) )
+   raw? ( media-libs/libraw:= )
+   tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+   vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+   !app-office/calligra:4[calligra_features_krita]
+   !app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+# bug 630508
+RESTRICT+=" test"
+
+PATCHES=( "${FILESDIR}/${PN}-4.0.3-tests-optional.patch" )
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+   kde5_pkg_setup
+}
+
+src_configure() {
+   # Prevent sandbox 

  1   2   >