gentoo resync : 12.01.2019

3 files changed, 9 insertions, 359 deletions

diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest
index 64f4820b8b8f..9e20e6caff3d 100644
--- a/media-gfx/krita/Manifest
+++ b/media-gfx/krita/Manifest
@@ -1,8 +1,8 @@
 AUX krita-4.0.3-tests-optional.patch 10001 BLAKE2B d31e7e89c745642e6cf5fec9f464122954bc050104f1f3dacff2001b8a594a376cd9a61243ca3e6eafc842c68a63c8d1a3b5dc75e737ff8ef8b0e2f1f08d61a2 SHA512 753af31735cd9df6d17e9323fa6699b2b27b60f58d0597e84a30f749c97c7a0595b3719e94235a34e3e51a90b0f6c183e4864ea6a0c5e5f70f27c41e3da0ffdb
 AUX krita-4.1.5-desktopfile.patch 1587 BLAKE2B 7155223dfa5a9bace62729f71a298953c9c2b9ec426693b539bcab961287ee172d8c6151f028508efdfc4e0983b3a8903affefc8ee1a30eb48a51f807c3545df SHA512 ad2a265d287a8e5de9752a83f697f49470ec9984b69a24dd351708372f7c3f1b5dabbbd671a53e5e0fdfa4dae2a0ab1b90ebfc19e6e8ba745a673f1cff607707
-AUX krita-4.1.7-exiv2-0.27.patch 14937 BLAKE2B 9ccfbb4fd023895aff49a9cff0f4e30b687b2285881d7fe489ac546589f44c722a36279b16ec2efa8b4c1c86a37494768565e8c5137f5894a84df5944cdd0b60 SHA512 d48928a86fcb6b7d80c79fb17fe20c6be46184e9ca67755723633c3a340127af336f1c1c845a8a6861d4967cbff32f61cbf5f6398c7868a4dcf158f29b67cbd6
 DIST krita-4.1.5.tar.gz 243929094 BLAKE2B 7288717978e3370b435d73dc1f7005dc339f3d11e0023cb29abf964d16a5751107287d0eca31b053a2068978c4ed40b745358afc5667b71df98e41373171ff82 SHA512 7790e3e61c18f5a2f5ba0c5d08f09bf78bcfba563b46751689db00814b9775db85cc64c162aa1c1dc47b5e73e49598b24e6a4599b8350a9e07c15aa4eb463499
+DIST krita-4.1.7-patchset.tar.xz 7208 BLAKE2B 0c5ca308d5d11878f63312a3980e66838d82a50ad64f67326a4cf35e36b500b22e5d56441516f65c3c09dd9ec7adf2f3b76ed90e3644c24e86a8ddbc499bf772 SHA512 a4290b7973cbe157c1d21f914130a3d43fcf6afa223795d1c52ca2ef22b552f0eac7714f97766d70cbfee2b88f5367c5da21baeb76febd7490cec5896791f3b4
 DIST krita-4.1.7.101.tar.gz 243977488 BLAKE2B 84cfb0f7e6e7b63c3bb9303793c2b74f180982f66ed0756c8878bf8db64b5d9bf9d3cbdb28afba11a952737b02e46759a465d90a2e8822fbb382ae679ba3c3de SHA512 8558501684bc686f431660f3dffeb75575fea3bd23662b6c598c27173cce3145c3ec2caff32b56dd597c50907a69b2faab5259cc6f518f5a0e160cae89004791
 EBUILD krita-4.1.5.ebuild 3169 BLAKE2B bb899ccaecd54bb8ba069631692aac6a64a0ed9618175b4e685ff9198818fae355814af4cb550f025f6093c6e2eb314b63a3f33da64d1e5d48c002189e6ea5a6 SHA512 33b4e2e836b187428f92620d590cfd3ed068ca48d6811a9290cf582db11e118463b13fc933b3948b5f4dd9d4addefc416f8cdf41cbdf51a1e2930060a28221f2
