media-gfx/krita: 3.2.0 version bump

Package-Manager: Portage-2.3.8, Repoman-2.3.3

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index d7276d4cc54c8d8bbb71c4d93d367cb083d0ba61..776b275f1dd45520fd2474f91d2b4353b7338d78 100644 (file)
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1 +1,2 @@
 DIST krita-3.1.4.tar.gz 209778186 SHA256 741837b0d12afa795dbbca45d5efc78966f3041dbfb22a268c101c7dc23e82aa SHA512 6695d8d09552de2d98cb4a8fac1aefc6b5e35df50d7b72c088f11a25af54574b303a7445b4a9cb099844cdf0729a185f03fd208ab2f98329123398fd54a374df WHIRLPOOL 9b8819432594d10377ef6db5adaca06193044203ae5b870a2f014171c817dd2ffc251bd20af0a05183251a798d06fc6aa7b33c1a640879af3ac3c01c0e9869e7
+DIST krita-3.2.0.tar.gz 207016115 SHA256 0891be48a0338e1419d084da594900864b85de89cc4a38c8946d907cc1009356 SHA512 62fc8f333097eb23bd631f4e28a23c38bfffba2206277463454f2b9cd199a2972b185511407d50e62ce069c3dfbcfadcebbbb8faa89484f41bcbed3b352e27d5 WHIRLPOOL 403d0381af6fcf9404b790dc34feb26705629795f77c2fb61d50bfb6691872ffb1d9c56099841088a9d32135fe23ed91cd8f35eb491de2888aa0e6b01c83ef74

