gentoo resync : 30.06.2019

5 files changed, 438 insertions, 328 deletions

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 114a3faa7fdf..df0016abfe11 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,9 +1,10 @@
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
 AUX krita-4.1.8-fix-pre-5.12-tablet-support.patch 1794 BLAKE2B d67cfe9a758e26416abf1150a4b25f81b5befb8ffb254daf0c25b4b189ba0aefe9a3256eb83013d80919e21f77f7880fa7856a05ef5c995dfc73d079753e2c38 SHA512 c4048d8fe560508f04df785a012db99a5e6a2d4ca5b1d8e774a307cdb99f62de4969b04a58586c771a174dadf6dedafaa70568e8b6342612fbe52be32db257cb
 AUX krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch 1591 BLAKE2B d11c8b3a7f5a70c40fe5c0f19bcb06c9a2b047e651a27ce3de9e8ecc41287171b50566b481a8ca49b7625aae1ffd0db0a507b1ad7928b6c959de15ec7b7c2dc5 SHA512 3d1d9c09abb2b72d6d7ef5061e7fdb4ca98a4d7f7d1356833fa518da6bce52f9959532f0417b7e30a305ef052acc59dd2b27ef71e1de5fa138fe4f107528517a
-AUX krita-4.2.0-tests-optional.patch 9915 BLAKE2B 3f63d2b30630e42413e58d23429c3df917c926d793c570be87bf59b83af9ec5740b220bbac433c928748dededf6714936c041433bc723c9612a45372311e6dc5 SHA512 72c62152ef767daedee84da58f179b34b0dc38adb03e63433c2870e0de93d30d2e929e65d7a8c8cd968b200ca0d87e570ab3c13f5be8b78b1c328dc3489ccb3b
+AUX krita-4.2.2-fixuifiles.patch 759 BLAKE2B 0d99b4948e0dc9c507232736d8c56dd3595b5d985fc58cfe09b057cdfdf91d2e2df066d0538733c8b79429eecef7f53e5f69192b9813445ddfd22e9177e75ef3 SHA512 f77b22771e5bea7804868d19456e89dbab8079096e9776a788ac100eb8fd278c144efb8279753bc7ce6b2845c9d4505fd6733e33251298bfd0069a7deb337bee
+AUX krita-4.2.2-tests-optional.patch 12503 BLAKE2B 31b96b377e217dd9e7f8dd25e45487fc7bf0bf4883ffb15d965c0fbdf0a660baf0229024e236cd50ec8533ab85b89cb0c78c4a78f210801be87a43c0ecee4701 SHA512 a4f64e008e07974dbc343a90e8ec181121b14b7d000dfb5bb167b49871b2c31e1d74786409240d2bfbbdeebb89f8b29d2e8cd61df0761a523e61e8a6115ea9fe
 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
-DIST krita-4.2.1.tar.gz 245929278 BLAKE2B 06544424bae7965be2fbf7a0e9d4fc260de80f16e6f8beba600432139e20f4c9bde24244d5b8ce5573fbc354ee0461c6930255f47798618998b895828a682390 SHA512 879d1efe2e3f888a5f37a843ae739f6441d142f0a2831f15b11e7a86e1c4df99fee0bda9accc7a41d374f3df16cff60ac17e490b4f656db0b480fd32a5bca3f1
+DIST krita-4.2.2.tar.gz 246075662 BLAKE2B 0d4f57924f4a63afbbd53df885844aa02e93b75afb0be3a32f1be6a6d3b031389b6efc907e725b31f31f6846fd8a02cefb33e93354a75191f7ba6bf485b72f4e SHA512 7ca5f18c9c8c0448ac2634bb6e0108328b4ae84527741aa35863a3423449797a4e1e1debcd7c6ace2c6c3362d339ed5b7970af71e5bd4b0e7299cf8e877ca096
 EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a
