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/oxygen/
Date: Mon, 23 Oct 2017 23:19:53
Message-Id: 1508800772.ab201ec9fd7c49059d9fef5060b391022db3fc08.asturm@gentoo
1 commit: ab201ec9fd7c49059d9fef5060b391022db3fc08
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 23 22:23:24 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Mon Oct 23 23:19:32 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=ab201ec9
7
8 kde-plasma/oxygen: Fix cmake warning
9
10 Package-Manager: Portage-2.3.12, Repoman-2.3.3
11
12 kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild | 8 +++++---
13 kde-plasma/oxygen/oxygen-9999.ebuild | 8 +++++---
14 2 files changed, 10 insertions(+), 6 deletions(-)
15
16 diff --git a/kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild b/kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild
17 index 6b352f6d3d..7135bd0367 100644
18 --- a/kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild
19 +++ b/kde-plasma/oxygen/oxygen-5.11.49.9999.ebuild
20 @@ -64,12 +64,14 @@ pkg_setup() {
21
22 src_configure() {
23 myconfigure() {
24 - local mycmakeargs=(
25 - $(cmake-utils_use_find_package wayland KF5Wayland)
26 - )
27 + local mycmakeargs=()
28
29 if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
30 mycmakeargs+=( -DUSE_KDE4=true )
31 + else
32 + mycmakeargs+=(
33 + $(cmake-utils_use_find_package wayland KF5Wayland)
34 + )
35 fi
36
37 kde5_src_configure
38
39 diff --git a/kde-plasma/oxygen/oxygen-9999.ebuild b/kde-plasma/oxygen/oxygen-9999.ebuild
40 index 6b352f6d3d..7135bd0367 100644
41 --- a/kde-plasma/oxygen/oxygen-9999.ebuild
42 +++ b/kde-plasma/oxygen/oxygen-9999.ebuild
43 @@ -64,12 +64,14 @@ pkg_setup() {
44
45 src_configure() {
46 myconfigure() {
47 - local mycmakeargs=(
48 - $(cmake-utils_use_find_package wayland KF5Wayland)
49 - )
50 + local mycmakeargs=()
51
52 if [[ ${MULTIBUILD_VARIANT} = qt4 ]] ; then
53 mycmakeargs+=( -DUSE_KDE4=true )
54 + else
55 + mycmakeargs+=(
56 + $(cmake-utils_use_find_package wayland KF5Wayland)
57 + )
58 fi
59
60 kde5_src_configure