[gentoo-commits] proj/kde:master commit in: kde-plasma/breeze/

[Michael Palimaka]

commit:     1c0196c2b6f975d05703cd031f97a40714e20f75
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Nov  9 23:58:52 2015 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Tue Nov 10 17:05:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=1c0196c2

kde-plasma/breeze: Disable icons subdirectories for breeze-icons

The old 5.4.x content is being split out into kde-frameworks/breeze-icons.
This makes breeze-5.4.x compatible with kde-frameworks-5.16 set/newer 
breeze-icons.

Package-Manager: portage-2.2.20.1

 kde-plasma/breeze/breeze-5.4.3.ebuild       | 9 +++++++++
 kde-plasma/breeze/breeze-5.4.49.9999.ebuild | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/kde-plasma/breeze/breeze-5.4.3.ebuild 
b/kde-plasma/breeze/breeze-5.4.3.ebuild
index b34bda2..a8d14fd 100644
--- a/kde-plasma/breeze/breeze-5.4.3.ebuild
+++ b/kde-plasma/breeze/breeze-5.4.3.ebuild
@@ -41,6 +41,15 @@ pkg_setup() {
        MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
 }
 
+src_prepare() {
+       # Disable icons packaged separately in kde-frameworks/breeze-icons
+       sed -i \
+               -e "/add_subdirectory(icons/ s/^/#/" \
+               CMakeLists.txt
+
+       kde5_src_prepare
+}
+
 src_configure() {
        myconfigure() {
                local mycmakeargs=()

diff --git a/kde-plasma/breeze/breeze-5.4.49.9999.ebuild 
b/kde-plasma/breeze/breeze-5.4.49.9999.ebuild
index e991b7c..ff4f4ca 100644
--- a/kde-plasma/breeze/breeze-5.4.49.9999.ebuild
+++ b/kde-plasma/breeze/breeze-5.4.49.9999.ebuild
@@ -41,6 +41,15 @@ pkg_setup() {
        MULTIBUILD_VARIANTS=( kf5 $(usev qt4) )
 }
 
+src_prepare() {
+       # Disable icons packaged separately in kde-frameworks/breeze-icons
+       sed -i \
+               -e "/add_subdirectory(icons/ s/^/#/" \
+               CMakeLists.txt
+
+       kde5_src_prepare
+}
+
 src_configure() {
        myconfigure() {
                local mycmakeargs=()