-EBUILD krita-4.2.1.ebuild 3154 BLAKE2B 671e4a47b6485efff0ee69b74ef05030be2d93ce282a9b554ddbcb6d7abcd46c198710d007f38a132fada4719611f3f72726d598e09bd9fc6fad1d6a909f4968 SHA512 667a9f2b187e98fdb2e3aeadd52e6f5e1c321cca003969294147566008c02361f2ddd1f618fdfb6c5453de729141218d1a94762260e17b27ef5b49ac87f7e7c9
+EBUILD krita-4.2.2.ebuild 3185 BLAKE2B 7fb9adb95e8a0965b983f2c7fa63ba90c2df688e99f81bb6d19f27693c0350aecb48d811a0c61fa72da7004e0d9bac971b9299a13cad939223d292f61e566c46 SHA512 0b25893e4a8dda09c493c563118cd5fac0649e7f4f76689b0b776d1de4cb461d6cf8f57b391150e9216c2fd618250bcbf2d52ed4b90bfe33d1f421f6cc8bb5b4
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch b/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
deleted file mode 100644
index b605e922aba1..000000000000
--- a/media-gfx/krita/files/krita-4.2.0-tests-optional.patch
+++ /dev/null
@@ -1,324 +0,0 @@
---- a/plugins/color/lcms2engine/CMakeLists.txt	2019-06-01 15:10:43.442258240 +0200
-+++ b/plugins/color/lcms2engine/CMakeLists.txt	2019-06-01 15:10:43.452257980 +0200
-@@ -1,6 +1,8 @@
- project( lcmsengine )
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
-     ${LCMS2_INCLUDE_DIR}
---- a/plugins/extensions/qmic/CMakeLists.txt	2019-06-01 15:10:43.469257540 +0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt	2019-06-01 15:10:43.477257332 +0200
-@@ -20,4 +20,6 @@
- target_link_libraries(kritaqmic kritaui)
- install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/filters/CMakeLists.txt	2019-06-01 15:10:43.488257047 +0200
-+++ b/plugins/filters/CMakeLists.txt	2019-06-01 15:10:43.497256813 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- add_subdirectory( blur )
- add_subdirectory( colors )
- add_subdirectory( colorsfilters )
---- a/plugins/filters/unsharp/CMakeLists.txt	2019-06-01 15:10:43.508256528 +0200
-+++ b/plugins/filters/unsharp/CMakeLists.txt	2019-06-01 15:10:43.516256320 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaunsharpfilter_SOURCES
-     unsharp.cpp
---- a/plugins/dockers/lut/CMakeLists.txt	2019-06-01 15:10:43.527256035 +0200
-+++ b/plugins/dockers/lut/CMakeLists.txt	2019-06-01 15:10:43.535255828 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
-     ${OCIO_INCLUDE_DIR}
---- a/plugins/dockers/animation/CMakeLists.txt	2019-06-01 15:10:43.546255542 +0200
-+++ b/plugins/dockers/animation/CMakeLists.txt	2019-06-01 15:10:43.555255309 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- set(KRITA_ANIMATIONDOCKER_SOURCES
---- a/plugins/tools/tool_transform2/CMakeLists.txt	2019-06-01 15:10:43.566255024 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt	2019-06-01 15:10:43.574254816 +0200
-@@ -1,5 +1,7 @@
- if (NOT WIN32 AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif()
- 
- set(kritatooltransform_SOURCES
---- a/plugins/tools/basictools/CMakeLists.txt	2019-06-01 15:10:43.584254557 +0200
-+++ b/plugins/tools/basictools/CMakeLists.txt	2019-06-01 15:10:43.592254349 +0200
-@@ -1,5 +1,7 @@
- if (NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+add_subdirectory(tests)
-+endif()
- endif ()
- 
- set(kritadefaulttools_SOURCES
---- a/plugins/impex/tiff/CMakeLists.txt	2019-06-01 15:10:43.602254090 +0200
-+++ b/plugins/impex/tiff/CMakeLists.txt	2019-06-01 15:10:43.609253908 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(libkritatiffconverter_LIB_SRCS
-     kis_tiff_converter.cc
---- a/plugins/impex/libkra/CMakeLists.txt	2019-06-01 15:10:43.620253623 +0200
-+++ b/plugins/impex/libkra/CMakeLists.txt	2019-06-01 15:10:43.627253441 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritalibkra_LIB_SRCS
-     kis_colorize_dom_utils.cpp
---- a/plugins/impex/jpeg/CMakeLists.txt	2019-06-01 15:10:43.638253156 +0200
-+++ b/plugins/impex/jpeg/CMakeLists.txt	2019-06-01 15:10:43.646252949 +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	2019-06-01 15:10:43.662252534 +0200
-+++ b/plugins/impex/psd/CMakeLists.txt	2019-06-01 15:10:43.671252300 +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/xcf/CMakeLists.txt	2019-06-01 15:10:43.685251937 +0200
-+++ b/plugins/impex/xcf/CMakeLists.txt	2019-06-01 15:10:43.694251704 +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/heightmap/CMakeLists.txt	2019-06-01 15:10:43.705251418 +0200
-+++ b/plugins/impex/heightmap/CMakeLists.txt	2019-06-01 15:10:43.714251185 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
---- a/plugins/impex/csv/CMakeLists.txt	2019-06-01 15:10:43.725250900 +0200
-+++ b/plugins/impex/csv/CMakeLists.txt	2019-06-01 15:10:43.734250666 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- # import
- 
---- a/plugins/impex/exr/CMakeLists.txt	2019-06-01 15:10:43.745250381 +0200
-+++ b/plugins/impex/exr/CMakeLists.txt	2019-06-01 15:10:43.754250148 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
- 
---- a/plugins/impex/ppm/CMakeLists.txt	2019-06-01 15:10:43.765249862 +0200
-+++ b/plugins/impex/ppm/CMakeLists.txt	2019-06-01 15:10:43.773249655 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
---- a/plugins/impex/svg/CMakeLists.txt	2019-06-01 15:10:43.784249370 +0200
-+++ b/plugins/impex/svg/CMakeLists.txt	2019-06-01 15:10:43.792249162 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritasvgimport_SOURCES
-     kis_svg_import.cc
---- a/plugins/impex/png/CMakeLists.txt	2019-06-01 15:10:43.803248877 +0200
-+++ b/plugins/impex/png/CMakeLists.txt	2019-06-01 15:10:43.811248669 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritapngimport_SOURCES
-     kis_png_import.cc
---- a/plugins/paintops/libpaintop/CMakeLists.txt	2019-06-01 15:10:43.823248358 +0200
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt	2019-06-01 15:10:43.831248150 +0200
-@@ -104,4 +104,6 @@
- install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-06-01 15:10:43.842247865 +0200
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-06-01 15:10:43.850247658 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(brush/tests)
-+endif()
- 
- include_directories(brush
-                     duplicate
---- a/libs/metadata/CMakeLists.txt	2019-06-01 15:10:43.862247346 +0200
-+++ b/libs/metadata/CMakeLists.txt	2019-06-01 15:10:43.870247139 +0200
-@@ -29,4 +29,6 @@
- 
- install(TARGETS kritametadata  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/global/CMakeLists.txt	2019-06-01 15:10:43.881246854 +0200
-+++ b/libs/global/CMakeLists.txt	2019-06-01 15:10:43.890246620 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include(CheckFunctionExists)
- check_function_exists(backtrace HAVE_BACKTRACE)
---- a/libs/ui/CMakeLists.txt	2019-06-01 15:10:43.901246335 +0200
-+++ b/libs/ui/CMakeLists.txt	2019-06-01 15:10:43.911246076 +0200
-@@ -7,7 +7,9 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- if (APPLE)
-     find_library(FOUNDATION_LIBRARY Foundation)
---- a/libs/flake/CMakeLists.txt	2019-06-01 15:10:43.922245790 +0200
-+++ b/libs/flake/CMakeLists.txt	2019-06-01 15:10:43.931245557 +0200
-@@ -9,7 +9,9 @@
- )
- 
- add_subdirectory(styles)
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritaflake_SRCS
-     KoGradientHelper.cpp
---- a/libs/brush/CMakeLists.txt	2019-06-01 15:10:43.943245246 +0200
-+++ b/libs/brush/CMakeLists.txt	2019-06-01 15:10:43.952245012 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include_directories(SYSTEM
-     ${EIGEN3_INCLUDE_DIR}
---- a/libs/widgetutils/CMakeLists.txt	2019-06-01 15:10:43.963244727 +0200
-+++ b/libs/widgetutils/CMakeLists.txt	2019-06-01 15:10:43.972244494 +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/store/CMakeLists.txt	2019-06-01 15:10:43.984244182 +0200
-+++ b/libs/store/CMakeLists.txt	2019-06-01 15:10:43.992243975 +0200
-@@ -1,6 +1,8 @@
- include_directories(${QUAZIP_INCLUDE_DIRS})
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritastore_LIB_SRCS
-     KoDirectoryStore.cpp
---- a/libs/pigment/CMakeLists.txt	2019-06-01 15:10:44.002243716 +0200
-+++ b/libs/pigment/CMakeLists.txt	2019-06-01 15:10:44.010243508 +0200
-@@ -31,7 +31,9 @@
-     message("${__per_arch_factory_objs}")
- endif()
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- add_subdirectory(benchmarks)
- 
- set(kritapigment_SRCS
---- a/libs/libkis/CMakeLists.txt	2019-06-01 15:10:44.021243223 +0200
-+++ b/libs/libkis/CMakeLists.txt	2019-06-01 15:10:44.028243041 +0200
-@@ -47,4 +47,6 @@
- install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/image/CMakeLists.txt	2019-06-01 15:10:44.039242756 +0200
-+++ b/libs/image/CMakeLists.txt	2019-06-01 15:10:44.047242548 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- add_subdirectory( tiles3 )
- 
---- a/libs/image/tiles3/CMakeLists.txt	2019-06-01 15:10:44.057242289 +0200
-+++ b/libs/image/tiles3/CMakeLists.txt	2019-06-01 15:10:44.065242082 +0200
-@@ -1 +1,3 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/odf/CMakeLists.txt	2019-06-01 15:10:44.076241796 +0200
-+++ b/libs/odf/CMakeLists.txt	2019-06-01 15:10:44.084241589 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaodf_LIB_SRCS
-     KoOdf.cpp
---- a/libs/widgets/CMakeLists.txt	2019-06-01 15:10:44.094241329 +0200
-+++ b/libs/widgets/CMakeLists.txt	2019-06-01 15:10:44.102241122 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
diff --git a/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
new file mode 100644
index 000000000000..1703386a3c72
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.2-fixuifiles.patch
@@ -0,0 +1,25 @@
+From e46ad1f917705d84dc5562c2f261a06eb70a57b9 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino@kde.org>
+Date: Tue, 25 Jun 2019 06:57:40 +0200
+Subject: fixuifiles
+
+---
+ libs/widgetutils/tests/dialogsavertestwidget.ui | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/libs/widgetutils/tests/dialogsavertestwidget.ui b/libs/widgetutils/tests/dialogsavertestwidget.ui
+index 66e70b3..ba0f54f 100644
+--- a/libs/widgetutils/tests/dialogsavertestwidget.ui
++++ b/libs/widgetutils/tests/dialogsavertestwidget.ui
+@@ -10,9 +10,6 @@
+     <height>300</height>
+    </rect>
+   </property>
+-  <property name="windowTitle">
+-   <string>Form</string>
+-  </property>
+   <widget class="QPushButton" name="pushButton">
+    <property name="geometry">
+     <rect>
+-- 
+cgit v1.1
diff --git a/media-gfx/krita/files/krita-4.2.2-tests-optional.patch b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
new file mode 100644
index 000000000000..2df715be04f6
--- /dev/null
+++ b/media-gfx/krita/files/krita-4.2.2-tests-optional.patch
@@ -0,0 +1,405 @@
+--- a/plugins/filters/CMakeLists.txt	2019-06-27 18:48:55.049823682 +0200
++++ b/plugins/filters/CMakeLists.txt	2019-06-27 18:48:55.056823729 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ add_subdirectory( blur )
+ add_subdirectory( colors )
+ add_subdirectory( colorsfilters )
+--- a/plugins/filters/unsharp/CMakeLists.txt	2019-06-27 18:48:55.063823776 +0200
++++ b/plugins/filters/unsharp/CMakeLists.txt	2019-06-27 18:48:55.069823817 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaunsharpfilter_SOURCES
+     unsharp.cpp
+--- a/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-06-27 18:48:55.077823871 +0200
++++ b/plugins/paintops/defaultpaintops/CMakeLists.txt	2019-06-27 18:48:55.084823918 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(brush/tests)
++endif()
+ 
+ include_directories(brush
+                     duplicate
+--- a/plugins/paintops/libpaintop/CMakeLists.txt	2019-06-27 18:48:55.092823972 +0200
++++ b/plugins/paintops/libpaintop/CMakeLists.txt	2019-06-27 18:48:55.098824013 +0200
+@@ -104,4 +104,6 @@
+ install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/dockers/lut/CMakeLists.txt	2019-06-27 18:48:55.105824060 +0200
++++ b/plugins/dockers/lut/CMakeLists.txt	2019-06-27 18:48:55.112824107 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${OCIO_INCLUDE_DIR}
+--- a/plugins/dockers/animation/CMakeLists.txt	2019-06-27 18:48:55.120824161 +0200
++++ b/plugins/dockers/animation/CMakeLists.txt	2019-06-27 18:48:55.124824188 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ set(KRITA_ANIMATIONDOCKER_SOURCES
+--- a/plugins/extensions/qmic/CMakeLists.txt	2019-06-27 18:48:55.132824242 +0200
++++ b/plugins/extensions/qmic/CMakeLists.txt	2019-06-27 18:48:55.136824270 +0200
+@@ -20,4 +20,6 @@
+ target_link_libraries(kritaqmic kritaui)
+ install(TARGETS kritaqmic  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/plugins/tools/basictools/CMakeLists.txt	2019-06-27 18:48:55.141824303 +0200
++++ b/plugins/tools/basictools/CMakeLists.txt	2019-06-27 18:48:55.146824337 +0200
+@@ -1,5 +1,7 @@
+ if (NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif ()
+ 
+ set(kritadefaulttools_SOURCES
+--- a/plugins/tools/tool_transform2/CMakeLists.txt	2019-06-27 18:48:55.151824371 +0200
++++ b/plugins/tools/tool_transform2/CMakeLists.txt	2019-06-27 18:48:55.155824398 +0200
+@@ -1,5 +1,7 @@
+ if (NOT WIN32 AND NOT APPLE)
+-    add_subdirectory(tests)
++    if(BUILD_TESTING)
++add_subdirectory(tests)
++endif()
+ endif()
+ 
+ set(kritatooltransform_SOURCES
+--- a/plugins/impex/ppm/CMakeLists.txt	2019-06-27 18:48:55.163824452 +0200
++++ b/plugins/impex/ppm/CMakeLists.txt	2019-06-27 18:48:55.169824492 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+ 
+--- a/plugins/impex/svg/CMakeLists.txt	2019-06-27 18:48:55.175824533 +0200
++++ b/plugins/impex/svg/CMakeLists.txt	2019-06-27 18:48:55.180824567 +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-06-27 18:48:55.186824607 +0200
++++ b/plugins/impex/brush/CMakeLists.txt	2019-06-27 18:48:55.190824634 +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-06-27 18:48:55.195824668 +0200
++++ b/plugins/impex/psd/CMakeLists.txt	2019-06-27 18:48:55.199824695 +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-06-27 18:48:55.206824742 +0200
++++ b/plugins/impex/tga/CMakeLists.txt	2019-06-27 18:48:55.210824769 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritatgaexport_SOURCES
+     kis_tga_export.cpp
+--- a/plugins/impex/libkra/CMakeLists.txt	2019-06-27 18:48:55.216824810 +0200
++++ b/plugins/impex/libkra/CMakeLists.txt	2019-06-27 18:48:55.221824844 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritalibkra_LIB_SRCS
+     kis_colorize_dom_utils.cpp
+--- a/plugins/impex/jpeg/CMakeLists.txt	2019-06-27 18:48:55.228824891 +0200
++++ b/plugins/impex/jpeg/CMakeLists.txt	2019-06-27 18:48:55.233824924 +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/gif/CMakeLists.txt	2019-06-27 18:48:55.239824965 +0200
++++ b/plugins/impex/gif/CMakeLists.txt	2019-06-27 18:48:55.243824992 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritagifexport_SOURCES
+     kis_gif_export.cpp
+--- a/plugins/impex/exr/CMakeLists.txt	2019-06-27 18:48:55.248825026 +0200
++++ b/plugins/impex/exr/CMakeLists.txt	2019-06-27 18:48:55.253825060 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
+ 
+--- a/plugins/impex/xcf/CMakeLists.txt	2019-06-27 18:48:55.260825107 +0200
++++ b/plugins/impex/xcf/CMakeLists.txt	2019-06-27 18:48:55.268825160 +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	2019-06-27 18:48:55.277825221 +0200
++++ b/plugins/impex/tiff/CMakeLists.txt	2019-06-27 18:48:55.283825262 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(libkritatiffconverter_LIB_SRCS
+     kis_tiff_converter.cc
+--- a/plugins/impex/ora/CMakeLists.txt	2019-06-27 18:48:55.290825310 +0200
++++ b/plugins/impex/ora/CMakeLists.txt	2019-06-27 18:48:55.295825343 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(libkritaconverter_LIB_SRCS
+     ora_converter.cpp
+--- a/plugins/impex/heif/CMakeLists.txt	2019-06-27 18:48:55.302825391 +0200
++++ b/plugins/impex/heif/CMakeLists.txt	2019-06-27 18:48:55.309825438 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${HEIF_CFLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${HEIF_CFLAGS}")
+--- a/plugins/impex/pdf/CMakeLists.txt	2019-06-27 18:48:55.317825492 +0200
++++ b/plugins/impex/pdf/CMakeLists.txt	2019-06-27 18:48:55.322825526 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritapdfimport_SOURCES kis_pdf_import.cpp kis_pdf_import_widget.cpp )
+ 
+--- a/plugins/impex/csv/CMakeLists.txt	2019-06-27 18:48:55.332825593 +0200
++++ b/plugins/impex/csv/CMakeLists.txt	2019-06-27 18:48:55.339825640 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ # import
+ 
+--- a/plugins/impex/heightmap/CMakeLists.txt	2019-06-27 18:48:55.347825694 +0200
++++ b/plugins/impex/heightmap/CMakeLists.txt	2019-06-27 18:48:55.352825728 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
+ 
+--- a/plugins/impex/raw/CMakeLists.txt	2019-06-27 18:48:55.359825775 +0200
++++ b/plugins/impex/raw/CMakeLists.txt	2019-06-27 18:48:55.365825816 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ if(OPENEXR_FOUND)
+ 	include_directories(${OPENEXR_INCLUDE_DIR})
+--- a/plugins/impex/qimageio/CMakeLists.txt	2019-06-27 18:48:55.371825857 +0200
++++ b/plugins/impex/qimageio/CMakeLists.txt	2019-06-27 18:48:55.376825890 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritaqimageioexport_SOURCES
+     kis_qimageio_export.cpp
+--- a/plugins/impex/qml/CMakeLists.txt	2019-06-27 18:48:55.383825938 +0200
++++ b/plugins/impex/qml/CMakeLists.txt	2019-06-27 18:48:55.389825978 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritaqmlexport_SOURCES
+     qml_converter.cc
+--- a/plugins/impex/png/CMakeLists.txt	2019-06-27 18:48:55.396826025 +0200
++++ b/plugins/impex/png/CMakeLists.txt	2019-06-27 18:48:55.401826059 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritapngimport_SOURCES
+     kis_png_import.cc
+--- a/plugins/color/lcms2engine/CMakeLists.txt	2019-06-27 18:48:55.408826106 +0200
++++ b/plugins/color/lcms2engine/CMakeLists.txt	2019-06-27 18:48:55.412826133 +0200
+@@ -1,6 +1,8 @@
+ project( lcmsengine )
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ include_directories(SYSTEM
+     ${LCMS2_INCLUDE_DIR}
+--- a/libs/brush/CMakeLists.txt	2019-06-27 18:48:55.417826167 +0200
++++ b/libs/brush/CMakeLists.txt	2019-06-27 18:48:55.421826194 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include_directories(SYSTEM
+     ${EIGEN3_INCLUDE_DIR}
+--- a/libs/global/CMakeLists.txt	2019-06-27 18:48:55.426826228 +0200
++++ b/libs/global/CMakeLists.txt	2019-06-27 18:48:55.430826255 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include(CheckFunctionExists)
+ check_function_exists(backtrace HAVE_BACKTRACE)
+--- a/libs/image/CMakeLists.txt	2019-06-27 18:48:55.435826289 +0200
++++ b/libs/image/CMakeLists.txt	2019-06-27 18:48:55.438826309 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ add_subdirectory( tiles3 )
+ 
+--- a/libs/image/tiles3/CMakeLists.txt	2019-06-27 18:48:55.444826350 +0200
++++ b/libs/image/tiles3/CMakeLists.txt	2019-06-27 18:48:55.447826370 +0200
+@@ -1 +1,3 @@
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/odf/CMakeLists.txt	2019-06-27 18:48:55.452826404 +0200
++++ b/libs/odf/CMakeLists.txt	2019-06-27 18:48:55.456826430 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ set(kritaodf_LIB_SRCS
+     KoOdf.cpp
+--- a/libs/metadata/CMakeLists.txt	2019-06-27 18:48:55.461826464 +0200
++++ b/libs/metadata/CMakeLists.txt	2019-06-27 18:48:55.465826491 +0200
+@@ -29,4 +29,6 @@
+ 
+ install(TARGETS kritametadata  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/store/CMakeLists.txt	2019-06-27 18:48:55.470826525 +0200
++++ b/libs/store/CMakeLists.txt	2019-06-27 18:48:55.473826545 +0200
+@@ -1,6 +1,8 @@
+ include_directories(${QUAZIP_INCLUDE_DIRS})
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritastore_LIB_SRCS
+     KoDirectoryStore.cpp
+--- a/libs/libkis/CMakeLists.txt	2019-06-27 18:48:55.478826579 +0200
++++ b/libs/libkis/CMakeLists.txt	2019-06-27 18:48:55.482826605 +0200
+@@ -47,4 +47,6 @@
+ install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
+ 
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+--- a/libs/widgetutils/CMakeLists.txt	2019-06-27 18:48:55.487826640 +0200
++++ b/libs/widgetutils/CMakeLists.txt	2019-06-27 18:48:55.491826667 +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/widgets/CMakeLists.txt	2019-06-27 18:48:55.496826701 +0200
++++ b/libs/widgets/CMakeLists.txt	2019-06-27 18:48:55.500826727 +0200
+@@ -1,4 +1,6 @@
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+ 
+--- a/libs/flake/CMakeLists.txt	2019-06-27 18:48:55.505826761 +0200
++++ b/libs/flake/CMakeLists.txt	2019-06-27 18:48:55.510826795 +0200
+@@ -9,7 +9,9 @@
+ )
+ 
+ add_subdirectory(styles)
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ 
+ set(kritaflake_SRCS
+     KoGradientHelper.cpp
+--- a/libs/ui/CMakeLists.txt	2019-06-27 18:48:55.516826836 +0200
++++ b/libs/ui/CMakeLists.txt	2019-06-27 18:48:55.520826863 +0200
+@@ -7,7 +7,9 @@
+     ${OCIO_INCLUDE_DIR}
+ )
+ 
++if(BUILD_TESTING)
+ add_subdirectory( tests )
++endif()
+ 
+ if (APPLE)
+     find_library(FOUNDATION_LIBRARY Foundation)
+--- a/libs/pigment/CMakeLists.txt	2019-06-27 18:48:55.526826903 +0200
++++ b/libs/pigment/CMakeLists.txt	2019-06-27 18:48:55.530826930 +0200
+@@ -31,7 +31,9 @@
+     message("${__per_arch_factory_objs}")
+ endif()
+ 
++if(BUILD_TESTING)
+ add_subdirectory(tests)
++endif()
+ add_subdirectory(benchmarks)
+ 
+ set(kritapigment_SRCS
diff --git a/media-gfx/krita/krita-4.2.1.ebuild b/media-gfx/krita/krita-4.2.2.ebuild
index f9b39e3a7afa..5a7e08cbf683 100644
--- a/media-gfx/krita/krita-4.2.1.ebuild
+++ b/media-gfx/krita/krita-4.2.2.ebuild
@@ -87,7 +87,10 @@ RDEPEND="${COMMON_DEPEND}
 # bug 630508
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-4.2.0-tests-optional.patch" )
+PATCHES=(
+	"${FILESDIR}"/${P}-tests-optional.patch
+	"${FILESDIR}"/${P}-fixuifiles.patch
+)
 
 pkg_setup() {
 	python-single-r1_pkg_setup