-EBUILD krita-4.1.7.ebuild 3280 BLAKE2B d95bac7e59fda438c564500330f7f291dcb04b4772a050af065d3d45dca7660a7726ce5cc7bf7c329c4983ccf86bdf7b6aac4292db5ebadf6a6a1cacefa44967 SHA512 0aaabe637dfeb809b36fd32ef572344439021f2d0432ee08e342447d5ccc404028c73bbd63877c334c76b3ca22a8c2f4a21196459af1bc09d7a065bc3bea3411
+EBUILD krita-4.1.7-r1.ebuild 3458 BLAKE2B 698c3974fc2d55c1dbb6ddd6b5d16272528943e71f42ae7425bcbb6de9076b5e431de317543d21725cbf13e0787e686972c5c603e914ecadb984aaac3a10f665 SHA512 c0b8ae87e32b963053f9f9a1d29b1a0ff990ac5c1a24b1bffc3e97218e3b66c77202ef0f3b4c082a87e844350de6f89bef35f5c2c19534f5b1e277ba3f8e5a8a
 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd
diff --git a/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch b/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch
deleted file mode 100644
index 41b290852eb5..000000000000
--- a/media-gfx/krita/files/krita-4.1.7-exiv2-0.27.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-From 6b6758bb37da4997be36a7e2a839b07278160559 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Thu, 27 Dec 2018 22:40:44 +0100
-Subject: [PATCH] Fix building against exiv2-0.27
-
-Summary:
-Copied FindLibExiv2.cmake from ECM 5.53.0 until we raise min version.
-
-Thanks-to: Boudewijn Rempt <boud@valdyas.org>
-for final fix to kis_xmp_io.cpp.
-
-CCBUG: 402566
-
-Test Plan: Built fine against exiv2-0.26 and exiv2-0.27.
-
-Reviewers: #krita, rempt
-
-Reviewed By: #krita, rempt
-
-Subscribers: pino
-
-Tags: #krita
-
-Differential Revision: https://phabricator.kde.org/D17810
----
- CMakeLists.txt                    |   6 +-
- cmake/modules/FindLibExiv2.cmake  | 115 ++++++++++++++++++++++++++++++
- libs/ui/CMakeLists.txt            |   3 +-
- libs/ui/kisexiv2/kis_exif_io.cpp  |  14 ++--
- libs/ui/kisexiv2/kis_exiv2.h      |   2 +-
- libs/ui/kisexiv2/kis_iptc_io.cpp  |   4 +-
- libs/ui/kisexiv2/kis_xmp_io.cpp   |   6 +-
- plugins/impex/jpeg/CMakeLists.txt |   5 +-
- 8 files changed, 130 insertions(+), 25 deletions(-)
- create mode 100644 cmake/modules/FindLibExiv2.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5558088200..b2d2cd497e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -607,11 +607,7 @@ set_package_properties(Eigen3 PROPERTIES
- ##
- ## Test for exiv2
- ##
--find_package(Exiv2 0.16 REQUIRED)
--set_package_properties(Exiv2 PROPERTIES
--    DESCRIPTION "Image metadata library and tools"
--    URL "http://www.exiv2.org"
--    PURPOSE "Required by Krita")
-+find_package(LibExiv2 0.16 REQUIRED)
- 
- ##
- ## Test for lcms
-diff --git a/cmake/modules/FindLibExiv2.cmake b/cmake/modules/FindLibExiv2.cmake
-new file mode 100644
-index 0000000000..935cee2c55
---- /dev/null
-+++ b/cmake/modules/FindLibExiv2.cmake
-@@ -0,0 +1,115 @@
-+#.rst:
-+# FindLibExiv2
-+# ------------
-+#
-+# Try to find the Exiv2 library.
-+#
-+# This will define the following variables:
-+#
-+# ``LibExiv2_FOUND``
-+#     System has LibExiv2.
-+#
-+# ``LibExiv2_VERSION``
-+#     The version of LibExiv2.
-+#
-+# ``LibExiv2_INCLUDE_DIRS``
-+#     This should be passed to target_include_directories() if
-+#     the target is not used for linking.
-+#
-+# ``LibExiv2_LIBRARIES``
-+#     The LibExiv2 library.
-+#     This can be passed to target_link_libraries() instead of
-+#     the ``LibExiv2::LibExiv2`` target
-+#
-+# If ``LibExiv2_FOUND`` is TRUE, the following imported target
-+# will be available:
-+#
-+# ``LibExiv2::LibExiv2``
-+#     The Exiv2 library
-+#
-+# Since 5.53.0.
-+#
-+#=============================================================================
-+# Copyright (c) 2018, Christophe Giboudeaux, <christophe@krop.fr>
-+# Copyright (c) 2010, Alexander Neundorf, <neundorf@kde.org>
-+# Copyright (c) 2008, Gilles Caulier, <caulier.gilles@gmail.com>
-+#
-+#
-+# Redistribution and use in source and binary forms, with or without
-+# modification, are permitted provided that the following conditions
-+# are met:
-+#
-+# 1. Redistributions of source code must retain the copyright
-+#    notice, this list of conditions and the following disclaimer.
-+# 2. Redistributions in binary form must reproduce the copyright
-+#    notice, this list of conditions and the following disclaimer in the
-+#    documentation and/or other materials provided with the distribution.
-+# 3. The name of the author may not be used to endorse or promote products
-+#    derived from this software without specific prior written permission.
-+#
-+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+#=============================================================================
-+
-+find_package(PkgConfig QUIET)
-+pkg_check_modules(PC_EXIV2 QUIET exiv2)
-+
-+find_path(LibExiv2_INCLUDE_DIRS NAMES exiv2/exif.hpp
-+    HINTS ${PC_EXIV2_INCLUDEDIR}
-+)
-+
-+find_library(LibExiv2_LIBRARIES NAMES exiv2 libexiv2
-+    HINTS ${PC_EXIV2_LIBRARY_DIRS}
-+)
-+
-+set(LibExiv2_VERSION ${PC_EXIV2_VERSION})
-+
-+if(NOT LibExiv2_VERSION AND DEFINED LibExiv2_INCLUDE_DIRS)
-+    # With exiv >= 0.27, the version #defines are in exv_conf.h instead of version.hpp
-+    foreach(_exiv2_version_file "version.hpp" "exv_conf.h")
-+        if(EXISTS "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}")
-+            file(READ "${LibExiv2_INCLUDE_DIRS}/exiv2/${_exiv2_version_file}" _exiv_version_file_content)
-+            string(REGEX MATCH "#define EXIV2_MAJOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MAJOR_VERSION_MATCH ${_exiv_version_file_content})
-+            string(REGEX MATCH "#define EXIV2_MINOR_VERSION[ ]+\\([0-9]+\\)" EXIV2_MINOR_VERSION_MATCH ${_exiv_version_file_content})
-+            string(REGEX MATCH "#define EXIV2_PATCH_VERSION[ ]+\\([0-9]+\\)" EXIV2_PATCH_VERSION_MATCH ${_exiv_version_file_content})
-+            if(EXIV2_MAJOR_VERSION_MATCH)
-+                string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MAJOR_VERSION ${EXIV2_MAJOR_VERSION_MATCH})
-+                string(REGEX REPLACE ".*_MINOR_VERSION[ ]+\\((.*)\\)" "\\1" EXIV2_MINOR_VERSION ${EXIV2_MINOR_VERSION_MATCH})
-+                string(REGEX REPLACE ".*_PATCH_VERSION[ ]+\\((.*)\\)" "\\1"  EXIV2_PATCH_VERSION  ${EXIV2_PATCH_VERSION_MATCH})
-+            endif()
-+        endif()
-+    endforeach()
-+
-+    set(LibExiv2_VERSION "${EXIV2_MAJOR_VERSION}.${EXIV2_MINOR_VERSION}.${EXIV2_PATCH_VERSION}")
-+endif()
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(LibExiv2
-+    FOUND_VAR LibExiv2_FOUND
-+    REQUIRED_VARS  LibExiv2_LIBRARIES LibExiv2_INCLUDE_DIRS
-+    VERSION_VAR  LibExiv2_VERSION
-+)
-+
-+mark_as_advanced(LibExiv2_INCLUDE_DIRS LibExiv2_LIBRARIES)
-+
-+if(LibExiv2_FOUND AND NOT TARGET LibExiv2::LibExiv2)
-+    add_library(LibExiv2::LibExiv2 UNKNOWN IMPORTED)
-+    set_target_properties(LibExiv2::LibExiv2 PROPERTIES
-+        IMPORTED_LOCATION "${LibExiv2_LIBRARIES}"
-+        INTERFACE_INCLUDE_DIRECTORIES "${LibExiv2_INCLUDE_DIRS}"
-+    )
-+endif()
-+
-+include(FeatureSummary)
-+set_package_properties(LibExiv2 PROPERTIES
-+    URL "http://www.exiv2.org"
-+    DESCRIPTION "Image metadata support"
-+)
-diff --git a/libs/ui/CMakeLists.txt b/libs/ui/CMakeLists.txt
-index f14d3591bc..ff57f53158 100644
---- a/libs/ui/CMakeLists.txt
-+++ b/libs/ui/CMakeLists.txt
-@@ -1,6 +1,5 @@
- include_directories(
-     ${CMAKE_CURRENT_SOURCE_DIR}/qtlockedfile
--    ${EXIV2_INCLUDE_DIR}
- )
- 
- include_directories(SYSTEM
-@@ -544,7 +543,7 @@ add_library(kritaui SHARED ${kritaui_HEADERS_MOC} ${kritaui_LIB_SRCS} )
- generate_export_header(kritaui BASE_NAME kritaui)
- 
- target_link_libraries(kritaui KF5::CoreAddons KF5::Completion KF5::I18n KF5::ItemViews Qt5::Network
--                      kritaimpex kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} ${EXIV2_LIBRARIES}
-+                      kritaimpex kritacolor kritaimage kritalibbrush kritawidgets kritawidgetutils ${PNG_LIBRARIES} LibExiv2::LibExiv2
- )
- 
- if (HAVE_QT_MULTIMEDIA)
-diff --git a/libs/ui/kisexiv2/kis_exif_io.cpp b/libs/ui/kisexiv2/kis_exif_io.cpp
-index 1a01fedf33..4a7857aa9c 100644
---- a/libs/ui/kisexiv2/kis_exif_io.cpp
-+++ b/libs/ui/kisexiv2/kis_exif_io.cpp
-@@ -438,11 +438,10 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
-                     if (entry.value().asArray().size() > 0) {
-                         creator = entry.value().asArray()[0];
-                     }
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-+#if !EXIV2_TEST_VERSION(0,21,0)
-                     v = kmdValueToExivValue(creator, Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
- #else
-                     v = kmdValueToExivValue(creator, exifKey.defaultTypeId());
--
- #endif
-                 } else if (exivKey == "Exif.Photo.OECF") {
-                     v = kmdOECFStructureToExifOECF(entry.value());
-@@ -456,13 +455,13 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
-                     Q_ASSERT(entry.value().type() == KisMetaData::Value::LangArray);
-                     QMap<QString, KisMetaData::Value> langArr = entry.value().asLangArray();
-                     if (langArr.contains("x-default")) {
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-+#if !EXIV2_TEST_VERSION(0,21,0)
-                         v = kmdValueToExivValue(langArr.value("x-default"), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
- #else
-                         v = kmdValueToExivValue(langArr.value("x-default"), exifKey.defaultTypeId());
- #endif
-                     } else if (langArr.size() > 0) {
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-+#if !EXIV2_TEST_VERSION(0,21,0)
-                         v = kmdValueToExivValue(langArr.begin().value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
- #else
-                         v = kmdValueToExivValue(langArr.begin().value(), exifKey.defaultTypeId());
-@@ -470,7 +469,7 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
-                     }
-                 } else {
-                     dbgMetaData << exifKey.tag();
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 20
-+#if !EXIV2_TEST_VERSION(0,21,0)
-                     v = kmdValueToExivValue(entry.value(), Exiv2::ExifTags::tagType(exifKey.tag(), exifKey.ifdId()));
- #else
-                     v = kmdValueToExivValue(entry.value(), exifKey.defaultTypeId());
-@@ -487,7 +486,7 @@ bool KisExifIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
-             dbgMetaData << "exiv error " << e.what();
-         }
-     }
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
-+#if !EXIV2_TEST_VERSION(0,18,0)
-     Exiv2::DataBuf rawData = exifData.copy();
-     ioDevice->write((const char*) rawData.pData_, rawData.size_);
- #else
-@@ -514,7 +513,7 @@ bool KisExifIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
-     QByteArray arr = ioDevice->readAll();
-     Exiv2::ExifData exifData;
-     Exiv2::ByteOrder byteOrder;
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
-+#if !EXIV2_TEST_VERSION(0,18,0)
-     exifData.load((const Exiv2::byte*)arr.data(), arr.size());
-     byteOrder = exifData.byteOrder();
- #else
-@@ -529,7 +528,6 @@ bool KisExifIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
-         dbgKrita << "Received unknown exception trying to parse exiv data";
-         return false;
-     }
--
- #endif
-     dbgMetaData << "Byte order = " << byteOrder << ppVar(Exiv2::bigEndian) << ppVar(Exiv2::littleEndian);
-     dbgMetaData << "There are" << exifData.count() << " entries in the exif section";
-diff --git a/libs/ui/kisexiv2/kis_exiv2.h b/libs/ui/kisexiv2/kis_exiv2.h
-index 9343265f1e..6b66aa7852 100644
---- a/libs/ui/kisexiv2/kis_exiv2.h
-+++ b/libs/ui/kisexiv2/kis_exiv2.h
-@@ -21,7 +21,7 @@
- 
- 
- #include <metadata/kis_meta_data_value.h>
--#include <exiv2/value.hpp>
-+#include <exiv2/exiv2.hpp>
- #include "kritaui_export.h"
- 
- /// Convert an exiv value to a KisMetaData value
-diff --git a/libs/ui/kisexiv2/kis_iptc_io.cpp b/libs/ui/kisexiv2/kis_iptc_io.cpp
-index d2eb7c9b2f..0ac881f61b 100644
---- a/libs/ui/kisexiv2/kis_iptc_io.cpp
-+++ b/libs/ui/kisexiv2/kis_iptc_io.cpp
-@@ -126,7 +126,7 @@ bool KisIptcIO::saveTo(KisMetaData::Store* store, QIODevice* ioDevice, HeaderTyp
-             }
-         }
-     }
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
-+#if !EXIV2_TEST_VERSION(0,18,0)
-     Exiv2::DataBuf rawData = iptcData.copy();
- #else
-     Exiv2::DataBuf rawData = Exiv2::IptcParser::encode(iptcData);
-@@ -167,7 +167,7 @@ bool KisIptcIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
-     ioDevice->open(QIODevice::ReadOnly);
-     QByteArray arr = ioDevice->readAll();
-     Exiv2::IptcData iptcData;
--#if EXIV2_MAJOR_VERSION == 0 && EXIV2_MINOR_VERSION <= 17
-+#if !EXIV2_TEST_VERSION(0,18,0)
-     iptcData.load((const Exiv2::byte*)arr.data(), arr.size());
- #else
-     Exiv2::IptcParser::decode(iptcData, (const Exiv2::byte*)arr.data(), arr.size());
-diff --git a/libs/ui/kisexiv2/kis_xmp_io.cpp b/libs/ui/kisexiv2/kis_xmp_io.cpp
-index c4663efe7d..72fa5c5d38 100644
---- a/libs/ui/kisexiv2/kis_xmp_io.cpp
-+++ b/libs/ui/kisexiv2/kis_xmp_io.cpp
-@@ -17,7 +17,6 @@
- #include "kis_xmp_io.h"
- 
- #include <string>
--#include <exiv2/xmp.hpp>
- 
- #include "kis_exiv2.h"
- 
-@@ -277,9 +276,8 @@ bool KisXMPIO::loadFrom(KisMetaData::Store* store, QIODevice* ioDevice) const
-                 const Exiv2::XmpArrayValue* xav = dynamic_cast<const Exiv2::XmpArrayValue*>(value.get());
-                 Q_ASSERT(xav);
-                 QList<KisMetaData::Value> array;
--                for (std::vector< std::string >::const_iterator it = xav->value_.begin();
--                        it != xav->value_.end(); ++it) {
--                    QString value = it->c_str();
-+                for (int i = 0; i < xav->size(); ++i) {
-+                    QString value = QString::fromStdString(xav->toString(i));
-                     if (parser) {
-                         array.push_back(parser->parse(value));
-                     } else {
-diff --git a/plugins/impex/jpeg/CMakeLists.txt b/plugins/impex/jpeg/CMakeLists.txt
-index 347e46dbe3..50edb05c96 100644
---- a/plugins/impex/jpeg/CMakeLists.txt
-+++ b/plugins/impex/jpeg/CMakeLists.txt
-@@ -4,7 +4,6 @@ set(ICCJPEG_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/lcms")
- 
- include_directories(
-     ${ICCJPEG_SOURCE_DIR}
--    ${EXIV2_INCLUDE_DIR}
- )
- 
- include_directories(SYSTEM
-@@ -25,7 +24,7 @@ set(kritajpegimport_SOURCES
- 
- add_library(kritajpegimport MODULE ${kritajpegimport_SOURCES})
- 
--target_link_libraries(kritajpegimport kritaui  ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
-+target_link_libraries(kritajpegimport kritaui  ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} LibExiv2::LibExiv2 )
- 
- install(TARGETS kritajpegimport  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
- 
-@@ -38,7 +37,7 @@ ki18n_wrap_ui(kritajpegexport_SOURCES kis_wdg_options_jpeg.ui )
- 
- add_library(kritajpegexport MODULE ${kritajpegexport_SOURCES})
- 
--target_link_libraries(kritajpegexport kritaui kritaimpex ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} ${EXIV2_LIBRARIES} )
-+target_link_libraries(kritajpegexport kritaui kritaimpex ${JPEG_LIBRARIES} ${LCMS2_LIBRARIES} LibExiv2::LibExiv2 )
- 
- install(TARGETS kritajpegexport  DESTINATION ${KRITA_PLUGIN_INSTALL_DIR})
- install( PROGRAMS  krita_jpeg.desktop  DESTINATION ${XDG_APPS_INSTALL_DIR})
--- 
-2.20.1
-
diff --git a/media-gfx/krita/krita-4.1.7.ebuild b/media-gfx/krita/krita-4.1.7-r1.ebuild
index efe9923bc337..9a37a3abbdb5 100644
--- a/media-gfx/krita/krita-4.1.7.ebuild
+++ b/media-gfx/krita/krita-4.1.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,8 @@ PYTHON_COMPAT=( python3_{4,5,6,7} )
 inherit kde5 python-single-r1
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.101.tar.gz"
+	SRC_URI="mirror://kde/stable/${PN}/${PV%.1}/${P}.101.tar.gz
+		https://dev.gentoo.org/~asturm/distfiles/${P}-patchset.tar.xz"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -88,7 +89,10 @@ RESTRICT+=" test"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.0.3-tests-optional.patch"
-	"${FILESDIR}/${P}-exiv2-0.27.patch"
+	"${WORKDIR}/${P}-exiv2-0.27.patch"
+	"${WORKDIR}/${P}-resize-hud.patch"
+	"${WORKDIR}/${P}-overview-docker.patch"
+	"${WORKDIR}/${P}-assert-error.patch"
 )
 
 S="${S}.101"