[gentoo-commits] proj/kde:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: a9deb0ccf181018c7c6f8144cfdc05307d6fcdd3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jul 13 18:45:12 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jul 13 19:55:40 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a9deb0cc
media-gfx/krita: enable py3.12, add IUSE media, xsimd; re-add jpeg2k
IUSE raw switched back to kde-apps/libkdcraw
Upstream commit 02f4f845eaf789d3840805e69bdbb38f131a3cc7
IUSE media w/ media-video/mlt replaces IUSE qtmedia w/ dev-qt/qtmultimedia
Upstream commits:
7f976690636071a2387d8ca9c4203edb59489b0d
c76debce1c39b337bdd21c5dc2048605dc6d267d
New dependency on dev-libs/libunibreak
Upstream commit 3d0ba2926f576e9dd059c2bed5264cbd8f6adcf6
Rebase tests-optional.patch on 5.2.3
Upstream commit 2acfac835adf5cb39dd6d9149c739648da060385
Sync with ::gentoo w/ minor sorting fixes, plus:
- Pin down kde-apps/libkdcraw to SLOT 5
- Raise minimum dep on dev-cpp/xsimd to 13.0.0
- Drop unnecessary openjpeg patch
See also:
https://github.com/gentoo/gentoo/pull/34736
Bug: https://bugs.gentoo.org/921972
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/files/krita-5.2.2-fftw.patch | 18
...onal.patch => krita-5.2.3-tests-optional.patch} | 14 +++--
media-gfx/krita/krita-.ebuild | 33 +++---
media-gfx/krita/metadata.xml | 3 +-
4 files changed, 55 insertions(+), 13 deletions(-)
diff --git a/media-gfx/krita/files/krita-5.2.2-fftw.patch
b/media-gfx/krita/files/krita-5.2.2-fftw.patch
new file mode 100644
index 00..b805be6a21
--- /dev/null
+++ b/media-gfx/krita/files/krita-5.2.2-fftw.patch
@@ -0,0 +1,18 @@
+Disable the cmake find_package method. It will instead fallback to use
pkgconfig.
+Without this, it will fail to find fftw3 and error out.
+
+--- a/cmake/modules/FindFFTW3.cmake2023-11-24 19:59:45.904059240 +0100
b/cmake/modules/FindFFTW3.cmake2023-11-24 20:00:17.029563107 +0100
+@@ -74,9 +74,9 @@
+ endforeach()
+ mark_as_advanced(PKG_FFTW_CONFIG_DIR)
+
+-find_package(FFTW3 QUIET NO_MODULE
+-HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3
/usr/local/lib/cmake/fftw3
+-)
++#find_package(FFTW3 QUIET NO_MODULE
++#HINTS ${PKG_FFTW_CONFIG_DIR} /usr/lib/cmake/fftw3
/usr/local/lib/cmake/fftw3
++#)
+ mark_as_advanced(FFTW3_DIR)
+
+ # if we found the FFTW3 CMake package then we can start
diff --git a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
b/media-gfx/krita/files/krita-5.2.3-tests-optional.patch
similarity index 91%
rename from media-gfx/krita/files/krita-4.3.1-tests-optional.patch
rename to media-gfx/krita/files/krita-5.2.3-tests-optional.patch
index 37f2ac50ff..48d9e314a2 100644
--- a/media-gfx/krita/files/krita-4.3.1-tests-optional.patch
+++ b/media-gfx/krita/files/krita-5.2.3-tests-optional.patch
@@ -76,5 +76,15 @@ index 88c0516360..01f2383ddb 100644
+if(BUILD_TESTING)
+add_subdirectory(tests)
+endif()
---
-2.27.0
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -1246,7 +1246,9 @@
+${CMAKE_CURRENT_BINARY_DIR}
+ )
+
++if(BUILD_TESTING)
+ add_subdirectory(sdk/tests)
++endif()
+
+ add_subdirectory(libs)
+ add_subdirectory(plugins)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 425c755041..506ff60ab9 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -4,14 +4,14 @@
EAPI=8
ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{10..11} )
+PYTHON_COMPAT=( python3_{10..12} )
KFMIN=5.115.0
QTMIN=5.15.12
inherit ecm kde.org python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+ KEYWORDS="~amd64"
fi
DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
@@ -19,7 +19,7 @@ HOMEPAGE="https://apps.kde.org/krita/ https://krita.org/en/";
LICENSE="GPL-3"
SLOT="5"
-IUSE="color-management fftw gif +gsl heif jpegxl +mypaint-brush-engine openexr
pdf qtmedia +raw webp"
+IUSE="color-management fftw gif +gsl heif jpeg2k jpegxl +mypaint-brush-engine
openexr pdf media +raw +xsimd webp"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# bug 630508
@@ -27,6 +27,7 @@ RESTRICT="test"
RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=
+ dev-libs/libunibreak:=
dev-libs/quazip:0=[qt5(+)]
$(python_gen_cond_dep '
dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
@@ -68,23 +69,34 @@ RDEPEND="${PYTHON_DEPS}
fftw? ( sci-libs/fftw:3.0= )
gif? ( media-libs/giflib )
gsl? ( sci-libs/gsl:= )
+ jpeg2k? ( media-libs/openjpeg:= )
jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825:= )
heif? ( >=media-libs/libheif-1.11:=[x265] )
+ media? ( media-libs/mlt:= )
mypaint-brush-engine? ( media-libs/libmypaint:= )
openexr? ( media-libs/
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 0e26ea8f4f2b578035de1d19d67063d236ba146c Author: Michał Górny gentoo org> AuthorDate: Sun Oct 22 12:50:24 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 25 18:46:53 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0e26ea8f media-gfx/krita: Remove redundant local flag descs Signed-off-by: Michał Górny gentoo.org> 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 99adf7a478..ff6c095b3a 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] proj/kde:master commit in: media-gfx/krita/, media-gfx/digikam/, kde-frameworks/kimageformats/
commit: 2abcdbc65a574fbfe1eab3e08633fcc441bfe1c3 Author: Sam James gentoo org> AuthorDate: Thu Dec 29 20:13:47 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 25 13:52:40 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2abcdbc6 */*: adapt to USE=heif being a global USE flag Signed-off-by: Sam James gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> kde-frameworks/kimageformats/metadata.xml | 1 - media-gfx/digikam/metadata.xml| 1 - media-gfx/krita/metadata.xml | 1 - 3 files changed, 3 deletions(-) diff --git a/kde-frameworks/kimageformats/metadata.xml b/kde-frameworks/kimageformats/metadata.xml index e8d1457648..589b531cec 100644 --- a/kde-frameworks/kimageformats/metadata.xml +++ b/kde-frameworks/kimageformats/metadata.xml @@ -12,7 +12,6 @@ Support the AVIF image file format Support the EPS graphics file format - Support for HEIF/HEIC images Support for JPEG XL image format diff --git a/media-gfx/digikam/metadata.xml b/media-gfx/digikam/metadata.xml index 1c37a7c308..98caf78224 100644 --- a/media-gfx/digikam/metadata.xml +++ b/media-gfx/digikam/metadata.xml @@ -13,7 +13,6 @@ Enable akonadi contact integration - Enable support for ISO/IEC 23008-12:2017 HEIF files using media-libs/x265 Enable support for additional image formats such as XCF, FITS, HEIC etc. Enable support for media-libs/lensfun Enable support for geolocation using kde-apps/marble diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml index 27c873d15e..99adf7a478 100644 --- a/media-gfx/krita/metadata.xml +++ b/media-gfx/krita/metadata.xml @@ -10,7 +10,6 @@ Enable color management via media-libs/opencolorio - Enable support for ISO/IEC 23008-12:2017 HEIF/HEIC image format using media-libs/libheif 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] proj/kde:master commit in: media-gfx/krita/
commit: 596c06060cf231d15fb2d5c9ffc1daabb7f96d70
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jan 21 18:37:51 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jan 21 19:18:17 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=596c0606
media-gfx/krita: Add new media-libs/libjxl:= slot op
Bug: https://bugs.gentoo.org/922524
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 3596b5cb0f..a2c45cfa80 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -68,7 +68,7 @@ RDEPEND="${PYTHON_DEPS}
fftw? ( sci-libs/fftw:3.0= )
gif? ( media-libs/giflib )
gsl? ( sci-libs/gsl:= )
- jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825 )
+ 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:= )
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: be3031e06a67e5cc7ed3a181fedefcab75f731da
Author: Sam James gentoo org>
AuthorDate: Fri Dec 16 01:26:15 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Dec 16 19:31:19 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=be3031e0
media-gfx/krita: add media-libs/libtiff subslot dep
libtiff changed SONAME.
Signed-off-by: Sam James gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 37a85704ec..abf1cf77bf 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -59,8 +59,8 @@ RDEPEND="${PYTHON_DEPS}
media-gfx/exiv2:=
media-libs/lcms
media-libs/libjpeg-turbo:=
- media-libs/libpng:0=
- media-libs/tiff:0
+ media-libs/libpng:=
+ media-libs/tiff:=
sys-libs/zlib
virtual/opengl
x11-libs/libX11
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 322853915867bb1bc6502f4c66729d4815fd63b3
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Dec 14 19:42:38 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Dec 14 19:42:38 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=32285391
media-gfx/krita: Drop obsolete FETCH_TRANSLATIONS cmake arg
Upstream commit 46ec4635fd7edae82f675eec73173a738ec5f96c
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 6bca4884e8..37a85704ec 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -99,7 +99,6 @@ src_configure() {
local mycmakeargs=(
-DENABLE_UPDATERS=OFF
- -DFETCH_TRANSLATIONS=OFF
-DKRITA_ENABLE_PCH=OFF # big mess.
-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
-DCMAKE_DISABLE_FIND_PACKAGE_xsimd=ON # not packaged
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: efccf39555a20f6526f6de29188e40944b25f487
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Nov 8 20:18:07 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Nov 8 20:20:20 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=efccf395
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-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 044988c1a3..6bca4884e8 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.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] proj/kde:master commit in: media-gfx/krita/
commit: 3559bab801067b7c1a86dc7bcb932b59736861be
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Oct 16 09:14:59 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Oct 16 09:42:36 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3559bab8
media-gfx/krita: Raise minimum media-libs/libjxl version
To one that krita builds with.
Bug: https://bugs.gentoo.org/877015
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 767fb155de..044988c1a3 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -69,7 +69,7 @@ RDEPEND="${PYTHON_DEPS}
fftw? ( sci-libs/fftw:3.0= )
gif? ( media-libs/giflib )
gsl? ( sci-libs/gsl:= )
- jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220329 )
+ jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220825 )
heif? ( >=media-libs/libheif-1.11:= )
mypaint-brush-engine? ( media-libs/libmypaint:= )
openexr? ( media-libs/openexr:= )
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 9fcd9dbf819c9c5b489a0f8e4e506ef19c1e9252
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 14 11:07:22 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 14 11:53:24 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9fcd9dbf
media-gfx/krita: Drop IUSE jpeg
Upstream commit dd4d2b4b793a42b2c7406dfc63fc108ea8905ec5 would complicate
the flag by overloading it with JPEG-compressed TIFF support. The idea of
having a painting application without JPEG support does not make a lot of
sense in the best of times, so just drop the IUSE.
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 753af63179..5f07f67b09 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -20,7 +20,7 @@ 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"
+IUSE="color-management fftw gif +gsl heif jpegxl +mypaint-brush-engine openexr
pdf qtmedia +raw webp"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# bug 630508
@@ -58,6 +58,7 @@ RDEPEND="${PYTHON_DEPS}
>=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
@@ -68,7 +69,6 @@ RDEPEND="${PYTHON_DEPS}
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:= )
@@ -108,7 +108,6 @@ src_configure() {
$(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 jpegxl JPEGXL)
$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
$(cmake_use_find_package openexr OpenEXR)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 96a33bff7de7f2f98f869ea583b29d8d35a83059
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Sep 14 11:54:49 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 14 11:55:44 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=96a33bff
media-gfx/krita: Allow to be built against >=libjxl-0.7.0_pre20220329
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 5f07f67b09..767fb155de 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -69,7 +69,7 @@ RDEPEND="${PYTHON_DEPS}
fftw? ( sci-libs/fftw:3.0= )
gif? ( media-libs/giflib )
gsl? ( sci-libs/gsl:= )
- jpegxl? ( >=media-libs/libjxl-0.7.0 )
+ jpegxl? ( >=media-libs/libjxl-0.7.0_pre20220329 )
heif? ( >=media-libs/libheif-1.11:= )
mypaint-brush-engine? ( media-libs/libmypaint:= )
openexr? ( media-libs/openexr:= )
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 9c74a0a152846ee512affd011042abf541c4d325
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Fri Sep 9 16:02:36 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Sep 14 11:51:44 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9c74a0a1
media-gfx/krita: depend on quazip[qt5(+)]
Signed-off-by: Andrew Ammerlaan gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index bac42d89b0..753af63179 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.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}]
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 0ede4c34291c39b85acfed71e867e859d91cd857
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jul 4 16:25:08 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jul 4 16:25:08 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0ede4c34
media-gfx/krita: python3_11, update dependencies, sync KEYWORDS
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 15 ---
media-gfx/krita/metadata.xml | 2 +-
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index fdc7f5ceed..569571eb10 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -4,7 +4,7 @@
EAPI=8
ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
KFMIN=5.82.0
QTMIN=5.15.4
VIRTUALX_REQUIRED="test"
@@ -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!"
@@ -20,7 +20,7 @@ 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"
+IUSE="color-management fftw gif +gsl heif +jpeg jpegxl +mypaint-brush-engine
openexr pdf qtmedia +raw webp"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# bug 630508
@@ -69,6 +69,7 @@ RDEPEND="${PYTHON_DEPS}
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:= )
@@ -77,9 +78,7 @@ RDEPEND="${PYTHON_DEPS}
raw? ( media-libs/libraw:= )
webp? ( >=media-libs/libwebp-1.2.0:= )
"
-DEPEND="${RDEPEND}
- vc? ( >=dev-libs/vc-1.1.0 )
-"
+DEPEND="${RDEPEND}"
BDEPEND="
dev-cpp/eigen:3
dev-lang/perl
@@ -101,19 +100,21 @@ src_configure() {
local mycmakeargs=(
-DENABLE_UPDATERS=OFF
-DFETCH_TRANSLATIONS=OFF
+ -DKRITA_ENABLE_PCH=OFF # big mess.
-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
+ -DCMAKE_DISABLE_FIND_PACKAGE_xsimd=ON # not packaged
$(cmake_use_find_package color-management OpenColorIO)
$(cmake_use_find_package fftw FFTW3)
$(cmake_use_find_package gif GIF)
$(cmake_use_find_package gsl GSL)
$(cmake_use_find_package heif HEIF)
$(cmake_use_find_package jpeg JPEG)
+ $(cmake_use_find_package jpegxl JPEGXL)
$(cmake_use_find_package mypaint-brush-engine LibMyPaint)
$(cmake_use_find_package openexr OpenEXR)
$(cmake_use_find_package pdf Poppler)
$(cmake_use_find_package qtmedia Qt5Multimedia)
$(cmake_use_find_package raw LibRaw)
- $(cmake_use_find_package vc Vc)
$(cmake_use_find_package webp WebP)
)
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index c489668005..27c873d15e 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -11,8 +11,8 @@
Enable color management via
media-libs/opencolorio
Enable support for ISO/IEC 23008-12:2017
HEIF/HEIC image format using media-libs/libheif
+ 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] proj/kde:master commit in: media-gfx/krita/
commit: 92921b0ea5f356549aa449e816d252e12ce38c36
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun May 8 13:12:04 2022 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun May 8 13:12:04 2022 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=92921b0e
media-gfx/krita: Switch to media-libs/libjpeg-turbo:=
Away from deprecated virtual/jpeg.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index e880d07ce0..1b7d411ec7 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.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] proj/kde:master commit in: media-gfx/krita/
commit: 04f7dbbabb01d1341f81f03ed1fba7307522e90e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Dec 28 17:01:01 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Dec 28 17:01:01 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=04f7dbba
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-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index f6f7c94470..80d88c6840 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.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] proj/kde:master commit in: media-gfx/krita/
commit: d5ced80ce8345c0033a9e02c995ecc0fa8dbaa20
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Sep 30 17:52:35 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Dec 23 11:33:47 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d5ced80c
media-gfx/krita: DEPEND on dev-python/PyQt5[declarative,gui,widgets]
Thanks-to: YOSHIOKA Takuma hard-wi.red>
Bug: 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-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index a9408b90ff..f6f7c94470 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -30,7 +30,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=
dev-libs/quazip:0=
$(python_gen_cond_dep '
- dev-python/PyQt5[${PYTHON_USEDEP}]
+ dev-python/PyQt5[declarative,gui,widgets,${PYTHON_USEDEP}]
dev-python/sip:=[${PYTHON_USEDEP}]
')
>=dev-qt/qtconcurrent-${QTMIN}:5
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: eb734f0afd03805b87a0dee2361d175a8901d434
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Dec 23 10:53:24 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Dec 23 11:02:07 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=eb734f0a
media-gfx/krita: Raise min media-gfx/libheif version to 1.11
Upstream commit cf7588743574cdefe2601a0d180d9752820247eb
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index b748b7c29e..a9408b90ff 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -26,11 +26,6 @@ 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=
@@ -73,7 +68,7 @@ RDEPEND="${PYTHON_DEPS}
gif? ( media-libs/giflib )
gsl? ( sci-libs/gsl:= )
jpeg? ( virtual/jpeg:0 )
- heif? ( media-libs/libheif:= )
+ heif? ( >=media-libs/libheif-1.11:= )
mypaint-brush-engine? ( media-libs/libmypaint:= )
openexr? ( media-libs/openexr:= )
pdf? ( app-text/poppler[qt5] )
@@ -84,6 +79,11 @@ RDEPEND="${PYTHON_DEPS}
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] proj/kde:master commit in: media-gfx/krita/
commit: 35c596975a9603140020ac5ca314791328b64e67
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Nov 5 11:26:54 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Nov 5 15:54:49 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=35c59697
media-gfx/krita: Update dependencies, build options
Upstream commits:
3d24ed1314471371dc42c0b0d93e3c0037942412
6ccc1e4b9fa3e027b13068fd7cfd84277be68ec0
d66383f6c593d21463c658fbcc6adef28a7f570f
7699e8a1cb0d18751ad02fb786c0d15562a76e51
7df61f0aa4db59a0b689a17e320ef4f34d961113
0d811d3464a8ba10f3c8dc705a302f030326a73d
f25646800ba3e5ccbc70f8c66c66867698a82548
e08adffe97f886a387fa0f2e274094b920b56972
Bug: https://bugs.gentoo.org/821244
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 8fa12af0f4..b748b7c29e 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -20,7 +20,7 @@ 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 tiff vc"
+IUSE="color-management fftw gif +gsl heif +jpeg +mypaint-brush-engine openexr
pdf qtmedia +raw vc webp"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# bug 630508
@@ -63,25 +63,23 @@ RDEPEND="${PYTHON_DEPS}
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 )
+ 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:= )
mypaint-brush-engine? ( media-libs/libmypaint:= )
- openexr? (
- media-libs/ilmbase:=
- =dev-qt/qtmultimedia-${QTMIN}:5 )
raw? ( media-libs/libraw:= )
- tiff? ( media-libs/tiff:0 )
+ webp? ( >=media-libs/libwebp-1.2.0:= )
"
DEPEND="${RDEPEND}
vc? ( >=dev-libs/vc-1.1.0 )
@@ -101,8 +99,9 @@ src_configure() {
local mycmakeargs=(
-DENABLE_UPDATERS=OFF
+ -DFETCH_TRANSLATIONS=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_KSeExpr=ON # not packaged
- $(cmake_use_find_package color-management OCIO)
+ $(cmake_use_find_package color-management OpenColorIO)
$(cmake_use_find_package fftw FFTW3)
$(cmake_use_find_package gif GIF)
$(cmake_use_find_package gsl GSL)
@@ -113,8 +112,8 @@ src_configure() {
$(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)
+ $(cmake_use_find_package webp WebP)
)
ecm_src_configure
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: da20ff2ca12452b00a99f0ab9797be7d68dab435
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Aug 25 08:26:09 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Aug 25 08:31:22 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=da20ff2c
media-gfx/krita: python3_10
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 63f7b7ef53..8fa12af0f4 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -4,7 +4,7 @@
EAPI=8
ECM_TEST="forceoptional"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
KFMIN=5.82.0
QTMIN=5.15.2
VIRTUALX_REQUIRED="test"
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 10953597e4455ecff874160c514f7cea708898db
Author: David Seifert gentoo org>
AuthorDate: Sat Jul 17 18:16:10 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jul 22 20:00:20 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=10953597
media-gfx/krita: PYTHON_MULTI_USEDEP -> PYTHON_USEDEP
Signed-off-by: David Seifert gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 33bae69cbe..fa5f499b8d 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -35,8 +35,8 @@ 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-python/PyQt5[${PYTHON_USEDEP}]
+ dev-python/sip:=[${PYTHON_USEDEP}]
')
>=dev-qt/qtconcurrent-${QTMIN}:5
>=dev-qt/qtdbus-${QTMIN}:5
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 2f62f6686943741a6b9bc90321a26e45adab1b91
Author: Bernd Waibel posteo net>
AuthorDate: Wed Jul 21 16:00:39 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jul 22 20:00:21 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2f62f668
media-gfx/krita: add slot operator for openexr
- restrict to posteo.net>
Signed-off-by: Marek Szuba gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index fa5f499b8d..45421223e1 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -76,7 +76,7 @@ RDEPEND="${PYTHON_DEPS}
mypaint-brush-engine? ( media-libs/libmypaint:= )
openexr? (
media-libs/ilmbase:=
- media-libs/openexr
+ =dev-qt/qtmultimedia-${QTMIN}:5 )
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/, media-gfx/krita/files/
commit: 4847e3cf248e8af5be4dc7207f137ed42f27242c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Mar 26 19:32:10 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Mar 26 21:18:07 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4847e3cf
media-gfx/krita: Drop 4.4.3_beta2
Package-Manager: Portage-3.0.17, 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.3_beta2.ebuild| 129
2 files changed, 165 deletions(-)
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 6a49bd3ba2..00
--- 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/krita-4.4.3_beta2.ebuild
b/media-gfx/krita/krita-4.4.3_beta2.ebuild
deleted file mode 100644
index 3c31724a57..00
--- a/media-gfx/krita/krita-4.4.3_beta2.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_{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/unstable/${PN}/${PV/_/-}/${PN}-${PV/_/-}.tar.xz
-
https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz";
- KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
- S="${WORKDIR}/${PN}-${PV/_/-}"
-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/libpn
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: a44526746f453950a5364e9b868f12fd7ffe7615
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Mar 12 13:40:58 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Mar 12 13:40:58 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a4452674
media-gfx/krita: 4.4.3_beta2 version bump
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/{krita-4.4.3_beta1.ebuild => krita-4.4.3_beta2.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-gfx/krita/krita-4.4.3_beta1.ebuild
b/media-gfx/krita/krita-4.4.3_beta2.ebuild
similarity index 100%
rename from media-gfx/krita/krita-4.4.3_beta1.ebuild
rename to media-gfx/krita/krita-4.4.3_beta2.ebuild
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 8efd9077f3e3e4313ffd81c9af80df4c65e8d234
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 7 21:53:03 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 7 21:55:41 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8efd9077
media-gfx/krita: 4.4.3_beta1 version bump
Package-Manager: Portage-3.0.17, 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.3_beta1.ebuild| 129
2 files changed, 165 insertions(+)
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 00..6a49bd3ba2
--- /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.3_beta1.ebuild
b/media-gfx/krita/krita-4.4.3_beta1.ebuild
new file mode 100644
index 00..3c31724a57
--- /dev/null
+++ b/media-gfx/krita/krita-4.4.3_beta1.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_{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/unstable/${PN}/${PV/_/-}/${PN}-${PV/_/-}.tar.xz
+
https://dev.gentoo.org/~asturm/distfiles/${PN}-4.2.9-patchset.tar.xz";
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+ S="${WORKDIR}/${PN}-${PV/_/-}"
+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/libp
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 995fff1878f6536b2889ca025100888ddd989143
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Mar 7 22:11:47 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Mar 7 22:11:47 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=995fff18
media-gfx/krita: Sync with Gentoo ebuild repo
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 23b774faba..c80b33670c 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.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 ~ppc64 ~x86"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
@@ -23,6 +23,9 @@ SLOT="5"
IUSE="color-management fftw gif +gsl heif +jpeg +mypaint-brush-engine openexr
pdf qtmedia +raw tiff vc"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# bug 630508
+RESTRICT+=" test"
+
BDEPEND="
dev-cpp/eigen:3
dev-lang/perl
@@ -30,7 +33,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}]
@@ -84,9 +87,6 @@ DEPEND="${RDEPEND}
vc? ( >=dev-libs/vc-1.1.0 )
"
-# bug 630508
-RESTRICT+=" test"
-
PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
pkg_setup() {
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: c7a266bd6c541693e1f0bdc68388a828739cb7f6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Jan 21 14:26:31 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jan 21 14:26:31 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c7a266bd
media-gfx/krita: Add IUSE="+mypaint-brush-engine", new DEPEND
Upstream commit fa13169d35d787d8292f8483a0ffde7d2306ea61
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 4 +++-
media-gfx/krita/metadata.xml | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 0937f70cb6..36254eb31f 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -20,7 +20,7 @@ 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"
+IUSE="color-management fftw gif +gsl heif +jpeg +mypaint-brush-engine openexr
pdf qtmedia +raw tiff vc"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
BDEPEND="
@@ -70,6 +70,7 @@ RDEPEND="${PYTHON_DEPS}
gsl? ( sci-libs/gsl:= )
jpeg? ( virtual/jpeg:0 )
heif? ( media-libs/libheif:= )
+ mypaint-brush-engine? ( media-libs/libmypaint:= )
openexr? (
media-libs/ilmbase:=
media-libs/openexr
@@ -107,6 +108,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 mypaint-brush-engine LibMyPaint)
$(cmake_use_find_package openexr OpenEXR)
$(cmake_use_find_package pdf Poppler)
$(cmake_use_find_package qtmedia Qt5Multimedia)
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index 0ee0df7f22..61254fa50d 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -8,6 +8,7 @@
Enable color management via
media-libs/opencolorio
Enable support for ISO/IEC 23008-12:2017
HEIF/HEIC image format using media-libs/libheif
+ 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] proj/kde:master commit in: media-gfx/krita/
commit: ae90f8259e7e97c6d49efd06d4449422694a8735
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Jan 19 20:40:06 2021 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Jan 19 20:44:43 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ae90f825
media-gfx/krita: Upstream rebranded SeExpr2 -> KSeExpr
Upstream commit 96ab15bffb4b047b8455cf78ed5ad03fc2a666bf
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index c117eec55f..0937f70cb6 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -100,7 +100,7 @@ src_configure() {
local mycmakeargs=(
-DENABLE_UPDATERS=OFF
- -DCMAKE_DISABLE_FIND_PACKAGE_SeExpr2=ON # not packaged
+ -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)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 4db25181b0357b745c5b9e5e5c495b00e70ee21e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Oct 30 15:12:36 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Oct 30 15:12:36 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4db25181
media-gfx/krita: Disable SeExpr2 cmake option
Not packaged in Gentoo, upstream commit a2f826437d09bd12b66c2e3315256af6267e677d
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 67c43140fb..ae806f0d42 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -101,6 +101,7 @@ src_configure() {
local mycmakeargs=(
-DENABLE_UPDATERS=OFF
+ -DCMAKE_DISABLE_FIND_PACKAGE_SeExpr2=ON # not packaged
$(cmake_use_find_package color-management OCIO)
$(cmake_use_find_package fftw FFTW3)
$(cmake_use_find_package gif GIF)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: e670123e0fcc719895d6bc66df001e2085b6e0ff
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Oct 30 15:13:28 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Oct 30 15:13:28 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e670123e
media-gfx/krita: Drop unused DEPEND
Upstream commit dd0a4a08a67fd38be1ae895c493afcef9ad4e755
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index ae806f0d42..45bb20cc57 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -45,7 +45,6 @@ RDEPEND="${PYTHON_DEPS}
>=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
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 357030fc725c55c1ee82b966ccc6ae63a526f0eb
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Tue Aug 18 14:23:47 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Aug 18 14:24:46 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=357030fc
media-gfx/krita: Disable update notifications
Upstream commit be3dcddb20a7b97401440f480049264a09689f33
Package-Manager: Portage-3.0.3, Repoman-3.0.0
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 215cf210d5..b8b25d7e3b 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -100,6 +100,7 @@ src_configure() {
addpredict /dev/dri
local mycmakeargs=(
+ -DENABLE_UPDATERS=OFF
$(cmake_use_find_package color-management OCIO)
$(cmake_use_find_package fftw FFTW3)
$(cmake_use_find_package gif GIF)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/, media-gfx/krita/files/
commit: 568d5a1aea5a1931403de7653376fcd227694d6a
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jul 11 21:58:50 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jul 12 22:53:27 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=568d5a1a
media-gfx/krita: Drop 4.3.0
Moved to Gentoo ebuild repository.
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../krita/files/krita-4.3.0-tests-optional.patch | 536 -
media-gfx/krita/krita-4.3.0.ebuild | 122 -
2 files changed, 658 deletions(-)
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 b58dcf1f4a..00
--- 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
a/libs/odf/CMakeLists.txt
-+++ b/libs/odf/CMakeLists.txt
-@@ -1,4 +1,6 @@
--add_subdirectory( tests )
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
-
- set(kritaodf_LIB_SRCS
- KoOdf.cpp
-diff --git a/libs/pigment/CMakeLists.txt b/libs/pigment/CMakeLists.txt
-index 7e38c6cb00..60879fcea2 100644
a/libs/pigment/CMakeLists.txt
-+++ b/libs/pigment/CMakeLists.txt
-@@ -33,8 +33,10 @@ else()
- set(__per_arch_alpha_applicator_factory_objs
KoAlphaMaskApplicatorFactoryImpl.cpp)
- endif()
-
--add_subdirectory(tests)
--add_subdirectory(benchmarks)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+add_subdirectory(benchmarks)
-+endif()
-
- set(kritapigment_SRCS
- DebugPigment.cpp
-diff --git a/libs/store/CMakeLists.txt b/libs/store/CMakeLists.txt
-index b7c42996bd..30f9d5c5c6 100644
a/libs/store/CMakeLists.txt
-+++ b/libs/store/CMakeLists.txt
-@@ -1,6 +1,8 @@
- include_directories(${QUAZIP_INCLUDE_DIRS})
-
--add_subdirectory(tests)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
-
- set(kritastore_LIB_SRCS
- KoDirectoryStore.cpp
-diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.t
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/, media-gfx/krita/files/
commit: 07cda4a3a1bd5fd356ea8a4961d6e12a2c870b98
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jul 12 18:48:47 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jul 12 22:53:27 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=07cda4a3
media-gfx/krita: Update tests-optional patch
Now we rely on patched ECMAddTests.cmake to skip them.
The remaining patch is much smaller.
Bug: https://bugs.gentoo.org/651978
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../krita/files/krita-4.3.1-tests-optional.patch | 80 ++
media-gfx/krita/krita-.ebuild | 2 +
2 files changed, 82 insertions(+)
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 00..37f2ac50ff
--- /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-.ebuild
b/media-gfx/krita/krita-.ebuild
index fda25b11c0..215cf210d5 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -87,6 +87,8 @@ DEPEND="${RDEPEND}
# bug 630508
RESTRICT+=" test"
+PATCHES=( "${FILESDIR}"/${PN}-4.3.1-tests-optional.patch )
+
pkg_setup() {
python-single-r1_pkg_setup
ecm_pkg_setup
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: c2e88029c765b838f605a9a72505232ac4b1c6d7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Jun 17 16:49:55 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Jun 18 17:37:47 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c2e88029
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>
.../krita/files/krita-4.2.4-tests-optional.patch | 399 ---
.../krita/files/krita-4.3.0-tests-optional.patch | 536 +
...krita-4.3.0_beta2.ebuild => krita-4.3.0.ebuild} | 5 +-
3 files changed, 538 insertions(+), 402 deletions(-)
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
deleted file mode 100644
index 2f13c999b6..00
--- a/media-gfx/krita/files/krita-4.2.4-tests-optional.patch
+++ /dev/null
@@ -1,399 +0,0 @@
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)
-+if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
-
- set(kritatooltransform_SOURCES
a/plugins/impex/svg/CMakeLists.txt 2019-07-31 11:22:19.658863444 +0200
-+++ b/plugins/impex/svg/CMakeLists.txt 2019-07-31 11:22:19.662863472 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritasvgimport_SOURCES
- kis_svg_import.cc
a/plugins/impex/brush/CMakeLists.txt 2019-07-31 11:22:19.668863514
+0200
-+++ b/plugins/impex/brush/CMakeLists.txt 2019-07-31 11:22:19.672863542
+0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
-
- set(kritabrushexport_PART_SRCS
- kis_brush_export.cpp
a/plugins/impex/psd/CMakeLists.txt 2019-07-31 11:22:19.678863584 +0200
-+++ b/plugins/impex/psd/CMakeLists.txt 2019-07-31 11:22:19.684863626 +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/tga/CMakeLists.
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 6b20c83a5932f207222474568b074202bfae3f64
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jun 8 12:54:51 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jun 8 12:54:51 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6b20c83a
media-gfx/krita: Add 4.3.0_beta2, python3_9
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner gentoo.org>
.../krita/files/krita-4.2.4-tests-optional.patch | 399 +
...{krita-.ebuild => krita-4.3.0_beta2.ebuild} | 15 +-
media-gfx/krita/krita-.ebuild | 2 +-
3 files changed, 411 insertions(+), 5 deletions(-)
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 00..2f13c999b6
--- /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)
++if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+
+ set(kritatooltransform_SOURCES
+--- a/plugins/impex/svg/CMakeLists.txt 2019-07-31 11:22:19.658863444 +0200
b/plugins/impex/svg/CMakeLists.txt 2019-07-31 11:22:19.662863472 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritasvgimport_SOURCES
+ kis_svg_import.cc
+--- a/plugins/impex/brush/CMakeLists.txt 2019-07-31 11:22:19.668863514
+0200
b/plugins/impex/brush/CMakeLists.txt 2019-07-31 11:22:19.672863542
+0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+
+ set(kritabrushexport_PART_SRCS
+ kis_brush_export.cpp
+--- a/plugins/impex/psd/CMakeLists.txt 2019-07-31 11:22:19.678863584 +0200
b/plugins/impex/psd/CMakeLists.txt 2019-07-31 11:22:19.684863626 +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/tga/CMakeLists.txt 2019-07
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 6ddc319a8b01fd993cf32d101a33360e80c269c3
Author: Georgy Yakovlev gentoo org>
AuthorDate: Wed Mar 11 07:04:15 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Mar 26 13:46:28 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6ddc319a
media-gfx/krita: keyword on ~ppc64
Package-Manager: Portage-2.3.93, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index d63db937de..0033933a87 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.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 ~x86"
+ KEYWORDS="~amd64 ~ppc64 ~x86"
fi
DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 1a16907e303b1d20b54688fd538473501f5090c6
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Feb 12 00:08:33 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Feb 12 00:08:33 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1a16907e
media-gfx/krita: Update HOMEPAGE
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 7b705c5378..c093df17f4 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -16,7 +16,7 @@ if [[ ${KDE_BUILD_TYPE} = release ]]; then
fi
DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
-HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/";
+HOMEPAGE="https://kde.org/applications/graphics/org.kde.krita
https://krita.org/en/";
LICENSE="GPL-3"
SLOT="5"
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 85aacd3cc039ac20e386e021411cacd554e2e6ad
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Feb 12 00:08:58 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Feb 12 00:08:58 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=85aacd3c
media-gfx/krita: python3_8
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index c093df17f4..d63db937de 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -4,7 +4,7 @@
EAPI=7
ECM_TEST="forceoptional-recursive"
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8} )
KFMIN=5.60.0
QTMIN=5.12.3
VIRTUALX_REQUIRED="test"
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 9cee744758cbf52144ab9e409b041fed7eb9e21b
Author: Michał Górny gentoo org>
AuthorDate: Fri Feb 7 15:04:22 2020 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 9 18:05:27 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9cee7447
media-gfx/krita: Switch to PYTHON_MULTI_USEDEP API
Signed-off-by: Michał Górny gentoo.org>
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index fcf7239d28..7b705c5378 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -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] proj/kde:master commit in: media-gfx/krita/
commit: 6fd1d431b709583b9044edd81c278de8ded151f5
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Nov 10 23:52:31 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Nov 10 23:52:31 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6fd1d431
media-gfx/krita: Port to ecm.eclass and kde.org.eclass
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 62 +--
1 file changed, 33 insertions(+), 29 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index a39f760956..fd93648acb 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -3,10 +3,12 @@
EAPI=7
-KDE_TEST="forceoptional-recursive"
-VIRTUALX_REQUIRED="test"
+ECM_TEST="forceoptional-recursive"
PYTHON_COMPAT=( python3_{6,7} )
-inherit kde5 python-single-r1
+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}/${PV}/${P}.tar.xz"
@@ -15,7 +17,9 @@ 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}"
@@ -25,33 +29,33 @@ BDEPEND="
sys-devel/gettext
"
RDEPEND="${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}]
+ >=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=
@@ -70,7 +74,7 @@ RDEPEND="${PYTHON_DEPS}
media-libs/openexr
)
pdf? ( app-text/poppler[qt5] )
- qtmedia? ( $(add_qt_dep qtmultimedia) )
+ qtmedia? ( >=dev-qt/qtmultimedia-${QTMIN}:5 )
raw? ( media-libs/libraw:= )
tiff? ( media-libs/tiff:0 )
"
@@ -83,7 +87,7 @@ RESTRICT+=" test"
pkg_setup() {
python-single-r1_pkg_setup
- kde5_pkg_setup
+ ecm_pkg_setup
}
src_configure() {
@@ -106,5 +110,5 @@ src_configure() {
$(cmake-utils_use_find_package vc Vc)
)
- kde5_src_configure
+ ecm_src_configure
}
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 2ebbf0d7690527b43e5827dca8e9a7b0a64294e8
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Oct 24 18:30:23 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Oct 24 18:30:23 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2ebbf0d7
media-gfx/krita: Drop obsolete blockers
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 8 ++--
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 3be1c7e691..a39f760956 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -24,7 +24,7 @@ BDEPEND="
dev-lang/perl
sys-devel/gettext
"
-COMMON_DEPEND="${PYTHON_DEPS}
+RDEPEND="${PYTHON_DEPS}
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
@@ -74,13 +74,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
raw? ( media-libs/libraw:= )
tiff? ( media-libs/tiff:0 )
"
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
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"
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 8b23e8f09b61b8ef3b50cf168ca4a0aa9f1bd372
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Sep 6 20:34:24 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Sep 6 20:34:24 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8b23e8f0
media-gfx/krita: Drop x11-libs/libxcb from DEPENDs
Upstream commit ca902a45579c01472ef0df39d56bf3ad834cd430
Package-Manager: Portage-2.3.75, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index cc1fd49df6..f9fedec259 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -58,7 +58,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
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= )
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: dc6a58380508ba81b39b48a4b5c52214c89b7098
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Aug 4 18:58:44 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Aug 4 18:58:44 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dc6a5838
media-gfx/krita: Switch release to tar.xz
Package-Manager: Portage-2.3.70, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 430751f4f4..cc1fd49df6 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -9,7 +9,7 @@ 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"
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
KEYWORDS="~amd64 ~x86"
fi
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 95bf7357759bec3c447c7b898cfbcface8396294
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon Jul 15 16:56:18 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon Jul 15 16:56:18 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=95bf7357
media-gfx/krita: Drop obsolete QT_MINIMAL
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 91ad54e36e..430751f4f4 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -4,7 +4,6 @@
EAPI=7
KDE_TEST="forceoptional-recursive"
-QT_MINIMAL="5.12.3"
VIRTUALX_REQUIRED="test"
PYTHON_COMPAT=( python3_{5,6,7} )
inherit kde5 python-single-r1
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 7aab44e88146abec3a6dfc523ebaa6242a6314e7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jun 1 13:25:26 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jun 1 13:25:26 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7aab44e8
media-gfx/krita: dev-qt/qtgui slot op 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/krita-.ebuild | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 2dbc68e759..91ad54e36e 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -4,13 +4,13 @@
EAPI=7
KDE_TEST="forceoptional-recursive"
-QT_MINIMAL="5.11.3"
+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%.1}/${P}.tar.gz"
+ SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
KEYWORDS="~amd64 ~x86"
fi
@@ -42,7 +42,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
$(add_qt_dep qtdeclarative)
- $(add_qt_dep qtgui '-gles2')
+ $(add_qt_dep qtgui '-gles2' '' '5=')
$(add_qt_dep qtnetwork)
$(add_qt_dep qtprintsupport)
$(add_qt_dep qtsvg)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: c0018b2af708847977e1e9acc72994c6be4a015f
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Mon May 27 18:49:04 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Mon May 27 18:49:04 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c0018b2a
media-gfx/krita: Add back kde-frameworks/karchive DEPEND
Upstream commit 4cb990274f8664d4eb3311af7755c8ff6065150c
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 2984137920..2dbc68e759 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -26,6 +26,7 @@ BDEPEND="
sys-devel/gettext
"
COMMON_DEPEND="${PYTHON_DEPS}
+ $(add_frameworks_dep karchive)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kcoreaddons)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 196ccdf29f2f273f9e67e0581351669866eca498
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Feb 17 10:30:09 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Feb 17 10:30:09 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=196ccdf2
media-gfx/krita: Fix USE vc DEPEND
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 8 +---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 8357d2ea5c..23d3275624 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -24,9 +24,8 @@ BDEPEND="
dev-cpp/eigen:3
dev-lang/perl
sys-devel/gettext
- vc? ( >=dev-libs/vc-1.1.0 )
"
-DEPEND="${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kcoreaddons)
@@ -76,7 +75,10 @@ DEPEND="${PYTHON_DEPS}
raw? ( media-libs/libraw:= )
tiff? ( media-libs/tiff:0 )
"
-RDEPEND="${DEPEND}
+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(+)]
"
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/, kde-frameworks/extra-cmake-modules/, kde-apps/lokalize/, ...
commit: 657bda4f6225f0c2e8917cdf5914d65ba3802e77
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jan 26 23:44:58 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jan 26 23:44:58 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=657bda4f
*/*: Drop python3_4
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
dev-util/kdevelop-python/kdevelop-python-5.3..ebuild | 2 +-
dev-util/kdevelop-python/kdevelop-python-.ebuild | 2 +-
kde-apps/lokalize/lokalize-18.12.49..ebuild| 2 +-
kde-apps/lokalize/lokalize-.ebuild | 2 +-
kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild | 2 +-
kde-frameworks/kfilemetadata/kfilemetadata-.ebuild | 2 +-
kde-frameworks/ki18n/ki18n-.ebuild | 2 +-
media-gfx/krita/krita-.ebuild | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/dev-util/kdevelop-python/kdevelop-python-5.3..ebuild
b/dev-util/kdevelop-python/kdevelop-python-5.3..ebuild
index 91b6ad4151..d9c943694f 100644
--- a/dev-util/kdevelop-python/kdevelop-python-5.3..ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-5.3..ebuild
@@ -7,7 +7,7 @@ EGIT_BRANCH="5.3"
KDE_TEST="forceoptional"
KDEBASE="kdevelop"
KMNAME="kdev-python"
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
inherit kde5 python-single-r1
DESCRIPTION="Python plugin for KDevelop"
diff --git a/dev-util/kdevelop-python/kdevelop-python-.ebuild
b/dev-util/kdevelop-python/kdevelop-python-.ebuild
index 7624f156fd..7e79b54169 100644
--- a/dev-util/kdevelop-python/kdevelop-python-.ebuild
+++ b/dev-util/kdevelop-python/kdevelop-python-.ebuild
@@ -6,7 +6,7 @@ EAPI=7
KDE_TEST="forceoptional"
KDEBASE="kdevelop"
KMNAME="kdev-python"
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
inherit kde5 python-single-r1
DESCRIPTION="Python plugin for KDevelop"
diff --git a/kde-apps/lokalize/lokalize-18.12.49..ebuild
b/kde-apps/lokalize/lokalize-18.12.49..ebuild
index b616dcdf0b..fc723ba4c7 100644
--- a/kde-apps/lokalize/lokalize-18.12.49..ebuild
+++ b/kde-apps/lokalize/lokalize-18.12.49..ebuild
@@ -4,7 +4,7 @@
EAPI=6
KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit python-single-r1 kde5
DESCRIPTION="KDE Applications 5 translation tool"
diff --git a/kde-apps/lokalize/lokalize-.ebuild
b/kde-apps/lokalize/lokalize-.ebuild
index c77eebb841..2dc24b9a23 100644
--- a/kde-apps/lokalize/lokalize-.ebuild
+++ b/kde-apps/lokalize/lokalize-.ebuild
@@ -4,7 +4,7 @@
EAPI=7
KDE_HANDBOOK="forceoptional"
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+PYTHON_COMPAT=( python2_7 python3_{5,6} )
inherit python-single-r1 kde5
DESCRIPTION="KDE Applications 5 translation tool"
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
index c9c1d975bb..b7be0b53d6 100644
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
ECM_KDEINSTALLDIRS="false"
KDE_AUTODEPS="false"
KDE_DEBUG="false"
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-.ebuild
b/kde-frameworks/kfilemetadata/kfilemetadata-.ebuild
index de47594427..45d93bf9cc 100644
--- a/kde-frameworks/kfilemetadata/kfilemetadata-.ebuild
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
inherit kde5 python-any-r1
DESCRIPTION="Library for extracting file metadata"
diff --git a/kde-frameworks/ki18n/ki18n-.ebuild
b/kde-frameworks/ki18n/ki18n-.ebuild
index 53f27ced5a..c884c6d473 100644
--- a/kde-frameworks/ki18n/ki18n-.ebuild
+++ b/kde-frameworks/ki18n/ki18n-.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_{4,5,6,7}} )
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
inherit kde5 python-single-r1
DESCRIPTION="Framework based on Gettext for internationalizing user interface
text"
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 783f712ce7..8357d2ea5c 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -6,7 +6,7 @@ EAPI=7
KDE_TEST="forceoptional-recursive"
QT_MINIMAL="5.11.3"
VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{4,5,6,7} )
+PYTHON_COMPAT=( python3_{5,6,7} )
inherit kde5 python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 4336cd2d621f01d238a5218e02957d6841af90f7
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jan 26 21:55:49 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jan 26 21:55:49 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4336cd2d
media-gfx/krita: Update DEPENDs
Upstream commit 593dba2b7098049092072a4260005996b34a8a56
Package-Manager: Portage-2.3.58, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 41e3c6ff9b..783f712ce7 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -27,7 +27,6 @@ BDEPEND="
vc? ( >=dev-libs/vc-1.1.0 )
"
DEPEND="${PYTHON_DEPS}
- $(add_frameworks_dep karchive)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
$(add_frameworks_dep kcoreaddons)
@@ -51,6 +50,7 @@ DEPEND="${PYTHON_DEPS}
$(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:=
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 594d66a0fab02b65063de87525c2e53c32cceb3e
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat Jan 19 16:49:55 2019 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat Jan 26 20:28:42 2019 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=594d66a0
media-gfx/krita: EAPI-7 bump
Package-Manager: Portage-2.3.56, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index e33c5fa4d9..41e3c6ff9b 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
KDE_TEST="forceoptional-recursive"
QT_MINIMAL="5.11.3"
@@ -20,7 +20,13 @@ LICENSE="GPL-3"
IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff
vc"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-COMMON_DEPEND="${PYTHON_DEPS}
+BDEPEND="
+ dev-cpp/eigen:3
+ dev-lang/perl
+ sys-devel/gettext
+ vc? ( >=dev-libs/vc-1.1.0 )
+"
+DEPEND="${PYTHON_DEPS}
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
@@ -70,13 +76,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
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}
+RDEPEND="${DEPEND}
!app-office/calligra:4[calligra_features_krita]
!app-office/calligra-l10n:4[calligra_features_krita(+)]
"
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 9fc2f570da6f315d6476061050d585773a9407a5
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Dec 16 19:38:00 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Dec 16 19:38:00 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9fc2f570
media-gfx/krita: Sync with Gentoo ebuild repo
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner gentoo.org>
media-gfx/krita/krita-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 0a7be5dabe..89c934 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -4,8 +4,9 @@
EAPI=6
KDE_TEST="forceoptional-recursive"
+QT_MINIMAL="5.11.3"
VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_{4,5,6,7} )
inherit kde5 python-single-r1
if [[ ${KDE_BUILD_TYPE} = release ]]; then
@@ -28,7 +29,6 @@ COMMON_DEPEND="${PYTHON_DEPS}
$(add_frameworks_dep kguiaddons)
$(add_frameworks_dep ki18n)
$(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kio)
$(add_frameworks_dep kitemmodels)
$(add_frameworks_dep kitemviews)
$(add_frameworks_dep kwidgetsaddons)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 09d8edf7fc6846efbe9a2666d0bf640949252b19
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Thu Oct 4 10:46:38 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Thu Oct 4 10:53:03 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=09d8edf7
media-gfx/krita: Add USE heif
Upstream commit bf21ee1e4d83256900d843e00c495e7cf9646e35
Signed-off-by: Andreas Sturmlechner gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
media-gfx/krita/krita-.ebuild | 6 --
media-gfx/krita/metadata.xml | 1 +
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 8d2f3b2f08..0a7be5dabe 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -16,7 +16,7 @@ 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 +jpeg openexr pdf qtmedia +raw tiff vc"
+IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff
vc"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
COMMON_DEPEND="${PYTHON_DEPS}
@@ -60,6 +60,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
gif? ( media-libs/giflib )
gsl? ( sci-libs/gsl:= )
jpeg? ( virtual/jpeg:0 )
+ heif? ( media-libs/libheif:= )
openexr? (
media-libs/ilmbase:=
media-libs/openexr
@@ -98,6 +99,7 @@ src_configure() {
$(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)
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index c63335afbc..0ee0df7f22 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -7,6 +7,7 @@
Enable color management via
media-libs/opencolorio
+ Enable support for ISO/IEC 23008-12:2017
HEIF/HEIC image format using media-libs/libheif
Enable sound support for animations via
dev-qt/qtmultimedia
Enable support for dev-libs/vc,
could be a significant speed boost
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 895f1b637f8ddb47b4363cc215c0775104ae8e21
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Aug 29 16:31:04 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Tue Sep 4 21:53:27 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=895f1b63
media-gfx/krita: Need addpredict /dev/dri
Closes: https://bugs.gentoo.org/655918
Package-Manager: Portage-2.3.48, Repoman-2.3.10
media-gfx/krita/krita-.ebuild | 4
1 file changed, 4 insertions(+)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 17fe9fd0e5..8d2f3b2f08 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -89,6 +89,10 @@ 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)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: b380b88d8a30c355c68f30ff36fd21f9060186f5
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Aug 29 10:22:00 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Aug 29 10:51:23 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b380b88d
media-gfx/krita: Drop USE=python and make it unconditional
USE=-python breaks cmake and would need a patch to keep up.
Package-Manager: Portage-2.3.48, Repoman-2.3.10
media-gfx/krita/krita-.ebuild | 18 +++---
1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 04f2354e07..17fe9fd0e5 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -16,10 +16,10 @@ 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 +jpeg openexr pdf python qtmedia +raw
tiff vc"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+IUSE="color-management fftw gif +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-COMMON_DEPEND="
+COMMON_DEPEND="${PYTHON_DEPS}
$(add_frameworks_dep karchive)
$(add_frameworks_dep kcompletion)
$(add_frameworks_dep kconfig)
@@ -45,6 +45,8 @@ COMMON_DEPEND="
$(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=
@@ -63,11 +65,6 @@ COMMON_DEPEND="
media-libs/openexr
)
pdf? ( app-text/poppler[qt5] )
- python? (
- ${PYTHON_DEPS}
- dev-python/PyQt5[${PYTHON_USEDEP}]
- dev-python/sip[${PYTHON_USEDEP}]
- )
qtmedia? ( $(add_qt_dep qtmultimedia) )
raw? ( media-libs/libraw:= )
tiff? ( media-libs/tiff:0 )
@@ -87,7 +84,8 @@ RDEPEND="${COMMON_DEPEND}
RESTRICT+=" test"
pkg_setup() {
- use python && python-single-r1_pkg_setup
+ python-single-r1_pkg_setup
+ kde5_pkg_setup
}
src_configure() {
@@ -99,8 +97,6 @@ src_configure() {
$(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 python PyQt5)
- $(cmake-utils_use_find_package python SIP)
$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
$(cmake-utils_use_find_package raw LibRaw)
$(cmake-utils_use_find_package tiff TIFF)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: b89498063466a2f77a3cb6712d7da80a2c690e0e
Author: Johannes Huber gentoo org>
AuthorDate: Sun Apr 8 15:50:44 2018 +
Commit: Johannes Huber gentoo org>
CommitDate: Sun Apr 8 16:02:40 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=b8949806
media-gfx/krita: Add release switch
Package-Manager: Portage-2.3.28, Repoman-2.3.9
media-gfx/krita/krita-.ebuild | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 2815e69719..0f8e2fef6b 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -8,11 +8,14 @@ VIRTUALX_REQUIRED="test"
PYTHON_COMPAT=( python3_{4,5,6} )
inherit kde5 python-single-r1
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+ SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${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"
-KEYWORDS=""
IUSE="color-management fftw gif +gsl +jpeg openexr pdf python qtmedia +raw
tiff vc"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 9d09d9a00988953486e2ae3670f0e2666343045b
Author: Johannes Huber gentoo org>
AuthorDate: Sun Apr 8 15:59:08 2018 +
Commit: Johannes Huber gentoo org>
CommitDate: Sun Apr 8 16:02:40 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9d09d9a0
media-gfx/krita: Restrict tests
Closes: https://bugs.gentoo.org/630508
Package-Manager: Portage-2.3.28, Repoman-2.3.9
media-gfx/krita/krita-.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 5b3dd7b4ef..04f2354e07 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -83,6 +83,9 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra-l10n:4[calligra_features_krita(+)]
"
+# bug 630508
+RESTRICT+=" test"
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 70a718f3d38ae41f544c65dec1d6b86d71be96f2
Author: Johannes Huber gentoo org>
AuthorDate: Sun Apr 8 15:47:25 2018 +
Commit: Johannes Huber gentoo org>
CommitDate: Sun Apr 8 16:02:40 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=70a718f3
media-gfx/krita: Add python use flag
Upstream commit 5f0f100d6a99d3e1801dccd86ca38a88d9acd981
Package-Manager: Portage-2.3.28, Repoman-2.3.9
media-gfx/krita/krita-.ebuild | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 59aac9fc7e..2815e69719 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -5,14 +5,16 @@ EAPI=6
KDE_TEST="forceoptional-recursive"
VIRTUALX_REQUIRED="test"
-inherit kde5
+PYTHON_COMPAT=( python3_{4,5,6} )
+inherit kde5 python-single-r1
DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/";
LICENSE="GPL-3"
KEYWORDS=""
-IUSE="color-management fftw gif +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
+IUSE="color-management fftw gif +gsl +jpeg openexr pdf python qtmedia +raw
tiff vc"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
COMMON_DEPEND="
$(add_frameworks_dep karchive)
@@ -57,6 +59,11 @@ COMMON_DEPEND="
media-libs/openexr
)
pdf? ( app-text/poppler[qt5] )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/PyQt5[${PYTHON_USEDEP}]
+ dev-python/sip[${PYTHON_USEDEP}]
+ )
qtmedia? ( $(add_qt_dep qtmultimedia) )
raw? ( media-libs/libraw:= )
tiff? ( media-libs/tiff:0 )
@@ -72,6 +79,10 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra-l10n:4[calligra_features_krita(+)]
"
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package color-management OCIO)
@@ -81,6 +92,8 @@ src_configure() {
$(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 python PyQt5)
+ $(cmake-utils_use_find_package python SIP)
$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
$(cmake-utils_use_find_package raw LibRaw)
$(cmake-utils_use_find_package tiff TIFF)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 555949daa1701ad95669eda3c50eca82a7092272 Author: Johannes Huber gentoo org> AuthorDate: Sun Apr 8 15:54:27 2018 + Commit: Johannes Huber gentoo org> CommitDate: Sun Apr 8 16:02:40 2018 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=555949da media-gfx/krita: DEPEND on dev-qt/qtdeclarative Package-Manager: Portage-2.3.28, Repoman-2.3.9 media-gfx/krita/krita-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index 0f8e2fef6b..5b3dd7b4ef 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -36,6 +36,7 @@ COMMON_DEPEND=" $(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)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 663545ea2639a1d5e6362e563b76a9d526f9684b
Author: Johannes Huber gentoo org>
AuthorDate: Sun Apr 8 14:25:24 2018 +
Commit: Johannes Huber gentoo org>
CommitDate: Sun Apr 8 14:25:24 2018 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=663545ea
media-gfx/krita: Add use flag gif
Upstream commit a4cef6af0d8cb6ff0920227fd578933d1e878652
Package-Manager: Portage-2.3.28, Repoman-2.3.9
media-gfx/krita/krita-.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 2bc43106ec..59aac9fc7e 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/graphics/krita/
https://krita.org/";
LICENSE="GPL-3"
KEYWORDS=""
-IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
+IUSE="color-management fftw gif +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
COMMON_DEPEND="
$(add_frameworks_dep karchive)
@@ -49,6 +49,7 @@ COMMON_DEPEND="
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 )
openexr? (
@@ -75,6 +76,7 @@ src_configure() {
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 jpeg JPEG)
$(cmake-utils_use_find_package openexr OpenEXR)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 293c8cf5a5a96b66035bc19e0edab6c5010702c4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Sep 10 14:48:38 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Sep 10 14:48:38 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=293c8cf5 media-gfx/krita: VIRTUALX_REQUIRED="test" Gentoo-bug: 630508 Package-Manager: Portage-2.3.8, Repoman-2.3.3 media-gfx/krita/krita-.ebuild | 1 + 1 file changed, 1 insertion(+) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index 76108bc96f..e72ee76156 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -4,6 +4,7 @@ EAPI=6 KDE_TEST="forceoptional-recursive" +VIRTUALX_REQUIRED="test" inherit kde5 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 122f10147ad5e89f94b8417bdb1f580fbfb1c14a Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Aug 19 21:27:31 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 20 08:19:51 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=122f1014 media-gfx/krita: Drop unused DEPEND, set KDE_TEST=forceoptional-recursive Upstream commit 176546ed492883b63f6b8c274a97ce781af3631c Package-Manager: Portage-2.3.8, Repoman-2.3.3 media-gfx/krita/krita-.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index db4a97469b..76108bc96f 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -3,7 +3,7 @@ EAPI=6 -KDE_TEST="forceoptional" +KDE_TEST="forceoptional-recursive" inherit kde5 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" @@ -41,7 +41,6 @@ COMMON_DEPEND=" media-gfx/exiv2:= media-libs/lcms media-libs/libpng:0= - net-misc/curl sys-libs/zlib virtual/opengl x11-libs/libX11
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 0fb9740b47528dcf8a0296762bea0175e7da7e98 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri May 26 16:11:30 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri May 26 16:11:30 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0fb9740b media-gfx/krita: Update LICENSE Upstream commit 508f09939f8b2aa2daf9445badf3d27d3022120f Package-Manager: Portage-2.3.5, Repoman-2.3.1 media-gfx/krita/krita-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index af20495e6f..db4a97469b 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -9,7 +9,7 @@ inherit kde5 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"; -LICENSE="GPL-2+" +LICENSE="GPL-3" KEYWORDS="" IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 48aab06f1d07910a177d3eaaa0491b71b1334ef5
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Feb 2 09:00:19 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Feb 2 09:00:24 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=48aab06f
media-gfx/krita: adapt to upstream build system changes
Upstream-commit: 757b74d63a2aec4312be7355b54754ced7ecbe00
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-gfx/krita/krita-.ebuild | 18 +-
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 027f455..19c9581 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -74,16 +74,16 @@ RDEPEND="${COMMON_DEPEND}
src_configure() {
local mycmakeargs=(
- -DWITH_FFTW3=$(usex fftw)
- -DWITH_GSL=$(usex gsl)
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_LibRaw=$(usex raw)
- -DWITH_OCIO=$(usex color-management)
- -DWITH_OpenEXR=$(usex openexr)
- -DWITH_Poppler=$(usex pdf)
+ $(cmake-utils_use_find_package color-management OCIO)
+ $(cmake-utils_use_find_package fftw FFTW3)
+ $(cmake-utils_use_find_package gsl GSL)
+ $(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)
- -DWITH_TIFF=$(usex tiff)
- -DWITH_Vc=$(usex vc)
+ $(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] proj/kde:master commit in: media-gfx/krita/
commit: f67450eabe6cabce9c1b4e1c6e49cdb21a3e15f4 Author: Michael Palimaka gentoo org> AuthorDate: Thu Feb 2 08:36:19 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Feb 2 08:36:49 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f67450ea media-gfx/krita: pin media-libs/libpng to SLOT 0 Package-Manager: Portage-2.3.3, Repoman-2.3.1 media-gfx/krita/krita-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index 2bcfe70..027f455 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -41,7 +41,7 @@ COMMON_DEPEND=" dev-libs/boost:= media-gfx/exiv2:= media-libs/lcms - media-libs/libpng:= + media-libs/libpng:0= net-misc/curl sys-libs/zlib virtual/opengl
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: cc611432483947e5faf7d1199935aaa1cbbd8a6c
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Fri Jan 20 00:00:16 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Fri Jan 20 00:00:16 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=cc611432
media-gfx/krita: Add USE=qtmedia
Upstream commit 4315b1d2a177d9740e3da55275c34f304586b26d
Package-Manager: portage-2.3.0
media-gfx/krita/krita-.ebuild | 4 +++-
media-gfx/krita/metadata.xml | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index b1475c5..2bcfe70 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/graphics/krita/
https://krita.org/";
LICENSE="GPL-2+"
KEYWORDS=""
-IUSE="color-management fftw +gsl +jpeg openexr pdf +raw tiff vc"
+IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
COMMON_DEPEND="
$(add_frameworks_dep karchive)
@@ -57,6 +57,7 @@ COMMON_DEPEND="
media-libs/openexr
)
pdf? ( app-text/poppler[qt5] )
+ qtmedia? ( $(add_qt_dep qtmultimedia) )
raw? ( media-libs/libraw:= )
tiff? ( media-libs/tiff:0 )
"
@@ -80,6 +81,7 @@ src_configure() {
-DWITH_OCIO=$(usex color-management)
-DWITH_OpenEXR=$(usex openexr)
-DWITH_Poppler=$(usex pdf)
+ $(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-DWITH_TIFF=$(usex tiff)
-DWITH_Vc=$(usex vc)
)
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
index adafed4..c63335a 100644
--- a/media-gfx/krita/metadata.xml
+++ b/media-gfx/krita/metadata.xml
@@ -7,6 +7,7 @@
Enable color management via
media-libs/opencolorio
+ Enable sound support for animations via
dev-qt/qtmultimedia
Enable support for dev-libs/vc,
could be a significant speed boost
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 04b9e9a2ac731a7b07bed9f57ee3b816849196f8
Author: Johannes Huber gentoo org>
AuthorDate: Sat Dec 17 17:54:38 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Sat Dec 17 17:54:38 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=04b9e9a2
media-gfx/krita: Sync with gentoo main tree
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch | 17 -
media-gfx/krita/krita-.ebuild | 4
2 files changed, 21 deletions(-)
diff --git a/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
b/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
deleted file mode 100644
index 11c1105..000
--- a/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
-
-Gentoo-bug: 584118
-
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -525,10 +525,6 @@
- endif()
- endmacro()
-
--if (NOT PACKAGERS_BUILD)
--# Optimize everything for the current architecture
--set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
--endif ()
- endif()
- set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
-
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 8ee6353..6360555 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -71,10 +71,6 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra-l10n:4[calligra_features_krita(+)]
"
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.1-vc-cxxflags.patch"
-)
-
src_configure() {
local mycmakeargs=(
-DWITH_FFTW3=$(usex fftw)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/, media-gfx/krita/files/
commit: dee51a1b9f5e7511897a22a122a2fba4edb7ed82
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Oct 27 19:41:40 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Oct 27 19:41:51 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=dee51a1b
media-gfx/krita: drop breeze collision patch
Upstream-commit: f50c5949365e333e9762b635722251a8406b3f81
Package-Manager: portage-2.3.2
.../krita/files/krita-3.0.1-breeze-collisions.patch | 16
media-gfx/krita/krita-.ebuild| 1 -
2 files changed, 17 deletions(-)
diff --git a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
deleted file mode 100644
index 890f825..000
--- a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Avoid installing files that collide with kde-plasma/breeze.
-
-Gentoo-bug: 594594
-KDE-bug: 368093
-
a/krita/data/themes/CMakeLists.txt
-+++ b/krita/data/themes/CMakeLists.txt
-@@ -1,8 +1,6 @@
- ### install files ###
-
- install(FILES
--BreezeDark.colors
--BreezeHighContrast.colors
- BreezeLight.colors
- KritaNeutral.colors
- KritaBlender.colors
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 33d11a2..8ee6353 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -72,7 +72,6 @@ RDEPEND="${COMMON_DEPEND}
"
PATCHES=(
- "${FILESDIR}/${PN}-3.0.1-breeze-collisions.patch"
"${FILESDIR}/${PN}-3.0.1-vc-cxxflags.patch"
)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 0daa6cad90f282b47fba71003079cc9c8a2273af
Author: Andreas Sturmlechner gmail com>
AuthorDate: Thu Sep 29 07:40:42 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 29 09:06:16 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0daa6cad
media-gfx/krita: Add blocker against calligra-l10n
Package-Manager: portage-2.3.0
media-gfx/krita/krita-.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 4634b46..33d11a2 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -68,6 +68,7 @@ DEPEND="${COMMON_DEPEND}
"
RDEPEND="${COMMON_DEPEND}
!app-office/calligra:4[calligra_features_krita]
+ !app-office/calligra-l10n:4[calligra_features_krita(+)]
"
PATCHES=(
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/files/, media-gfx/krita/
commit: 3f62cdbbba05554ccc0230d532e5ba2193b8ac4c
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Sep 22 11:38:03 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 22 11:38:08 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3f62cdbb
media-gfx/krita: avoid automagic CXXFLAG detection courtesy of dev-libs/vc
Gentoo-bug: 584118
Package-Manager: portage-2.3.1
media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch | 17 +
media-gfx/krita/krita-.ebuild | 5 -
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
b/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
new file mode 100644
index 000..11c1105
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
@@ -0,0 +1,17 @@
+Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
+
+Gentoo-bug: 584118
+
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -525,10 +525,6 @@
+ endif()
+ endmacro()
+
+-if (NOT PACKAGERS_BUILD)
+-# Optimize everything for the current architecture
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
+-endif ()
+ endif()
+ set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
+
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 930b316..4634b46 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -70,7 +70,10 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra:4[calligra_features_krita]
"
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-breeze-collisions.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-3.0.1-breeze-collisions.patch"
+ "${FILESDIR}/${PN}-3.0.1-vc-cxxflags.patch"
+)
src_configure() {
local mycmakeargs=(
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/, media-gfx/krita/files/
commit: 2b1cbfea543a690796f4a6292d5c408106f75fd9
Author: Michael Palimaka gentoo org>
AuthorDate: Thu Sep 22 11:33:58 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Thu Sep 22 11:38:08 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2b1cbfea
media-gfx/krita: add patch solving file collision with kde-plasma/breeze
Gentoo-bug: 594594
KDE-bug: 368093
Package-Manager: portage-2.3.1
.../krita/files/krita-3.0.1-breeze-collisions.patch | 16
media-gfx/krita/krita-.ebuild| 2 ++
2 files changed, 18 insertions(+)
diff --git a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
new file mode 100644
index 000..890f825
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
@@ -0,0 +1,16 @@
+Avoid installing files that collide with kde-plasma/breeze.
+
+Gentoo-bug: 594594
+KDE-bug: 368093
+
+--- a/krita/data/themes/CMakeLists.txt
b/krita/data/themes/CMakeLists.txt
+@@ -1,8 +1,6 @@
+ ### install files ###
+
+ install(FILES
+-BreezeDark.colors
+-BreezeHighContrast.colors
+ BreezeLight.colors
+ KritaNeutral.colors
+ KritaBlender.colors
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 0ad1ee1..930b316 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -70,6 +70,8 @@ RDEPEND="${COMMON_DEPEND}
!app-office/calligra:4[calligra_features_krita]
"
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-breeze-collisions.patch" )
+
src_configure() {
local mycmakeargs=(
-DWITH_FFTW3=$(usex fftw)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: a2b249a451626d48abd21c6dc8162192ea5e9d32 Author: Michael Palimaka gentoo org> AuthorDate: Thu Sep 22 11:16:49 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Sep 22 11:17:05 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a2b249a4 media-gfx/krita: upstream doesn't support building with gles2 Gentoo-bug: 585334 KDE-bug: 357708 Package-Manager: portage-2.3.1 media-gfx/krita/krita-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index e3a2531..0ad1ee1 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -31,7 +31,7 @@ COMMON_DEPEND=" $(add_frameworks_dep kxmlgui) $(add_qt_dep qtconcurrent) $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) + $(add_qt_dep qtgui '-gles2') $(add_qt_dep qtnetwork) $(add_qt_dep qtprintsupport) $(add_qt_dep qtsvg)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 063474d0d660813bbf5fa42c7e9db1c392fb2c17
Author: Andreas Sturmlechner gmail com>
AuthorDate: Sat Aug 6 13:11:47 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Aug 7 16:30:45 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=063474d0
media-gfx/krita: Update Vc DEPEND, drop USE=jpeg2k
Upstream commits:
cf76bbcd708723b61104ae3c7bbd94d2f8de2779
3747300737ffed138ae321b66234cab682481594
Package-Manager: portage-2.2.28
media-gfx/krita/krita-.ebuild | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 859b961..e3a2531 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://www.kde.org/applications/graphics/krita/
https://krita.org/";
LICENSE="GPL-2+"
KEYWORDS=""
-IUSE="color-management fftw +gsl +jpeg jpeg2k openexr pdf +raw tiff vc"
+IUSE="color-management fftw +gsl +jpeg openexr pdf +raw tiff vc"
COMMON_DEPEND="
$(add_frameworks_dep karchive)
@@ -52,7 +52,6 @@ COMMON_DEPEND="
fftw? ( sci-libs/fftw:3.0= )
gsl? ( sci-libs/gsl:= )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/openjpeg:0= )
openexr? (
media-libs/ilmbase:=
media-libs/openexr
@@ -65,10 +64,7 @@ DEPEND="${COMMON_DEPEND}
dev-cpp/eigen:3
dev-lang/perl
sys-devel/gettext
- vc? (
- >=dev-libs/vc-0.7.4
- =dev-libs/vc-1.1.0 )
"
RDEPEND="${COMMON_DEPEND}
!app-office/calligra:4[calligra_features_krita]
@@ -81,7 +77,6 @@ src_configure() {
-DWITH_JPEG=$(usex jpeg)
-DWITH_LibRaw=$(usex raw)
-DWITH_OCIO=$(usex color-management)
- -DWITH_OpenJPEG=$(usex jpeg2k)
-DWITH_OpenEXR=$(usex openexr)
-DWITH_Poppler=$(usex pdf)
-DWITH_TIFF=$(usex tiff)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 05aac815aa34070876e9227ff82e436385ec991c Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 5 18:20:25 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 5 18:25:20 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=05aac815 media-gfx/krita: add missing dependency for USE="openexr" Package-Manager: portage-2.3.0_rc1 media-gfx/krita/krita-.ebuild | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index f388a95..4cef09e 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -53,7 +53,10 @@ COMMON_DEPEND=" gsl? ( sci-libs/gsl ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:0 ) - openexr? ( media-libs/openexr ) + openexr? ( + media-libs/ilmbase + media-libs/openexr + ) pdf? ( app-text/poppler[qt5] ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 )
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: c916ece6d37b3702bc24ed24f64d417c722acd52 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 5 18:25:11 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 5 18:25:20 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c916ece6 media-gfx/krita: add subslot dependencies Package-Manager: portage-2.3.0_rc1 media-gfx/krita/krita-.ebuild | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index 4cef09e..859b961 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -38,7 +38,7 @@ COMMON_DEPEND=" $(add_qt_dep qtwidgets) $(add_qt_dep qtx11extras) $(add_qt_dep qtxml) - dev-libs/boost + dev-libs/boost:= media-gfx/exiv2:= media-libs/lcms media-libs/libpng:= @@ -49,12 +49,12 @@ COMMON_DEPEND=" x11-libs/libxcb x11-libs/libXi color-management? ( media-libs/opencolorio ) - fftw? ( sci-libs/fftw:3.0 ) - gsl? ( sci-libs/gsl ) + fftw? ( sci-libs/fftw:3.0= ) + gsl? ( sci-libs/gsl:= ) jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:0 ) + jpeg2k? ( media-libs/openjpeg:0= ) openexr? ( - media-libs/ilmbase + media-libs/ilmbase:= media-libs/openexr ) pdf? ( app-text/poppler[qt5] )
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 2a3d23f53699d17d6c339f52fe42049029e11eb7 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 5 18:19:10 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 5 18:25:20 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2a3d23f5 media-gfx/krita: dev-libs/vc is only used at build-time Package-Manager: portage-2.3.0_rc1 media-gfx/krita/krita-.ebuild | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index 16c8a95..f388a95 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -57,15 +57,15 @@ COMMON_DEPEND=" pdf? ( app-text/poppler[qt5] ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) - vc? ( - >=dev-libs/vc-0.7.4 -
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: faab90a95fffe0210d04f81589e0eb4cf35c1df0 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 5 18:10:24 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 5 18:10:24 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=faab90a9 media-gfx/krita: raise dev-libs/vc dependency This avoids a build failure. Package-Manager: portage-2.3.0_rc1 media-gfx/krita/krita-.ebuild | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index dfc6714..16c8a95 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -57,7 +57,10 @@ COMMON_DEPEND=" pdf? ( app-text/poppler[qt5] ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) - vc? ( =dev-libs/vc-0.7.4 +
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 79aa5c5f6c39a175f33014b72e2749e70a279d2a Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 5 17:19:48 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 5 17:20:47 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=79aa5c5f media-gfx/krita: force tests to be optional Package-Manager: portage-2.3.0_rc1 media-gfx/krita/krita-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index ac31498..0349bf7 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -4,7 +4,7 @@ EAPI=6 -KDE_TEST="true" +KDE_TEST="forceoptional" inherit kde5 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 7eae6a216fedca69c58106d06bca5a406e1b7243 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 5 17:20:43 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 5 17:20:47 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=7eae6a21 media-gfx/krita: correct LICENSE Package-Manager: portage-2.3.0_rc1 media-gfx/krita/krita-.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index 0349bf7..dfc6714 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -9,6 +9,8 @@ inherit kde5 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"; + +LICENSE="GPL-2+" KEYWORDS="" IUSE="color-management fftw +gsl +jpeg jpeg2k openexr pdf +raw tiff vc"
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: aee25ef576121529494812073d11ddf82cc430b4 Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 5 17:11:42 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 5 17:14:26 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=aee25ef5 media-gfx/krita: remove handbook USE flag There is no included handbook - the link just opens krita.kde.org. Package-Manager: portage-2.3.0_rc1 media-gfx/krita/krita-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index 2f18d42..2458bc9 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -5,7 +5,6 @@ EAPI=6 KDE_DOXYGEN="true" -KDE_HANDBOOK="true" KDE_TEST="true" inherit kde5
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 05998c590d7ee5e31ddaebfead98186c2f5a286a Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 5 17:06:18 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 5 17:14:26 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=05998c59 media-gfx/krita: remove png USE flag libpng is now mandatory. Package-Manager: portage-2.3.0_rc1 media-gfx/krita/krita-.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index 8089b2e..cc27158 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -12,7 +12,7 @@ inherit kde5 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"; KEYWORDS="" -IUSE="color-management fftw +gsl +jpeg jpeg2k openexr pdf png +raw tiff vc" +IUSE="color-management fftw +gsl +jpeg jpeg2k openexr pdf +raw tiff vc" COMMON_DEPEND=" $(add_frameworks_dep karchive) @@ -41,6 +41,7 @@ COMMON_DEPEND=" dev-libs/boost media-gfx/exiv2:= media-libs/lcms + media-libs/libpng:= net-misc/curl sys-libs/zlib virtual/opengl @@ -54,7 +55,6 @@ COMMON_DEPEND=" jpeg2k? ( media-libs/openjpeg:0 ) openexr? ( media-libs/openexr ) pdf? ( app-text/poppler[qt5] ) - png? ( media-libs/libpng:= ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) vc? (
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 11b14b92e1df27d0588dd18f66bdf453a5749adf
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Jun 5 16:41:21 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jun 5 17:14:26 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=11b14b92
media-gfx/krita: remove X USE flag
At least Qt5X11Extras appears to be used unconditionally in places.
Additionally, there was never any configure option backing the flag.
Package-Manager: portage-2.3.0_rc1
media-gfx/krita/krita-.ebuild | 9 +++--
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 743da9d..3a1e023 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -12,7 +12,7 @@ inherit kde5
DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/";
KEYWORDS=""
-IUSE="color-management fftw +gsl +jpeg jpeg2k +mime openexr pdf png +raw tiff
vc X"
+IUSE="color-management fftw +gsl +jpeg jpeg2k +mime openexr pdf png +raw tiff
vc"
COMMON_DEPEND="
$(add_frameworks_dep karchive)
@@ -47,6 +47,8 @@ COMMON_DEPEND="
media-libs/lcms
sys-libs/zlib
virtual/opengl
+ x11-libs/libX11
+ x11-libs/libxcb
color-management? ( media-libs/opencolorio )
fftw? ( sci-libs/fftw:3.0 )
gsl? ( sci-libs/gsl )
@@ -59,11 +61,6 @@ COMMON_DEPEND="
raw? ( $(add_kdeapps_dep libkdcraw) )
tiff? ( media-libs/tiff:0 )
vc? ( dev-libs/vc )
- X? (
- $(add_qt_dep qtx11extras)
- x11-libs/libX11
- x11-libs/libxcb
- )
"
DEPEND="${COMMON_DEPEND}
sys-devel/gettext
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 70c5fc8a899ab65429b64276272a8ec60299f96b
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Jun 5 17:09:33 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jun 5 17:14:26 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=70c5fc8a
media-gfx/krita: sort configure options
Package-Manager: portage-2.3.0_rc1
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 04076fb..2f18d42 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -70,11 +70,11 @@ RDEPEND="${COMMON_DEPEND}
src_configure() {
local mycmakeargs=(
- -DWITH_OCIO=$(usex color-management)
-DWITH_FFTW3=$(usex fftw)
-DWITH_GSL=$(usex gsl)
-DWITH_JPEG=$(usex jpeg)
-DWITH_LibRaw=$(usex raw)
+ -DWITH_OCIO=$(usex color-management)
-DWITH_OpenJPEG=$(usex jpeg2k)
-DWITH_OpenEXR=$(usex openexr)
-DWITH_Poppler=$(usex pdf)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: a8cd5f54346a51ec3acc7e70d11628715b9276ba Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 5 17:14:15 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 5 17:14:26 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a8cd5f54 media-gfx/krita: remove doxygen USE flag The doxygen output for Krita is very limited and not really useful. Package-Manager: portage-2.3.0_rc1 media-gfx/krita/krita-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index 2458bc9..ac31498 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -4,7 +4,6 @@ EAPI=6 -KDE_DOXYGEN="true" KDE_TEST="true" inherit kde5
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 417ee0ccaf904a548e8c3706c66681e77b11c55f
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Jun 5 17:08:53 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jun 5 17:14:26 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=417ee0cc
media-gfx/krita: remove unused configure option
Package-Manager: portage-2.3.0_rc1
media-gfx/krita/krita-.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index cc27158..04076fb 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -70,7 +70,6 @@ RDEPEND="${COMMON_DEPEND}
src_configure() {
local mycmakeargs=(
- -DUSEOPENGL=ON
-DWITH_OCIO=$(usex color-management)
-DWITH_FFTW3=$(usex fftw)
-DWITH_GSL=$(usex gsl)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 0e9f1e2e38fe3a9590e8df76fc54c02347554532
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Jun 5 16:48:32 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jun 5 17:14:26 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0e9f1e2e
media-gfx/krita: remove mime USE flag
The mime USE flag has no backing option, and mime database updates are handled
by the eclass.
Package-Manager: portage-2.3.0_rc1
media-gfx/krita/krita-.ebuild | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 2d62652..abcb497 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -12,7 +12,7 @@ inherit kde5
DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/";
KEYWORDS=""
-IUSE="color-management fftw +gsl +jpeg jpeg2k +mime openexr pdf png +raw tiff
vc"
+IUSE="color-management fftw +gsl +jpeg jpeg2k openexr pdf png +raw tiff vc"
COMMON_DEPEND="
$(add_frameworks_dep karchive)
@@ -54,7 +54,6 @@ COMMON_DEPEND="
gsl? ( sci-libs/gsl )
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:0 )
- mime? ( x11-misc/shared-mime-info )
openexr? ( media-libs/openexr )
pdf? ( app-text/poppler[qt5] )
png? ( media-libs/libpng:= )
@@ -64,7 +63,6 @@ COMMON_DEPEND="
"
DEPEND="${COMMON_DEPEND}
sys-devel/gettext
- x11-misc/shared-mime-info
"
RDEPEND="${COMMON_DEPEND}
!app-office/calligra:4[calligra_features_krita]
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 57759424aa5d3c3636aa123442c742aac6916892
Author: Michael Palimaka gentoo org>
AuthorDate: Sun Jun 5 16:46:40 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Sun Jun 5 17:14:26 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=57759424
media-gfx/krita: fix USE="raw" dependency
Krita bundles its own custom libkdcraw thus uses libraw directly.
Package-Manager: portage-2.3.0_rc1
media-gfx/krita/krita-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 3a1e023..2d62652 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -58,7 +58,7 @@ COMMON_DEPEND="
openexr? ( media-libs/openexr )
pdf? ( app-text/poppler[qt5] )
png? ( media-libs/libpng:= )
- raw? ( $(add_kdeapps_dep libkdcraw) )
+ raw? ( media-libs/libraw:= )
tiff? ( media-libs/tiff:0 )
vc? ( dev-libs/vc )
"
@@ -77,11 +77,11 @@ src_configure() {
-DWITH_FFTW3=$(usex fftw)
-DWITH_GSL=$(usex gsl)
-DWITH_JPEG=$(usex jpeg)
+ -DWITH_LibRaw=$(usex raw)
-DWITH_OpenJPEG=$(usex jpeg2k)
-DWITH_OpenEXR=$(usex openexr)
-DWITH_Poppler=$(usex pdf)
-DWITH_PNG=$(usex png)
- -DWITH_KF5KDcraw=$(usex raw)
-DWITH_TIFF=$(usex tiff)
-DWITH_Vc=$(usex vc)
)
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: ea305cf06a50db13d68503d5ab726ad257d35c6a Author: Michael Palimaka gentoo org> AuthorDate: Sun Jun 5 17:04:58 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Sun Jun 5 17:14:26 2016 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ea305cf0 media-gfx/krita: improve dependencies Package-Manager: portage-2.3.0_rc1 media-gfx/krita/krita-.ebuild | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index abcb497..8089b2e 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -19,6 +19,7 @@ COMMON_DEPEND=" $(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) @@ -26,29 +27,26 @@ COMMON_DEPEND=" $(add_frameworks_dep kitemmodels) $(add_frameworks_dep kitemviews) $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) $(add_frameworks_dep kxmlgui) - $(add_qt_dep designer) $(add_qt_dep qtconcurrent) $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) $(add_qt_dep qtgui) $(add_qt_dep qtnetwork) - $(add_qt_dep qtopengl) $(add_qt_dep qtprintsupport) - $(add_qt_dep qtscript) $(add_qt_dep qtsvg) $(add_qt_dep qtwidgets) $(add_qt_dep qtx11extras) $(add_qt_dep qtxml) - dev-cpp/eigen:3 - dev-lang/perl dev-libs/boost media-gfx/exiv2:= media-libs/lcms + net-misc/curl 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 ) gsl? ( sci-libs/gsl ) @@ -59,9 +57,11 @@ COMMON_DEPEND=" png? ( media-libs/libpng:= ) raw? ( media-libs/libraw:= ) tiff? ( media-libs/tiff:0 ) - vc? ( dev-libs/vc ) + vc? (
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 6071855869188f3ee505b939e12cc750dadf21c7
Author: Johannes Huber gentoo org>
AuthorDate: Tue Mar 22 21:09:35 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Tue Mar 22 21:09:35 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=60718558
media-gfx/krita: EAPI 6
Package-Manager: portage-2.2.28
media-gfx/krita/krita-.ebuild | 32
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index d2e14f9..743da9d 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -2,14 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
KDE_DOXYGEN="true"
KDE_HANDBOOK="true"
KDE_TEST="true"
inherit kde5
-DESCRIPTION="A free digital painting application. Digital Painting, Creative
Freedom!"
+DESCRIPTION="Free digital painting application. Digital Painting, Creative
Freedom!"
HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/";
KEYWORDS=""
IUSE="color-management fftw +gsl +jpeg jpeg2k +mime openexr pdf png +raw tiff
vc X"
@@ -27,9 +27,6 @@ COMMON_DEPEND="
$(add_frameworks_dep kitemviews)
$(add_frameworks_dep kwidgetsaddons)
$(add_frameworks_dep kxmlgui)
- dev-cpp/eigen:3
- dev-lang/perl
- dev-libs/boost
$(add_qt_dep designer)
$(add_qt_dep qtconcurrent)
$(add_qt_dep qtdbus)
@@ -43,6 +40,9 @@ COMMON_DEPEND="
$(add_qt_dep qtwidgets)
$(add_qt_dep qtx11extras)
$(add_qt_dep qtxml)
+ dev-cpp/eigen:3
+ dev-lang/perl
+ dev-libs/boost
media-gfx/exiv2:=
media-libs/lcms
sys-libs/zlib
@@ -76,17 +76,17 @@ RDEPEND="${COMMON_DEPEND}
src_configure() {
local mycmakeargs=(
-DUSEOPENGL=ON
- $(cmake-utils_use_with color-management OCIO)
- $(cmake-utils_use_with fftw FFTW3)
- $(cmake-utils_use_with gsl GSL)
- $(cmake-utils_use_with jpeg JPEG)
- $(cmake-utils_use_with jpeg2k OpenJPEG)
- $(cmake-utils_use_with raw KF5KDcraw)
- $(cmake-utils_use_with openexr OpenEXR)
- $(cmake-utils_use_with pdf Poppler)
- $(cmake-utils_use_with png PNG)
- $(cmake-utils_use_with tiff TIFF)
- $(cmake-utils_use_with vc Vc)
+ -DWITH_OCIO=$(usex color-management)
+ -DWITH_FFTW3=$(usex fftw)
+ -DWITH_GSL=$(usex gsl)
+ -DWITH_JPEG=$(usex jpeg)
+ -DWITH_OpenJPEG=$(usex jpeg2k)
+ -DWITH_OpenEXR=$(usex openexr)
+ -DWITH_Poppler=$(usex pdf)
+ -DWITH_PNG=$(usex png)
+ -DWITH_KF5KDcraw=$(usex raw)
+ -DWITH_TIFF=$(usex tiff)
+ -DWITH_Vc=$(usex vc)
)
kde5_src_configure
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 27bcc27fe0089d660b5c443cbaa413dac543db98
Author: Johannes Huber gentoo org>
AuthorDate: Tue Mar 22 20:12:30 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Tue Mar 22 20:12:30 2016 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=27bcc27f
media-gfx/krita: Update blocker on app-offce/calligra
Package-Manager: portage-2.2.28
media-gfx/krita/krita-.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
index 8593d29..d2e14f9 100644
--- a/media-gfx/krita/krita-.ebuild
+++ b/media-gfx/krita/krita-.ebuild
@@ -70,7 +70,7 @@ DEPEND="${COMMON_DEPEND}
x11-misc/shared-mime-info
"
RDEPEND="${COMMON_DEPEND}
- !app-office/calligra[calligra_features_krita]
+ !app-office/calligra:4[calligra_features_krita]
"
src_configure() {
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: 4be90868535bc1fe0f545480b6fbb674f48b3e76 Author: Michael Palimaka gentoo org> AuthorDate: Thu Dec 31 09:26:25 2015 + Commit: Michael Palimaka gentoo org> CommitDate: Thu Dec 31 09:26:27 2015 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=4be90868 media-gfx/krita: add subslot operator Package-Manager: portage-2.2.26 media-gfx/krita/krita-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/media-gfx/krita/krita-.ebuild b/media-gfx/krita/krita-.ebuild index 4061819..2af9411 100644 --- a/media-gfx/krita/krita-.ebuild +++ b/media-gfx/krita/krita-.ebuild @@ -43,7 +43,7 @@ COMMON_DEPEND=" dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtxml:5 - media-gfx/exiv2 + media-gfx/exiv2:= media-libs/lcms sys-libs/zlib virtual/opengl
[gentoo-commits] proj/kde:master commit in: media-gfx/krita/
commit: d74a5e222dcd0d57cc148f386aeb3940df3daa7b
Author: Andreas Sturmlechner gmail com>
AuthorDate: Tue Oct 13 00:03:36 2015 +
Commit: Michael Palimaka gentoo org>
CommitDate: Tue Oct 13 13:21:46 2015 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=d74a5e22
media-gfx/krita: New package
Package-Manager: portage-2.2.23
media-gfx/krita/krita-.ebuild | 93 +++
media-gfx/krita/metadata.xml | 9
2 files changed, 102 insertions(+)
diff --git a/media-gfx/krita/krita-.ebuild
b/media-gfx/krita/krita-.ebuild
new file mode 100644
index 000..4061819
--- /dev/null
+++ b/media-gfx/krita/krita-.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+KDE_DOXYGEN="true"
+KDE_HANDBOOK="true"
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="A free digital painting application. Digital Painting, Creative
Freedom!"
+HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/";
+KEYWORDS=""
+IUSE="color-management fftw +gsl +jpeg jpeg2k +mime openexr pdf png +raw tiff
vc X"
+
+COMMON_DEPEND="
+ $(add_frameworks_dep karchive)
+ $(add_frameworks_dep kcompletion)
+ $(add_frameworks_dep kconfig)
+ $(add_frameworks_dep kcoreaddons)
+ $(add_frameworks_dep kguiaddons)
+ $(add_frameworks_dep ki18n)
+ $(add_frameworks_dep kiconthemes)
+ $(add_frameworks_dep kio)
+ $(add_frameworks_dep kitemmodels)
+ $(add_frameworks_dep kitemviews)
+ $(add_frameworks_dep kwidgetsaddons)
+ $(add_frameworks_dep kxmlgui)
+ dev-cpp/eigen:3
+ dev-lang/perl
+ dev-libs/boost
+ dev-qt/designer:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtdbus:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtopengl:5
+ dev-qt/qtprintsupport:5
+ dev-qt/qtscript:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ dev-qt/qtxml:5
+ media-gfx/exiv2
+ media-libs/lcms
+ sys-libs/zlib
+ virtual/opengl
+ color-management? ( media-libs/opencolorio )
+ fftw? ( sci-libs/fftw:3.0 )
+ gsl? ( sci-libs/gsl )
+ jpeg? ( virtual/jpeg:0 )
+ jpeg2k? ( media-libs/openjpeg:0 )
+ mime? ( x11-misc/shared-mime-info )
+ openexr? ( media-libs/openexr )
+ pdf? ( app-text/poppler[qt5] )
+ png? ( media-libs/libpng:= )
+ raw? ( $(add_kdeapps_dep libkdcraw) )
+ tiff? ( media-libs/tiff:0 )
+ vc? ( dev-libs/vc )
+ X? (
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libxcb
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/gettext
+ x11-misc/shared-mime-info
+"
+RDEPEND="${COMMON_DEPEND}
+ !app-office/calligra[calligra_features_krita]
+"
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSEOPENGL=ON
+ $(cmake-utils_use_with color-management OCIO)
+ $(cmake-utils_use_with fftw FFTW3)
+ $(cmake-utils_use_with gsl GSL)
+ $(cmake-utils_use_with jpeg JPEG)
+ $(cmake-utils_use_with jpeg2k OpenJPEG)
+ $(cmake-utils_use_with raw KF5KDcraw)
+ $(cmake-utils_use_with openexr OpenEXR)
+ $(cmake-utils_use_with pdf Poppler)
+ $(cmake-utils_use_with png PNG)
+ $(cmake-utils_use_with tiff TIFF)
+ $(cmake-utils_use_with vc Vc)
+ )
+
+ kde5_src_configure
+}
diff --git a/media-gfx/krita/metadata.xml b/media-gfx/krita/metadata.xml
new file mode 100644
index 000..dd5c045
--- /dev/null
+++ b/media-gfx/krita/metadata.xml
@@ -0,0 +1,9 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+ kde
+
+ Enable color management via
media-libs/opencolorio
+ Enable support for dev-libs/vc,
could be a significant speed boost
+
+
