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

[Michael Palimaka]

commit:     2b1cbfea543a690796f4a6292d5c408106f75fd9
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 22 11:33:58 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=2b1cbfea

media-gfx/krita: add patch solving file collision with kde-plasma/breeze

Gentoo-bug: 594594
KDE-bug: 368093

Package-Manager: portage-2.3.1

 .../krita/files/krita-3.0.1-breeze-collisions.patch      | 16 ++++++++++++++++
 media-gfx/krita/krita-9999.ebuild                        |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
new file mode 100644
index 0000000..890f825
--- /dev/null
+++ b/media-gfx/krita/files/krita-3.0.1-breeze-collisions.patch
@@ -0,0 +1,16 @@
+Avoid installing files that collide with kde-plasma/breeze.
+
+Gentoo-bug: 594594
+KDE-bug: 368093
+
+--- a/krita/data/themes/CMakeLists.txt
++++ b/krita/data/themes/CMakeLists.txt
+@@ -1,8 +1,6 @@
+ ########### install files ###############
+ 
+ install(FILES
+-BreezeDark.colors
+-BreezeHighContrast.colors
+ BreezeLight.colors
+ KritaNeutral.colors
+ KritaBlender.colors

diff --git a/media-gfx/krita/krita-9999.ebuild b/media-gfx/krita/krita-9999.ebuild
index 0ad1ee1..930b316 100644
--- a/media-gfx/krita/krita-9999.ebuild
+++ b/media-gfx/krita/krita-9999.ebuild
@@ -70,6 +70,8 @@ RDEPEND="${COMMON_DEPEND}
 	!app-office/calligra:4[calligra_features_krita]
 "
 
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-breeze-collisions.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DWITH_FFTW3=$(usex fftw)