Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/kde:master commit in: kde-plasma/breeze/
Date: Mon, 23 Oct 2017 23:19:53
Message-Id: 1508800759.8a4c6e5b415609fd7ac900b9952900a3d0775c50.asturm@gentoo
1 commit: 8a4c6e5b415609fd7ac900b9952900a3d0775c50
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 23 20:55:47 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 23 23:19:19 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=8a4c6e5b
7
8 kde-plasma/breeze: Fix cmake warning
9
10 KF5Wayland is not a thing when building for USE=qt4.
11
12 Reported-by: Arfrever
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, 14 insertions(+), 10 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 fdeaaae705..063879f0ac 100644
21 --- a/kde-plasma/breeze/breeze-5.11.49.9999.ebuild
22 +++ b/kde-plasma/breeze/breeze-5.11.49.9999.ebuild
23 @@ -6,7 +6,7 @@ EAPI=6
24 inherit kde5 multibuild
25
26 DESCRIPTION="Breeze visual style for the Plasma desktop"
27 -HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
28 +HOMEPAGE="https://cgit.kde.org/breeze.git"
29 KEYWORDS=""
30 IUSE="qt4 wayland"
31
32 @@ -49,12 +49,14 @@ pkg_setup() {
33
34 src_configure() {
35 myconfigure() {
36 - local mycmakeargs=(
37 - $(cmake-utils_use_find_package wayland KF5Wayland)
38 - )
39 + local mycmakeargs=()
40
41 - if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
42 + if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
43 mycmakeargs+=( -DUSE_KDE4=true )
44 + else
45 + mycmakeargs+=(
46 + $(cmake-utils_use_find_package wayland KF5Wayland)
47 + )
48 fi
49
50 kde5_src_configure
51
52 diff --git a/kde-plasma/breeze/breeze-9999.ebuild b/kde-plasma/breeze/breeze-9999.ebuild
53 index fdeaaae705..063879f0ac 100644
54 --- a/kde-plasma/breeze/breeze-9999.ebuild
55 +++ b/kde-plasma/breeze/breeze-9999.ebuild
56 @@ -6,7 +6,7 @@ EAPI=6
57 inherit kde5 multibuild
58
59 DESCRIPTION="Breeze visual style for the Plasma desktop"
60 -HOMEPAGE="https://projects.kde.org/projects/kde/workspace/breeze"
61 +HOMEPAGE="https://cgit.kde.org/breeze.git"
62 KEYWORDS=""
63 IUSE="qt4 wayland"
64
65 @@ -49,12 +49,14 @@ pkg_setup() {
66
67 src_configure() {
68 myconfigure() {
69 - local mycmakeargs=(
70 - $(cmake-utils_use_find_package wayland KF5Wayland)
71 - )
72 + local mycmakeargs=()
73
74 - if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
75 + if [[ ${MULTIBUILD_VARIANT} = qt4 ]]; then
76 mycmakeargs+=( -DUSE_KDE4=true )
77 + else
78 + mycmakeargs+=(
79 + $(cmake-utils_use_find_package wayland KF5Wayland)
80 + )
81 fi
82
83 kde5_src_configure