1 |
commit: af22b7a865488d3f24787e363334ec90ea96ef83 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Oct 23 21:55:34 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Oct 23 23:19:25 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=af22b7a8 |
7 |
|
8 |
kde-plasma/breeze: Fix KDE_INSTALL_USE_QT_SYS_PATHS warning |
9 |
|
10 |
Not a thing when building for USE=qt4. |
11 |
Adding relevant parts of kde4-base.eclass to src_configure. |
12 |
|
13 |
Package-Manager: Portage-2.3.12, Repoman-2.3.3 |
14 |
|
15 |
kde-plasma/breeze/breeze-5.11.49.9999.ebuild | 12 ++++++++---- |
16 |
kde-plasma/breeze/breeze-9999.ebuild | 12 ++++++++---- |
17 |
2 files changed, 16 insertions(+), 8 deletions(-) |
18 |
|
19 |
diff --git a/kde-plasma/breeze/breeze-5.11.49.9999.ebuild b/kde-plasma/breeze/breeze-5.11.49.9999.ebuild |
20 |
index b42401c941..371d5ab90b 100644 |
21 |
--- a/kde-plasma/breeze/breeze-5.11.49.9999.ebuild |
22 |
+++ b/kde-plasma/breeze/breeze-5.11.49.9999.ebuild |
23 |
@@ -3,7 +3,7 @@ |
24 |
|
25 |
EAPI=6 |
26 |
|
27 |
-inherit kde5 multibuild |
28 |
+inherit flag-o-matic kde5 multibuild |
29 |
|
30 |
DESCRIPTION="Breeze visual style for the Plasma desktop" |
31 |
HOMEPAGE="https://cgit.kde.org/breeze.git" |
32 |
@@ -56,15 +56,19 @@ src_configure() { |
33 |
local mycmakeargs=() |
34 |
|
35 |
if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
36 |
- mycmakeargs+=( -DUSE_KDE4=true ) |
37 |
+ use debug || append-cppflags -DQT_NO_DEBUG |
38 |
+ mycmakeargs+=( |
39 |
+ -DUSE_KDE4=true |
40 |
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc |
41 |
+ ) |
42 |
+ cmake-utils_src_configure |
43 |
else |
44 |
mycmakeargs+=( |
45 |
$(cmake-utils_use_find_package wayland KF5Wayland) |
46 |
$(cmake-utils_use_find_package X XCB) |
47 |
) |
48 |
+ kde5_src_configure |
49 |
fi |
50 |
- |
51 |
- kde5_src_configure |
52 |
} |
53 |
|
54 |
multibuild_foreach_variant myconfigure |
55 |
|
56 |
diff --git a/kde-plasma/breeze/breeze-9999.ebuild b/kde-plasma/breeze/breeze-9999.ebuild |
57 |
index b42401c941..371d5ab90b 100644 |
58 |
--- a/kde-plasma/breeze/breeze-9999.ebuild |
59 |
+++ b/kde-plasma/breeze/breeze-9999.ebuild |
60 |
@@ -3,7 +3,7 @@ |
61 |
|
62 |
EAPI=6 |
63 |
|
64 |
-inherit kde5 multibuild |
65 |
+inherit flag-o-matic kde5 multibuild |
66 |
|
67 |
DESCRIPTION="Breeze visual style for the Plasma desktop" |
68 |
HOMEPAGE="https://cgit.kde.org/breeze.git" |
69 |
@@ -56,15 +56,19 @@ src_configure() { |
70 |
local mycmakeargs=() |
71 |
|
72 |
if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then |
73 |
- mycmakeargs+=( -DUSE_KDE4=true ) |
74 |
+ use debug || append-cppflags -DQT_NO_DEBUG |
75 |
+ mycmakeargs+=( |
76 |
+ -DUSE_KDE4=true |
77 |
+ -DSYSCONF_INSTALL_DIR="${EPREFIX}"/etc |
78 |
+ ) |
79 |
+ cmake-utils_src_configure |
80 |
else |
81 |
mycmakeargs+=( |
82 |
$(cmake-utils_use_find_package wayland KF5Wayland) |
83 |
$(cmake-utils_use_find_package X XCB) |
84 |
) |
85 |
+ kde5_src_configure |
86 |
fi |
87 |
- |
88 |
- kde5_src_configure |
89 |
} |
90 |
|
91 |
multibuild_foreach_variant myconfigure |