gentoo resync : 18.11.2019

6 files changed, 2 insertions, 541 deletions

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 503df3e9bf28..ac8cd7935a7d 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,9 +1,4 @@
-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.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3
-DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9
 DIST krita-4.2.7.1.tar.xz 164304772 BLAKE2B 99a4c3b6a48d1d695ee5bb8f6576c9a4593e1ff3a10846340974588ff8b3c061a7838b862c1ecdc4f0635ffa270cb272f1155b1efca4dbf50a11096ee1e92d48 SHA512 28f4af4131a0f364b285596031a3f59a8bd7e97930cd740a4767dbe95540dc403bd6ae0a99ff2bef95e2bac6f23931873404e4fed3ea4afd4b614b5f7d823a35
-EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a
-EBUILD krita-4.2.7.1.ebuild 3115 BLAKE2B bd8b791204aed7c36e0d3290177371389e8e9f3e60526f86db85a5c3213e694925b033291a2b67e37821220b9975ae4eb4d202aab482a6796ca975a29aa240be SHA512 a2e337bdb1fc79038570be6b4585c3b741013a3404e1ad4b90d7449167d0e9e67318160cd725d6c95c98829825484c6b29f08d222b62e8c1260692071d2bcb45
+EBUILD krita-4.2.7.1.ebuild 3114 BLAKE2B 5cae86dc90f5a657ffaadcefd3c6c3cb595f96bc3a48aeb45982f2d55f99546c9c4cec6412ccfa4631000764591ebcc27ed5f782d29535aa6d245fbc13e6557f SHA512 7e8fa9982d82509f0efa6edc5826793493fc11348db464ef998cdf0789d914fb185894b66b8ce5ffd053f3e08c23be68b0c4a76cb10455e63e0b9ae2fe041e7c
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.0.3-tests-optional.patch b/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
deleted file mode 100644
index c9e3ddc2aea3..000000000000
--- a/media-gfx/krita/files/krita-4.0.3-tests-optional.patch
+++ /dev/null
@@ -1,324 +0,0 @@
-Autogenerated by KDE_TEST=forceoptional-recursive and edited.
-
---- a/plugins/paintops/libpaintop/CMakeLists.txt	2018-08-29 18:17:38.843385842 +0200
-+++ b/plugins/paintops/libpaintop/CMakeLists.txt	2018-08-29 18:17:38.846385865 +0200
-@@ -104,4 +104,6 @@
- install(TARGETS kritalibpaintop  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/plugins/paintops/defaultpaintops/CMakeLists.txt	2018-08-29 18:17:38.851385903 +0200
-+++ b/plugins/paintops/defaultpaintops/CMakeLists.txt	2018-08-29 18:17:38.854385926 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(brush/tests)
-+endif()
- 
- include_directories(brush
-                     duplicate
---- a/plugins/impex/libkra/CMakeLists.txt	2018-08-29 18:17:38.858385956 +0200
-+++ b/plugins/impex/libkra/CMakeLists.txt	2018-08-29 18:17:38.861385978 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritalibkra_LIB_SRCS
-     kis_colorize_dom_utils.cpp
---- a/plugins/impex/exr/CMakeLists.txt	2018-08-29 18:17:38.866386016 +0200
-+++ b/plugins/impex/exr/CMakeLists.txt	2018-08-29 18:17:38.869386039 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM ${OPENEXR_INCLUDE_DIR} )
- 
---- a/plugins/impex/svg/CMakeLists.txt	2018-08-29 18:17:38.874386077 +0200
-+++ b/plugins/impex/svg/CMakeLists.txt	2018-08-29 18:17:38.878386107 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritasvgimport_SOURCES
-     kis_svg_import.cc
---- a/plugins/impex/jpeg/CMakeLists.txt	2018-08-29 18:17:38.883386145 +0200
-+++ b/plugins/impex/jpeg/CMakeLists.txt	2018-08-29 18:17:38.887386175 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
- 
---- a/plugins/impex/heightmap/CMakeLists.txt	2018-08-29 18:17:38.892386213 +0200
-+++ b/plugins/impex/heightmap/CMakeLists.txt	2018-08-29 18:17:38.896386243 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
---- a/plugins/impex/psd/CMakeLists.txt	2018-08-29 18:17:38.901386281 +0200
-+++ b/plugins/impex/psd/CMakeLists.txt	2018-08-29 18:17:38.904386304 +0200
-@@ -1,5 +1,7 @@
- if (NOT MSVC AND NOT APPLE)
--    add_subdirectory(tests)
-+    if(BUILD_TESTING)
-+        add_subdirectory(tests)
-+    endif()
- endif()
- 
- configure_file(config_psd.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_psd.h)
---- a/plugins/impex/ppm/CMakeLists.txt	2018-08-29 18:17:38.909386342 +0200
-+++ b/plugins/impex/ppm/CMakeLists.txt	2018-08-29 18:17:38.913386372 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories( ${CMAKE_CURRENT_SOURCE_DIR} )
- 
---- a/plugins/impex/png/CMakeLists.txt	2018-08-29 18:17:38.918386410 +0200
-+++ b/plugins/impex/png/CMakeLists.txt	2018-08-29 18:17:38.922386440 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritapngimport_SOURCES
-     kis_png_import.cc
---- a/plugins/impex/csv/CMakeLists.txt	2018-08-29 18:17:38.927386478 +0200
-+++ b/plugins/impex/csv/CMakeLists.txt	2018-08-29 18:17:38.931386508 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- # import
- 
---- a/plugins/impex/xcf/CMakeLists.txt	2018-08-29 18:17:38.936386546 +0200
-+++ b/plugins/impex/xcf/CMakeLists.txt	2018-08-29 18:17:38.940386576 +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	2018-08-29 18:17:38.944386606 +0200
-+++ b/plugins/impex/tiff/CMakeLists.txt	2018-08-29 18:17:38.947386630 +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	2018-08-29 18:17:38.952386667 +0200
-+++ b/plugins/extensions/qmic/CMakeLists.txt	2018-08-29 18:17:38.955386690 +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	2018-08-29 18:17:38.959386720 +0200
-+++ b/plugins/filters/CMakeLists.txt	2018-08-29 18:17:38.963386750 +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	2018-08-29 18:17:38.968386788 +0200
-+++ b/plugins/filters/unsharp/CMakeLists.txt	2018-08-29 18:17:38.971386811 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaunsharpfilter_SOURCES
-     unsharp.cpp
---- a/plugins/tools/basictools/CMakeLists.txt	2018-08-29 18:17:38.976386849 +0200
-+++ b/plugins/tools/basictools/CMakeLists.txt	2018-08-29 18:17:38.980386879 +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	2018-08-29 18:17:38.985386917 +0200
-+++ b/plugins/tools/tool_transform2/CMakeLists.txt	2018-08-29 18:17:38.989386947 +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/color/lcms2engine/CMakeLists.txt	2018-08-29 18:17:38.994386985 +0200
-+++ b/plugins/color/lcms2engine/CMakeLists.txt	2018-08-29 18:17:38.998387015 +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	2018-08-29 18:17:39.003387053 +0200
-+++ b/plugins/dockers/defaultdockers/CMakeLists.txt	2018-08-29 18:17:39.007387084 +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	2018-08-29 18:17:39.012387121 +0200
-+++ b/plugins/dockers/animation/CMakeLists.txt	2018-08-29 18:17:39.016387151 +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/dockers/lut/CMakeLists.txt	2018-08-29 18:17:39.021387189 +0200
-+++ b/plugins/dockers/lut/CMakeLists.txt	2018-08-29 18:17:39.025387220 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- include_directories(SYSTEM
-     ${OCIO_INCLUDE_DIR}
---- a/libs/store/CMakeLists.txt	2018-08-29 18:17:39.030387258 +0200
-+++ b/libs/store/CMakeLists.txt	2018-08-29 18:17:39.033387280 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritastore_LIB_SRCS
-     KoDirectoryStore.cpp
---- a/libs/flake/CMakeLists.txt	2018-08-29 18:17:39.038387318 +0200
-+++ b/libs/flake/CMakeLists.txt	2018-08-29 18:17:39.042387349 +0200
-@@ -9,7 +9,9 @@
- )
- 
- add_subdirectory(styles)
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
- 
- set(kritaflake_SRCS
-     KoGradientHelper.cpp
---- a/libs/widgetutils/CMakeLists.txt	2018-08-29 18:17:39.046387379 +0200
-+++ b/libs/widgetutils/CMakeLists.txt	2018-08-29 18:17:39.049387401 +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	2018-08-29 18:17:39.054387439 +0200
-+++ b/libs/odf/CMakeLists.txt	2018-08-29 18:17:39.058387469 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- set(kritaodf_LIB_SRCS
-     KoOdf.cpp
---- a/libs/pigment/CMakeLists.txt	2018-08-29 18:17:39.062387500 +0200
-+++ b/libs/pigment/CMakeLists.txt	2018-08-29 18:17:39.067387538 +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/widgets/CMakeLists.txt	2018-08-29 18:17:39.073387583 +0200
-+++ b/libs/widgets/CMakeLists.txt	2018-08-29 18:17:39.078387621 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include_directories(${CMAKE_CURRENT_BINARY_DIR})
- 
---- a/libs/ui/CMakeLists.txt	2018-08-29 18:17:39.084387666 +0200
-+++ b/libs/ui/CMakeLists.txt	2018-08-29 18:17:39.088387697 +0200
-@@ -8,7 +8,9 @@
-     ${OCIO_INCLUDE_DIR}
- )
- 
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- if (APPLE)
-     find_library(FOUNDATION_LIBRARY Foundation)
---- a/libs/image/CMakeLists.txt	2018-08-29 18:17:39.092387727 +0200
-+++ b/libs/image/CMakeLists.txt	2018-08-29 18:17:39.096387757 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- add_subdirectory( tiles3 )
- 
---- a/libs/image/tiles3/CMakeLists.txt	2018-08-29 18:17:39.101387795 +0200
-+++ b/libs/image/tiles3/CMakeLists.txt	2018-08-29 18:17:39.105387825 +0200
-@@ -1 +1,3 @@
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
---- a/libs/global/CMakeLists.txt	2018-08-29 18:17:39.110387863 +0200
-+++ b/libs/global/CMakeLists.txt	2018-08-29 18:17:39.113387886 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include(CheckFunctionExists)
- check_function_exists(backtrace HAVE_BACKTRACE)
---- a/libs/brush/CMakeLists.txt	2018-08-29 18:17:39.117387916 +0200
-+++ b/libs/brush/CMakeLists.txt	2018-08-29 18:17:39.121387946 +0200
-@@ -1,4 +1,6 @@
-+if(BUILD_TESTING)
- add_subdirectory( tests )
-+endif()
- 
- include_directories(SYSTEM
-     ${EIGEN3_INCLUDE_DIR}
---- a/libs/libkis/CMakeLists.txt	2018-08-29 18:17:39.126387984 +0200
-+++ b/libs/libkis/CMakeLists.txt	2018-08-29 18:17:39.131388022 +0200
-@@ -46,4 +46,6 @@
- install(TARGETS kritalibkis  ${INSTALL_TARGETS_DEFAULT_ARGS})
- 
- 
-+if(BUILD_TESTING)
- add_subdirectory(tests)
-+endif()
diff --git a/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch b/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
deleted file mode 100644
index 2928247e57a0..000000000000
--- a/media-gfx/krita/files/krita-4.1.8-fix-pre-5.12-tablet-support.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 0218025b1725aa810f108d08802b590ce62f1044 Mon Sep 17 00:00:00 2001
-From: Dmitry Kazakov <dimula73@gmail.com>
-Date: Mon, 25 Mar 2019 21:16:41 +0300
-Subject: Add a workaround for Qt 5.9...5.11.X to fix tablet support
-
-Basically, the patch mimics this Qt's patch that has been
-added in Qt 5.12.0 only:
-https://codereview.qt-project.org/#/c/239918/
-
-BUG:399696
----
- libs/ui/input/kis_input_manager_p.cpp | 22 ++++++++++++++++++++++
- 1 file changed, 22 insertions(+)
-
-diff --git a/libs/ui/input/kis_input_manager_p.cpp b/libs/ui/input/kis_input_manager_p.cpp
-index 4f5a58f..0a26655 100644
---- a/libs/ui/input/kis_input_manager_p.cpp
-+++ b/libs/ui/input/kis_input_manager_p.cpp
-@@ -333,6 +333,28 @@ KisInputManager::Private::ProximityNotifier::ProximityNotifier(KisInputManager::
- 
- bool KisInputManager::Private::ProximityNotifier::eventFilter(QObject* object, QEvent* event )
- {
-+    /**
-+     * All Qt builds in range 5.7.0...5.11.X on X11 had a problem that made all
-+     * the tablet events be accepted by default. It meant that no mouse
-+     * events were synthesized, and, therefore, no Enter/Leave were generated.
-+     *
-+     * The fix for this bug has been added only in Qt 5.12.0:
-+     * https://codereview.qt-project.org/#/c/239918/
-+     *
-+     * To avoid this problem we should explicitly ignore all the tablet events.
-+     */
-+#if defined Q_OS_LINUX && \
-+    QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) && \
-+    QT_VERSION < QT_VERSION_CHECK(5, 12, 0)
-+
-+    if (event->type() == QEvent::TabletMove ||
-+        event->type() == QEvent::TabletPress ||
-+        event->type() == QEvent::TabletRelease) {
-+
-+        event->ignore();
-+    }
-+#endif
-+
-     switch (event->type()) {
-     case QEvent::TabletEnterProximity:
-         d->debugEvent<QEvent, false>(event);
--- 
-cgit v1.1
diff --git a/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch b/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
deleted file mode 100644
index dc65b1c49d23..000000000000
--- a/media-gfx/krita/files/krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9347112a77b3b628af8c0b8d4d7cbc0929eede9e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Wolthera=20van=20H=C3=B6vell=20tot=20Westerflier?=
- <griffinvalley@gmail.com>
-Date: Sat, 30 Mar 2019 21:47:37 +0100
-Subject: BUG:406032 Fix crash caused by unsupported composition mode in QT
- 5.12
-
-Qt 5.12 doesn't support QPainter::RasterOp_SourceXorDestination anymore.
-
-Trying to paint with a painter that uses this while opengl is enabled
-will lead to a crash. The only relevant place this enum value is still used
-is in kis_tool.cc, where it is only painted on the regular non-accelerated canvas.
-
-Anyhow, told the smartpatch to use this function instead of doing something itself.
-
-The whole thing is a little bizar.
----
- plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
-index 656ba38..32577a3 100644
---- a/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
-+++ b/plugins/tools/tool_smart_patch/kis_tool_smart_patch.cpp
-@@ -245,9 +245,8 @@ void KisToolSmartPatch::paint(QPainter &painter, const KoViewConverter &converte
-     Q_UNUSED(converter);
- 
-     painter.save();
--    painter.setCompositionMode(QPainter::RasterOp_SourceXorDestination);
--    painter.setPen(QColor(128, 255, 128));
--    painter.drawPath(pixelToView(m_d->brushOutline));
-+    QPainterPath path = pixelToView(m_d->brushOutline);
-+    paintToolOutline(&painter, path);
-     painter.restore();
- 
-     painter.save();
--- 
-cgit v1.1
diff --git a/media-gfx/krita/krita-4.1.8-r1.ebuild b/media-gfx/krita/krita-4.1.8-r1.ebuild
deleted file mode 100644
index dae8437cd874..000000000000
--- a/media-gfx/krita/krita-4.1.8-r1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="forceoptional"
-QT_MINIMAL="5.11.3"
-VIRTUALX_REQUIRED="test"
-PYTHON_COMPAT=( python3_{5,6,7} )
-inherit kde5 python-single-r1
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-fi
-
-DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
-HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
-LICENSE="GPL-3"
-IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# FIXME: drop qtgui subslot operator when QTBUG is fixed or QT_MINIMAL >= 5.12.0:
-# https://bugreports.qt.io/browse/QTBUG-72488
-BDEPEND="
-	dev-cpp/eigen:3
-	dev-lang/perl
-	sys-devel/gettext
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui '-gles2' '' '5=')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	dev-libs/boost:=
-	dev-python/PyQt5[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	media-gfx/exiv2:=
-	media-libs/lcms
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXi
-	color-management? ( media-libs/opencolorio )
-	fftw? ( sci-libs/fftw:3.0= )
-	gif? ( media-libs/giflib )
-	gsl? ( sci-libs/gsl:= )
-	jpeg? ( virtual/jpeg:0 )
-	heif? ( media-libs/libheif:= )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr
-	)
-	pdf? ( app-text/poppler[qt5] )
-	qtmedia? ( $(add_qt_dep qtmultimedia) )
-	raw? ( media-libs/libraw:= )
-	tiff? ( media-libs/tiff:0 )
-"
-DEPEND="${COMMON_DEPEND}
-	vc? ( >=dev-libs/vc-1.1.0 )
-"
-RDEPEND="${COMMON_DEPEND}
-	!app-office/calligra:4[calligra_features_krita]
-	!app-office/calligra-l10n:4[calligra_features_krita(+)]
-"
-
-# bug 630508
-RESTRICT+=" test"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
-	"${FILESDIR}/${P}-qt-5.12-fix-unsupported-composition-mode.patch"
-	"${FILESDIR}/${P}-fix-pre-5.12-tablet-support.patch"
-)
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-	kde5_pkg_setup
-}
-
-src_configure() {
-	# Prevent sandbox violation from FindPyQt5.py module
-	# See Gentoo-bug 655918
-	addpredict /dev/dri
-
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package color-management OCIO)
-		$(cmake-utils_use_find_package fftw FFTW3)
-		$(cmake-utils_use_find_package gif GIF)
-		$(cmake-utils_use_find_package gsl GSL)
-		$(cmake-utils_use_find_package heif HEIF)
-		$(cmake-utils_use_find_package jpeg JPEG)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-		$(cmake-utils_use_find_package pdf Poppler)
-		$(cmake-utils_use_find_package qtmedia Qt5Multimedia)
-		$(cmake-utils_use_find_package raw LibRaw)
-		$(cmake-utils_use_find_package tiff TIFF)
-		$(cmake-utils_use_find_package vc Vc)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-gfx/krita/krita-4.2.7.1.ebuild b/media-gfx/krita/krita-4.2.7.1.ebuild
index 30b6159d8dce..4f1797aa0064 100644
--- a/media-gfx/krita/krita-4.2.7.1.ebuild
+++ b/media-gfx/krita/krita-4.2.7.1.ebuild
@@ -10,7 +10,7 @@ inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
 	SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"