commit:     af22b7a865488d3f24787e363334ec90ea96ef83
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 23 21:55:34 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Oct 23 23:19:25 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=af22b7a8

kde-plasma/breeze: Fix KDE_INSTALL_USE_QT_SYS_PATHS warning

Not a thing when building for USE=qt4.
Adding relevant parts of kde4-base.eclass to src_configure.

Package-Manager: Portage-2.3.12, Repoman-2.3.3

 kde-plasma/breeze/breeze-5.11.49.9999.ebuild | 12 ++++++++----
 kde-plasma/breeze/breeze-9999.ebuild         | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/kde-plasma/breeze/breeze-5.11.49.9999.ebuild 
b/kde-plasma/breeze/breeze-5.11.49.9999.ebuild
index b42401c941..371d5ab90b 100644
--- a/kde-plasma/breeze/breeze-5.11.49.9999.ebuild
+++ b/kde-plasma/breeze/breeze-5.11.49.9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit kde5 multibuild
+inherit flag-o-matic kde5 multibuild
 
 DESCRIPTION="Breeze visual style for the Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/breeze.git";
@@ -56,15 +56,19 @@ src_configure() {
                local mycmakeargs=()
 
                if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-                       mycmakeargs+=( -DUSE_KDE4=true )
+                       use debug || append-cppflags -DQT_NO_DEBUG
+                       mycmakeargs+=(
+                               -DUSE_KDE4=true
+                               -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+                       )
+                       cmake-utils_src_configure
                else
                        mycmakeargs+=(
                                $(cmake-utils_use_find_package wayland 
KF5Wayland)
                                $(cmake-utils_use_find_package X XCB)
                        )
+                       kde5_src_configure
                fi
-
-               kde5_src_configure
        }
 
        multibuild_foreach_variant myconfigure

diff --git a/kde-plasma/breeze/breeze-9999.ebuild 
b/kde-plasma/breeze/breeze-9999.ebuild
index b42401c941..371d5ab90b 100644
--- a/kde-plasma/breeze/breeze-9999.ebuild
+++ b/kde-plasma/breeze/breeze-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit kde5 multibuild
+inherit flag-o-matic kde5 multibuild
 
 DESCRIPTION="Breeze visual style for the Plasma desktop"
 HOMEPAGE="https://cgit.kde.org/breeze.git";
@@ -56,15 +56,19 @@ src_configure() {
                local mycmakeargs=()
 
                if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
-                       mycmakeargs+=( -DUSE_KDE4=true )
+                       use debug || append-cppflags -DQT_NO_DEBUG
+                       mycmakeargs+=(
+                               -DUSE_KDE4=true
+                               -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc
+                       )
+                       cmake-utils_src_configure
                else
                        mycmakeargs+=(
                                $(cmake-utils_use_find_package wayland 
KF5Wayland)
                                $(cmake-utils_use_find_package X XCB)
                        )
+                       kde5_src_configure
                fi
-
-               kde5_src_configure
        }
 
        multibuild_foreach_variant myconfigure

Reply via email to