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

["Guilherme Amadio" <amadio@gentoo.org>]

commit:     8c3ad9a5535e0c3d5c90c5bfd31511d33a2fffb1
Author:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 15 16:38:20 2017 +0000
Commit:     Guilherme Amadio <amadio <AT> gentoo <DOT> org>
CommitDate: Wed Feb 15 16:40:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c3ad9a5

media-gfx/krita: Use right ABI when using GCC4.x, bug 596740

Gentoo-Bug: https://bugs.gentoo.org/596740

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch | 14 ++++
 media-gfx/krita/krita-3.1.2-r2.ebuild              | 95 ++++++++++++++++++++++
 2 files changed, 109 insertions(+)

diff --git a/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch b/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch
new file mode 100644
index 0000000000..0f0b9674dd
--- /dev/null
+++ b/media-gfx/krita/files/krita-vc-fix-gcc49-abi.patch
@@ -0,0 +1,14 @@
+--- a/CMakeLists.txt	2017-02-13 11:12:47.866321035 -0200
++++ b/CMakeLists.txt	2017-02-13 11:18:55.769657370 -0200
+@@ -533,9 +533,9 @@
+     include (VcMacros)
+ 
+     if(Vc_COMPILER_IS_CLANG)
+-        set(ADDITIONAL_VC_FLAGS "-Wabi -ffp-contract=fast -fPIC")
++        add_compile_options(-Wabi -ffp-contract=fast -fPIC)
+     elseif (NOT MSVC)
+-        set(ADDITIONAL_VC_FLAGS "-Wabi -fabi-version=0 -ffp-contract=fast -fPIC")
++        add_compile_options(-Wabi -fabi-version=0 -ffp-contract=fast -fPIC)
+     endif()
+ 
+     #Handle Vc master

diff --git a/media-gfx/krita/krita-3.1.2-r2.ebuild b/media-gfx/krita/krita-3.1.2-r2.ebuild
new file mode 100644
index 0000000000..87e9facb8b
--- /dev/null
+++ b/media-gfx/krita/krita-3.1.2-r2.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_TEST="forceoptional"
+inherit kde5
+
+DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!"
+HOMEPAGE="https://www.kde.org/applications/graphics/krita/ https://krita.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.1.tar.gz"
+
+LICENSE="GPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="color-management fftw +gsl +jpeg openexr pdf qtmedia +raw tiff vc"
+
+COMMON_DEPEND="
+	$(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 kio)
+	$(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 qtgui '-gles2')
+	$(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:=
+	media-gfx/exiv2:=
+	media-libs/lcms
+	media-libs/libpng:0=
+	net-misc/curl
+	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= )
+	gsl? ( sci-libs/gsl:= )
+	jpeg? ( virtual/jpeg:0 )
+	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}
+	dev-cpp/eigen:3
+	dev-lang/perl
+	sys-devel/gettext
+	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(+)]
+"
+
+S="${WORKDIR}/${P}.1"
+
+PATCHES=( "${FILESDIR}"/${PN}-vc-fix-gcc49-abi.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package color-management OCIO)
+		$(cmake-utils_use_find_package fftw FFTW3)
+		$(cmake-utils_use_find_package gsl GSL)
+		$(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
+}