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:54
Message-Id: 1508800765.9bafeae2fae60df77ac17cbbd8cb692f673f32ae.asturm@gentoo
1 commit: 9bafeae2fae60df77ac17cbbd8cb692f673f32ae
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Mon Oct 23 21:28:44 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=9bafeae2
7
8 kde-plasma/breeze: Add USE=X
9
10 Package-Manager: Portage-2.3.12, Repoman-2.3.3
11
12 kde-plasma/breeze/breeze-5.11.49.9999.ebuild | 11 ++++++++---
13 kde-plasma/breeze/breeze-9999.ebuild | 11 ++++++++---
14 2 files changed, 16 insertions(+), 6 deletions(-)
15
16 diff --git a/kde-plasma/breeze/breeze-5.11.49.9999.ebuild b/kde-plasma/breeze/breeze-5.11.49.9999.ebuild
17 index 063879f0ac..b42401c941 100644
18 --- a/kde-plasma/breeze/breeze-5.11.49.9999.ebuild
19 +++ b/kde-plasma/breeze/breeze-5.11.49.9999.ebuild
20 @@ -8,7 +8,9 @@ inherit kde5 multibuild
21 DESCRIPTION="Breeze visual style for the Plasma desktop"
22 HOMEPAGE="https://cgit.kde.org/breeze.git"
23 KEYWORDS=""
24 -IUSE="qt4 wayland"
25 +IUSE="qt4 wayland X"
26 +
27 +REQUIRED_USE="qt4? ( X )"
28
29 COMMON_DEPEND="
30 $(add_frameworks_dep frameworkintegration)
31 @@ -25,13 +27,15 @@ COMMON_DEPEND="
32 $(add_qt_dep qtdeclarative)
33 $(add_qt_dep qtgui)
34 $(add_qt_dep qtwidgets)
35 - $(add_qt_dep qtx11extras)
36 - x11-libs/libxcb
37 qt4? (
38 kde-frameworks/kdelibs:4
39 x11-libs/libX11
40 )
41 wayland? ( $(add_frameworks_dep kwayland) )
42 + X? (
43 + $(add_qt_dep qtx11extras)
44 + x11-libs/libxcb
45 + )
46 "
47 DEPEND="${COMMON_DEPEND}
48 $(add_frameworks_dep kpackage)
49 @@ -56,6 +60,7 @@ src_configure() {
50 else
51 mycmakeargs+=(
52 $(cmake-utils_use_find_package wayland KF5Wayland)
53 + $(cmake-utils_use_find_package X XCB)
54 )
55 fi
56
57
58 diff --git a/kde-plasma/breeze/breeze-9999.ebuild b/kde-plasma/breeze/breeze-9999.ebuild
59 index 063879f0ac..b42401c941 100644
60 --- a/kde-plasma/breeze/breeze-9999.ebuild
61 +++ b/kde-plasma/breeze/breeze-9999.ebuild
62 @@ -8,7 +8,9 @@ inherit kde5 multibuild
63 DESCRIPTION="Breeze visual style for the Plasma desktop"
64 HOMEPAGE="https://cgit.kde.org/breeze.git"
65 KEYWORDS=""
66 -IUSE="qt4 wayland"
67 +IUSE="qt4 wayland X"
68 +
69 +REQUIRED_USE="qt4? ( X )"
70
71 COMMON_DEPEND="
72 $(add_frameworks_dep frameworkintegration)
73 @@ -25,13 +27,15 @@ COMMON_DEPEND="
74 $(add_qt_dep qtdeclarative)
75 $(add_qt_dep qtgui)
76 $(add_qt_dep qtwidgets)
77 - $(add_qt_dep qtx11extras)
78 - x11-libs/libxcb
79 qt4? (
80 kde-frameworks/kdelibs:4
81 x11-libs/libX11
82 )
83 wayland? ( $(add_frameworks_dep kwayland) )
84 + X? (
85 + $(add_qt_dep qtx11extras)
86 + x11-libs/libxcb
87 + )
88 "
89 DEPEND="${COMMON_DEPEND}
90 $(add_frameworks_dep kpackage)
91 @@ -56,6 +60,7 @@ src_configure() {
92 else
93 mycmakeargs+=(
94 $(cmake-utils_use_find_package wayland KF5Wayland)
95 + $(cmake-utils_use_find_package X XCB)
96 )
97 fi