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

[Andreas Sturmlechner]

commit:     7cdde17ffb6a2cc1a89fa37d19ba124f7a1cbc18
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 18 00:32:58 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 00:32:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7cdde17f

media-gfx/krita: Drop workaround for media-gfx/exiv2-0.27

This reverts commit 3621c5441adf6c1bf587c759d3d621b289f4901b.

 media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch | 11 -----------
 media-gfx/krita/krita-3.2.1.ebuild                   |  7 ++-----
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch 
b/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
deleted file mode 100644
index 22c3858f4c6..00000000000
--- a/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/libs/ui/kisexiv2/kis_xmp_io.cpp  2017-10-15 22:09:56.908903726 +0200
-+++ b/libs/ui/kisexiv2/kis_xmp_io.cpp  2017-10-15 22:10:23.956192118 +0200
-@@ -17,7 +17,7 @@
- #include "kis_xmp_io.h"
- 
- #include <string>
--#include <exiv2/xmp.hpp>
-+#include <exiv2/xmp_exiv2.hpp>
- 
- #include "kis_exiv2.h"
- 

diff --git a/media-gfx/krita/krita-3.2.1.ebuild 
b/media-gfx/krita/krita-3.2.1.ebuild
index 12b520bc5c5..7c6ab717aba 100644
--- a/media-gfx/krita/krita-3.2.1.ebuild
+++ b/media-gfx/krita/krita-3.2.1.ebuild
@@ -40,7 +40,7 @@ COMMON_DEPEND="
        $(add_qt_dep qtx11extras)
        $(add_qt_dep qtxml)
        dev-libs/boost:=
-       >=media-gfx/exiv2-0.26_p20170713:=
+       media-gfx/exiv2:=
        media-libs/lcms
        media-libs/libpng:0=
        sys-libs/zlib
@@ -72,10 +72,7 @@ RDEPEND="${COMMON_DEPEND}
        !app-office/calligra-l10n:4[calligra_features_krita(+)]
 "
 
-PATCHES=(
-       "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch
-       "${FILESDIR}"/${P}-exiv2-0.26.1.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
 
 src_configure() {
        local mycmakeargs=(