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

[Michael Palimaka]

commit:     3f62cdbbba05554ccc0230d532e5ba2193b8ac4c
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 11:38:03 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Sep 22 11:38:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=3f62cdbb

media-gfx/krita: avoid automagic CXXFLAG detection courtesy of dev-libs/vc

Gentoo-bug: 584118

Package-Manager: portage-2.3.1

 media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch | 17 +++++++++++++++++
 media-gfx/krita/krita-9999.ebuild                   |  5 ++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch b/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
new file mode 100644
index 0000000..11c1105
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.0.1-vc-cxxflags.patch
@@ -0,0 +1,17 @@
+Avoid automagic CXXFLAG detection courtesy of dev-libs/vc.
+
+Gentoo-bug: 584118
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -525,10 +525,6 @@
+     endif()
+     endmacro()
+ 
+-    if (NOT PACKAGERS_BUILD)
+-        # Optimize everything for the current architecture
+-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${Vc_DEFINITIONS}")
+-    endif ()
+ endif()
+ set(CMAKE_MODULE_PATH ${OLD_CMAKE_MODULE_PATH} )
+ 

diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 930b316..4634b46 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -70,7 +70,10 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/calligra:4[calligra_features_krita]
 "
 
-PATCHES=( "${FILESDIR}/${PN}-3.0.1-breeze-collisions.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-3.0.1-breeze-collisions.patch"
+	"${FILESDIR}/${PN}-3.0.1-vc-cxxflags.patch"
+)
 
 src_configure() {
 	local mycmakeargs=(