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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     3621c5441adf6c1bf587c759d3d621b289f4901b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 15 20:29:39 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 15 20:46:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3621c544

media-gfx/krita: Fix build with >=media-gfx/exiv2-0.26_p20171013

Package-Manager: Portage-2.3.11, Repoman-2.3.3

 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, 16 insertions(+), 2 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
new file mode 100644
index 00000000000..22c3858f4c6
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch
@@ -0,0 +1,11 @@
+--- 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 7c6ab717aba..12b520bc5c5 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:=
+	>=media-gfx/exiv2-0.26_p20170713:=
 	media-libs/lcms
 	media-libs/libpng:0=
 	sys-libs/zlib
@@ -72,7 +72,10 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/calligra-l10n:4[calligra_features_krita(+)]
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-3.2.0-tests-optional.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.2.0-tests-optional.patch
+	"${FILESDIR}"/${P}-exiv2-0.26.1.patch
+)
 
 src_configure() {
 	local mycmakeargs=(