From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D61F81396DA for ; Wed, 18 Oct 2017 00:35:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26F072BC00F; Wed, 18 Oct 2017 00:35:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 078FE2BC00F for ; Wed, 18 Oct 2017 00:35:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 22AB7341301 for ; Wed, 18 Oct 2017 00:35:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8B2F2825 for ; Wed, 18 Oct 2017 00:35:18 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1508286778.7cdde17ffb6a2cc1a89fa37d19ba124f7a1cbc18.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/krita/files/, media-gfx/krita/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/krita/files/krita-3.2.1-exiv2-0.26.1.patch media-gfx/krita/krita-3.2.1.ebuild X-VCS-Directories: media-gfx/krita/files/ media-gfx/krita/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 7cdde17ffb6a2cc1a89fa37d19ba124f7a1cbc18 X-VCS-Branch: master Date: Wed, 18 Oct 2017 00:35:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a356e3de-cd6f-4805-bcb5-b0865757cf48 X-Archives-Hash: a5e47ef0cef3510123a003acae04fddf commit: 7cdde17ffb6a2cc1a89fa37d19ba124f7a1cbc18 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Oct 18 00:32:58 2017 +0000 Commit: Andreas Sturmlechner gentoo 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 --#include -+#include - - #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=(