diff --git a/media-gfx/krita/files/krita-3.2.0-tests-optional.patch b/media-gfx/krita/files/krita-3.2.0-tests-optional.patch
new file mode 100644 (file)
index 0000000..0f143ff
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.2.0-tests-optional.patch
@@ -0,0 +1,282 @@
+Autogenerated by KDE_TEST=forceoptional-recursive and edited.
+
+--- a/plugins/paintops/libpaintop/CMakeLists.txt       2017-08-19 23:45:06.235796211 +0200
++++ b/plugins/paintops/libpaintop/CMakeLists.txt       2017-08-19 23:45:06.241796045 +0200
+@@ -95,4 +95,6 @@
+ install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt  2017-08-19 23:45:06.250795797 +0200
++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt  2017-08-19 23:45:06.258795576 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+ 
+ include_directories(brush)
+ include_directories(duplicate)
+--- a/plugins/impex/exr/CMakeLists.txt 2017-08-19 23:45:06.266795355 +0200
++++ b/plugins/impex/exr/CMakeLists.txt 2017-08-19 23:45:06.274795134 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
+ 
+--- a/plugins/impex/jpeg/CMakeLists.txt        2017-08-19 23:45:06.282794913 +0200
++++ b/plugins/impex/jpeg/CMakeLists.txt        2017-08-19 23:45:06.289794720 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
+ 
+--- a/plugins/impex/psd/CMakeLists.txt 2017-08-19 23:45:06.297794499 +0200
++++ b/plugins/impex/psd/CMakeLists.txt 2017-08-19 23:45:06.304794306 +0200
+@@ -1,5 +1,7 @@
+ if (NOT MSVC AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++        add_subdirectory(tests)
++    endif()
+ endif()
+ 
+ configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
+--- a/plugins/impex/ppm/CMakeLists.txt 2017-08-19 23:45:06.313794058 +0200
++++ b/plugins/impex/ppm/CMakeLists.txt 2017-08-19 23:45:06.319793892 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+ 
+--- a/plugins/impex/png/CMakeLists.txt 2017-08-19 23:45:06.327793672 +0200
++++ b/plugins/impex/png/CMakeLists.txt 2017-08-19 23:45:06.334793478 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritapngimport_SOURCES
+     kis_png_import.cc
+--- a/plugins/impex/csv/CMakeLists.txt 2017-08-19 23:45:06.343793230 +0200
++++ b/plugins/impex/csv/CMakeLists.txt 2017-08-19 23:45:06.349793064 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${Boost_INCLUDE_DIRS}
+--- a/plugins/impex/xcf/CMakeLists.txt 2017-08-19 23:45:06.357792843 +0200
++++ b/plugins/impex/xcf/CMakeLists.txt 2017-08-19 23:45:06.364792650 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(XCFTOOLS_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/xcftools")
+ 
+--- a/plugins/impex/tiff/CMakeLists.txt        2017-08-19 23:45:06.372792429 +0200
++++ b/plugins/impex/tiff/CMakeLists.txt        2017-08-19 23:45:06.379792236 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(libkritatiffconverter_LIB_SRCS
+     kis_tiff_converter.cc
+--- a/plugins/extensions/qmic/CMakeLists.txt   2017-08-19 23:45:06.387792016 +0200
++++ b/plugins/extensions/qmic/CMakeLists.txt   2017-08-19 23:45:06.393791850 +0200
+@@ -20,4 +20,6 @@
+ target_link_libraries(kritaqmic kritaui)
+ install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/filters/CMakeLists.txt   2017-08-19 23:45:06.401791629 +0200
++++ b/plugins/filters/CMakeLists.txt   2017-08-19 23:45:06.408791436 +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   2017-08-19 23:45:06.416791215 +0200
++++ b/plugins/filters/unsharp/CMakeLists.txt   2017-08-19 23:45:06.422791049 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaunsharpfilter_SOURCES
+     unsharp.cpp
+--- a/plugins/tools/basictools/CMakeLists.txt  2017-08-19 23:45:06.430790829 +0200
++++ b/plugins/tools/basictools/CMakeLists.txt  2017-08-19 23:45:06.437790636 +0200
+@@ -1,5 +1,7 @@
+ if (NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++        add_subdirectory(tests)
++    endif()
+ endif ()
+ 
+ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+--- a/plugins/tools/tool_transform2/CMakeLists.txt     2017-08-19 23:45:06.446790387 +0200
++++ b/plugins/tools/tool_transform2/CMakeLists.txt     2017-08-19 23:45:06.453790194 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++        add_subdirectory(tests)
++    endif()
+ endif()
+ 
+ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+--- a/plugins/color/lcms2engine/CMakeLists.txt 2017-08-19 23:45:06.461789973 +0200
++++ b/plugins/color/lcms2engine/CMakeLists.txt 2017-08-19 23:45:06.468789780 +0200
+@@ -1,6 +1,8 @@
+ project( lcmsengine )
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${LCMS2_INCLUDE_DIR} 
+--- a/plugins/dockers/defaultdockers/CMakeLists.txt    2017-08-19 23:45:06.476789559 +0200
++++ b/plugins/dockers/defaultdockers/CMakeLists.txt    2017-08-19 23:45:06.483789366 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritadefaultdockers_SOURCES 
+   kis_layer_box.cpp
+--- a/plugins/dockers/animation/CMakeLists.txt 2017-08-19 23:45:06.491789145 +0200
++++ b/plugins/dockers/animation/CMakeLists.txt 2017-08-19 23:45:06.497788980 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++        add_subdirectory(tests)
++    endif()
+ endif()    
+ 
+ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
+--- a/plugins/dockers/lut/CMakeLists.txt       2017-08-19 23:45:06.506788731 +0200
++++ b/plugins/dockers/lut/CMakeLists.txt       2017-08-19 23:45:06.512788565 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++        add_subdirectory(tests)
++    endif()
+ endif()
+ 
+ include_directories(SYSTEM
+--- a/libs/store/CMakeLists.txt        2017-08-19 23:45:06.520788345 +0200
++++ b/libs/store/CMakeLists.txt        2017-08-19 23:45:06.527788151 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritastore_LIB_SRCS
+     KoDirectoryStore.cpp
+--- a/libs/flake/CMakeLists.txt        2017-08-19 23:45:06.536787903 +0200
++++ b/libs/flake/CMakeLists.txt        2017-08-19 23:45:06.542787737 +0200
+@@ -8,7 +8,9 @@
+ )
+ 
+ add_subdirectory(styles)
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritaflake_SRCS
+     KoGradientHelper.cpp
+--- a/libs/widgetutils/CMakeLists.txt  2017-08-19 23:45:06.550787517 +0200
++++ b/libs/widgetutils/CMakeLists.txt  2017-08-19 23:45:06.557787323 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ configure_file(xmlgui/config-xmlgui.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xmlgui.h )
+ 
+--- a/libs/odf/CMakeLists.txt  2017-08-19 23:45:06.565787103 +0200
++++ b/libs/odf/CMakeLists.txt  2017-08-19 23:45:06.572786910 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaodf_LIB_SRCS
+     KoOdf.cpp
+--- a/libs/pigment/CMakeLists.txt      2017-08-19 23:45:06.580786689 +0200
++++ b/libs/pigment/CMakeLists.txt      2017-08-19 23:45:06.587786495 +0200
+@@ -34,7 +34,9 @@
+     message(${__per_arch_factory_objs})
+ endif()
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ add_subdirectory(benchmarks)
+ 
+ set(kritapigment_SRCS
+--- a/libs/widgets/CMakeLists.txt      2017-08-19 23:45:06.595786275 +0200
++++ b/libs/widgets/CMakeLists.txt      2017-08-19 23:45:06.601786109 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
+--- a/libs/ui/CMakeLists.txt   2017-08-19 23:45:06.610785861 +0200
++++ b/libs/ui/CMakeLists.txt   2017-08-19 23:45:06.617785667 +0200
+@@ -9,7 +9,9 @@
+     ${Boost_INCLUDE_DIRS}
+ )
+ 
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ if (APPLE)
+     find_library(FOUNDATION_LIBRARY Foundation)
+--- a/libs/image/CMakeLists.txt        2017-08-19 23:45:06.626785419 +0200
++++ b/libs/image/CMakeLists.txt        2017-08-19 23:45:06.632785254 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ add_subdirectory( tiles3 )
+ 
+--- a/libs/image/tiles3/CMakeLists.txt 2017-08-19 23:45:06.641785005 +0200
++++ b/libs/image/tiles3/CMakeLists.txt 2017-08-19 23:45:06.647784839 +0200
+@@ -1,2 +1,4 @@
+ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/brush/CMakeLists.txt        2017-08-19 23:45:06.658784536 +0200
++++ b/libs/brush/CMakeLists.txt        2017-08-19 23:45:06.665784343 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include_directories(SYSTEM
+     ${EIGEN3_INCLUDE_DIR}

diff --git a/media-gfx/krita/files/krita-3.2.0-unused-dep.patch b/media-gfx/krita/files/krita-3.2.0-unused-dep.patch
new file mode 100644 (file)
index 0000000..34031b5
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.2.0-unused-dep.patch
@@ -0,0 +1,69 @@
+From 176546ed492883b63f6b8c274a97ce781af3631c Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Wed, 16 Aug 2017 23:35:07 +0200
+Subject: Remove unused dependency
+
+Summary:
+libcurl doesn't seem to be used anymore since
+427a9ede658e4bee0e96e09741adb879e396c0c1 and the removal of the gmic
+plugin.
+
+Test Plan: Still builds fine.
+
+Reviewers: #krita, rempt
+
+Subscribers: woltherav
+
+Tags: #krita
+
+Differential Revision: https://phabricator.kde.org/D7360
+---
+ CMakeLists.txt      | 10 ----------
+ README_PACKAGERS.md |  3 ---
+ 2 files changed, 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5575b8c..b1edfc1 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -604,16 +604,6 @@ set_package_properties(OpenMP PROPERTIES
+     TYPE OPTIONAL
+     PURPOSE "Optionally used by the G'Mic plugin")
+ 
+-##
+-## Test for Curl (for G'Mic)
+-##
+-find_package(CURL)
+-set_package_properties(CURL PROPERTIES
+-    DESCRIPTION "A tool to fetch remote data"
+-    URL "http://curl.haxx.se/"
+-    TYPE OPTIONAL
+-    PURPOSE "Optionally used by the G'Mic plugin")
+-
+  ############################
+ #############################
+ ## Add Krita helper macros ##
+diff --git a/README_PACKAGERS.md b/README_PACKAGERS.md
+index ef66f9d..bd3d694 100644
+--- a/README_PACKAGERS.md
++++ b/README_PACKAGERS.md
+@@ -23,8 +23,6 @@ There are four forks of 3rd party libraries that are relevant and cannot be repl
+ 
+ * plugins/impex/xcf/3rdparty contains the xcftools code. This has never been released as a library
+ 
+-* plugins/extensions/gmic/3rdparty contains G'Mic. This has never been released as a shared library.
+-
+ * libs/image/3rdparty contains einspline. This code is directly linke d into the kritaimage library and has never been released as a separate library.
+ 
+ == Build flags ==
+@@ -47,7 +45,6 @@ Krita depends on:
+   * ilmbase   
+   * jpeg: Note that libjpeg-turbo is recommended.       
+   * lcms2     
+-  * libcurl   
+   * libraw    
+   * opencolorio
+   * openexr   
+-- 
+cgit v0.11.2
+

diff --git a/media-gfx/krita/krita-3.2.0.ebuild b/media-gfx/krita/krita-3.2.0.ebuild
new file mode 100644 (file)
index 0000000..fb7757c
--- /dev/null
+++ b/media-gfx/krita/krita-3.2.0.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
+
+COMMON_DEPEND="
+       $(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 kio)
+       $(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 qtgui '-gles2')
+       $(add_qt_dep qtnetwork)
+       $(add_qt_dep qtprintsupport)
+       $(add_qt_dep qtsvg)
+       $(add_qt_dep qtwidgets)
+       $(add_qt_dep qtx11extras)
+       $(add_qt_dep qtxml)
+       dev-libs/boost:=
+       media-gfx/exiv2:=
+       media-libs/lcms
+       media-libs/libpng:0=
+       sys-libs/zlib
+       virtual/opengl
+       x11-libs/libX11
+       x11-libs/libxcb
+       x11-libs/libXi
+       color-management? ( media-libs/opencolorio )
+       fftw? ( sci-libs/fftw:3.0= )
+       gsl? ( sci-libs/gsl:= )
+       jpeg? ( virtual/jpeg:0 )
+       openexr? (
+               media-libs/ilmbase:=
+               media-libs/openexr
+       )
+       pdf? ( app-text/poppler[qt5] )
+       qtmedia? ( $(add_qt_dep qtmultimedia) )
+       raw? ( media-libs/libraw:= )
+       tiff? ( media-libs/tiff:0 )
+"
+DEPEND="${COMMON_DEPEND}
+       dev-cpp/eigen:3
+       dev-lang/perl
+       sys-devel/gettext
+       vc? ( >=dev-libs/vc-1.1.0 )
+"
+RDEPEND="${COMMON_DEPEND}
+       !app-office/calligra:4[calligra_features_krita]
+       !app-office/calligra-l10n:4[calligra_features_krita(+)]
+"
+
+PATCHES=(
+       "${FILESDIR}"/${P}-tests-optional.patch
+       "${FILESDIR}"/${P}-unused-dep.patch
+)
+
+src_configure() {
+       local mycmakeargs=(
+               $(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)
+               $(cmake-utils_use_find_package raw LibRaw)
+               $(cmake-utils_use_find_package tiff TIFF)
+               $(cmake-utils_use_find_package vc Vc)
+       )
+
+       kde5_src_configure
+}