1 |
commit: 208d323aa67df8d129eb18b59efb03202766e29e |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 30 23:32:54 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Dec 31 00:45:55 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=208d323a |
7 |
|
8 |
kde-plasma/breeze: Add missing DEPEND, drop IUSE=wayland |
9 |
|
10 |
Upstream commits: |
11 |
a1e1a53f3b734a22e69e567016ee764a566d988b |
12 |
6d83b045443f8d333dd0cd0042a17b5b3a668d05 |
13 |
|
14 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
16 |
|
17 |
kde-plasma/breeze/breeze-5.20.49.9999.ebuild | 11 ++++------- |
18 |
kde-plasma/breeze/breeze-9999.ebuild | 11 ++++------- |
19 |
2 files changed, 8 insertions(+), 14 deletions(-) |
20 |
|
21 |
diff --git a/kde-plasma/breeze/breeze-5.20.49.9999.ebuild b/kde-plasma/breeze/breeze-5.20.49.9999.ebuild |
22 |
index d4a8ebe5d9..6fd199e680 100644 |
23 |
--- a/kde-plasma/breeze/breeze-5.20.49.9999.ebuild |
24 |
+++ b/kde-plasma/breeze/breeze-5.20.49.9999.ebuild |
25 |
@@ -14,13 +14,14 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze" |
26 |
LICENSE="GPL-2" # TODO: CHECK |
27 |
SLOT="5" |
28 |
KEYWORDS="" |
29 |
-IUSE="wayland X" |
30 |
+IUSE="X" |
31 |
|
32 |
RDEPEND=" |
33 |
>=dev-qt/qtdbus-${QTMIN}:5 |
34 |
>=dev-qt/qtdeclarative-${QTMIN}:5 |
35 |
>=dev-qt/qtgui-${QTMIN}:5 |
36 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
37 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
38 |
>=kde-frameworks/frameworkintegration-${KFMIN}:5 |
39 |
>=kde-frameworks/kcmutils-${KFMIN}:5 |
40 |
>=kde-frameworks/kconfig-${KFMIN}:5 |
41 |
@@ -28,14 +29,11 @@ RDEPEND=" |
42 |
>=kde-frameworks/kcoreaddons-${KFMIN}:5 |
43 |
>=kde-frameworks/kguiaddons-${KFMIN}:5 |
44 |
>=kde-frameworks/ki18n-${KFMIN}:5 |
45 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
46 |
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
47 |
>=kde-frameworks/kwindowsystem-${KFMIN}:5 |
48 |
>=kde-plasma/kdecoration-${PVCUT}:5 |
49 |
- wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) |
50 |
- X? ( |
51 |
- >=dev-qt/qtx11extras-${QTMIN}:5 |
52 |
- x11-libs/libxcb |
53 |
- ) |
54 |
+ X? ( x11-libs/libxcb ) |
55 |
" |
56 |
DEPEND="${RDEPEND} |
57 |
>=kde-frameworks/kpackage-${KFMIN}:5 |
58 |
@@ -47,7 +45,6 @@ PDEPEND=" |
59 |
|
60 |
src_configure() { |
61 |
local mycmakeargs=( |
62 |
- $(cmake_use_find_package wayland KF5Wayland) |
63 |
$(cmake_use_find_package X XCB) |
64 |
) |
65 |
ecm_src_configure |
66 |
|
67 |
diff --git a/kde-plasma/breeze/breeze-9999.ebuild b/kde-plasma/breeze/breeze-9999.ebuild |
68 |
index a5d4be0fac..9d5babb5d7 100644 |
69 |
--- a/kde-plasma/breeze/breeze-9999.ebuild |
70 |
+++ b/kde-plasma/breeze/breeze-9999.ebuild |
71 |
@@ -14,13 +14,14 @@ HOMEPAGE="https://invent.kde.org/plasma/breeze" |
72 |
LICENSE="GPL-2" # TODO: CHECK |
73 |
SLOT="5" |
74 |
KEYWORDS="" |
75 |
-IUSE="wayland X" |
76 |
+IUSE="X" |
77 |
|
78 |
RDEPEND=" |
79 |
>=dev-qt/qtdbus-${QTMIN}:5 |
80 |
>=dev-qt/qtdeclarative-${QTMIN}:5 |
81 |
>=dev-qt/qtgui-${QTMIN}:5 |
82 |
>=dev-qt/qtwidgets-${QTMIN}:5 |
83 |
+ >=dev-qt/qtx11extras-${QTMIN}:5 |
84 |
>=kde-frameworks/frameworkintegration-${KFMIN}:5 |
85 |
>=kde-frameworks/kcmutils-${KFMIN}:5 |
86 |
>=kde-frameworks/kconfig-${KFMIN}:5 |
87 |
@@ -28,14 +29,11 @@ RDEPEND=" |
88 |
>=kde-frameworks/kcoreaddons-${KFMIN}:5 |
89 |
>=kde-frameworks/kguiaddons-${KFMIN}:5 |
90 |
>=kde-frameworks/ki18n-${KFMIN}:5 |
91 |
+ >=kde-frameworks/kiconthemes-${KFMIN}:5 |
92 |
>=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
93 |
>=kde-frameworks/kwindowsystem-${KFMIN}:5 |
94 |
>=kde-plasma/kdecoration-${PVCUT}:5 |
95 |
- wayland? ( >=kde-frameworks/kwayland-${KFMIN}:5 ) |
96 |
- X? ( |
97 |
- >=dev-qt/qtx11extras-${QTMIN}:5 |
98 |
- x11-libs/libxcb |
99 |
- ) |
100 |
+ X? ( x11-libs/libxcb ) |
101 |
" |
102 |
DEPEND="${RDEPEND} |
103 |
>=kde-frameworks/kpackage-${KFMIN}:5 |
104 |
@@ -47,7 +45,6 @@ PDEPEND=" |
105 |
|
106 |
src_configure() { |
107 |
local mycmakeargs=( |
108 |
- $(cmake_use_find_package wayland KF5Wayland) |
109 |
$(cmake_use_find_package X XCB) |
110 |
) |
111 |
ecm_src_configure |