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

[Andreas Sturmlechner]

commit:     a1f2a30c593f6d748720218a462bc5640f4a071b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 30 11:57:00 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep  1 19:31:45 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1f2a30c

media-gfx/krita: Drop 3.3.3

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-gfx/krita/Manifest                           |   1 -
 .../krita/files/krita-3.2.0-tests-optional.patch   | 282 ---------------------
 media-gfx/krita/krita-3.3.3.ebuild                 |  94 -------
 3 files changed, 377 deletions(-)

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 81392963b2a..2725ffd07b5 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,3 +1,2 @@
-DIST krita-3.3.3.tar.gz 207582956 BLAKE2B 36fd2978956fbba870ff8d8c28c31db0731742385620d6b5fd0cc275d74bf6352635c4fd4a537a87b7994fa41d140ee05000593d5a95cd288fd07959e8ef1693 SHA512 b6dc30809e0d6c19fee4bbb240aa53c65e88361ebe273c73c2f24f43904c3cd51719dadb9c11fb7f691f17d75732374295ce904810d8893b7f95b45f859901e0
 DIST krita-4.0.3.tar.gz 241332929 BLAKE2B 222a3425f64c98d964f421c84f48295d5cb72e622631e9b1cb5a2ac9980a6f59cbf12b0815df68a09daf138efc2d4e2e83cb46034c8e12ddd621cb49f1117b72 SHA512 13b3263a09dbb955dea435e97bf12b6f0670fce68c4c2c9e97e7b45b480301119f317e72fac63eec07caff295885b7d62ac7c6255545a139e1e5f4b1106989e8
 DIST krita-4.0.4.tar.gz 241431012 BLAKE2B c8bb51132f089276761d5a6897fee416a23154267fef72ad525660125770d0fe4b6ab93f70b67ba11c8344f2b27f82bbadc96306d111ff77145b4056ec2c7601 SHA512 a1d82366f7b145c5db4c74ea8c31672a96a3dccd1b31fe2758606de50a4a8e5f8fd794e319127f98cc80f067d851edd4bc6e2f842eba76b807cc3a075a997f45

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
deleted file mode 100644
index 0f143ff1cc5..00000000000
--- a/media-gfx/krita/files/krita-3.2.0-tests-optional.patch
+++ /dev/null
@@ -1,282 +0,0 @@
-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/krita-3.3.3.ebuild b/media-gfx/krita/krita-3.3.3.ebuild
deleted file mode 100644
index b99c804b692..00000000000
--- a/media-gfx/krita/krita-3.3.3.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-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%.1}/${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-0.19:= )
-	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(+)]
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.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
-}